Android patch: CLDR data: Force default Gregorian calendar.
This change was introduced in Android by this patch:
https://android.googlesource.com/platform/external/icu/+/b844b3e
And then amended by the ICU52 upgrade:
https://android.googlesource.com/platform/external/icu/+/59d709d
Change-Id: I93f7850b1a3ab17d53e97a4b3152e878e2985d20
diff --git a/icu4c/source/data/locales/fa.txt b/icu4c/source/data/locales/fa.txt
index 089da57..4e6ae14 100644
--- a/icu4c/source/data/locales/fa.txt
+++ b/icu4c/source/data/locales/fa.txt
@@ -267,7 +267,7 @@
}
}
}
- default{"persian"}
+ default{"gregorian"} // android-changed
generic{
DateTimePatterns{
"H:mm:ss (zzzz)",
diff --git a/icu4c/source/data/locales/ps.txt b/icu4c/source/data/locales/ps.txt
index 8f5309d..2e0c8bb 100644
--- a/icu4c/source/data/locales/ps.txt
+++ b/icu4c/source/data/locales/ps.txt
@@ -40,7 +40,7 @@
}
Version{"2.1.19.14"}
calendar{
- default{"persian"}
+ default{"gregorian"} // android-changed
generic{
DateTimePatterns{
"H:mm:ss (zzzz)",
diff --git a/icu4c/source/data/locales/th.txt b/icu4c/source/data/locales/th.txt
index adf9a4c..613208c 100644
--- a/icu4c/source/data/locales/th.txt
+++ b/icu4c/source/data/locales/th.txt
@@ -859,7 +859,7 @@
}
}
}
- default{"buddhist"}
+ default{"gregorian"} // android-changed
ethiopic{
monthNames{
format{
diff --git a/icu4c/source/data/misc/supplementalData.txt b/icu4c/source/data/misc/supplementalData.txt
index e031bb7..c86dbed 100644
--- a/icu4c/source/data/misc/supplementalData.txt
+++ b/icu4c/source/data/misc/supplementalData.txt
@@ -1639,8 +1639,10 @@
"islamic-tbla",
}
AF{
- "persian",
+// BEGIN android-changed
"gregorian",
+ "persian",
+// END android-changed
"islamic",
"islamic-civil",
"islamic-tbla",
@@ -1717,8 +1719,10 @@
"islamic-tbla",
}
IR{
- "persian",
+// BEGIN android-changed
"gregorian",
+ "persian",
+// END android-changed
"islamic",
"islamic-civil",
"islamic-tbla",
@@ -1826,8 +1830,10 @@
"islamic-tbla",
}
TH{
- "buddhist",
+// BEGIN android-changed
"gregorian",
+ "buddhist",
+// END android-changed
}
TN{
"gregorian",
diff --git a/icu4c/source/test/cintltst/ccaltst.c b/icu4c/source/test/cintltst/ccaltst.c
index 4571cda..b717dfb 100644
--- a/icu4c/source/test/cintltst/ccaltst.c
+++ b/icu4c/source/test/cintltst/ccaltst.c
@@ -82,7 +82,8 @@
{ "en_US", UCAL_GREGORIAN, "gregorian" },
{ "ja_JP@calendar=japanese", UCAL_DEFAULT, "japanese" },
{ "th_TH", UCAL_GREGORIAN, "gregorian" },
- { "th_TH", UCAL_DEFAULT, "buddhist" },
+ { "th_TH", UCAL_DEFAULT, "gregorian" }, // android-changed
+ // { "th_TH", UCAL_DEFAULT, "buddhist" },
{ "th-TH-u-ca-gregory", UCAL_DEFAULT, "gregorian" },
{ "ja_JP@calendar=japanese", UCAL_GREGORIAN, "gregorian" },
{ "", UCAL_GREGORIAN, "gregorian" },
@@ -1553,17 +1554,20 @@
{ "und", "gregorian", NULL, NULL, NULL, NULL },
{ "en_US", "gregorian", NULL, NULL, NULL, NULL },
{ "en_029", "gregorian", NULL, NULL, NULL, NULL },
- { "th_TH", "buddhist", "gregorian", NULL, NULL, NULL },
- { "und_TH", "buddhist", "gregorian", NULL, NULL, NULL },
- { "en_TH", "buddhist", "gregorian", NULL, NULL, NULL },
+ { "th_TH", "gregorian", "buddhist", NULL, NULL, NULL }, // android-changed
+ { "und_TH", "gregorian", "buddhist", NULL, NULL, NULL }, // android-changed
+ { "en_TH", "gregorian", "buddhist", NULL, NULL, NULL }, // android-changed
+ // { "th_TH", "buddhist", "gregorian", NULL, NULL, NULL },
+ // { "und_TH", "buddhist", "gregorian", NULL, NULL, NULL },
+ // { "en_TH", "buddhist", "gregorian", NULL, NULL, NULL },
{ "he_IL", "gregorian", "hebrew", "islamic", "islamic-civil", "islamic-tbla" },
{ "ar_EG", "gregorian", "coptic", "islamic", "islamic-civil", "islamic-tbla" },
{ "ja", "gregorian", "japanese", NULL, NULL, NULL },
{ "ps_Guru_IN", "gregorian", "indian", NULL, NULL, NULL },
- { "th@calendar=gregorian", "buddhist", "gregorian", NULL, NULL, NULL },
+ { "th@calendar=gregorian", "gregorian", "buddhist", NULL, NULL, NULL },
{ "en@calendar=islamic", "gregorian", NULL, NULL, NULL, NULL },
{ "zh_TW", "gregorian", "roc", "chinese", NULL, NULL },
- { "ar_IR", "persian", "gregorian", "islamic", "islamic-civil", "islamic-tbla" },
+ { "ar_IR", "gregorian", "persian", "islamic", "islamic-civil", "islamic-tbla" }, // android-changed
};
const int32_t EXPECTED_SIZE[PREFERRED_SIZE] = { 1, 1, 1, 1, 2, 2, 2, 5, 5, 2, 2, 2, 1, 3, 5 };
UErrorCode status = U_ZERO_ERROR;
diff --git a/icu4c/source/test/intltest/dtfmttst.cpp b/icu4c/source/test/intltest/dtfmttst.cpp
index 9c15c95..4d8e2cf 100644
--- a/icu4c/source/test/intltest/dtfmttst.cpp
+++ b/icu4c/source/test/intltest/dtfmttst.cpp
@@ -4788,12 +4788,12 @@
return;
}
- // Farsi should default to the persian calendar, not gregorian
+ // Android: All locales default to Gregorian calendar:
int32_t count;
const UnicodeString *months = sym->getShortMonths(count);
// First persian month.
- UnicodeString expected("\\u0641\\u0631\\u0648\\u0631\\u062f\\u06cc\\u0646");
+ UnicodeString expected("\\u0698\\u0627\\u0646\\u0648\\u06CC\\u0647\\u0654"); // Android-changed
assertEquals("", expected.unescape(), months[0]);
}
diff --git a/icu4c/source/test/intltest/dtifmtts.cpp b/icu4c/source/test/intltest/dtifmtts.cpp
index 0777fa7..4143a47 100644
--- a/icu4c/source/test/intltest/dtifmtts.cpp
+++ b/icu4c/source/test/intltest/dtifmtts.cpp
@@ -992,48 +992,50 @@
// Thai (default calendar buddhist)
- "th", "2550 10 10 10:10:10", "2551 10 10 10:10:10", "EEEEdMMMy", "\\u0E27\\u0E31\\u0E19\\u0E1E\\u0E38\\u0E18\\u0E17\\u0E35\\u0E48 10 \\u0E15.\\u0E04. 2550 \\u2013 \\u0E27\\u0E31\\u0E19\\u0E28\\u0E38\\u0E01\\u0E23\\u0E4C\\u0E17\\u0E35\\u0E48 10 \\u0E15.\\u0E04. 2551",
+ // BEGIN ANDROID-changed. Default calendar in Android is Gregorian for th locale.
+ // "th", "2550 10 10 10:10:10", "2551 10 10 10:10:10", "EEEEdMMMy", "\\u0E27\\u0E31\\u0E19\\u0E1E\\u0E38\\u0E18\\u0E17\\u0E35\\u0E48 10 \\u0E15.\\u0E04. 2550 \\u2013 \\u0E27\\u0E31\\u0E19\\u0E28\\u0E38\\u0E01\\u0E23\\u0E4C\\u0E17\\u0E35\\u0E48 10 \\u0E15.\\u0E04. 2551",
- "th", "2550 10 10 10:10:10", "2551 10 10 10:10:10", "dMMM", "10 \\u0E15.\\u0E04. 2550 \\u2013 10 \\u0E15.\\u0E04. 2551",
+ // "th", "2550 10 10 10:10:10", "2551 10 10 10:10:10", "dMMM", "10 \\u0E15.\\u0E04. 2550 \\u2013 10 \\u0E15.\\u0E04. 2551",
- "th", "2550 10 10 10:10:10", "2551 10 10 10:10:10", "MMMy", "\\u0E15.\\u0E04. 2550 \\u2013 \\u0E15.\\u0E04. 2551",
+ // "th", "2550 10 10 10:10:10", "2551 10 10 10:10:10", "MMMy", "\\u0E15.\\u0E04. 2550 \\u2013 \\u0E15.\\u0E04. 2551",
- "th", "2550 10 10 10:10:10", "2551 10 10 10:10:10", "EdMy", "\\u0E1E. 10/10/2550 \\u2013 \\u0E28. 10/10/2551",
+ // "th", "2550 10 10 10:10:10", "2551 10 10 10:10:10", "EdMy", "\\u0E1E. 10/10/2550 \\u2013 \\u0E28. 10/10/2551",
- "th", "2550 10 10 10:10:10", "2551 10 10 10:10:10", "dMy", "10/10/2550 \\u2013 10/10/2551",
+ // "th", "2550 10 10 10:10:10", "2551 10 10 10:10:10", "dMy", "10/10/2550 \\u2013 10/10/2551",
- "th", "2550 10 10 10:10:10", "2551 10 10 10:10:10", "My", "10/2550 \\u2013 10/2551",
+ // "th", "2550 10 10 10:10:10", "2551 10 10 10:10:10", "My", "10/2550 \\u2013 10/2551",
- "th", "2550 10 10 10:10:10", "2551 10 10 10:10:10", "EdM", "\\u0E1E. 10/10/2550 \\u2013 \\u0E28. 10/10/2551",
+ // "th", "2550 10 10 10:10:10", "2551 10 10 10:10:10", "EdM", "\\u0E1E. 10/10/2550 \\u2013 \\u0E28. 10/10/2551",
- "th", "2550 10 10 10:10:10", "2551 10 10 10:10:10", "y", "2550\\u20132551",
+ // "th", "2550 10 10 10:10:10", "2551 10 10 10:10:10", "y", "2550\\u20132551",
- "th", "2550 10 10 10:10:10", "2551 10 10 10:10:10", "M", "10/2550 \\u2013 10/2551",
+ // "th", "2550 10 10 10:10:10", "2551 10 10 10:10:10", "M", "10/2550 \\u2013 10/2551",
- "th", "2550 10 10 10:10:10", "2550 11 10 10:10:10", "EEEEdMMMy", "\\u0E27\\u0E31\\u0E19\\u0E1E\\u0E38\\u0E18\\u0E17\\u0E35\\u0E48 10 \\u0E15.\\u0E04. \\u2013 \\u0E27\\u0E31\\u0E19\\u0E40\\u0E2A\\u0E32\\u0E23\\u0E4C\\u0E17\\u0E35\\u0E48 10 \\u0E1E.\\u0E22. 2550",
+ // "th", "2550 10 10 10:10:10", "2550 11 10 10:10:10", "EEEEdMMMy", "\\u0E27\\u0E31\\u0E19\\u0E1E\\u0E38\\u0E18\\u0E17\\u0E35\\u0E48 10 \\u0E15.\\u0E04. \\u2013 \\u0E27\\u0E31\\u0E19\\u0E40\\u0E2A\\u0E32\\u0E23\\u0E4C\\u0E17\\u0E35\\u0E48 10 \\u0E1E.\\u0E22. 2550",
"th", "2550 10 10 10:10:10", "2550 11 10 10:10:10", "dMMM", "10 \\u0E15.\\u0E04. \\u2013 10 \\u0E1E.\\u0E22.",
- "th", "2550 10 10 10:10:10", "2550 11 10 10:10:10", "MMMy", "\\u0E15.\\u0E04.\\u2013\\u0E1E.\\u0E22. 2550",
+ // "th", "2550 10 10 10:10:10", "2550 11 10 10:10:10", "MMMy", "\\u0E15.\\u0E04.\\u2013\\u0E1E.\\u0E22. 2550",
"th", "2550 10 10 10:10:10", "2550 11 10 10:10:10", "dM", "10/10 \\u2013 10/11",
- "th", "2550 10 10 10:10:10", "2550 11 10 10:10:10", "My", "10/2550 \\u2013 11/2550",
+ // "th", "2550 10 10 10:10:10", "2550 11 10 10:10:10", "My", "10/2550 \\u2013 11/2550",
"th", "2550 10 10 10:10:10", "2550 11 10 10:10:10", "d", "10/10 \\u2013 10/11",
- "th", "2550 10 10 10:10:10", "2550 11 10 10:10:10", "y", "\\u0E1E.\\u0E28. 2550",
+ // "th", "2550 10 10 10:10:10", "2550 11 10 10:10:10", "y", "\\u0E1E.\\u0E28. 2550",
"th", "2550 10 10 10:10:10", "2550 11 10 10:10:10", "MMM", "\\u0E15.\\u0E04.\\u2013\\u0E1E.\\u0E22.",
+ // END ANDROID-changed
};
expect(DATA, ARRAY_SIZE(DATA));
}
diff --git a/icu4c/source/test/intltest/incaltst.cpp b/icu4c/source/test/intltest/incaltst.cpp
index 7627696..81fc447 100644
--- a/icu4c/source/test/intltest/incaltst.cpp
+++ b/icu4c/source/test/intltest/incaltst.cpp
@@ -116,9 +116,9 @@
"buddhist",
"gregorian",
"gregorian",
- "buddhist",
- "buddhist",
- "buddhist",
+ "gregorian", // android-changed. "buddhist",
+ "gregorian", // android-changed. "buddhist",
+ "gregorian", // android-changed. "buddhist",
"gregorian",
NULL };
