regions: Revise and split gcc / latam-es-419 countries.
In additional to virtual set of countries like 'gcc' and 'latam-es-419',
we do want to have better control of individual region.
This change has corrected few regions which was covered by gcc and
latam-es-419.
Qatar is not moved since its region code, 256, has exceed the maximum
number we have previously reserved for region codes and need HWID code
to change before that can be moved to confirmed list.
BUG=chrome-os-partner:50630
TEST=emerge-samus chromeos-regions
Change-Id: Id5e85c050577c9eac850e14792e5152091b94291
Reviewed-on: https://chromium-review.googlesource.com/344461
Commit-Ready: Hung-Te Lin <hungte@chromium.org>
Tested-by: Hung-Te Lin <hungte@chromium.org>
Reviewed-by: Mohammed Habibulla <moch@google.com>
(cherry picked from commit df179fde4c233d4829f30bd724442bca363e108c)
Reviewed-on: https://chromium-review.googlesource.com/457002
Reviewed-by: YH Lin <yueherngl@chromium.org>
Reviewed-by: Marco Chen <marcochen@chromium.org>
Reviewed-by: Hung-Te Lin <hungte@chromium.org>
Tested-by: Anfernee Cheng <anfernee_chen@wistron.com>
Commit-Queue: Anfernee Cheng <anfernee_chen@wistron.com>
diff --git a/regions/regions.py b/regions/regions.py
index 4a78428..56aa8f7 100755
--- a/regions/regions.py
+++ b/regions/regions.py
@@ -443,7 +443,25 @@
Region(
'ch.usintl', 'xkb:us:intl:eng', 'Europe/Zurich', 'en-US',
_KML.ANSI, 'Switzerland (US Intl)',
- 'Switzerland with US International keyboard layout.', 50)]
+ 'Switzerland with US International keyboard layout.', 50),
+ Region(
+ 'pe', 'xkb:pe::spa', 'America/Lima', 'es-PE',
+ _KML.ANSI, 'Peru', None, 115),
+ Region(
+ 'sa', 'xkb:us::eng', 'Asia/Riyadh', ['ar-SA', 'en'], _KML.ANSI,
+ 'Saudi Arabia', None, 128),
+ Region(
+ 'mx', 'xkb:mx::spa', 'America/Mexico_City', 'es-MX', _KML.ANSI,
+ 'Mexico', None, 154),
+ Region(
+ 'cl', 'xkb:cl::spa', 'America/Santiago', 'es-CL', _KML.ANSI, 'Chile',
+ None, 176),
+ Region(
+ 'kw', 'xkb:kw::ara', 'Asia/Kuwait', ['ar-KW', 'en'], _KML.ANSI,
+ 'Kuwait', None, 201),
+ Region(
+ 'uy', 'xkb:uy::spa', 'America/Montevideo', 'es-UY', _KML.ANSI,
+ 'Uruguay', None, 216)]
"""A list of :py:class:`regions.Region` objects for
all **confirmed** regions. A confirmed region is a region whose
properties are known to be correct and valid: all contents (locale / timezone /
@@ -650,9 +668,6 @@
['en-PG', 'ho', 'meu', 'tpi'], _KML.ANSI, 'Papua New Guinea', None,
114),
Region(
- 'pe', 'xkb:pe::spa', 'America/Lima', ['es-PE', 'qu', 'ay'],
- _KML.ANSI, 'Peru', None, 115),
- Region(
'pk', 'xkb:pk::urd', 'Asia/Karachi',
['ur-PK', 'en-PK', 'pa', 'sd', 'ps', 'brh'], _KML.ANSI,
'Pakistan', None, 116),
@@ -692,9 +707,6 @@
'zw', 'xkb:zw::eng', 'Africa/Harare', ['en-ZW', 'sn', 'nr', 'nd'],
_KML.ANSI, 'Zimbabwe', None, 127),
Region(
- 'sa', 'xkb:us::eng', 'Asia/Riyadh', 'ar-SA', _KML.ANSI,
- 'Saudi Arabia', None, 128),
- Region(
'er', 'xkb:er::aar', 'Africa/Asmara',
['aa-ER', 'ar', 'tig', 'kun', 'ti-ER'], _KML.ANSI, 'Eritrea', None,
129),
@@ -775,13 +787,6 @@
'tz', 'xkb:tz::swa', 'Africa/Dar_es_Salaam',
['sw-TZ', 'en', 'ar'], _KML.ANSI, 'Tanzania', None, 153),
Region(
- 'mx', 'xkb:mx::spa',
- ['America/Mexico_City', 'America/Cancun', 'America/Merida',
- 'America/Monterrey', 'America/Matamoros', 'America/Mazatlan',
- 'America/Chihuahua', 'America/Ojinaga', 'America/Hermosillo',
- 'America/Tijuana', 'America/Santa_Isabel',
- 'America/Bahia_Banderas'], 'es-MX', _KML.ANSI, 'Mexico', None, 154),
- Region(
'io', 'xkb:io::eng', 'Indian/Chagos', 'en-IO', _KML.ANSI,
'British Indian Ocean Territory', None, 155),
Region(
@@ -847,9 +852,6 @@
'cm', 'xkb:cm::eng', 'Africa/Douala', ['en-CM', 'fr-CM'],
_KML.ANSI, 'Cameroon', None, 175),
Region(
- 'cl', 'xkb:cl::spa', ['America/Santiago', 'Pacific/Easter'],
- 'es-CL', _KML.ANSI, 'Chile', None, 176),
- Region(
'cc', 'xkb:cc::msa', 'Indian/Cocos', ['ms-CC', 'en'], _KML.ANSI,
'Cocos Islands', None, 177),
Region(
@@ -927,9 +929,6 @@
'kp', 'xkb:kp::kor', 'Asia/Pyongyang', 'ko-KP', _KML.ANSI,
'North Korea', None, 200),
Region(
- 'kw', 'xkb:kw::ara', 'Asia/Kuwait', ['ar-KW', 'en'], _KML.ANSI,
- 'Kuwait', None, 201),
- Region(
'sn', 'xkb:sn::fra', 'Africa/Dakar',
['fr-SN', 'wo', 'fuc', 'mnk'], _KML.ANSI, 'Senegal', None, 202),
Region(
@@ -973,9 +972,6 @@
'dz', 'xkb:dz::ara', 'Africa/Algiers', 'ar-DZ', _KML.ANSI,
'Algeria', None, 215),
Region(
- 'uy', 'xkb:uy::spa', 'America/Montevideo', 'es-UY', _KML.ANSI,
- 'Uruguay', None, 216),
- Region(
'yt', 'xkb:yt::fra', 'Indian/Mayotte', 'fr-YT', _KML.ANSI,
'Mayotte', None, 217),
Region(
@@ -1104,7 +1100,7 @@
['Europe/Kiev', 'Europe/Uzhgorod', 'Europe/Zaporozhye'],
['uk', 'ru-UA', 'rom', 'pl', 'hu'], _KML.ANSI, 'Ukraine', None, 255),
Region(
- 'qa', 'xkb:qa::ara', 'Asia/Qatar', ['ar-QA', 'es'], _KML.ANSI,
+ 'qa', 'xkb:qa::ara', 'Asia/Bahrain', ['ar-QA', 'en'], _KML.ANSI,
'Qatar', None, 256),
Region(
'mz', 'xkb:mz::por', 'Africa/Maputo', ['pt-MZ', 'vmw'],
