Set 24h format based on language

src/Config.vala.in

@@ -1,7 +1,7 @@
 namespace Build {
-	public const string GETTEXT_PACKAGE = "@GETTEXT_PACKAGE@";
-	public const string LANG_LIST = "@LANG_LIST@";
-	public const string PREFERRED_LANG_LIST = "@PREFERRED_LANG_LIST@";
-	public const string XKB_BASE = "@XKB_BASE@";
-	public const string ISO_CODES_LOCATION = "@ISO_CODES_LOCATION@";
+    public const string GETTEXT_PACKAGE = "@GETTEXT_PACKAGE@";
+    public const string LANG_LIST = "@LANG_LIST@";
+    public const string PREFERRED_LANG_LIST = "@PREFERRED_LANG_LIST@";
+    public const string XKB_BASE = "@XKB_BASE@";
+    public const string ISO_CODES_LOCATION = "@ISO_CODES_LOCATION@";
 }

src/Helpers/AccountsServiceInterface.vala

@@ -7,6 +7,7 @@ public interface Installer.AccountsService : Object {
 
     public abstract KeyboardLayout[] keyboard_layouts { owned get; set; }
     public abstract uint active_keyboard_layout { get; set; }
+    public abstract string clock_format { owned get; set; }
     public abstract bool left_handed { get; set; }
 }
 

src/Helpers/LocationHelper.vala

@@ -0,0 +1,164 @@
+// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
+/*-
+ * Copyright (c) 2014 Pantheon Developers (http://launchpad.net/switchboard-plug-datetime)
+ *
+ * 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 3 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, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Corentin Noël <corentin@elementaryos.org>
+ */
+
+public class LocationHelper : GLib.Object {
+    [DBus (name = "org.freedesktop.timedate1")]
+    public interface DateTime1 : Object {
+        public abstract string Timezone {public owned get;}
+        public abstract bool LocalRTC {public get;}
+        public abstract bool CanNTP {public get;}
+        public abstract bool NTP {public get;}
+
+        //usec_utc expects number of microseconds since 1 Jan 1970 UTC
+        public abstract void set_time (int64 usec_utc, bool relative, bool user_interaction) throws GLib.Error;
+        public abstract void set_timezone (string timezone, bool user_interaction) throws GLib.Error;
+        public abstract void SetLocalRTC (bool local_rtc, bool fix_system, bool user_interaction) throws GLib.Error; //vala-lint=naming-convention
+        public abstract void SetNTP (bool use_ntp, bool user_interaction) throws GLib.Error; //vala-lint=naming-convention
+    }
+
+    private static List<string> lines;
+    private static LocationHelper? helper = null;
+
+    public static LocationHelper get_default () {
+        if (helper == null)
+            helper = new LocationHelper ();
+        return helper;
+    }
+    private LocationHelper () {
+        var file = File.new_for_path ("/usr/share/zoneinfo/zone.tab");
+        if (!file.query_exists ()) {
+            critical ("/usr/share/zoneinfo/zone.tab doesn't exist !");
+            return;
+        }
+
+        lines = new List<string> ();
+        try {
+            var dis = new DataInputStream (file.read ());
+            string line;
+            while ((line = dis.read_line (null)) != null) {
+                if (line.has_prefix ("#")) {
+                    continue;
+                }
+
+                lines.append (line);
+            }
+        } catch (Error e) {
+            critical (e.message);
+        }
+#if GENERATE
+        generate_translation_template ();
+#endif
+    }
+
+    public HashTable<string, string> get_timezones_from_continent (string continent) {
+        var timezones = new HashTable<string, string> (str_hash, str_equal);
+        foreach (var line in lines) {
+            var items = line.split ("\t", 4);
+            string value = items[2];
+            if (value.has_prefix (continent) == false)
+                continue;
+
+            string tz_name_field;
+            // Take the original English string if there is something wrong with the translation
+            if (_(items[2]) == null || _(items[2]) == "") {
+                tz_name_field = items[2];
+            } else {
+                tz_name_field = _(items[2]);
+            }
+
+            string city = tz_name_field.split ("/", 2)[1];
+            if (city != null && city != "") {
+                string key = format_city (city);
+                if (items[3] != null && items[3] != "") {
+                    if (items[3] != "mainland" && items[3] != "most locations" && _(items[3]) != key) {
+                        key = "%s - %s".printf (key, format_city (_(items[3])));
+                    }
+                }
+
+                timezones.set (key, value);
+            }
+        }
+
+        return timezones;
+    }
+
+    public string? get_countrycode_from_timezone (string timezone) {
+        foreach (var line in lines) {
+            var items = line.split ("\t", 4);
+            string value = items[2];
+
+            if (value == timezone) {
+                return items[0];
+            }
+        }
+
+        return null;
+    }
+
+    public HashTable<string, string> get_locations () {
+        var locations = new HashTable<string, string> (str_hash, str_equal);
+        foreach (var line in lines) {
+            var items = line.split ("\t", 4);
+            string key = items[1];
+            string value = items[2];
+            locations.set (key, value);
+        }
+
+        return locations;
+    }
+
+    public static string format_city (string city) {
+        return city.replace ("_", " ").replace ("/", ", ");
+    }
+
+    public static string get_clock_format () {
+        var t_fmt = Posix.nl_langinfo (Posix.NLItem.T_FMT);
+
+        if (t_fmt.contains ("%r") || t_fmt.contains ("%l") || t_fmt.contains ("%I")) {
+            return "12h";
+        }
+
+        return "24h";
+    }
+
+#if GENERATE
+    public void generate_translation_template () {
+        var file = GLib.File.new_for_path (GLib.Environment.get_home_dir () + "/Translations.vala");
+        try {
+            var dos = new GLib.DataOutputStream (file.create (GLib.FileCreateFlags.REPLACE_DESTINATION));
+            dos.put_string ("#if 0\n");
+            foreach (var line in lines) {
+                var items = line.split ("\t", 4);
+                string key = items[2];
+                string comment = items[3];
+                dos.put_string ("///Translators: Secondary \"/\" and all \"_\" will be replaced by \", \" and \" \".\n");
+                dos.put_string ("_(\""+ key + "\");\n");
+                if (comment != null && comment != "") {
+                    dos.put_string ("///Translators: Comment for Timezone %s\n".printf (key));
+                    dos.put_string ("_(\""+ comment + "\");\n");
+                }
+            }
+            dos.put_string ("#endif\n");
+        } catch (Error e) {
+            critical (e.message);
+        }
+    }
+#endif
+}

