regions: move ukraine to confirmed list

Languages:
  - remove "ru-UA", "rom", "pl", "hu"
  - add "en-US"
Time zones:
  - Remove "Europe/Uzhgorod" and "Europe/Zaporozhye"
Keyboard:
  - Add "xkb:us::eng"

BUG=b:240672808
TEST=./update_testdata.py && ./regions_unittest.py

Change-Id: Ie86a4e1549920d112bcdb4e06672078142ae9d77
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform2/+/3793071
Commit-Queue: Stimim Chen <stimim@chromium.org>
Tested-by: Stimim Chen <stimim@chromium.org>
Reviewed-by: Alexander Alekseev <alemate@chromium.org>
(cherry picked from commit 3bb486442d039994affe970a25f0ee768eedb56a)
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform2/+/4402633
Reviewed-by: Stimim Chen <stimim@chromium.org>
Reviewed-by: YH Lin <yueherngl@chromium.org>
diff --git a/regions/regions.py b/regions/regions.py
index 95b10e8..632772f 100755
--- a/regions/regions.py
+++ b/regions/regions.py
@@ -494,7 +494,16 @@
         'ro.us', ['xkb:us::eng', 'xkb:ro::rum'], 'Europe/Bucharest', [
             'ro', 'hu', 'de', 'en-GB'], KML.ANSI,
         'Romania with US keyboard'),
-    ]
+    Region(
+        "ua",
+        ["xkb:us::eng", "xkb:ua::ukr"],
+        ["Europe/Kiev"],
+        # "uk" is Ukraine, not United Kingdom.
+        ["uk", "en-US"],
+        KML.ANSI,
+        "Ukraine",
+    ),
+]
 
 """A list of :py:class:`regions.Region` objects for
 all **confirmed** regions.  A confirmed region is a region whose
@@ -1106,11 +1115,6 @@
         'az', 'xkb:az::aze', 'Asia/Baku', ['az', 'ru', 'hy'], KML.ANSI,
         'Azerbaijan'),
     Region(
-        'ua', 'xkb:ua::ukr', [
-            'Europe/Kiev', 'Europe/Uzhgorod', 'Europe/Zaporozhye'], [
-                'uk', 'ru-UA', 'rom', 'pl', 'hu'], KML.ANSI,
-        'Ukraine'),
-    Region(
         'qa', 'xkb:qa::ara', 'Asia/Bahrain', ['ar', 'en'], KML.ANSI,
         'Qatar'),
     Region(