summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbrian m. carlson <[email protected]>2014-05-30 21:36:05 +0000
committerinfirit <[email protected]>2014-06-12 00:08:49 +0200
commitdebbeac50a48c78fd0ca1559228e54eebc4d7aa8 (patch)
tree31fbc2a392eb8955a7340b5eb16b908484e7d709
parentd27a591a9a930741aeda5c82f5e9016091f37f12 (diff)
downloadmate-screensaver-debbeac50a48c78fd0ca1559228e54eebc4d7aa8.tar.bz2
mate-screensaver-debbeac50a48c78fd0ca1559228e54eebc4d7aa8.tar.xz
Honor locale time settings in lock screen.
The time display in the lock screen should honor the LC_TIME variable, including the locale-specific settings for whether to display a 12-hour or 24-hour time. Sending the time and date strings through gettext results in a value which is specific to LC_MESSAGES, which can be different from LC_TIME. Use the %X value for time, which is guaranteed to be appropriate for the locale in question. Signed-off-by: brian m. carlson <[email protected]>
-rw-r--r--src/gs-lock-plug.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/gs-lock-plug.c b/src/gs-lock-plug.c
index 8b47e96..cbc1241 100644
--- a/src/gs-lock-plug.c
+++ b/src/gs-lock-plug.c
@@ -300,10 +300,8 @@ date_time_update (GSLockPlug *plug)
gchar *str;
datetime = g_date_time_new_now_local ();
- /* Translators: Time format, see https://developer.gnome.org/glib/stable/glib-GDateTime.html#g-date-time-format */
- time = g_date_time_format (datetime, _("%l:%M %p"));
- /* Translators: Date format, see https://developer.gnome.org/glib/stable/glib-GDateTime.html#g-date-time-format */
- date = g_date_time_format (datetime, _("%A, %B %e"));
+ time = g_date_time_format (datetime, "%X");
+ date = g_date_time_format (datetime, "%A, %B %e");
str = g_strdup_printf ("<span size=\"xx-large\" weight=\"ultrabold\">%s</span>", time);
gtk_label_set_text (GTK_LABEL (plug->priv->auth_time_label), str);