diff options
| author | Elliott Hughes <enh@google.com> | 2013-12-20 14:50:41 -0800 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2014-03-21 10:01:44 +0000 |
| commit | 18668f3b015a110275f5cc9a8722b2f65f3333bf (patch) | |
| tree | 9cfe3adead99244400b80feed85736642348540e | |
| parent | 0a61a367aa48577edf1c9ba57c501b8f5e7555d5 (diff) | |
| download | icu4c-kitkat-mr2.2-release.tar.gz | |
Force icu4c to always default to the Gregorian calendar.android-4.4w_r1android-4.4.4_r2.0.1android-4.4.4_r2android-4.4.4_r1.0.1android-4.4.4_r1android-4.4.3_r1.1.0.1android-4.4.3_r1.1android-4.4.3_r1.0.1android-4.4.3_r1kitkat-wearkitkat-mr2.2-releasekitkat-mr2.1-releasekitkat-mr2-releasekitkat-dev
This matches the Java side of the system (and pre-KitKat behavior).
Bug: 12004664
(cherry-picked from b844b3e14e24df5b8d9b25539f6eb92ac507d8b4)
Change-Id: I2462e9a8af288535a1511f7cb3bba9dd459a8ed3
| -rw-r--r-- | data/locales/fa.txt | 2 | ||||
| -rw-r--r-- | data/locales/ps.txt | 2 | ||||
| -rw-r--r-- | data/locales/th.txt | 2 | ||||
| -rw-r--r-- | data/misc/supplementalData.txt | 12 | ||||
| -rw-r--r-- | stubdata/icudt51l-all.dat | bin | 19032528 -> 19032544 bytes | |||
| -rw-r--r-- | stubdata/icudt51l-default.dat | bin | 14146816 -> 14146832 bytes |
6 files changed, 12 insertions, 6 deletions
diff --git a/data/locales/fa.txt b/data/locales/fa.txt index feedef7d..06e6e2e3 100644 --- a/data/locales/fa.txt +++ b/data/locales/fa.txt @@ -143,7 +143,7 @@ fa{ } Version{"2.0.82.45"} calendar{ - default{"persian"} + default{"gregorian"} // android-changed generic{ DateTimePatterns{ "H:mm:ss (zzzz)", diff --git a/data/locales/ps.txt b/data/locales/ps.txt index 8a4cf71c..e6b918d5 100644 --- a/data/locales/ps.txt +++ b/data/locales/ps.txt @@ -45,7 +45,7 @@ ps{ } Version{"2.0.82.45"} calendar{ - default{"persian"} + default{"gregorian"} // android-changed generic{ DateTimePatterns{ "H:mm:ss (zzzz)", diff --git a/data/locales/th.txt b/data/locales/th.txt index 50cd4954..79b9e317 100644 --- a/data/locales/th.txt +++ b/data/locales/th.txt @@ -594,7 +594,7 @@ th{ } } } - default{"buddhist"} + default{"gregorian"} // android-changed ethiopic{ monthNames{ format{ diff --git a/data/misc/supplementalData.txt b/data/misc/supplementalData.txt index 513f195e..24157926 100644 --- a/data/misc/supplementalData.txt +++ b/data/misc/supplementalData.txt @@ -17,8 +17,10 @@ supplementalData:table(nofallback){ "islamic-civil", } AF{ - "persian", +// BEGIN android-changed "gregorian", + "persian", +// END android-changed "islamic", "islamic-civil", } @@ -85,8 +87,10 @@ supplementalData:table(nofallback){ "islamic-civil", } IR{ - "persian", +// BEGIN android-changed "gregorian", + "persian", +// END android-changed "islamic", "islamic-civil", } @@ -177,8 +181,10 @@ supplementalData:table(nofallback){ "islamic-civil", } TH{ - "buddhist", +// BEGIN android-changed "gregorian", + "buddhist", +// END android-changed } TN{ "gregorian", diff --git a/stubdata/icudt51l-all.dat b/stubdata/icudt51l-all.dat Binary files differindex c14e3392..7a86bb26 100644 --- a/stubdata/icudt51l-all.dat +++ b/stubdata/icudt51l-all.dat diff --git a/stubdata/icudt51l-default.dat b/stubdata/icudt51l-default.dat Binary files differindex c285e71a..39ea7ec4 100644 --- a/stubdata/icudt51l-default.dat +++ b/stubdata/icudt51l-default.dat |