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

MessageTray: clean-up chat timestamps

Browse Source 
Change the text for design reasons and correct some English issues
in the timestamp string.

https://bugzilla.gnome.org/show_bug.cgi?id=680989
This commit is contained in:
Carlos Soriano Sánchez 2012-11-15 19:31:16 +01:00 committed by Giovanni Campagna
parent 71ad39b6e3
commit 50fbf9982e
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -926,26 +926,24 @@ const ChatNotification = new Lang.Class({
} }
// Show the word "Yesterday" and time if date is on yesterday // Show the word "Yesterday" and time if date is on yesterday
else if(daysAgo <2){ else if(daysAgo <2){
/* Translators: this is a time format string followed by the word "Yesterday". i.e. "14:30 on Yesterday"*/ /* Translators: this is the word "Yesterday" followed by a time string. i.e. "Yesterday, 14:30"*/
// xgettext:no-c-format // xgettext:no-c-format
format = _("<b>%H:%M</b> on Yesterday"); format = _("<b>Yesterday</b>, <b>%H:%M</b>");
} }
// Show a week day and time if date is in the last week // Show a week day and time if date is in the last week
else if (daysAgo < 7) { else if (daysAgo < 7) {
/* Translators: this is a time format string followed by a week day name. i.e. "14:30 on Monday*/ /* Translators: this is the week day name followed by a time string. i.e. "Monday, 14:30*/
// xgettext:no-c-format // xgettext:no-c-format
format = _("<b>%H:%M</b> on <b>%A</b>"); format = _("<b>%A</b>, <b>%H:%M</b>");
} else if (date.getYear() == now.getYear()) { } else if (date.getYear() == now.getYear()) {
/* Translators: this is a time format in the style of "14:30 on Wednesday, May 25", /* Translators: this is the month name and day number followed by a time string. i.e. "May 25, 14:30"*/
shown when you get a chat message in the same year */
// xgettext:no-c-format // xgettext:no-c-format
format = _("<b>%H:%M</b> on <b>%A</b>, <b>%B</b> <b>%d</b>"); format = _("<b>%B</b> <b>%d</b>, <b>%H:%M</b>");
} else { } else {
/* Translators: this is a time format in the style of "14:30 on Wednesday, May 25, 2012", /* Translators: this is the month name, day number, year number followed by a time string. i.e. "May 25 2012, 14:30"*/
shown when you get a chat message in a different year */
// xgettext:no-c-format // xgettext:no-c-format
format = _("<b>%H:%M</b> on <b>%A</b>, <b>%B</b> <b>%d</b>, %Y"); format = _("<b>%B</b> <b>%d</b> <b>%Y</b>, <b>%H:%M</b> ");
} }
return date.toLocaleFormat(format); return date.toLocaleFormat(format);