diff --git a/0001-Change-default-clock-format-back-to-24h-for-non-US-l.patch b/0001-Change-default-clock-format-back-to-24h-for-non-US-l.patch new file mode 100644 index 0000000..9f0cfe0 --- /dev/null +++ b/0001-Change-default-clock-format-back-to-24h-for-non-US-l.patch @@ -0,0 +1,79 @@ +From aa2d88f00ca8827a690aab55ec765f9142a34c1d Mon Sep 17 00:00:00 2001 +From: Simon McVittie +Date: Fri, 16 Feb 2024 13:24:05 +0000 +Subject: [PATCH] Change default clock format back to 24h for non-US locales + +Instead of changing the default for all known and unknown locales +until their translations are updated, set the default format to 24h, +and generate an en_US locale that overrides it to 12h to accommodate +American time display expectations. + +Resolves: https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas/-/issues/55 +Signed-off-by: Simon McVittie +--- + po/LINGUAS | 1 + + po/en_US.po | 26 +++++++++++++++++++ + ...org.gnome.desktop.interface.gschema.xml.in | 2 +- + 3 files changed, 28 insertions(+), 1 deletion(-) + create mode 100644 po/en_US.po + +diff --git a/po/LINGUAS b/po/LINGUAS +index 4ba222e..8231f3c 100644 +--- a/po/LINGUAS ++++ b/po/LINGUAS +@@ -12,6 +12,7 @@ da + de + el + en_GB ++en_US + eo + es + eu +diff --git a/po/en_US.po b/po/en_US.po +new file mode 100644 +index 0000000..fbd4781 +--- /dev/null ++++ b/po/en_US.po +@@ -0,0 +1,26 @@ ++# American English translation for gsettings-desktop-schemas. ++# This is almost the same as LC_MESSAGES=C, but with a 12h clock. ++# Copyright (C) 2024 gsettings-desktop-schemas's COPYRIGHT HOLDER ++# This file is distributed under the same license as the gsettings-desktop-schemas package. ++# Simon McVittie , 2024 ++# ++msgid "" ++msgstr "" ++"Project-Id-Version: gsettings-desktop-schemas main\n" ++"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gsettings-desktop-" ++"schemas/issues\n" ++"POT-Creation-Date: 2024-02-16 13:00+0000\n" ++"PO-Revision-Date: 2024-02-16 13:00+0000\n" ++"Last-Translator: Simon McVittie \n" ++"Language-Team: https://gitlab.gnome.org/Teams/Translation/Coordination\n" ++"Language: en_US\n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"Plural-Forms: nplurals=2; plural=(n != 1);\n" ++"X-Project-Style: gnome\n" ++ ++#. TRANSLATORS: select your locale's default clock format, this should be '12h' or '24h' (with the quotes!) ++#: schemas/org.gnome.desktop.interface.gschema.xml.in:212 ++msgid "'24h'" ++msgstr "'12h'" +diff --git a/schemas/org.gnome.desktop.interface.gschema.xml.in b/schemas/org.gnome.desktop.interface.gschema.xml.in +index 7782323..10fca74 100644 +--- a/schemas/org.gnome.desktop.interface.gschema.xml.in ++++ b/schemas/org.gnome.desktop.interface.gschema.xml.in +@@ -209,7 +209,7 @@ + + + +- '12h' ++ '24h' + Whether the clock displays in 24h or 12h format + + Whether the clock displays in 24h or 12h format +-- +2.43.2 + diff --git a/gsettings-desktop-schemas.spec b/gsettings-desktop-schemas.spec index 32a814e..cba5dd3 100644 --- a/gsettings-desktop-schemas.spec +++ b/gsettings-desktop-schemas.spec @@ -12,6 +12,12 @@ License: LGPL-2.1-or-later URL: https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas Source0: https://download.gnome.org/sources/%{name}/46/%{name}-%{tarball_version}.tar.xz +# https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas/-/merge_requests/75 +# https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas/-/issues/55 +# https://bugzilla.redhat.com/show_bug.cgi?id=2265628 +# set default clock format back to 24hr for non-US locales +Patch: 0001-Change-default-clock-format-back-to-24h-for-non-US-l.patch + BuildRequires: gettext BuildRequires: glib2-devel >= 2.31.0 BuildRequires: gobject-introspection-devel