Merge lp:~kelemeng/unity-greeter/bug831026 into lp:~robert-ancell/unity-greeter/trunk

[Gabor Kelemen]

[Robert Ancell (robert-ancell)]

Fixed with minor changes:
- Remove tab character
- Remove unnecessary variable 'txt'

[Robert Ancell (robert-ancell)]

Thanks!

=== modified file 'configure.ac'
--- configure.ac	2011-08-09 14:43:44 +0000
+++ configure.ac	2011-08-22 16:25:17 +0000
@@ -29,6 +29,7 @@
 IT_PROG_INTLTOOL(0.35.0)
 GETTEXT_PACKAGE=unity-greeter
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", Gettext package)
+AC_SUBST(GETTEXT_PACKAGE)
 
 dnl ###########################################################################
 dnl Files to generate

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2011-07-13 03:09:52 +0000
+++ po/POTFILES.in	2011-08-22 16:25:17 +0000
@@ -1,3 +1,4 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
 src/unity-greeter.vala
+src/user-list.vala

=== modified file 'po/POTFILES.skip'
--- po/POTFILES.skip	2011-07-13 03:09:52 +0000
+++ po/POTFILES.skip	2011-08-22 16:25:17 +0000
@@ -1,1 +1,2 @@
 src/unity-greeter.c
+src/user-list.c

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2011-07-26 04:21:25 +0000
+++ src/Makefile.am	2011-08-22 16:25:17 +0000
@@ -11,6 +11,7 @@
 	$(UNITY_GREETER_CFLAGS) \
 	$(WARN_CFLAGS) \
 	-DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \
+	-DLOCALEDIR=\""$(localedir)"\" \
 	-DVERSION=\"$(VERSION)\" \
 	-DCONFIG_FILE=\""$(sysconfdir)/lightdm/unity-greeter.conf"\"
 

=== modified file 'src/config.vapi'
--- src/config.vapi	2011-07-26 00:29:18 +0000
+++ src/config.vapi	2011-08-22 16:25:17 +0000
@@ -2,6 +2,7 @@
 namespace Config
 {
   public const string GETTEXT_PACKAGE;
+  public const string LOCALEDIR;
   public const string VERSION;
   public const string CONFIG_FILE;
 }

=== modified file 'src/unity-greeter.vala'
--- src/unity-greeter.vala	2011-08-22 03:39:03 +0000
+++ src/unity-greeter.vala	2011-08-22 16:25:17 +0000
@@ -78,8 +78,8 @@
             user_list.add_entry ("alice", "Alice User", "/usr/share/backgrounds/Berries_by_Orb9220.jpg", true);
             user_list.add_entry ("bob", "Bob User", "/usr/share/backgrounds/White_flowers_by_Garuna_bor-bor.jpg");
             user_list.add_entry ("carol", "Carol User", "/usr/share/backgrounds/Bird_by_Magnus.jpg");
-            user_list.add_entry ("*guest", "Guest Account", null, true);
-            user_list.add_entry (null, "Other...");
+            user_list.add_entry ("*guest", _("Guest Account"), null, true);
+            user_list.add_entry (null, _("Other..."));
 
             user_list.add_session ("gnome", "Ubuntu");
             user_list.add_session ("gnome-shell", "GNOME");
@@ -96,8 +96,8 @@
                 user_list.add_entry (user.name, label, null);
             }
             if (greeter.has_guest_account_hint)
-                user_list.add_entry ("*guest", "Guest Account", null);
-            user_list.add_entry (null, "Other...");
+                user_list.add_entry ("*guest", _("Guest Account"), null);
+            user_list.add_entry (null, _("Other..."));
         }
 
         main_window = new Gtk.Window ();
@@ -214,7 +214,7 @@
             test_is_authenticated = false;
 
             if (user_list.selected == null)
-                show_prompt_cb ("Username:", LightDM.PromptType.QUESTION);
+                show_prompt_cb (_("Username:"), LightDM.PromptType.QUESTION);
             else if (user_list.selected == "*guest" || user_list.selected == "bob")
             {
                 test_is_authenticated = true;
@@ -223,7 +223,7 @@
             else
             {
                 test_username = user_list.selected;
-                show_prompt_cb ("Password:", LightDM.PromptType.SECRET);
+                show_prompt_cb (_("Password:"), LightDM.PromptType.SECRET);
             }
         }
         else
@@ -248,7 +248,7 @@
             {
                 debug ("username=%s", text);
                 test_username = text;
-                show_prompt_cb ("Password:", LightDM.PromptType.SECRET);
+                show_prompt_cb (_("Password:"), LightDM.PromptType.SECRET);
             }
             else
             {
@@ -335,6 +335,11 @@
         /* Disable the stupid global menubar */
         Environment.unset_variable ("UBUNTU_MENUPROXY");
 
+        /* Initialize i18n */
+        Intl.bindtextdomain (Config.GETTEXT_PACKAGE, Config.LOCALEDIR);
+        Intl.bind_textdomain_codeset (Config.GETTEXT_PACKAGE, "UTF-8");
+        Intl.textdomain (Config.GETTEXT_PACKAGE);
+
         Gtk.init (ref args);
 
         /* Set the cursor to not be the crap default */

=== modified file 'src/user-list.vala'
--- src/user-list.vala	2011-08-22 05:20:25 +0000
+++ src/user-list.vala	2011-08-22 16:25:17 +0000
@@ -129,7 +129,8 @@
         add (prompt_entry);
 
         login_button = new Gtk.Button ();
-        var label = new Gtk.Label ("<span font_size=\"large\">Login</span>");
+	string txt = "<span font_size=\"large\">" + _("Login") + "</span>";
+        var label = new Gtk.Label (txt);
         label.use_markup = true;
         label.show ();
         login_button.add (label);
@@ -216,7 +217,7 @@
         sensitive = false;
 
         error = null;
-        message = "Logging in...";
+        message = _("Logging in...");
 
         login_button.hide ();
         prompt_entry.hide ();