Merge lp:~jeremywootten/pantheon-files/fix-1633862-honor-24h-clock into lp:~elementary-apps/pantheon-files/trunk

[Jeremy Wootten]

* Display "iso" format when this is selected in settings
* Honor 12/24hr setting when "informal" is the date-time format
* clean up the code for gof-preferences and global-preferences

This branches fixes a couple of issues with the date-time formatting.

* Displays "iso" format when this is selected in settings
* Honors the gnome-interface setting of clock-format when "informal" is selected as the date-time format.

Also the opportunity was taken to clean up the code for gof-preferences and global-preferences.

[lp:~jeremywootten/pantheon-files/fix-1633862-honor-24h-clock]

2523. By Jeremy Wootten on 2017-03-10

Use explicit translatable datetime formats

[Danielle Foré (danrabbit)]

Looks like some good cleanup and I can confirm that the 12/24hr time setting is now respected. Nice work :)

review: Approve

=== modified file 'libcore/FileUtils.vala'
--- libcore/FileUtils.vala	2017-02-26 04:50:36 +0000
+++ libcore/FileUtils.vala	2017-03-10 17:31:58 +0000
@@ -357,52 +357,46 @@
         });
     }
 
-    public string get_formatted_time_attribute_from_info (GLib.FileInfo info, string attr, string format = "locale") {
+    public string get_formatted_time_attribute_from_info (GLib.FileInfo info, string attr) {
+        DateTime? dt = null;
+
         switch (attr) {
             case FileAttribute.TIME_MODIFIED:
             case FileAttribute.TIME_CREATED:
             case FileAttribute.TIME_ACCESS:
             case FileAttribute.TIME_CHANGED:
                 uint64 t = info.get_attribute_uint64 (attr);
-                if (t == 0) {
-                    return "";
-                }
-
-                DateTime dt = new DateTime.from_unix_local ((int64)t);
-
-                if (dt == null) {
-                    return "";
-                }
-
-                return get_formatted_date_time (dt, format);
+                if (t > 0) {
+                    dt = new DateTime.from_unix_local ((int64)t);
+                }
+
+                break;
 
             case FileAttribute.TRASH_DELETION_DATE:
                 var deletion_date = info.get_attribute_string (attr);
                 var tv = TimeVal ();
-                if (deletion_date == null || !tv.from_iso8601 (deletion_date)) {
-                    return "";
-                }
-
-                DateTime dt = new DateTime.from_timeval_local (tv);
-
-                if (dt == null) {
-                    return "";
-                }
-
-                return get_formatted_date_time (dt, format);
+                if (deletion_date != null && !tv.from_iso8601 (deletion_date)) {
+                    dt = new DateTime.from_timeval_local (tv);
+                }
+
+                break;
 
             default:
                 break;
         }
 
-        return "";
+        return get_formatted_date_time (dt);
     }
 
-    public string get_formatted_date_time (DateTime dt, string format = "locale") {
-        switch (format) {
+    public string get_formatted_date_time (DateTime? dt) {
+        if (dt == null) {
+            return "";
+        }
+
+        switch (GOF.Preferences.get_default ().date_format.down ()) {
             case "locale":
                 return dt.format ("%c");
-            case "ISO" :
+            case "iso" :
                 return dt.format ("%Y-%m-%d %H:%M:%S");
             default:
                 return get_informal_date_time (dt);
@@ -430,39 +424,39 @@
         int now_weekday = now.get_day_of_week ();
         int disp_weekday = dt.get_day_of_week ();
 
+        bool clock_is_24h = GOF.Preferences.get_default ().clock_format.has_prefix ("24");
+
+        string format_string = "";
+
         switch (now_weekday - disp_weekday) {
             case 0:
-            /* TRANSLATORS: This string determines the format and order in which the day and time
-             * are shown informally for a time that occurred today.
-             * %-I expands to the numeric hour in 12 hour clock.
-             * %M expands to the numeric minute.
-             * %p expands to "am" or "pm" according to the locale. 
-             * These components must not be altered, but their order may be changed to accord with
-             * the informal custom for the locale.
-             */ 
-                return dt.format (_("Today at %-I:%M %p"));
+                if (clock_is_24h) {
+                    format_string = _("Today at %-H:%M"); ///TRANSLATORS Used when 24h clock has been selected
+                } else {
+                    format_string = _("Today at %-I:%M %p"); ///TRANSLATORS Used when 12h clock has been selected (if available))
+                }
+
+                break;
             case 1:
-            /* TRANSLATORS: This string determines the format and order in which the day and time
-             * are shown informally for a time that occurred yesterday.
-             * %-I expands to the numeric hour in 12 hour clock.
-             * %M expands to the numeric minute.
-             * %p expands to "am" or "pm" according to the locale. 
-             * These components must not be altered, but their order may be changed to accord with
-             * the informal custom for the locale.
-             */ 
-                return dt.format (_("Yesterday at %-I:%M %p"));
+                if (clock_is_24h) {
+                    format_string = _("Yesterday at %-H:%M"); ///TRANSLATORS Used when 24h clock has been selected
+                } else {
+                    format_string = _("Yesterday at %-I:%M %p"); ///TRANSLATORS Used when 12h clock has been selected (if available))
+                }
+
+                break;
+
             default:
-            /* TRANSLATORS: This string determines the format and order in which the day and time
-             * are shown informally for a time that occurred in the past week.
-             * %-I expands to the numeric hour in 12 hour clock.
-             * %M expands to the numeric minute.
-             * %p expands to "am" or "pm" according to the locale.
-             * %A expands to the abbreviated name of the weekday according to the locale.   
-             * These components must not be altered, but their order may be changed to accord with
-             * the informal custom for the locale.
-             */ 
-                return dt.format (_("%A at %-I:%M %p"));
+                if (clock_is_24h) {
+                    format_string = _("%A at %-H:%M"); ///TRANSLATORS Used when 24h clock has been selected
+                } else {
+                    format_string = _("%A at %-I:%M %p"); ///TRANSLATORS Used when 12h clock has been selected (if available))
+                }
+
+                break;
         }
+
+        return dt.format (format_string);
     }
 
     private bool can_browse_scheme (string scheme) {

=== modified file 'libcore/gof-directory-async.vala'
--- libcore/gof-directory-async.vala	2017-02-26 04:50:36 +0000
+++ libcore/gof-directory-async.vala	2017-03-10 17:31:58 +0000
@@ -533,7 +533,7 @@
         debug ("Listing cached files");  /* Required for ctest */
 
         state = State.LOADING;
-        bool show_hidden = is_trash || Preferences.get_default ().pref_show_hidden_files;
+        bool show_hidden = is_trash || Preferences.get_default ().show_hidden_files;
         foreach (GOF.File gof in file_hash.get_values ()) {
             if (gof != null) {
                 after_load_file (gof, show_hidden, file_loaded_func);
@@ -571,7 +571,7 @@
         can_load = true;
         files_count = 0;
         state = State.LOADING;
-        bool show_hidden = is_trash || Preferences.get_default ().pref_show_hidden_files;
+        bool show_hidden = is_trash || Preferences.get_default ().show_hidden_files;
         bool server_responding = false;
 
         debug ("(Re)loading folder children"); /* Required for ctest */
@@ -712,7 +712,7 @@
     public void update_files () {
         foreach (GOF.File gof in file_hash.get_values ()) {
             if (gof != null && gof.info != null
-                && (!gof.is_hidden || Preferences.get_default ().pref_show_hidden_files))
+                && (!gof.is_hidden || Preferences.get_default ().show_hidden_files))
 
                 gof.update ();
         }
@@ -721,7 +721,7 @@
     public void update_desktop_files () {
         foreach (GOF.File gof in file_hash.get_values ()) {
             if (gof != null && gof.info != null
-                && (!gof.is_hidden || Preferences.get_default ().pref_show_hidden_files)
+                && (!gof.is_hidden || Preferences.get_default ().show_hidden_files)
                 && gof.is_desktop)
 
                 gof.update_desktop_file ();
@@ -793,7 +793,7 @@
 
         gof.update ();
 
-        if (!gof.is_hidden || Preferences.get_default ().pref_show_hidden_files) {
+        if (!gof.is_hidden || Preferences.get_default ().show_hidden_files) {
             file_changed (gof);
             gof.changed ();
         }
@@ -811,7 +811,7 @@
 
         gof.update ();
 
-        if ((!gof.is_hidden || Preferences.get_default ().pref_show_hidden_files)) {
+        if ((!gof.is_hidden || Preferences.get_default ().show_hidden_files)) {
             file_added (gof);
         }
 
@@ -838,7 +838,7 @@
     }
 
     private void notify_file_removed (GOF.File gof) {
-        if (!gof.is_hidden || Preferences.get_default ().pref_show_hidden_files) {
+        if (!gof.is_hidden || Preferences.get_default ().show_hidden_files) {
             file_deleted (gof);
         }
 

=== modified file 'libcore/gof-file.c'
--- libcore/gof-file.c	2017-02-26 04:50:36 +0000
+++ libcore/gof-file.c	2017-03-10 17:31:58 +0000
@@ -144,8 +144,9 @@
     if (file->directory != NULL) {
         dir = gof_directory_async_cache_lookup (file->directory);
         if (dir != NULL) {
-            if (!file->is_hidden || gof_preferences_get_default ()->pref_show_hidden_files)
+            if (!file->is_hidden || gof_preferences_get_show_hidden_files (gof_preferences_get_default ())) {
                 g_signal_emit_by_name (dir, "icon_changed", file);
+            }
 
             g_object_unref (dir);
         }
@@ -695,7 +696,7 @@
     _g_object_unref0 (file->pix);
     /* make sure we always got a non null pixbuf of the specified size */
     file->pix = gof_file_get_icon_pixbuf (file, size,
-                                          gof_preferences_get_default ()->pref_force_icon_size,
+                                          gof_preferences_get_force_icon_size (gof_preferences_get_default ()),
                                           GOF_FILE_ICON_FLAGS_USE_THUMBNAILS);
     file->pix_size = size;
 }
@@ -1409,9 +1410,7 @@
     g_return_val_if_fail (file != NULL, NULL);
     g_return_val_if_fail (file->info != NULL, NULL);
 
-    return pf_file_utils_get_formatted_time_attribute_from_info (file->info,
-                                                                 attr,
-                                                                 gof_preferences_get_default ()->pref_date_format);
+    return pf_file_utils_get_formatted_time_attribute_from_info (file->info, attr);
 }
 
 

=== modified file 'libcore/gof-preferences.vala'
--- libcore/gof-preferences.vala	2017-02-10 19:35:18 +0000
+++ libcore/gof-preferences.vala	2017-03-10 17:31:58 +0000
@@ -23,57 +23,18 @@
 
         public const string TAGS_COLORS[10] = { null, "#fce94f", "#fcaf3e", "#997666", "#8ae234", "#729fcf", "#ad7fa8", "#ef2929", "#d3d7cf", "#888a85" };
 
-        public bool pref_show_hidden_files = false;
-        public bool show_hidden_files {
-            get {
-                return pref_show_hidden_files;
-            }
-            set {
-                pref_show_hidden_files = value;
-            }
-        }
-
+        public bool show_hidden_files {get; set; default=false;}
         public bool show_remote_thumbnails {set; get; default=false;}
-
-        public bool pref_confirm_trash = true;
-        public bool confirm_trash {
-            get {
-                return pref_confirm_trash;
-            }
-            set {
-                pref_confirm_trash = value;
-            }
-        }
-
-        public bool pref_force_icon_size = true;
-        public bool force_icon_size {
-            get {
-                return pref_force_icon_size;
-            }
-            set {
-                pref_force_icon_size = value;
-            }
-        }
-
-        public string pref_date_format = "iso";
-        public string date_format {
-            get {
-                return pref_date_format;
-            }
-            set {
-                pref_date_format = value;
-            }
-        }
-
-        public class Preferences () {
-
-        }
+        public bool confirm_trash {set; get; default=true;}
+        public bool force_icon_size {set; get; default=true;}
+        public string date_format {set; get; default="iso";}
+        public string clock_format {set; get; default="24h";}
 
         public static Preferences get_default () {
-            if (preferences != null)
-                return preferences;
+            if (preferences == null) {
+                preferences = new Preferences ();
+            }
 
-            preferences = new Preferences ();
             return preferences;
         }
     }

=== modified file 'libcore/marlin-file-operations.c'
--- libcore/marlin-file-operations.c	2017-02-10 19:35:18 +0000
+++ libcore/marlin-file-operations.c	2017-03-10 17:31:58 +0000
@@ -1361,7 +1361,7 @@
 static gboolean
 should_confirm_trash (void)
 {
-    return gof_preferences_get_default ()->pref_confirm_trash;
+    return gof_preferences_get_confirm_trash (gof_preferences_get_default ());
 }
 
 static gboolean

=== modified file 'libwidgets/View/SearchResults.vala'
--- libwidgets/View/SearchResults.vala	2017-01-13 13:31:06 +0000
+++ libwidgets/View/SearchResults.vala	2017-03-10 17:31:58 +0000
@@ -241,7 +241,7 @@
                 return;
             }
 
-            var include_hidden = GOF.Preferences.get_default ().pref_show_hidden_files;
+            var include_hidden = GOF.Preferences.get_default ().show_hidden_files;
 
             display_count = 0;
             directory_queue = new Gee.LinkedList<File> ();

=== modified file 'plugins/pantheon-files-ctags/plugin.vala'
--- plugins/pantheon-files-ctags/plugin.vala	2017-01-14 13:09:47 +0000
+++ plugins/pantheon-files-ctags/plugin.vala	2017-03-10 17:31:58 +0000
@@ -287,7 +287,7 @@
         return_if_fail (file != null);
 
         if (!ignore_dir && file.info != null &&
-            (!file.is_hidden || GOF.Preferences.get_default ().pref_show_hidden_files)) {
+            (!file.is_hidden || GOF.Preferences.get_default ().show_hidden_files)) {
  
             if (file.location.has_uri_scheme ("recent")) {
                 rreal_update_file_info_for_recent.begin (file, file.get_display_target_uri ());

=== modified file 'src/Application.vala'
--- src/Application.vala	2017-02-02 11:37:26 +0000
+++ src/Application.vala	2017-03-10 17:31:58 +0000
@@ -252,6 +252,7 @@
         Preferences.marlin_icon_view_settings = new Settings ("org.pantheon.files.icon-view");
         Preferences.marlin_list_view_settings = new Settings ("org.pantheon.files.list-view");
         Preferences.marlin_column_view_settings = new Settings ("org.pantheon.files.column-view");
+        Preferences.gnome_interface_settings = new Settings ("org.gnome.desktop.interface");
 
         /* Bind settings with GOFPreferences */
         Preferences.settings.bind ("show-hiddenfiles",
@@ -264,6 +265,8 @@
                                    GOF.Preferences.get_default (), "date-format", GLib.SettingsBindFlags.DEFAULT);
         Preferences.settings.bind ("force-icon-size",
                                    GOF.Preferences.get_default (), "force-icon-size", GLib.SettingsBindFlags.DEFAULT);
+        Preferences.gnome_interface_settings.bind ("clock-format",
+                                   GOF.Preferences.get_default (), "clock-format", GLib.SettingsBindFlags.GET);
     }
 
     private void open_windows (File[]? files) {

=== modified file 'src/marlin-global-preferences.h'
--- src/marlin-global-preferences.h	2017-02-10 19:35:18 +0000
+++ src/marlin-global-preferences.h	2017-03-10 17:31:58 +0000
@@ -21,12 +21,5 @@
 GSettings  *marlin_icon_view_settings;
 GSettings  *marlin_list_view_settings;
 GSettings  *marlin_column_view_settings;
-GSettings   *gnome_mouse_settings;
-
-#define MARLIN_PREFERENCES_DATE_FORMAT                      "date-format"
-#define MARLIN_PREFERENCES_SIDEBAR_CAT_PERSONAL_EXPANDER    "sidebar-cat-personal-expander"
-#define MARLIN_PREFERENCES_SIDEBAR_CAT_DEVICES_EXPANDER     "sidebar-cat-devices-expander"
-#define MARLIN_PREFERENCES_SIDEBAR_CAT_NETWORK_EXPANDER     "sidebar-cat-network-expander"
-#define MARLIN_PREFERENCES_CONFIRM_TRASH                    "confirm-trash"
-
+GSettings  *gnome_interface_settings;
 #endif

=== modified file 'src/marlin.vapi'
--- src/marlin.vapi	2016-12-19 16:46:47 +0000
+++ src/marlin.vapi	2017-03-10 17:31:58 +0000
@@ -6,7 +6,7 @@
     public GLib.Settings marlin_icon_view_settings;
     public GLib.Settings marlin_list_view_settings;
     public GLib.Settings marlin_column_view_settings;
-    public GLib.Settings gnome_mouse_settings;
+    public GLib.Settings gnome_interface_settings;
 }