lightdm-gtk-greeter-team team mailing list archive

[Gunnar Hjalmarsson <gunnar.hjalmarsson@xxxxxxxxx>]

Gunnar Hjalmarsson has proposed merging lp:~gunnarhj/lightdm-gtk-greeter/default-lang into lp:lightdm-gtk-greeter.

Commit message:
* Use the system language by default (LP: #1276072).
* Replace the label "Guest Account" with "Guest Session".

Requested reviews:
  LightDM Gtk+ Greeter Development Team (lightdm-gtk-greeter-team)
Related bugs:
  Bug #1276072 in lightdm-gtk-greeter (Ubuntu): "Language selection always falls back to English"
  https://bugs.launchpad.net/ubuntu/+source/lightdm-gtk-greeter/+bug/1276072

For more details, see:
https://code.launchpad.net/~gunnarhj/lightdm-gtk-greeter/default-lang/+merge/208958

There are two reasons why I suggest that "Guest Session" is used instead of "Guest Account".

1. An "account" indicates something persistent, while a guest session is of a temporary nature per se.

2. "Guest Session" is used everywhere else - in unity-greeter, in Unity's system menu, in Ubuntu's desktop guide, in the tutorial https://help.ubuntu.com/community/CustomizeGuestSession ...
-- 
https://code.launchpad.net/~gunnarhj/lightdm-gtk-greeter/default-lang/+merge/208958
Your team LightDM Gtk+ Greeter Development Team is requested to review the proposed merge of lp:~gunnarhj/lightdm-gtk-greeter/default-lang into lp:lightdm-gtk-greeter.

=== modified file 'src/lightdm-gtk-greeter.c'
--- src/lightdm-gtk-greeter.c	2014-02-27 11:55:36 +0000
+++ src/lightdm-gtk-greeter.c	2014-03-02 09:00:56 +0000
@@ -1263,7 +1263,7 @@
 
     if (g_strcmp0 (username, "*guest") == 0)
     {
-        user_tooltip = g_strdup(_("Guest Account"));
+        user_tooltip = g_strdup(_("Guest Session"));
     }
 
     set_login_button_label (greeter, username);
@@ -1275,6 +1275,8 @@
         set_language (lightdm_user_get_language (user));
         set_session (lightdm_user_get_session (user));
     }
+    else
+        set_language (lightdm_language_get_code (lightdm_get_language ()));
     gtk_widget_set_tooltip_text (GTK_WIDGET (user_combo), user_tooltip);
     start_authentication (username);
     g_free (user_tooltip);
@@ -1848,7 +1850,7 @@
         gtk_list_store_append (GTK_LIST_STORE (model), &iter);
         gtk_list_store_set (GTK_LIST_STORE (model), &iter,
                             0, "*guest",
-                            1, _("Guest Account"),
+                            1, _("Guest Session"),
                             2, PANGO_WEIGHT_NORMAL,
                             -1);
     }