Merge lp:~leonardolemos/pantheon-greeter/fix-1624217 into lp:~elementary-pantheon/pantheon-greeter/trunk

[Leonardo Lemos]

* Remove AM/PM label;
* Move AM/PM label content to Time label;
* Update translation template.

This branch removes the AM/PM label and moves that label content to time's label to introduce a better translation and internationalization support.

[Danielle Foré (danrabbit)]

there's a problem here because we're using style classes for the AM/PM label. So we'll have to figure out how we're going to handle those styles

Unmerged revisions

521. By Leonardo Lemos on 2017-01-08

Update translation template

520. By Leonardo Lemos on 2017-01-08

Remove pm label; Move pm label content to time label

=== modified file 'po/pantheon-greeter.pot'
--- po/pantheon-greeter.pot	2016-12-01 15:23:46 +0000
+++ po/pantheon-greeter.pot	2017-01-08 23:34:29 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-01 09:23-0600\n"
+"POT-Creation-Date: 2017-01-08 21:30-0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -17,12 +17,14 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/LoginOptions/GuestLogin.vala:41
-msgid "Guest session"
+#. / Date display, see http://valadoc.org/#!api=glib-2.0/GLib.DateTime.format for more details
+#: ../src/TimeLabel.vala:53
+msgid "%A, %B %e"
 msgstr ""
 
-#: ../src/LoginOptions/ManualLogin.vala:35
-msgid "Manual Login"
+#. / Time display, see http://valadoc.org/#!api=glib-2.0/GLib.DateTime.format for more details. If you translate in a language that has no equivalent for AM/PM, keep the '%p' string.
+#: ../src/TimeLabel.vala:55
+msgid "%l:%M %p"
 msgstr ""
 
 #: ../src/FingerprintIndicatorArea.vala:117
@@ -41,21 +43,14 @@
 msgid "Center your finger and try again."
 msgstr ""
 
-#: ../src/PasswordArea.vala:34 ../src/LoginButtonArea.vala:26
+#: ../src/LoginButtonArea.vala:26 ../src/PasswordArea.vala:34
 msgid "Log In"
 msgstr ""
 
-#. / Date display, see http://valadoc.org/#!api=glib-2.0/GLib.DateTime.format for more details
-#: ../src/TimeLabel.vala:59
-msgid "%A, %B %e"
-msgstr ""
-
-#. / Time display, see http://valadoc.org/#!api=glib-2.0/GLib.DateTime.format for more details
-#: ../src/TimeLabel.vala:61
-msgid "%l:%M"
-msgstr ""
-
-#. / AM/PM display, see http://valadoc.org/#!api=glib-2.0/GLib.DateTime.format for more details. If you translate in a language that has no equivalent for AM/PM, keep the original english string.
-#: ../src/TimeLabel.vala:63
-msgid " %p"
+#: ../src/LoginOptions/GuestLogin.vala:41
+msgid "Guest session"
+msgstr ""
+
+#: ../src/LoginOptions/ManualLogin.vala:35
+msgid "Manual Login"
 msgstr ""

=== modified file 'src/TimeLabel.vala'
--- src/TimeLabel.vala	2016-12-31 19:51:56 +0000
+++ src/TimeLabel.vala	2017-01-08 23:34:29 +0000
@@ -21,7 +21,6 @@
 public class TimeLabel : GtkClutter.Actor {
     private Gtk.Label date_label;
     private Gtk.Label time_label;
-    private Gtk.Label pm_label;
 
     public TimeLabel () {
         update_time ();
@@ -40,13 +39,8 @@
         time_label = new Gtk.Label ("");
         time_label.get_style_context ().add_class ("time");
 
-        pm_label = new Gtk.Label ("");
-        pm_label.get_style_context ().add_class ("time");
-        pm_label.get_style_context ().add_class ("pm");
-
         layout.attach (date_label, 0, 0, 2, 1);
         layout.attach (time_label, 0, 1, 1, 1);
-        layout.attach (pm_label, 1, 1, 1, 1);
         layout.show_all ();
 
         container_widget.add (layout);
@@ -57,14 +51,11 @@
 
         /// Date display, see http://valadoc.org/#!api=glib-2.0/GLib.DateTime.format for more details
         var day_format = _("%A, %B %e");
-        /// Time display, see http://valadoc.org/#!api=glib-2.0/GLib.DateTime.format for more details
-        var time_format = _("%l:%M");
-        /// AM/PM display, see http://valadoc.org/#!api=glib-2.0/GLib.DateTime.format for more details. If you translate in a language that has no equivalent for AM/PM, keep the original english string.
-        var meridiem_format = _(" %p");
+        /// Time display, see http://valadoc.org/#!api=glib-2.0/GLib.DateTime.format for more details. If you translate in a language that has no equivalent for AM/PM, keep the '%p' string.
+        var time_format = _("%l:%M %p");
 
         date_label.label = date.format (day_format);
         time_label.label = date.format (time_format);
-        pm_label.label = date.format (meridiem_format);
         return true;
     }
 }