Prioritize Pacific/Kanton over Pacific/Enderbury.
CLDR 42 adds translations for it, so we can use it now [1].
But ICU considers Pacific/Enderbury as canonical ID for
Pacific/Kanton, so on SettingsUI Enderbury is listed even though
under the hood Pacific/Kanton is used.
[1] https://source.corp.google.com/aosp-master/external/cldr/common/main/ar.xml;l=4457
Fix: 204539416
Bug: 204539416
Test: Time zone picker works with Pacific/Kanton
Change-Id: I65c30a93af9d3d00d38abc894b04248a0e98f62d
diff --git a/input_data/android/countryzones.txt b/input_data/android/countryzones.txt
index b8dbd7e..860fae8 100644
--- a/input_data/android/countryzones.txt
+++ b/input_data/android/countryzones.txt
@@ -1868,10 +1868,8 @@
timeZoneMappings:<
utcOffset:"13:00"
- # TODO(b/204539416) Switch to Pacific/Kanton when CLDR has exemplar
- # location translations.
- id:"Pacific/Enderbury"
- alternativeIds: "Pacific/Kanton"
+ id:"Pacific/Kanton"
+ alternativeIds:"Pacific/Enderbury"
>
timeZoneMappings:<
diff --git a/output_data/android/tzids.prototxt b/output_data/android/tzids.prototxt
index b76ffba..71772e1 100644
--- a/output_data/android/tzids.prototxt
+++ b/output_data/android/tzids.prototxt
@@ -1005,11 +1005,11 @@
countryMappings {
isoCode: "ki"
timeZoneIds: "Pacific/Kiritimati"
- timeZoneIds: "Pacific/Enderbury"
+ timeZoneIds: "Pacific/Kanton"
timeZoneIds: "Pacific/Tarawa"
timeZoneLinks {
- alternativeId: "Pacific/Kanton"
- preferredId: "Pacific/Enderbury"
+ alternativeId: "Pacific/Enderbury"
+ preferredId: "Pacific/Kanton"
}
}
countryMappings {
diff --git a/output_data/android/tzlookup.xml b/output_data/android/tzlookup.xml
index 34d5fa5..dc9ddfa 100644
--- a/output_data/android/tzlookup.xml
+++ b/output_data/android/tzlookup.xml
@@ -437,7 +437,7 @@
</country>
<country code="ki" default="Pacific/Tarawa" everutc="n">
<id>Pacific/Kiritimati</id>
- <id alts="Pacific/Kanton">Pacific/Enderbury</id>
+ <id alts="Pacific/Enderbury">Pacific/Kanton</id>
<id>Pacific/Tarawa</id>
</country>
<country code="km" default="Indian/Comoro" everutc="n">
diff --git a/testing/data/test1/output_data/android/tzlookup.xml b/testing/data/test1/output_data/android/tzlookup.xml
index a18497f..8557ae3 100644
--- a/testing/data/test1/output_data/android/tzlookup.xml
+++ b/testing/data/test1/output_data/android/tzlookup.xml
@@ -437,7 +437,7 @@
</country>
<country code="ki" default="Pacific/Tarawa" everutc="n">
<id>Pacific/Kiritimati</id>
- <id alts="Pacific/Kanton">Pacific/Enderbury</id>
+ <id alts="Pacific/Enderbury">Pacific/Kanton</id>
<id>Pacific/Tarawa</id>
</country>
<country code="km" default="Indian/Comoro" everutc="n">
diff --git a/testing/data/test3/output_data/android/tzlookup.xml b/testing/data/test3/output_data/android/tzlookup.xml
index a18497f..8557ae3 100644
--- a/testing/data/test3/output_data/android/tzlookup.xml
+++ b/testing/data/test3/output_data/android/tzlookup.xml
@@ -437,7 +437,7 @@
</country>
<country code="ki" default="Pacific/Tarawa" everutc="n">
<id>Pacific/Kiritimati</id>
- <id alts="Pacific/Kanton">Pacific/Enderbury</id>
+ <id alts="Pacific/Enderbury">Pacific/Kanton</id>
<id>Pacific/Tarawa</id>
</country>
<country code="km" default="Indian/Comoro" everutc="n">
