commit 0fffd51bdde412f26bc6ebcebbd1ae1ed0aca2ce
author Jon Salz <jsalz@chromium.org> Thu Dec 12 21:51:57 2013
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Fri Dec 13 20:18:51 2013
tree f521b64c5e52f516110be0c4fc56e74a2d9cb8bb
parent 13578041751df3df56bee9ebfa8af4333c576a51

Add region information.

BUG=None
TEST=unit tests
CQ-DEPEND=CL:*150065

Change-Id: Iff81541c8c6907fcbbbd733c86857be4724b2127
Reviewed-on: https://chromium-review.googlesource.com/179844
Reviewed-by: Jon Salz <jsalz@chromium.org>
Commit-Queue: Jon Salz <jsalz@chromium.org>
Tested-by: Jon Salz <jsalz@chromium.org>

py/l10n/regions.py

diff --git a/py/l10n/regions.py b/py/l10n/regions.py
index a904836..34e2db3 100755
--- a/py/l10n/regions.py
+++ b/py/l10n/regions.py
@@ -95,10 +95,42 @@
 
 _KML = KeyboardMechanicalLayout
 REGIONS_LIST = [
+    Region('au', 'xkb:us::eng', 'Australia/Sydney', 'en-AU', _KML.ANSI,
+           'Australia'),
+    Region('ca.ansi', 'xkb:us::eng', 'America/Toronto', 'en-CA', _KML.ANSI,
+           'Canada (US keyboard)',
+           'Canada with US (ANSI) keyboard; see http://goto/cros-canada'),
+    Region('ca.fr', 'xkb:ca::fra', 'America/Toronto', 'fr-CA', _KML.ISO,
+           'Canada (French keyboard)',
+           ('Device shipping to Canada with a purely Canadian French (ISO) '
+            'keyboard; see http://goto/cros-canada')),
+    Region('ca.hybrid', 'xkb:ca:eng:eng', 'America/Toronto', 'en-CA', _KML.ISO,
+           'Canada (hybrid)',
+           ('Canada with hybrid xkb:ca:eng:eng + xkb:ca::fra keyboard (ISO), '
+            'defaulting to English language and keyboard; see '
+            'http://goto/cros-canada')),
+    Region('ca.multix', 'xkb:ca:multix:fra', 'America/Toronto', 'fr-CA',
+           _KML.ISO, 'Canada (multilingual)',
+           ('Device shipping to Canada with a Canadian Multilingual keyboard; '
+            'see http://goto/cros-canada')),
+    Region('de', 'xkb:de::ger', 'Europe/Berlin', 'de', _KML.ISO, 'Germany'),
+    Region('fi', 'xkb:fi::fin', 'Europe/Helsinki', 'fi', _KML.ISO, 'Finland'),
+    Region('fr', 'xkb:fr::fra', 'Europe/Paris', 'fr', _KML.ISO, 'France'),
+    Region('gb', 'xkb:gb:extd:eng', 'Europe/London', 'en-GB', _KML.ISO, 'UK'),
+    Region('ie', 'xkb:gb:extd:eng', 'Europe/Dublin', 'en-GB', _KML.ISO,
+           'Ireland'),
+    Region('in', 'xkb:us::eng', 'Asia/Calcutta', 'en-US', _KML.ANSI, 'India'),
+    Region('my', 'xkb:us::eng', 'Asia/Kuala_Lumpur', 'ms', _KML.ANSI,
+           'Malaysia'),
+    Region('nl', 'xkb:us:intl:eng', 'Europe/Amsterdam', 'nl', _KML.ANSI,
+           'Netherlands'),
+    Region('nordic', 'xkb:se::swe', 'Europe/Stockholm', 'en-US', _KML.ISO,
+           'Nordics', 'Unified keyboard for Sweden, Norway, and Denmark'),
+    Region('se', 'xkb:se::swe', 'Europe/Stockholm', 'sv', _KML.ISO, 'Sweden'),
+    Region('sg', 'xkb:us::eng', 'Asia/Singapore', 'en-GB', _KML.ANSI,
+           'Singapore'),
     Region('us', 'xkb:us::eng', 'America/Los_Angeles', 'en-US', _KML.ANSI,
            'United States'),
-    Region('gb', 'xkb:gb:extd:eng', 'Europe/London', 'en-GB', _KML.ISO,
-           'UK'),
 ]
 """A list of :py:class:`cros.factory.l10n.regions.Region` objects for
 all **confirmed** regions.  A confirmed region is a region whose