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

dateMenu: Use formatTime() for world clock

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=745111
This commit is contained in:
Florian Müllner 2015-02-25 20:26:08 +01:00
parent 60f6715228
commit 39fd7b9a05
1 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
js/ui/dateMenu.js
View File

@ -200,23 +200,11 @@ const WorldClocksSection = new Lang.Class({
}, },
_updateLabels: function() { _updateLabels: function() {
let desktopSettings = new Gio.Settings({ schema_id: 'org.gnome.desktop.interface' });
let clockFormat = desktopSettings.get_string('clock-format');
let hasAmPm = new Date().toLocaleFormat('%p') != '';
let format;
if (clockFormat == '24h' || !hasAmPm)
/* Translators: Time in 24h format */
format = N_("%H\u2236%M");
else
/* Translators: Time in 12h format */
format = N_("%l\u2236%M %p");
for (let i = 0; i < this._locations.length; i++) { for (let i = 0; i < this._locations.length; i++) {
let l = this._locations[i]; let l = this._locations[i];
let tz = GLib.TimeZone.new(l.location.get_timezone().get_tzid()); let tz = GLib.TimeZone.new(l.location.get_timezone().get_tzid());
let now = GLib.DateTime.new_now(tz); let now = GLib.DateTime.new_now(tz);
l.actor.text = now.format(format); l.actor.text = Util.formatTime(now, { timeOnly: true });
} }
} }
}); });