Enhancement: Select First Day of Week for Locale

data/io.elementary.switchboard.locale.gschema.xml

@@ -1,11 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <schemalist>
+	<enum id='first-day'>
+		<value nick='Sunday' value='0'/>
+		<value nick='Monday' value='1'/>
+		<value nick='Friday' value='2'/>
+		<value nick='Saturday' value='3'/>
+	</enum>
 	<schema path="/io/elementary/switchboard/locale/" id="io.elementary.switchboard.locale">
 		<key name="input-selections" type="a(ss)">
 			<default>[]</default>
 			<summary>Saves selected input sources per language.</summary>
 			<description>Saves selected input sources per language.</description>
 		</key>
-
+		<key name='week-start-day-name' enum='first-day'>
+			<default>'Sunday'</default>
+			<summary>Saves the First Day of the Week for use in locale settings such as a calendar display.</summary>
+			<description>Saves the First Day of the Week for use in locale settings such as a calendar display.</description>
+		</key>
 	</schema>
 </schemalist>

src/LocaleManager.vala

@@ -19,6 +19,7 @@ public interface AccountProxy : GLib.Object {
     public abstract void set_formats_locale (string formats_locale) throws GLib.Error;
     public abstract void set_language (string language) throws GLib.Error;
     public abstract string formats_locale { owned get; }
+    public abstract string first_day { owned get; }
     public abstract string language { owned get; }
 }
 
@@ -127,6 +128,14 @@ namespace SwitchboardPlugLocale {
             return account_proxy.formats_locale;
         }
 
+        public void set_user_first_day (int first_day) {
+            settings.set_enum ("week-start-day-name", first_day.clamp (0, 6));
+        }
+
+        public int get_user_first_day () {
+            return settings.get_enum ("week-start-day-name");
+        }
+
         private void localectl_set_locale (string locale, string? format = null) throws GLib.Error {
             debug ("setting system-wide locale via localectl");
             if (Utils.get_permission ().allowed) {

src/Widgets/LocaleSetting.vala

@@ -19,16 +19,20 @@ namespace SwitchboardPlugLocale.Widgets {
         private Gtk.Button set_button;
         private Gtk.ComboBox format_combobox;
         private Gtk.ComboBox region_combobox;
+        private Gtk.ComboBox first_day_combobox;
         private Gtk.ListStore format_store;
         private Gtk.ListStore region_store;
+        private Gtk.ListStore first_day_store;
 
         private LocaleManager lm;
         private Preview preview;
         private string language;
         private string selected_language = "";
         private string selected_format = "";
+        private int selected_first_day;
         private bool has_region;
         private EndLabel region_endlabel;
+        private EndLabel first_day_endlabel;
 
         private static GLib.Settings? temperature_settings = null;
 
@@ -62,26 +66,40 @@ namespace SwitchboardPlugLocale.Widgets {
             format_combobox.changed.connect (compare);
             format_combobox.active = 0;
 
+            first_day_store = new Gtk.ListStore (2, typeof (string), typeof (int));
+
+            first_day_combobox = new Gtk.ComboBox.with_model (first_day_store);
+            first_day_combobox.pack_start (renderer, true);
+            first_day_combobox.add_attribute (renderer, "text", 0);
+            first_day_combobox.active = lm.get_user_first_day ();
+            first_day_combobox.changed.connect (() => {
+                lm.set_user_first_day (first_day_combobox.active);
+                compare ();
+            });
+
             preview = new Preview ();
             preview.margin_bottom = 12;
             preview.margin_top = 12;
 
             region_endlabel = new EndLabel (_("Region: "));
+            first_day_endlabel = new EndLabel (_("First Day of Week:"));
 
             content_area.halign = Gtk.Align.CENTER;
             content_area.attach (region_endlabel, 0, 2, 1, 1);
             content_area.attach (region_combobox, 1, 2, 1, 1);
             content_area.attach (new EndLabel (_("Formats: ")), 0, 3, 1, 1);
             content_area.attach (format_combobox, 1, 3, 1, 1);
-            content_area.attach (preview, 0, 5, 2, 1);
+            content_area.attach (first_day_endlabel, 0, 4, 1, 1);
+            content_area.attach (first_day_combobox, 1, 4, 1, 1);
+            content_area.attach (preview, 0, 6, 2, 1);
 
             if (temperature_settings != null) {
                 var temperature = new Granite.Widgets.ModeButton ();
                 temperature.append_text (_("Celsius"));
                 temperature.append_text (_("Fahrenheit"));
 
-                content_area.attach (new EndLabel (_("Temperature:")), 0, 4, 1, 1);
-                content_area.attach (temperature, 1, 4, 1, 1);
+                content_area.attach (new EndLabel (_("Temperature:")), 0, 5, 1, 1);
+                content_area.attach (temperature, 1, 5, 1, 1);
 
                 var temp_setting = temperature_settings.get_string ("temperature-unit");
 
@@ -311,6 +329,39 @@ namespace SwitchboardPlugLocale.Widgets {
             compare ();
         }
 
+        public void reload_first_day () {
+            Gee.ArrayList<string>? first_days = new Gee.ArrayList<string> ();
+            // As per real world data, First Day option in many countries boils down to these 4 options.
+            first_days.add (_("Sunday"));
+            first_days.add (_("Monday"));
+            first_days.add (_("Friday"));
+            first_days.add (_("Saturday"));
+            first_day_store.clear ();
+            var user_first_day = lm.get_user_first_day ();
+            int first_day_id = 0;
+
+            int i = 0;
+            foreach (var first_day in first_days) {
+                var iter = Gtk.TreeIter ();
+                first_day_store.append (out iter);
+                first_day_store.set (iter, 0, first_day, 1, first_days.index_of (first_day));
+
+                if (first_days.index_of (first_day) == user_first_day) {
+                    first_day_id = i;
+                }
+
+                i++;
+            }
+            first_day_combobox.sensitive = i != 1; // set to unsensitive if only have one item
+            first_day_combobox.active = user_first_day;
+
+            if (selected_first_day == 0) {
+                selected_first_day = user_first_day;
+            }
+
+            compare ();
+        }
+
         public void reload_labels (string language) {
             title = Utils.translate (language, null);
         }

src/Widgets/LocaleView.vala

@@ -76,7 +76,8 @@ namespace SwitchboardPlugLocale.Widgets {
                 var regions = Utils.get_regions (selected_language_code);
 
                 debug ("reloading Settings widget for language '%s'".printf (selected_language_code));
-                locale_setting.reload_regions (selected_language_code, regions);
+                locale_setting.reload_regions.begin (selected_language_code, regions);
+                locale_setting.reload_first_day ();
                 locale_setting.reload_labels (selected_language_code);
 
                 if (selected_language_code == locale_manager.get_user_language ().slice (0, 2)) {