diff --git a/gnome-control-center-remove-country-in-the-name-of-timezone.patch b/gnome-control-center-remove-country-in-the-name-of-timezone.patch new file mode 100644 index 0000000000000000000000000000000000000000..dfa1bf2fbe544d4e60ce93afb0609679cd229c17 --- /dev/null +++ b/gnome-control-center-remove-country-in-the-name-of-timezone.patch @@ -0,0 +1,77 @@ +From 758b69f9834d24120a7e5f1c20cf5b63c67a4aca Mon Sep 17 00:00:00 2001 +Date: Fri, 14 Feb 2020 18:14:33 +0800 +Subject: [PATCH] control-center: remove country in the name of timezone + +Change-Id: I794c649d35e498bdd4273062b982c04ebe953e6c +--- + gnome-control-center-3.30.1/panels/datetime/backward | 3 +-- + .../panels/datetime/cc-datetime-panel.c | 12 ++++-------- + .../panels/datetime/po-timezones/zh_CN.po | 4 ---- + 3 files changed, 5 insertions(+), 14 deletions(-) + +diff --git a/panels/datetime/backward b/panels/datetime/backward +index 8594be6..3fe71fc 100644 +--- a/panels/datetime/backward ++++ b/panels/datetime/backward +@@ -35,7 +35,6 @@ Link Asia/Dhaka Asia/Dacca + Link Asia/Shanghai Asia/Harbin + Link Asia/Urumqi Asia/Kashgar + Link Asia/Kathmandu Asia/Katmandu +-Link Asia/Macau Asia/Macao + Link Asia/Yangon Asia/Rangoon + Link Asia/Ho_Chi_Minh Asia/Saigon + Link Asia/Jerusalem Asia/Tel_Aviv +@@ -125,4 +124,4 @@ Link Pacific/Pago_Pago US/Samoa + Link Etc/UTC UTC + Link Etc/UTC Universal + Link Europe/Moscow W-SU +-Link Etc/UTC Zulu +\ No newline at end of file ++Link Etc/UTC Zulu +diff --git a/panels/datetime/cc-datetime-panel.c b/panels/datetime/cc-datetime-panel.c +index 880490a..23bb7d1 100644 +--- a/panels/datetime/cc-datetime-panel.c ++++ b/panels/datetime/cc-datetime-panel.c +@@ -478,7 +478,6 @@ translated_city_name (TzLocation *loc) + { + g_autofree gchar *zone_translated = NULL; + g_auto(GStrv) split_translated = NULL; +- g_autofree gchar *country = NULL; + gchar *name; + gint length; + +@@ -490,13 +489,10 @@ translated_city_name (TzLocation *loc) + 0, 0); + + length = g_strv_length (split_translated); +- +- country = gnome_get_country_from_code (loc->country, NULL); +- /* Translators: "city, country" */ +- name = g_strdup_printf (C_("timezone loc", "%s, %s"), +- split_translated[length-1], +- country); +- ++ /* Translators: "city" */ ++ name = g_strdup_printf (C_("timezone loc", "%s"), ++ split_translated[length-1]); ++ + return name; + } + +diff --git a/panels/datetime/po-timezones/zh_CN.po b/panels/datetime/po-timezones/zh_CN.po +index 38b053f..6bd84e9 100644 +--- a/panels/datetime/po-timezones/zh_CN.po ++++ b/panels/datetime/po-timezones/zh_CN.po +@@ -1755,10 +1755,6 @@ msgstr "亚洲/科威特" + msgid "Asia/Macao" + msgstr "亚洲/澳门" + +-#: timezones.h:530 +-msgid "Asia/Macau" +-msgstr "亚洲/澳门" +- + #: timezones.h:531 + msgid "Asia/Magadan" + msgstr "亚洲/马加丹" +-- +2.19.1 diff --git a/gnome-control-center.spec b/gnome-control-center.spec index 553c28d25186a293f11d8f8084ee5e20cad19099..0cf1b54ecef4c5aa67b1a2016636ad510959d9c4 100644 --- a/gnome-control-center.spec +++ b/gnome-control-center.spec @@ -1,6 +1,6 @@ Name: gnome-control-center Version: 3.30.1 -Release: 7 +Release: 8 Summary: GNOME Settings is GNOME's main interface for configuration of various aspects of your desktop. License: GPLv2+ and CC-BY-SA @@ -38,6 +38,7 @@ Patch9001: bugfix-gnome-control-center-fix-repetitivewallpapers.patch Patch9002: bugfix-fix_used_passwd_error_capture.patch Patch9003: gnome-control-center-change-translation-when-changing-password.patch Patch9004: bugfix-duplicate-Current-passwd.patch +Patch9005: gnome-control-center-remove-country-in-the-name-of-timezone.patch %description Gnome-control-center is a graphical user interface to configure @@ -102,6 +103,12 @@ chrpath --delete %{buildroot}%{_bindir}/gnome-control-center %{_mandir}/man1/*.gz %changelog +* Fri Mar 13 2020 openEuler Buildteam - 3.30.1-8 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:remove country in the name of timezone + * Mon Dec 30 2019 daiqianwen - 3.30.1-7 - Type:bugfix - ID:NA