[Xfce4-commits] [apps/xfce4-screensaver] 148/425: Revert "Honor locale time settings in lock screen."

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

b   l   u   e   s   a   b   r   e       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository apps/xfce4-screensaver.

commit 8fe598d87e203b9d956a83fa60ab0e481b85f5df
Author: infirit <infirit at gmail.com>
Date:   Thu Jun 12 12:34:29 2014 +0200

    Revert "Honor locale time settings in lock screen."
    
    This reverts commit debbeac50a48c78fd0ca1559228e54eebc4d7aa8.
---
 src/gs-lock-plug.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/gs-lock-plug.c b/src/gs-lock-plug.c
index cbc1241..8b47e96 100644
--- a/src/gs-lock-plug.c
+++ b/src/gs-lock-plug.c
@@ -300,8 +300,10 @@ date_time_update (GSLockPlug *plug)
 	gchar *str;
 
 	datetime = g_date_time_new_now_local ();
-	time = g_date_time_format (datetime, "%X");
-	date = g_date_time_format (datetime, "%A, %B %e");
+	/* 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"));
 
 	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);

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.