[gnome-shell] util: Always use 12h format if requested

[Florian Müllner <fmuellner src gnome org>]

commit 817ff52414d18eb11cb97141c594e79d3e0c0512
Author: Florian Müllner <fmuellner gnome org>
Date:   Sun May 21 21:12:49 2017 +0200

    util: Always use 12h format if requested
    
    Whether we show times in 12h format currently depends on:
     - the 'clock-format' desktop setting
     - the locale support for AM/PM
    
    This was consist with other GNOME components, however both the
    WallClock[0] and the Date+Time Settings panel[1] dropped the
    second check after GDateTime started supporting AM/PM independently
    from the locale, so we should follow suite.
    
    [0] https://git.gnome.org/browse/gnome-desktop/commit?id=226fe725ef2cb2
    [1] https://git.gnome.org/browse/gnome-control-center/commit?id=85cd910af
    
    https://bugzilla.gnome.org/show_bug.cgi?id=782930

 configure.ac    |    2 +-
 js/misc/util.js |    3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index ffbc1a4..8f19ad3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -87,7 +87,7 @@ GOBJECT_INTROSPECTION_MIN_VERSION=1.49.1
 GJS_MIN_VERSION=1.47.0
 MUTTER_MIN_VERSION=3.25.1
 GTK_MIN_VERSION=3.15.0
-GIO_MIN_VERSION=2.45.3
+GIO_MIN_VERSION=2.53.0
 LIBECAL_MIN_VERSION=3.5.3
 LIBEDATASERVER_MIN_VERSION=3.17.2
 POLKIT_MIN_VERSION=0.100
diff --git a/js/misc/util.js b/js/misc/util.js
index d4026e2..e9aa9ef 100644
--- a/js/misc/util.js
+++ b/js/misc/util.js
@@ -218,11 +218,10 @@ function formatTime(time, params) {
     if (_desktopSettings == null)
         _desktopSettings = new Gio.Settings({ schema_id: 'org.gnome.desktop.interface' });
     let clockFormat = _desktopSettings.get_string('clock-format');
-    let hasAmPm = date.format('%p') != '';
 
     params = Params.parse(params, { timeOnly: false });
 
-    if (clockFormat == '24h' || !hasAmPm) {
+    if (clockFormat == '24h') {
         // Show only the time if date is on today
         if (daysAgo < 1 || params.timeOnly)
             /* Translators: Time in 24h format */