isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

messageTray: Change timestamp string formats

Browse Source 
The timestamps before contained unnecessary information.
Additionally, align the timestamps to be in the middle of the
bubble for design reasons.

https://bugzilla.gnome.org/show_bug.cgi?id=680989
This commit is contained in:
Carlos Soriano 2012-09-30 15:39:37 +02:00 committed by Florian Müllner
parent 1496ba0bbd
commit 3de0ebf7fd
1 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
js/ui/components/telepathyClient.js
View File

@ -930,24 +930,32 @@ const ChatNotification = new Lang.Class({
let format; let format;
// Show a week day and time if date is in the last week // Show only the hour if date is on today
if (daysAgo < 1 || (daysAgo < 7 && now.getDay() != date.getDay())) { if(daysAgo < 1){
/* Translators: this is a time format string followed by a date. format = "<b>%H:%M</b>";
If applicable, replace %X with a strftime format valid for your }
locale, without seconds. */ // Show the word "Yesterday" and time if date is on yesterday
else if(daysAgo <2){
/* Translators: this is a time format string followed by the word "Yesterday". i.e. "14:30 on Yesterday"*/
// xgettext:no-c-format // xgettext:no-c-format
format = _("Sent at <b>%X</b> on <b>%A</b>"); format = _("<b>%H:%M</b> on Yesterday");
}
// Show a week day and time if date is in the last week
else if (daysAgo < 7) {
/* Translators: this is a time format string followed by a week day name. i.e. "14:30 on Monday*/
// xgettext:no-c-format
format = _("<b>%H:%M</b> on <b>%A</b>");
} else if (date.getYear() == now.getYear()) { } else if (date.getYear() == now.getYear()) {
/* Translators: this is a time format in the style of "Wednesday, May 25", /* Translators: this is a time format in the style of "14:30 on Wednesday, May 25",
shown when you get a chat message in the same year. */ shown when you get a chat message in the same year */
// xgettext:no-c-format // xgettext:no-c-format
format = _("Sent on <b>%A</b>, <b>%B %d</b>"); format = _("<b>%H:%M</b> on <b>%A</b>, <b>%B</b> <b>%d</b>");
} else { } else {
/* Translators: this is a time format in the style of "Wednesday, May 25, 2012", /* Translators: this is a time format in the style of "14:30 on Wednesday, May 25, 2012",
shown when you get a chat message in a different year. */ shown when you get a chat message in a different year */
// xgettext:no-c-format // xgettext:no-c-format
format = _("Sent on <b>%A</b>, <b>%B %d</b>, %Y"); format = _("<b>%H:%M</b> on <b>%A</b>, <b>%B</b> <b>%d</b>, %Y");
} }
return date.toLocaleFormat(format); return date.toLocaleFormat(format);
@ -960,8 +968,7 @@ const ChatNotification = new Lang.Class({
let timeLabel = this._append({ body: this._formatTimestamp(lastMessageDate), let timeLabel = this._append({ body: this._formatTimestamp(lastMessageDate),
group: 'meta', group: 'meta',
styles: ['chat-meta-message'], styles: ['chat-meta-message'],
childProps: { expand: true, x_fill: false, childProps: { expand: true, x_fill: false },
x_align: St.Align.END },
noTimestamp: true, noTimestamp: true,
timestamp: lastMessageTime }); timestamp: lastMessageTime });