Merge lp:~embik/switchboard-plug-locale/refine-localectl-call into lp:~elementary-apps/switchboard-plug-locale/trunk

[Marvin Beckers]

Refine procedure to set system-wide locale settings

[Danielle Foré (danrabbit)]

review: Needs Fixing

[Zisu Andrei (matzipan)]

Hey Marvin,

This seems to be a quick fix and it's good to merge. Care to push the change?

Unmerged revisions

171. By Marvin Beckers on 2015-11-29

Refine procedure to set system-wide locale settings which includes the parameters expected by localectl_set_locale and the accuracy of debug messages

=== modified file 'src/LocaleManager.vala'
--- src/LocaleManager.vala	2015-11-29 18:25:11 +0000
+++ src/LocaleManager.vala	2015-11-29 18:58:05 +0000
@@ -264,7 +264,7 @@
          * user related stuff
          */
         public void set_user_language (string language) {
-            debug("Setting user language to %s", language);
+            debug("Setting user language to '%s'", language);
 
             try {
                 account_proxy.set_language (language);
@@ -278,7 +278,7 @@
         }
 
         public void set_user_format (string language) {
-            debug("Setting user format to %s", language);
+            debug("Setting user format to '%s'", language);
 
             try {
                 account_proxy.set_formats_locale (language);
@@ -339,7 +339,10 @@
         }
 
         private void localectl_set_locale (string locale, string? format = null) throws GLib.Error {
-            debug ("setting system-wide locale via localectl");
+            debug ("Setting system-wide language to '%s'".printf (locale));
+            if (format != null)
+                debug ("Setting system-wide format to '%s'".printf (format));
+
             if (Utils.get_permission ().allowed) {
                 string output;
                 int status;
@@ -349,7 +352,7 @@
                 try {
                     if (format == null) {
                         Process.spawn_sync (null,
-                            {"pkexec", cli, command, locale},
+                            {"pkexec", cli, command, "LANG=%s".printf (locale)},
                             Environ.get (),
                             SpawnFlags.SEARCH_PATH,
                             null, out output,
@@ -358,9 +361,9 @@
                             critical ("localectl failed to set locale");
                     } else {
                         Process.spawn_sync (null,
-                            {"pkexec", cli, command, locale, "LC_TIME=%s".printf (format),
-                             "LC_NUMERIC=%s".printf (format), "LC_MONETARY=%s".printf (format),
-                             "LC_MEASUREMENT=%s".printf (format)},
+                            {"pkexec", cli, command, "LANG=%s".printf (locale),
+                             "LC_TIME=%s".printf (format), "LC_NUMERIC=%s".printf (format),
+                             "LC_MONETARY=%s".printf (format), "LC_MEASUREMENT=%s".printf (format)},
                             Environ.get (),
                             SpawnFlags.SEARCH_PATH,
                             null, out output,
@@ -425,9 +428,9 @@
 
             try {
                 if (language.length == 2)
-                    localectl_set_locale ("LANG=%s.UTF-8".printf (Utils.get_default_for_lang (language)), format);
+                    localectl_set_locale ("%s.UTF-8".printf (Utils.get_default_for_lang (language)), format);
                 else
-                    localectl_set_locale ("LANG=%s.UTF-8".printf (language), format);
+                    localectl_set_locale ("%s.UTF-8".printf (language), format);
                 //locale_proxy.set_locale (list.to_array (), true);
             } catch (Error e) {
                 warning (e.message);

=== modified file 'src/Widgets/LocaleSetting.vala'
--- src/Widgets/LocaleSetting.vala	2015-07-14 12:09:24 +0000
+++ src/Widgets/LocaleSetting.vala	2015-11-29 18:58:05 +0000
@@ -92,12 +92,10 @@
 
             set_button.clicked.connect (() => {
                 if (!has_region) {
-                    debug ("Setting user language to '%s'", language);
                     lm.set_user_language (language);
                     selected_language = language;
                 } else {
                     var region = get_region ();
-                    debug ("Setting user language to '%s_%s'", language, region);
                     lm.set_user_language ("%s_%s".printf (language, region));
                     selected_language = "%s_%s".printf (language, region);
                 }
@@ -267,13 +265,11 @@
         }
 
         private void on_applied_to_system () {
-            if (!has_region) {
-                debug ("Setting system language to '%s' and format to '%s'", language, get_format ());
+            if (!has_region)
                 lm.apply_to_system (language, get_format ());
-            } else {
-                debug ("Setting system language to '%s_%s' and format to '%s'", language, get_region (), get_format ());
+            else
                 lm.apply_to_system ("%s_%s".printf (language, get_region ()), get_format ());
-            }
+
             settings_changed ();
         }
     }