diff options
| author | Elliott Hughes <enh@google.com> | 2013-12-26 18:32:08 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-12-26 18:32:08 +0000 |
| commit | 4edaaa98d71ed588de62a62410f342ab913a854d (patch) | |
| tree | e0cd8c595ddbe23d8bbef1bb3dc6ebcfbc14a3bd | |
| parent | 75e18f0c2c5278242f158003f440634df70ddd8e (diff) | |
| parent | b844b3e14e24df5b8d9b25539f6eb92ac507d8b4 (diff) | |
| download | icu4c-4edaaa98d71ed588de62a62410f342ab913a854d.tar.gz | |
Merge "Force icu4c to always default to the Gregorian calendar."
| -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.dat | bin | 19032528 -> 19032544 bytes |
5 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.dat b/stubdata/icudt51l.dat Binary files differindex 638725c2..f72b4a36 100644 --- a/stubdata/icudt51l.dat +++ b/stubdata/icudt51l.dat |