Merge lp:~elementary-pantheon/pantheon-greeter/time-label-file into lp:~elementary-pantheon/pantheon-greeter/trunk

[Danielle Foré]

ShadowedLabel:
* Remove Using Clutter

TimeLabel:
* Remove get_english_number_suffix

[lp:~elementary-pantheon/pantheon-greeter/time-label-file]

423. By Danielle Foré on 2016-04-12

merge trunk

[Corentin Noël (tintou)]

I know it's just copy/paste, but note to translators are handled with ///

[lp:~elementary-pantheon/pantheon-greeter/time-label-file]

424. By Danielle Foré on 2016-04-14

merge trunk

425. By Danielle Foré on 2016-04-14

fix translator notes

426. By Danielle Foré on 2016-04-14

fix spacing

=== modified file 'src/ShadowedLabel.vala'
--- src/ShadowedLabel.vala	2016-04-04 23:01:22 +0000
+++ src/ShadowedLabel.vala	2016-04-14 18:03:49 +0000
@@ -19,9 +19,7 @@
     END LICENSE
 ***/
 
-using Clutter;
-
-public class ShadowedLabel : Actor {
+public class ShadowedLabel : Clutter.Actor {
     Granite.Drawing.BufferSurface buffer;
 
     string _label = "";
@@ -46,13 +44,13 @@
     }
 
     public ShadowedLabel (string _label) {
-        content = new Canvas ();
-        (content as Canvas).draw.connect (draw);
+        content = new Clutter.Canvas ();
+        (content as Clutter.Canvas).draw.connect (draw);
 
         reactive = false;
 
-        notify["width"].connect (() => {(content as Canvas).set_size ((int) width, (int) height); buffer = null;});
-        notify["height"].connect (() => {(content as Canvas).set_size ((int) width, (int) height); buffer = null;});
+        notify["width"].connect (() => {(content as Clutter.Canvas).set_size ((int) width, (int) height); buffer = null;});
+        notify["height"].connect (() => {(content as Clutter.Canvas).set_size ((int) width, (int) height); buffer = null;});
 
         label = _label;
     }
@@ -84,62 +82,3 @@
         return true;
     }
 }
-
-public class TimeLabel : ShadowedLabel {
-
-    public TimeLabel () {
-        base ("");
-
-        update_time ();
-        Clutter.Threads.Timeout.add (5000, update_time);
-    }
-
-    bool update_time () {
-        var date = new GLib.DateTime.now_local ();
-
-        /*Date display, see http://unstable.valadoc.org/#!api=glib-2.0/GLib.DateTime.format for more details.
-          %v is added here to provide the English date suffixes th, nd and so on*/
-        var day_format = _("%A, %B %e");
-        /*Time display, see http://unstable.valadoc.org/#!api=glib-2.0/GLib.DateTime.format for more details*/
-        var time_format = _("%l:%M");
-        /*AM/PM display, see http://unstable.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");
-
-        label = date.format (
-            "<span face='Open Sans Light' font='24'>"+
-            day_format+
-            "</span>\n<span face='Raleway' weight='100' font='72'>"+
-            time_format+
-            "</span><span face='Raleway' weight='100' font='50'>"+
-            meridiem_format+
-            "</span>");
-        return true;
-    }
-
-    /**
-     * Utility to get the English number suffix
-     * @param number The number to find the the suffix for
-     * @return The according English suffix
-     **/
-    string get_english_number_suffix (int number) {
-        number %= 100;
-
-        if (number > 20)
-            number %= 10;
-
-        switch (number) {
-            case 1:
-                return "st";
-            case 2:
-                return "nd";
-            case 3:
-                return "rd";
-            case 11:
-            case 12:
-            case 13:
-            default:
-                return "th";
-        }
-    }
-}

=== added file 'src/TimeLabel.vala'
--- src/TimeLabel.vala	1970-01-01 00:00:00 +0000
+++ src/TimeLabel.vala	2016-04-14 18:03:49 +0000
@@ -0,0 +1,50 @@
+/*
+* Copyright (c) 2011-2016 elementary LLC (http://launchpad.net/pantheon-greeter)
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public
+* License as published by the Free Software Foundation; either
+* version 2 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+* Boston, MA 02111-1307, USA.
+*
+*/
+
+public class TimeLabel : ShadowedLabel {
+
+    public TimeLabel () {
+        base ("");
+
+        update_time ();
+        Clutter.Threads.Timeout.add (5000, update_time);
+    }
+
+    bool update_time () {
+        var date = new GLib.DateTime.now_local ();
+
+        /// 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");
+
+        label = date.format (
+            "<span face='Open Sans Light' font='24'>"+
+            day_format+
+            "</span>\n<span face='Raleway' weight='100' font='72'>"+
+            time_format+
+            "</span><span face='Raleway' weight='100' font='50'>"+
+            meridiem_format+
+            "</span>");
+        return true;
+    }
+}