src/MainWindow.vala

@@ -22,6 +22,7 @@ public class Installer.MainWindow : Hdy.Window {
 
     private AccountView account_view;
     private LanguageView language_view;
+    private LocationView location_view;
     private KeyboardLayoutView keyboard_layout_view;
     private NetworkView network_view;
 
@@ -82,20 +83,69 @@ public class Installer.MainWindow : Hdy.Window {
             deck.add (network_view);
             deck.visible_child = network_view;
 
-            network_view.next_step.connect (load_account_view);
+            network_view.next_step.connect (load_location_view);
         } else {
-            load_account_view ();
+            load_location_view ();
         }
     }
 
+    private void load_location_view () {
+        if (location_view != null) {
+            location_view.destroy ();
+        }
+
+        location_view = new LocationView ();
+        deck.add (location_view);
+        deck.visible_child = location_view;
+
+        location_view.next_step.connect (() => load_account_view ());
+    }
+
     private void load_account_view () {
         if (account_view != null) {
             account_view.destroy ();
         }
 
         account_view = new AccountView ();
-
         deck.add (account_view);
         deck.visible_child = account_view;
     }
+
+    private async void set_timezone () {
+        try {
+            LocationHelper.DateTime1 datetime1 = yield Bus.get_proxy (BusType.SYSTEM, "org.freedesktop.timedate1", "/org/freedesktop/timedate1");
+            unowned Configuration configuration = Configuration.get_default ();
+            datetime1.set_timezone (configuration.timezone, true);
+        } catch (Error e) {
+            warning (e.message);
+        }
+    }
+
+    private async void set_clock_format () {
+        AccountsService accounts_service = null;
+
+        try {
+            var act_service = yield GLib.Bus.get_proxy<FDO.Accounts> (GLib.BusType.SYSTEM,
+                                                                      "org.freedesktop.Accounts",
+                                                                      "/org/freedesktop/Accounts");
+            var user_path = act_service.find_user_by_name (account_view.created.user_name);
+
+            accounts_service = yield GLib.Bus.get_proxy (GLib.BusType.SYSTEM,
+                                                        "org.freedesktop.Accounts",
+                                                        user_path,
+                                                        GLib.DBusProxyFlags.GET_INVALIDATED_PROPERTIES);
+        } catch (Error e) {
+            warning ("Unable to get AccountsService proxy, clock format on new user may be incorrect: %s", e.message);
+        }
+
+        if (accounts_service != null) {
+            accounts_service.clock_format = Configuration.get_default ().clock_format;
+        }
+    }
+
+    private async void set_settings () {
+        yield set_accounts_service_settings ();
+        yield set_timezone ();
+        yield set_clock_format ();
+    }
 }

