[SCM] mate-screensaver Debian package branch, master, updated. debian/1.8.0-4-2-g11be389

[Mike Gabriel]

Gitweb-URL: http://git.debian.org/?p=pkg-mate/mate-screensaver.git;a=commitdiff;h=355519b

The following commit has been merged in the master branch:
commit 355519b56916b6e0e311cccb671ea5bbada51563
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Jun 11 22:23:25 2014 +0200

    debian/patches: Add 1003_proper-locale-datetime.patch. Use locale system to obtain correct date and time format for screensaver clock. (Closes: #746019).
---
 debian/patches/1003_proper-locale-datetime.patch | 23 +++++++++++++++++++++++
 debian/patches/series                            |  1 +
 2 files changed, 24 insertions(+)

diff --git a/debian/patches/1003_proper-locale-datetime.patch b/debian/patches/1003_proper-locale-datetime.patch
new file mode 100644
index 0000000..7948435
--- /dev/null
+++ b/debian/patches/1003_proper-locale-datetime.patch
@@ -0,0 +1,23 @@
+Author: Brian M. Carlson (https://github.com/bk2204)
+Description: Use locale representation of datetime objects
+Forwarded: https://github.com/mate-desktop/mate-screensaver/pull/47
+Abstract:
+ Instead of burdening i18n team members with figuring out
+ the correct datetime format for the different locales,
+ we directly get the datetime format directly via strftime()
+ and the underlying libc/locale implementation.
+--- a/src/gs-lock-plug.c
++++ b/src/gs-lock-plug.c
+@@ -300,10 +300,8 @@
+ 	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, "%x");
+ 
+ 	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);
diff --git a/debian/patches/series b/debian/patches/series
index c8b6a22..f6f2eb2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 1001_add-keywords-to-desktop-files.patch
 1002_fix-segfault-if-xrandr-is-unavailable.patch
+1003_proper-locale-datetime.patch

-- 
mate-screensaver Debian package