aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-04-25Cherry-pick: changeset 14981 Add more Japan new era localized names, remove ↵android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12android10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseNikita Iashchenko
placeholders This CL cherry-picks all changes from upstream commit except the third line in zh.xml (dropping line 4552 "<era type="236" draft="contributed">R</era>" from the patch). This is done because: a) In Android copy of zh.xml under <eraNarrow> array we have eras with numbers up to 162, so that the last entry is "<era type="162" draft="contributed">天授(1375–1379)</era>" and the mentioned above hunk can't be appled there. We also do not have any narrow forms of recent eras there. b) Even if we apply this hunk, we still will not have any changes in ICU data, so this hunk can be safely ignored. Upstream bug: https://unicode.org/cldr/trac/ticket/11969 Changeset: https://unicode.org/cldr/trac/changeset/14981 Bug: 77858319 Test: external/icu/tools/udpatecldrdata.py Change-Id: I2016ec21a4f8b3e99b3392d2b2aebfbcc92be164 Merged-In: I2016ec21a4f8b3e99b3392d2b2aebfbcc92be164 (cherry picked from commit 40d7c12ce7a27dca5f41f0b639819416913e5b18)
2019-04-25Cherry-pick: changeset-14976 Japanese/root data for Japanse era Reiwa ↵Nikita Iashchenko
(2019-05-01 -) Upstream bug: https://unicode.org/cldr/trac/ticket/11796 Changeset: https://unicode.org/cldr/trac/changeset/14976 Bug: 77858319 Test: external/icu/tools/udpatecldrdata.py Change-Id: Id3524bc1cc947edb112b3459072cdbd1caddb10f Merged-In: Id3524bc1cc947edb112b3459072cdbd1caddb10f (cherry picked from commit cbbb30140b9b997ca13cf86ffe4b0331b767c502)
2019-04-03Merge master@5428150 into git_qt-dev-plus-aosp.Bill Rassieur
am: db1786320b Change-Id: I2bd5cb4f816d5a09a13138ab900216a16c32775d
2019-04-02Merge master@5428150 into git_qt-dev-plus-aosp.Bill Rassieur
Change-Id: I1c1f78f7075f4328441ce54de2baa94adc28a717 BUG: 129345239
2019-04-02Apply https://unicode.org/cldr/trac/ticket/11972 am: 33c735084a am: bf4dfa1871Neil Fuller
am: cbbb342d2e Change-Id: Ie20a488987dc3f53492865ec1cbce53bc08e0355
2019-04-02Apply https://unicode.org/cldr/trac/ticket/11972 am: 33c735084aNeil Fuller
am: bf4dfa1871 Change-Id: I8b1aeedb95f998c8fd24fa5e520c4a3b158666f0
2019-04-02Apply https://unicode.org/cldr/trac/ticket/11972Neil Fuller
am: 33c735084a Change-Id: I43733c2fdff728237dfcdaeddaab63bc6756767d
2019-04-02Apply https://unicode.org/cldr/trac/ticket/11972android-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5Neil Fuller
This change patches in https://unicode.org/cldr/trac/ticket/11972 to correct CLDR's copy of tzdb input files. They're not used on Android but I applied that change to prove that, and it makes sense to keep up. Bug: 129748824 Test: Ran external/icu/tools/updatecldrdata.py and inspected external/icu state Change-Id: I95e47984f62742a98d8bb90899275d08674fbd98
2019-03-28CLDR changes associated with 2019a tzdb update am: 270d1270cc am: d103810314Neil Fuller
am: 68bc6ae0c7 Change-Id: If7f1f0a9343a64341647e3b0e7402d9e4c773dcd
2019-03-28CLDR changes associated with 2019a tzdb update am: 270d1270ccNeil Fuller
am: d103810314 Change-Id: I46d40d5725cc5113684401c07b354ec0f43ff030
2019-03-28CLDR changes associated with 2019a tzdb updateNeil Fuller
am: 270d1270cc Change-Id: If5fb2479fcc768c818bed8a5fb445fadf533571b
2019-03-28CLDR changes associated with 2019a tzdb updateNeil Fuller
Changes were taken from: https://unicode.org/cldr/trac/changeset/14964 Only a subset were needed as Android's commit c92c11cb contained changes associated with vanguard vs rearguard rules choice. Bug: 129319176 Test: See the associated system/timezone/ change Change-Id: I83247746634849a2e2a38017523437a82ea6c67a
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospXin Li
am: 7a7270cbf0 Change-Id: I088c981809b7baa6af40eaa8acc58ab4bb97f967
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospXin Li
Bug: 126125118 Change-Id: I18143922d1a49e647282ee800a852b30a0771c26
2019-02-20DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li
Bug: 120848293 Change-Id: I22cf493a5ec3c29abf4fc1c2ba00865a33e1a1cc
2019-01-16Cherry-pick: cldr-ticket 11751: Time zone data updates for 2018h and 2018i ↵Pete Gillin
am: c92c11cb79 am: c222b3819b am: f60536c937 Change-Id: I6ca37b709951b70f682d9c95f7c713ddfef02ecd
2019-01-16Cherry-pick: cldr-ticket 11751: Time zone data updates for 2018h and 2018i ↵Pete Gillin
am: c92c11cb79 am: c222b3819b Change-Id: Icba5f24d326930cb65932fe9ba3deda27d2de75d
2019-01-16Cherry-pick: cldr-ticket 11751: Time zone data updates for 2018h and 2018iPete Gillin
am: c92c11cb79 Change-Id: I7ee84c9e59d853fdf3dd14a4836107a18fe98070
2019-01-16Cherry-pick: cldr-ticket 11751: Time zone data updates for 2018h and 2018iandroid-q-preview-1Pete Gillin
Cherrypick https://unicode.org/cldr/trac/changeset/14742 Briefly (2018h): Qyzylorda, Kazakhstan moved from +06 to +05 on 2018-12-21. New zone Asia/Qostanay because Qostanay, Kazakhstan didn't move. Metlakatla, Alaska observes PST this winter only. Guess Morocco will continue to adjust clocks around Ramadan. Add predictions for Iran from 2038 through 2090. Briefly (2018i): Sao Tome and Principe switches from +01 to +00 on 2019-01-01. Bug: 122448923 Test: None (see the associated external/icu/ change) Change-Id: I39c81bb3fb93edbfffc2e5c52ce8239ed3855c4c
2018-11-09Cherry-pick: cldr-ticket 11523: Update Android CLDR tzdata from 2018f to ↵Victor Chang
2018g am: e55918306d am: 467d9e241f am: 8273e73968 Change-Id: I95445e3d1b8fcf0dd28ab187a18f8dec18ebeefa
2018-11-09Cherry-pick: cldr-ticket 11507: Update Android CLDR tzdata from 2018e to ↵Victor Chang
2018f am: a71b248034 am: e415e10fce am: ff2282baea Change-Id: Iefe05001fe51b8b4f43baba9542e49eda6a9846a
2018-11-09Cherry-pick: cldr-ticket 11523: Update Android CLDR tzdata from 2018f to ↵Victor Chang
2018g am: e55918306d am: 467d9e241f Change-Id: I71c2a78fd8df743050e4ee88b58371f6df8dceaf
2018-11-09Cherry-pick: cldr-ticket 11507: Update Android CLDR tzdata from 2018e to ↵Victor Chang
2018f am: a71b248034 am: e415e10fce Change-Id: Iaf3e2c2eb2f502e05c5f9442a77640132981e6fc
2018-11-09Cherry-pick: cldr-ticket 11523: Update Android CLDR tzdata from 2018f to 2018gVictor Chang
am: e55918306d Change-Id: I70b1715dad7daaffa4eedb1ed18fbb5ef8104ee2
2018-11-09Cherry-pick: cldr-ticket 11507: Update Android CLDR tzdata from 2018e to 2018fVictor Chang
am: a71b248034 Change-Id: I4ba73d0b58880ebe8f409482d482054680bd84ba
2018-11-08Cherry-pick: cldr-ticket 11523: Update Android CLDR tzdata from 2018f to 2018gandroid-wear-8.0.0_r2Victor Chang
Cherrypick https://unicode.org/cldr/trac/changeset/14566 Bug: 117917198 Test: external/icu/tools/udpatecldrdata.py Change-Id: I472c42e045b4e47a2a9b31b45db958720934c0a3
2018-11-07Cherry-pick: cldr-ticket 11507: Update Android CLDR tzdata from 2018e to 2018fVictor Chang
Cherrypick https://unicode.org/cldr/trac/changeset/14552 Bug: 117917198 Test: external/icu/tools/udpatecldrdata.py Change-Id: I24a2e8695040a608401b2f7bd4c69f507ed67778
2018-10-30Merge remote-tracking branch 'aosp/cldr-release-34' into master am: ↵Victor Chang
b9545c9bee am: 2cf67e3dfb am: 1597ff8e23 Change-Id: Ia2ac960cf7d8c247f28cf13da7d4c4bea2505e85
2018-10-30Merge remote-tracking branch 'aosp/cldr-release-34' into master am: b9545c9beeVictor Chang
am: 2cf67e3dfb Change-Id: I71082744b8cc50c2cd8e23b0867ab6348dc25b41
2018-10-30Merge remote-tracking branch 'aosp/cldr-release-34' into masterVictor Chang
am: b9545c9bee Change-Id: I676559fcd406de7cffe527ea0be8574cd5343a72
2018-10-23Merge remote-tracking branch 'aosp/cldr-release-34' into masterVictor Chang
This updates CLDR to version 34 in preparation for the ICU 63.1 upgrade. Bug: 113100098 Test: Run external/icu/tools/updatecldrdata.py successfully. Change-Id: I7a254ccad4c9b68208a453cb8fa0c6c9d643ba6a
2018-10-20Copy CLDR 34 from unicode.orgcldr-release-35cldr-release-34Victor Chang
These files were exported from the CLDR Subversion repository by running the following commands: rm -rf * svn export --force https://unicode.org/repos/cldr/tags/release-34/ . git clean -dfX git add -A . Test: n/a Change-Id: Ie42df516d51e6dad397b8652d1b566d7dd16291d
2018-07-10Merge remote-tracking branch 'aosp/cldr-release-33-1' into aosp/master. am: ↵Fredrik Roubert
916131948a am: 40b6c069ee am: d86c64bc26 Change-Id: I1af0057f085484ac6b81f68c7e9d9e96d7a41e96
2018-07-10Merge remote-tracking branch 'aosp/cldr-release-33-1' into aosp/master. am: ↵Fredrik Roubert
916131948a am: 40b6c069ee Change-Id: Id72e3253f5dca1b2d226ff4b7406c82cd01893ea
2018-07-10Merge remote-tracking branch 'aosp/cldr-release-33-1' into aosp/master.master-cuttlefish-testing-releaseFredrik Roubert
am: 916131948a Change-Id: I2bb1baa11bffc54ad3360ce700cc47dcdde77e41
2018-07-09Merge remote-tracking branch 'aosp/cldr-release-33-1' into aosp/master.android-p-preview-5Fredrik Roubert
This updates AOSP to CLDR 33.1 in preparation for the ICU 62.1 upgrade. Bug: 111246576 Change-Id: I391323aa1215dd9cc021987e9f98251da9760381
2018-07-09Copy CLDR 33.1 from unicode.org to release-33-1.cldr-release-33-1Fredrik Roubert
These files were exported from the CLDR Subversion repository by running the following commands: rm -rf * svn export --force https://unicode.org/repos/cldr/tags/release-33-1 . git clean -dfX git add -A . Bug: 111246576 Change-Id: Ibd61af7472a114edb5a56012ca0a8c447c14f604
2018-06-01Merge remote-tracking branch 'aosp/cldr-release-33' into aosp/master. am: ↵Fredrik Roubert
1786145132 am: 1e1f6e7035 am: c890d65ade Change-Id: Iad2470835c0cc9ef3b629ba4bd96fd3d8acce8c3
2018-06-01Merge remote-tracking branch 'aosp/cldr-release-33' into aosp/master. am: ↵Fredrik Roubert
1786145132 am: 1e1f6e7035 Change-Id: I76021845f6fb3bbc9c675e06e0f1d057fc1f8746
2018-06-01Merge remote-tracking branch 'aosp/cldr-release-33' into aosp/master.Fredrik Roubert
am: 1786145132 Change-Id: If070da2c27d0071bb37db98b2a985750ba33c015
2018-05-31Merge remote-tracking branch 'aosp/cldr-release-33' into aosp/master.android-p-preview-4Fredrik Roubert
This updates AOSP to CLDR 33 in preparation for the ICU 61.1 upgrade. Bug: 79564536 Change-Id: Idf996e64bfafd7172deafe9521f079ada99a0782
2018-05-25Android patch: Fix pt-PT translation of "Mountain Time" am: b1a9c98d37 am: ↵Victor Chang
0533411865 am: 20016b4926 Change-Id: Ib24b35701a7a915a5284a5a9665d6b258d43f8f4
2018-05-25Android patch: Fix pt-PT translation of "Mountain Time" am: b1a9c98d37Victor Chang
am: 0533411865 Change-Id: I1904c3cc7d5f47c96ea8e6ba4992a654a2ad9aa1
2018-05-25Android patch: Fix pt-PT translation of "Mountain Time"Victor Chang
am: b1a9c98d37 Change-Id: Idac225182690db6d4ba66937dcb7eaceac687303
2018-05-25Android patch: Fix pt-PT translation of "Mountain Time"Victor Chang
CLDR ticket: https://unicode.org/cldr/trac/ticket/11111 - Regression of translation introduced in Android N - According to a pt-PT linguist, "Hora de Montanha" is wrong language-wise, regardless of where you use it. Bug: 77972075 Test: m Change-Id: Icc820c306ad086f09f5f519de88d896126ff13e8
2018-05-25Revert removal of roubert@google.com from OWNERS. am: 465d6a0fd1 am: e0b40fd805Fredrik Roubert
am: dac34eca7b Change-Id: Ieab21067fd9cb209fc584f8bace2730b230e6b06
2018-05-25Revert removal of roubert@google.com from OWNERS. am: 465d6a0fd1Fredrik Roubert
am: e0b40fd805 Change-Id: I249f0ee1fb509ff41eb647aef0fd4b93060ef8cf
2018-05-25Revert removal of roubert@google.com from OWNERS.Fredrik Roubert
am: 465d6a0fd1 Change-Id: I3180dff225aa199a9018e222a109392bb70786ef
2018-05-25Revert removal of roubert@google.com from OWNERS.Fredrik Roubert
This partially reverts commit a903cc7, the bug that required this entry to be removed then has been fixed now: https://gerrit.googlesource.com/plugins/find-owners/+/7a4ec6a Bug: 79676796 Test: repo upload Change-Id: Ideda071d5262bee8e4376f292e4b1fb9db2c37d9
2018-05-24Android patch: Customize likelySubtags. am: 037354b32a am: 117da98ee5Fredrik Roubert
am: 065a2a0e10 Change-Id: Id460412677c41e0477e1cfb2b3a290eee08c1297
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-20 00:27:38 +0000