src/Objects/Configuration.vala

@@ -32,5 +32,7 @@ public class Configuration : GLib.Object {
     public string? country { get; set; default = null; }
     public InitialSetup.KeyboardLayout keyboard_layout { get; set; }
     public InitialSetup.KeyboardVariant? keyboard_variant { get; set; default = null; }
+    public string timezone { get; set; }
+    public string clock_format { get; set; default = "24h"; }
     public bool left_handed { get; set; }
 }

src/Objects/LocationLayout.vala

@@ -0,0 +1,87 @@
+/*-
+ * Copyright 2019 elementary, Inc (https://elementary.io)
+ *
+ * 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 3 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, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Corentin Noël <corentin@elementary.io>
+ */
+
+public class InitialSetup.LocationLayout : GLib.Object {
+    public string name { get; construct; }
+    public string original_name { get; construct; }
+    public string display_name {
+        get {
+            return name;
+        }
+    }
+
+    private GLib.ListStore variants_store;
+
+    public LocationLayout (string name, string original_name) {
+        Object (name: name, original_name: original_name);
+    }
+
+    construct {
+        variants_store = new GLib.ListStore (typeof (LocationVariant));
+        variants_store.append (new LocationVariant (this, null, null));
+    }
+
+    public void add_variant (string name, string original_name) {
+        var variant = new LocationVariant (this, name, original_name);
+        variants_store.insert_sorted (variant, (GLib.CompareDataFunc<GLib.Object>) LocationVariant.compare);
+    }
+
+    public bool has_variants () {
+        return variants_store.get_n_items () > 1;
+    }
+
+    public unowned GLib.ListStore get_variants () {
+        return variants_store;
+    }
+
+    public GLib.Variant to_gsd_variant () {
+        return new GLib.Variant ("(ss)", "xkb", name);
+    }
+
+    public static int compare (LocationLayout a, LocationLayout b) {
+        return a.display_name.collate (b.display_name);
+    }
+
+    public static GLib.ListStore get_all () {
+        var layout_store = new GLib.ListStore (typeof (LocationLayout));
+
+        var continents = new List<string> ();
+        continents.append ("Africa");
+        continents.append ("America");
+        continents.append ("Antarctica");
+        continents.append ("Asia");
+        continents.append ("Atlantic");
+        continents.append ("Australia");
+        continents.append ("Europe");
+        continents.append ("Indian");
+        continents.append ("Pacific");
+
+        continents.foreach ((continent) => {
+            var layout = new LocationLayout (_(continent), continent);
+            layout_store.insert_sorted (layout, (GLib.CompareDataFunc<GLib.Object>) LocationLayout.compare);
+
+            var timezones = LocationHelper.get_default ().get_timezones_from_continent (continent);
+            timezones.foreach ((city, timezone) => {
+                layout.add_variant (_(city), timezone);
+            });
+        });
+
+        return layout_store;
+    }
+}