Merge remote-tracking branch 'upstream/SLE-15-SP6' into huha-kyiv-master

yast · Jun 6, 2024 · 804f48e · 804f48e
2 parents 079c4ed + 8c09621
commit 804f48e
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 4 deletions.
diff --git a/language/src/data/languages/language_uk_UA.ycp b/language/src/data/languages/language_uk_UA.ycp
@@ -36,7 +36,7 @@
 		    _("Ukrainian")
 	],
 	// 2. what time zone propose for this language
-	"timezone"	: "Europe/Kiev",
+	"timezone"	: "Europe/Kyiv",
 	// 3. which keyboard layout propose for this language
 	"keyboard"	: "ukrainian",
     ];

diff --git a/package/yast2-country.changes b/package/yast2-country.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu May 16 20:41:25 UTC 2024 - jjindrak@suse.com
+
+- Rename Europe/Kiev to Europe/Kyiv as per 2022b release of
+  tz code and data by ICANN (bsc#1224387)
+- 5.0.3
+
 -------------------------------------------------------------------
 Tue Oct 24 11:54:32 UTC 2023 - Martin Vidner <mvidner@suse.com>
 

diff --git a/package/yast2-country.spec b/package/yast2-country.spec
@@ -16,7 +16,7 @@
 #
 
 Name:           yast2-country
-Version:        5.0.2
+Version:        5.0.3
 Release:        0
 Summary:        YaST2 - Country Settings (Language, Keyboard, and Timezone)
 License:        GPL-2.0-only

diff --git a/timezone/src/data/lang2tz.ycp b/timezone/src/data/lang2tz.ycp
@@ -65,7 +65,7 @@ $[
 
   "ru"			: "Europe/Moscow",
   "ru_RU.KOI8-R"	: "Europe/Moscow",
-  "ru_UA"		: "Europe/Kiev",
+  "ru_UA"		: "Europe/Kyiv",
 
   "sr_YU"		: "Europe/Belgrade",
 

diff --git a/timezone/src/data/timezone_raw.ycp b/timezone/src/data/timezone_raw.ycp
@@ -47,7 +47,7 @@ $[
 	// time zone
 	"Europe/Kaliningrad"	: _("Russia (Kaliningrad)"),
 	// time zone
-	"Europe/Kiev"		: _("Ukraine (Kiev)"),
+	"Europe/Kyiv"		: _("Ukraine (Kyiv)"),
 	"Europe/Lisbon" : _("Portugal"),
 	"Europe/Ljubljana" : _("Slovenia"),
 	"Europe/London" : _("United Kingdom"),