diff --git a/configure.ac b/configure.ac index ffbc1a4ca..8f19ad3c3 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 d4026e27b..e9aa9ef8a 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 */