From effc7f87feadc36c40355ace14722e80277d0312 Mon Sep 17 00:00:00 2001 From: Ram Viswanadha Date: Tue, 18 May 2004 02:47:52 +0000 Subject: [PATCH] ICU-3764 update calendar data format X-SVN-Rev: 15364 --- icu4c/source/data/locales/af.txt | 116 ++- icu4c/source/data/locales/af_ZA.txt | 26 +- icu4c/source/data/locales/am.txt | 124 ++- icu4c/source/data/locales/am_ET.txt | 36 +- icu4c/source/data/locales/ar.txt | 225 +++-- icu4c/source/data/locales/ar_IN.txt | 26 +- icu4c/source/data/locales/ar_JO.txt | 86 +- icu4c/source/data/locales/ar_LB.txt | 84 +- icu4c/source/data/locales/ar_MA.txt | 2 +- icu4c/source/data/locales/ar_QA.txt | 56 +- icu4c/source/data/locales/ar_SA.txt | 56 +- icu4c/source/data/locales/ar_SY.txt | 96 +- icu4c/source/data/locales/ar_TN.txt | 58 +- icu4c/source/data/locales/ar_YE.txt | 56 +- icu4c/source/data/locales/be.txt | 149 +-- icu4c/source/data/locales/bg.txt | 143 +-- icu4c/source/data/locales/bn.txt | 112 ++- icu4c/source/data/locales/bn_IN.txt | 26 +- icu4c/source/data/locales/ca.txt | 126 +-- icu4c/source/data/locales/ca_ES.txt | 13 +- icu4c/source/data/locales/cs.txt | 152 +-- icu4c/source/data/locales/da.txt | 167 ++-- icu4c/source/data/locales/de.txt | 174 ++-- icu4c/source/data/locales/de_AT.txt | 94 +- icu4c/source/data/locales/de_BE.txt | 95 -- icu4c/source/data/locales/de_LU.txt | 10 +- icu4c/source/data/locales/el.txt | 151 +-- icu4c/source/data/locales/en.txt | 136 +-- icu4c/source/data/locales/en_AU.txt | 26 +- icu4c/source/data/locales/en_BE.txt | 35 +- icu4c/source/data/locales/en_BW.txt | 26 +- icu4c/source/data/locales/en_CA.txt | 26 +- icu4c/source/data/locales/en_GB.txt | 36 +- icu4c/source/data/locales/en_GB_EURO.txt | 1 - icu4c/source/data/locales/en_HK.txt | 38 - icu4c/source/data/locales/en_IE.txt | 34 +- icu4c/source/data/locales/en_IN.txt | 35 - icu4c/source/data/locales/en_MT.txt | 36 +- icu4c/source/data/locales/en_NZ.txt | 26 +- icu4c/source/data/locales/en_PH.txt | 26 +- icu4c/source/data/locales/en_SG.txt | 26 +- icu4c/source/data/locales/en_ZA.txt | 26 +- icu4c/source/data/locales/en_ZW.txt | 26 +- icu4c/source/data/locales/eo.txt | 151 +-- icu4c/source/data/locales/es.txt | 166 ++-- icu4c/source/data/locales/es_AR.txt | 26 +- icu4c/source/data/locales/es_BO.txt | 26 +- icu4c/source/data/locales/es_CL.txt | 26 +- icu4c/source/data/locales/es_CO.txt | 26 +- icu4c/source/data/locales/es_CR.txt | 26 +- icu4c/source/data/locales/es_DO.txt | 26 +- icu4c/source/data/locales/es_EC.txt | 26 +- icu4c/source/data/locales/es_ES.txt | 26 +- icu4c/source/data/locales/es_GT.txt | 26 +- icu4c/source/data/locales/es_HN.txt | 26 +- icu4c/source/data/locales/es_MX.txt | 26 +- icu4c/source/data/locales/es_NI.txt | 26 +- icu4c/source/data/locales/es_PA.txt | 26 +- icu4c/source/data/locales/es_PE.txt | 26 +- icu4c/source/data/locales/es_PR.txt | 26 +- icu4c/source/data/locales/es_PY.txt | 26 +- icu4c/source/data/locales/es_SV.txt | 26 +- icu4c/source/data/locales/es_US.txt | 35 +- icu4c/source/data/locales/es_UY.txt | 26 +- icu4c/source/data/locales/es_VE.txt | 26 +- icu4c/source/data/locales/et.txt | 143 +-- icu4c/source/data/locales/eu.txt | 104 +- icu4c/source/data/locales/eu_ES.txt | 35 +- icu4c/source/data/locales/fa.txt | 142 +-- icu4c/source/data/locales/fa_AF.txt | 252 ----- icu4c/source/data/locales/fa_IR.txt | 13 +- icu4c/source/data/locales/fi.txt | 261 +++-- icu4c/source/data/locales/fo.txt | 126 +-- icu4c/source/data/locales/fr.txt | 260 ++--- icu4c/source/data/locales/fr_BE.txt | 36 +- icu4c/source/data/locales/fr_CA.txt | 26 +- icu4c/source/data/locales/fr_CH.txt | 36 +- icu4c/source/data/locales/fr_FR.txt | 10 +- icu4c/source/data/locales/fr_LU.txt | 10 +- icu4c/source/data/locales/ga.txt | 121 ++- icu4c/source/data/locales/ga_IE.txt | 28 +- icu4c/source/data/locales/gl.txt | 104 +- icu4c/source/data/locales/gl_ES.txt | 35 +- icu4c/source/data/locales/gu.txt | 112 ++- icu4c/source/data/locales/gu_IN.txt | 28 +- icu4c/source/data/locales/gv.txt | 120 ++- icu4c/source/data/locales/gv_GB.txt | 35 +- icu4c/source/data/locales/he.txt | 246 ++--- icu4c/source/data/locales/hi.txt | 124 +-- icu4c/source/data/locales/hi_IN.txt | 28 +- icu4c/source/data/locales/hr.txt | 135 +-- icu4c/source/data/locales/hu.txt | 270 ++--- icu4c/source/data/locales/hy.txt | 156 +-- icu4c/source/data/locales/hy_AM.txt | 25 +- icu4c/source/data/locales/hy_AM_REVISED.txt | 98 +- icu4c/source/data/locales/id.txt | 104 +- icu4c/source/data/locales/id_ID.txt | 24 +- icu4c/source/data/locales/is.txt | 126 +-- icu4c/source/data/locales/it.txt | 174 ++-- icu4c/source/data/locales/it_CH.txt | 26 +- icu4c/source/data/locales/it_IT.txt | 24 +- icu4c/source/data/locales/ja.txt | 596 +++++------ .../source/data/locales/ja_JP_TRADITIONAL.txt | 4 +- icu4c/source/data/locales/kk.txt | 133 +-- icu4c/source/data/locales/kl.txt | 104 +- icu4c/source/data/locales/kl_GL.txt | 26 +- icu4c/source/data/locales/kn.txt | 112 ++- icu4c/source/data/locales/kn_IN.txt | 28 +- icu4c/source/data/locales/ko.txt | 134 +-- icu4c/source/data/locales/ko_KR.txt | 26 +- icu4c/source/data/locales/kok.txt | 115 ++- icu4c/source/data/locales/kok_IN.txt | 28 +- icu4c/source/data/locales/kw.txt | 120 ++- icu4c/source/data/locales/kw_GB.txt | 35 +- icu4c/source/data/locales/lt.txt | 143 +-- icu4c/source/data/locales/lv.txt | 143 +-- icu4c/source/data/locales/mk.txt | 143 +-- icu4c/source/data/locales/mr.txt | 114 ++- icu4c/source/data/locales/mr_IN.txt | 28 +- icu4c/source/data/locales/ms.txt | 102 +- icu4c/source/data/locales/ms_BN.txt | 2 +- icu4c/source/data/locales/ms_MY.txt | 26 +- icu4c/source/data/locales/mt.txt | 199 ++-- icu4c/source/data/locales/nb.txt | 166 ++-- icu4c/source/data/locales/nl.txt | 271 ++--- icu4c/source/data/locales/nl_BE.txt | 35 +- icu4c/source/data/locales/nn.txt | 143 +-- icu4c/source/data/locales/om.txt | 121 ++- icu4c/source/data/locales/om_ET.txt | 34 +- icu4c/source/data/locales/om_KE.txt | 34 +- icu4c/source/data/locales/pa.txt | 112 ++- icu4c/source/data/locales/pa_IN.txt | 33 +- icu4c/source/data/locales/pl.txt | 143 +-- icu4c/source/data/locales/ps.txt | 136 +-- icu4c/source/data/locales/pt.txt | 157 +-- icu4c/source/data/locales/pt_BR.txt | 26 +- icu4c/source/data/locales/pt_PT.txt | 37 +- icu4c/source/data/locales/ro.txt | 143 +-- icu4c/source/data/locales/root.txt | 938 ++++++++++-------- icu4c/source/data/locales/ru.txt | 143 +-- icu4c/source/data/locales/ru_UA.txt | 26 +- icu4c/source/data/locales/sh.txt | 143 +-- icu4c/source/data/locales/sk.txt | 144 +-- icu4c/source/data/locales/sl.txt | 142 +-- icu4c/source/data/locales/so.txt | 151 +-- icu4c/source/data/locales/so_DJ.txt | 2 +- icu4c/source/data/locales/so_ET.txt | 2 +- icu4c/source/data/locales/so_KE.txt | 6 +- icu4c/source/data/locales/so_SO.txt | 2 +- icu4c/source/data/locales/sq.txt | 151 +-- icu4c/source/data/locales/sr.txt | 143 +-- icu4c/source/data/locales/sv.txt | 143 +-- icu4c/source/data/locales/sv_FI.txt | 2 +- icu4c/source/data/locales/sw.txt | 120 ++- icu4c/source/data/locales/ta.txt | 120 ++- icu4c/source/data/locales/ta_IN.txt | 31 +- icu4c/source/data/locales/te.txt | 112 ++- icu4c/source/data/locales/te_IN.txt | 27 +- icu4c/source/data/locales/th.txt | 175 ++-- .../source/data/locales/th_TH_TRADITIONAL.txt | 4 +- icu4c/source/data/locales/ti.txt | 130 +-- icu4c/source/data/locales/ti_ER.txt | 126 +-- icu4c/source/data/locales/ti_ET.txt | 26 +- icu4c/source/data/locales/tr.txt | 143 +-- icu4c/source/data/locales/uk.txt | 134 +-- icu4c/source/data/locales/vi.txt | 153 +-- icu4c/source/data/locales/zh.txt | 112 ++- icu4c/source/data/locales/zh_CN.txt | 25 +- icu4c/source/data/locales/zh_HK.txt | 80 +- icu4c/source/data/locales/zh_MO.txt | 81 +- icu4c/source/data/locales/zh_SG.txt | 53 - icu4c/source/data/locales/zh_TW.txt | 34 +- 172 files changed, 8155 insertions(+), 7082 deletions(-) diff --git a/icu4c/source/data/locales/af.txt b/icu4c/source/data/locales/af.txt index 9c403f49e84..6e651433be1 100644 --- a/icu4c/source/data/locales/af.txt +++ b/icu4c/source/data/locales/af.txt @@ -8,10 +8,7 @@ af { Version { "4.0" } - AmPmMarkers { - "vm", - "nm" - } + Countries { //Fallback{ "en" } // Some of the names are the same as en. @@ -173,28 +170,6 @@ af { Currencies { ZAR { "R", "Rand" } } - DayAbbreviations { - "So", - "Ma", - "Di", - "Wo", - "Do", - "Vr", - "Sa", - } - DayNames { - "Sondag", - "Maandag", - "Dinsdag", - "Woensdag", - "Donderdag", - "Vrydag", - "Saterdag", - } - Eras { - "v.C.", - "n.C." - } Languages { //af { "Afrikaanse" } // adjective form af { "Afrikaans" } @@ -203,33 +178,68 @@ af { LocaleScript{ "Latn", // ISO 15924 Name } - MonthAbbreviations { - "Jan", - "Feb", - "Mar", - "Apr", - "Mei", - "Jun", - "Jul", - "Aug", - "Sep", - "Okt", - "Nov", - "Des", - } - MonthNames { - "Januarie", - "Februarie", - "Maart", - "April", - "Mei", - "Junie", - "Julie", - "Augustus", - "September", - "Oktober", - "November", - "Desember", + + calendar{ + gregorian{ + eras { + "v.C.", + "n.C." + } + dayNames{ + format{ + abbreviated { + "So", + "Ma", + "Di", + "Wo", + "Do", + "Vr", + "Sa", + } + wide { + "Sondag", + "Maandag", + "Dinsdag", + "Woensdag", + "Donderdag", + "Vrydag", + "Saterdag", + } + } + } + monthNames{ + format{ + abbreviated { + "Jan", + "Feb", + "Mar", + "Apr", + "Mei", + "Jun", + "Jul", + "Aug", + "Sep", + "Okt", + "Nov", + "Des", + } + wide { + "Januarie", + "Februarie", + "Maart", + "April", + "Mei", + "Junie", + "Julie", + "Augustus", + "September", + "Oktober", + "November", + "Desember", + } + } + } + } } NumberElements { ",", diff --git a/icu4c/source/data/locales/af_ZA.txt b/icu4c/source/data/locales/af_ZA.txt index 535b405a5a5..b0ec5a8c945 100644 --- a/icu4c/source/data/locales/af_ZA.txt +++ b/icu4c/source/data/locales/af_ZA.txt @@ -8,21 +8,25 @@ af_ZA { Version { "2.0" } - DateTimePatterns { - "h:mm:ss a", - "h:mm:ss a", - "h:mm:ss a", - "h:mm a", - "EEEE dd MMMM yyyy", - "dd MMMM yyyy", - "dd MMM yyyy", - "yyyy/MM/dd", - "{1} {0}", - } NumberPatterns { "#,##0.###;-#,##0.###", "\u00a4#,##0.00;-\u00a4#,##0.00", "#,##0%", "#E0", } + calendar{ + gregorian{ + DateTimePatterns{ + "h:mm:ss a", + "h:mm:ss a", + "h:mm:ss a", + "h:mm a", + "EEEE dd MMMM yyyy", + "dd MMMM yyyy", + "dd MMM yyyy", + "yyyy/MM/dd", + "{1} {0}", + } + } + } } diff --git a/icu4c/source/data/locales/am.txt b/icu4c/source/data/locales/am.txt index 097437d3a91..dbc848321b8 100644 --- a/icu4c/source/data/locales/am.txt +++ b/icu4c/source/data/locales/am.txt @@ -9,65 +9,79 @@ am { Version{ "2.0" } - DayAbbreviations { - "\u12A5\u1211\u12F5", - "\u1230\u129E", - "\u121B\u12AD\u1230", - "\u1228\u1261\u12D5", - "\u1210\u1219\u1235", - "\u12D3\u122D\u1265", - "\u1245\u12F3\u121C", - } - DayNames { - "\u12A5\u1211\u12F5", - "\u1230\u129E", - "\u121B\u12AD\u1230\u129E", - "\u1228\u1261\u12D5", - "\u1210\u1219\u1235", - "\u12D3\u122D\u1265", - "\u1245\u12F3\u121C", - } -// LanguageLibraryUse { "amh" } - MonthAbbreviations { - "\u1303\u1295\u12E9", - "\u134C\u1265\u1229", - "\u121B\u122D\u127D", - "\u12A4\u1355\u1228", - "\u121C\u12ED", - "\u1301\u1295", - "\u1301\u120B\u12ED", - "\u12A6\u1308\u1235", - "\u1234\u1355\u1274", - "\u12A6\u12AD\u1270", - "\u1296\u126C\u121D", - "\u12F2\u1234\u121D", - } - MonthNames { - "\u1303\u1295\u12E9\u12C8\u122A", - "\u134C\u1265\u1229\u12C8\u122A", - "\u121B\u122D\u127D", - "\u12A4\u1355\u1228\u120D", - "\u121C\u12ED", - "\u1301\u1295", - "\u1301\u120B\u12ED", - "\u12A6\u1308\u1235\u1275", - "\u1234\u1355\u1274\u121D\u1260\u122D", - "\u12A6\u12AD\u1270\u12CD\u1260\u122D", - "\u1296\u126C\u121D\u1260\u122D", - "\u12F2\u1234\u121D\u1260\u122D", - } + calendar{ + gregorian{ + DateTimeElements:intvector { + 7, + 1, + } + + dayNames{ + format{ + + abbreviated { + "\u12A5\u1211\u12F5", + "\u1230\u129E", + "\u121B\u12AD\u1230", + "\u1228\u1261\u12D5", + "\u1210\u1219\u1235", + "\u12D3\u122D\u1265", + "\u1245\u12F3\u121C", + } + wide { + "\u12A5\u1211\u12F5", + "\u1230\u129E", + "\u121B\u12AD\u1230\u129E", + "\u1228\u1261\u12D5", + "\u1210\u1219\u1235", + "\u12D3\u122D\u1265", + "\u1245\u12F3\u121C", + } + } + } + eras { + "\u12D3/\u12D3", + "\u12D3/\u121D" + } + monthNames{ + format{ + abbreviated { + "\u1303\u1295\u12E9", + "\u134C\u1265\u1229", + "\u121B\u122D\u127D", + "\u12A4\u1355\u1228", + "\u121C\u12ED", + "\u1301\u1295", + "\u1301\u120B\u12ED", + "\u12A6\u1308\u1235", + "\u1234\u1355\u1274", + "\u12A6\u12AD\u1270", + "\u1296\u126C\u121D", + "\u12F2\u1234\u121D", + } + wide { + "\u1303\u1295\u12E9\u12C8\u122A", + "\u134C\u1265\u1229\u12C8\u122A", + "\u121B\u122D\u127D", + "\u12A4\u1355\u1228\u120D", + "\u121C\u12ED", + "\u1301\u1295", + "\u1301\u120B\u12ED", + "\u12A6\u1308\u1235\u1275", + "\u1234\u1355\u1274\u121D\u1260\u122D", + "\u12A6\u12AD\u1270\u12CD\u1260\u122D", + "\u1296\u126C\u121D\u1260\u122D", + "\u12F2\u1234\u121D\u1260\u122D", + } + } + } + } + } LocaleScript { "Ethi", } ExemplarCharacters{"[:Ethi:]"} - DateTimeElements:intvector { - 7, - 1, - } - Eras { - "\u12D3/\u12D3", - "\u12D3/\u121D" - } + Languages { aa { "\u12A0\u134B\u122D\u129B" } ab { "\u12A0\u1265\u1210\u12DA\u129B" } diff --git a/icu4c/source/data/locales/am_ET.txt b/icu4c/source/data/locales/am_ET.txt index a64d773f3d8..5f87fcf81a5 100644 --- a/icu4c/source/data/locales/am_ET.txt +++ b/icu4c/source/data/locales/am_ET.txt @@ -9,21 +9,6 @@ am_ET { Version{ "2.0" } - AmPmMarkers { - "\u1321\u12CB\u1275", - "\u12A8\u1233\u12D3\u1275", - } - DateTimePatterns { - "hh:mm:ss a", - "hh:mm:ss a", - "h:mm:ss a", - "h:mm a", - "EEEE\u1363 dd MMMM \u1240\u1295 yyyy G", - "dd MMMM yyyy", - "dd-MMM-yy", - "dd/MM/yy", - "{1} {0}", - } // Measurement { "Metric" } // NumberElements { // ".", @@ -54,4 +39,23 @@ am_ET { Currencies { ETB { "$", "ETB" } } - } + calendar{ + gregorian{ + AmPmMarkers{ + "\u1321\u12CB\u1275", + "\u12A8\u1233\u12D3\u1275", + } + DateTimePatterns{ + "hh:mm:ss a", + "hh:mm:ss a", + "h:mm:ss a", + "h:mm a", + "EEEE\u1363 dd MMMM \u1240\u1295 yyyy G", + "dd MMMM yyyy", + "dd-MMM-yy", + "dd/MM/yy", + "{1} {0}", + } + } + } +} diff --git a/icu4c/source/data/locales/ar.txt b/icu4c/source/data/locales/ar.txt index 30d326e3fbf..204909148d3 100644 --- a/icu4c/source/data/locales/ar.txt +++ b/icu4c/source/data/locales/ar.txt @@ -7,10 +7,6 @@ ar { Version{"2.0"} - AmPmMarkers { - "\u0635", - "\u0645", - } Countries { AD { "\u0627\u0646\u062f\u0648\u0631\u0627" } //AE { "\u0627\u0644\u0625\u0645\u0627\u0631\u0627\u062A" } @@ -233,43 +229,6 @@ ar { ZM { "\u0632\u0627\u0645\u0628\u064a\u0627" } ZW { "\u0632\u064a\u0645\u0628\u0627\u0628\u0648\u064a" } } - DateTimeElements:intvector { - 7, - 1, - } - DateTimePatterns { - "z h:mm:ss a", - "h:mm:ss a", - "h:mm:ss a", - "h:mm a", - "EEEE, d MMMM, yyyy", - "d MMMM, yyyy", - "dd/MM/yyyy", - "d/M/yyyy", - "{1} {0}", - } - DayAbbreviations { - "\u062D", - "\u0646", - "\u062B", - "\u0631", - "\u062E", - "\u062C", - "\u0633", - } - DayNames { - "\u0627\u0644\u0623\u062D\u062F", - "\u0627\u0644\u0627\u062B\u0646\u064A\u0646", - "\u0627\u0644\u062B\u0644\u0627\u062B\u0627\u0621", - "\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621", - "\u0627\u0644\u062E\u0645\u064A\u0633", - "\u0627\u0644\u062C\u0645\u0639\u0629", - "\u0627\u0644\u0633\u0628\u062A", - } - Eras { - "\u0642.\u0645", - "\u0645", - } // Note to translator: Sometimes the hamza is optional for these translations. Languages { ar { "\u0627\u0644\u0639\u0631\u0628\u064A\u0629" } @@ -319,34 +278,6 @@ ar { vi { "\u0627\u0644\u0641\u064A\u062A\u0646\u0627\u0645\u064A\u0629" } zh { "\u0627\u0644\u0635\u064A\u0646\u064A\u0629" } } - MonthAbbreviations { - "\u064A\u0646\u0627\u064A\u0631", - "\u0641\u0628\u0631\u0627\u064A\u0631", - "\u0645\u0627\u0631\u0633", - "\u0623\u0628\u0631\u064A\u0644", - "\u0645\u0627\u064A\u0648", - "\u064A\u0648\u0646\u064A\u0648", - "\u064A\u0648\u0644\u064A\u0648", - "\u0623\u063A\u0633\u0637\u0633", - "\u0633\u0628\u062A\u0645\u0628\u0631", - "\u0623\u0643\u062A\u0648\u0628\u0631", - "\u0646\u0648\u0641\u0645\u0628\u0631", - "\u062F\u064A\u0633\u0645\u0628\u0631", - } - MonthNames { - "\u064A\u0646\u0627\u064A\u0631", - "\u0641\u0628\u0631\u0627\u064A\u0631", - "\u0645\u0627\u0631\u0633", - "\u0623\u0628\u0631\u064A\u0644", - "\u0645\u0627\u064A\u0648", - "\u064A\u0648\u0646\u064A\u0648", - "\u064A\u0648\u0644\u064A\u0648", - "\u0623\u063A\u0633\u0637\u0633", - "\u0633\u0628\u062A\u0645\u0628\u0631", - "\u0623\u0643\u062A\u0648\u0628\u0631", - "\u0646\u0648\u0641\u0645\u0628\u0631", - "\u062F\u064A\u0633\u0645\u0628\u0631", - } NumberElements { "\u066B", "\u066C", @@ -398,42 +329,124 @@ ar { TND { "\u062F.\u062A.\u200F", "TND" } YER { "\u0631.\u064A.\u200F", "YER" } } - - // (ICU 2.6) International Calendar Data. Note, THE FORMAT OF THIS DATA WILL CHANGE IN FUTURE RELEASES. - - Eras_buddhist:array{ "\u0627\u0644\u062A\u0642\u0648\u064A\u0645 \u0627\u0644\u0628\u0648\u0630\u064A" } - - // Islamic calendar - Eras_islamic:array { - "\u0647\u200D" // AH + calendar{ + islamic{ + // islamic calendar + eras:array { + "\u0647\u200D" // AH + } + monthNames{ + format{ + wide{ + "\u0645\u062D\u0631\u0645", // Muharram + "\u0635\u0641\u0631", // Safar + "\u0631\u0628\u064A\u0639 \u0627\u0644\u0623\u0648\u0644", // Rabi' I + "\u0631\u0628\u064A\u0639 \u0627\u0644\u0622\u062E\u0631", // Rabi' II + "\u062C\u0645\u0627\u062F\u0649 \u0627\u0644\u0623\u0648\u0644\u0649", // Jumada I + "\u062C\u0645\u0627\u062F\u0649 \u0627\u0644\u0622\u062E\u0631\u0629", // Jumada I + "\u0631\u062C\u0628", // Rajab + "\u0634\u0639\u0628\u0627\u0646", // Sha'ban + "\u0631\u0645\u0636\u0627\u0646", // Ramadan + "\u0634\u0648\u0627\u0644", // Shawwal + "\u0630\u0648 \u0627\u0644\u0642\u0639\u062F\u0629", // Dhu'l-Qi'dah + "\u0630\u0648 \u0627\u0644\u062D\u062C\u0629" // Dhu'l-Hijjah + } + abbreviated:alias { // same as MonthNames (no data) + "ar/calendar/islamic/monthNames/format/wide" + } + } + } + } + islamic-civil{ + // Civil is identical other than in calculations + eras:alias { + "ar/calendar/islamic/eras" + } + monthNames:alias{ + "ar/calendar/islamic/monthNames" + } + } + buddhist{ + eras:array{ "\u0627\u0644\u062A\u0642\u0648\u064A\u0645 \u0627\u0644\u0628\u0648\u0630\u064A" } + } + gregorian{ + AmPmMarkers{ + "\u0635", + "\u0645", + } + DateTimePatterns{ + "z h:mm:ss a", + "h:mm:ss a", + "h:mm:ss a", + "h:mm a", + "EEEE, d MMMM, yyyy", + "d MMMM, yyyy", + "dd/MM/yyyy", + "d/M/yyyy", + "{1} {0}", + } + DateTimeElements:intvector { + 7, + 1, + } + dayNames{ + format{ + abbreviated{ + "\u062D", + "\u0646", + "\u062B", + "\u0631", + "\u062E", + "\u062C", + "\u0633", + } + wide{ + "\u0627\u0644\u0623\u062D\u062F", + "\u0627\u0644\u0627\u062B\u0646\u064A\u0646", + "\u0627\u0644\u062B\u0644\u0627\u062B\u0627\u0621", + "\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621", + "\u0627\u0644\u062E\u0645\u064A\u0633", + "\u0627\u0644\u062C\u0645\u0639\u0629", + "\u0627\u0644\u0633\u0628\u062A", + } + } + } + eras{ + "\u0642.\u0645", + "\u0645", + } + monthNames{ + format{ + abbreviated{ + "\u064A\u0646\u0627\u064A\u0631", + "\u0641\u0628\u0631\u0627\u064A\u0631", + "\u0645\u0627\u0631\u0633", + "\u0623\u0628\u0631\u064A\u0644", + "\u0645\u0627\u064A\u0648", + "\u064A\u0648\u0646\u064A\u0648", + "\u064A\u0648\u0644\u064A\u0648", + "\u0623\u063A\u0633\u0637\u0633", + "\u0633\u0628\u062A\u0645\u0628\u0631", + "\u0623\u0643\u062A\u0648\u0628\u0631", + "\u0646\u0648\u0641\u0645\u0628\u0631", + "\u062F\u064A\u0633\u0645\u0628\u0631", + } + wide{ + "\u064A\u0646\u0627\u064A\u0631", + "\u0641\u0628\u0631\u0627\u064A\u0631", + "\u0645\u0627\u0631\u0633", + "\u0623\u0628\u0631\u064A\u0644", + "\u0645\u0627\u064A\u0648", + "\u064A\u0648\u0646\u064A\u0648", + "\u064A\u0648\u0644\u064A\u0648", + "\u0623\u063A\u0633\u0637\u0633", + "\u0633\u0628\u062A\u0645\u0628\u0631", + "\u0623\u0643\u062A\u0648\u0628\u0631", + "\u0646\u0648\u0641\u0645\u0628\u0631", + "\u062F\u064A\u0633\u0645\u0628\u0631", + } + } + } + } } - - MonthNames_islamic { - "\u0645\u062D\u0631\u0645", // Muharram - "\u0635\u0641\u0631", // Safar - "\u0631\u0628\u064A\u0639 \u0627\u0644\u0623\u0648\u0644", // Rabi' I - "\u0631\u0628\u064A\u0639 \u0627\u0644\u0622\u062E\u0631", // Rabi' II - "\u062C\u0645\u0627\u062F\u0649 \u0627\u0644\u0623\u0648\u0644\u0649", // Jumada I - "\u062C\u0645\u0627\u062F\u0649 \u0627\u0644\u0622\u062E\u0631\u0629", // Jumada I - "\u0631\u062C\u0628", // Rajab - "\u0634\u0639\u0628\u0627\u0646", // Sha'ban - "\u0631\u0645\u0636\u0627\u0646", // Ramadan - "\u0634\u0648\u0627\u0644", // Shawwal - "\u0630\u0648 \u0627\u0644\u0642\u0639\u062F\u0629", // Dhu'l-Qi'dah - "\u0630\u0648 \u0627\u0644\u062D\u062C\u0629" // Dhu'l-Hijjah - } - MonthAbbreviations_islamic:alias { // same as MonthNames (no data) - "ar/MonthNames_islamic" - } - // Civil is identical other than in calculations - Eras_islamic-civil:alias { - "ar/Eras_islamic" - } - MonthNames_islamic-civil:alias { - "ar/MonthNames_islamic" - } - MonthAbbreviations_islamic-civil:alias { - "ar/MonthAbbreviations_islamic" - } - } diff --git a/icu4c/source/data/locales/ar_IN.txt b/icu4c/source/data/locales/ar_IN.txt index 4137d549cf8..3d2de7ce345 100644 --- a/icu4c/source/data/locales/ar_IN.txt +++ b/icu4c/source/data/locales/ar_IN.txt @@ -8,17 +8,6 @@ ar_IN { Version{ "2.0" } - DateTimePatterns { - "h:mm:ss a z", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", - "EEEE d MMMM yyyy", - "d MMMM yyyy", - "dd-MM-yyyy", - "d-M-yy", - "{1} {0}" - } // Duplicated in parent // NumberElements { // ".", @@ -41,4 +30,19 @@ ar_IN { } // LocaleString { "ar_IN" } // ShortCountry { "IND" } + calendar{ + gregorian{ + DateTimePatterns{ + "h:mm:ss a z", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", + "EEEE d MMMM yyyy", + "d MMMM yyyy", + "dd-MM-yyyy", + "d-M-yy", + "{1} {0}" + } + } + } } diff --git a/icu4c/source/data/locales/ar_JO.txt b/icu4c/source/data/locales/ar_JO.txt index 5ca715f92ee..a54e6c4f831 100644 --- a/icu4c/source/data/locales/ar_JO.txt +++ b/icu4c/source/data/locales/ar_JO.txt @@ -7,47 +7,59 @@ ar_JO { Version{ "2.0" } - DayAbbreviations { - "\u0627\u0644\u0623\u062D\u062F", - "\u0627\u0644\u0627\u062B\u0646\u064A\u0646", - "\u0627\u0644\u062B\u0644\u0627\u062B\u0627\u0621", - "\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621", - "\u0627\u0644\u062E\u0645\u064A\u0633", - "\u0627\u0644\u062C\u0645\u0639\u0629", - "\u0627\u0644\u0633\u0628\u062A", - } - MonthAbbreviations { - "\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u062B\u0627\u0646\u064A", - "\u0634\u0628\u0627\u0637", - "\u0622\u0630\u0627\u0631", - "\u0646\u064A\u0633\u0627\u0646", - "\u0623\u064a\u0627\u0631", - "\u062D\u0632\u064A\u0631\u0627\u0646", - "\u062A\u0645\u0648\u0632", - "\u0622\u0628", - "\u0623\u064A\u0644\u0648\u0644", - "\u062A\u0634\u0631\u064A\u0646 \u0627\u0644\u0623\u0648\u0644", - "\u062A\u0634\u0631\u064A\u0646 \u0627\u0644\u062B\u0627\u0646\u064A", - "\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u0623\u0648\u0644", - } - MonthNames { - "\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u062B\u0627\u0646\u064A", - "\u0634\u0628\u0627\u0637", - "\u0622\u0630\u0627\u0631", - "\u0646\u064A\u0633\u0627\u0646", - "\u0623\u064a\u0627\u0631", - "\u062D\u0632\u064A\u0631\u0627\u0646", - "\u062A\u0645\u0648\u0632", - "\u0622\u0628", - "\u0623\u064A\u0644\u0648\u0644", - "\u062A\u0634\u0631\u064A\u0646 \u0627\u0644\u0623\u0648\u0644", - "\u062A\u0634\u0631\u064A\u0646 \u0627\u0644\u062B\u0627\u0646\u064A", - "\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u0623\u0648\u0644", - } NumberPatterns { "#,##0.###;#,##0.###-", "\u00A4 #,##0.000;\u00A4 #,##0.000-", "#,##0%", "#E0", } + calendar{ + gregorian{ + dayNames{ + format{ + abbreviated{ + "\u0627\u0644\u0623\u062D\u062F", + "\u0627\u0644\u0627\u062B\u0646\u064A\u0646", + "\u0627\u0644\u062B\u0644\u0627\u062B\u0627\u0621", + "\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621", + "\u0627\u0644\u062E\u0645\u064A\u0633", + "\u0627\u0644\u062C\u0645\u0639\u0629", + "\u0627\u0644\u0633\u0628\u062A", + } + } + } + monthNames{ + format{ + abbreviated{ + "\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u062B\u0627\u0646\u064A", + "\u0634\u0628\u0627\u0637", + "\u0622\u0630\u0627\u0631", + "\u0646\u064A\u0633\u0627\u0646", + "\u0623\u064a\u0627\u0631", + "\u062D\u0632\u064A\u0631\u0627\u0646", + "\u062A\u0645\u0648\u0632", + "\u0622\u0628", + "\u0623\u064A\u0644\u0648\u0644", + "\u062A\u0634\u0631\u064A\u0646 \u0627\u0644\u0623\u0648\u0644", + "\u062A\u0634\u0631\u064A\u0646 \u0627\u0644\u062B\u0627\u0646\u064A", + "\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u0623\u0648\u0644", + } + wide{ + "\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u062B\u0627\u0646\u064A", + "\u0634\u0628\u0627\u0637", + "\u0622\u0630\u0627\u0631", + "\u0646\u064A\u0633\u0627\u0646", + "\u0623\u064a\u0627\u0631", + "\u062D\u0632\u064A\u0631\u0627\u0646", + "\u062A\u0645\u0648\u0632", + "\u0622\u0628", + "\u0623\u064A\u0644\u0648\u0644", + "\u062A\u0634\u0631\u064A\u0646 \u0627\u0644\u0623\u0648\u0644", + "\u062A\u0634\u0631\u064A\u0646 \u0627\u0644\u062B\u0627\u0646\u064A", + "\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u0623\u0648\u0644", + } + } + } + } + } } diff --git a/icu4c/source/data/locales/ar_LB.txt b/icu4c/source/data/locales/ar_LB.txt index c1cbae31c64..1f7b43a5d82 100644 --- a/icu4c/source/data/locales/ar_LB.txt +++ b/icu4c/source/data/locales/ar_LB.txt @@ -7,41 +7,53 @@ ar_LB { Version{ "2.0" } - DayAbbreviations { - "\u0627\u0644\u0623\u062D\u062F", - "\u0627\u0644\u0627\u062B\u0646\u064A\u0646", - "\u0627\u0644\u062B\u0644\u0627\u062B\u0627\u0621", - "\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621", - "\u0627\u0644\u062E\u0645\u064A\u0633", - "\u0627\u0644\u062C\u0645\u0639\u0629", - "\u0627\u0644\u0633\u0628\u062A", - } - MonthAbbreviations { - "\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u062B\u0627\u0646\u064A", - "\u0634\u0628\u0627\u0637", - "\u0622\u0630\u0627\u0631", - "\u0646\u064A\u0633\u0627\u0646", - "\u0646\u0648\u0627\u0631", - "\u062D\u0632\u064A\u0631\u0627\u0646", - "\u062A\u0645\u0648\u0632", - "\u0622\u0628", - "\u0623\u064A\u0644\u0648\u0644", - "\u062A\u0634\u0631\u064A\u0646 \u0627\u0644\u0623\u0648\u0644", - "\u062A\u0634\u0631\u064A\u0646 \u0627\u0644\u062B\u0627\u0646\u064A", - "\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u0623\u0648\u0644", - } - MonthNames { - "\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u062B\u0627\u0646\u064A", - "\u0634\u0628\u0627\u0637", - "\u0622\u0630\u0627\u0631", - "\u0646\u064A\u0633\u0627\u0646", - "\u0646\u0648\u0627\u0631", - "\u062D\u0632\u064A\u0631\u0627\u0646", - "\u062A\u0645\u0648\u0632", - "\u0622\u0628", - "\u0623\u064A\u0644\u0648\u0644", - "\u062A\u0634\u0631\u064A\u0646 \u0627\u0644\u0623\u0648\u0644", - "\u062A\u0634\u0631\u064A\u0646 \u0627\u0644\u062B\u0627\u0646\u064A", - "\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u0623\u0648\u0644", + calendar{ + gregorian{ + dayNames{ + format{ + abbreviated{ + "\u0627\u0644\u0623\u062D\u062F", + "\u0627\u0644\u0627\u062B\u0646\u064A\u0646", + "\u0627\u0644\u062B\u0644\u0627\u062B\u0627\u0621", + "\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621", + "\u0627\u0644\u062E\u0645\u064A\u0633", + "\u0627\u0644\u062C\u0645\u0639\u0629", + "\u0627\u0644\u0633\u0628\u062A", + } + } + } + monthNames{ + format{ + abbreviated{ + "\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u062B\u0627\u0646\u064A", + "\u0634\u0628\u0627\u0637", + "\u0622\u0630\u0627\u0631", + "\u0646\u064A\u0633\u0627\u0646", + "\u0646\u0648\u0627\u0631", + "\u062D\u0632\u064A\u0631\u0627\u0646", + "\u062A\u0645\u0648\u0632", + "\u0622\u0628", + "\u0623\u064A\u0644\u0648\u0644", + "\u062A\u0634\u0631\u064A\u0646 \u0627\u0644\u0623\u0648\u0644", + "\u062A\u0634\u0631\u064A\u0646 \u0627\u0644\u062B\u0627\u0646\u064A", + "\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u0623\u0648\u0644", + } + wide{ + "\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u062B\u0627\u0646\u064A", + "\u0634\u0628\u0627\u0637", + "\u0622\u0630\u0627\u0631", + "\u0646\u064A\u0633\u0627\u0646", + "\u0646\u0648\u0627\u0631", + "\u062D\u0632\u064A\u0631\u0627\u0646", + "\u062A\u0645\u0648\u0632", + "\u0622\u0628", + "\u0623\u064A\u0644\u0648\u0644", + "\u062A\u0634\u0631\u064A\u0646 \u0627\u0644\u0623\u0648\u0644", + "\u062A\u0634\u0631\u064A\u0646 \u0627\u0644\u062B\u0627\u0646\u064A", + "\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u0623\u0648\u0644", + } + } + } + } } } diff --git a/icu4c/source/data/locales/ar_MA.txt b/icu4c/source/data/locales/ar_MA.txt index 44ca05b9c89..cee606458e6 100644 --- a/icu4c/source/data/locales/ar_MA.txt +++ b/icu4c/source/data/locales/ar_MA.txt @@ -22,4 +22,4 @@ ar_MA { "\u066B", "+", } -} \ No newline at end of file +} diff --git a/icu4c/source/data/locales/ar_QA.txt b/icu4c/source/data/locales/ar_QA.txt index 46e6d337fc9..bcd6a437fde 100644 --- a/icu4c/source/data/locales/ar_QA.txt +++ b/icu4c/source/data/locales/ar_QA.txt @@ -13,27 +13,39 @@ ar_QA { "#,##0%", "#E0", } - MonthAbbreviations { - "\u064A\u0646\u0627\u064A\u0631", - "\u0641\u0628\u0631\u0627\u064A\u0631", - "\u0645\u0627\u0631\u0633", - "\u0623\u0628\u0631\u064A\u0644", - "\u0645\u0627\u064A\u0648", - "\u064A\u0648\u0646\u064A\u0648", - "\u064A\u0648\u0644\u064A\u0648", - "\u0623\u063A\u0633\u0637\u0633", - "\u0633\u0628\u062A\u0645\u0628\u0631", - "\u0623\u0643\u062A\u0648\u0628\u0631", - "\u0646\u0648\u0641\u0645\u0628\u0631", - "\u062F\u064A\u0633\u0645\u0628\u0631", - } - DayAbbreviations { - "\u0627\u0644\u0623\u062D\u062F", - "\u0627\u0644\u0627\u062B\u0646\u064A\u0646", - "\u0627\u0644\u062B\u0644\u0627\u062B\u0627\u0621", - "\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621", - "\u0627\u0644\u062E\u0645\u064A\u0633", - "\u0627\u0644\u062C\u0645\u0639\u0629", - "\u0627\u0644\u0633\u0628\u062A", + calendar{ + gregorian{ + dayNames{ + format{ + abbreviated{ + "\u0627\u0644\u0623\u062D\u062F", + "\u0627\u0644\u0627\u062B\u0646\u064A\u0646", + "\u0627\u0644\u062B\u0644\u0627\u062B\u0627\u0621", + "\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621", + "\u0627\u0644\u062E\u0645\u064A\u0633", + "\u0627\u0644\u062C\u0645\u0639\u0629", + "\u0627\u0644\u0633\u0628\u062A", + } + } + } + monthNames{ + format{ + abbreviated{ + "\u064A\u0646\u0627\u064A\u0631", + "\u0641\u0628\u0631\u0627\u064A\u0631", + "\u0645\u0627\u0631\u0633", + "\u0623\u0628\u0631\u064A\u0644", + "\u0645\u0627\u064A\u0648", + "\u064A\u0648\u0646\u064A\u0648", + "\u064A\u0648\u0644\u064A\u0648", + "\u0623\u063A\u0633\u0637\u0633", + "\u0633\u0628\u062A\u0645\u0628\u0631", + "\u0623\u0643\u062A\u0648\u0628\u0631", + "\u0646\u0648\u0641\u0645\u0628\u0631", + "\u062F\u064A\u0633\u0645\u0628\u0631", + } + } + } + } } } diff --git a/icu4c/source/data/locales/ar_SA.txt b/icu4c/source/data/locales/ar_SA.txt index 3cbfdc23fa8..a6da1b4bceb 100644 --- a/icu4c/source/data/locales/ar_SA.txt +++ b/icu4c/source/data/locales/ar_SA.txt @@ -13,27 +13,39 @@ ar_SA { "#,##0%", "#E0", } - MonthAbbreviations { - "\u064A\u0646\u0627\u064A\u0631", - "\u0641\u0628\u0631\u0627\u064A\u0631", - "\u0645\u0627\u0631\u0633", - "\u0623\u0628\u0631\u064A\u0644", - "\u0645\u0627\u064A\u0648", - "\u064A\u0648\u0646\u064A\u0648", - "\u064A\u0648\u0644\u064A\u0648", - "\u0623\u063A\u0633\u0637\u0633", - "\u0633\u0628\u062A\u0645\u0628\u0631", - "\u0623\u0643\u062A\u0648\u0628\u0631", - "\u0646\u0648\u0641\u0645\u0628\u0631", - "\u062F\u064A\u0633\u0645\u0628\u0631", - } - DayAbbreviations { - "\u0627\u0644\u0623\u062D\u062F", - "\u0627\u0644\u0627\u062B\u0646\u064A\u0646", - "\u0627\u0644\u062B\u0644\u0627\u062B\u0627\u0621", - "\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621", - "\u0627\u0644\u062E\u0645\u064A\u0633", - "\u0627\u0644\u062C\u0645\u0639\u0629", - "\u0627\u0644\u0633\u0628\u062A", + calendar{ + gregorian{ + dayNames{ + format{ + abbreviated{ + "\u0627\u0644\u0623\u062D\u062F", + "\u0627\u0644\u0627\u062B\u0646\u064A\u0646", + "\u0627\u0644\u062B\u0644\u0627\u062B\u0627\u0621", + "\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621", + "\u0627\u0644\u062E\u0645\u064A\u0633", + "\u0627\u0644\u062C\u0645\u0639\u0629", + "\u0627\u0644\u0633\u0628\u062A", + } + } + } + monthNames{ + format{ + abbreviated{ + "\u064A\u0646\u0627\u064A\u0631", + "\u0641\u0628\u0631\u0627\u064A\u0631", + "\u0645\u0627\u0631\u0633", + "\u0623\u0628\u0631\u064A\u0644", + "\u0645\u0627\u064A\u0648", + "\u064A\u0648\u0646\u064A\u0648", + "\u064A\u0648\u0644\u064A\u0648", + "\u0623\u063A\u0633\u0637\u0633", + "\u0633\u0628\u062A\u0645\u0628\u0631", + "\u0623\u0643\u062A\u0648\u0628\u0631", + "\u0646\u0648\u0641\u0645\u0628\u0631", + "\u062F\u064A\u0633\u0645\u0628\u0631", + } + } + } + } } } diff --git a/icu4c/source/data/locales/ar_SY.txt b/icu4c/source/data/locales/ar_SY.txt index 8fb6cb029f2..957e9997c8f 100644 --- a/icu4c/source/data/locales/ar_SY.txt +++ b/icu4c/source/data/locales/ar_SY.txt @@ -7,51 +7,63 @@ ar_SY { Version{ "2.0" } - DayAbbreviations { - "\u0627\u0644\u0623\u062D\u062F", - "\u0627\u0644\u0627\u062B\u0646\u064A\u0646", - "\u0627\u0644\u062B\u0644\u0627\u062B\u0627\u0621", - "\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621", - "\u0627\u0644\u062E\u0645\u064A\u0633", - "\u0627\u0644\u062C\u0645\u0639\u0629", - "\u0627\u0644\u0633\u0628\u062A", - } - MonthAbbreviations { - "\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u062B\u0627\u0646\u064A", - "\u0634\u0628\u0627\u0637", - "\u0622\u0630\u0627\u0631", - "\u0646\u064A\u0633\u0627\u0646", - "\u0646\u0648\u0627\u0631", - "\u062D\u0632\u064A\u0631\u0627\u0646", - "\u062A\u0645\u0648\u0632", - "\u0622\u0628", - "\u0623\u064A\u0644\u0648\u0644", - "\u062A\u0634\u0631\u064A\u0646 \u0627\u0644\u0623\u0648\u0644", - "\u062A\u0634\u0631\u064A\u0646 \u0627\u0644\u062B\u0627\u0646\u064A", - "\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u0623\u0648\u0644", - } - MonthNames { - "\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u062B\u0627\u0646\u064A", - "\u0634\u0628\u0627\u0637", - "\u0622\u0630\u0627\u0631", - "\u0646\u064A\u0633\u0627\u0646", - "\u0646\u0648\u0627\u0631", - "\u062D\u0632\u064A\u0631\u0627\u0646", - "\u062A\u0645\u0648\u0632", - "\u0622\u0628", - "\u0623\u064A\u0644\u0648\u0644", - "\u062A\u0634\u0631\u064A\u0646 \u0627\u0644\u0623\u0648\u0644", - "\u062A\u0634\u0631\u064A\u0646 \u0627\u0644\u062B\u0627\u0646\u064A", - "\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u0623\u0648\u0644", - } - DateTimeElements:intvector { - 5, - 1 - } - NumberPatterns { + NumberPatterns { "###0.###;###0.###-", "\u00a4###0.00;-\u00a4###0.00", "#,##0%", "#E0", } + calendar{ + gregorian{ + DateTimeElements:intvector { + 5, + 1 + } + dayNames{ + format{ + abbreviated{ + "\u0627\u0644\u0623\u062D\u062F", + "\u0627\u0644\u0627\u062B\u0646\u064A\u0646", + "\u0627\u0644\u062B\u0644\u0627\u062B\u0627\u0621", + "\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621", + "\u0627\u0644\u062E\u0645\u064A\u0633", + "\u0627\u0644\u062C\u0645\u0639\u0629", + "\u0627\u0644\u0633\u0628\u062A", + } + } + } + monthNames{ + format{ + abbreviated{ + "\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u062B\u0627\u0646\u064A", + "\u0634\u0628\u0627\u0637", + "\u0622\u0630\u0627\u0631", + "\u0646\u064A\u0633\u0627\u0646", + "\u0646\u0648\u0627\u0631", + "\u062D\u0632\u064A\u0631\u0627\u0646", + "\u062A\u0645\u0648\u0632", + "\u0622\u0628", + "\u0623\u064A\u0644\u0648\u0644", + "\u062A\u0634\u0631\u064A\u0646 \u0627\u0644\u0623\u0648\u0644", + "\u062A\u0634\u0631\u064A\u0646 \u0627\u0644\u062B\u0627\u0646\u064A", + "\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u0623\u0648\u0644", + } + wide{ + "\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u062B\u0627\u0646\u064A", + "\u0634\u0628\u0627\u0637", + "\u0622\u0630\u0627\u0631", + "\u0646\u064A\u0633\u0627\u0646", + "\u0646\u0648\u0627\u0631", + "\u062D\u0632\u064A\u0631\u0627\u0646", + "\u062A\u0645\u0648\u0632", + "\u0622\u0628", + "\u0623\u064A\u0644\u0648\u0644", + "\u062A\u0634\u0631\u064A\u0646 \u0627\u0644\u0623\u0648\u0644", + "\u062A\u0634\u0631\u064A\u0646 \u0627\u0644\u062B\u0627\u0646\u064A", + "\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u0623\u0648\u0644", + } + } + } + } + } } diff --git a/icu4c/source/data/locales/ar_TN.txt b/icu4c/source/data/locales/ar_TN.txt index c5aacf75c1a..1846f45c653 100644 --- a/icu4c/source/data/locales/ar_TN.txt +++ b/icu4c/source/data/locales/ar_TN.txt @@ -28,27 +28,39 @@ ar_TN { "#,##0%", "#E0", } - MonthAbbreviations { - "\u064A\u0646\u0627\u064A\u0631", - "\u0641\u0628\u0631\u0627\u064A\u0631", - "\u0645\u0627\u0631\u0633", - "\u0623\u0628\u0631\u064A\u0644", - "\u0645\u0627\u064A\u0648", - "\u064A\u0648\u0646\u064A\u0648", - "\u064A\u0648\u0644\u064A\u0648", - "\u0623\u063A\u0633\u0637\u0633", - "\u0633\u0628\u062A\u0645\u0628\u0631", - "\u0623\u0643\u062A\u0648\u0628\u0631", - "\u0646\u0648\u0641\u0645\u0628\u0631", - "\u062F\u064A\u0633\u0645\u0628\u0631", + calendar{ + gregorian{ + dayNames{ + format{ + abbreviated{ + "\u0627\u0644\u0623\u062D\u062F", + "\u0627\u0644\u0627\u062B\u0646\u064A\u0646", + "\u0627\u0644\u062B\u0644\u0627\u062B\u0627\u0621", + "\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621", + "\u0627\u0644\u062E\u0645\u064A\u0633", + "\u0627\u0644\u062C\u0645\u0639\u0629", + "\u0627\u0644\u0633\u0628\u062A", + } + } + } + monthNames{ + format{ + abbreviated{ + "\u064A\u0646\u0627\u064A\u0631", + "\u0641\u0628\u0631\u0627\u064A\u0631", + "\u0645\u0627\u0631\u0633", + "\u0623\u0628\u0631\u064A\u0644", + "\u0645\u0627\u064A\u0648", + "\u064A\u0648\u0646\u064A\u0648", + "\u064A\u0648\u0644\u064A\u0648", + "\u0623\u063A\u0633\u0637\u0633", + "\u0633\u0628\u062A\u0645\u0628\u0631", + "\u0623\u0643\u062A\u0648\u0628\u0631", + "\u0646\u0648\u0641\u0645\u0628\u0631", + "\u062F\u064A\u0633\u0645\u0628\u0631", + } + } + } + } } - DayAbbreviations { - "\u0627\u0644\u0623\u062D\u062F", - "\u0627\u0644\u0627\u062B\u0646\u064A\u0646", - "\u0627\u0644\u062B\u0644\u0627\u062B\u0627\u0621", - "\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621", - "\u0627\u0644\u062E\u0645\u064A\u0633", - "\u0627\u0644\u062C\u0645\u0639\u0629", - "\u0627\u0644\u0633\u0628\u062A", - } -} \ No newline at end of file +} diff --git a/icu4c/source/data/locales/ar_YE.txt b/icu4c/source/data/locales/ar_YE.txt index 42ebba9b16e..0c437c524ed 100644 --- a/icu4c/source/data/locales/ar_YE.txt +++ b/icu4c/source/data/locales/ar_YE.txt @@ -13,27 +13,39 @@ ar_YE { "#,##0%", "#E0", } - MonthAbbreviations { - "\u064A\u0646\u0627\u064A\u0631", - "\u0641\u0628\u0631\u0627\u064A\u0631", - "\u0645\u0627\u0631\u0633", - "\u0623\u0628\u0631\u064A\u0644", - "\u0645\u0627\u064A\u0648", - "\u064A\u0648\u0646\u064A\u0648", - "\u064A\u0648\u0644\u064A\u0648", - "\u0623\u063A\u0633\u0637\u0633", - "\u0633\u0628\u062A\u0645\u0628\u0631", - "\u0623\u0643\u062A\u0648\u0628\u0631", - "\u0646\u0648\u0641\u0645\u0628\u0631", - "\u062F\u064A\u0633\u0645\u0628\u0631", - } - DayAbbreviations { - "\u0627\u0644\u0623\u062D\u062F", - "\u0627\u0644\u0627\u062B\u0646\u064A\u0646", - "\u0627\u0644\u062B\u0644\u0627\u062B\u0627\u0621", - "\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621", - "\u0627\u0644\u062E\u0645\u064A\u0633", - "\u0627\u0644\u062C\u0645\u0639\u0629", - "\u0627\u0644\u0633\u0628\u062A", + calendar{ + gregorian{ + dayNames{ + format{ + abbreviated{ + "\u0627\u0644\u0623\u062D\u062F", + "\u0627\u0644\u0627\u062B\u0646\u064A\u0646", + "\u0627\u0644\u062B\u0644\u0627\u062B\u0627\u0621", + "\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621", + "\u0627\u0644\u062E\u0645\u064A\u0633", + "\u0627\u0644\u062C\u0645\u0639\u0629", + "\u0627\u0644\u0633\u0628\u062A", + } + } + } + monthNames{ + format{ + abbreviated{ + "\u064A\u0646\u0627\u064A\u0631", + "\u0641\u0628\u0631\u0627\u064A\u0631", + "\u0645\u0627\u0631\u0633", + "\u0623\u0628\u0631\u064A\u0644", + "\u0645\u0627\u064A\u0648", + "\u064A\u0648\u0646\u064A\u0648", + "\u064A\u0648\u0644\u064A\u0648", + "\u0623\u063A\u0633\u0637\u0633", + "\u0633\u0628\u062A\u0645\u0628\u0631", + "\u0623\u0643\u062A\u0648\u0628\u0631", + "\u0646\u0648\u0641\u0645\u0628\u0631", + "\u062F\u064A\u0633\u0645\u0628\u0631", + } + } + } + } } } diff --git a/icu4c/source/data/locales/be.txt b/icu4c/source/data/locales/be.txt index 00a3d3464b6..868efda9ac5 100644 --- a/icu4c/source/data/locales/be.txt +++ b/icu4c/source/data/locales/be.txt @@ -11,75 +11,11 @@ be { Countries { BY { "\u0411\u0435\u043B\u0430\u0440\u0443\u0441\u044C" } } - DateTimePatterns { - "HH.mm.ss z", - "HH.mm.ss z", - "HH.mm.ss", - "HH.mm", - "EEEE, d MMMM yyyy", - "d MMMM yyyy", - "d.M.yyyy", - "d.M.yy", - "{1} {0}", - } - DateTimeElements:intvector { - 2, - 1, // "Minimal Days in First Week" is unknown. Root value used instead - } - DayAbbreviations { - "\u043d\u0434", - "\u043F\u043D", - "\u0430\u045e", - "\u0441\u0440", - "\u0447\u0446", - "\u043F\u0442", - "\u0441\u0431", - } - DayNames { - "\u043D\u044F\u0434\u0437\u0435\u043B\u044F", - "\u043F\u0430\u043D\u044F\u0434\u0437\u0435\u043B\u0430\u043A", - "\u0430\u045E\u0442\u043E\u0440\u0430\u043A", - "\u0441\u0435\u0440\u0430\u0434\u0430", - "\u0447\u0430\u0446\u0432\u0435\u0440", - "\u043F\u044F\u0442\u043D\u0456\u0446\u0430", - "\u0441\u0443\u0431\u043E\u0442\u0430", - } - Eras { - "\u0434\u0430 \u043D.\u0435.", - "\u043D.\u0435.", - } - Languages { + + Languages { be { "\u0411\u0435\u043B\u0430\u0440\u0443\u0441\u043A\u0456" } } - MonthAbbreviations { - "\u0441\u0442\u0443", - "\u043b\u044e\u0442", - "\u0441\u0430\u043a", - "\u043a\u0440\u0430", - "\u043c\u0430\u0439", - "\u0447\u044d\u0440", - "\u043b\u0456\u043f", - "\u0436\u043d\u0456", - "\u0432\u0435\u0440", - "\u043a\u0430\u0441", - "\u043b\u0456\u0441", - "\u0441\u043d\u0435", - } - MonthNames { - "\u0441\u0442\u0443\u0434\u0437\u0435\u043d\u044c", - "\u043b\u044e\u0442\u044b", - "\u0441\u0430\u043a\u0430\u0432\u0456\u043a", - "\u043a\u0440\u0430\u0441\u0430\u0432\u0456\u043a", - "\u043c\u0430\u0439", - "\u0447\u044d\u0440\u0432\u0435\u043d\u044c", - "\u043b\u0456\u043f\u0435\u043d\u044c", - "\u0436\u043d\u0456\u0432\u0435\u043d\u044c", - "\u0432\u0435\u0440\u0430\u0441\u0435\u043d\u044c", - "\u043a\u0430\u0441\u0442\u0440\u044b\u0447\u043d\u0456\u043a", - "\u043b\u0456\u0441\u0442\u0430\u043f\u0430\u0434", - "\u0441\u043d\u0435\u0436\u0430\u043d\u044c", - } - NumberElements { + NumberElements { ",", "\u00A0", ";", @@ -97,7 +33,7 @@ be { localPatternChars { "GanjkHmsSEDFwWxhKzAeugXZ" } LocaleScript{ - "Cyrl", // Abbreviation + "Cyrl", // Abbreviation } ExemplarCharacters { "[\u0430-\u0437 \u0439-\u0448 \u044b-\u044f \u2019\u0451\u0456\u045e {\u0434\u0436} {\u0434\u0437}]" } @@ -105,4 +41,81 @@ be { Currencies { BYB { "\u0420\u0443\u0431", "BYB" } } + calendar{ + gregorian{ + DateTimeElements:intvector { + 2, + 1, // "Minimal Days in First Week" is unknown. Root value used instead + } + DateTimePatterns{ + "HH.mm.ss z", + "HH.mm.ss z", + "HH.mm.ss", + "HH.mm", + "EEEE, d MMMM yyyy", + "d MMMM yyyy", + "d.M.yyyy", + "d.M.yy", + "{1} {0}", + } + dayNames{ + format{ + abbreviated{ + "\u043d\u0434", + "\u043F\u043D", + "\u0430\u045e", + "\u0441\u0440", + "\u0447\u0446", + "\u043F\u0442", + "\u0441\u0431", + } + wide{ + "\u043D\u044F\u0434\u0437\u0435\u043B\u044F", + "\u043F\u0430\u043D\u044F\u0434\u0437\u0435\u043B\u0430\u043A", + "\u0430\u045E\u0442\u043E\u0440\u0430\u043A", + "\u0441\u0435\u0440\u0430\u0434\u0430", + "\u0447\u0430\u0446\u0432\u0435\u0440", + "\u043F\u044F\u0442\u043D\u0456\u0446\u0430", + "\u0441\u0443\u0431\u043E\u0442\u0430", + } + } + } + eras{ + "\u0434\u0430 \u043D.\u0435.", + "\u043D.\u0435.", + } + monthNames{ + format{ + abbreviated{ + "\u0441\u0442\u0443", + "\u043b\u044e\u0442", + "\u0441\u0430\u043a", + "\u043a\u0440\u0430", + "\u043c\u0430\u0439", + "\u0447\u044d\u0440", + "\u043b\u0456\u043f", + "\u0436\u043d\u0456", + "\u0432\u0435\u0440", + "\u043a\u0430\u0441", + "\u043b\u0456\u0441", + "\u0441\u043d\u0435", + } + wide{ + "\u0441\u0442\u0443\u0434\u0437\u0435\u043d\u044c", + "\u043b\u044e\u0442\u044b", + "\u0441\u0430\u043a\u0430\u0432\u0456\u043a", + "\u043a\u0440\u0430\u0441\u0430\u0432\u0456\u043a", + "\u043c\u0430\u0439", + "\u0447\u044d\u0440\u0432\u0435\u043d\u044c", + "\u043b\u0456\u043f\u0435\u043d\u044c", + "\u0436\u043d\u0456\u0432\u0435\u043d\u044c", + "\u0432\u0435\u0440\u0430\u0441\u0435\u043d\u044c", + "\u043a\u0430\u0441\u0442\u0440\u044b\u0447\u043d\u0456\u043a", + "\u043b\u0456\u0441\u0442\u0430\u043f\u0430\u0434", + "\u0441\u043d\u0435\u0436\u0430\u043d\u044c", + } + } + } + } + } } diff --git a/icu4c/source/data/locales/bg.txt b/icu4c/source/data/locales/bg.txt index 5aa94b05f19..f3e7a09b59c 100644 --- a/icu4c/source/data/locales/bg.txt +++ b/icu4c/source/data/locales/bg.txt @@ -253,43 +253,7 @@ bg { BGL { "\u043B\u0432", "BGL" } BGN { "\u043B\u0432.", "BGN" } } - DateTimePatterns { - "HH:mm:ss z", - "HH:mm:ss", - "HH:mm:ss", - "HH:mm", - "dd MMMM yyyy, EEEE", - "dd MMMM yyyy", - "dd.MM.yyyy", - "dd.MM.yy", - "{1} {0}", - } - DayAbbreviations { - "\u043D\u0435\u0434.", - "\u043F\u043E\u043D.", - "\u0432\u0442.", - "\u0441\u0440.", - "\u0447\u0435\u0442\u0432.", - "\u043F\u0435\u0442.", - "\u0441\u044A\u0431.", - } - DateTimeElements:intvector { - 2, - 1, - } - DayNames { - "\u043D\u0435\u0434\u0435\u043B\u044F", - "\u043F\u043E\u043D\u0435\u0434\u0435\u043B\u043D\u0438\u043A", - "\u0432\u0442\u043E\u0440\u043D\u0438\u043A", - "\u0441\u0440\u044F\u0434\u0430", - "\u0447\u0435\u0442\u0432\u044A\u0440\u0442\u044A\u043A", - "\u043F\u0435\u0442\u044A\u043A", - "\u0441\u044A\u0431\u043E\u0442\u0430", - } - Eras { - "\u043F\u0440.\u043D.\u0435.", - "\u043D.\u0435.", - } + ExemplarCharacters { "[\u0430-\u044c \u044e\u044f\u0463\u046b]" } Languages { ar { "\u0410\u0440\u0430\u0431\u0441\u043A\u0438" } @@ -330,34 +294,6 @@ bg { "Cyrl", // Abbreviation } localPatternChars { "GanjkHmsSEDFwWxhKzAeugXZ" } - MonthAbbreviations { - "\u044f\u043d.", - "\u0444\u0435\u0432.", - "\u043c\u0430\u0440\u0442", - "\u0430\u043f\u0440.", - "\u043c\u0430\u0439", - "\u044e\u043d\u0438", - "\u044e\u043b\u0438", - "\u0430\u0432\u0433.", - "\u0441\u0435\u043f.", - "\u043e\u043a\u0442.", - "\u043d\u043e\u0435\u043c.", - "\u0434\u0435\u043a.", - } - MonthNames { - "\u044F\u043D\u0443\u0430\u0440\u0438", - "\u0444\u0435\u0432\u0440\u0443\u0430\u0440\u0438", - "\u043C\u0430\u0440\u0442", - "\u0430\u043F\u0440\u0438\u043B", - "\u043C\u0430\u0439", - "\u044E\u043D\u0438", - "\u044E\u043B\u0438", - "\u0430\u0432\u0433\u0443\u0441\u0442", - "\u0441\u0435\u043F\u0442\u0435\u043C\u0432\u0440\u0438", - "\u043E\u043A\u0442\u043E\u043C\u0432\u0440\u0438", - "\u043D\u043E\u0435\u043C\u0432\u0440\u0438", - "\u0434\u0435\u043A\u0435\u043C\u0432\u0440\u0438", - } NumberElements { ",", "\u00A0", @@ -374,4 +310,81 @@ bg { "+", } + calendar{ + gregorian{ + DateTimePatterns{ + "HH:mm:ss z", + "HH:mm:ss", + "HH:mm:ss", + "HH:mm", + "dd MMMM yyyy, EEEE", + "dd MMMM yyyy", + "dd.MM.yyyy", + "dd.MM.yy", + "{1} {0}", + } + DateTimeElements:intvector { + 2, + 1, + } + dayNames{ + format{ + abbreviated{ + "\u043D\u0435\u0434.", + "\u043F\u043E\u043D.", + "\u0432\u0442.", + "\u0441\u0440.", + "\u0447\u0435\u0442\u0432.", + "\u043F\u0435\u0442.", + "\u0441\u044A\u0431.", + } + wide{ + "\u043D\u0435\u0434\u0435\u043B\u044F", + "\u043F\u043E\u043D\u0435\u0434\u0435\u043B\u043D\u0438\u043A", + "\u0432\u0442\u043E\u0440\u043D\u0438\u043A", + "\u0441\u0440\u044F\u0434\u0430", + "\u0447\u0435\u0442\u0432\u044A\u0440\u0442\u044A\u043A", + "\u043F\u0435\u0442\u044A\u043A", + "\u0441\u044A\u0431\u043E\u0442\u0430", + } + } + } + eras{ + "\u043F\u0440.\u043D.\u0435.", + "\u043D.\u0435.", + } + monthNames{ + format{ + abbreviated{ + "\u044f\u043d.", + "\u0444\u0435\u0432.", + "\u043c\u0430\u0440\u0442", + "\u0430\u043f\u0440.", + "\u043c\u0430\u0439", + "\u044e\u043d\u0438", + "\u044e\u043b\u0438", + "\u0430\u0432\u0433.", + "\u0441\u0435\u043f.", + "\u043e\u043a\u0442.", + "\u043d\u043e\u0435\u043c.", + "\u0434\u0435\u043a.", + } + wide{ + "\u044F\u043D\u0443\u0430\u0440\u0438", + "\u0444\u0435\u0432\u0440\u0443\u0430\u0440\u0438", + "\u043C\u0430\u0440\u0442", + "\u0430\u043F\u0440\u0438\u043B", + "\u043C\u0430\u0439", + "\u044E\u043D\u0438", + "\u044E\u043B\u0438", + "\u0430\u0432\u0433\u0443\u0441\u0442", + "\u0441\u0435\u043F\u0442\u0435\u043C\u0432\u0440\u0438", + "\u043E\u043A\u0442\u043E\u043C\u0432\u0440\u0438", + "\u043D\u043E\u0435\u043C\u0432\u0440\u0438", + "\u0434\u0435\u043A\u0435\u043C\u0432\u0440\u0438", + } + } + } + } + } } diff --git a/icu4c/source/data/locales/bn.txt b/icu4c/source/data/locales/bn.txt index 2503f75c9f6..542aa09baa9 100644 --- a/icu4c/source/data/locales/bn.txt +++ b/icu4c/source/data/locales/bn.txt @@ -8,10 +8,6 @@ bn { Version{ "2.0" } - AmPmMarkers { - "\u09AA\u09C2\u09B0\u09CD\u09AC\u09BE\u09B9\u09CD\u09A3", - "\u0985\u09AA\u09B0\u09BE\u09B9\u09CD\u09A3" - } Countries { AF { "\u0986\u09ab\u0997\u09be\u09a8\u09bf\u09b8\u09cd\u09a4\u09be\u09a8" } AL { "\u0986\u09b2\u09ac\u09cd\u09af\u09be\u09a8\u09bf\u09df\u09be" } @@ -147,57 +143,73 @@ bn { INR { "\u099F\u09BE\u0995\u09BE", "INR" } BDT { "\u09F3", "BDT" } // Bangladesh Taka } - DayAbbreviations { - "\u09B0\u09AC\u09BF", - "\u09B8\u09CB\u09AE", - "\u09ae\u0999\u09cd\u0997\u09b2", - "\u09AC\u09C1\u09A7", - "\u09AC\u09C3\u09B9\u09B8\u09CD\u09AA\u09A4\u09BF", - "\u09B6\u09C1\u0995\u09CD\u09B0", - "\u09B6\u09A8\u09BF", - } - DayNames { - "\u09B0\u09AC\u09BF\u09AC\u09BE\u09B0", - "\u09B8\u09CB\u09AE\u09AC\u09BE\u09B0", - "\u09ae\u0999\u09cd\u0997\u09b2\u09ac\u09be\u09b0", - "\u09AC\u09C1\u09A7\u09AC\u09BE\u09B0", - "\u09ac\u09c3\u09b9\u09b7\u09cd\u09aa\u09a4\u09bf\u09ac\u09be\u09b0", - "\u09B6\u09C1\u0995\u09CD\u09B0\u09AC\u09BE\u09B0", - "\u09B6\u09A8\u09BF\u09AC\u09BE\u09B0" - } Languages { bn { "\u09ac\u09be\u0982\u09b2\u09be" } } - MonthAbbreviations { - "\u099C\u09BE\u09A8\u09C1\u09DF\u09BE\u09B0\u09C0", - "\u09AB\u09C7\u09AC\u09CD\u09B0\u09C1\u09DF\u09BE\u09B0\u09C0", - "\u09AE\u09BE\u09B0\u09CD\u099A", - "\u098F\u09AA\u09CD\u09B0\u09BF\u09B2", - "\u09AE\u09C7", - "\u099C\u09C1\u09A8", - "\u099C\u09C1\u09B2\u09BE\u0987", - "\u0986\u0997\u09B8\u09CD\u099F", - "\u09B8\u09C7\u09AA\u09CD\u099F\u09C7\u09AE\u09CD\u09AC\u09B0", - "\u0985\u0995\u09CD\u099F\u09CB\u09AC\u09B0", - "\u09A8\u09AD\u09C7\u09AE\u09CD\u09AC\u09B0", - "\u09A1\u09BF\u09B8\u09C7\u09AE\u09CD\u09AC\u09B0" - } - MonthNames { - "\u099C\u09BE\u09A8\u09C1\u09DF\u09BE\u09B0\u09C0", - "\u09AB\u09C7\u09AC\u09CD\u09B0\u09C1\u09DF\u09BE\u09B0\u09C0", - "\u09AE\u09BE\u09B0\u09CD\u099A", - "\u098F\u09AA\u09CD\u09B0\u09BF\u09B2", - "\u09AE\u09C7", - "\u099C\u09C1\u09A8", - "\u099C\u09C1\u09B2\u09BE\u0987", - "\u0986\u0997\u09B8\u09CD\u099F", - "\u09B8\u09C7\u09AA\u09CD\u099F\u09C7\u09AE\u09CD\u09AC\u09B0", - "\u0985\u0995\u09CD\u099F\u09CB\u09AC\u09B0", - "\u09A8\u09AD\u09C7\u09AE\u09CD\u09AC\u09B0", - "\u09A1\u09BF\u09B8\u09C7\u09AE\u09CD\u09AC\u09B0" - } LocaleScript:array{ "Beng" } ExemplarCharacters{"[[:Beng:]\u200c\u200d]"} + calendar{ + gregorian{ + AmPmMarkers{ + "\u09AA\u09C2\u09B0\u09CD\u09AC\u09BE\u09B9\u09CD\u09A3", + "\u0985\u09AA\u09B0\u09BE\u09B9\u09CD\u09A3" + } + dayNames{ + format{ + abbreviated{ + "\u09B0\u09AC\u09BF", + "\u09B8\u09CB\u09AE", + "\u09ae\u0999\u09cd\u0997\u09b2", + "\u09AC\u09C1\u09A7", + "\u09AC\u09C3\u09B9\u09B8\u09CD\u09AA\u09A4\u09BF", + "\u09B6\u09C1\u0995\u09CD\u09B0", + "\u09B6\u09A8\u09BF", + } + wide{ + "\u09B0\u09AC\u09BF\u09AC\u09BE\u09B0", + "\u09B8\u09CB\u09AE\u09AC\u09BE\u09B0", + "\u09ae\u0999\u09cd\u0997\u09b2\u09ac\u09be\u09b0", + "\u09AC\u09C1\u09A7\u09AC\u09BE\u09B0", + "\u09ac\u09c3\u09b9\u09b7\u09cd\u09aa\u09a4\u09bf\u09ac\u09be\u09b0", + "\u09B6\u09C1\u0995\u09CD\u09B0\u09AC\u09BE\u09B0", + "\u09B6\u09A8\u09BF\u09AC\u09BE\u09B0" + } + } + } + monthNames{ + format{ + abbreviated{ + "\u099C\u09BE\u09A8\u09C1\u09DF\u09BE\u09B0\u09C0", + "\u09AB\u09C7\u09AC\u09CD\u09B0\u09C1\u09DF\u09BE\u09B0\u09C0", + "\u09AE\u09BE\u09B0\u09CD\u099A", + "\u098F\u09AA\u09CD\u09B0\u09BF\u09B2", + "\u09AE\u09C7", + "\u099C\u09C1\u09A8", + "\u099C\u09C1\u09B2\u09BE\u0987", + "\u0986\u0997\u09B8\u09CD\u099F", + "\u09B8\u09C7\u09AA\u09CD\u099F\u09C7\u09AE\u09CD\u09AC\u09B0", + "\u0985\u0995\u09CD\u099F\u09CB\u09AC\u09B0", + "\u09A8\u09AD\u09C7\u09AE\u09CD\u09AC\u09B0", + "\u09A1\u09BF\u09B8\u09C7\u09AE\u09CD\u09AC\u09B0" + } + wide{ + "\u099C\u09BE\u09A8\u09C1\u09DF\u09BE\u09B0\u09C0", + "\u09AB\u09C7\u09AC\u09CD\u09B0\u09C1\u09DF\u09BE\u09B0\u09C0", + "\u09AE\u09BE\u09B0\u09CD\u099A", + "\u098F\u09AA\u09CD\u09B0\u09BF\u09B2", + "\u09AE\u09C7", + "\u099C\u09C1\u09A8", + "\u099C\u09C1\u09B2\u09BE\u0987", + "\u0986\u0997\u09B8\u09CD\u099F", + "\u09B8\u09C7\u09AA\u09CD\u099F\u09C7\u09AE\u09CD\u09AC\u09B0", + "\u0985\u0995\u09CD\u099F\u09CB\u09AC\u09B0", + "\u09A8\u09AD\u09C7\u09AE\u09CD\u09AC\u09B0", + "\u09A1\u09BF\u09B8\u09C7\u09AE\u09CD\u09AC\u09B0" + } + } + } + } + } } diff --git a/icu4c/source/data/locales/bn_IN.txt b/icu4c/source/data/locales/bn_IN.txt index 944c6c43002..ac85188065b 100644 --- a/icu4c/source/data/locales/bn_IN.txt +++ b/icu4c/source/data/locales/bn_IN.txt @@ -8,17 +8,6 @@ bn_IN { Version{ "2.0" } - DateTimePatterns { - "h:mm:ss a z", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", - "EEEE d MMMM yyyy", - "d MMMM yyyy", - "dd-MM-yyyy", - "d-M-yy", - "{1} {0}" - } // NumberElements { // ".", // ",", @@ -38,4 +27,19 @@ bn_IN { "##,##,##0%", "#E0", } + calendar{ + gregorian{ + DateTimePatterns{ + "h:mm:ss a z", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", + "EEEE d MMMM yyyy", + "d MMMM yyyy", + "dd-MM-yyyy", + "d-M-yy", + "{1} {0}" + } + } + } } diff --git a/icu4c/source/data/locales/ca.txt b/icu4c/source/data/locales/ca.txt index 8ce455f6e5b..329753a3438 100644 --- a/icu4c/source/data/locales/ca.txt +++ b/icu4c/source/data/locales/ca.txt @@ -347,63 +347,6 @@ ca { zh { "xin\u00E9s" } zu { "zulu" } } - DateTimePatterns { - "HH:mm:ss z", - "HH:mm:ss z", - "HH:mm:ss", - "HH:mm", - "EEEE dd MMMM yyyy", - "d MMMM yyyy", - "dd/MM/yyyy", - "dd/MM/yy", - "{1} {0}", - } - DayAbbreviations { - "dg.", - "dl.", - "dt.", - "dc.", - "dj.", - "dv.", - "ds.", - } - DayNames { - "diumenge", - "dilluns", - "dimarts", - "dimecres", - "dijous", - "divendres", - "dissabte", - } - MonthAbbreviations { - "gen.", - "feb.", - "mar\u00E7", - "abr.", - "maig", - "juny", - "jul.", - "ag.", - "set.", - "oct.", - "nov.", - "des.", - } - MonthNames { - "gener", - "febrer", - "mar\u00E7", - "abril", - "maig", - "juny", - "juliol", - "agost", - "setembre", - "octubre", - "novembre", - "desembre", - } NumberElements { ",", ".", @@ -431,4 +374,73 @@ ca { Currencies { ESP { "\u20A7", "ESP" } // Spanish Peseta } + calendar{ + gregorian{ + DateTimePatterns{ + "HH:mm:ss z", + "HH:mm:ss z", + "HH:mm:ss", + "HH:mm", + "EEEE dd MMMM yyyy", + "d MMMM yyyy", + "dd/MM/yyyy", + "dd/MM/yy", + "{1} {0}", + } + dayNames{ + format{ + abbreviated{ + "dg.", + "dl.", + "dt.", + "dc.", + "dj.", + "dv.", + "ds.", + } + wide{ + "diumenge", + "dilluns", + "dimarts", + "dimecres", + "dijous", + "divendres", + "dissabte", + } + } + } + monthNames{ + format{ + abbreviated{ + "gen.", + "feb.", + "mar\u00E7", + "abr.", + "maig", + "juny", + "jul.", + "ag.", + "set.", + "oct.", + "nov.", + "des.", + } + wide{ + "gener", + "febrer", + "mar\u00E7", + "abril", + "maig", + "juny", + "juliol", + "agost", + "setembre", + "octubre", + "novembre", + "desembre", + } + } + } + } + } } diff --git a/icu4c/source/data/locales/ca_ES.txt b/icu4c/source/data/locales/ca_ES.txt index d658e936d8e..a6feb2eb8da 100644 --- a/icu4c/source/data/locales/ca_ES.txt +++ b/icu4c/source/data/locales/ca_ES.txt @@ -7,14 +7,19 @@ ca_ES { Version{ "2.0" } - DateTimeElements:intvector { - 2, - 1, - } + NumberPatterns { "#,##0.###;-#,##0.###", "#,##0.00 \u00A4;-#,##0.00 \u00A4", "#,##0%", "#E0", } + calendar{ + gregorian{ + DateTimeElements:intvector { + 2, + 1, + } + } + } } diff --git a/icu4c/source/data/locales/cs.txt b/icu4c/source/data/locales/cs.txt index 99faaa7f159..816b495e490 100644 --- a/icu4c/source/data/locales/cs.txt +++ b/icu4c/source/data/locales/cs.txt @@ -7,10 +7,6 @@ cs { Version{ "3.0" } - AmPmMarkers { - "dop.", - "odp.", - } Countries { Fallback{"en"} //AD { "Andorra" } @@ -253,43 +249,6 @@ cs { ZM { "Zambie" } //ZW { "Zimbabwe" } } - DateTimePatterns { - "H:mm:ss z", - "H:mm:ss z", - "H:mm:ss", - "H:mm", - "EEEE, d. MMMM yyyy", - "d. MMMM yyyy", - "d.M.yyyy", - "d.M.yy", - "{1} {0}", - } - DateTimeElements:intvector { - 2, - 1, // "Minimal Days in First Week" is unknown. Root value used instead - } - DayAbbreviations { - "ne", - "po", - "\u00FAt", - "st", - "\u010dt", - "p\u00E1", - "so", - } - DayNames { - "ned\u011Ble", - "pond\u011Bl\u00ED", - "\u00FAter\u00FD", - "st\u0159eda", - "\u010dtvrtek", - "p\u00E1tek", - "sobota", - } - Eras { - "p\u0159.Kr.", - "po Kr.", - } Languages { aa { "Afar\u0161tina" } ab { "Abch\u00E1z\u0161tina" } @@ -359,7 +318,7 @@ cs { ja { "Japon\u0161tina" } //ji { "Jidi\u0161" } jv { "Jav\u00E1n\u0161tina" } - + ka { "Gruz\u00EDn\u0161tina" } kk { "Kazach\u0161tina" } @@ -462,34 +421,6 @@ cs { zh { "\u010C\u00EDn\u0161tina" } } - MonthAbbreviations { - "I", - "II", - "III", - "IV", - "V", - "VI", - "VII", - "VIII", - "IX", - "X", - "XI", - "XII", - } - MonthNames { - "leden", - "\u00FAnor", - "b\u0159ezen", - "duben", - "kv\u011Bten", - "\u010Derven", - "\u010Dervenec", - "srpen", - "z\u00E1\u0159\u00ED", - "\u0159\u00EDjen", - "listopad", - "prosinec", - } NumberElements { ",", "\u00A0", @@ -516,4 +447,85 @@ cs { Currencies { CZK { "K\u010D", "CZK" } } + calendar{ + gregorian{ + AmPmMarkers{ + "dop.", + "odp.", + } + DateTimeElements:intvector { + 2, + 1, // "Minimal Days in First Week" is unknown. Root value used instead + } + DateTimePatterns{ + "H:mm:ss z", + "H:mm:ss z", + "H:mm:ss", + "H:mm", + "EEEE, d. MMMM yyyy", + "d. MMMM yyyy", + "d.M.yyyy", + "d.M.yy", + "{1} {0}", + } + dayNames{ + format{ + abbreviated{ + "ne", + "po", + "\u00FAt", + "st", + "\u010dt", + "p\u00E1", + "so", + } + wide{ + "ned\u011Ble", + "pond\u011Bl\u00ED", + "\u00FAter\u00FD", + "st\u0159eda", + "\u010dtvrtek", + "p\u00E1tek", + "sobota", + } + } + } + eras{ + "p\u0159.Kr.", + "po Kr.", + } + monthNames{ + format{ + abbreviated{ + "I", + "II", + "III", + "IV", + "V", + "VI", + "VII", + "VIII", + "IX", + "X", + "XI", + "XII", + } + wide{ + "leden", + "\u00FAnor", + "b\u0159ezen", + "duben", + "kv\u011Bten", + "\u010Derven", + "\u010Dervenec", + "srpen", + "z\u00E1\u0159\u00ED", + "\u0159\u00EDjen", + "listopad", + "prosinec", + } + } + } + } + } } diff --git a/icu4c/source/data/locales/da.txt b/icu4c/source/data/locales/da.txt index 27d6b52eb14..ee8a997db1a 100644 --- a/icu4c/source/data/locales/da.txt +++ b/icu4c/source/data/locales/da.txt @@ -598,43 +598,6 @@ da { ZRZ { "ZRZ", "Zairisk naire" } // 10/27/1971-11/01/1993 ZWD { "Z$", "Zimbabwisk dollar" } // 04/18/1980- } - DateTimeElements:intvector { - 2, - 4, - } - DateTimePatterns { - "HH:mm:ss z", - "HH:mm:ss z", - "HH:mm:ss", - "HH:mm", - "EEEE dd MMMM yyyy", - "d. MMM yyyy", - "dd-MM-yyyy", - "dd-MM-yy", - "{1} {0}", - } - DayAbbreviations { - "s\u00F8n", - "man", - "tir", - "ons", - "tor", - "fre", - "l\u00F8r", - } - DayNames { - "s\u00F8ndag", - "mandag", - "tirsdag", - "onsdag", - "torsdag", - "fredag", - "l\u00F8rdag", - } - Eras { - "f.Kr.", - "e.Kr.", - } Languages { ab { "Abkhasisk" } am { "Amharisk" } @@ -743,34 +706,6 @@ da { //zh_tw { "Kinesisk (Uforkortet)" } } localPatternChars { "GuMtkHmsSEDFwWahKzUeygAZ" } - MonthAbbreviations { - "jan", - "feb", - "mar", - "apr", - "maj", - "jun", - "jul", - "aug", - "sep", - "okt", - "nov", - "dec", - } - MonthNames { - "januar", - "februar", - "marts", - "april", - "maj", - "juni", - "juli", - "august", - "september", - "oktober", - "november", - "december", - } NumberElements { ",", ".", @@ -857,7 +792,7 @@ da { calendar{ japanese { "Japansk kalender" } buddhist { "Buddhistisk kalender" } - islamic { "Islamisk kalender" } + islamic { "Islamisk kalender" } islamic-civil { "Verdslig islamisk kalender" } hebrew { "J\u00F8disk kalender" } chinese { "Kinesisk kalender" } @@ -865,4 +800,104 @@ da { } } + calendar{ + gregorian{ + DateTimeElements:intvector { + 2, + 4, + } + DateTimePatterns{ + "HH:mm:ss z", + "HH:mm:ss z", + "HH:mm:ss", + "HH:mm", + "EEEE dd MMMM yyyy", + "d. MMM yyyy", + "dd-MM-yyyy", + "dd-MM-yy", + "{1} {0}", + } + dayNames{ + format{ + abbreviated{ + "s\u00F8n", + "man", + "tir", + "ons", + "tor", + "fre", + "l\u00F8r", + } + narrow{ + "S", + "M", + "T", + "O", + "T", + "F", + "L", + } + wide{ + "s\u00F8ndag", + "mandag", + "tirsdag", + "onsdag", + "torsdag", + "fredag", + "l\u00F8rdag", + } + } + } + eras{ + "f.Kr.", + "e.Kr.", + } + monthNames{ + format{ + abbreviated{ + "jan", + "feb", + "mar", + "apr", + "maj", + "jun", + "jul", + "aug", + "sep", + "okt", + "nov", + "dec", + } + narrow{ + "J", + "F", + "M", + "A", + "M", + "J", + "J", + "A", + "S", + "O", + "N", + "D", + } + wide{ + "januar", + "februar", + "marts", + "april", + "maj", + "juni", + "juli", + "august", + "september", + "oktober", + "november", + "december", + } + } + } + } + } } diff --git a/icu4c/source/data/locales/de.txt b/icu4c/source/data/locales/de.txt index d144d4b6f44..45708de774f 100644 --- a/icu4c/source/data/locales/de.txt +++ b/icu4c/source/data/locales/de.txt @@ -21,10 +21,6 @@ de { // This shouldn't be used, but valid data should be here. // vorm. -> vormittags -> in the morning // nachm. -> nachmittags -> in the afternoon - AmPmMarkers { - "vorm.", - "nachm.", - } // Currency display names // See for example "W\u00e4hrungscodes" at @@ -630,44 +626,6 @@ de { SP { "Serbien" } TL { "Osttimor" } } - DateTimeElements:intvector { - 2, - 4, - } - DateTimePatterns { - "H:mm' Uhr 'z", - "HH:mm:ss z", - "HH:mm:ss", - "HH:mm", - "EEEE, d. MMMM yyyy", - "d. MMMM yyyy", - "dd.MM.yyyy", - "dd.MM.yy", - "{1} {0}", - } - DayAbbreviations { - "So", - "Mo", - "Di", - "Mi", - "Do", - "Fr", - "Sa", - } - DayNames { - "Sonntag", - "Montag", - "Dienstag", - "Mittwoch", - "Donnerstag", - "Freitag", - "Samstag", - } - Eras { - "v. Chr.", - "n. Chr.", - } - // For the languages, I am trying to use the adjective list in the // official list of country names. // Sometimes I am guessing. @@ -851,34 +809,6 @@ de { zu { "Zulu" } } - MonthAbbreviations { - "Jan", - "Feb", - "Mrz", - "Apr", - "Mai", - "Jun", - "Jul", - "Aug", - "Sep", - "Okt", - "Nov", - "Dez", - } - MonthNames { - "Januar", - "Februar", - "M\u00E4rz", - "April", - "Mai", - "Juni", - "Juli", - "August", - "September", - "Oktober", - "November", - "Dezember", - } NumberElements { ",", ".", @@ -1058,4 +988,108 @@ de { "Berlin", } } + calendar{ + gregorian{ + AmPmMarkers{ + "vorm.", + "nachm.", + } + DateTimeElements:intvector { + 2, + 4, + } + DateTimePatterns{ + "H:mm' Uhr 'z", + "HH:mm:ss z", + "HH:mm:ss", + "HH:mm", + "EEEE, d. MMMM yyyy", + "d. MMMM yyyy", + "dd.MM.yyyy", + "dd.MM.yy", + "{1} {0}", + } + dayNames{ + format{ + abbreviated{ + "So", + "Mo", + "Di", + "Mi", + "Do", + "Fr", + "Sa", + } + narrow{ + "S" + "M" + "D" + "M" + "D" + "F" + "S" + } + wide{ + "Sonntag", + "Montag", + "Dienstag", + "Mittwoch", + "Donnerstag", + "Freitag", + "Samstag", + } + } + } + eras{ + "v. Chr.", + "n. Chr.", + } + monthNames{ + format{ + abbreviated{ + "Jan", + "Feb", + "Mrz", + "Apr", + "Mai", + "Jun", + "Jul", + "Aug", + "Sep", + "Okt", + "Nov", + "Dez", + } + narrow{ + "J", + "F", + "M", + "A", + "M", + "J", + "J", + "A", + "S", + "O", + "N", + "D", + } + wide{ + "Januar", + "Februar", + "M\u00E4rz", + "April", + "Mai", + "Juni", + "Juli", + "August", + "September", + "Oktober", + "November", + "Dezember", + } + } + } + } + } } diff --git a/icu4c/source/data/locales/de_AT.txt b/icu4c/source/data/locales/de_AT.txt index ec1c9e39a60..460c8ae043d 100644 --- a/icu4c/source/data/locales/de_AT.txt +++ b/icu4c/source/data/locales/de_AT.txt @@ -7,48 +7,56 @@ de_AT { Version{"2.0"} - DateTimeElements:intvector { - 2, - 1, - } - DateTimePatterns { - "HH:mm' Uhr 'z", - "HH:mm:ss z", - "HH:mm:ss", - "HH:mm", - "EEEE, dd. MMMM yyyy", - "dd. MMMM yyyy", - "dd.MM.yyyy", - "dd.MM.yy", - "{1} {0}", - } - MonthAbbreviations { - "J\u00E4n", - "Feb", - "M\u00E4r", - "Apr", - "Mai", - "Jun", - "Jul", - "Aug", - "Sep", - "Okt", - "Nov", - "Dez", - } - MonthNames { - "J\u00E4nner", - "Februar", - "M\u00E4rz", - "April", - "Mai", - "Juni", - "Juli", - "August", - "September", - "Oktober", - "November", - "Dezember", - } + calendar{ + gregorian{ + DateTimeElements:intvector { + 2, + 1, + } + DateTimePatterns{ + "HH:mm' Uhr 'z", + "HH:mm:ss z", + "HH:mm:ss", + "HH:mm", + "EEEE, dd. MMMM yyyy", + "dd. MMMM yyyy", + "dd.MM.yyyy", + "dd.MM.yy", + "{1} {0}", + } + monthNames{ + format{ + abbreviated{ + "J\u00E4n", + "Feb", + "M\u00E4r", + "Apr", + "Mai", + "Jun", + "Jul", + "Aug", + "Sep", + "Okt", + "Nov", + "Dez", + } + wide{ + "J\u00E4nner", + "Februar", + "M\u00E4rz", + "April", + "Mai", + "Juni", + "Juli", + "August", + "September", + "Oktober", + "November", + "Dezember", + } + } + } + } + } } diff --git a/icu4c/source/data/locales/de_BE.txt b/icu4c/source/data/locales/de_BE.txt index 7e20350dd9a..7b768a2a361 100644 --- a/icu4c/source/data/locales/de_BE.txt +++ b/icu4c/source/data/locales/de_BE.txt @@ -7,99 +7,4 @@ de_BE { Version{ "2.0" } -// AmPmMarkers { -// "vorm", -// "nachm", -// } - DateTimePatterns { - "HH 'h' mm 'min' ss 's' z", - "HH:mm:ss z", - "HH:mm:ss", - "HH:mm", - "EEEE d MMMM yyyy", - "d MMMM yyyy", - "d-MMM-yy", - "d/MM/yy", - "{1} {0}", - } - DateTimeElements:intvector { - 2, - 1, - } - DayAbbreviations { - "Son", - "Mon", - "Die", - "Mit", - "Don", - "Fre", - "Sam", - } -// DayNames { -// "Sonntag", -// "Montag", -// "Dienstag", -// "Mittwoch", -// "Donnerstag", -// "Freitag", -// "Samstag", -// } -// Measurement { "Metric" } - MonthAbbreviations { - "Jan", - "Feb", - "M\u00E4r", - "Apr", - "Mai", - "Jun", - "Jul", - "Aug", - "Sep", - "Okt", - "Nov", - "Dez", - } -// MonthNames { -// "Januar", -// "Februar", -// "M\u00E4rz", -// "April", -// "Mai", -// "Juni", -// "Juli", -// "August", -// "September", -// "Oktober", -// "November", -// "Dezember", -// } -// NumberElements { -// ",", -// ".", -// ";", -// "%", -// "0", -// "#", -// "-", -// "E", -// "\u2030", -// "\u221E", -// "\uFFFD", -// } - NumberPatterns { - "#,##0.###;-#,##0.###", - "#,##0.00 \u00A4;-#,##0.00 \u00A4", - "#,##0%", - "#E0", - } -// PaperSize { -// Hieght { "297" } -// Width { "210" } -// Units { "mm" } -// } -// LocaleString{ "de_BE" } - - Currencies { - FRF { "FF", "Franken" } - } } diff --git a/icu4c/source/data/locales/de_LU.txt b/icu4c/source/data/locales/de_LU.txt index f4615267bc0..2aa572f77db 100644 --- a/icu4c/source/data/locales/de_LU.txt +++ b/icu4c/source/data/locales/de_LU.txt @@ -13,9 +13,13 @@ de_LU { "#,##0%", "#E0", } - DateTimeElements:intvector { - 2, - 1, + calendar{ + gregorian{ + DateTimeElements:intvector { + 2, + 1, + } + } } // Currency display names diff --git a/icu4c/source/data/locales/el.txt b/icu4c/source/data/locales/el.txt index 4383bf447d4..1ba96e3d28c 100644 --- a/icu4c/source/data/locales/el.txt +++ b/icu4c/source/data/locales/el.txt @@ -7,10 +7,6 @@ el { Version { "2.0" } - AmPmMarkers { - "\u03A0\u039C", // The lowercase form is "\u03C0\u03BC". Both are valid. It's also been seen as mixed case too. - "\u039C\u039C", // The lowercase form is "\u03BC\u03BC". Both are valid. It's also been seen as mixed case too. - } Countries { AD { "\u0391\u03BD\u03B4\u03CC\u03C1\u03B1" } AE { "\u0397\u03BD\u03C9\u03BC\u03AD\u03BD\u03B1 \u0391\u03C1\u03B1\u03B2\u03B9\u03BA\u03AC \u0395\u03BC\u03B9\u03C1\u03AC\u03C4\u03B1" } @@ -278,43 +274,7 @@ el { SEK { "SEK", "\u039A\u039F\u03A1\u039F\u039D\u0391 \u03A3\u039F\u03A5\u0397\u0394\u0399\u0391\u03A3" } USD { "USD", "\u0394\u039F\u039B\u0391\u03A1\u0399\u039F \u0397\u03A0\u0391" } } - DateTimeElements:intvector { - 2, - 1, - } - DateTimePatterns { - "h:mm:ss a z", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", // While Greece uses both 12 and 24 hour formats, we use one for consistency due to limitations of current ICU API. - "EEEE, dd MMMM yyyy", - "dd MMMM yyyy", - "dd MMM yyyy", - "dd/MM/yyyy", - "{1} {0}", - } - DayAbbreviations { - "\u039A\u03C5\u03C1", - "\u0394\u03B5\u03C5", - "\u03A4\u03C1\u03B9", - "\u03A4\u03B5\u03C4", - "\u03A0\u03B5\u03BC", - "\u03A0\u03B1\u03C1", - "\u03A3\u03B1\u03B2", - } - DayNames { - "\u039A\u03C5\u03C1\u03B9\u03B1\u03BA\u03AE", - "\u0394\u03B5\u03C5\u03C4\u03AD\u03C1\u03B1", - "\u03A4\u03C1\u03AF\u03C4\u03B7", - "\u03A4\u03B5\u03C4\u03AC\u03C1\u03C4\u03B7", - "\u03A0\u03AD\u03BC\u03C0\u03C4\u03B7", - "\u03A0\u03B1\u03C1\u03B1\u03C3\u03BA\u03B5\u03C5\u03AE", - "\u03A3\u03AC\u03B2\u03B2\u03B1\u03C4\u03BF", - } - Eras { - "\u03C0.\u03A7.", - "\u03BC.\u03A7." - } + /* These languages should be all lower case, but it doesn't seem to be lowercase */ Languages { ar { "\u0391\u03c1\u03b1\u03b2\u03b9\u03ba\u03ac" } @@ -357,34 +317,6 @@ el { //zh_cn { "\u039A\u03B9\u03BD\u03B5\u03B6\u03B9\u03BA\u03AC (\u0391\u03C0\u03BB\u03BF\u03C0\u03BF\u03B9\u03B7\u03BC\u03AD\u03BD\u03B1)" } //zh_tw { "\u039A\u03B9\u03BD\u03B5\u03B6\u03B9\u03BA\u03AC (\u03A0\u03B1\u03C1\u03B1\u03B4\u03BF\u03C3\u03B9\u03B1\u03BA\u03AC)" } } - MonthAbbreviations { - "\u0399\u03B1\u03BD", - "\u03A6\u03B5\u03B2", - "\u039C\u03B1\u03C1", - "\u0391\u03C0\u03C1", - "\u039C\u03B1\u03CA", - "\u0399\u03BF\u03C5\u03BD", - "\u0399\u03BF\u03C5\u03BB", - "\u0391\u03C5\u03B3", - "\u03A3\u03B5\u03C0", - "\u039F\u03BA\u03C4", - "\u039D\u03BF\u03B5", - "\u0394\u03B5\u03BA", - } - MonthNames { - "\u0399\u03B1\u03BD\u03BF\u03C5\u03AC\u03C1\u03B9\u03BF\u03C2", - "\u03A6\u03B5\u03B2\u03C1\u03BF\u03C5\u03AC\u03C1\u03B9\u03BF\u03C2", - "\u039C\u03AC\u03C1\u03C4\u03B9\u03BF\u03C2", - "\u0391\u03C0\u03C1\u03AF\u03BB\u03B9\u03BF\u03C2", - "\u039C\u03AC\u03B9\u03BF\u03C2", - "\u0399\u03BF\u03CD\u03BD\u03B9\u03BF\u03C2", - "\u0399\u03BF\u03CD\u03BB\u03B9\u03BF\u03C2", - "\u0391\u03CD\u03B3\u03BF\u03C5\u03C3\u03C4\u03BF\u03C2", - "\u03A3\u03B5\u03C0\u03C4\u03AD\u03BC\u03B2\u03C1\u03B9\u03BF\u03C2", - "\u039F\u03BA\u03C4\u03CE\u03B2\u03C1\u03B9\u03BF\u03C2", - "\u039D\u03BF\u03AD\u03BC\u03B2\u03C1\u03B9\u03BF\u03C2", - "\u0394\u03B5\u03BA\u03AD\u03BC\u03B2\u03C1\u03B9\u03BF\u03C2", - } NumberElements { ",", ".", @@ -463,4 +395,85 @@ el { "UNGEGN", "::Greek-Latin/UNGEGN;" } + calendar{ + gregorian{ + AmPmMarkers{ + "\u03A0\u039C", // The lowercase form is "\u03C0\u03BC". Both are valid. It's also been seen as mixed case too. + "\u039C\u039C", // The lowercase form is "\u03BC\u03BC". Both are valid. It's also been seen as mixed case too. + } + DateTimeElements:intvector { + 2, + 1, + } + DateTimePatterns{ + "h:mm:ss a z", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", // While Greece uses both 12 and 24 hour formats, we use one for consistency due to limitations of current ICU API. + "EEEE, dd MMMM yyyy", + "dd MMMM yyyy", + "dd MMM yyyy", + "dd/MM/yyyy", + "{1} {0}", + } + dayNames{ + format{ + abbreviated{ + "\u039A\u03C5\u03C1", + "\u0394\u03B5\u03C5", + "\u03A4\u03C1\u03B9", + "\u03A4\u03B5\u03C4", + "\u03A0\u03B5\u03BC", + "\u03A0\u03B1\u03C1", + "\u03A3\u03B1\u03B2", + } + wide{ + "\u039A\u03C5\u03C1\u03B9\u03B1\u03BA\u03AE", + "\u0394\u03B5\u03C5\u03C4\u03AD\u03C1\u03B1", + "\u03A4\u03C1\u03AF\u03C4\u03B7", + "\u03A4\u03B5\u03C4\u03AC\u03C1\u03C4\u03B7", + "\u03A0\u03AD\u03BC\u03C0\u03C4\u03B7", + "\u03A0\u03B1\u03C1\u03B1\u03C3\u03BA\u03B5\u03C5\u03AE", + "\u03A3\u03AC\u03B2\u03B2\u03B1\u03C4\u03BF", + } + } + } + eras{ + "\u03C0.\u03A7.", + "\u03BC.\u03A7." + } + monthNames{ + format{ + abbreviated{ + "\u0399\u03B1\u03BD", + "\u03A6\u03B5\u03B2", + "\u039C\u03B1\u03C1", + "\u0391\u03C0\u03C1", + "\u039C\u03B1\u03CA", + "\u0399\u03BF\u03C5\u03BD", + "\u0399\u03BF\u03C5\u03BB", + "\u0391\u03C5\u03B3", + "\u03A3\u03B5\u03C0", + "\u039F\u03BA\u03C4", + "\u039D\u03BF\u03B5", + "\u0394\u03B5\u03BA", + } + wide{ + "\u0399\u03B1\u03BD\u03BF\u03C5\u03AC\u03C1\u03B9\u03BF\u03C2", + "\u03A6\u03B5\u03B2\u03C1\u03BF\u03C5\u03AC\u03C1\u03B9\u03BF\u03C2", + "\u039C\u03AC\u03C1\u03C4\u03B9\u03BF\u03C2", + "\u0391\u03C0\u03C1\u03AF\u03BB\u03B9\u03BF\u03C2", + "\u039C\u03AC\u03B9\u03BF\u03C2", + "\u0399\u03BF\u03CD\u03BD\u03B9\u03BF\u03C2", + "\u0399\u03BF\u03CD\u03BB\u03B9\u03BF\u03C2", + "\u0391\u03CD\u03B3\u03BF\u03C5\u03C3\u03C4\u03BF\u03C2", + "\u03A3\u03B5\u03C0\u03C4\u03AD\u03BC\u03B2\u03C1\u03B9\u03BF\u03C2", + "\u039F\u03BA\u03C4\u03CE\u03B2\u03C1\u03B9\u03BF\u03C2", + "\u039D\u03BF\u03AD\u03BC\u03B2\u03C1\u03B9\u03BF\u03C2", + "\u0394\u03B5\u03BA\u03AD\u03BC\u03B2\u03C1\u03B9\u03BF\u03C2", + } + } + } + } + } } diff --git a/icu4c/source/data/locales/en.txt b/icu4c/source/data/locales/en.txt index 12a55c4bc1a..77f6a770e8c 100644 --- a/icu4c/source/data/locales/en.txt +++ b/icu4c/source/data/locales/en.txt @@ -659,39 +659,6 @@ en { ZRZ { "ZRZ", "Zairean Zaire" } // 10/27/1971-11/01/1993 ZWD { "Z$", "Zimbabwe Dollar" } // 04/18/1980- } - DateTimePatterns { - "h:mm:ss a z", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", - "EEEE, MMMM d, yyyy", - "MMMM d, yyyy", - "MMM d, yyyy", - "M/d/yy", // Changing this will break binary compatibility. - "{1} {0}", - } - DayAbbreviations { - "Sun", - "Mon", - "Tue", - "Wed", - "Thu", - "Fri", - "Sat", - } - DayNames { - "Sunday", - "Monday", - "Tuesday", - "Wednesday", - "Thursday", - "Friday", - "Saturday", - } - Eras { - "BC", - "AD", - } Languages { root{ "Root"} // The only exception to ISO-639 @@ -1172,34 +1139,6 @@ en { } ExemplarCharacters{ "[a-z]" } LocaleScript:array{ "Latn" } - MonthAbbreviations { - "Jan", - "Feb", - "Mar", - "Apr", - "May", - "Jun", - "Jul", - "Aug", - "Sep", - "Oct", - "Nov", - "Dec", - } - MonthNames { - "January", - "February", - "March", - "April", - "May", - "June", - "July", - "August", - "September", - "October", - "November", - "December", - } NumberPatterns { "#,##0.###;-#,##0.###", "\u00A4#,##0.00;-\u00A4#,##0.00", @@ -1494,7 +1433,7 @@ en { japanese { "Japanese Calendar" } buddhist { "Buddhist Calendar" } islamic { "Islamic Calendar" } - islamic-civil { "Islamic-Civil Calendar" } + islamic-civil { "Islamic-Civil Calendar" } hebrew { "Hebrew Calendar" } chinese { "Chinese Calendar" } gregorian { "Gregorian Calendar" } @@ -1756,4 +1695,77 @@ en { "Shanghai", } } + calendar{ + gregorian{ + DateTimePatterns{ + "h:mm:ss a z", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", + "EEEE, MMMM d, yyyy", + "MMMM d, yyyy", + "MMM d, yyyy", + "M/d/yy", // Changing this will break binary compatibility. + "{1} {0}", + } + dayNames{ + format{ + abbreviated{ + "Sun", + "Mon", + "Tue", + "Wed", + "Thu", + "Fri", + "Sat", + } + wide{ + "Sunday", + "Monday", + "Tuesday", + "Wednesday", + "Thursday", + "Friday", + "Saturday", + } + } + } + eras{ + "BC", + "AD", + } + monthNames{ + format{ + abbreviated{ + "Jan", + "Feb", + "Mar", + "Apr", + "May", + "Jun", + "Jul", + "Aug", + "Sep", + "Oct", + "Nov", + "Dec", + } + wide{ + "January", + "February", + "March", + "April", + "May", + "June", + "July", + "August", + "September", + "October", + "November", + "December", + } + } + } + } + } } diff --git a/icu4c/source/data/locales/en_AU.txt b/icu4c/source/data/locales/en_AU.txt index bb49a2096bb..a72edbd5d02 100644 --- a/icu4c/source/data/locales/en_AU.txt +++ b/icu4c/source/data/locales/en_AU.txt @@ -7,20 +7,24 @@ en_AU { Version { "2.0" } - DateTimePatterns { - "h:mm:ss a z", - "h:mm:ss a", - "h:mm:ss a", - "h:mm a", - "EEEE, d MMMM yyyy", - "d MMMM yyyy", - "dd/MM/yyyy", - "d/MM/yy", - "{1} {0}", - } // Currency display names Currencies { AUD { "$", "Australian Dollar" } USD { "US$", "US Dollar" } } + calendar{ + gregorian{ + DateTimePatterns{ + "h:mm:ss a z", + "h:mm:ss a", + "h:mm:ss a", + "h:mm a", + "EEEE, d MMMM yyyy", + "d MMMM yyyy", + "dd/MM/yyyy", + "d/MM/yy", + "{1} {0}", + } + } + } } diff --git a/icu4c/source/data/locales/en_BE.txt b/icu4c/source/data/locales/en_BE.txt index 9e2f36da3fc..75ac4ce0fbd 100644 --- a/icu4c/source/data/locales/en_BE.txt +++ b/icu4c/source/data/locales/en_BE.txt @@ -7,21 +7,7 @@ en_BE { Version { "2.0" } - DateTimePatterns { - "HH' h 'mm' min 'ss' s 'z", - "HH:mm:ss z", - "HH:mm:ss", - "HH:mm", - "EEEE d MMMM yyyy", - "EEE d MMM yyyy", - "dd MMM yyyy", - "dd/MM/yy", - "{1} {0}", - } - DateTimeElements:intvector { - 2, - 1, - } + // LocaleString { "en_BE" } NumberElements { ",", @@ -46,4 +32,23 @@ en_BE { "#,##0%", "#E0", } + calendar{ + gregorian{ + DateTimeElements:intvector { + 2, + 1, + } + DateTimePatterns{ + "HH' h 'mm' min 'ss' s 'z", + "HH:mm:ss z", + "HH:mm:ss", + "HH:mm", + "EEEE d MMMM yyyy", + "EEE d MMM yyyy", + "dd MMM yyyy", + "dd/MM/yy", + "{1} {0}", + } + } + } } diff --git a/icu4c/source/data/locales/en_BW.txt b/icu4c/source/data/locales/en_BW.txt index 032ece2e5fc..857ded30f86 100644 --- a/icu4c/source/data/locales/en_BW.txt +++ b/icu4c/source/data/locales/en_BW.txt @@ -7,17 +7,6 @@ en_BW { Version { "2.0" } - DateTimePatterns { - "h:mm:ss a", - "h:mm:ss a", - "h:mm:ss a", - "h:mm a", - "EEEE dd MMMM yyyy", - "dd MMMM yyyy", - "MMM dd,yy", - "dd/MM/yy", - "{1} {0}", - } // NumberElements { // ".", // ",", @@ -37,4 +26,19 @@ en_BW { "#,##0%", "#E0", } + calendar{ + gregorian{ + DateTimePatterns{ + "h:mm:ss a", + "h:mm:ss a", + "h:mm:ss a", + "h:mm a", + "EEEE dd MMMM yyyy", + "dd MMMM yyyy", + "MMM dd,yy", + "dd/MM/yy", + "{1} {0}", + } + } + } } diff --git a/icu4c/source/data/locales/en_CA.txt b/icu4c/source/data/locales/en_CA.txt index 79d1f7a94c1..485da6a6502 100644 --- a/icu4c/source/data/locales/en_CA.txt +++ b/icu4c/source/data/locales/en_CA.txt @@ -7,17 +7,6 @@ en_CA { Version { "2.0" } - DateTimePatterns { - "h:mm:ss a z", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", - "EEEE, MMMM d, yyyy", - "MMMM d, yyyy", - "d-MMM-yy", - "dd/MM/yy", - "{1} {0}", - } NumberPatterns { "#,##0.###;-#,##0.###", "\u00A4#,##0.00;(\u00A4#,##0.00)", @@ -30,4 +19,19 @@ en_CA { CAD { "$", "Canadian Dollar" } USD { "US$", "US Dollar" } } + calendar{ + gregorian{ + DateTimePatterns{ + "h:mm:ss a z", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", + "EEEE, MMMM d, yyyy", + "MMMM d, yyyy", + "d-MMM-yy", + "dd/MM/yy", + "{1} {0}", + } + } + } } diff --git a/icu4c/source/data/locales/en_GB.txt b/icu4c/source/data/locales/en_GB.txt index 8398ff447c2..6f1b746401f 100644 --- a/icu4c/source/data/locales/en_GB.txt +++ b/icu4c/source/data/locales/en_GB.txt @@ -7,22 +7,7 @@ en_GB { Version { "2.0" } - DateTimeElements:intvector { - 2, - 1, - } - DateTimePatterns { - "HH:mm:ss z", - "HH:mm:ss z", - "HH:mm:ss", - "HH:mm", - "EEEE, d MMMM yyyy", - "d MMMM yyyy", - "d MMM yyyy", - "dd/MM/yyyy", - "{1} {0}", - } - zoneStrings { + zoneStrings { { "Europe/London", "Greenwich Mean Time", @@ -97,4 +82,23 @@ en_GB { "%%lenient-parse:\n" "& ' ' , ',' ;\n" } + calendar{ + gregorian{ + DateTimeElements:intvector { + 2, + 1, + } + DateTimePatterns{ + "HH:mm:ss z", + "HH:mm:ss z", + "HH:mm:ss", + "HH:mm", + "EEEE, d MMMM yyyy", + "d MMMM yyyy", + "d MMM yyyy", + "dd/MM/yyyy", + "{1} {0}", + } + } + } } diff --git a/icu4c/source/data/locales/en_GB_EURO.txt b/icu4c/source/data/locales/en_GB_EURO.txt index 30dad16f627..a0d7a008966 100644 --- a/icu4c/source/data/locales/en_GB_EURO.txt +++ b/icu4c/source/data/locales/en_GB_EURO.txt @@ -8,4 +8,3 @@ en_GB_EURO { Version{"2.0"} } - diff --git a/icu4c/source/data/locales/en_HK.txt b/icu4c/source/data/locales/en_HK.txt index 620d84bc01c..a156ace888a 100644 --- a/icu4c/source/data/locales/en_HK.txt +++ b/icu4c/source/data/locales/en_HK.txt @@ -7,42 +7,4 @@ en_HK { Version { "2.0" } -// AmPmMarkers { -// "AM", -// "PM", -// } - DateTimePatterns { - "h:mm:ss a z", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", - "EEEE, d MMMM yyyy", - "d MMMM yyyy", - "d MMM yyyy", - "dd/MM/yyyy", - "{1} {0}", - } -// NumberElements { -// ".", -// ",", -// ";", -// "%", -// "0", -// "#", -// "-", -// "E", -// "\u2030", -// "\u221E", -// "\uFFFD", -// } - NumberPatterns { - "#,##0.###;-#,##0.###", - "\u00A4#,##0.00;(\u00A4#,##0.00)", - "#,##0%", - "#E0", - } - Currencies{ - HKD { "$", "Hong Kong Dollar" } - USD { "US$", "USD" } // US Dollar - } } diff --git a/icu4c/source/data/locales/en_IE.txt b/icu4c/source/data/locales/en_IE.txt index f6d9ba2e0b1..e362676db44 100644 --- a/icu4c/source/data/locales/en_IE.txt +++ b/icu4c/source/data/locales/en_IE.txt @@ -7,24 +7,9 @@ en_IE { Version { "2.0" } - AmPmMarkers { - "a.m.", - "p.m.", - } Currencies { IEP { "\u00A3","Irish Pound" } // 1922-2001 } - DateTimePatterns { - "HH:mm:ss z", - "HH:mm:ss z", - "HH:mm:ss", - "HH:mm", - "EEEE d MMMM yyyy", - "d MMMM yyyy", - "d MMM yyyy", - "dd/MM/yyyy", - "{1} {0}", - } NumberPatterns { "#,##0.###;-#,##0.###", "\u00a4#,##0.00;-\u00a4#,##0.00", @@ -41,4 +26,23 @@ en_IE { "Dublin", } } + calendar{ + gregorian{ + AmPmMarkers{ + "a.m.", + "p.m.", + } + DateTimePatterns{ + "HH:mm:ss z", + "HH:mm:ss z", + "HH:mm:ss", + "HH:mm", + "EEEE d MMMM yyyy", + "d MMMM yyyy", + "d MMM yyyy", + "dd/MM/yyyy", + "{1} {0}", + } + } + } } diff --git a/icu4c/source/data/locales/en_IN.txt b/icu4c/source/data/locales/en_IN.txt index bced981c9ff..39a5311cf40 100644 --- a/icu4c/source/data/locales/en_IN.txt +++ b/icu4c/source/data/locales/en_IN.txt @@ -7,39 +7,4 @@ en_IN { Version{"2.0"} -// AmPmMarkers { -// "AM", -// "PM", -// } - DateTimePatterns { - "h:mm:ss a z", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", - "EEEE d MMMM yyyy", - "d MMMM yyyy", - "dd-MMM-yy", - "dd/MM/yy", - "{1} {0}", - } - -// NumberElements { -// ".", -// ",", -// ";", -// "%", -// "0", -// "#", -// "-", -// "E", -// "\u2030", -// "\u221E", -// "\uFFFD", -// } - NumberPatterns { - "##,##,##0.###;-##,##,##0.###", - "\u00A4 ##,##,##0.00;-\u00A4 ##,##,##0.00", - "##,##,##0%", - "#E0", - } } diff --git a/icu4c/source/data/locales/en_MT.txt b/icu4c/source/data/locales/en_MT.txt index 7a2fa6228d9..72d57aef303 100644 --- a/icu4c/source/data/locales/en_MT.txt +++ b/icu4c/source/data/locales/en_MT.txt @@ -19,27 +19,29 @@ en_MT { "#E0", } - DateTimePatterns { - "HH:mm:ss z", - "HH:mm:ss z", - "HH:mm:ss", - "HH:mm", - "EEEE, d MMMM yyyy", - "dd MMMM yyyy", - "dd MMM yyyy", - "dd/MM/yyyy", - "{1} {0}", - } Currencies{ //MTP { "\u00A3", "Maltese Pound"} (Obsolete) GBP { "GBP", "British Pound Sterling" } // British Pound Sterling. (Entered here to prevent GBP from showing up with the pound symbol, and being confused with MTL.) } - - DateTimeElements:intvector { - 1, // Sunday (il-Hadd) is first day of calendar week - 4 // four days minimal in first week for week numbering [MSA 200:2003 4.5.5, referencing 8601?] - // Monday is first day of workweek. [MSA 200:2003 4.5.5] + calendar{ + gregorian{ + DateTimeElements:intvector { + 1, // Sunday (il-Hadd) is first day of calendar week + 4 // four days minimal in first week for week numbering [MSA 200:2003 4.5.5, referencing 8601?] + // Monday is first day of workweek. [MSA 200:2003 4.5.5] + } + DateTimePatterns{ + "HH:mm:ss z", + "HH:mm:ss z", + "HH:mm:ss", + "HH:mm", + "EEEE, d MMMM yyyy", + "dd MMMM yyyy", + "dd MMM yyyy", + "dd/MM/yyyy", + "{1} {0}", + } + } } - } diff --git a/icu4c/source/data/locales/en_NZ.txt b/icu4c/source/data/locales/en_NZ.txt index 14cc2a57e8b..738a99f3521 100644 --- a/icu4c/source/data/locales/en_NZ.txt +++ b/icu4c/source/data/locales/en_NZ.txt @@ -7,20 +7,24 @@ en_NZ { Version { "2.0" } - DateTimePatterns { - "h:mm:ss a z", - "h:mm:ss a", - "h:mm:ss a", - "h:mm a", - "EEEE, d MMMM yyyy", - "d MMMM yyyy", - "d/MM/yyyy", - "d/MM/yy", - "{1} {0}", - } // Currency display names Currencies { NZD { "$", "New Zealand Dollar" } USD { "US$", "US Dollar" } } + calendar{ + gregorian{ + DateTimePatterns{ + "h:mm:ss a z", + "h:mm:ss a", + "h:mm:ss a", + "h:mm a", + "EEEE, d MMMM yyyy", + "d MMMM yyyy", + "d/MM/yyyy", + "d/MM/yy", + "{1} {0}", + } + } + } } diff --git a/icu4c/source/data/locales/en_PH.txt b/icu4c/source/data/locales/en_PH.txt index 038988039a8..faf9563ec4e 100644 --- a/icu4c/source/data/locales/en_PH.txt +++ b/icu4c/source/data/locales/en_PH.txt @@ -8,17 +8,6 @@ en_PH { Version{"2.0"} - DateTimePatterns { - "h:mm:ss a z", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", - "EEEE, MMMM d, yyyy", - "MMMM d, yyyy", - "MM d, yy", - "M/d/yy", - "{1} {0}", - } Currencies{ PHP { "PHP", "Peso" } } @@ -42,4 +31,19 @@ en_PH { "#E0", } + calendar{ + gregorian{ + DateTimePatterns{ + "h:mm:ss a z", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", + "EEEE, MMMM d, yyyy", + "MMMM d, yyyy", + "MM d, yy", + "M/d/yy", + "{1} {0}", + } + } + } } diff --git a/icu4c/source/data/locales/en_SG.txt b/icu4c/source/data/locales/en_SG.txt index d89919980fd..ab136fcf5b2 100644 --- a/icu4c/source/data/locales/en_SG.txt +++ b/icu4c/source/data/locales/en_SG.txt @@ -10,17 +10,6 @@ en_SG { Version { "2.0" } - DateTimePatterns { - "a hh:mm:ss", - "a hh:mm:ss", - "a hh:mm", - "a hh:mm", - "dd MMMM yyyy", - "dd MMM yyyy", - "dd-MMM-yy", - "dd/MM/yy", - "{1} {0}" - } // ShortCountry { "SIN" } // copied to zh_SG.txt @@ -40,4 +29,19 @@ en_SG { USD { "US$", "USD" } // US Dollar } + calendar{ + gregorian{ + DateTimePatterns{ + "a hh:mm:ss", + "a hh:mm:ss", + "a hh:mm", + "a hh:mm", + "dd MMMM yyyy", + "dd MMM yyyy", + "dd-MMM-yy", + "dd/MM/yy", + "{1} {0}" + } + } + } } diff --git a/icu4c/source/data/locales/en_ZA.txt b/icu4c/source/data/locales/en_ZA.txt index 6f26044c772..4ac03164c48 100644 --- a/icu4c/source/data/locales/en_ZA.txt +++ b/icu4c/source/data/locales/en_ZA.txt @@ -7,21 +7,25 @@ en_ZA { Version { "2.0" } - DateTimePatterns { - "h:mm:ss a", - "h:mm:ss a", - "h:mm:ss a", - "h:mm a", - "EEEE dd MMMM yyyy", - "dd MMMM yyyy", - "dd MMM yyyy", - "yyyy/MM/dd", - "{1} {0}", - } NumberPatterns { "#,##0.###;-#,##0.###", "\u00A4#,##0.00;-\u00A4#,##0.00", "#,##0%", "#E0", } + calendar{ + gregorian{ + DateTimePatterns{ + "h:mm:ss a", + "h:mm:ss a", + "h:mm:ss a", + "h:mm a", + "EEEE dd MMMM yyyy", + "dd MMMM yyyy", + "dd MMM yyyy", + "yyyy/MM/dd", + "{1} {0}", + } + } + } } diff --git a/icu4c/source/data/locales/en_ZW.txt b/icu4c/source/data/locales/en_ZW.txt index 9dad06d13b8..b4a132b8ab2 100644 --- a/icu4c/source/data/locales/en_ZW.txt +++ b/icu4c/source/data/locales/en_ZW.txt @@ -7,17 +7,6 @@ en_ZW { Version { "2.0" } - DateTimePatterns { - "h:mm:ss a", - "h:mm:ss a", - "h:mm:ss a", - "h:mm a", - "EEEE dd MMMM yyyy", - "dd MMMM yyyy", - "dd MMM,yy", - "d/M/yyyy", - "{1} {0}", - } NumberPatterns { "#,##0.###;-#,##0.###", "\u00a4#,##0.00;-\u00a4#,##0.00", @@ -28,4 +17,19 @@ en_ZW { ZWD { "Z$", "Zimbabwean Dollar" } // 04/18/1980- Zimbabwean Dollar USD { "US$", "USD" } // US Dollar } + calendar{ + gregorian{ + DateTimePatterns{ + "h:mm:ss a", + "h:mm:ss a", + "h:mm:ss a", + "h:mm a", + "EEEE dd MMMM yyyy", + "dd MMMM yyyy", + "dd MMM,yy", + "d/M/yyyy", + "{1} {0}", + } + } + } } diff --git a/icu4c/source/data/locales/eo.txt b/icu4c/source/data/locales/eo.txt index 747ad5d121a..6109c3b71c2 100644 --- a/icu4c/source/data/locales/eo.txt +++ b/icu4c/source/data/locales/eo.txt @@ -265,47 +265,7 @@ eo { ZM { "Zambio" } ZW { "Zimbabvo" } } - DateTimePatterns { - "H'-a horo kaj 'm z", - "HH:mm:ss z", - "HH:mm:ss", - "HH:mm", - "EEEE, d'-a de 'MMMM yyyy", - "yyyy-MMMM-dd", - "yyyy-MMM-dd", - "yy-MM-dd", - "{1} {0}", - } - DateTimeElements:intvector { - 2, - 4, - } - AmPmMarkers { - "atm", - "ptm", - } - DayAbbreviations { - "di", - "lu", - "ma", - "me", - "\u0135a", - "ve", - "sa", - } - DayNames { - "diman\u0109o", - "lundo", - "mardo", - "merkredo", - "\u0135a\u016ddo", - "vendredo", - "sabato", - } - Eras { - "aK", - "pK", - } + // Data comes from http://www.bertilow.com/lanlin/iso.php Languages { aa { "afara" } @@ -447,34 +407,6 @@ eo { zh { "\u0109ina" } zu { "zulua" } } - MonthAbbreviations { - "jan", - "feb", - "mar", - "apr", - "maj", - "jun", - "jul", - "a\u016dg", - "sep", - "okt", - "nov", - "dec", - } - MonthNames { - "januaro", - "februaro", - "marto", - "aprilo", - "majo", - "junio", - "julio", - "a\u016dgusto", - "septembro", - "oktobro", - "novembro", - "decembro", - } NumberElements { ",", "\u00A0", @@ -521,4 +453,85 @@ eo { "2,000,000,000,000: << bilionoj[ >>];\n" "1,000,000,000,000,000: =#,##0=;\n" } + calendar{ + gregorian{ + AmPmMarkers{ + "atm", + "ptm", + } + DateTimeElements:intvector { + 2, + 4, + } + DateTimePatterns{ + "H'-a horo kaj 'm z", + "HH:mm:ss z", + "HH:mm:ss", + "HH:mm", + "EEEE, d'-a de 'MMMM yyyy", + "yyyy-MMMM-dd", + "yyyy-MMM-dd", + "yy-MM-dd", + "{1} {0}", + } + dayNames{ + format{ + abbreviated{ + "di", + "lu", + "ma", + "me", + "\u0135a", + "ve", + "sa", + } + wide{ + "diman\u0109o", + "lundo", + "mardo", + "merkredo", + "\u0135a\u016ddo", + "vendredo", + "sabato", + } + } + } + eras{ + "aK", + "pK", + } + monthNames{ + format{ + abbreviated{ + "jan", + "feb", + "mar", + "apr", + "maj", + "jun", + "jul", + "a\u016dg", + "sep", + "okt", + "nov", + "dec", + } + wide{ + "januaro", + "februaro", + "marto", + "aprilo", + "majo", + "junio", + "julio", + "a\u016dgusto", + "septembro", + "oktobro", + "novembro", + "decembro", + } + } + } + } + } } diff --git a/icu4c/source/data/locales/es.txt b/icu4c/source/data/locales/es.txt index dd2548bf751..5f83c5a7b0f 100644 --- a/icu4c/source/data/locales/es.txt +++ b/icu4c/source/data/locales/es.txt @@ -641,43 +641,7 @@ es { ZRZ { "ZRZ", "zaire zaire\u00F1o" } // 10/27/1971-11/01/1993 ZWD { "Z$", "d\u00F3lar de Zimbabue" } // 04/18/1980- } - DateTimeElements:intvector { - 2, - 1, - } - DateTimePatterns { - "HH'H'mm''ss\" z", - "HH:mm:ss z", - "HH:mm:ss", - "HH:mm", - "EEEE d' de 'MMMM' de 'yyyy", - "d' de 'MMMM' de 'yyyy", - "dd-MMM-yy", - "d/MM/yy", - "{1} {0}", - } - DayAbbreviations { - "dom", - "lun", - "mar", - "mi\u00E9", - "jue", - "vie", - "s\u00E1b", - } - DayNames { - "domingo", - "lunes", - "martes", - "mi\u00E9rcoles", - "jueves", - "viernes", - "s\u00E1bado", - } - Eras { - "a.C.", // Said to be a.C. for antes de Cristo - "d.C.", // Said to be d.C. for despu\u00E9s de Cristo - } + // Spanish does not capitalize the language names like English Languages { root{"ra\u00EDz" } // The only exception to ISO-639 @@ -811,34 +775,6 @@ es { // u umlaut \u00fc is a rare character. // It can be found in words like multilig\u00fce, ag\u00fcita and Itag\u00fc\u00ed ExemplarCharacters { "[a-z \u00f1 \u00e1 \u00e9 \u00ed \u00f3 \u00fa \u00fc]" } - MonthAbbreviations { - "ene", - "feb", - "mar", - "abr", - "may", - "jun", - "jul", - "ago", - "sep", - "oct", - "nov", - "dic", - } - MonthNames { - "enero", - "febrero", - "marzo", - "abril", - "mayo", - "junio", - "julio", - "agosto", - "septiembre", - "octubre", - "noviembre", - "diciembre", - } NumberPatterns { "#,##0.###;-#,##0.###", "\u00A4#,##0.00;(\u00A4#,##0.00)", @@ -996,4 +932,104 @@ es { REVISED { "Revisado" } } + calendar{ + gregorian{ + DateTimeElements:intvector { + 2, + 1, + } + DateTimePatterns{ + "HH'H'mm''ss\" z", + "HH:mm:ss z", + "HH:mm:ss", + "HH:mm", + "EEEE d' de 'MMMM' de 'yyyy", + "d' de 'MMMM' de 'yyyy", + "dd-MMM-yy", + "d/MM/yy", + "{1} {0}", + } + dayNames{ + format{ + abbreviated{ + "dom", + "lun", + "mar", + "mi\u00E9", + "jue", + "vie", + "s\u00E1b", + } + narrow{ + "D" + "L" + "M" + "M" + "J" + "V" + "S" + } + wide{ + "domingo", + "lunes", + "martes", + "mi\u00E9rcoles", + "jueves", + "viernes", + "s\u00E1bado", + } + } + } + eras{ + "a.C.", // Said to be a.C. for antes de Cristo + "d.C.", // Said to be d.C. for despu\u00E9s de Cristo + } + monthNames{ + format{ + abbreviated{ + "ene", + "feb", + "mar", + "abr", + "may", + "jun", + "jul", + "ago", + "sep", + "oct", + "nov", + "dic", + } + narrow{ + "E", + "F", + "M", + "A", + "M", + "J", + "J", + "A", + "S", + "O", + "N", + "D", + } + wide{ + "enero", + "febrero", + "marzo", + "abril", + "mayo", + "junio", + "julio", + "agosto", + "septiembre", + "octubre", + "noviembre", + "diciembre", + } + } + } + } + } } diff --git a/icu4c/source/data/locales/es_AR.txt b/icu4c/source/data/locales/es_AR.txt index fead3825aa3..9ef1eea94c5 100644 --- a/icu4c/source/data/locales/es_AR.txt +++ b/icu4c/source/data/locales/es_AR.txt @@ -7,17 +7,6 @@ es_AR { Version { "2.0" } - DateTimePatterns { - "HH'h'''mm z", - "H:mm:ss z", - "HH:mm:ss", - "HH:mm", - "EEEE d' de 'MMMM' de 'yyyy", - "d' de 'MMMM' de 'yyyy", - "dd/MM/yyyy", - "dd/MM/yy", - "{1} {0}", - } NumberElements { ",", ".", @@ -38,4 +27,19 @@ es_AR { ARS { "$", "Peso Argentino" } USD { "US$", "D\u00F3lar Americano" } } + calendar{ + gregorian{ + DateTimePatterns{ + "HH'h'''mm z", + "H:mm:ss z", + "HH:mm:ss", + "HH:mm", + "EEEE d' de 'MMMM' de 'yyyy", + "d' de 'MMMM' de 'yyyy", + "dd/MM/yyyy", + "dd/MM/yy", + "{1} {0}", + } + } + } } diff --git a/icu4c/source/data/locales/es_BO.txt b/icu4c/source/data/locales/es_BO.txt index a98179b8076..8852db78d0f 100644 --- a/icu4c/source/data/locales/es_BO.txt +++ b/icu4c/source/data/locales/es_BO.txt @@ -7,17 +7,6 @@ es_BO { Version { "2.0" } - DateTimePatterns { - "hh:mm:ss a z", - "hh:mm:ss a z", - "hh:mm:ss a", - "hh:mm a", - "EEEE d' de 'MMMM' de 'yyyy", - "d' de 'MMMM' de 'yyyy", - "dd/MM/yyyy", - "dd/MM/yy", - "{1} {0}", - } NumberElements { ",", ".", @@ -33,4 +22,19 @@ es_BO { ",", "+", } + calendar{ + gregorian{ + DateTimePatterns{ + "hh:mm:ss a z", + "hh:mm:ss a z", + "hh:mm:ss a", + "hh:mm a", + "EEEE d' de 'MMMM' de 'yyyy", + "d' de 'MMMM' de 'yyyy", + "dd/MM/yyyy", + "dd/MM/yy", + "{1} {0}", + } + } + } } diff --git a/icu4c/source/data/locales/es_CL.txt b/icu4c/source/data/locales/es_CL.txt index 7f536717e4b..7eb34c677cb 100644 --- a/icu4c/source/data/locales/es_CL.txt +++ b/icu4c/source/data/locales/es_CL.txt @@ -7,17 +7,6 @@ es_CL { Version { "2.0" } - DateTimePatterns { - "HH:mm:ss z", - "H:mm:ss z", - "H:mm:ss", - "H:mm", - "EEEE d' de 'MMMM' de 'yyyy", - "d' de 'MMMM' de 'yyyy", - "dd-MM-yyyy", - "dd-MM-yy", - "{1} {0}", - } NumberElements { ",", ".", @@ -44,4 +33,19 @@ es_CL { CLP { "$", "Peso Chileno" } USD { "US$", "D\u00F3lar Americano" } } + calendar{ + gregorian{ + DateTimePatterns{ + "HH:mm:ss z", + "H:mm:ss z", + "H:mm:ss", + "H:mm", + "EEEE d' de 'MMMM' de 'yyyy", + "d' de 'MMMM' de 'yyyy", + "dd-MM-yyyy", + "dd-MM-yy", + "{1} {0}", + } + } + } } diff --git a/icu4c/source/data/locales/es_CO.txt b/icu4c/source/data/locales/es_CO.txt index 3dea252209c..e371b03193a 100644 --- a/icu4c/source/data/locales/es_CO.txt +++ b/icu4c/source/data/locales/es_CO.txt @@ -7,17 +7,6 @@ es_CO { Version { "2.0" } - DateTimePatterns { - "HH:mm:ss z", - "H:mm:ss z", - "H:mm:ss", - "H:mm", - "EEEE d' de 'MMMM' de 'yyyy", - "d' de 'MMMM' de 'yyyy", - "d/MM/yyyy", - "d/MM/yy", - "{1} {0}", - } NumberElements { ",", ".", @@ -38,4 +27,19 @@ es_CO { COP { "$", "Peso de Colombia" } USD { "US$", "D\u00F3lar Americano" } } + calendar{ + gregorian{ + DateTimePatterns{ + "HH:mm:ss z", + "H:mm:ss z", + "H:mm:ss", + "H:mm", + "EEEE d' de 'MMMM' de 'yyyy", + "d' de 'MMMM' de 'yyyy", + "d/MM/yyyy", + "d/MM/yy", + "{1} {0}", + } + } + } } diff --git a/icu4c/source/data/locales/es_CR.txt b/icu4c/source/data/locales/es_CR.txt index 198aac1146b..fb25bab27d3 100644 --- a/icu4c/source/data/locales/es_CR.txt +++ b/icu4c/source/data/locales/es_CR.txt @@ -7,17 +7,6 @@ es_CR { Version { "2.0" } - DateTimePatterns { - "hh:mm:ss a z", - "hh:mm:ss a z", - "hh:mm:ss a", - "hh:mm a", - "EEEE d' de 'MMMM' de 'yyyy", - "d' de 'MMMM' de 'yyyy", - "dd/MM/yyyy", - "dd/MM/yy", - "{1} {0}", - } NumberElements { ",", ".", @@ -33,4 +22,19 @@ es_CR { ",", "+", } + calendar{ + gregorian{ + DateTimePatterns{ + "hh:mm:ss a z", + "hh:mm:ss a z", + "hh:mm:ss a", + "hh:mm a", + "EEEE d' de 'MMMM' de 'yyyy", + "d' de 'MMMM' de 'yyyy", + "dd/MM/yyyy", + "dd/MM/yy", + "{1} {0}", + } + } + } } diff --git a/icu4c/source/data/locales/es_DO.txt b/icu4c/source/data/locales/es_DO.txt index cc83358225f..2f4eb58513a 100644 --- a/icu4c/source/data/locales/es_DO.txt +++ b/icu4c/source/data/locales/es_DO.txt @@ -7,17 +7,6 @@ es_DO { Version { "2.0" } - DateTimePatterns { - "hh:mm:ss a z", - "hh:mm:ss a z", - "hh:mm:ss a", - "hh:mm a", - "EEEE d' de 'MMMM' de 'yyyy", - "d' de 'MMMM' de 'yyyy", - "dd/MM/yyyy", - "dd/MM/yy", - "{1} {0}", - } // NumberElements { // ".", // ",", @@ -31,4 +20,19 @@ es_DO { // "\u221E", // "\uFFFD", // } + calendar{ + gregorian{ + DateTimePatterns{ + "hh:mm:ss a z", + "hh:mm:ss a z", + "hh:mm:ss a", + "hh:mm a", + "EEEE d' de 'MMMM' de 'yyyy", + "d' de 'MMMM' de 'yyyy", + "dd/MM/yyyy", + "dd/MM/yy", + "{1} {0}", + } + } + } } diff --git a/icu4c/source/data/locales/es_EC.txt b/icu4c/source/data/locales/es_EC.txt index e511c79cd79..708ff019ba9 100644 --- a/icu4c/source/data/locales/es_EC.txt +++ b/icu4c/source/data/locales/es_EC.txt @@ -7,17 +7,6 @@ es_EC { Version { "2.0" } - DateTimePatterns { - "HH:mm:ss z", - "H:mm:ss z", - "H:mm:ss", - "H:mm", - "EEEE d' de 'MMMM' de 'yyyy", - "d' de 'MMMM' de 'yyyy", - "dd/MM/yyyy", - "dd/MM/yy", - "{1} {0}", - } NumberElements { ",", ".", @@ -39,4 +28,19 @@ es_EC { "#,##0%", "#E0", } + calendar{ + gregorian{ + DateTimePatterns{ + "HH:mm:ss z", + "H:mm:ss z", + "H:mm:ss", + "H:mm", + "EEEE d' de 'MMMM' de 'yyyy", + "d' de 'MMMM' de 'yyyy", + "dd/MM/yyyy", + "dd/MM/yy", + "{1} {0}", + } + } + } } diff --git a/icu4c/source/data/locales/es_ES.txt b/icu4c/source/data/locales/es_ES.txt index 2168a65bee5..bcc58192153 100644 --- a/icu4c/source/data/locales/es_ES.txt +++ b/icu4c/source/data/locales/es_ES.txt @@ -22,21 +22,25 @@ es_ES { ",", "+", } - DateTimePatterns { - "HH'H'mm''ss\" z", - "HH:mm:ss z", - "H:mm:ss", - "H:mm", - "EEEE d' de 'MMMM' de 'yyyy", - "d' de 'MMMM' de 'yyyy", - "dd/MM/yyyy", - "dd/MM/yy", - "{1} {0}", - } NumberPatterns { "#,##0.###;-#,##0.###", "#,##0.00 \u00A4;-#,##0.00 \u00A4", "#,##0%", "#E0", } + calendar{ + gregorian{ + DateTimePatterns{ + "HH'H'mm''ss\" z", + "HH:mm:ss z", + "H:mm:ss", + "H:mm", + "EEEE d' de 'MMMM' de 'yyyy", + "d' de 'MMMM' de 'yyyy", + "dd/MM/yyyy", + "dd/MM/yy", + "{1} {0}", + } + } + } } diff --git a/icu4c/source/data/locales/es_GT.txt b/icu4c/source/data/locales/es_GT.txt index 2a58de7a8c7..75793951a68 100644 --- a/icu4c/source/data/locales/es_GT.txt +++ b/icu4c/source/data/locales/es_GT.txt @@ -7,17 +7,6 @@ es_GT { Version { "2.0" } - DateTimePatterns { - "hh:mm:ss a z", - "hh:mm:ss a z", - "hh:mm:ss a", - "hh:mm a", - "EEEE d' de 'MMMM' de 'yyyy", - "d' de 'MMMM' de 'yyyy", - "d/MM/yyyy", - "d/MM/yy", - "{1} {0}", - } // NumberElements { // ".", // ",", @@ -31,4 +20,19 @@ es_GT { // "\u221E", // "\uFFFD", // } + calendar{ + gregorian{ + DateTimePatterns{ + "hh:mm:ss a z", + "hh:mm:ss a z", + "hh:mm:ss a", + "hh:mm a", + "EEEE d' de 'MMMM' de 'yyyy", + "d' de 'MMMM' de 'yyyy", + "d/MM/yyyy", + "d/MM/yy", + "{1} {0}", + } + } + } } diff --git a/icu4c/source/data/locales/es_HN.txt b/icu4c/source/data/locales/es_HN.txt index 48382f38bff..a16af1ae03c 100644 --- a/icu4c/source/data/locales/es_HN.txt +++ b/icu4c/source/data/locales/es_HN.txt @@ -7,17 +7,6 @@ es_HN { Version { "2.0" } - DateTimePatterns { - "hh:mm:ss a z", - "hh:mm:ss a z", - "hh:mm:ss a", - "hh:mm a", - "EEEE dd' de 'MMMM' de 'yyyy", - "dd' de 'MMMM' de 'yyyy", - "dd/MM/yyyy", - "dd/MM/yy", - "{1} {0}", - } // NumberElements { // ".", // ",", @@ -31,4 +20,19 @@ es_HN { // "\u221E", // "\uFFFD", // } + calendar{ + gregorian{ + DateTimePatterns{ + "hh:mm:ss a z", + "hh:mm:ss a z", + "hh:mm:ss a", + "hh:mm a", + "EEEE dd' de 'MMMM' de 'yyyy", + "dd' de 'MMMM' de 'yyyy", + "dd/MM/yyyy", + "dd/MM/yy", + "{1} {0}", + } + } + } } diff --git a/icu4c/source/data/locales/es_MX.txt b/icu4c/source/data/locales/es_MX.txt index ed76ef71eca..7a18b8a9a1e 100644 --- a/icu4c/source/data/locales/es_MX.txt +++ b/icu4c/source/data/locales/es_MX.txt @@ -7,17 +7,6 @@ es_MX { Version { "2.0" } - DateTimePatterns { - "hh:mm:ss a z", - "hh:mm:ss a z", - "hh:mm:ss a", - "hh:mm a", - "EEEE d' de 'MMMM' de 'yyyy", - "d' de 'MMMM' de 'yyyy", - "dd/MM/yyyy", - "dd/MM/yy", - "{1} {0}", - } // NumberElements { // ".", // ",", @@ -37,4 +26,19 @@ es_MX { MXN { "$", "MXN" } USD { "US$", "D\u00F3lar Americano" } } + calendar{ + gregorian{ + DateTimePatterns{ + "hh:mm:ss a z", + "hh:mm:ss a z", + "hh:mm:ss a", + "hh:mm a", + "EEEE d' de 'MMMM' de 'yyyy", + "d' de 'MMMM' de 'yyyy", + "dd/MM/yyyy", + "dd/MM/yy", + "{1} {0}", + } + } + } } diff --git a/icu4c/source/data/locales/es_NI.txt b/icu4c/source/data/locales/es_NI.txt index 7ac46d14a7a..bef4271c30f 100644 --- a/icu4c/source/data/locales/es_NI.txt +++ b/icu4c/source/data/locales/es_NI.txt @@ -7,17 +7,6 @@ es_NI { Version { "2.0" } - DateTimePatterns { - "hh:mm:ss a z", - "hh:mm:ss a z", - "hh:mm:ss a", - "hh:mm a", - "EEEE d' de 'MMMM' de 'yyyy", - "d' de 'MMMM' de 'yyyy", - "dd/MM/yyyy", - "dd/MM/yy", - "{1} {0}", - } // NumberElements { // ".", // ",", @@ -31,4 +20,19 @@ es_NI { // "\u221E", // "\uFFFD", // } + calendar{ + gregorian{ + DateTimePatterns{ + "hh:mm:ss a z", + "hh:mm:ss a z", + "hh:mm:ss a", + "hh:mm a", + "EEEE d' de 'MMMM' de 'yyyy", + "d' de 'MMMM' de 'yyyy", + "dd/MM/yyyy", + "dd/MM/yy", + "{1} {0}", + } + } + } } diff --git a/icu4c/source/data/locales/es_PA.txt b/icu4c/source/data/locales/es_PA.txt index ab7ab5a6b77..622f93fa918 100644 --- a/icu4c/source/data/locales/es_PA.txt +++ b/icu4c/source/data/locales/es_PA.txt @@ -7,17 +7,6 @@ es_PA { Version { "2.0" } - DateTimePatterns { - "hh:mm:ss a z", - "hh:mm:ss a z", - "hh:mm:ss a", - "hh:mm a", - "EEEE d' de 'MMMM' de 'yyyy", - "d' de 'MMMM' de 'yyyy", - "MM/dd/yyyy", - "MM/dd/yy", - "{1} {0}", - } // NumberElements { // ".", // ",", @@ -31,4 +20,19 @@ es_PA { // "\u221E", // "\uFFFD", // } + calendar{ + gregorian{ + DateTimePatterns{ + "hh:mm:ss a z", + "hh:mm:ss a z", + "hh:mm:ss a", + "hh:mm a", + "EEEE d' de 'MMMM' de 'yyyy", + "d' de 'MMMM' de 'yyyy", + "MM/dd/yyyy", + "MM/dd/yy", + "{1} {0}", + } + } + } } diff --git a/icu4c/source/data/locales/es_PE.txt b/icu4c/source/data/locales/es_PE.txt index 349f2def60c..ade483a71b5 100644 --- a/icu4c/source/data/locales/es_PE.txt +++ b/icu4c/source/data/locales/es_PE.txt @@ -7,17 +7,6 @@ es_PE { Version { "2.0" } - DateTimePatterns { - "hh:mm:ss a z", - "hh:mm:ss a z", - "hh:mm:ss a", - "hh:mm a", - "EEEE d' de 'MMMM' de 'yyyy", - "d' de 'MMMM' de 'yyyy", - "dd/MM/yyyy", - "dd/MM/yy", - "{1} {0}", - } // NumberElements { // ".", // ",", @@ -37,4 +26,19 @@ es_PE { "#,##0%", "#E0", } + calendar{ + gregorian{ + DateTimePatterns{ + "hh:mm:ss a z", + "hh:mm:ss a z", + "hh:mm:ss a", + "hh:mm a", + "EEEE d' de 'MMMM' de 'yyyy", + "d' de 'MMMM' de 'yyyy", + "dd/MM/yyyy", + "dd/MM/yy", + "{1} {0}", + } + } + } } diff --git a/icu4c/source/data/locales/es_PR.txt b/icu4c/source/data/locales/es_PR.txt index ad44086768d..32ee811d64e 100644 --- a/icu4c/source/data/locales/es_PR.txt +++ b/icu4c/source/data/locales/es_PR.txt @@ -7,17 +7,6 @@ es_PR { Version{ "2.0" } - DateTimePatterns { - "hh:mm:ss a z", - "hh:mm:ss a z", - "hh:mm:ss a", - "hh:mm a", - "EEEE d' de 'MMMM' de 'yyyy", - "d' de 'MMMM' de 'yyyy", - "MM/dd/yyyy", - "MM/dd/yy", - "{1} {0}", - } // NumberElements { // ".", // ",", @@ -35,4 +24,19 @@ es_PR { Currencies { USD { "$", "D\u00F3lar Americano" } } + calendar{ + gregorian{ + DateTimePatterns{ + "hh:mm:ss a z", + "hh:mm:ss a z", + "hh:mm:ss a", + "hh:mm a", + "EEEE d' de 'MMMM' de 'yyyy", + "d' de 'MMMM' de 'yyyy", + "MM/dd/yyyy", + "MM/dd/yy", + "{1} {0}", + } + } + } } diff --git a/icu4c/source/data/locales/es_PY.txt b/icu4c/source/data/locales/es_PY.txt index f3cc36ced8d..f7b797f912e 100644 --- a/icu4c/source/data/locales/es_PY.txt +++ b/icu4c/source/data/locales/es_PY.txt @@ -7,17 +7,6 @@ es_PY { Version{ "2.0" } - DateTimePatterns { - "hh:mm:ss a z", - "hh:mm:ss a z", - "hh:mm:ss a", - "hh:mm a", - "EEEE d' de 'MMMM' de 'yyyy", - "d' de 'MMMM' de 'yyyy", - "dd/MM/yyyy", - "dd/MM/yy", - "{1} {0}", - } NumberElements { ",", ".", @@ -39,4 +28,19 @@ es_PY { "#,##0%", "#E0", } + calendar{ + gregorian{ + DateTimePatterns{ + "hh:mm:ss a z", + "hh:mm:ss a z", + "hh:mm:ss a", + "hh:mm a", + "EEEE d' de 'MMMM' de 'yyyy", + "d' de 'MMMM' de 'yyyy", + "dd/MM/yyyy", + "dd/MM/yy", + "{1} {0}", + } + } + } } diff --git a/icu4c/source/data/locales/es_SV.txt b/icu4c/source/data/locales/es_SV.txt index 3ec3540f8b0..e66da395320 100644 --- a/icu4c/source/data/locales/es_SV.txt +++ b/icu4c/source/data/locales/es_SV.txt @@ -7,17 +7,6 @@ es_SV { Version { "2.0" } - DateTimePatterns { - "hh:mm:ss a z", - "hh:mm:ss a z", - "hh:mm:ss a", - "hh:mm a", - "EEEE d' de 'MMMM' de 'yyyy", - "d' de 'MMMM' de 'yyyy", - "dd/MM/yyyy", - "dd/MM/yy", - "{1} {0}", - } // NumberElements { // ".", // ",", @@ -31,4 +20,19 @@ es_SV { // "\u221E", // "\uFFFD", // } + calendar{ + gregorian{ + DateTimePatterns{ + "hh:mm:ss a z", + "hh:mm:ss a z", + "hh:mm:ss a", + "hh:mm a", + "EEEE d' de 'MMMM' de 'yyyy", + "d' de 'MMMM' de 'yyyy", + "dd/MM/yyyy", + "dd/MM/yy", + "{1} {0}", + } + } + } } diff --git a/icu4c/source/data/locales/es_US.txt b/icu4c/source/data/locales/es_US.txt index a84965a1374..ec033db1509 100644 --- a/icu4c/source/data/locales/es_US.txt +++ b/icu4c/source/data/locales/es_US.txt @@ -20,21 +20,7 @@ es_US { // "\u221e", // "\ufffd", // } - DateTimeElements:intvector { - 1, - 1, - } - DateTimePatterns { - "h:mm:ss a z", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", - "EEEE d' de 'MMMM' de 'yyyy", - "d' de 'MMMM' de 'yyyy", - "MMM d, yyyy", - "M/d/yy", - "{1} {0}", - } + NumberPatterns { "#,##0.###;-#,##0.###", "\u00a4#,##0.00;(\u00a4#,##0.00)", @@ -49,4 +35,23 @@ es_US { 216 // width } MeasurementSystem:int{ 1 } // US system + calendar{ + gregorian{ + DateTimeElements:intvector { + 1, + 1, + } + DateTimePatterns{ + "h:mm:ss a z", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", + "EEEE d' de 'MMMM' de 'yyyy", + "d' de 'MMMM' de 'yyyy", + "MMM d, yyyy", + "M/d/yy", + "{1} {0}", + } + } + } } diff --git a/icu4c/source/data/locales/es_UY.txt b/icu4c/source/data/locales/es_UY.txt index 9119c5494db..34d986f90a2 100644 --- a/icu4c/source/data/locales/es_UY.txt +++ b/icu4c/source/data/locales/es_UY.txt @@ -7,17 +7,6 @@ es_UY { Version { "2.0" } - DateTimePatterns { - "hh:mm:ss a z", - "hh:mm:ss a z", - "hh:mm:ss a", - "hh:mm a", - "EEEE d' de 'MMMM' de 'yyyy", - "d' de 'MMMM' de 'yyyy", - "dd/MM/yyyy", - "dd/MM/yy", - "{1} {0}", - } NumberElements { ",", ".", @@ -39,4 +28,19 @@ es_UY { "#,##0%", "#E0", } + calendar{ + gregorian{ + DateTimePatterns{ + "hh:mm:ss a z", + "hh:mm:ss a z", + "hh:mm:ss a", + "hh:mm a", + "EEEE d' de 'MMMM' de 'yyyy", + "d' de 'MMMM' de 'yyyy", + "dd/MM/yyyy", + "dd/MM/yy", + "{1} {0}", + } + } + } } diff --git a/icu4c/source/data/locales/es_VE.txt b/icu4c/source/data/locales/es_VE.txt index 5f6538ff566..e7fa26c7c25 100644 --- a/icu4c/source/data/locales/es_VE.txt +++ b/icu4c/source/data/locales/es_VE.txt @@ -7,17 +7,6 @@ es_VE { Version { "2.0" } - DateTimePatterns { - "hh:mm:ss a z", - "hh:mm:ss a z", - "hh:mm:ss a", - "hh:mm a", - "EEEE d' de 'MMMM' de 'yyyy", - "d' de 'MMMM' de 'yyyy", - "dd/MM/yyyy", - "dd/MM/yy", - "{1} {0}", - } NumberElements { ",", ".", @@ -39,4 +28,19 @@ es_VE { "#,##0%", "#E0", } + calendar{ + gregorian{ + DateTimePatterns{ + "hh:mm:ss a z", + "hh:mm:ss a z", + "hh:mm:ss a", + "hh:mm a", + "EEEE d' de 'MMMM' de 'yyyy", + "d' de 'MMMM' de 'yyyy", + "dd/MM/yyyy", + "dd/MM/yy", + "{1} {0}", + } + } + } } diff --git a/icu4c/source/data/locales/et.txt b/icu4c/source/data/locales/et.txt index 228a17c8c9a..a665b8e748a 100644 --- a/icu4c/source/data/locales/et.txt +++ b/icu4c/source/data/locales/et.txt @@ -283,71 +283,7 @@ et { //zh_cn { "Hiina (lihtsustatud)" } //zh_tw { "Hiina (traditsiooniline)" } } - DateTimePatterns { - "H:mm:ss z", - "H:mm:ss z", - "H:mm:ss", - "H:mm", - "EEEE, d, MMMM yyyy", - "d MMMM yyyy", - "dd.MM.yyyy", - "dd.MM.yy", - "{1} {0}", - } - DateTimeElements:intvector { - 2, - 1, // "Minimal Days in First Week" is unknown. Root value used instead - } - DayAbbreviations { - "P", - "E", - "T", - "K", - "N", - "R", - "L", - } - DayNames { - "p\u00FChap\u00E4ev", - "esmasp\u00E4ev", - "teisip\u00E4ev", - "kolmap\u00E4ev", - "neljap\u00E4ev", - "reede", - "laup\u00E4ev", - } - Eras { - "e.m.a.", - "m.a.j.", - } - MonthAbbreviations { - "jaan", - "veebr", - "m\u00E4rts", - "apr", - "mai", - "juuni", - "juuli", - "aug", - "sept", - "okt", - "nov", - "dets", - } - MonthNames { - "jaanuar", - "veebruar", - "m\u00E4rts", - "aprill", - "mai", - "juuni", - "juuli", - "august", - "september", - "oktoober", - "november", - "detsember", - } + NumberElements { ",", "\u00A0", @@ -374,4 +310,81 @@ et { Currencies { EEK { "kr", "EEK" } } + calendar{ + gregorian{ + DateTimeElements:intvector { + 2, + 1, // "Minimal Days in First Week" is unknown. Root value used instead + } + DateTimePatterns{ + "H:mm:ss z", + "H:mm:ss z", + "H:mm:ss", + "H:mm", + "EEEE, d, MMMM yyyy", + "d MMMM yyyy", + "dd.MM.yyyy", + "dd.MM.yy", + "{1} {0}", + } + dayNames{ + format{ + abbreviated{ + "P", + "E", + "T", + "K", + "N", + "R", + "L", + } + wide{ + "p\u00FChap\u00E4ev", + "esmasp\u00E4ev", + "teisip\u00E4ev", + "kolmap\u00E4ev", + "neljap\u00E4ev", + "reede", + "laup\u00E4ev", + } + } + } + eras{ + "e.m.a.", + "m.a.j.", + } + monthNames{ + format{ + abbreviated{ + "jaan", + "veebr", + "m\u00E4rts", + "apr", + "mai", + "juuni", + "juuli", + "aug", + "sept", + "okt", + "nov", + "dets", + } + wide{ + "jaanuar", + "veebruar", + "m\u00E4rts", + "aprill", + "mai", + "juuni", + "juuli", + "august", + "september", + "oktoober", + "november", + "detsember", + } + } + } + } + } } diff --git a/icu4c/source/data/locales/eu.txt b/icu4c/source/data/locales/eu.txt index de80ec62350..f8e97bcfb20 100644 --- a/icu4c/source/data/locales/eu.txt +++ b/icu4c/source/data/locales/eu.txt @@ -234,24 +234,6 @@ eu { Currencies { ESP { "\u20A7", "ESP" } } - DayAbbreviations { - "ig", - "al", - "as", - "az", - "og", - "or", - "lr", - } - DayNames { - "igandea", - "astelehena", - "asteartea", - "asteazkena", - "osteguna", - "ostirala", - "larunbata", - } Languages { eu { "euskara" } } @@ -259,34 +241,6 @@ eu { "Latn", // ISO 15924 Name } ExemplarCharacters { "[a-z\u00f1\u00e7]" } - MonthAbbreviations { - "urt", - "ots", - "mar", - "api", - "mai", - "eka", - "uzt", - "abu", - "ira", - "urr", - "aza", - "abe", - } - MonthNames { - "urtarrila", - "otsaila", - "martxoa", - "apirila", - "maiatza", - "ekaina", - "uztaila", - "abuztua", - "iraila", - "urria", - "azaroa", - "abendua", - } NumberElements { ",", ".", @@ -306,4 +260,62 @@ eu { // /**************** Info Below is needed ****************/ // Eras{} // localPatternChars{} + calendar{ + gregorian{ + dayNames{ + format{ + abbreviated{ + "ig", + "al", + "as", + "az", + "og", + "or", + "lr", + } + wide{ + "igandea", + "astelehena", + "asteartea", + "asteazkena", + "osteguna", + "ostirala", + "larunbata", + } + } + } + monthNames{ + format{ + abbreviated{ + "urt", + "ots", + "mar", + "api", + "mai", + "eka", + "uzt", + "abu", + "ira", + "urr", + "aza", + "abe", + } + wide{ + "urtarrila", + "otsaila", + "martxoa", + "apirila", + "maiatza", + "ekaina", + "uztaila", + "abuztua", + "iraila", + "urria", + "azaroa", + "abendua", + } + } + } + } + } } diff --git a/icu4c/source/data/locales/eu_ES.txt b/icu4c/source/data/locales/eu_ES.txt index cf30cac6df7..f44650e1369 100644 --- a/icu4c/source/data/locales/eu_ES.txt +++ b/icu4c/source/data/locales/eu_ES.txt @@ -7,25 +7,30 @@ eu_ES { Version { "2.0" } - DateTimeElements:intvector { - 2, - 1, - } - DateTimePatterns { - "HH:mm:ss z", - "HH:mm:ss z", - "HH:mm:ss", - "HH:mm", - "EEEE, yyyy'eko' MMMM'ren' dd'a'", - "EEE, yyyy'eko' MMM'ren' dd'a'", - "yy'-'MMM'-'dd", - "yy'-'MM'-'dd", - "{1} {0}", - } + NumberPatterns { "#,##0.###;-#,##0.###", "#,##0.00 \u00A4;-#,##0.00 \u00A4", "#,##0%", "#E0", } + calendar{ + gregorian{ + DateTimeElements:intvector { + 2, + 1, + } + DateTimePatterns{ + "HH:mm:ss z", + "HH:mm:ss z", + "HH:mm:ss", + "HH:mm", + "EEEE, yyyy'eko' MMMM'ren' dd'a'", + "EEE, yyyy'eko' MMM'ren' dd'a'", + "yy'-'MMM'-'dd", + "yy'-'MM'-'dd", + "{1} {0}", + } + } + } } diff --git a/icu4c/source/data/locales/fa.txt b/icu4c/source/data/locales/fa.txt index d5b9e419c8f..b62f7a896e0 100644 --- a/icu4c/source/data/locales/fa.txt +++ b/icu4c/source/data/locales/fa.txt @@ -9,10 +9,6 @@ fa { Version { "3.0" } - AmPmMarkers { - "\u0642.\u0638.", - "\u0628.\u0638.", - } // Currency display names Currencies { // The Afghani symbol doesn't exist in Unicode. So we use the long name @@ -286,39 +282,6 @@ fa { ZM { "\u0632\u0627\u0645\u0628\u06cc\u0627" } ZW { "\u0632\u06cc\u0645\u0628\u0627\u0628\u0648\u0647" } } - DateTimePatterns { - "HH:mm:ss (z)", - "HH:mm:ss (z)", - "HH:mm:ss", - "HH:mm", - "EEEE\u060c d MMMM yyyy", - "d MMMM yyyy", - "yyyy/MM/d", - "yyyy/MM/d", - "{1} {0}", - } - DayAbbreviations { - "\u06cc.", - "\u062f.", - "\u0633.", - "\u0686.", - "\u067e.", - "\u062c.", - "\u0634.", - } - DayNames { - "\u06cc\u06a9\u200c\u0634\u0646\u0628\u0647", - "\u062f\u0648\u0634\u0646\u0628\u0647", - "\u0633\u0647\u200c\u0634\u0646\u0628\u0647", - "\u0686\u0647\u0627\u0631\u0634\u0646\u0628\u0647", - "\u067e\u0646\u062c\u200c\u0634\u0646\u0628\u0647", - "\u062c\u0645\u0639\u0647", - "\u0634\u0646\u0628\u0647", - } - Eras { - "\u0642.\u0645.", - "\u0645.", - } ExemplarCharacters {"[\u0621-\u0624\u0626-\u063a\u0641\u0642\u0644-\u0648\u064b-\u0652\u0654\u0670\u067e\u0686\u0698\u06a9\u06af\u06cc\u200c\u200d\u200f\u200e]"} Languages { root { "\u0631\u06cc\u0634\u0647" } @@ -595,34 +558,6 @@ fa { LocaleScript:array { "Arab" // ISO 15924 Name } - MonthAbbreviations { - "\u0698\u0627\u0646", - "\u0641\u0648\u0631", - "\u0645\u0627\u0631", - "\u0622\u0648\u0631", - "\u0645\u0640\u0647", - "\u0698\u0648\u0646", - "\u0698\u0648\u06cc", - "\u0627\u0648\u062a", - "\u0633\u067e\u062a", - "\u0627\u06a9\u062a", - "\u0646\u0648\u0627", - "\u062f\u0633\u0627", - } - MonthNames { - "\u0698\u0627\u0646\u0648\u06cc\u0647", - "\u0641\u0648\u0631\u06cc\u0647", - "\u0645\u0627\u0631\u0633", - "\u0622\u0648\u0631\u06cc\u0644", - "\u0645\u0647", - "\u0698\u0648\u0626\u0646", - "\u0698\u0648\u0626\u06cc\u0647", - "\u0627\u0648\u062a", - "\u0633\u067e\u062a\u0627\u0645\u0628\u0631", - "\u0627\u06a9\u062a\u0628\u0631", - "\u0646\u0648\u0627\u0645\u0628\u0631", - "\u062f\u0633\u0627\u0645\u0628\u0631", - } Scripts { Arab { "\u0639\u0631\u0628\u06cc" } Armn { "\u0627\u0631\u0645\u0646\u06cc" } @@ -707,4 +642,81 @@ fa { "\u062a\u0647\u0631\u0627\u0646", } } + calendar{ + gregorian{ + AmPmMarkers{ + "\u0642.\u0638.", + "\u0628.\u0638.", + } + DateTimePatterns{ + "HH:mm:ss (z)", + "HH:mm:ss (z)", + "HH:mm:ss", + "HH:mm", + "EEEE\u060c d MMMM yyyy", + "d MMMM yyyy", + "yyyy/MM/d", + "yyyy/MM/d", + "{1} {0}", + } + dayNames{ + format{ + abbreviated{ + "\u06cc.", + "\u062f.", + "\u0633.", + "\u0686.", + "\u067e.", + "\u062c.", + "\u0634.", + } + wide{ + "\u06cc\u06a9\u200c\u0634\u0646\u0628\u0647", + "\u062f\u0648\u0634\u0646\u0628\u0647", + "\u0633\u0647\u200c\u0634\u0646\u0628\u0647", + "\u0686\u0647\u0627\u0631\u0634\u0646\u0628\u0647", + "\u067e\u0646\u062c\u200c\u0634\u0646\u0628\u0647", + "\u062c\u0645\u0639\u0647", + "\u0634\u0646\u0628\u0647", + } + } + } + eras{ + "\u0642.\u0645.", + "\u0645.", + } + monthNames{ + format{ + abbreviated{ + "\u0698\u0627\u0646", + "\u0641\u0648\u0631", + "\u0645\u0627\u0631", + "\u0622\u0648\u0631", + "\u0645\u0640\u0647", + "\u0698\u0648\u0646", + "\u0698\u0648\u06cc", + "\u0627\u0648\u062a", + "\u0633\u067e\u062a", + "\u0627\u06a9\u062a", + "\u0646\u0648\u0627", + "\u062f\u0633\u0627", + } + wide{ + "\u0698\u0627\u0646\u0648\u06cc\u0647", + "\u0641\u0648\u0631\u06cc\u0647", + "\u0645\u0627\u0631\u0633", + "\u0622\u0648\u0631\u06cc\u0644", + "\u0645\u0647", + "\u0698\u0648\u0626\u0646", + "\u0698\u0648\u0626\u06cc\u0647", + "\u0627\u0648\u062a", + "\u0633\u067e\u062a\u0627\u0645\u0628\u0631", + "\u0627\u06a9\u062a\u0628\u0631", + "\u0646\u0648\u0627\u0645\u0628\u0631", + "\u062f\u0633\u0627\u0645\u0628\u0631", + } + } + } + } + } } diff --git a/icu4c/source/data/locales/fa_AF.txt b/icu4c/source/data/locales/fa_AF.txt index 56810e16b46..ce76e13f15f 100644 --- a/icu4c/source/data/locales/fa_AF.txt +++ b/icu4c/source/data/locales/fa_AF.txt @@ -10,256 +10,4 @@ fa_AF { Version { "1.0" } // Use the fa rules instead -// AmPmMarkers { -// "\u0642.\u0638.", -// "\u0628.\u0638.", -// } - Countries { - AD { "\u0627\u0646\u062f\u0648\u0631\u0627" } - AE { "\u0627\u0645\u0627\u0631\u0627\u062a \u0645\u062a\u062d\u062f\u0647\u0654 \u0639\u0631\u0628\u06cc" } - AG { "\u0627\u0646\u062a\u06cc\u06af\u0648\u0627 \u0648 \u0628\u0627\u0631\u0628\u0648\u062f\u0627" } - AL { "\u0627\u0644\u0628\u0627\u0646\u06cc\u0627" } - AO { "\u0627\u0646\u06af\u0648\u0644\u0627" } - AR { "\u0627\u0631\u062c\u0646\u062a\u0627\u06cc\u0646" } - AU { "\u0622\u0633\u062a\u0631\u0627\u0644\u06cc\u0627" } - - BA { "\u0628\u0648\u0633\u0646\u06cc\u0627 \u0648 \u0647\u0631\u0632\u0647\u200c\u06af\u0648\u06cc\u0646\u0627" } - BD { "\u0628\u0646\u06af\u0644\u0647\u200c\u062f\u06cc\u0634" } - BE { "\u0628\u0644\u062c\u06cc\u0645" } - BG { "\u0628\u0644\u063a\u0627\u0631\u06cc\u0627" } - BN { "\u0628\u0631\u0648\u0646\u06cc" } - BO { "\u0628\u0648\u0644\u06cc\u0648\u06cc\u0627" } - BR { "\u0628\u0631\u0627\u0632\u06cc\u0644" } - BS { "\u0628\u0647\u0627\u0645\u0627\u0633" } - BY { "\u0631\u0648\u0633\u06cc\u0647\u0654 \u0633\u0641\u06cc\u062f" } - - CD { "\u062c\u0645\u0647\u0648\u0631\u06cc \u062f\u0645\u0648\u06a9\u0631\u0627\u062a\u06cc\u06a9 \u06a9\u0627\u0646\u06af\u0648" } - CF { "\u0627\u0641\u0631\u06cc\u0642\u0627\u06cc \u0645\u0631\u06a9\u0632\u06cc" } - CG { "\u06a9\u0627\u0646\u06af\u0648" } - CH { "\u0633\u0648\u06cc\u0633" } - CL { "\u0686\u0644\u06cc" } - CO { "\u06a9\u0648\u0644\u0645\u0628\u06cc\u0627" } - CR { "\u06a9\u0627\u0633\u062a\u0631\u06cc\u06a9\u0627" } - CU { "\u06a9\u06cc\u0648\u0628\u0627" } - - DK { "\u062f\u0646\u0645\u0627\u0631\u06a9" } - - EC { "\u0627\u06a9\u0648\u0627\u062f\u0648\u0631" } - EE { "\u0627\u0633\u062a\u0648\u0646\u06cc\u0627" } - ER { "\u0627\u0631\u06cc\u062a\u0631\u06cc\u0627" } - ES { "\u0647\u0633\u067e\u0627\u0646\u06cc\u0647" } - ET { "\u0627\u06cc\u062a\u0648\u067e\u06cc\u0627" } - - FI { "\u0641\u0646\u0644\u0646\u062f" } - FM { "\u0645\u06cc\u06a9\u0631\u0648\u0646\u0632\u06cc\u0627" } - - GD { "\u06af\u0631\u06cc\u0646\u0627\u062f\u0627" } - GN { "\u06af\u06cc\u0646\u06cc\u0627" } - GQ { "\u06af\u06cc\u0646\u06cc\u0627 \u0627\u0633\u062a\u0648\u0627\u06cc\u06cc" } - GT { "\u06af\u0648\u0627\u062a\u06cc\u0645\u0627\u0644\u0627" } - GW { "\u06af\u06cc\u0646\u06cc\u0627 \u0628\u06cc\u0633\u0627\u0626\u0648" } - GY { "\u06af\u06cc\u0627\u0646\u0627" } - - HN { "\u0647\u0627\u0646\u062f\u0648\u0631\u0627\u0633" } - HR { "\u06a9\u0631\u0648\u0634\u06cc\u0627" } - HT { "\u0647\u0627\u06cc\u062a\u06cc" } - - ID { "\u0627\u0646\u062f\u0648\u0646\u06cc\u0632\u06cc\u0627" } - IE { "\u0622\u06cc\u0631\u0644\u0646\u062f" } - IS { "\u0622\u06cc\u0633\u0644\u0646\u062f" } - - JP { "\u062c\u0627\u067e\u0627\u0646" } - - KE { "\u06a9\u06cc\u0646\u06cc\u0627" } - KG { "\u0642\u0631\u063a\u0632\u0633\u062a\u0627\u0646" } - KH { "\u06a9\u0645\u067e\u0648\u0686\u06cc\u0627" } - KM { "\u06a9\u0648\u0645\u0648\u0631" } - KN { "\u0633\u0646\u062a \u06a9\u06cc\u062a\u0633 \u0648 \u0646\u06cc\u0648\u06cc\u0633" } - KP { "\u06a9\u0648\u0631\u06cc\u0627\u06cc \u0634\u0645\u0627\u0644\u06cc" } - KR { "\u06a9\u0648\u0631\u06cc\u0627\u06cc \u062c\u0646\u0648\u0628\u06cc" } - - LK { "\u0633\u0631\u06cc\u0644\u0627\u0646\u06a9\u0627" } - LS { "\u0644\u06cc\u0633\u0648\u062a\u0648" } - LT { "\u0644\u062a\u0648\u0627\u0646\u06cc\u0627" } - LV { "\u0644\u0627\u062a\u0648\u06cc\u0627" } - LY { "\u0644\u06cc\u0628\u06cc\u0627" } - - MG { "\u0645\u0627\u062f\u063a\u0627\u0633\u06a9\u0631" } - MN { "\u0645\u0646\u06af\u0648\u0644\u06cc\u0627" } - MR { "\u0645\u0648\u0631\u06cc\u062a\u0627\u0646\u06cc\u0627" } - MT { "\u0645\u0627\u0644\u062a\u0627" } - MX { "\u0645\u06a9\u0633\u06cc\u06a9\u0648" } - MY { "\u0645\u0627\u0644\u06cc\u0632\u06cc\u0627" } - MZ { "\u0645\u0648\u0632\u0645\u0628\u06cc\u0642" } - - NG { "\u0646\u06cc\u062c\u0631\u06cc\u0627" } - NI { "\u0646\u06cc\u06a9\u0627\u0631\u0627\u06af\u0648\u0627" } - NL { "\u0647\u0627\u0644\u0646\u062f" } - NO { "\u0646\u0627\u0631\u0648\u06cc" } - NP { "\u0646\u06cc\u067e\u0627\u0644" } - NZ { "\u0632\u06cc\u0644\u0627\u0646\u062f \u062c\u062f\u06cc\u062f" } - - PA { "\u067e\u0627\u0646\u0627\u0645\u0647" } - PE { "\u067e\u06cc\u0631\u0648" } - PG { "\u067e\u0627\u067e\u0648\u0627 \u0646\u06cc\u0648 \u06af\u06cc\u0646\u06cc\u0627" } - PL { "\u067e\u0648\u0644\u0646\u062f" } - PT { "\u067e\u0631\u062a\u06af\u0627\u0644" } - PY { "\u067e\u0627\u0631\u0627\u06af\u0648\u0627\u06cc" } - - RO { "\u0631\u0648\u0645\u0627\u0646\u06cc\u0627" } - RW { "\u0631\u0648\u0622\u0646\u062f\u0627" } - - SB { "\u062c\u0632\u0627\u06cc\u0631 \u0633\u0644\u0648\u0645\u0648\u0646" } - SE { "\u0633\u0648\u06cc\u062f\u0646" } - SG { "\u0633\u06cc\u0646\u06af\u0627\u067e\u0648\u0631" } - SI { "\u0633\u0644\u0648\u0646\u06cc\u0627" } - SK { "\u0633\u0644\u0648\u0627\u06a9\u06cc\u0627" } - SL { "\u0633\u06cc\u0631\u0627\u0644\u06cc\u0648\u0646" } - SN { "\u0633\u06cc\u0646\u06cc\u06af\u0627\u0644" } - SO { "\u0633\u0648\u0645\u0627\u0644\u06cc\u0647" } - ST { "\u0633\u0627\u0626\u0648 \u062a\u0648\u0645\u0647 \u0648 \u067e\u0631\u06cc\u0646\u0633\u06cc\u067e" } - SV { "\u0627\u0644\u0633\u0644\u0648\u0627\u062f\u0648\u0631" } - - TJ { "\u062a\u0627\u062c\u06a9\u0633\u062a\u0627\u0646" } - - UA { "\u0627\u06a9\u0631\u0627\u06cc\u0646" } - US { "\u0627\u06cc\u0627\u0644\u0627\u062a \u0645\u062a\u062d\u062f\u0647\u0654 \u0627\u0645\u0631\u06cc\u06a9\u0627" } - UY { "\u06cc\u0648\u0631\u0648\u06af\u0648\u0627\u06cc" } - - VC { "\u0633\u0646\u062a \u0648\u06cc\u0646\u0633\u0646\u062a \u0648 \u06af\u0631\u06cc\u0646\u0627\u062f\u06cc\u0646" } - VE { "\u0648\u0646\u0632\u0648\u06cc\u0644\u0627" } - - WS { "\u0633\u0627\u0645\u0648\u0622\u06cc \u063a\u0631\u0628\u06cc" } - - YU { "\u06cc\u0648\u06af\u0648\u0633\u0644\u0627\u0648\u06cc\u0627" } - - ZA { "\u0627\u0641\u0631\u06cc\u0642\u0627\u06cc \u062c\u0646\u0648\u0628\u06cc" } - ZW { "\u0632\u06cc\u0645\u0628\u0627\u0628\u0648\u06cc" } - } - // Use the fa rules instead -// DateTimePatterns { -// "H:mm:ss (z)", -// "H:mm:ss (z)", -// "H:mm:ss ", -// "H:mm", -// "EEEE\u060c d MMMM yyyy", -// "d MMMM yyyy", -// "yyyy/M/d", -// "yyyy/M/d", -// "{1} {0}", -// } - DateTimeElements:intvector { - 7, // Saturday - 1, - } -// ExemplarCharacters {"[\u0621-\u0624\u0626-\u063a\u0641\u0642\u0644-\u0648\u064a-\u0652\u0654\u0670\u067c\u067e\u0681\u0685-\u0686\u0689\u0693\u0696\u0698\u069a\u06a9\u06ab\u06af\u06bc\u06cc-\u06cd\u06d0 \u200c\u200d\u200f\u200e]"} - Languages { - es { "\u0647\u0633\u067e\u0627\u0646\u0648\u06cc" } - fa { "\u062f\u0631\u06cc" } - fi { "\u0641\u0646\u0644\u0646\u062f\u06cc" } - ga { "\u0622\u06cc\u0631\u0644\u0646\u062f\u06cc" } - hr { "\u06a9\u0631\u0648\u0634\u06cc\u0627\u06cc\u06cc" } - id { "\u0627\u0646\u062f\u0648\u0646\u06cc\u0632\u06cc\u0627\u06cc\u06cc" } - is { "\u0622\u06cc\u0633\u0644\u0646\u062f\u06cc" } - it { "\u0627\u06cc\u062a\u0627\u0644\u0648\u06cc" } - ja { "\u062c\u0627\u067e\u0627\u0646\u06cc" } - ko { "\u06a9\u0648\u0631\u06cc\u0627\u06cc\u06cc" } - ky { "\u0642\u0631\u063a\u0632\u06cc" } - mn { "\u0645\u063a\u0644\u06cc" } - ne { "\u0646\u06cc\u067e\u0627\u0644\u06cc" } - nl { "\u0647\u0627\u0644\u0646\u062f\u06cc" } - no { "\u0646\u0627\u0631\u0648\u06cc\u0698\u06cc" } - pl { "\u067e\u0648\u0644\u0646\u062f\u06cc" } - pt { "\u067e\u0631\u062a\u06af\u0627\u0644\u06cc" } - sv { "\u0633\u0648\u06cc\u062f\u0646\u06cc" } - tg { "\u062a\u0627\u062c\u06a9\u06cc" } - } - MonthAbbreviations { - "\u062c\u0646\u0648", - "\u0641\u0628\u0631", - "\u0645\u0627\u0631", - "\u0627\u067e\u0631", - "\u0645\u0640\u06cc", - "\u062c\u0648\u0646", - "\u062c\u0648\u0644", - "\u0627\u06af\u0633", - "\u0633\u067e\u062a", - "\u0627\u06a9\u062a", - "\u0646\u0648\u0645", - "\u062f\u0633\u0645", - } - MonthNames { - "\u062c\u0646\u0648\u0631\u06cc", - "\u0641\u0628\u0631\u0648\u0631\u06cc", // DoL says "\u0641\u0631\u0648\u0631\u06cc" - "\u0645\u0627\u0631\u0686", - "\u0627\u067e\u0631\u06cc\u0644", - "\u0645\u06cc", - "\u062c\u0648\u0646", - "\u062c\u0648\u0644\u0627\u06cc", - "\u0627\u06af\u0633\u062a", - "\u0633\u067e\u062a\u0645\u0628\u0631", // MoIC says "\u0633\u067e\u062a\u0627\u0645\u0628\u0631" - "\u0627\u06a9\u062a\u0648\u0628\u0631", - "\u0646\u0648\u0645\u0628\u0631", // MoIC says "\u0646\u0648\u0627\u0645\u0628\u0631" - "\u062f\u0633\u0645\u0628\u0631", // MoIC says "\u062f\u0633\u0627\u0645\u0628\u0631" - } - NumberPatterns { - "#,##0.###;-#,##0.###", - "#,##0 \u00a4;-#,##0 \u00a4", - "#,##0%", // The percent sign should appear on the right side. Academy says it should appear on the left (like fa_IR). - "#E0", - } - NumberElements { - "\u066b", - "\u066c", - ";", - "\u066a", - "\u06f0", - "#", - "\u2212", - "\u00d7\u06f1\u06f0^", - "\u2030", - "\u221e", - "\ufffd", - "\u066b", - "+", - } - SpelloutRules { - "%main:\n" - "-x: \u0645\u0646\u0641\u06cc >>;\n" - "x.x: << \u0639\u0634\u0627\u0631\u06cc\u0647 >>;\n" - "\u0635\u0641\u0631; \u06cc\u06a9; \u062f\u0648; \u0633\u0647; \u0686\u0647\u0627\u0631; \u067e\u0646\u062c; \u0634\u0634; \u0647\u0641\u062a; \u0647\u0634\u062a; \u0646\u0647;\n" - "\u062f\u0647; \u06cc\u0627\u0632\u062f\u0647; \u062f\u0648\u0627\u0632\u062f\u0647; \u0633\u06cc\u0632\u062f\u0647; \u0686\u0647\u0627\u0631\u062f\u0647; \u067e\u0627\u0646\u0632\u062f\u0647; \u0634\u0627\u0646\u0632\u062f\u0647;\n" - " \u0647\u0641\u062f\u0647; \u0647\u062c\u062f\u0647; \u0646\u0632\u062f\u0647;\n" - "20: \u0628\u06cc\u0633\u062a[ \u0648 >>];\n" - "30: \u0633\u06cc[ \u0648 >>];\n" - "40: \u0686\u0647\u0644[ \u0648 >>];\n" - "50: \u067e\u0646\u062c\u0627\u0647[ \u0648 >>];\n" - "60: \u0634\u0635\u062a[ \u0648 >>];\n" - "70: \u0647\u0641\u062a\u0627\u062f[ \u0648 >>];\n" - "80: \u0647\u0634\u062a\u0627\u062f[ \u0648 >>];\n" - "90: \u0646\u0648\u062f[ \u0648 >>];\n" - "100: \u0635\u062f[ \u0648 >>];\n" - "200: \u062f\u0648\u0635\u062f[ \u0648 >>];\n" - "300: \u0633\u0647\u200c\u0635\u062f[ \u0648 >>];\n" - "400: \u0686\u0647\u0627\u0631\u0635\u062f[ \u0648 >>];\n" - "500: \u067e\u0646\u062c\u0635\u062f[ \u0648 >>];\n" - "600: \u0634\u0634\u0635\u062f[ \u0648 >>];\n" - "700: \u0647\u0641\u062a\u0635\u062f[ \u0648 >>];\n" - "800: \u0647\u0634\u062a\u0635\u062f[ \u0648 >>];\n" - "900: \u0646\u0647\u0635\u062f[ \u0648 >>];\n" - "1000: << \u0647\u0632\u0627\u0631[ \u0648 >>];\n" - "1,000,000: << \u0645\u06cc\u0644\u06cc\u0648\u0646[ \u0648 >>];\n" - "1,000,000,000: << \u0645\u06cc\u0644\u06cc\u0627\u0631\u062f[ \u0648 >>];\n" - "1,000,000,000,000: =#,##0=;\n" - } - zoneStrings { - { - "Asia/Kabul", - "\u0648\u0642\u062a \u0627\u0641\u063a\u0627\u0646\u0633\u062a\u0627\u0646", - "AFT", - "\u0648\u0642\u062a \u0627\u0641\u063a\u0627\u0646\u0633\u062a\u0627\u0646", - "AFT", - "\u06a9\u0627\u0628\u0644", - } - } } diff --git a/icu4c/source/data/locales/fa_IR.txt b/icu4c/source/data/locales/fa_IR.txt index 3d2de1ffb68..b8abe8e737c 100644 --- a/icu4c/source/data/locales/fa_IR.txt +++ b/icu4c/source/data/locales/fa_IR.txt @@ -9,11 +9,15 @@ fa_IR { Version { "3.0" } - DateTimeElements:intvector { - 7, // Saturday - 1, + calendar{ + gregorian{ + DateTimeElements:intvector { + 7, // Saturday + 1, + } + } } - NumberPatterns { + NumberPatterns { "#,##0.###;\u2212#,##0.###", "#,##0 \u00a4;\u2212#,##0 \u00a4", "%#,##0", @@ -35,4 +39,3 @@ fa_IR { "+", } } - diff --git a/icu4c/source/data/locales/fi.txt b/icu4c/source/data/locales/fi.txt index bfed0edf9fe..dc1dfa9551d 100644 --- a/icu4c/source/data/locales/fi.txt +++ b/icu4c/source/data/locales/fi.txt @@ -533,39 +533,7 @@ fi { ZRZ { "ZRZ", "Zairen zaire" } // 10/27/1971-11/01/1993 ZWD { "Z$", "Zimbabwen dollari" } // 04/18/1980- } - DateTimeElements:intvector { - 2, - 4, - } - DateTimePatterns { - "HH:mm:ss z", - "HH:mm:ss z", - "HH:mm:ss", - "HH:mm", - "d. MMMM'ta 'yyyy", - "d. MMMM'ta 'yyyy", - "d.M.yyyy", - "d.M.yyyy", - "{1} {0}", - } - DayAbbreviations { - "su", - "ma", - "ti", - "ke", - "to", - "pe", - "la", - } - DayNames { - "sunnuntai", - "maanantai", - "tiistai", - "keskiviikko", - "torstai", - "perjantai", - "lauantai", - } + Languages { ab { "abhaasi" } ae { "avesta" } @@ -724,82 +692,6 @@ fi { LocaleScript{ "Latn", // ISO 15924 Name } - MonthAbbreviations { - "tammi", - "helmi", - "maalis", - "huhti", - "touko", - "kes\u00E4", - "hein\u00E4", - "elo", - "syys", - "loka", - "marras", - "joulu", - } - MonthNames { - "tammikuu", - "helmikuu", - "maaliskuu", - "huhtikuu", - "toukokuu", - "kes\u00E4kuu", - "hein\u00E4kuu", - "elokuu", - "syyskuu", - "lokakuu", - "marraskuu", - "joulukuu", - } - // International Calendars Data. - // NOTE (ICU 2.6) - the format of this data WILL CHANGE in future releases. - MonthNames_islamic { - "Muh\u00E1rram", // Muharram - "S\u00E1far", // Safar - "Rab\u00ED' al-\u00E1wwal", // Rabi' al-awwal - "Rab\u00ED' al-\u00E1khir", // Rabi' al-thani - "D\u017Eumada-l-\u00FAla", // Jumada al-awwal - "D\u017Eumada-l-\u00E1khira", // Jumada al-thani - "Rad\u017Eab", // Rajab - "\u0160a'b\u00E1n", // Sha'ban - "Ramad\u00E1n", // Ramadan - "\u0160awwal", // Shawwal - "Dhu-l-qada", // Dhu al-Qi'dah - "Dhu-l-hidd\u017Ea" // Dhu al-Hijjah - } - //Eras_islamic { - // "AH" // Anno Hid\u017Era (in root) - //} - MonthAbbreviations_islamic:alias { // same as MonthNames (no data) - "fi/MonthNames_islamic" - } - // Civil is identical other than in calculations - MonthNames_islamic-civil:alias { - "fi/MonthNames_islamic" - } - MonthAbbreviations_islamic-civil:alias { - "fi/MonthAbbreviations_islamic" - } - - MonthNames_hebrew { - "Ti\u0161r\u00ECkuu", // Tishri - "He\u0161v\u00E1nkuu", // Heshvan - "Kisl\u00E9vkuu", // Kislev - "Tev\u00E9tkuu", // Tevet - "\u0160evatkuu", // Shevat - "Ad\u00E1rkuu", // Adar I - "Ad\u00E1rkuu II", // Adar - "Nis\u00E1nkuu", // Nisan - "Ijj\u00E1rkuu", // Iyar - "Siv\u00E1nkuu", // Sivan - "Tamm\u00FAzkuu", // Tamuz - "Abkuu", // Av - "El\u00FAlkuu", // Elul - } - MonthAbbreviations_hebrew:alias { - "fi/MonthNames_hebrew" // no data - } Scripts { Arab { "Arabialainen" } Armn { "Armenialainen" } @@ -861,4 +753,155 @@ fi { gregorian { "Gregoriaaninen kalenteri" } } } + calendar{ + islamic{ + //eras { + // "AH" // Anno Hid\u017Era (in root) + //} + monthNames{ + format{ + abbreviated:alias { // same as MonthNames (no data) + "fi/calendar/islamic/monthNames/format/wide" + } + wide { + "Muh\u00E1rram", // Muharram + "S\u00E1far", // Safar + "Rab\u00ED' al-\u00E1wwal", // Rabi' al-awwal + "Rab\u00ED' al-\u00E1khir", // Rabi' al-thani + "D\u017Eumada-l-\u00FAla", // Jumada al-awwal + "D\u017Eumada-l-\u00E1khira", // Jumada al-thani + "Rad\u017Eab", // Rajab + "\u0160a'b\u00E1n", // Sha'ban + "Ramad\u00E1n", // Ramadan + "\u0160awwal", // Shawwal + "Dhu-l-qada", // Dhu al-Qi'dah + "Dhu-l-hidd\u017Ea" // Dhu al-Hijjah + } + } + } + } + islamic-civil{ + monthNames:alias{ + "fi/calendar/islamic/monthNames" + } + } + hebrew{ + monthNames{ + format{ + wide { + "Ti\u0161r\u00ECkuu", // Tishri + "He\u0161v\u00E1nkuu", // Heshvan + "Kisl\u00E9vkuu", // Kislev + "Tev\u00E9tkuu", // Tevet + "\u0160evatkuu", // Shevat + "Ad\u00E1rkuu", // Adar I + "Ad\u00E1rkuu II", // Adar + "Nis\u00E1nkuu", // Nisan + "Ijj\u00E1rkuu", // Iyar + "Siv\u00E1nkuu", // Sivan + "Tamm\u00FAzkuu", // Tamuz + "Abkuu", // Av + "El\u00FAlkuu", // Elul + } + abbreviated:alias { + "fi/calendar/hebrew/monthNames/format/wide" // no data + } + } + } + } + gregorian{ + DateTimeElements:intvector { + 2, + 4, + } + DateTimePatterns{ + "HH:mm:ss z", + "HH:mm:ss z", + "HH:mm:ss", + "HH:mm", + "d. MMMM'ta 'yyyy", + "d. MMMM'ta 'yyyy", + "d.M.yyyy", + "d.M.yyyy", + "{1} {0}", + } + dayNames{ + format{ + abbreviated{ + "su", + "ma", + "ti", + "ke", + "to", + "pe", + "la", + } + narrow{ + "S", + "M", + "T", + "K", + "T", + "P", + "L", + } + wide{ + "sunnuntai", + "maanantai", + "tiistai", + "keskiviikko", + "torstai", + "perjantai", + "lauantai", + } + } + } + monthNames{ + format{ + abbreviated{ + "tammi", + "helmi", + "maalis", + "huhti", + "touko", + "kes\u00E4", + "hein\u00E4", + "elo", + "syys", + "loka", + "marras", + "joulu", + } + narrow{ + "T" + "H" + "M" + "H" + "T" + "K" + "H" + "E" + "S" + "L" + "M" + "J" + } + wide{ + "tammikuu", + "helmikuu", + "maaliskuu", + "huhtikuu", + "toukokuu", + "kes\u00E4kuu", + "hein\u00E4kuu", + "elokuu", + "syyskuu", + "lokakuu", + "marraskuu", + "joulukuu", + } + } + } + } + } } diff --git a/icu4c/source/data/locales/fo.txt b/icu4c/source/data/locales/fo.txt index d6a32e30580..eda98965e95 100644 --- a/icu4c/source/data/locales/fo.txt +++ b/icu4c/source/data/locales/fo.txt @@ -234,35 +234,6 @@ fo { Currencies { DKK { "kr", "DKK" } } - DateTimePatterns { - "HH:mm:ss z", - "HH:mm:ss z", - "HH:mm:ss", - "HH:mm", - "EEEE dd MMMM yyyy", - "d. MMM yyyy", - "dd-MM-yyyy", - "dd-MM-yy", - "{1} {0}", - } - DayAbbreviations { - "sun", - "m\u00e1n", - "t\u00fds", - "mik", - "h\u00f3s", - "fr\u00ed", - "ley" - } - DayNames { - "sunnudagur", - "m\u00e1nadagur", - "t\u00fdsdagur", - "mikudagur", - "h\u00f3sdagur", - "fr\u00edggjadagur", - "leygardagur" - } Languages { fo { "f\u00f8royskt" } } @@ -270,34 +241,6 @@ fo { "Latn", // ISO 15924 Name } ExemplarCharacters { "[a-z\u00e1\u00e6\u00ed\u00f0\u00f3\u00f8\u00fa\u00fd]" } - MonthAbbreviations { - "jan", - "feb", - "mar", - "apr", - "mai", - "jun", - "jul", - "aug", - "sep", - "okt", - "nov", - "des" - } - MonthNames { - "januar", - "februar", - "mars", - "apr\u00edl", - "mai", - "juni", - "juli", - "august", - "september", - "oktober", - "november", - "desember" - } NumberElements { ",", ".", @@ -313,4 +256,73 @@ fo { ",", "+", } + calendar{ + gregorian{ + DateTimePatterns{ + "HH:mm:ss z", + "HH:mm:ss z", + "HH:mm:ss", + "HH:mm", + "EEEE dd MMMM yyyy", + "d. MMM yyyy", + "dd-MM-yyyy", + "dd-MM-yy", + "{1} {0}", + } + dayNames{ + format{ + abbreviated{ + "sun", + "m\u00e1n", + "t\u00fds", + "mik", + "h\u00f3s", + "fr\u00ed", + "ley" + } + wide{ + "sunnudagur", + "m\u00e1nadagur", + "t\u00fdsdagur", + "mikudagur", + "h\u00f3sdagur", + "fr\u00edggjadagur", + "leygardagur" + } + } + } + monthNames{ + format{ + abbreviated{ + "jan", + "feb", + "mar", + "apr", + "mai", + "jun", + "jul", + "aug", + "sep", + "okt", + "nov", + "des" + } + wide{ + "januar", + "februar", + "mars", + "apr\u00edl", + "mai", + "juni", + "juli", + "august", + "september", + "oktober", + "november", + "desember" + } + } + } + } + } } diff --git a/icu4c/source/data/locales/fr.txt b/icu4c/source/data/locales/fr.txt index 51c6dc8dc7b..f3fca0845cb 100644 --- a/icu4c/source/data/locales/fr.txt +++ b/icu4c/source/data/locales/fr.txt @@ -584,39 +584,6 @@ fr { ZRZ { "ZRZ", "za\u00EFre" } ZWD { "Z$", "dollar du Zimbabwe" } } - DateTimePatterns { - "HH' h 'mm z", - "HH:mm:ss z", - "HH:mm:ss", - "HH:mm", - "EEEE d MMMM yyyy", - "d MMMM yyyy", - "d MMM yy", - "dd/MM/yy", - "{1} {0}", - } - DayAbbreviations { - "dim.", - "lun.", - "mar.", - "mer.", - "jeu.", - "ven.", - "sam.", - } - DayNames { - "dimanche", - "lundi", - "mardi", - "mercredi", - "jeudi", - "vendredi", - "samedi", - } - Eras { - "av. J.-C.", - "ap. J.-C.", - } localPatternChars { "GaMjkHmsSEDFwWxhKzAeugXZ" } LocaleScript{ "Latn", // ISO 15924 Name @@ -822,34 +789,6 @@ fr { zh { "chinois" } zu { "zoulou" } } - MonthAbbreviations { - "janv.", - "f\u00E9vr.", - "mars", - "avr.", - "mai", - "juin", - "juil.", - "ao\u00FBt", - "sept.", - "oct.", - "nov.", - "d\u00E9c.", - } - MonthNames { - "janvier", - "f\u00E9vrier", - "mars", - "avril", - "mai", - "juin", - "juillet", - "ao\u00FBt", - "septembre", - "octobre", - "novembre", - "d\u00E9cembre", - } NumberElements { ",", "\u00A0", @@ -1026,56 +965,153 @@ fr { REVISED { "R\u00e9vis\u00e9" } } - - // International Calendars Data. - // NOTE (ICU 2.6) - the format of this data WILL CHANGE in future releases. - // Islamic calendar - //Eras_islamic:array { - // "AH" // Anno Hijri (in root) - //} - - MonthNames_islamic { - "Mouharram", // Muharram - "Safar", // Safar - "Rabi'-oul-Aououal", // Rabi' al-awwal - "Rabi'-out-Tani", // Rabi' al-thani - "Djoumada-l-Oula", // Jumada al-awwal - "Djoumada-t-Tania", // Jumada al-thani - "Radjab", // Rajab - "Cha'ban", // Sha'ban - "Ramadan", // Ramadan - "Chaououal", // Shawwal - "Dou-l-Qa'da", // Dhu al-Qi'dah - "Dou-l-Hidjja", // Dhu al-Hijjah + calendar{ + islamic{ + //eras:array { + // "AH" // Anno Hijri (in root) + //} + monthNames{ + format{ + abbreviated:alias { // same as MonthNames (no data) + "fr/calendar/islamic/monthNames/format/wide" + } + wide { + "Mouharram", // Muharram + "Safar", // Safar + "Rabi'-oul-Aououal", // Rabi' al-awwal + "Rabi'-out-Tani", // Rabi' al-thani + "Djoumada-l-Oula", // Jumada al-awwal + "Djoumada-t-Tania", // Jumada al-thani + "Radjab", // Rajab + "Cha'ban", // Sha'ban + "Ramadan", // Ramadan + "Chaououal", // Shawwal + "Dou-l-Qa'da", // Dhu al-Qi'dah + "Dou-l-Hidjja", // Dhu al-Hijjah + } + } + } + } + islamic-civil:alias{ + "fr/calendar/islamic" + } + gregorian{ + DateTimePatterns{ + "HH' h 'mm z", + "HH:mm:ss z", + "HH:mm:ss", + "HH:mm", + "EEEE d MMMM yyyy", + "d MMMM yyyy", + "d MMM yy", + "dd/MM/yy", + "{1} {0}", + } + dayNames{ + format{ + abbreviated{ + "dim.", + "lun.", + "mar.", + "mer.", + "jeu.", + "ven.", + "sam.", + } + narrow{ + "D", + "L", + "M", + "M", + "J", + "V", + "S", + } + wide{ + "dimanche", + "lundi", + "mardi", + "mercredi", + "jeudi", + "vendredi", + "samedi", + } + } + } + eras{ + "av. J.-C.", + "ap. J.-C.", + } + monthNames{ + format{ + abbreviated{ + "janv.", + "f\u00E9vr.", + "mars", + "avr.", + "mai", + "juin", + "juil.", + "ao\u00FBt", + "sept.", + "oct.", + "nov.", + "d\u00E9c.", + } + narrow{ + "J", + "F", + "M", + "A", + "M", + "J", + "J", + "A", + "S", + "O", + "N", + "D", + } + wide{ + "janvier", + "f\u00E9vrier", + "mars", + "avril", + "mai", + "juin", + "juillet", + "ao\u00FBt", + "septembre", + "octobre", + "novembre", + "d\u00E9cembre", + } + } + } + } + hebrew{ + monthNames{ + format{ + abbreviated:alias { + "fr/calendar/hebrew/monthNames/format/wide" // no data + } + wide{ + "Tisseri", // Tishri + "Hesvan", // Heshvan + "Kislev", // Kislev + "T\u00e9beth", // Tevet + "Sch\u00e9bat", // Shevat + "Adar", // Adar I + "Adar II", // Adar + "Nissan", // Nisan + "Iyar", // Iyar + "Sivan", // Sivan + "Tamouz", // Tamuz + "Ab", // Av + "Elloul", // Elul + } + } + } + } } - MonthAbbreviations_islamic:alias { // same as MonthNames (no data) - "fr/MonthNames_islamic" - } - // Civil is identical other than in calculations - MonthNames_islamic-civil:alias { - "fr/MonthNames_islamic" - } - MonthAbbreviations_islamic-civil:alias { - "fr/MonthAbbreviations_islamic" - } - MonthNames_hebrew { - "Tisseri", // Tishri - "Hesvan", // Heshvan - "Kislev", // Kislev - "T\u00e9beth", // Tevet - "Sch\u00e9bat", // Shevat - "Adar", // Adar I - "Adar II", // Adar - "Nissan", // Nisan - "Iyar", // Iyar - "Sivan", // Sivan - "Tamouz", // Tamuz - "Ab", // Av - "Elloul", // Elul - } - MonthAbbreviations_hebrew:alias { - "fr/MonthNames_hebrew" // no data - } - - } diff --git a/icu4c/source/data/locales/fr_BE.txt b/icu4c/source/data/locales/fr_BE.txt index 9faaf7e2c35..13842d6f841 100644 --- a/icu4c/source/data/locales/fr_BE.txt +++ b/icu4c/source/data/locales/fr_BE.txt @@ -7,22 +7,7 @@ fr_BE { Version{ "2.0" } - DateTimePatterns { - "H' h 'mm' min 'ss' s 'z", - "HH:mm:ss z", - "HH:mm:ss", - "HH:mm", - "EEEE d MMMM yyyy", - "d MMMM yyyy", - "dd-MMM-yy", - "d/MM/yy", - "{1} {0}", - } - DateTimeElements:intvector { - 2, - 1, - } - NumberElements { + NumberElements { ",", ".", ";", @@ -48,4 +33,23 @@ fr_BE { // Reuse Swiss French spellout rules. Also for French in Zaire, // but we've no locale for it yet. SpelloutRules:alias { "/ICUDATA/fr_CH" } + calendar{ + gregorian{ + DateTimeElements:intvector { + 2, + 1, + } + DateTimePatterns{ + "H' h 'mm' min 'ss' s 'z", + "HH:mm:ss z", + "HH:mm:ss", + "HH:mm", + "EEEE d MMMM yyyy", + "d MMMM yyyy", + "dd-MMM-yy", + "d/MM/yy", + "{1} {0}", + } + } + } } diff --git a/icu4c/source/data/locales/fr_CA.txt b/icu4c/source/data/locales/fr_CA.txt index 8fbd9d421bb..d99dfa2ad51 100644 --- a/icu4c/source/data/locales/fr_CA.txt +++ b/icu4c/source/data/locales/fr_CA.txt @@ -7,17 +7,6 @@ fr_CA { Version { "2.0" } - DateTimePatterns { - "HH' h 'mm' min 'ss' s 'z", - "HH:mm:ss z", - "HH:mm:ss", - "HH:mm", - "EEEE d MMMM yyyy", - "d MMMM yyyy", - "yy-MM-dd", - "yy-MM-dd", - "{1} {0}", - } NumberPatterns { "#,##0.###;-#,##0.###", "#,##0.00 \u00A4;(#,##0.00\u00A4)", @@ -30,4 +19,19 @@ fr_CA { CAD { "$", "dollar canadien" } // Canadian Dollar USD { "$ US", "dollar am\u00E9ricain" } // US Dollar } + calendar{ + gregorian{ + DateTimePatterns{ + "HH' h 'mm' min 'ss' s 'z", + "HH:mm:ss z", + "HH:mm:ss", + "HH:mm", + "EEEE d MMMM yyyy", + "d MMMM yyyy", + "yy-MM-dd", + "yy-MM-dd", + "{1} {0}", + } + } + } } diff --git a/icu4c/source/data/locales/fr_CH.txt b/icu4c/source/data/locales/fr_CH.txt index a41924486e0..286fdbd73c4 100644 --- a/icu4c/source/data/locales/fr_CH.txt +++ b/icu4c/source/data/locales/fr_CH.txt @@ -7,22 +7,7 @@ fr_CH { Version { "2.0" } - DateTimeElements:intvector { - 2, - 4, - } - DateTimePatterns { - "HH.mm:ss' h' z", - "HH:mm:ss z", - "HH:mm:ss", - "HH:mm", - "EEEE, d MMMM yyyy", - "d MMMM yyyy", - "d MMM yy", - "dd.MM.yy", - "{1} {0}", - } - NumberElements { + NumberElements { ".", "'", ";", @@ -91,4 +76,23 @@ fr_CH { "%%alt-ones:\n" "; et-un; =%main=;" } + calendar{ + gregorian{ + DateTimeElements:intvector { + 2, + 4, + } + DateTimePatterns{ + "HH.mm:ss' h' z", + "HH:mm:ss z", + "HH:mm:ss", + "HH:mm", + "EEEE, d MMMM yyyy", + "d MMMM yyyy", + "d MMM yy", + "dd.MM.yy", + "{1} {0}", + } + } + } } diff --git a/icu4c/source/data/locales/fr_FR.txt b/icu4c/source/data/locales/fr_FR.txt index 4b27306770f..d51204edac2 100644 --- a/icu4c/source/data/locales/fr_FR.txt +++ b/icu4c/source/data/locales/fr_FR.txt @@ -7,8 +7,12 @@ fr_FR { Version{ "2.0"} - DateTimeElements:intvector { - 2, - 1, + calendar{ + gregorian{ + DateTimeElements:intvector { + 2, + 1, + } + } } } diff --git a/icu4c/source/data/locales/fr_LU.txt b/icu4c/source/data/locales/fr_LU.txt index 9fe38053b39..2593c61f1c2 100644 --- a/icu4c/source/data/locales/fr_LU.txt +++ b/icu4c/source/data/locales/fr_LU.txt @@ -7,9 +7,13 @@ fr_LU { Version{"2.0"} - DateTimeElements:intvector { - 2, - 1, + calendar{ + gregorian{ + DateTimeElements:intvector { + 2, + 1, + } + } } NumberElements { ",", diff --git a/icu4c/source/data/locales/ga.txt b/icu4c/source/data/locales/ga.txt index d8c0c7a48dc..2f768acb9b2 100644 --- a/icu4c/source/data/locales/ga.txt +++ b/icu4c/source/data/locales/ga.txt @@ -10,10 +10,6 @@ ga{ Version { "2.0" } - AmPmMarkers { - "a.m.", - "p.m.", - } Countries { AD { "Andóra" } AE { "Aontas na nÉimíríochtaí Arabacha" } @@ -670,52 +666,6 @@ ga{ ZRZ { "ZRZ", "Zaire Sáíreach" } // 10/27/1971-11/01/1993 ZWD { "Z$", "Dollar Siombábach" } // 04/18/1980- } - DayAbbreviations { - "Domh", - "Luan", - "Máirt", - "Céad", - "Déar", - "Aoine", - "Sath", - } - DayNames { - "Dé Domhnaigh", - "Dé Luain", - "Dé Máirt", - "Dé Céadaoin", - "Déardaoin", - "Dé hAoine", - "Dé Sathairn", - } - MonthAbbreviations { - "Ean", - "Feabh", - "Márta", - "Aib", - "Beal", - "Meith", - "Iúil", - "Lún", - "MFómh", - "DFómh", - "Samh", - "Noll", - } - MonthNames { - "Eanáir", - "Feabhra", - "Márta", - "Aibreán", - "Bealtaine", - "Meitheamh", - "Iúil", - "Lúnasa", - "Meán Fómhair", - "Deireadh Fómhair", - "Samhain", - "Nollaig", - } // NumberElements { // ".", @@ -734,10 +684,6 @@ ga{ "Latn", // ISO 15924 Name } - Eras { - "RC", - "AD", - } ExemplarCharacters { "[a-z \u00e1 \u00e9 \u00ed \u00f3 \u00fa]" } Languages { // ones needing work are marked //?? @@ -1229,5 +1175,70 @@ ga{ } // many others could go in here if desired } + calendar{ + gregorian{ + AmPmMarkers{ + "a.m.", + "p.m.", + } + dayNames{ + format{ + abbreviated{ + "Domh", + "Luan", + "Máirt", + "Céad", + "Déar", + "Aoine", + "Sath", + } + wide{ + "Dé Domhnaigh", + "Dé Luain", + "Dé Máirt", + "Dé Céadaoin", + "Déardaoin", + "Dé hAoine", + "Dé Sathairn", + } + } + } + eras{ + "RC", + "AD", + } + monthNames{ + format{ + abbreviated{ + "Ean", + "Feabh", + "Márta", + "Aib", + "Beal", + "Meith", + "Iúil", + "Lún", + "MFómh", + "DFómh", + "Samh", + "Noll", + } + wide{ + "Eanáir", + "Feabhra", + "Márta", + "Aibreán", + "Bealtaine", + "Meitheamh", + "Iúil", + "Lúnasa", + "Meán Fómhair", + "Deireadh Fómhair", + "Samhain", + "Nollaig", + } + } + } + } + } } - diff --git a/icu4c/source/data/locales/ga_IE.txt b/icu4c/source/data/locales/ga_IE.txt index fe6b8779c77..bde84e296bb 100644 --- a/icu4c/source/data/locales/ga_IE.txt +++ b/icu4c/source/data/locales/ga_IE.txt @@ -10,21 +10,25 @@ ga_IE { Currencies { IEP { "\u00A3","Punt \u00C9ireannach" } // 1922-2001 } - DateTimePatterns { - "HH:mm:ss z", - "HH:mm:ss z", - "HH:mm:ss", - "HH:mm", - "EEEE d MMMM yyyy", - "d MMMM yyyy", - "d MMM yyyy", - "dd/MM/yyyy", - "{1} {0}", - } NumberPatterns { "#,##0.###;-#,##0.###", "\u00a4#,##0.00;-\u00a4#,##0.00", "#,##0%", "#E0", } -} \ No newline at end of file + calendar{ + gregorian{ + DateTimePatterns{ + "HH:mm:ss z", + "HH:mm:ss z", + "HH:mm:ss", + "HH:mm", + "EEEE d MMMM yyyy", + "d MMMM yyyy", + "d MMM yyyy", + "dd/MM/yyyy", + "{1} {0}", + } + } + } +} diff --git a/icu4c/source/data/locales/gl.txt b/icu4c/source/data/locales/gl.txt index deb8d1fdbf6..97f92a33aac 100644 --- a/icu4c/source/data/locales/gl.txt +++ b/icu4c/source/data/locales/gl.txt @@ -14,24 +14,6 @@ gl { Currencies { ESP { "\u20A7", "ESP" } // Spanish Peseta } - DayAbbreviations { - "Dom", - "Lun", - "Mar", - "Mér", - "Xov", - "Ven", - "Sáb", - } - DayNames { - "Domingo", - "Luns", - "Martes", - "Mércores", - "Xoves", - "Venres", - "Sábado", - } Languages { gl { "galego" } } @@ -39,34 +21,6 @@ gl { "Latn", // ISO 15924 Name } ExemplarCharacters { "[a-z\u00e1\u00e9\u00ed\u00f3\u00fa\u00fc\u00f1]" } - MonthAbbreviations { - "Xan", - "Feb", - "Mar", - "Abr", - "Mai", - "Xuñ", - "Xul", - "Ago", - "Set", - "Out", - "Nov", - "Dec", - } - MonthNames { - "Xaneiro", - "Febreiro", - "Marzo", - "Abril", - "Maio", - "Xuño", - "Xullo", - "Agosto", - "Setembro", - "Outubro", - "Novembro", - "Decembro", - } NumberElements { ",", ".", @@ -91,4 +45,62 @@ gl { // localPatternChars{} // + calendar{ + gregorian{ + dayNames{ + format{ + abbreviated{ + "Dom", + "Lun", + "Mar", + "Mér", + "Xov", + "Ven", + "Sáb", + } + wide{ + "Domingo", + "Luns", + "Martes", + "Mércores", + "Xoves", + "Venres", + "Sábado", + } + } + } + monthNames{ + format{ + abbreviated{ + "Xan", + "Feb", + "Mar", + "Abr", + "Mai", + "Xuñ", + "Xul", + "Ago", + "Set", + "Out", + "Nov", + "Dec", + } + wide{ + "Xaneiro", + "Febreiro", + "Marzo", + "Abril", + "Maio", + "Xuño", + "Xullo", + "Agosto", + "Setembro", + "Outubro", + "Novembro", + "Decembro", + } + } + } + } + } } diff --git a/icu4c/source/data/locales/gl_ES.txt b/icu4c/source/data/locales/gl_ES.txt index 48bcfb9dbe5..39adf20ff2c 100644 --- a/icu4c/source/data/locales/gl_ES.txt +++ b/icu4c/source/data/locales/gl_ES.txt @@ -7,25 +7,30 @@ gl_ES { Version { "2.0" } - DateTimeElements:intvector { - 2, - 1, - } - DateTimePatterns { - "HH:mm:ss z", - "HH:mm:ss z", - "HH:mm:ss", - "HH:mm", - "EEEE dd MMMM yyyy", - "dd MMMM yyyy", - "MMM dd,yy", - "dd/MM/yy", - "{1} {0}", - } + NumberPatterns { "#,##0.###;-#,##0.###", "#,##0.00 \u00A4;-#,##0.00 \u00A4", "#,##0%", "#E0", } + calendar{ + gregorian{ + DateTimeElements:intvector { + 2, + 1, + } + DateTimePatterns{ + "HH:mm:ss z", + "HH:mm:ss z", + "HH:mm:ss", + "HH:mm", + "EEEE dd MMMM yyyy", + "dd MMMM yyyy", + "MMM dd,yy", + "dd/MM/yy", + "{1} {0}", + } + } + } } diff --git a/icu4c/source/data/locales/gu.txt b/icu4c/source/data/locales/gu.txt index dfda54fb16d..60f718046ff 100644 --- a/icu4c/source/data/locales/gu.txt +++ b/icu4c/source/data/locales/gu.txt @@ -7,10 +7,6 @@ gu { Version{ "2.0" } - AmPmMarkers{ - "\u0AAA\u0AC2\u0AB0\u0ACD\u0AB5\u00A0\u0AAE\u0AA7\u0ACD\u0AAF\u0ABE\u0AB9\u0ACD\u0AA8", - "\u0A89\u0AA4\u0ACD\u0AA4\u0AB0\u00A0\u0AAE\u0AA7\u0ACD\u0AAF\u0ABE\u0AB9\u0ACD\u0AA8" - } Countries { CN { "\u0a9a\u0ac0\u0aa8" } DE { "\u0a9c\u0aae\u0abf\u0aa8\u0ac0" } @@ -27,58 +23,12 @@ gu { Currencies { INR { "\u0AB0\u0AC1", "INR" } } - DayNames{ - "\u0AB0\u0AB5\u0ABF\u0AB5\u0ABE\u0AB0", - "\u0AB8\u0ACB\u0AAE\u0AB5\u0ABE\u0AB0", - "\u0AAE\u0A82\u0A97\u0AB3\u0AB5\u0ABE\u0AB0", - "\u0AAC\u0AC1\u0AA7\u0AB5\u0ABE\u0AB0", - "\u0A97\u0AC1\u0AB0\u0AC1\u0AB5\u0ABE\u0AB0", - "\u0AB6\u0AC1\u0A95\u0ACD\u0AB0\u0AB5\u0ABE\u0AB0", - "\u0AB6\u0AA8\u0ABF\u0AB5\u0ABE\u0AB0" - } - DayAbbreviations{ - "\u0AB0\u0AB5\u0ABF", - "\u0AB8\u0ACB\u0AAE", - "\u0AAE\u0A82\u0A97\u0AB3", - "\u0AAC\u0AC1\u0AA7", - "\u0A97\u0AC1\u0AB0\u0AC1", - "\u0AB6\u0AC1\u0A95\u0ACD\u0AB0", - "\u0AB6\u0AA8\u0ABF" - } ExemplarCharacters { "[[:Gujr:]\u200c\u200d]" } LocaleScript:array { "Gujr" } Languages { gu { "\u0A97\u0AC1\u0A9C\u0AB0\u0ABE\u0AA4\u0AC0" } } - MonthNames{ - "\u0A9C\u0ABE\u0AA8\u0ACD\u0AAF\u0AC1\u0A86\u0AB0\u0AC0", - "\u0AAB\u0AC7\u0AAC\u0ACD\u0AB0\u0AC1\u0A86\u0AB0\u0AC0", - "\u0AAE\u0ABE\u0AB0\u0ACD\u0A9A", - "\u0A8F\u0AAA\u0ACD\u0AB0\u0ABF\u0AB2", - "\u0AAE\u0AC7", - "\u0A9C\u0AC2\u0AA8", - "\u0A9C\u0AC1\u0AB2\u0ABE\u0A88", - "\u0A91\u0A97\u0AB8\u0ACD\u0A9F", - "\u0AB8\u0AAA\u0ACD\u0A9F\u0AC7\u0AAE\u0ACD\u0AAC\u0AB0", - "\u0A91\u0A95\u0ACD\u0A9F\u0ACD\u0AAC\u0AB0", - "\u0AA8\u0AB5\u0AC7\u0AAE\u0ACD\u0AAC\u0AB0", - "\u0AA1\u0ABF\u0AB8\u0AC7\u0AAE\u0ACD\u0AAC\u0AB0" - } - MonthAbbreviations { - "\u0A9C\u0ABE\u0AA8\u0ACD\u0AAF\u0AC1", - "\u0AAB\u0AC7\u0AAC\u0ACD\u0AB0\u0AC1", - "\u0AAE\u0ABE\u0AB0\u0ACD\u0A9A", - "\u0A8F\u0AAA\u0ACD\u0AB0\u0ABF\u0AB2", - "\u0AAE\u0AC7", - "\u0A9C\u0AC2\u0AA8", - "\u0A9C\u0AC1\u0AB2\u0ABE\u0A88", - "\u0A91\u0A97\u0AB8\u0ACD\u0A9F", - "\u0AB8\u0AAA\u0ACD\u0A9F\u0AC7", - "\u0A91\u0A95\u0ACD\u0A9F\u0ACB", - "\u0AA8\u0AB5\u0AC7", - "\u0AA1\u0ABF\u0AB8\u0AC7" - } NumberElements{ ".", @@ -95,4 +45,66 @@ gu { ".", "+", } + calendar{ + gregorian{ + AmPmMarkers{ + "\u0AAA\u0AC2\u0AB0\u0ACD\u0AB5\u00A0\u0AAE\u0AA7\u0ACD\u0AAF\u0ABE\u0AB9\u0ACD\u0AA8", + "\u0A89\u0AA4\u0ACD\u0AA4\u0AB0\u00A0\u0AAE\u0AA7\u0ACD\u0AAF\u0ABE\u0AB9\u0ACD\u0AA8" + } + dayNames{ + format{ + abbreviated{ + "\u0AB0\u0AB5\u0ABF", + "\u0AB8\u0ACB\u0AAE", + "\u0AAE\u0A82\u0A97\u0AB3", + "\u0AAC\u0AC1\u0AA7", + "\u0A97\u0AC1\u0AB0\u0AC1", + "\u0AB6\u0AC1\u0A95\u0ACD\u0AB0", + "\u0AB6\u0AA8\u0ABF" + } + wide{ + "\u0AB0\u0AB5\u0ABF\u0AB5\u0ABE\u0AB0", + "\u0AB8\u0ACB\u0AAE\u0AB5\u0ABE\u0AB0", + "\u0AAE\u0A82\u0A97\u0AB3\u0AB5\u0ABE\u0AB0", + "\u0AAC\u0AC1\u0AA7\u0AB5\u0ABE\u0AB0", + "\u0A97\u0AC1\u0AB0\u0AC1\u0AB5\u0ABE\u0AB0", + "\u0AB6\u0AC1\u0A95\u0ACD\u0AB0\u0AB5\u0ABE\u0AB0", + "\u0AB6\u0AA8\u0ABF\u0AB5\u0ABE\u0AB0" + } + } + } + monthNames{ + format{ + abbreviated{ + "\u0A9C\u0ABE\u0AA8\u0ACD\u0AAF\u0AC1", + "\u0AAB\u0AC7\u0AAC\u0ACD\u0AB0\u0AC1", + "\u0AAE\u0ABE\u0AB0\u0ACD\u0A9A", + "\u0A8F\u0AAA\u0ACD\u0AB0\u0ABF\u0AB2", + "\u0AAE\u0AC7", + "\u0A9C\u0AC2\u0AA8", + "\u0A9C\u0AC1\u0AB2\u0ABE\u0A88", + "\u0A91\u0A97\u0AB8\u0ACD\u0A9F", + "\u0AB8\u0AAA\u0ACD\u0A9F\u0AC7", + "\u0A91\u0A95\u0ACD\u0A9F\u0ACB", + "\u0AA8\u0AB5\u0AC7", + "\u0AA1\u0ABF\u0AB8\u0AC7" + } + wide{ + "\u0A9C\u0ABE\u0AA8\u0ACD\u0AAF\u0AC1\u0A86\u0AB0\u0AC0", + "\u0AAB\u0AC7\u0AAC\u0ACD\u0AB0\u0AC1\u0A86\u0AB0\u0AC0", + "\u0AAE\u0ABE\u0AB0\u0ACD\u0A9A", + "\u0A8F\u0AAA\u0ACD\u0AB0\u0ABF\u0AB2", + "\u0AAE\u0AC7", + "\u0A9C\u0AC2\u0AA8", + "\u0A9C\u0AC1\u0AB2\u0ABE\u0A88", + "\u0A91\u0A97\u0AB8\u0ACD\u0A9F", + "\u0AB8\u0AAA\u0ACD\u0A9F\u0AC7\u0AAE\u0ACD\u0AAC\u0AB0", + "\u0A91\u0A95\u0ACD\u0A9F\u0ACD\u0AAC\u0AB0", + "\u0AA8\u0AB5\u0AC7\u0AAE\u0ACD\u0AAC\u0AB0", + "\u0AA1\u0ABF\u0AB8\u0AC7\u0AAE\u0ACD\u0AAC\u0AB0" + } + } + } + } + } } diff --git a/icu4c/source/data/locales/gu_IN.txt b/icu4c/source/data/locales/gu_IN.txt index 6be1d9780db..bbc03c86693 100644 --- a/icu4c/source/data/locales/gu_IN.txt +++ b/icu4c/source/data/locales/gu_IN.txt @@ -7,17 +7,6 @@ gu_IN { Version { "2.0" } - DateTimePatterns { - "hh:mm:ss a z", - "hh:mm:ss a z", - "hh:mm:ss a", - "hh:mm a", - "EEEE d MMMM yyyy", - "d MMMM yyyy", - "dd-MM-yyyy", - "d-MM-yy", - "{1} {0}" - } // DateTimeElements:intvector { // 1, // 1 @@ -28,4 +17,19 @@ gu_IN { "##,##,##0%", "#E0", } -} \ No newline at end of file + calendar{ + gregorian{ + DateTimePatterns{ + "hh:mm:ss a z", + "hh:mm:ss a z", + "hh:mm:ss a", + "hh:mm a", + "EEEE d MMMM yyyy", + "d MMMM yyyy", + "dd-MM-yyyy", + "d-MM-yy", + "{1} {0}" + } + } + } +} diff --git a/icu4c/source/data/locales/gv.txt b/icu4c/source/data/locales/gv.txt index 227f225d633..cb45a227791 100644 --- a/icu4c/source/data/locales/gv.txt +++ b/icu4c/source/data/locales/gv.txt @@ -7,31 +7,9 @@ gv { Version { "2.0" } - AmPmMarkers { - "a.m.", - "p.m." - } Countries { GB { "Rywvaneth Unys" } } - DayAbbreviations { - "Jed", - "Jel", - "Jem", - "Jerc", - "Jerd", - "Jeh", - "Jes", - } - DayNames { - "Jedoonee", - "Jelhein", - "Jemayrt", - "Jercean", - "Jerdein", - "Jeheiney", - "Jesarn", - } Languages { gv { "Gaelg" } } @@ -41,38 +19,6 @@ gv { ExemplarCharacters{ "[a-z\u00E7]" } - Eras { - "RC", // BC - "AD" // AD - } - MonthAbbreviations { - "J-guer", - "T-arree", - "Mayrnt", - "Avrril", - "Boaldyn", - "M-souree", - "J-souree", - "Luanistyn", - "M-fouyir", - "J-fouyir", - "M.Houney", - "M.Nollick", - } - MonthNames { - "Jerrey-geuree", - "Toshiaght-arree", - "Mayrnt", - "Averil", - "Boaldyn", - "Mean-souree", - "Jerrey-souree", - "Luanistyn", - "Mean-fouyir", - "Jerrey-fouyir", - "Mee Houney", - "Mee ny Nollick", - } // NumberElements { // ".", // ",", @@ -89,4 +35,70 @@ gv { // /**************** Info Below is needed ****************/ // localPatternChars{} // + calendar{ + gregorian{ + AmPmMarkers{ + "a.m.", + "p.m." + } + dayNames{ + format{ + abbreviated{ + "Jed", + "Jel", + "Jem", + "Jerc", + "Jerd", + "Jeh", + "Jes", + } + wide{ + "Jedoonee", + "Jelhein", + "Jemayrt", + "Jercean", + "Jerdein", + "Jeheiney", + "Jesarn", + } + } + } + eras{ + "RC", // BC + "AD" // AD + } + monthNames{ + format{ + abbreviated{ + "J-guer", + "T-arree", + "Mayrnt", + "Avrril", + "Boaldyn", + "M-souree", + "J-souree", + "Luanistyn", + "M-fouyir", + "J-fouyir", + "M.Houney", + "M.Nollick", + } + wide{ + "Jerrey-geuree", + "Toshiaght-arree", + "Mayrnt", + "Averil", + "Boaldyn", + "Mean-souree", + "Jerrey-souree", + "Luanistyn", + "Mean-fouyir", + "Jerrey-fouyir", + "Mee Houney", + "Mee ny Nollick", + } + } + } + } + } } diff --git a/icu4c/source/data/locales/gv_GB.txt b/icu4c/source/data/locales/gv_GB.txt index bd9de40798b..73b4768f568 100644 --- a/icu4c/source/data/locales/gv_GB.txt +++ b/icu4c/source/data/locales/gv_GB.txt @@ -7,25 +7,30 @@ gv_GB { Version { "2.0" } - DateTimeElements:intvector { - 2, - 1, - } - DateTimePatterns { - "HH:mm:ss z", - "HH:mm:ss", - "HH:mm:ss", - "HH:mm", - "EEEE dd MMMM yyyy", - "dd MMMM yyyy", - "MMM dd,yy", - "dd/MM/yy", - "{1} {0}", - } + NumberPatterns { "#,##0.###;-#,##0.###", "\u00a4#,##0.00;-\u00a4#,##0.00", "#,##0%", "#E0", } + calendar{ + gregorian{ + DateTimeElements:intvector { + 2, + 1, + } + DateTimePatterns{ + "HH:mm:ss z", + "HH:mm:ss", + "HH:mm:ss", + "HH:mm", + "EEEE dd MMMM yyyy", + "dd MMMM yyyy", + "MMM dd,yy", + "dd/MM/yy", + "{1} {0}", + } + } + } } diff --git a/icu4c/source/data/locales/he.txt b/icu4c/source/data/locales/he.txt index 4549d5d4b3f..9cc8d4e02e0 100644 --- a/icu4c/source/data/locales/he.txt +++ b/icu4c/source/data/locales/he.txt @@ -283,67 +283,6 @@ he { //zh_cn { "\u05E1\u05D9\u05E0\u05D9\u05EA (\u05DE\u05E4\u05D5\u05E9\u05D8\u05EA)" } //zh_tw { "\u05E1\u05D9\u05E0\u05D9\u05EA (\u05DE\u05E1\u05D5\u05E8\u05EA\u05D9\u05EA)" } } - DateTimePatterns { - "HH:mm:ss z", - "HH:mm:ss z", - "HH:mm:ss", - "HH:mm", - "EEEE d MMMM yyyy", - "d MMMM yyyy", - "dd/MM/yyyy", - "dd/MM/yy", - "{0} {1}", - } - DayAbbreviations { - "\u05D0", - "\u05D1", - "\u05D2", - "\u05D3", - "\u05D4", - "\u05D5", - "\u05E9", - } - DayNames { - "\u05D9\u05D5\u05DD \u05E8\u05D0\u05E9\u05D5\u05DF", - "\u05D9\u05D5\u05DD \u05E9\u05E0\u05D9", - "\u05D9\u05D5\u05DD \u05E9\u05DC\u05D9\u05E9\u05D9", - "\u05D9\u05D5\u05DD \u05E8\u05D1\u05D9\u05E2\u05D9", - "\u05D9\u05D5\u05DD \u05D7\u05DE\u05D9\u05E9\u05D9", - "\u05D9\u05D5\u05DD \u05E9\u05D9\u05E9\u05D9", - "\u05E9\u05D1\u05EA", - } - Eras { - "\u05DC\u05E4\u05E0\u05D4\"\u05E1", - "\u05DC\u05E1\u05D4\"\u05E0" - } - MonthAbbreviations { - "\u05D9\u05E0\u05D5", - "\u05E4\u05D1\u05E8", - "\u05DE\u05E8\u05E5", - "\u05D0\u05E4\u05E8", - "\u05DE\u05D0\u05D9", - "\u05D9\u05D5\u05E0", - "\u05D9\u05D5\u05DC", - "\u05D0\u05D5\u05D2", - "\u05E1\u05E4\u05D8", - "\u05D0\u05D5\u05E7", - "\u05E0\u05D5\u05D1", - "\u05D3\u05E6\u05DE", - } - MonthNames { - "\u05D9\u05E0\u05D5\u05D0\u05E8", - "\u05E4\u05D1\u05E8\u05D5\u05D0\u05E8", - "\u05DE\u05E8\u05E5", - "\u05D0\u05E4\u05E8\u05D9\u05DC", - "\u05DE\u05D0\u05D9", - "\u05D9\u05D5\u05E0\u05D9", - "\u05D9\u05D5\u05DC\u05D9", - "\u05D0\u05D5\u05D2\u05D5\u05E1\u05D8", - "\u05E1\u05E4\u05D8\u05DE\u05D1\u05E8", - "\u05D0\u05D5\u05E7\u05D8\u05D5\u05D1\u05E8", - "\u05E0\u05D5\u05D1\u05DE\u05D1\u05E8", - "\u05D3\u05E6\u05DE\u05D1\u05E8", - } localPatternChars { "GanjkHmsSEDFwWxhKzAeugXZ" } LocaleScript:array { @@ -392,60 +331,135 @@ he { // International Calendars Data. // NOTE (ICU 2.6) - the format of this data WILL CHANGE in future releases. - MonthNames_hebrew { - "\u05EA\u05E9\u05E8\u05D9", // Tishri - "\u05D7\u05E9\u05D5\u05DF", // Heshvan - "\u05DB\u05E1\u05DC\u05D5", // Kislev - "\u05D8\u05D1\u05EA", // Tevet - "\u05E9\u05D1\u05D8", // Shevat - "\u05D0\u05D3\u05E8 \u05E8\u05D0\u05E9\u05D5\u05DF", // Adar I - "\u05D0\u05D3\u05E8 \u05E9\u05E0\u05D9", // Adar - "\u05E0\u05D9\u05E1\u05DF", // Nisan - "\u05D0\u05D9\u05D9\u05E8", // Iyar - "\u05E1\u05D9\u05D5\u05DF", // Sivan - "\u05EA\u05DE\u05D5\u05D6", // Tamuz - "\u05D0\u05D1", // Av - "\u05D0\u05DC\u05D5\u05DC", // Elul + calendar{ + islamic{ + // Islamic calendar + eras:array { + "\u05E9\u05E0\u05EA \u05D4\u05D9\u05D2'\u05E8\u05D4" + } + monthNames{ + format{ + abbreviated:alias { // same as MonthNames (no data) + "he/calendar/islamic/monthNames/format/wide" + } + wide{ + "\u05DE\u05D5\u05D7\u05E8\u05DD", // Muharram + "\u05E1\u05E4\u05E8", // Safar + "\u05E8\u05D1\u05D9\u05E2 \u05D0\u05DC-\u05D0\u05D5\u05D5\u05D0\u05DC", // Rabi' al-awwal + "\u05E8\u05D1\u05D9\u05E2 \u05D0\u05DC-\u05EA\u05E0\u05D9", // Rabi' al-thani + "\u05D2'\u05D5\u05DE\u05D3\u05D4 \u05D0\u05DC-\u05D0\u05D5\u05D5\u05D0\u05DC", // Jumada al-awwal + "\u05D2'\u05D5\u05DE\u05D3\u05D4 \u05D0\u05DC-\u05EA\u05E0\u05D9", // Jumada al-thani + "\u05E8\u05D2'\u05D0\u05D1", // Rajab + "\u05E9\u05E2\u05D1\u05D0\u05DF", // Sha'ban + "\u05E8\u05D0\u05DE\u05D3\u05DF", // Ramadan + "\u05E9\u05D5\u05D5\u05D0\u05DC", // Shawwal + "\u05D6\u05D5 \u05D0\u05DC-QI'DAH", // Dhu al-Qi'dah (NEED TRANSLATION!!) + "\u05D6\u05D5 \u05D0\u05DC-\u05D7\u05D9\u05D2'\u05D4", // Dhu al-Hijjah + } + } + } + } + islamic-civil:alias{ + "he/calendar/islamic" + } + gregorian{ + DateTimePatterns{ + "HH:mm:ss z", + "HH:mm:ss z", + "HH:mm:ss", + "HH:mm", + "EEEE d MMMM yyyy", + "d MMMM yyyy", + "dd/MM/yyyy", + "dd/MM/yy", + "{0} {1}", + } + dayNames{ + format{ + abbreviated{ + "\u05D0", + "\u05D1", + "\u05D2", + "\u05D3", + "\u05D4", + "\u05D5", + "\u05E9", + } + wide{ + "\u05D9\u05D5\u05DD \u05E8\u05D0\u05E9\u05D5\u05DF", + "\u05D9\u05D5\u05DD \u05E9\u05E0\u05D9", + "\u05D9\u05D5\u05DD \u05E9\u05DC\u05D9\u05E9\u05D9", + "\u05D9\u05D5\u05DD \u05E8\u05D1\u05D9\u05E2\u05D9", + "\u05D9\u05D5\u05DD \u05D7\u05DE\u05D9\u05E9\u05D9", + "\u05D9\u05D5\u05DD \u05E9\u05D9\u05E9\u05D9", + "\u05E9\u05D1\u05EA", + } + } + } + eras{ + "\u05DC\u05E4\u05E0\u05D4\"\u05E1", + "\u05DC\u05E1\u05D4\"\u05E0" + } + monthNames{ + format{ + abbreviated{ + "\u05D9\u05E0\u05D5", + "\u05E4\u05D1\u05E8", + "\u05DE\u05E8\u05E5", + "\u05D0\u05E4\u05E8", + "\u05DE\u05D0\u05D9", + "\u05D9\u05D5\u05E0", + "\u05D9\u05D5\u05DC", + "\u05D0\u05D5\u05D2", + "\u05E1\u05E4\u05D8", + "\u05D0\u05D5\u05E7", + "\u05E0\u05D5\u05D1", + "\u05D3\u05E6\u05DE", + } + wide{ + "\u05D9\u05E0\u05D5\u05D0\u05E8", + "\u05E4\u05D1\u05E8\u05D5\u05D0\u05E8", + "\u05DE\u05E8\u05E5", + "\u05D0\u05E4\u05E8\u05D9\u05DC", + "\u05DE\u05D0\u05D9", + "\u05D9\u05D5\u05E0\u05D9", + "\u05D9\u05D5\u05DC\u05D9", + "\u05D0\u05D5\u05D2\u05D5\u05E1\u05D8", + "\u05E1\u05E4\u05D8\u05DE\u05D1\u05E8", + "\u05D0\u05D5\u05E7\u05D8\u05D5\u05D1\u05E8", + "\u05E0\u05D5\u05D1\u05DE\u05D1\u05E8", + "\u05D3\u05E6\u05DE\u05D1\u05E8", + } + } + } + } + + hebrew{ + eras:array { + "\u05DC\u05D1\u05D4\042\u05E2" + } + monthNames{ + format{ + wide { + "\u05EA\u05E9\u05E8\u05D9", // Tishri + "\u05D7\u05E9\u05D5\u05DF", // Heshvan + "\u05DB\u05E1\u05DC\u05D5", // Kislev + "\u05D8\u05D1\u05EA", // Tevet + "\u05E9\u05D1\u05D8", // Shevat + "\u05D0\u05D3\u05E8 \u05E8\u05D0\u05E9\u05D5\u05DF", // Adar I + "\u05D0\u05D3\u05E8 \u05E9\u05E0\u05D9", // Adar + "\u05E0\u05D9\u05E1\u05DF", // Nisan + "\u05D0\u05D9\u05D9\u05E8", // Iyar + "\u05E1\u05D9\u05D5\u05DF", // Sivan + "\u05EA\u05DE\u05D5\u05D6", // Tamuz + "\u05D0\u05D1", // Av + "\u05D0\u05DC\u05D5\u05DC", // Elul + } + abbreviated:alias { + "he/calendar/hebrew/monthNames/format/wide" + } + } + } + } } - MonthAbbreviations_hebrew:alias { - "he/MonthNames_hebrew" - } - Eras_hebrew:array { - "\u05DC\u05D1\u05D4\042\u05E2" - } - - // Islamic calendar - Eras_islamic:array { - "\u05E9\u05E0\u05EA \u05D4\u05D9\u05D2'\u05E8\u05D4" - } - - MonthNames_islamic { - "\u05DE\u05D5\u05D7\u05E8\u05DD", // Muharram - "\u05E1\u05E4\u05E8", // Safar - "\u05E8\u05D1\u05D9\u05E2 \u05D0\u05DC-\u05D0\u05D5\u05D5\u05D0\u05DC", // Rabi' al-awwal - "\u05E8\u05D1\u05D9\u05E2 \u05D0\u05DC-\u05EA\u05E0\u05D9", // Rabi' al-thani - "\u05D2'\u05D5\u05DE\u05D3\u05D4 \u05D0\u05DC-\u05D0\u05D5\u05D5\u05D0\u05DC", // Jumada al-awwal - "\u05D2'\u05D5\u05DE\u05D3\u05D4 \u05D0\u05DC-\u05EA\u05E0\u05D9", // Jumada al-thani - "\u05E8\u05D2'\u05D0\u05D1", // Rajab - "\u05E9\u05E2\u05D1\u05D0\u05DF", // Sha'ban - "\u05E8\u05D0\u05DE\u05D3\u05DF", // Ramadan - "\u05E9\u05D5\u05D5\u05D0\u05DC", // Shawwal - "\u05D6\u05D5 \u05D0\u05DC-QI'DAH", // Dhu al-Qi'dah (NEED TRANSLATION!!) - "\u05D6\u05D5 \u05D0\u05DC-\u05D7\u05D9\u05D2'\u05D4", // Dhu al-Hijjah - } - - MonthAbbreviations_islamic:alias { // same as MonthNames (no data) - "he/MonthNames_islamic" - } - // Civil is identical other than in calculations - Eras_islamic-civil:alias { - "he/Eras_islamic" - } - MonthNames_islamic-civil:alias { - "he/MonthNames_islamic" - } - MonthAbbreviations_islamic-civil:alias { - "he/MonthAbbreviations_islamic" - } - } diff --git a/icu4c/source/data/locales/hi.txt b/icu4c/source/data/locales/hi.txt index 97df8ffba70..77768e4fa50 100644 --- a/icu4c/source/data/locales/hi.txt +++ b/icu4c/source/data/locales/hi.txt @@ -366,63 +366,6 @@ hi { ZM { "\u091c\u093e\u092e\u094d\u092c\u093f\u092f\u093e" } ZW { "\u091c\u093f\u092e\u094d\u092c\u093e\u092c\u094d\u0935\u0947" } } - MonthNames { - "\u091c\u0928\u0935\u0930\u0940", - "\u092b\u0930\u0935\u0930\u0940", - "\u092e\u093e\u0930\u094d\u091a", - "\u0905\u092a\u094d\u0930\u0948\u0932", - "\u092e\u0908", - "\u091c\u0942\u0928", - "\u091c\u0941\u0932\u093e\u0908", - "\u0905\u0917\u0938\u094d\u0924", - "\u0938\u093F\u0924\u092E\u094D\u092C\u0930", - "\u0905\u0915\u094d\u0924\u0942\u092c\u0930", - "\u0928\u0935\u092E\u094D\u092C\u0930", - "\u0926\u093F\u0938\u092E\u094D\u092C\u0930", - } - MonthAbbreviations { - "\u091c\u0928\u0935\u0930\u0940", - "\u092b\u0930\u0935\u0930\u0940", - "\u092e\u093e\u0930\u094d\u091a", - "\u0905\u092a\u094d\u0930\u0948\u0932", - "\u092e\u0908", - "\u091c\u0942\u0928", - "\u091c\u0941\u0932\u093e\u0908", - "\u0905\u0917\u0938\u094d\u0924", - "\u0938\u093F\u0924\u092E\u094D\u092C\u0930", - "\u0905\u0915\u094d\u0924\u0942\u092c\u0930", - "\u0928\u0935\u092E\u094D\u092C\u0930", - "\u0926\u093F\u0938\u092E\u094D\u092C\u0930", - } - DayNames { - "\u0930\u0935\u093f\u0935\u093e\u0930", - "\u0938\u094b\u092e\u0935\u093e\u0930", - "\u092e\u0902\u0917\u0932\u0935\u093e\u0930", - "\u092c\u0941\u0927\u0935\u093e\u0930", - "\u0917\u0941\u0930\u0941\u0935\u093e\u0930", - "\u0936\u0941\u0915\u094d\u0930\u0935\u093e\u0930", - "\u0936\u0928\u093f\u0935\u093e\u0930", - } - DayAbbreviations - { - "\u0930\u0935\u093f", - "\u0938\u094b\u092e", - "\u092e\u0902\u0917\u0932", - "\u092c\u0941\u0927", - "\u0917\u0941\u0930\u0941", - "\u0936\u0941\u0915\u094d\u0930", - "\u0936\u0928\u093f", - } - - AmPmMarkers { - "\u092a\u0942\u0930\u094d\u0935\u093e\u0939\u094d\u0928", - "\u0905\u092a\u0930\u093e\u0939\u094d\u0928" - } - Eras { - "\u0908\u0938\u093e\u092a\u0942\u0930\u094d\u0935", - "\u0938\u0928" - } - NumberElements { ".", ",", @@ -465,5 +408,70 @@ hi { Currencies { INR { "\u0930\u0941", "INR" } } + calendar{ + gregorian{ + AmPmMarkers{ + "\u092a\u0942\u0930\u094d\u0935\u093e\u0939\u094d\u0928", + "\u0905\u092a\u0930\u093e\u0939\u094d\u0928" + } + dayNames{ + format{ + abbreviated{ + "\u0930\u0935\u093f", + "\u0938\u094b\u092e", + "\u092e\u0902\u0917\u0932", + "\u092c\u0941\u0927", + "\u0917\u0941\u0930\u0941", + "\u0936\u0941\u0915\u094d\u0930", + "\u0936\u0928\u093f", + } + wide{ + "\u0930\u0935\u093f\u0935\u093e\u0930", + "\u0938\u094b\u092e\u0935\u093e\u0930", + "\u092e\u0902\u0917\u0932\u0935\u093e\u0930", + "\u092c\u0941\u0927\u0935\u093e\u0930", + "\u0917\u0941\u0930\u0941\u0935\u093e\u0930", + "\u0936\u0941\u0915\u094d\u0930\u0935\u093e\u0930", + "\u0936\u0928\u093f\u0935\u093e\u0930", + } + } + } + eras{ + "\u0908\u0938\u093e\u092a\u0942\u0930\u094d\u0935", + "\u0938\u0928" + } + monthNames{ + format{ + abbreviated{ + "\u091c\u0928\u0935\u0930\u0940", + "\u092b\u0930\u0935\u0930\u0940", + "\u092e\u093e\u0930\u094d\u091a", + "\u0905\u092a\u094d\u0930\u0948\u0932", + "\u092e\u0908", + "\u091c\u0942\u0928", + "\u091c\u0941\u0932\u093e\u0908", + "\u0905\u0917\u0938\u094d\u0924", + "\u0938\u093F\u0924\u092E\u094D\u092C\u0930", + "\u0905\u0915\u094d\u0924\u0942\u092c\u0930", + "\u0928\u0935\u092E\u094D\u092C\u0930", + "\u0926\u093F\u0938\u092E\u094D\u092C\u0930", + } + wide{ + "\u091c\u0928\u0935\u0930\u0940", + "\u092b\u0930\u0935\u0930\u0940", + "\u092e\u093e\u0930\u094d\u091a", + "\u0905\u092a\u094d\u0930\u0948\u0932", + "\u092e\u0908", + "\u091c\u0942\u0928", + "\u091c\u0941\u0932\u093e\u0908", + "\u0905\u0917\u0938\u094d\u0924", + "\u0938\u093F\u0924\u092E\u094D\u092C\u0930", + "\u0905\u0915\u094d\u0924\u0942\u092c\u0930", + "\u0928\u0935\u092E\u094D\u092C\u0930", + "\u0926\u093F\u0938\u092E\u094D\u092C\u0930", + } + } + } + } + } } - diff --git a/icu4c/source/data/locales/hi_IN.txt b/icu4c/source/data/locales/hi_IN.txt index 9719d4d7ea0..9d171c8bf50 100644 --- a/icu4c/source/data/locales/hi_IN.txt +++ b/icu4c/source/data/locales/hi_IN.txt @@ -15,19 +15,19 @@ hi_IN { "##,##,##0%", "#E0", } - DateTimePatterns { - "h:mm:ss a z", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", - "EEEE d MMMM yyyy", - "d MMMM yyyy", - "dd-MM-yyyy", - "d-M-yy", - "{1} {0}" + calendar{ + gregorian{ + DateTimePatterns{ + "h:mm:ss a z", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", + "EEEE d MMMM yyyy", + "d MMMM yyyy", + "dd-MM-yyyy", + "d-M-yy", + "{1} {0}" + } + } } -// DateTimeElements { -// "1", -// "1" -// } } diff --git a/icu4c/source/data/locales/hr.txt b/icu4c/source/data/locales/hr.txt index b638ec28f5e..561d9c019b3 100644 --- a/icu4c/source/data/locales/hr.txt +++ b/icu4c/source/data/locales/hr.txt @@ -284,67 +284,7 @@ hr { //zh_cn { "kineski (pojednostavljeni)" } //zh_tw { "kineski (tradicionalni)" } } - DateTimePatterns { - "HH:mm:ss z", - "HH:mm:ss z", - "HH:mm:ss", - "HH:mm", - "yyyy. MMMM dd", - "yyyy. MMMM dd", - "yyyy.MM.dd", - "yyyy.MM.dd", - "{1} {0}", - } - DateTimeElements:intvector { - 2, - 1, // "Minimal Days in First Week" is unknown. Root value used instead - } - DayAbbreviations { - "ned", - "pon", - "uto", - "sri", - "\u010Det", - "pet", - "sub", - } - DayNames { - "nedjelja", - "ponedjeljak", - "utorak", - "srijeda", - "\u010Detvrtak", - "petak", - "subota", - } - MonthAbbreviations { - "sij", - "vel", - "o\u017Eu", - "tra", - "svi", - "lip", - "srp", - "kol", - "ruj", - "lis", - "stu", - "pro", - } - MonthNames { - "sije\u010Danj", - "velja\u010Da", - "o\u017Eujak", - "travanj", - "svibanj", - "lipanj", - "srpanj", - "kolovoz", - "rujan", - "listopad", - "studeni", - "prosinac", - } + NumberElements { ",", ".", @@ -371,4 +311,77 @@ hr { Currencies { HRK { "Kn", "HRK" } } + calendar{ + gregorian{ + DateTimeElements:intvector { + 2, + 1, // "Minimal Days in First Week" is unknown. Root value used instead + } + DateTimePatterns{ + "HH:mm:ss z", + "HH:mm:ss z", + "HH:mm:ss", + "HH:mm", + "yyyy. MMMM dd", + "yyyy. MMMM dd", + "yyyy.MM.dd", + "yyyy.MM.dd", + "{1} {0}", + } + dayNames{ + format{ + abbreviated{ + "ned", + "pon", + "uto", + "sri", + "\u010Det", + "pet", + "sub", + } + wide{ + "nedjelja", + "ponedjeljak", + "utorak", + "srijeda", + "\u010Detvrtak", + "petak", + "subota", + } + } + } + monthNames{ + format{ + abbreviated{ + "sij", + "vel", + "o\u017Eu", + "tra", + "svi", + "lip", + "srp", + "kol", + "ruj", + "lis", + "stu", + "pro", + } + wide{ + "sije\u010Danj", + "velja\u010Da", + "o\u017Eujak", + "travanj", + "svibanj", + "lipanj", + "srpanj", + "kolovoz", + "rujan", + "listopad", + "studeni", + "prosinac", + } + } + } + } + } } diff --git a/icu4c/source/data/locales/hu.txt b/icu4c/source/data/locales/hu.txt index e55735a6a07..037bb9ec6a7 100644 --- a/icu4c/source/data/locales/hu.txt +++ b/icu4c/source/data/locales/hu.txt @@ -390,75 +390,7 @@ hu { zh { "k\u00EDnai" } zu { "zulu" } } - AmPmMarkers { - "DE", - "DU", - } - DateTimePatterns { - "H:mm:ss z", - "H:mm:ss z", - "H:mm:ss", - "H:mm", - "yyyy. MMMM d.", - "yyyy. MMMM d.", - "yyyy.MM.dd.", - "yyyy.MM.dd.", - "{1} {0}", - } - DateTimeElements:intvector { - 2, - 1, // "Minimal Days in First Week" is unknown. Root value used instead - } - DayAbbreviations { - "V", - "H", - "K", - "Sze", - "Cs", - "P", - "Szo", - } - DayNames { - "vas\u00E1rnap", - "h\u00E9tf\u0151", - "kedd", - "szerda", - "cs\u00FCt\u00F6rt\u00F6k", - "p\u00E9ntek", - "szombat", - } - Eras { - "i.e.", - "i.u.", - } - MonthAbbreviations { - "jan.", - "febr.", - "m\u00E1rc.", - "\u00E1pr.", - "m\u00E1j.", - "j\u00FAn.", - "j\u00FAl.", - "aug.", - "szept.", - "okt.", - "nov.", - "dec.", - } - MonthNames { - "janu\u00E1r", - "febru\u00E1r", - "m\u00E1rcius", - "\u00E1prilis", - "m\u00E1jus", - "j\u00FAnius", - "j\u00FAlius", - "augusztus", - "szeptember", - "okt\u00F3ber", - "november", - "december", - } + NumberElements { ",", "\u00A0", @@ -488,63 +420,147 @@ hu { Currencies { HUF { "Ft", "HUF" } } - - // (ICU 2.6) International Calendar Data. Note, THE FORMAT OF THIS DATA WILL CHANGE IN FUTURE RELEASES. - Eras_buddhist:array { "BK" } - - // Islamic calendar - Eras_islamic:array { - "MF" - + calendar{ + islamic{ + // Islamic calendar + eras:array { + "MF" + } + monthNames{ + format{ + abbreviated:alias{ + "hu/calendar/islamic/monthNames/format/wide" + } + wide{ + "Moharrem", // Muharram + "Safar", // Safar + "R\u00E9bi el avvel", // Rabi' al-awwal + "R\u00E9bi el accher", // Rabi' al-thani + "Dsem\u00E1di el avvel", // Jumada al-awwal + "Dsem\u00E1di el accher", // Jumada al-thani + "Redseb", // Rajab + "Sab\u00E1n", // Sha'ban + "Ramad\u00E1n", // Ramadan + "Sevv\u00E1l", // Shawwal + "Ds\u00FCl kade", // Dhu al-Qi'dah + "Ds\u00FCl hedse", // Dhu al-Hijjah + } + } + } + } + + // Civil is identical other than in calculations + islamic-civil:alias{ + "hu/calendar/islamic" + } + buddhist{ + eras:array { "BK" } + } + gregorian{ + AmPmMarkers{ + "DE", + "DU", + } + DateTimeElements:intvector { + 2, + 1, // "Minimal Days in First Week" is unknown. Root value used instead + } + DateTimePatterns{ + "H:mm:ss z", + "H:mm:ss z", + "H:mm:ss", + "H:mm", + "yyyy. MMMM d.", + "yyyy. MMMM d.", + "yyyy.MM.dd.", + "yyyy.MM.dd.", + "{1} {0}", + } + dayNames{ + format{ + abbreviated{ + "V", + "H", + "K", + "Sze", + "Cs", + "P", + "Szo", + } + wide{ + "vas\u00E1rnap", + "h\u00E9tf\u0151", + "kedd", + "szerda", + "cs\u00FCt\u00F6rt\u00F6k", + "p\u00E9ntek", + "szombat", + } + } + } + eras{ + "i.e.", + "i.u.", + } + monthNames{ + format{ + abbreviated{ + "jan.", + "febr.", + "m\u00E1rc.", + "\u00E1pr.", + "m\u00E1j.", + "j\u00FAn.", + "j\u00FAl.", + "aug.", + "szept.", + "okt.", + "nov.", + "dec.", + } + wide{ + "janu\u00E1r", + "febru\u00E1r", + "m\u00E1rcius", + "\u00E1prilis", + "m\u00E1jus", + "j\u00FAnius", + "j\u00FAlius", + "augusztus", + "szeptember", + "okt\u00F3ber", + "november", + "december", + } + } + } + } + hebrew{ + eras:array { + "T\u00C9" + } + monthNames{ + format{ + abbreviated:alias{ + "hu/calendar/hebrew/monthNames/format/wide" + } + wide{ + "Tisri", // Tishri + "Hesv\u00E1n", // Heshvan + "Kiszl\u00E9v", // Kislev + "T\u00E9v\u00E9sz", // Tevet + "Sv\u00E1t", // Shevat + "\u00C1d\u00E1r ris\u00F3n", // Adar I + "\u00C1d\u00E1r s\u00E9ni", // Adar + "Nisz\u00E1n", // Nisan + "Ij\u00E1r", // Iyar + "Sziv\u00E1n", // Sivan + "Tamuz", // Tamuz + "\u00C1v", // Av + "Elul", // Elul + } + } + } + } } - - MonthNames_islamic { - "Moharrem", // Muharram - "Safar", // Safar - "R\u00E9bi el avvel", // Rabi' al-awwal - "R\u00E9bi el accher", // Rabi' al-thani - "Dsem\u00E1di el avvel", // Jumada al-awwal - "Dsem\u00E1di el accher", // Jumada al-thani - "Redseb", // Rajab - "Sab\u00E1n", // Sha'ban - "Ramad\u00E1n", // Ramadan - "Sevv\u00E1l", // Shawwal - "Ds\u00FCl kade", // Dhu al-Qi'dah - "Ds\u00FCl hedse", // Dhu al-Hijjah - } - MonthAbbreviations_islamic:alias { // same as MonthNames (no data) - "hu/MonthNames_islamic" - } - // Civil is identical other than in calculations - Eras_islamic-civil:alias { - "hu/Eras_islamic" - } - MonthNames_islamic-civil:alias { - "hu/MonthNames_islamic" - } - MonthAbbreviations_islamic-civil:alias { - "hu/MonthAbbreviations_islamic" - } - MonthNames_hebrew { - "Tisri", // Tishri - "Hesv\u00E1n", // Heshvan - "Kiszl\u00E9v", // Kislev - "T\u00E9v\u00E9sz", // Tevet - "Sv\u00E1t", // Shevat - "\u00C1d\u00E1r ris\u00F3n", // Adar I - "\u00C1d\u00E1r s\u00E9ni", // Adar - "Nisz\u00E1n", // Nisan - "Ij\u00E1r", // Iyar - "Sziv\u00E1n", // Sivan - "Tamuz", // Tamuz - "\u00C1v", // Av - "Elul", // Elul - } - MonthAbbreviations_hebrew:alias { - "hu/MonthNames_hebrew" // no data - } - Eras_hebrew:array { - "T\u00C9" - } - } diff --git a/icu4c/source/data/locales/hy.txt b/icu4c/source/data/locales/hy.txt index b9811a8584a..6e1bbf34820 100644 --- a/icu4c/source/data/locales/hy.txt +++ b/icu4c/source/data/locales/hy.txt @@ -14,14 +14,6 @@ hy{ Version { "2.0" } - AmPmMarkers { - "\u0531\u057c\u2024", - "\u0535\u0580\u2024", - -// ICU will only use the first two strings. -// "\u0531\u057c\u0561\u0582\u0585\u057f\u0565\u0561\u0576", -// "\u0535\u0580\u0565\u056f\u0578\u0575\u0565\u0561\u0576" - } Countries { AD { "\u0531\u0576\u0564\u0578\u0580\u0561" } AE { "\u0544\u056b\u0561\u0581\u0575\u0561\u056c \u0531\u0580\u0561\u0562\u0561\u056f\u0561\u0576 \u0537\u0574\u056b\u0580\u0561\u0569\u0576\u0565\u0580" } @@ -242,71 +234,7 @@ hy{ ZM { "\u0536\u0561\u0574\u0562\u056b\u0561" } ZW { "\u0536\u056b\u0574\u0562\u0561\u0562\u057e\u0565" } } - DateTimeElements:intvector { - 2, - 1, // "Minimal Days in First Week" is unknown. Root value used instead - } - DateTimePatterns { - "HH:mm:ss z", - "HH:mm:ss z", - "HH:mm:ss", - "HH:mm", - "EEEE, MMMM d, yyyy", - "MMMM dd, yyyy", - "MMM d, yyyy", - "MM/dd/yy", - "{1} {0}", - } - DayAbbreviations { - "\u053f\u056b\u0580", - "\u0535\u0580\u056f", - "\u0535\u0580\u0584", - "\u0549\u0578\u0580", - "\u0540\u0576\u0563", - "\u0548\u0582\u0580", - "\u0547\u0561\u0562", - } - DayNames { - "\u053f\u056b\u0580\u0561\u056f\u056b", - "\u0535\u0580\u056f\u0578\u0582\u0577\u0561\u0562\u0569\u056b", - "\u0535\u0580\u0565\u0584\u0577\u0561\u0562\u0569\u056b", - "\u0549\u0578\u0580\u0565\u0584\u0577\u0561\u0562\u0569\u056b", - "\u0540\u056b\u0576\u0563\u0577\u0561\u0562\u0569\u056b", - "\u0548\u0582\u0580\u0562\u0561\u0569", - "\u0547\u0561\u0562\u0561\u0569", - } - Eras { - "\u0545\u2024\u054F\u2024", // 3.D. - "\u0546\u2024\u0554\u2024" // N.K. - } - MonthAbbreviations { - "\u0545\u0576\u0580", - "\u0553\u057f\u0580", - "\u0544\u0580\u057f", - "\u0531\u057a\u0580", - "\u0544\u0575\u057d", - "\u0545\u0576\u057d", - "\u0545\u056c\u057d", - "\u0555\u0563\u057d", - "\u054d\u0565\u057a", - "\u0540\u0578\u056f", - "\u0546\u0578\u0575", - "\u0534\u0565\u056f", - } - MonthNames { - "\u0545\u0578\u0582\u0576\u0578\u0582\u0561\u0580", - "\u0553\u0565\u057f\u0580\u0578\u0582\u0561\u0580", - "\u0544\u0561\u0580\u057f", - "\u0531\u057a\u0580\u056b\u056c", - "\u0544\u0561\u0575\u056b\u057d", - "\u0545\u0578\u0582\u0576\u056b\u057d", - "\u0545\u0578\u0582\u056c\u056b\u057d", - "\u0555\u0563\u0578\u057d\u057f\u0578\u057d", - "\u054d\u0565\u057a\u057f\u0565\u0574\u0562\u0565\u0580", - "\u0540\u0578\u056f\u057f\u0565\u0574\u0562\u0565\u0580", - "\u0546\u0578\u0575\u0565\u0574\u0562\u0565\u0580", - "\u0534\u0565\u056f\u057f\u0565\u0574\u0562\u0565\u0580", - } + LocaleScript{ "Armn", // Script Name } @@ -340,4 +268,86 @@ hy{ // /**************** Info Below is needed ****************/ // currencies // + calendar{ + gregorian{ + AmPmMarkers{ + "\u0531\u057c\u2024", + "\u0535\u0580\u2024", + + } + DateTimeElements:intvector { + 2, + 1, // "Minimal Days in First Week" is unknown. Root value used instead + } + DateTimePatterns{ + "HH:mm:ss z", + "HH:mm:ss z", + "HH:mm:ss", + "HH:mm", + "EEEE, MMMM d, yyyy", + "MMMM dd, yyyy", + "MMM d, yyyy", + "MM/dd/yy", + "{1} {0}", + } + dayNames{ + format{ + abbreviated{ + "\u053f\u056b\u0580", + "\u0535\u0580\u056f", + "\u0535\u0580\u0584", + "\u0549\u0578\u0580", + "\u0540\u0576\u0563", + "\u0548\u0582\u0580", + "\u0547\u0561\u0562", + } + wide{ + "\u053f\u056b\u0580\u0561\u056f\u056b", + "\u0535\u0580\u056f\u0578\u0582\u0577\u0561\u0562\u0569\u056b", + "\u0535\u0580\u0565\u0584\u0577\u0561\u0562\u0569\u056b", + "\u0549\u0578\u0580\u0565\u0584\u0577\u0561\u0562\u0569\u056b", + "\u0540\u056b\u0576\u0563\u0577\u0561\u0562\u0569\u056b", + "\u0548\u0582\u0580\u0562\u0561\u0569", + "\u0547\u0561\u0562\u0561\u0569", + } + } + } + eras{ + "\u0545\u2024\u054F\u2024", // 3.D. + "\u0546\u2024\u0554\u2024" // N.K. + } + monthNames{ + format{ + abbreviated{ + "\u0545\u0576\u0580", + "\u0553\u057f\u0580", + "\u0544\u0580\u057f", + "\u0531\u057a\u0580", + "\u0544\u0575\u057d", + "\u0545\u0576\u057d", + "\u0545\u056c\u057d", + "\u0555\u0563\u057d", + "\u054d\u0565\u057a", + "\u0540\u0578\u056f", + "\u0546\u0578\u0575", + "\u0534\u0565\u056f", + } + wide{ + "\u0545\u0578\u0582\u0576\u0578\u0582\u0561\u0580", + "\u0553\u0565\u057f\u0580\u0578\u0582\u0561\u0580", + "\u0544\u0561\u0580\u057f", + "\u0531\u057a\u0580\u056b\u056c", + "\u0544\u0561\u0575\u056b\u057d", + "\u0545\u0578\u0582\u0576\u056b\u057d", + "\u0545\u0578\u0582\u056c\u056b\u057d", + "\u0555\u0563\u0578\u057d\u057f\u0578\u057d", + "\u054d\u0565\u057a\u057f\u0565\u0574\u0562\u0565\u0580", + "\u0540\u0578\u056f\u057f\u0565\u0574\u0562\u0565\u0580", + "\u0546\u0578\u0575\u0565\u0574\u0562\u0565\u0580", + "\u0534\u0565\u056f\u057f\u0565\u0574\u0562\u0565\u0580", + } + } + } + } + } } diff --git a/icu4c/source/data/locales/hy_AM.txt b/icu4c/source/data/locales/hy_AM.txt index 44e4a78a7b6..fa207ef4179 100644 --- a/icu4c/source/data/locales/hy_AM.txt +++ b/icu4c/source/data/locales/hy_AM.txt @@ -13,23 +13,12 @@ hy_AM{ Version { "1.0" } - Eras { - "\u0554\u2024\u0531\u2024", // K.A. - "\u0554\u2024\u0535\u2024" // K.E. + calendar{ + gregorian{ + eras{ + "\u0554\u2024\u0531\u2024", // K.A. + "\u0554\u2024\u0535\u2024" // K.E. + } + } } } - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/icu4c/source/data/locales/hy_AM_REVISED.txt b/icu4c/source/data/locales/hy_AM_REVISED.txt index 8974b04b5b1..99846299d53 100644 --- a/icu4c/source/data/locales/hy_AM_REVISED.txt +++ b/icu4c/source/data/locales/hy_AM_REVISED.txt @@ -14,58 +14,52 @@ hy_AM_REVISED{ Version { "2.0" } - AmPmMarkers { - "\u0531\u057C\u2024", - "\u053F\u0565\u2024", - -// ICU will only use the first two strings. -// "\u0531\u057c\u0561\u057E\u0578\u057f\u0575\u0561\u0576", -// "\u0535\u0580\u0565\u056f\u0578\u0575\u0561\u0576" - } - MonthAbbreviations { - "\u0540\u0576\u057e", - "\u0553\u057f\u057e", - "\u0544\u0580\u057f", - "\u0531\u057a\u0580", - "\u0544\u0575\u057d", - "\u0540\u0576\u057d", - "\u0540\u056c\u057d", - "\u0555\u0563\u057d", - "\u054d\u0565\u057a", - "\u0540\u0578\u056f", - "\u0546\u0578\u0575", - "\u0534\u0565\u056f", - } - MonthNames { - "\u0540\u0578\u0582\u0576\u057e\u0561\u0580", - "\u0553\u0565\u057f\u0580\u057e\u0561\u0580", - "\u0544\u0561\u0580\u057f", - "\u0531\u057a\u0580\u056b\u056c", - "\u0544\u0561\u0575\u056b\u057d", - "\u0540\u0578\u0582\u0576\u056b\u057d", - "\u0540\u0578\u0582\u056c\u056b\u057d", - "\u0555\u0563\u0578\u057d\u057f\u0578\u057d", - "\u054d\u0565\u057a\u057f\u0565\u0574\u0562\u0565\u0580", - "\u0540\u0578\u056f\u057f\u0565\u0574\u0562\u0565\u0580", - "\u0546\u0578\u0575\u0565\u0574\u0562\u0565\u0580", - "\u0534\u0565\u056f\u057f\u0565\u0574\u0562\u0565\u0580", - } - Eras { - "\u0544\u2024\u0539\u2024\u0531\u2024", - "\u0544\u2024\u0539\u2024" - } // Just use the data from the parent. // The original data in this locale looked suspicious. -// DateTimePatterns { -// "HH:mm:ss z", -// "H:mm:ss z", -// "H:mm:ss", -// "H:mm", -// "EEEE,d MMMM, yyyy", -// "d MMMM yyyy", -// "d MMM yyyy", -// "dd-MM-yy", -// "{1} {0}", -// } -} + calendar{ + gregorian{ + AmPmMarkers{ + "\u0531\u057C\u2024", + "\u053F\u0565\u2024", + + } + eras{ + "\u0544\u2024\u0539\u2024\u0531\u2024", + "\u0544\u2024\u0539\u2024" + } + monthNames{ + format{ + abbreviated{ + "\u0540\u0576\u057e", + "\u0553\u057f\u057e", + "\u0544\u0580\u057f", + "\u0531\u057a\u0580", + "\u0544\u0575\u057d", + "\u0540\u0576\u057d", + "\u0540\u056c\u057d", + "\u0555\u0563\u057d", + "\u054d\u0565\u057a", + "\u0540\u0578\u056f", + "\u0546\u0578\u0575", + "\u0534\u0565\u056f", + } + wide{ + "\u0540\u0578\u0582\u0576\u057e\u0561\u0580", + "\u0553\u0565\u057f\u0580\u057e\u0561\u0580", + "\u0544\u0561\u0580\u057f", + "\u0531\u057a\u0580\u056b\u056c", + "\u0544\u0561\u0575\u056b\u057d", + "\u0540\u0578\u0582\u0576\u056b\u057d", + "\u0540\u0578\u0582\u056c\u056b\u057d", + "\u0555\u0563\u0578\u057d\u057f\u0578\u057d", + "\u054d\u0565\u057a\u057f\u0565\u0574\u0562\u0565\u0580", + "\u0540\u0578\u056f\u057f\u0565\u0574\u0562\u0565\u0580", + "\u0546\u0578\u0575\u0565\u0574\u0562\u0565\u0580", + "\u0534\u0565\u056f\u057f\u0565\u0574\u0562\u0565\u0580", + } + } + } + } + } +} diff --git a/icu4c/source/data/locales/id.txt b/icu4c/source/data/locales/id.txt index 04f188ca630..50f1c2acfe6 100644 --- a/icu4c/source/data/locales/id.txt +++ b/icu4c/source/data/locales/id.txt @@ -280,52 +280,6 @@ id { Currencies { IDR { "Rp", "IDR" } } - DayAbbreviations { - "Min", - "Sen", - "Sel", - "Rab", - "Kam", - "Jum", - "Sab", - } - DayNames { - "Minggu", - "Senin", - "Selasa", - "Rabu", - "Kamis", - "Jumat", - "Sabtu", - } - MonthAbbreviations { - "Jan", - "Feb", - "Mar", - "Apr", - "Mei", - "Jun", - "Jul", - "Agu", - "Sep", - "Okt", - "Nov", - "Des", - } - MonthNames { - "Januari", - "Februari", - "Maret", - "April", - "Mei", - "Juni", - "Juli", - "Agustus", - "September", - "Oktober", - "November", - "Desember", - } Languages { aa { "Afar" } ab { "Abkhaz" } @@ -587,4 +541,62 @@ id { // AmPmMarkers{} // Eras{} // localPatternChars{} + calendar{ + gregorian{ + dayNames{ + format{ + abbreviated{ + "Min", + "Sen", + "Sel", + "Rab", + "Kam", + "Jum", + "Sab", + } + wide{ + "Minggu", + "Senin", + "Selasa", + "Rabu", + "Kamis", + "Jumat", + "Sabtu", + } + } + } + monthNames{ + format{ + abbreviated{ + "Jan", + "Feb", + "Mar", + "Apr", + "Mei", + "Jun", + "Jul", + "Agu", + "Sep", + "Okt", + "Nov", + "Des", + } + wide{ + "Januari", + "Februari", + "Maret", + "April", + "Mei", + "Juni", + "Juli", + "Agustus", + "September", + "Oktober", + "November", + "Desember", + } + } + } + } + } } diff --git a/icu4c/source/data/locales/id_ID.txt b/icu4c/source/data/locales/id_ID.txt index 510cc42f837..fdabb2f1a29 100644 --- a/icu4c/source/data/locales/id_ID.txt +++ b/icu4c/source/data/locales/id_ID.txt @@ -7,15 +7,19 @@ id_ID { Version { "2.0" } - DateTimePatterns { - "H:mm:ss", - "H:mm:ss", - "H:mm:ss", - "H:mm", - "EEEE dd MMMM yyyy", - "dd MMMM yyyy", - "dd MMM yy", - "dd/MM/yy", - "{1} {0}", + calendar{ + gregorian{ + DateTimePatterns{ + "H:mm:ss", + "H:mm:ss", + "H:mm:ss", + "H:mm", + "EEEE dd MMMM yyyy", + "dd MMMM yyyy", + "dd MMM yy", + "dd/MM/yy", + "{1} {0}", + } + } } } diff --git a/icu4c/source/data/locales/is.txt b/icu4c/source/data/locales/is.txt index 283acada0f8..6ece49403f5 100644 --- a/icu4c/source/data/locales/is.txt +++ b/icu4c/source/data/locales/is.txt @@ -188,66 +188,9 @@ is { Currencies { ISK { "kr.", "ISK" } } - DateTimePatterns { - "HH:mm:ss z", - "HH:mm:ss z", - "HH:mm:ss", - "HH:mm", - "EEEE, d. MMMM yyyy", - "d. MMMM yyyy", - "d.M.yyyy", - "d.M.yyyy", - "{1} {0}", - } - DayAbbreviations { - "sun", - "m\u00E1n", - "\u00FEri", - "mi\u00F0", - "fim", - "f\u00F6s", - "lau", - } - DayNames { - "sunnudagur", - "m\u00E1nudagur", - "\u00FEri\u00F0judagur", - "mi\u00F0vikudagur", - "fimmtudagur", - "f\u00F6studagur", - "laugardagur", - } Languages { is { "\u00EDslenska" } } - MonthAbbreviations { - "jan", - "feb", - "mar", - "apr", - "ma\u00ED", - "j\u00FAn", - "j\u00FAl", - "\u00E1g\u00FA", - "sep", - "okt", - "n\u00F3v", - "des", - } - MonthNames { - "jan\u00FAar", - "febr\u00FAar", - "mars", - "apr\u00EDl", - "ma\u00ED", - "j\u00FAn\u00ED", - "j\u00FAl\u00ED", - "\u00E1g\u00FAst", - "september", - "okt\u00F3ber", - "n\u00F3vember", - "desember", - } NumberElements { ",", ".", @@ -268,4 +211,73 @@ is { "Latn", // ISO 15924 Name } ExemplarCharacters { "[a-z\u00e1\u00e9\u00ed\u00f3\u00fa\u00fd\u00f6\u00e6\u00f0\u00fe]" } + calendar{ + gregorian{ + DateTimePatterns{ + "HH:mm:ss z", + "HH:mm:ss z", + "HH:mm:ss", + "HH:mm", + "EEEE, d. MMMM yyyy", + "d. MMMM yyyy", + "d.M.yyyy", + "d.M.yyyy", + "{1} {0}", + } + dayNames{ + format{ + abbreviated{ + "sun", + "m\u00E1n", + "\u00FEri", + "mi\u00F0", + "fim", + "f\u00F6s", + "lau", + } + wide{ + "sunnudagur", + "m\u00E1nudagur", + "\u00FEri\u00F0judagur", + "mi\u00F0vikudagur", + "fimmtudagur", + "f\u00F6studagur", + "laugardagur", + } + } + } + monthNames{ + format{ + abbreviated{ + "jan", + "feb", + "mar", + "apr", + "ma\u00ED", + "j\u00FAn", + "j\u00FAl", + "\u00E1g\u00FA", + "sep", + "okt", + "n\u00F3v", + "des", + } + wide{ + "jan\u00FAar", + "febr\u00FAar", + "mars", + "apr\u00EDl", + "ma\u00ED", + "j\u00FAn\u00ED", + "j\u00FAl\u00ED", + "\u00E1g\u00FAst", + "september", + "okt\u00F3ber", + "n\u00F3vember", + "desember", + } + } + } + } + } } diff --git a/icu4c/source/data/locales/it.txt b/icu4c/source/data/locales/it.txt index f8b560a6534..eff700c6a63 100644 --- a/icu4c/source/data/locales/it.txt +++ b/icu4c/source/data/locales/it.txt @@ -7,10 +7,6 @@ it { Version{ "2.0" } - AmPmMarkers { - "m.", - "p.", - } Countries { Fallback{ "en"} //AD { "Andorra" } @@ -638,43 +634,7 @@ it { ZRZ { "ZRZ", "Zaire dello Zaire" } ZWD { "Z$", "Dollaro dello Zimbabwe" } } - DateTimeElements:intvector { - 2, - 4, - } - DateTimePatterns { - "HH:mm:ss z", - "HH:mm:ss z", - "HH:mm:ss", - "HH:mm", - "EEEE d MMMM yyyy", - "dd MMMM yyyy", - "dd/MMM/yy", - "dd/MM/yy", - "{1} {0}", - } - DayAbbreviations { - "dom", - "lun", - "mar", - "mer", - "gio", - "ven", - "sab", - } - DayNames { - "domenica", - "luned\u00EC", - "marted\u00EC", - "mercoled\u00EC", - "gioved\u00EC", - "venerd\u00EC", - "sabato", - } - Eras { - "aC", - "dC", - } + Languages { af { "afrikaans" } @@ -794,34 +754,6 @@ it { LocaleScript{ "Latn", // ISO 15924 Name } - MonthAbbreviations { - "gen", - "feb", - "mar", - "apr", - "mag", - "giu", - "lug", - "ago", - "set", - "ott", - "nov", - "dic", - } - MonthNames { - "gennaio", - "febbraio", - "marzo", - "aprile", - "maggio", - "giugno", - "luglio", - "agosto", - "settembre", - "ottobre", - "novembre", - "dicembre", - } NumberElements { ",", ".", @@ -989,4 +921,108 @@ it { REVISED { "Modificato" } } + calendar{ + gregorian{ + AmPmMarkers{ + "m.", + "p.", + } + DateTimeElements:intvector { + 2, + 4, + } + DateTimePatterns{ + "HH:mm:ss z", + "HH:mm:ss z", + "HH:mm:ss", + "HH:mm", + "EEEE d MMMM yyyy", + "dd MMMM yyyy", + "dd/MMM/yy", + "dd/MM/yy", + "{1} {0}", + } + dayNames{ + format{ + abbreviated{ + "dom", + "lun", + "mar", + "mer", + "gio", + "ven", + "sab", + } + narrow{ + "D", + "L", + "M", + "M", + "G", + "V", + "S", + } + wide{ + "domenica", + "luned\u00EC", + "marted\u00EC", + "mercoled\u00EC", + "gioved\u00EC", + "venerd\u00EC", + "sabato", + } + } + } + eras{ + "aC", + "dC", + } + monthNames{ + format{ + abbreviated{ + "gen", + "feb", + "mar", + "apr", + "mag", + "giu", + "lug", + "ago", + "set", + "ott", + "nov", + "dic", + } + narrow{ + "G", + "F", + "M", + "A", + "M", + "G", + "L", + "A", + "S", + "O", + "N", + "D", + } + wide{ + "gennaio", + "febbraio", + "marzo", + "aprile", + "maggio", + "giugno", + "luglio", + "agosto", + "settembre", + "ottobre", + "novembre", + "dicembre", + } + } + } + } + } } diff --git a/icu4c/source/data/locales/it_CH.txt b/icu4c/source/data/locales/it_CH.txt index b5e138ac360..ccc92035fb9 100644 --- a/icu4c/source/data/locales/it_CH.txt +++ b/icu4c/source/data/locales/it_CH.txt @@ -7,17 +7,6 @@ it_CH { Version{ "2.0" } - DateTimePatterns { - "HH.mm:ss' h' z", - "HH:mm:ss z", - "HH:mm:ss", - "HH:mm", - "EEEE, d MMMM yyyy", - "d MMMM yyyy", - "d-MMM-yy", - "dd.MM.yy", - "{1} {0}", - } NumberElements { ".", "'", @@ -40,4 +29,19 @@ it_CH { "#E0", } + calendar{ + gregorian{ + DateTimePatterns{ + "HH.mm:ss' h' z", + "HH:mm:ss z", + "HH:mm:ss", + "HH:mm", + "EEEE, d MMMM yyyy", + "d MMMM yyyy", + "d-MMM-yy", + "dd.MM.yy", + "{1} {0}", + } + } + } } diff --git a/icu4c/source/data/locales/it_IT.txt b/icu4c/source/data/locales/it_IT.txt index 00d48ec5a8b..559821412d2 100644 --- a/icu4c/source/data/locales/it_IT.txt +++ b/icu4c/source/data/locales/it_IT.txt @@ -12,15 +12,19 @@ it_IT { // "\u00A4 #,##0.00;-\u00A4 #,##0.00", // "#,##0%", // } - DateTimePatterns { - "HH:mm:ss z", - "H:mm:ss z", - "HH:mm:ss", - "HH:mm", - "EEEE d MMMM yyyy", - "dd MMMM yyyy", - "dd/MMM/yy", - "dd/MM/yy", - "{1} {0}", + calendar{ + gregorian{ + DateTimePatterns{ + "HH:mm:ss z", + "H:mm:ss z", + "HH:mm:ss", + "HH:mm", + "EEEE d MMMM yyyy", + "dd MMMM yyyy", + "dd/MMM/yy", + "dd/MM/yy", + "{1} {0}", + } + } } } diff --git a/icu4c/source/data/locales/ja.txt b/icu4c/source/data/locales/ja.txt index 111f6e5d1f7..6eb1246c842 100644 --- a/icu4c/source/data/locales/ja.txt +++ b/icu4c/source/data/locales/ja.txt @@ -7,10 +7,6 @@ ja { Version { "2.0" } - AmPmMarkers { - "\u5348\u524D", - "\u5348\u5F8C", - } Countries { AD { "\u30A2\u30F3\u30C9\u30E9" } AE { "\u30A2\u30E9\u30D6\u9996\u9577\u56FD\u9023\u90A6" } @@ -264,17 +260,6 @@ ja { ZM { "\u30B6\u30F3\u30D3\u30A2" } ZW { "\u30B8\u30F3\u30D0\u30D6\u30A8" } } - DateTimePatterns { - "H'\u6642'mm'\u5206'ss'\u79D2'z", - "H:mm:ss:z", - "H:mm:ss", - "H:mm", - "yyyy'\u5E74'M'\u6708'd'\u65E5'EEEE", - "yyyy'\u5E74'M'\u6708'd'\u65E5'", - "yyyy/MM/dd", - "yy/MM/dd", - "{1} {0}", - } DateTimePatterns_japanese { "H'\u6642'mm'\u5206'ss'\u79D2'z", "H:mm:ss:z", @@ -287,28 +272,6 @@ ja { "{1} {0}", } - DayAbbreviations { - "\u65E5", - "\u6708", - "\u706B", - "\u6C34", - "\u6728", - "\u91D1", - "\u571F", - } - DayNames { - "\u65E5\u66DC\u65E5", - "\u6708\u66DC\u65E5", - "\u706B\u66DC\u65E5", - "\u6C34\u66DC\u65E5", - "\u6728\u66DC\u65E5", - "\u91D1\u66DC\u65E5", - "\u571F\u66DC\u65E5", - } - Eras { - "\u7D00\u5143\u524D", - "\u897F\u66A6", - } Languages { aa { "\u30a2\u30d5\u30a1\u30fc\u30eb\u8a9e" } ab { "\u30a2\u30d6\u30cf\u30ba\u8a9e" } @@ -530,20 +493,6 @@ ja { zu { "\u30ba\u30fc\u30eb\u30fc\u8a9e" } } - MonthNames { - "1\u6708", - "2\u6708", - "3\u6708", - "4\u6708", - "5\u6708", - "6\u6708", - "7\u6708", - "8\u6708", - "9\u6708", - "10\u6708", - "11\u6708", - "12\u6708", - } // NumberElements { // ".", // ",", @@ -920,246 +869,6 @@ ja { ZAR { "ZAR", "\u30E9\u30F3\u30C9" } // Rand ZWD { "ZWD", "\u30B8\u30F3\u30D0\u30D6\u30A8 \u30C9\u30EB" } // Zimbabwe Dollar } - - // (ICU 2.6) International Calendar Data. Note, THE FORMAT OF THIS DATA WILL CHANGE IN FUTURE RELEASES. - Eras_japanese { - "\u5927\u5316", // 645 Taika - "\u767D\u96C9", // 650 Hakuchi - "\u767D\u9CEF", // 672 Hakuho - "\u6731\u9CE5", // 686 Shucho - "\u5927\u5B9D", // 701 Taiho - "\u6176\u96F2", // 704 Keiun - "\u548C\u9285", // 708 Wado - "\u970A\u4E80", // 715 Reiki - "\u990A\u8001", // 717 Yoro - "\u795E\u4E80", // 724 Jinki - "\u5929\u5E73", // 729 Tempyo - "\u5929\u5E73\u611F\u5B9D", // 749 Tempyo-kampo - "\u5929\u5E73\u52DD\u5B9D", // 749 Tempyo-shoho - "\u5929\u5E73\u5B9D\u5B57", // 757 Tempyo-hoji - "\u5929\u5E73\u795E\u8B77", // 765 Tempho-jingo - "\u795E\u8B77\u666F\u96F2", // 767 Jingo-keiun - "\u5B9D\u4E80", // 770 Hoki - "\u5929\u5FDC", // 781 Ten-o - "\u5EF6\u66A6", // 782 Enryaku - "\u5927\u540C", // 806 Daido - "\u5F18\u4EC1", // 810 Konin - "\u5929\u9577", // 824 Tencho - "\u627F\u548C", // 834 Showa - "\u5609\u7965", // 848 Kajo - "\u4EC1\u5BFF", // 851 Ninju - "\u6589\u8861", // 854 Saiko - "\u5929\u5B89", // 857 Tennan - "\u8C9E\u89B3", // 859 Jogan - "\u5143\u6176", // 877 Genkei - "\u4EC1\u548C", // 885 Ninna - "\u5BDB\u5E73", // 889 Kampyo - "\u660C\u6CF0", // 898 Shotai - "\u5EF6\u559C", // 901 Engi - "\u5EF6\u9577", // 923 Encho - "\u627F\u5E73", // 931 Shohei - "\u5929\u6176", // 938 Tengyo - "\u5929\u66A6", // 947 Tenryaku - "\u5929\u5FB3", // 957 Tentoku - "\u5FDC\u548C", // 961 Owa - "\u5EB7\u4FDD", // 964 Koho - "\u5B89\u548C", // 968 Anna - "\u5929\u7984", // 970 Tenroku - "\u5929\u5EF6", // 973 Ten-en - "\u8C9E\u5143", // 976 Jogen - "\u5929\u5143", // 978 Tengen - "\u6C38\u89B3", // 983 Eikan - "\u5BDB\u548C", // 985 Kanna - "\u6C38\u5EF6", // 987 Ei-en - "\u6C38\u795A", // 989 Eiso - "\u6B63\u66A6", // 990 Shoryaku - "\u9577\u5FB3", // 995 Chotoku - "\u9577\u4FDD", // 999 Choho - "\u5BDB\u5F18", // 1004 Kanko - "\u9577\u548C", // 1012 Chowa - "\u5BDB\u4EC1", // 1017 Kannin - "\u6CBB\u5B89", // 1021 Jian - "\u4E07\u5BFF", // 1024 Manju - "\u9577\u5143", // 1028 Chogen - "\u9577\u66A6", // 1037 Choryaku - "\u9577\u4E45", // 1040 Chokyu - "\u5BDB\u5FB3", // 1044 Kantoku - "\u6C38\u627F", // 1046 Eisho - "\u5929\u559C", // 1053 Tengi - "\u5EB7\u5E73", // 1058 Kohei - "\u6CBB\u66A6", // 1065 Jiryaku - "\u5EF6\u4E45", // 1069 Enkyu - "\u627F\u4FDD", // 1074 Shoho - "\u627F\u66A6", // 1077 Shoryaku - "\u6C38\u4FDD", // 1081 Eiho - "\u5FDC\u5FB3", // 1084 Otoku - "\u5BDB\u6CBB", // 1087 Kanji - "\u5609\u4FDD", // 1094 Kaho - "\u6C38\u9577", // 1096 Eicho - "\u627F\u5FB3", // 1097 Shotoku - "\u5EB7\u548C", // 1099 Kowa - "\u9577\u6CBB", // 1104 Choji - "\u5609\u627F", // 1106 Kasho - "\u5929\u4EC1", // 1108 Tennin - "\u5929\u6C38", // 1110 Ten-ei - "\u6C38\u4E45", // 1113 Eikyu - "\u5143\u6C38", // 1118 Gen-ei - "\u4FDD\u5B89", // 1120 Hoan - "\u5929\u6CBB", // 1124 Tenji - "\u5927\u6CBB", // 1126 Daiji - "\u5929\u627F", // 1131 Tensho - "\u9577\u627F", // 1132 Chosho - "\u4FDD\u5EF6", // 1135 Hoen - "\u6C38\u6CBB", // 1141 Eiji - "\u5EB7\u6CBB", // 1142 Koji - "\u5929\u990A", // 1144 Tenyo - "\u4E45\u5B89", // 1145 Kyuan - "\u4EC1\u5E73", // 1151 Ninpei - "\u4E45\u5BFF", // 1154 Kyuju - "\u4FDD\u5143", // 1156 Hogen - "\u5E73\u6CBB", // 1159 Heiji - "\u6C38\u66A6", // 1160 Eiryaku - "\u5FDC\u4FDD", // 1161 Oho - "\u9577\u5BDB", // 1163 Chokan - "\u6C38\u4E07", // 1165 Eiman - "\u4EC1\u5B89", // 1166 Nin-an - "\u5609\u5FDC", // 1169 Kao - "\u627F\u5B89", // 1171 Shoan - "\u5B89\u5143", // 1175 Angen - "\u6CBB\u627F", // 1177 Jisho - "\u990A\u548C", // 1181 Yowa - "\u5BFF\u6C38", // 1182 Juei - "\u5143\u66A6", // 1184 Genryuku - "\u6587\u6CBB", // 1185 Bunji - "\u5EFA\u4E45", // 1190 Kenkyu - "\u6B63\u6CBB", // 1199 Shoji - "\u5EFA\u4EC1", // 1201 Kennin - "\u5143\u4E45", // 1204 Genkyu - "\u5EFA\u6C38", // 1206 Ken-ei - "\u627F\u5143", // 1207 Shogen - "\u5EFA\u66A6", // 1211 Kenryaku - "\u5EFA\u4FDD", // 1213 Kenpo - "\u627F\u4E45", // 1219 Shokyu - "\u8C9E\u5FDC", // 1222 Joo - "\u5143\u4EC1", // 1224 Gennin - "\u5609\u7984", // 1225 Karoku - "\u5B89\u8C9E", // 1227 Antei - "\u5BDB\u559C", // 1229 Kanki - "\u8C9E\u6C38", // 1232 Joei - "\u5929\u798F", // 1233 Tempuku - "\u6587\u66A6", // 1234 Bunryaku - "\u5609\u798E", // 1235 Katei - "\u66A6\u4EC1", // 1238 Ryakunin - "\u5EF6\u5FDC", // 1239 En-o - "\u4EC1\u6CBB", // 1240 Ninji - "\u5BDB\u5143", // 1243 Kangen - "\u5B9D\u6CBB", // 1247 Hoji - "\u5EFA\u9577", // 1249 Kencho - "\u5EB7\u5143", // 1256 Kogen - "\u6B63\u5609", // 1257 Shoka - "\u6B63\u5143", // 1259 Shogen - "\u6587\u5FDC", // 1260 Bun-o - "\u5F18\u9577", // 1261 Kocho - "\u6587\u6C38", // 1264 Bun-ei - "\u5EFA\u6CBB", // 1275 Kenji - "\u5F18\u5B89", // 1278 Koan - "\u6B63\u5FDC", // 1288 Shoo - "\u6C38\u4EC1", // 1293 Einin - "\u6B63\u5B89", // 1299 Shoan - "\u4E7E\u5143", // 1302 Kengen - "\u5609\u5143", // 1303 Kagen - "\u5FB3\u6CBB", // 1306 Tokuji - "\u5EF6\u6176", // 1308 Enkei - "\u5FDC\u9577", // 1311 Ocho - "\u6B63\u548C", // 1312 Showa - "\u6587\u4FDD", // 1317 Bunpo - "\u5143\u5FDC", // 1319 Geno - "\u5143\u4EA8", // 1321 Genkyo - "\u6B63\u4E2D", // 1324 Shochu - "\u5609\u66A6", // 1326 Kareki - "\u5143\u5FB3", // 1329 Gentoku - "\u5143\u5F18", // 1331 Genko - "\u5EFA\u6B66", // 1334 Kemmu - "\u5EF6\u5143", // 1336 Engen - "\u8208\u56FD", // 1340 Kokoku - "\u6B63\u5E73", // 1346 Shohei - "\u5EFA\u5FB3", // 1370 Kentoku - "\u6587\u4E2D", // 1372 Bunchu - "\u5929\u6388", // 1375 Tenju - "\u5F18\u548C", // 1381 Kowa - "\u5143\u4E2D", // 1384 Genchu - "\u81F3\u5FB3", // 1384 Meitoku - "\u5EB7\u66A6", // 1379 Koryaku - "\u5609\u6176", // 1387 Kakei - "\u5EB7\u5FDC", // 1389 Koo - "\u660E\u5FB3", // 1390 Meitoku - "\u5FDC\u6C38", // 1394 Oei - "\u6B63\u9577", // 1428 Shocho - "\u6C38\u4EAB", // 1429 Eikyo - "\u5609\u5409", // 1441 Kakitsu - "\u6587\u5B89", // 1444 Bun-an - "\u5B9D\u5FB3", // 1449 Hotoku - "\u4EAB\u5FB3", // 1452 Kyotoku - "\u5EB7\u6B63", // 1455 Kosho - "\u9577\u7984", // 1457 Choroku - "\u5BDB\u6B63", // 1460 Kansho - "\u6587\u6B63", // 1466 Bunsho - "\u5FDC\u4EC1", // 1467 Onin - "\u6587\u660E", // 1469 Bunmei - "\u9577\u4EAB", // 1487 Chokyo - "\u5EF6\u5FB3", // 1489 Entoku - "\u660E\u5FDC", // 1492 Meio - "\u6587\u4E80", // 1501 Bunki - "\u6C38\u6B63", // 1504 Eisho - "\u5927\u6C38", // 1521 Taiei - "\u4EAB\u7984", // 1528 Kyoroku - "\u5929\u6587", // 1532 Tenmon - "\u5F18\u6CBB", // 1555 Koji - "\u6C38\u7984", // 1558 Eiroku - "\u5143\u4E80", // 1570 Genki - "\u5929\u6B63", // 1573 Tensho - "\u6587\u7984", // 1592 Bunroku - "\u6176\u9577", // 1596 Keicho - "\u5143\u548C", // 1615 Genwa - "\u5BDB\u6C38", // 1624 Kan-ei - "\u6B63\u4FDD", // 1644 Shoho - "\u6176\u5B89", // 1648 Keian - "\u627F\u5FDC", // 1652 Shoo - "\u660E\u66A6", // 1655 Meiryaku - "\u4E07\u6CBB", // 1658 Manji - "\u5BDB\u6587", // 1661 Kanbun - "\u5EF6\u5B9D", // 1673 Enpo - "\u5929\u548C", // 1681 Tenwa - "\u8C9E\u4EAB", // 1684 Jokyo - "\u5143\u7984", // 1688 Genroku - "\u5B9D\u6C38", // 1704 Hoei - "\u6B63\u5FB3", // 1711 Shotoku - "\u4EAB\u4FDD", // 1716 Kyoho - "\u5143\u6587", // 1736 Genbun - "\u5BDB\u4FDD", // 1741 Kanpo - "\u5EF6\u4EAB", // 1744 Enkyo - "\u5BDB\u5EF6", // 1748 Kan-en - "\u5B9D\u66A6", // 1751 Horyaku - "\u660E\u548C", // 1764 Meiwa - "\u5B89\u6C38", // 1772 An-ei - "\u5929\u660E", // 1781 Tenmei - "\u5BDB\u653F", // 1789 Kansei - "\u4EAB\u548C", // 1801 Kyowa - "\u6587\u5316", // 1804 Bunka - "\u6587\u653F", // 1818 Bunsei - "\u5929\u4FDD", // 1830 Tenpo - "\u5F18\u5316", // 1844 Koka - "\u5609\u6C38", // 1848 Kaei - "\u5B89\u653F", // 1854 Ansei - "\u4E07\u5EF6", // 1860 Man-en - "\u6587\u4E45", // 1861 Bunkyu - "\u5143\u6CBB", // 1864 Genji - "\u6176\u5FDC", // 1865 Keio - "\u660E\u6CBB", // 1868 Meiji - "\u5927\u6B63", // 1912 Taisho - "\u662D\u548C", // 1926 Showa - "\u5E73\u6210" // 1989 Heisei - } Keys{ calendar { "\u66A6" } collation { "\u7167\u5408\u9806\u756A" } @@ -1188,4 +897,309 @@ ja { //PREEURO { "\u65e7\u901a\u8ca8" } REVISED { "\u6539\u8a02\u7248" } } + calendar{ + gregorian{ + AmPmMarkers{ + "\u5348\u524D", + "\u5348\u5F8C", + } + DateTimePatterns{ + "H'\u6642'mm'\u5206'ss'\u79D2'z", + "H:mm:ss:z", + "H:mm:ss", + "H:mm", + "yyyy'\u5E74'M'\u6708'd'\u65E5'EEEE", + "yyyy'\u5E74'M'\u6708'd'\u65E5'", + "yyyy/MM/dd", + "yy/MM/dd", + "{1} {0}", + } + dayNames{ + format{ + abbreviated{ + "\u65E5", + "\u6708", + "\u706B", + "\u6C34", + "\u6728", + "\u91D1", + "\u571F", + } + wide{ + "\u65E5\u66DC\u65E5", + "\u6708\u66DC\u65E5", + "\u706B\u66DC\u65E5", + "\u6C34\u66DC\u65E5", + "\u6728\u66DC\u65E5", + "\u91D1\u66DC\u65E5", + "\u571F\u66DC\u65E5", + } + } + } + eras{ + "\u7D00\u5143\u524D", + "\u897F\u66A6", + } + monthNames{ + format{ + wide{ + "1\u6708", + "2\u6708", + "3\u6708", + "4\u6708", + "5\u6708", + "6\u6708", + "7\u6708", + "8\u6708", + "9\u6708", + "10\u6708", + "11\u6708", + "12\u6708", + } + } + } + } + japanese{ + eras{ + // (ICU 2.6) International Calendar Data. Note, THE FORMAT OF THIS DATA WILL CHANGE IN FUTURE RELEASES. + + "\u5927\u5316", // 645 Taika + "\u767D\u96C9", // 650 Hakuchi + "\u767D\u9CEF", // 672 Hakuho + "\u6731\u9CE5", // 686 Shucho + "\u5927\u5B9D", // 701 Taiho + "\u6176\u96F2", // 704 Keiun + "\u548C\u9285", // 708 Wado + "\u970A\u4E80", // 715 Reiki + "\u990A\u8001", // 717 Yoro + "\u795E\u4E80", // 724 Jinki + "\u5929\u5E73", // 729 Tempyo + "\u5929\u5E73\u611F\u5B9D", // 749 Tempyo-kampo + "\u5929\u5E73\u52DD\u5B9D", // 749 Tempyo-shoho + "\u5929\u5E73\u5B9D\u5B57", // 757 Tempyo-hoji + "\u5929\u5E73\u795E\u8B77", // 765 Tempho-jingo + "\u795E\u8B77\u666F\u96F2", // 767 Jingo-keiun + "\u5B9D\u4E80", // 770 Hoki + "\u5929\u5FDC", // 781 Ten-o + "\u5EF6\u66A6", // 782 Enryaku + "\u5927\u540C", // 806 Daido + "\u5F18\u4EC1", // 810 Konin + "\u5929\u9577", // 824 Tencho + "\u627F\u548C", // 834 Showa + "\u5609\u7965", // 848 Kajo + "\u4EC1\u5BFF", // 851 Ninju + "\u6589\u8861", // 854 Saiko + "\u5929\u5B89", // 857 Tennan + "\u8C9E\u89B3", // 859 Jogan + "\u5143\u6176", // 877 Genkei + "\u4EC1\u548C", // 885 Ninna + "\u5BDB\u5E73", // 889 Kampyo + "\u660C\u6CF0", // 898 Shotai + "\u5EF6\u559C", // 901 Engi + "\u5EF6\u9577", // 923 Encho + "\u627F\u5E73", // 931 Shohei + "\u5929\u6176", // 938 Tengyo + "\u5929\u66A6", // 947 Tenryaku + "\u5929\u5FB3", // 957 Tentoku + "\u5FDC\u548C", // 961 Owa + "\u5EB7\u4FDD", // 964 Koho + "\u5B89\u548C", // 968 Anna + "\u5929\u7984", // 970 Tenroku + "\u5929\u5EF6", // 973 Ten-en + "\u8C9E\u5143", // 976 Jogen + "\u5929\u5143", // 978 Tengen + "\u6C38\u89B3", // 983 Eikan + "\u5BDB\u548C", // 985 Kanna + "\u6C38\u5EF6", // 987 Ei-en + "\u6C38\u795A", // 989 Eiso + "\u6B63\u66A6", // 990 Shoryaku + "\u9577\u5FB3", // 995 Chotoku + "\u9577\u4FDD", // 999 Choho + "\u5BDB\u5F18", // 1004 Kanko + "\u9577\u548C", // 1012 Chowa + "\u5BDB\u4EC1", // 1017 Kannin + "\u6CBB\u5B89", // 1021 Jian + "\u4E07\u5BFF", // 1024 Manju + "\u9577\u5143", // 1028 Chogen + "\u9577\u66A6", // 1037 Choryaku + "\u9577\u4E45", // 1040 Chokyu + "\u5BDB\u5FB3", // 1044 Kantoku + "\u6C38\u627F", // 1046 Eisho + "\u5929\u559C", // 1053 Tengi + "\u5EB7\u5E73", // 1058 Kohei + "\u6CBB\u66A6", // 1065 Jiryaku + "\u5EF6\u4E45", // 1069 Enkyu + "\u627F\u4FDD", // 1074 Shoho + "\u627F\u66A6", // 1077 Shoryaku + "\u6C38\u4FDD", // 1081 Eiho + "\u5FDC\u5FB3", // 1084 Otoku + "\u5BDB\u6CBB", // 1087 Kanji + "\u5609\u4FDD", // 1094 Kaho + "\u6C38\u9577", // 1096 Eicho + "\u627F\u5FB3", // 1097 Shotoku + "\u5EB7\u548C", // 1099 Kowa + "\u9577\u6CBB", // 1104 Choji + "\u5609\u627F", // 1106 Kasho + "\u5929\u4EC1", // 1108 Tennin + "\u5929\u6C38", // 1110 Ten-ei + "\u6C38\u4E45", // 1113 Eikyu + "\u5143\u6C38", // 1118 Gen-ei + "\u4FDD\u5B89", // 1120 Hoan + "\u5929\u6CBB", // 1124 Tenji + "\u5927\u6CBB", // 1126 Daiji + "\u5929\u627F", // 1131 Tensho + "\u9577\u627F", // 1132 Chosho + "\u4FDD\u5EF6", // 1135 Hoen + "\u6C38\u6CBB", // 1141 Eiji + "\u5EB7\u6CBB", // 1142 Koji + "\u5929\u990A", // 1144 Tenyo + "\u4E45\u5B89", // 1145 Kyuan + "\u4EC1\u5E73", // 1151 Ninpei + "\u4E45\u5BFF", // 1154 Kyuju + "\u4FDD\u5143", // 1156 Hogen + "\u5E73\u6CBB", // 1159 Heiji + "\u6C38\u66A6", // 1160 Eiryaku + "\u5FDC\u4FDD", // 1161 Oho + "\u9577\u5BDB", // 1163 Chokan + "\u6C38\u4E07", // 1165 Eiman + "\u4EC1\u5B89", // 1166 Nin-an + "\u5609\u5FDC", // 1169 Kao + "\u627F\u5B89", // 1171 Shoan + "\u5B89\u5143", // 1175 Angen + "\u6CBB\u627F", // 1177 Jisho + "\u990A\u548C", // 1181 Yowa + "\u5BFF\u6C38", // 1182 Juei + "\u5143\u66A6", // 1184 Genryuku + "\u6587\u6CBB", // 1185 Bunji + "\u5EFA\u4E45", // 1190 Kenkyu + "\u6B63\u6CBB", // 1199 Shoji + "\u5EFA\u4EC1", // 1201 Kennin + "\u5143\u4E45", // 1204 Genkyu + "\u5EFA\u6C38", // 1206 Ken-ei + "\u627F\u5143", // 1207 Shogen + "\u5EFA\u66A6", // 1211 Kenryaku + "\u5EFA\u4FDD", // 1213 Kenpo + "\u627F\u4E45", // 1219 Shokyu + "\u8C9E\u5FDC", // 1222 Joo + "\u5143\u4EC1", // 1224 Gennin + "\u5609\u7984", // 1225 Karoku + "\u5B89\u8C9E", // 1227 Antei + "\u5BDB\u559C", // 1229 Kanki + "\u8C9E\u6C38", // 1232 Joei + "\u5929\u798F", // 1233 Tempuku + "\u6587\u66A6", // 1234 Bunryaku + "\u5609\u798E", // 1235 Katei + "\u66A6\u4EC1", // 1238 Ryakunin + "\u5EF6\u5FDC", // 1239 En-o + "\u4EC1\u6CBB", // 1240 Ninji + "\u5BDB\u5143", // 1243 Kangen + "\u5B9D\u6CBB", // 1247 Hoji + "\u5EFA\u9577", // 1249 Kencho + "\u5EB7\u5143", // 1256 Kogen + "\u6B63\u5609", // 1257 Shoka + "\u6B63\u5143", // 1259 Shogen + "\u6587\u5FDC", // 1260 Bun-o + "\u5F18\u9577", // 1261 Kocho + "\u6587\u6C38", // 1264 Bun-ei + "\u5EFA\u6CBB", // 1275 Kenji + "\u5F18\u5B89", // 1278 Koan + "\u6B63\u5FDC", // 1288 Shoo + "\u6C38\u4EC1", // 1293 Einin + "\u6B63\u5B89", // 1299 Shoan + "\u4E7E\u5143", // 1302 Kengen + "\u5609\u5143", // 1303 Kagen + "\u5FB3\u6CBB", // 1306 Tokuji + "\u5EF6\u6176", // 1308 Enkei + "\u5FDC\u9577", // 1311 Ocho + "\u6B63\u548C", // 1312 Showa + "\u6587\u4FDD", // 1317 Bunpo + "\u5143\u5FDC", // 1319 Geno + "\u5143\u4EA8", // 1321 Genkyo + "\u6B63\u4E2D", // 1324 Shochu + "\u5609\u66A6", // 1326 Kareki + "\u5143\u5FB3", // 1329 Gentoku + "\u5143\u5F18", // 1331 Genko + "\u5EFA\u6B66", // 1334 Kemmu + "\u5EF6\u5143", // 1336 Engen + "\u8208\u56FD", // 1340 Kokoku + "\u6B63\u5E73", // 1346 Shohei + "\u5EFA\u5FB3", // 1370 Kentoku + "\u6587\u4E2D", // 1372 Bunchu + "\u5929\u6388", // 1375 Tenju + "\u5F18\u548C", // 1381 Kowa + "\u5143\u4E2D", // 1384 Genchu + "\u81F3\u5FB3", // 1384 Meitoku + "\u5EB7\u66A6", // 1379 Koryaku + "\u5609\u6176", // 1387 Kakei + "\u5EB7\u5FDC", // 1389 Koo + "\u660E\u5FB3", // 1390 Meitoku + "\u5FDC\u6C38", // 1394 Oei + "\u6B63\u9577", // 1428 Shocho + "\u6C38\u4EAB", // 1429 Eikyo + "\u5609\u5409", // 1441 Kakitsu + "\u6587\u5B89", // 1444 Bun-an + "\u5B9D\u5FB3", // 1449 Hotoku + "\u4EAB\u5FB3", // 1452 Kyotoku + "\u5EB7\u6B63", // 1455 Kosho + "\u9577\u7984", // 1457 Choroku + "\u5BDB\u6B63", // 1460 Kansho + "\u6587\u6B63", // 1466 Bunsho + "\u5FDC\u4EC1", // 1467 Onin + "\u6587\u660E", // 1469 Bunmei + "\u9577\u4EAB", // 1487 Chokyo + "\u5EF6\u5FB3", // 1489 Entoku + "\u660E\u5FDC", // 1492 Meio + "\u6587\u4E80", // 1501 Bunki + "\u6C38\u6B63", // 1504 Eisho + "\u5927\u6C38", // 1521 Taiei + "\u4EAB\u7984", // 1528 Kyoroku + "\u5929\u6587", // 1532 Tenmon + "\u5F18\u6CBB", // 1555 Koji + "\u6C38\u7984", // 1558 Eiroku + "\u5143\u4E80", // 1570 Genki + "\u5929\u6B63", // 1573 Tensho + "\u6587\u7984", // 1592 Bunroku + "\u6176\u9577", // 1596 Keicho + "\u5143\u548C", // 1615 Genwa + "\u5BDB\u6C38", // 1624 Kan-ei + "\u6B63\u4FDD", // 1644 Shoho + "\u6176\u5B89", // 1648 Keian + "\u627F\u5FDC", // 1652 Shoo + "\u660E\u66A6", // 1655 Meiryaku + "\u4E07\u6CBB", // 1658 Manji + "\u5BDB\u6587", // 1661 Kanbun + "\u5EF6\u5B9D", // 1673 Enpo + "\u5929\u548C", // 1681 Tenwa + "\u8C9E\u4EAB", // 1684 Jokyo + "\u5143\u7984", // 1688 Genroku + "\u5B9D\u6C38", // 1704 Hoei + "\u6B63\u5FB3", // 1711 Shotoku + "\u4EAB\u4FDD", // 1716 Kyoho + "\u5143\u6587", // 1736 Genbun + "\u5BDB\u4FDD", // 1741 Kanpo + "\u5EF6\u4EAB", // 1744 Enkyo + "\u5BDB\u5EF6", // 1748 Kan-en + "\u5B9D\u66A6", // 1751 Horyaku + "\u660E\u548C", // 1764 Meiwa + "\u5B89\u6C38", // 1772 An-ei + "\u5929\u660E", // 1781 Tenmei + "\u5BDB\u653F", // 1789 Kansei + "\u4EAB\u548C", // 1801 Kyowa + "\u6587\u5316", // 1804 Bunka + "\u6587\u653F", // 1818 Bunsei + "\u5929\u4FDD", // 1830 Tenpo + "\u5F18\u5316", // 1844 Koka + "\u5609\u6C38", // 1848 Kaei + "\u5B89\u653F", // 1854 Ansei + "\u4E07\u5EF6", // 1860 Man-en + "\u6587\u4E45", // 1861 Bunkyu + "\u5143\u6CBB", // 1864 Genji + "\u6176\u5FDC", // 1865 Keio + "\u660E\u6CBB", // 1868 Meiji + "\u5927\u6B63", // 1912 Taisho + "\u662D\u548C", // 1926 Showa + "\u5E73\u6210" // 1989 Heisei + } + } + } } diff --git a/icu4c/source/data/locales/ja_JP_TRADITIONAL.txt b/icu4c/source/data/locales/ja_JP_TRADITIONAL.txt index d4fcea29cd0..ba1a19ddfe5 100644 --- a/icu4c/source/data/locales/ja_JP_TRADITIONAL.txt +++ b/icu4c/source/data/locales/ja_JP_TRADITIONAL.txt @@ -10,5 +10,7 @@ ja_JP_TRADITIONAL { Version { "1.0" } // International Calendars Data. // NOTE (ICU 2.6) - the format of this data WILL CHANGE in future releases. - DefaultCalendar { "japanese" } + calendar{ + default{"japanese" } + } } diff --git a/icu4c/source/data/locales/kk.txt b/icu4c/source/data/locales/kk.txt index c8e16698607..1744982a79f 100644 --- a/icu4c/source/data/locales/kk.txt +++ b/icu4c/source/data/locales/kk.txt @@ -13,69 +13,12 @@ kk { Currencies { KZT { "\u0442\u04A3\u0433.", "KZT" } } - DateTimePatterns { - "HH:mm:ss z", - "HH:mm:ss z", - "HH:mm:ss", - "HH:mm", - "EEEE, d MMMM yyyy '\u0436.'", - "d MMMM yyyy '\u0436.'", - "dd.MM.yyyy", - "dd.MM.yy", - "{1} {0}", - } - DayAbbreviations { - "\u0436\u0441.", - "\u0434\u0441.", - "\u0441\u0441.", - "\u0441\u0440.", - "\u0431\u0441.", - "\u0436\u043C.", - "\u0441\u04BB.", - } - DayNames { - "\u0436\u0435\u043A\u0441\u0435\u043D\u0456", - "\u0434\u0443\u0439\u0441\u0435\u043D\u0431\u0456", - "\u0441\u0435\u0439\u0441\u0435\u043D\u0431\u0456", - "\u0441\u04D9\u0440\u0435\u043D\u0431\u0456", - "\u0431\u0435\u0439\u0441\u0435\u043D\u0431\u0456", - "\u0436\u04B1\u043C\u0430", - "\u0441\u0435\u043D\u0431\u0456", - } Languages { kk { "\u049A\u0430\u0437\u0430\u049B" } } // \u049B should be removed if it's not in the native language and country names. ExemplarCharacters { "[\u0430-\u044f\u044b\u044d\u0451\u0456\u049B\u04A3\u04AF\u04B1\u04D9]" } LocaleScript:array { "Cyrl" } - MonthAbbreviations { - "\u049B\u0430\u04A3.", - "\u0430\u049B\u043F.", - "\u043D\u0430\u0443.", - "\u0441\u04D9\u0443.", - "\u043C\u0430\u043C.", - "\u043C\u0430\u0443.", - "\u0448\u0456\u043B.", - "\u0442\u0430\u043C.", - "\u049B\u044B\u0440.", - "\u049B\u0430\u0437.", - "\u049B\u0430\u0440.", - "\u0436\u0435\u043B\u0442.", - } - MonthNames { - "\u049B\u0430\u04A3\u0442\u0430\u0440", - "\u0430\u049B\u043F\u0430\u043D", - "\u043D\u0430\u0443\u0440\u044B\u0437", - "\u0441\u04D9\u0443\u0456\u0440", - "\u043C\u0430\u043C\u044B\u0440", - "\u043C\u0430\u0443\u0441\u044B\u043C", - "\u0448\u0456\u043B\u0434\u0435", - "\u0442\u0430\u043C\u044B\u0437", - "\u049B\u044B\u0440\u043A\u04AF\u0439\u0435\u043A", - "\u049B\u0430\u0437\u0430\u043D", - "\u049B\u0430\u0440\u0430\u0448\u0430", - "\u0436\u0435\u043B\u0442\u043E\u049B\u0441\u0430\u043D", - } NumberElements { ",", "\u00A0", @@ -91,8 +34,78 @@ kk { ",", "+", } - DateTimeElements:intvector { - 2, // monday is the first day of the week - 1, + + calendar{ + gregorian{ + DateTimeElements:intvector { + 2, // monday is the first day of the week + 1, + } + DateTimePatterns{ + "HH:mm:ss z", + "HH:mm:ss z", + "HH:mm:ss", + "HH:mm", + "EEEE, d MMMM yyyy '\u0436.'", + "d MMMM yyyy '\u0436.'", + "dd.MM.yyyy", + "dd.MM.yy", + "{1} {0}", + } + dayNames{ + format{ + abbreviated{ + "\u0436\u0441.", + "\u0434\u0441.", + "\u0441\u0441.", + "\u0441\u0440.", + "\u0431\u0441.", + "\u0436\u043C.", + "\u0441\u04BB.", + } + wide{ + "\u0436\u0435\u043A\u0441\u0435\u043D\u0456", + "\u0434\u0443\u0439\u0441\u0435\u043D\u0431\u0456", + "\u0441\u0435\u0439\u0441\u0435\u043D\u0431\u0456", + "\u0441\u04D9\u0440\u0435\u043D\u0431\u0456", + "\u0431\u0435\u0439\u0441\u0435\u043D\u0431\u0456", + "\u0436\u04B1\u043C\u0430", + "\u0441\u0435\u043D\u0431\u0456", + } + } + } + monthNames{ + format{ + abbreviated{ + "\u049B\u0430\u04A3.", + "\u0430\u049B\u043F.", + "\u043D\u0430\u0443.", + "\u0441\u04D9\u0443.", + "\u043C\u0430\u043C.", + "\u043C\u0430\u0443.", + "\u0448\u0456\u043B.", + "\u0442\u0430\u043C.", + "\u049B\u044B\u0440.", + "\u049B\u0430\u0437.", + "\u049B\u0430\u0440.", + "\u0436\u0435\u043B\u0442.", + } + wide{ + "\u049B\u0430\u04A3\u0442\u0430\u0440", + "\u0430\u049B\u043F\u0430\u043D", + "\u043D\u0430\u0443\u0440\u044B\u0437", + "\u0441\u04D9\u0443\u0456\u0440", + "\u043C\u0430\u043C\u044B\u0440", + "\u043C\u0430\u0443\u0441\u044B\u043C", + "\u0448\u0456\u043B\u0434\u0435", + "\u0442\u0430\u043C\u044B\u0437", + "\u049B\u044B\u0440\u043A\u04AF\u0439\u0435\u043A", + "\u049B\u0430\u0437\u0430\u043D", + "\u049B\u0430\u0440\u0430\u0448\u0430", + "\u0436\u0435\u043B\u0442\u043E\u049B\u0441\u0430\u043D", + } + } + } + } } } diff --git a/icu4c/source/data/locales/kl.txt b/icu4c/source/data/locales/kl.txt index a0a1fcfedd2..d48d21059c5 100644 --- a/icu4c/source/data/locales/kl.txt +++ b/icu4c/source/data/locales/kl.txt @@ -14,24 +14,6 @@ kl{ Currencies { DKK { "kr", "DKK" } } - DayAbbreviations { - "sab", - "ata", - "mar", - "pin", - "sis", - "tal", - "arf", - } - DayNames { - "sabaat", - "ataasinngorneq", - "marlunngorneq", - "pingasunngorneq", - "sisamanngorneq", - "tallimanngorneq", - "arfininngorneq", - } Languages { kl { "kalaallisut" } } @@ -39,34 +21,6 @@ kl{ LocaleScript{ "Latn", // ISO 15924 Name } - MonthAbbreviations { - "jan", - "feb", - "mar", - "apr", - "maj", - "jun", - "jul", - "aug", - "sep", - "okt", - "nov", - "dec", - } - MonthNames { - "januari", - "februari", - "martsi", - "aprili", - "maji", - "juni", - "juli", - "augustusi", - "septemberi", - "oktoberi", - "novemberi", - "decemberi", - } NumberElements { ",", ".", @@ -91,4 +45,62 @@ kl{ // localPatternChars{} // + calendar{ + gregorian{ + dayNames{ + format{ + abbreviated{ + "sab", + "ata", + "mar", + "pin", + "sis", + "tal", + "arf", + } + wide{ + "sabaat", + "ataasinngorneq", + "marlunngorneq", + "pingasunngorneq", + "sisamanngorneq", + "tallimanngorneq", + "arfininngorneq", + } + } + } + monthNames{ + format{ + abbreviated{ + "jan", + "feb", + "mar", + "apr", + "maj", + "jun", + "jul", + "aug", + "sep", + "okt", + "nov", + "dec", + } + wide{ + "januari", + "februari", + "martsi", + "aprili", + "maji", + "juni", + "juli", + "augustusi", + "septemberi", + "oktoberi", + "novemberi", + "decemberi", + } + } + } + } + } } diff --git a/icu4c/source/data/locales/kl_GL.txt b/icu4c/source/data/locales/kl_GL.txt index 193e31bb356..f9acce92df2 100644 --- a/icu4c/source/data/locales/kl_GL.txt +++ b/icu4c/source/data/locales/kl_GL.txt @@ -7,21 +7,25 @@ kl_GL { Version { "2.0" } - DateTimePatterns { - "h:mm:ss a", - "h:mm:ss a", - "h:mm:ss a", - "h:mm a", - "EEEE dd MMMM yyyy", - "dd MMMM yyyy", - "MMM dd,yy", - "dd/MM/yy", - "{1} {0}", - } NumberPatterns { "#,##0.###;-#,##0.###", "\u00a4#,##0.00;\u00a4 -#,##0.00", "#,##0%", "#E0", } + calendar{ + gregorian{ + DateTimePatterns{ + "h:mm:ss a", + "h:mm:ss a", + "h:mm:ss a", + "h:mm a", + "EEEE dd MMMM yyyy", + "dd MMMM yyyy", + "MMM dd,yy", + "dd/MM/yy", + "{1} {0}", + } + } + } } diff --git a/icu4c/source/data/locales/kn.txt b/icu4c/source/data/locales/kn.txt index 6bbc619d706..1a0feaaf016 100644 --- a/icu4c/source/data/locales/kn.txt +++ b/icu4c/source/data/locales/kn.txt @@ -7,10 +7,6 @@ kn { Version{ "2.0" } - AmPmMarkers{ - "\u0CAA\u0CC2\u0CB0\u0CCD\u0CB5\u0CBE\u0CB9\u0CCD\u0CA8", - "\u0C85\u0CAA\u0CB0\u0CBE\u0CB9\u0CCD\u0CA8" - } Countries { AU { "\u0c86\u0cb8\u0ccd\u0c9f\u0ccd\u0cb0\u0cc6\u0cb2\u0cbf\u0caf" } CN { "\u0c9a\u0cc0\u0ca8" } @@ -24,57 +20,11 @@ kn { Currencies { INR { "\u0930\u0941", "INR" } } - DayNames{ - "\u0CB0\u0CB5\u0CBF\u0CB5\u0CBE\u0CB0", - "\u0CB8\u0CCB\u0CAE\u0CB5\u0CBE\u0CB0", - "\u0CAE\u0C82\u0C97\u0CB3\u0CB5\u0CBE\u0CB0", - "\u0CAC\u0CC1\u0CA7\u0CB5\u0CBE\u0CB0", - "\u0C97\u0CC1\u0CB0\u0CC1\u0CB5\u0CBE\u0CB0", - "\u0CB6\u0CC1\u0C95\u0CCD\u0CB0\u0CB5\u0CBE\u0CB0", - "\u0CB6\u0CA8\u0CBF\u0CB5\u0CBE\u0CB0" - } - DayAbbreviations{ - "\u0CB0.", - "\u0CB8\u0CCB.", - "\u0CAE\u0C82.", - "\u0CAC\u0CC1.", - "\u0C97\u0CC1.", - "\u0CB6\u0CC1.", - "\u0CB6\u0CA8\u0CBF." - } Languages { kn { "\u0c95\u0ca8\u0ccd\u0ca8\u0ca1" } } LocaleScript:array { "Knda" } ExemplarCharacters { "[:Knda:]" } - MonthNames{ - "\u0C9C\u0CA8\u0CB5\u0CB0\u0CC0", - "\u0CAB\u0CC6\u0CAC\u0CCD\u0CB0\u0CB5\u0CB0\u0CC0", - "\u0CAE\u0CBE\u0CB0\u0CCD\u0C9A\u0CCD", - "\u0C8E\u0CAA\u0CCD\u0CB0\u0CBF\u0CB2\u0CCD", - "\u0CAE\u0CC6", - "\u0C9C\u0CC2\u0CA8\u0CCD", - "\u0C9C\u0CC1\u0CB2\u0CC8", - "\u0C86\u0C97\u0CB8\u0CCD\u0C9F\u0CCD", - "\u0CB8\u0CAA\u0CCD\u0C9F\u0CC6\u0C82\u0CAC\u0CB0\u0CCD", - "\u0C85\u0C95\u0CCD\u0C9F\u0CCB\u0CAC\u0CB0\u0CCD", - "\u0CA8\u0CB5\u0CC6\u0C82\u0CAC\u0CB0\u0CCD", - "\u0CA1\u0CBF\u0CB8\u0CC6\u0C82\u0CAC\u0CB0\u0CCD", - } - MonthAbbreviations{ - "\u0C9C\u0CA8\u0CB5\u0CB0\u0CC0", - "\u0CAB\u0CC6\u0CAC\u0CCD\u0CB0\u0CB5\u0CB0\u0CC0", - "\u0CAE\u0CBE\u0CB0\u0CCD\u0C9A\u0CCD", - "\u0C8E\u0CAA\u0CCD\u0CB0\u0CBF\u0CB2\u0CCD", - "\u0CAE\u0CC6", - "\u0C9C\u0CC2\u0CA8\u0CCD", - "\u0C9C\u0CC1\u0CB2\u0CC8", - "\u0C86\u0C97\u0CB8\u0CCD\u0C9F\u0CCD", - "\u0CB8\u0CAA\u0CCD\u0C9F\u0CC6\u0C82\u0CAC\u0CB0\u0CCD", - "\u0C85\u0C95\u0CCD\u0C9F\u0CCB\u0CAC\u0CB0\u0CCD", - "\u0CA8\u0CB5\u0CC6\u0C82\u0CAC\u0CB0\u0CCD", - "\u0CA1\u0CBF\u0CB8\u0CC6\u0C82\u0CAC\u0CB0\u0CCD", - } // NumberElements { // ".", // ",", @@ -88,4 +38,66 @@ kn { // "\u221e", // "\ufffd", // } + calendar{ + gregorian{ + AmPmMarkers{ + "\u0CAA\u0CC2\u0CB0\u0CCD\u0CB5\u0CBE\u0CB9\u0CCD\u0CA8", + "\u0C85\u0CAA\u0CB0\u0CBE\u0CB9\u0CCD\u0CA8" + } + dayNames{ + format{ + abbreviated{ + "\u0CB0.", + "\u0CB8\u0CCB.", + "\u0CAE\u0C82.", + "\u0CAC\u0CC1.", + "\u0C97\u0CC1.", + "\u0CB6\u0CC1.", + "\u0CB6\u0CA8\u0CBF." + } + wide{ + "\u0CB0\u0CB5\u0CBF\u0CB5\u0CBE\u0CB0", + "\u0CB8\u0CCB\u0CAE\u0CB5\u0CBE\u0CB0", + "\u0CAE\u0C82\u0C97\u0CB3\u0CB5\u0CBE\u0CB0", + "\u0CAC\u0CC1\u0CA7\u0CB5\u0CBE\u0CB0", + "\u0C97\u0CC1\u0CB0\u0CC1\u0CB5\u0CBE\u0CB0", + "\u0CB6\u0CC1\u0C95\u0CCD\u0CB0\u0CB5\u0CBE\u0CB0", + "\u0CB6\u0CA8\u0CBF\u0CB5\u0CBE\u0CB0" + } + } + } + monthNames{ + format{ + abbreviated{ + "\u0C9C\u0CA8\u0CB5\u0CB0\u0CC0", + "\u0CAB\u0CC6\u0CAC\u0CCD\u0CB0\u0CB5\u0CB0\u0CC0", + "\u0CAE\u0CBE\u0CB0\u0CCD\u0C9A\u0CCD", + "\u0C8E\u0CAA\u0CCD\u0CB0\u0CBF\u0CB2\u0CCD", + "\u0CAE\u0CC6", + "\u0C9C\u0CC2\u0CA8\u0CCD", + "\u0C9C\u0CC1\u0CB2\u0CC8", + "\u0C86\u0C97\u0CB8\u0CCD\u0C9F\u0CCD", + "\u0CB8\u0CAA\u0CCD\u0C9F\u0CC6\u0C82\u0CAC\u0CB0\u0CCD", + "\u0C85\u0C95\u0CCD\u0C9F\u0CCB\u0CAC\u0CB0\u0CCD", + "\u0CA8\u0CB5\u0CC6\u0C82\u0CAC\u0CB0\u0CCD", + "\u0CA1\u0CBF\u0CB8\u0CC6\u0C82\u0CAC\u0CB0\u0CCD", + } + wide{ + "\u0C9C\u0CA8\u0CB5\u0CB0\u0CC0", + "\u0CAB\u0CC6\u0CAC\u0CCD\u0CB0\u0CB5\u0CB0\u0CC0", + "\u0CAE\u0CBE\u0CB0\u0CCD\u0C9A\u0CCD", + "\u0C8E\u0CAA\u0CCD\u0CB0\u0CBF\u0CB2\u0CCD", + "\u0CAE\u0CC6", + "\u0C9C\u0CC2\u0CA8\u0CCD", + "\u0C9C\u0CC1\u0CB2\u0CC8", + "\u0C86\u0C97\u0CB8\u0CCD\u0C9F\u0CCD", + "\u0CB8\u0CAA\u0CCD\u0C9F\u0CC6\u0C82\u0CAC\u0CB0\u0CCD", + "\u0C85\u0C95\u0CCD\u0C9F\u0CCB\u0CAC\u0CB0\u0CCD", + "\u0CA8\u0CB5\u0CC6\u0C82\u0CAC\u0CB0\u0CCD", + "\u0CA1\u0CBF\u0CB8\u0CC6\u0C82\u0CAC\u0CB0\u0CCD", + } + } + } + } + } } diff --git a/icu4c/source/data/locales/kn_IN.txt b/icu4c/source/data/locales/kn_IN.txt index 8620e576f01..334948b7bb6 100644 --- a/icu4c/source/data/locales/kn_IN.txt +++ b/icu4c/source/data/locales/kn_IN.txt @@ -7,17 +7,6 @@ kn_IN { Version { "2.0" } - DateTimePatterns { - "hh:mm:ss a z", - "hh:mm:ss a z", - "hh:mm:ss a", - "hh:mm a", - "EEEE d MMMM yyyy", - "d MMMM yyyy", - "dd-MM-yyyy", - "d-M-yy", - "{1} {0}" - } // DateTimeElements:intvector { // 1, // 1 @@ -28,4 +17,19 @@ kn_IN { "##,##,##0%", "#E0", } -} \ No newline at end of file + calendar{ + gregorian{ + DateTimePatterns{ + "hh:mm:ss a z", + "hh:mm:ss a z", + "hh:mm:ss a", + "hh:mm a", + "EEEE d MMMM yyyy", + "d MMMM yyyy", + "dd-MM-yyyy", + "d-M-yy", + "{1} {0}" + } + } + } +} diff --git a/icu4c/source/data/locales/ko.txt b/icu4c/source/data/locales/ko.txt index 888500832be..40315cf19fa 100644 --- a/icu4c/source/data/locales/ko.txt +++ b/icu4c/source/data/locales/ko.txt @@ -8,10 +8,6 @@ ko { Version { "2.0" } - AmPmMarkers { - "\uC624\uC804", - "\uC624\uD6C4", - } Countries { AD { "\uC548\uB3C4\uB77C" } AE { "\uC544\uB78D\uC5D0\uBBF8\uB9AC\uD2B8" } @@ -628,35 +624,6 @@ ko { ZWD { "Z$", "\uC9D0\uBE44\uBE0C\uC6E8 \uB2EC\uB7EC" } } - DateTimePatterns { - "a hh'\uC2DC' mm'\uBD84' ss'\uCD08' z", - "a hh'\uC2DC' mm'\uBD84' ss'\uCD08'", - "a hh'\uC2DC' mm'\uBD84'", - "a hh'\uC2DC' mm'\uBD84'", - "yyyy'\uB144' M'\uC6D4' d'\uC77C' EEEE", - "yyyy'\uB144' M'\uC6D4' d'\uC77C' EE", - "yyyy-MM-dd", - "yy-MM-dd", - "{1} {0}", - } - DayAbbreviations { - "\uC77C", - "\uC6D4", - "\uD654", - "\uC218", - "\uBAA9", - "\uAE08", - "\uD1A0", - } - DayNames { - "\uC77C\uC694\uC77C", - "\uC6D4\uC694\uC77C", - "\uD654\uC694\uC77C", - "\uC218\uC694\uC77C", - "\uBAA9\uC694\uC77C", - "\uAE08\uC694\uC77C", - "\uD1A0\uC694\uC77C", - } Eras { "\uae30\uC6D0\uC804", "\uC11C\uAE30", @@ -870,34 +837,6 @@ ko { zh { "\uC911\uAD6D\uC5B4" } zu { "\uC904\uB8E8\uC5B4" } } - MonthAbbreviations { - "1\uC6D4", - "2\uC6D4", - "3\uC6D4", - "4\uC6D4", - "5\uC6D4", - "6\uC6D4", - "7\uC6D4", - "8\uC6D4", - "9\uC6D4", - "10\uC6D4", - "11\uC6D4", - "12\uC6D4", - } - MonthNames { - "1\uC6D4", - "2\uC6D4", - "3\uC6D4", - "4\uC6D4", - "5\uC6D4", - "6\uC6D4", - "7\uC6D4", - "8\uC6D4", - "9\uC6D4", - "10\uC6D4", - "11\uC6D4", - "12\uC6D4", - } Scripts { Arab { "\uC544\uB78D\uC5B4" } Armn { "\uC544\uB974\uBA54\uB2C8\uC544\uC5B4" } @@ -992,4 +931,77 @@ ko { "KST" } } + calendar{ + gregorian{ + AmPmMarkers{ + "\uC624\uC804", + "\uC624\uD6C4", + } + DateTimePatterns{ + "a hh'\uC2DC' mm'\uBD84' ss'\uCD08' z", + "a hh'\uC2DC' mm'\uBD84' ss'\uCD08'", + "a hh'\uC2DC' mm'\uBD84'", + "a hh'\uC2DC' mm'\uBD84'", + "yyyy'\uB144' M'\uC6D4' d'\uC77C' EEEE", + "yyyy'\uB144' M'\uC6D4' d'\uC77C' EE", + "yyyy-MM-dd", + "yy-MM-dd", + "{1} {0}", + } + dayNames{ + format{ + abbreviated{ + "\uC77C", + "\uC6D4", + "\uD654", + "\uC218", + "\uBAA9", + "\uAE08", + "\uD1A0", + } + wide{ + "\uC77C\uC694\uC77C", + "\uC6D4\uC694\uC77C", + "\uD654\uC694\uC77C", + "\uC218\uC694\uC77C", + "\uBAA9\uC694\uC77C", + "\uAE08\uC694\uC77C", + "\uD1A0\uC694\uC77C", + } + } + } + monthNames{ + format{ + abbreviated{ + "1\uC6D4", + "2\uC6D4", + "3\uC6D4", + "4\uC6D4", + "5\uC6D4", + "6\uC6D4", + "7\uC6D4", + "8\uC6D4", + "9\uC6D4", + "10\uC6D4", + "11\uC6D4", + "12\uC6D4", + } + wide{ + "1\uC6D4", + "2\uC6D4", + "3\uC6D4", + "4\uC6D4", + "5\uC6D4", + "6\uC6D4", + "7\uC6D4", + "8\uC6D4", + "9\uC6D4", + "10\uC6D4", + "11\uC6D4", + "12\uC6D4", + } + } + } + } + } } diff --git a/icu4c/source/data/locales/ko_KR.txt b/icu4c/source/data/locales/ko_KR.txt index f56789f90f2..df49df3b606 100644 --- a/icu4c/source/data/locales/ko_KR.txt +++ b/icu4c/source/data/locales/ko_KR.txt @@ -23,20 +23,24 @@ ko_KR { //FR { "\uD504\uB791\uC2A4" } //CA { "\uCE90\uB098\uB2E4" } // } - DateTimePatterns { - "a hh'\uC2DC' mm'\uBD84' ss'\uCD08' z", - "a hh'\uC2DC' mm'\uBD84' ss'\uCD08'", - "a h:mm:ss", - "a h:mm", - "yyyy'\uB144' M'\uC6D4' d'\uC77C' EEEE", - "yyyy'\uB144' M'\uC6D4' d'\uC77C'", - "yyyy. MM. dd", - "yy. MM. dd", - "{1} {0}", - } // Languages { // ko { "\uD55C\uAD6D\uC5B4" } // } + calendar{ + gregorian{ + DateTimePatterns{ + "a hh'\uC2DC' mm'\uBD84' ss'\uCD08' z", + "a hh'\uC2DC' mm'\uBD84' ss'\uCD08'", + "a h:mm:ss", + "a h:mm", + "yyyy'\uB144' M'\uC6D4' d'\uC77C' EEEE", + "yyyy'\uB144' M'\uC6D4' d'\uC77C'", + "yyyy. MM. dd", + "yy. MM. dd", + "{1} {0}", + } + } + } } diff --git a/icu4c/source/data/locales/kok.txt b/icu4c/source/data/locales/kok.txt index 8d2c768e691..f704bc14df2 100644 --- a/icu4c/source/data/locales/kok.txt +++ b/icu4c/source/data/locales/kok.txt @@ -155,58 +155,7 @@ kok { IN { "\u092D\u093E\u0930\u0924" } } - MonthNames { - "\u091c\u093e\u0928\u0947\u0935\u093e\u0930\u0940", - "\u092b\u0947\u092c\u094d\u0930\u0941\u0935\u093e\u0930\u0940", - "\u092e\u093e\u0930\u094d\u091a", - "\u090f\u092a\u094d\u0930\u093f\u0932", - "\u092e\u0947", - "\u091c\u0942\u0928", - "\u091c\u0941\u0932\u0948", - "\u0913\u0917\u0938\u094d\u091f", - "\u0938\u0947\u092a\u094d\u091f\u0947\u0902\u092c\u0930", - "\u0913\u0915\u094d\u091f\u094b\u092c\u0930", - "\u0928\u094b\u0935\u094d\u0939\u0947\u0902\u092c\u0930", - "\u0921\u093f\u0938\u0947\u0902\u092c\u0930", - } - MonthAbbreviations { - "\u091c\u093e\u0928\u0947\u0935\u093e\u0930\u0940", - "\u092b\u0947\u092c\u0943\u0935\u093e\u0930\u0940", - "\u092e\u093e\u0930\u094d\u091a", - "\u090f\u092a\u094d\u0930\u093f\u0932", - "\u092e\u0947", - "\u091c\u0942\u0928", - "\u091c\u0941\u0932\u0948", - "\u0913\u0917\u0938\u094d\u091f", - "\u0938\u0947\u092a\u094d\u091f\u0947\u0902\u092c\u0930", - "\u0913\u0915\u094d\u091f\u094b\u092c\u0930", - "\u0928\u094b\u0935\u094d\u0939\u0947\u0902\u092c\u0930", - "\u0921\u093f\u0938\u0947\u0902\u092c\u0930", - } - DayNames { - "\u0906\u0926\u093f\u0924\u094d\u092f\u0935\u093e\u0930", - "\u0938\u094b\u092e\u0935\u093e\u0930", - "\u092e\u0902\u0917\u0933\u093e\u0930", - "\u092c\u0941\u0927\u0935\u093e\u0930", - "\u0917\u0941\u0930\u0941\u0935\u093e\u0930", - "\u0936\u0941\u0915\u094d\u0930\u0935\u093e\u0930", - "\u0936\u0928\u093f\u0935\u093e\u0930", - } - DayAbbreviations - { - "\u0930\u0935\u093f", - "\u0938\u094b\u092e", - "\u092e\u0902\u0917\u0933", - "\u092c\u0941\u0927", - "\u0917\u0941\u0930\u0941", - "\u0936\u0941\u0915\u094d\u0930", - "\u0936\u0928\u093f", - } - AmPmMarkers { - "\u092e.\u092a\u0942.", - "\u092e.\u0928\u0902." - } Eras { "\u0915\u094d\u0930\u093f\u0938\u094d\u0924\u092a\u0942\u0930\u094d\u0935", @@ -245,6 +194,66 @@ kok { Currencies { INR { "\u0930\u0941", "INR" } } + calendar{ + gregorian{ + AmPmMarkers{ + "\u092e.\u092a\u0942.", + "\u092e.\u0928\u0902." + } + dayNames{ + format{ + abbreviated{ + "\u0930\u0935\u093f", + "\u0938\u094b\u092e", + "\u092e\u0902\u0917\u0933", + "\u092c\u0941\u0927", + "\u0917\u0941\u0930\u0941", + "\u0936\u0941\u0915\u094d\u0930", + "\u0936\u0928\u093f", + } + wide{ + "\u0906\u0926\u093f\u0924\u094d\u092f\u0935\u093e\u0930", + "\u0938\u094b\u092e\u0935\u093e\u0930", + "\u092e\u0902\u0917\u0933\u093e\u0930", + "\u092c\u0941\u0927\u0935\u093e\u0930", + "\u0917\u0941\u0930\u0941\u0935\u093e\u0930", + "\u0936\u0941\u0915\u094d\u0930\u0935\u093e\u0930", + "\u0936\u0928\u093f\u0935\u093e\u0930", + } + } + } + monthNames{ + format{ + abbreviated{ + "\u091c\u093e\u0928\u0947\u0935\u093e\u0930\u0940", + "\u092b\u0947\u092c\u0943\u0935\u093e\u0930\u0940", + "\u092e\u093e\u0930\u094d\u091a", + "\u090f\u092a\u094d\u0930\u093f\u0932", + "\u092e\u0947", + "\u091c\u0942\u0928", + "\u091c\u0941\u0932\u0948", + "\u0913\u0917\u0938\u094d\u091f", + "\u0938\u0947\u092a\u094d\u091f\u0947\u0902\u092c\u0930", + "\u0913\u0915\u094d\u091f\u094b\u092c\u0930", + "\u0928\u094b\u0935\u094d\u0939\u0947\u0902\u092c\u0930", + "\u0921\u093f\u0938\u0947\u0902\u092c\u0930", + } + wide{ + "\u091c\u093e\u0928\u0947\u0935\u093e\u0930\u0940", + "\u092b\u0947\u092c\u094d\u0930\u0941\u0935\u093e\u0930\u0940", + "\u092e\u093e\u0930\u094d\u091a", + "\u090f\u092a\u094d\u0930\u093f\u0932", + "\u092e\u0947", + "\u091c\u0942\u0928", + "\u091c\u0941\u0932\u0948", + "\u0913\u0917\u0938\u094d\u091f", + "\u0938\u0947\u092a\u094d\u091f\u0947\u0902\u092c\u0930", + "\u0913\u0915\u094d\u091f\u094b\u092c\u0930", + "\u0928\u094b\u0935\u094d\u0939\u0947\u0902\u092c\u0930", + "\u0921\u093f\u0938\u0947\u0902\u092c\u0930", + } + } + } + } + } } - - diff --git a/icu4c/source/data/locales/kok_IN.txt b/icu4c/source/data/locales/kok_IN.txt index 681f7e084c7..0fe379b2c40 100644 --- a/icu4c/source/data/locales/kok_IN.txt +++ b/icu4c/source/data/locales/kok_IN.txt @@ -14,19 +14,19 @@ kok_IN { "##,##,##0%", "#E0", } - DateTimePatterns { - "h:mm:ss a z", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", - "EEEE d MMMM yyyy", - "d MMMM yyyy", - "dd-MM-yyyy", - "d-M-yy", - "{1} {0}" + calendar{ + gregorian{ + DateTimePatterns{ + "h:mm:ss a z", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", + "EEEE d MMMM yyyy", + "d MMMM yyyy", + "dd-MM-yyyy", + "d-M-yy", + "{1} {0}" + } + } } -// DateTimeElements { -// "1", -// "1" -// } } diff --git a/icu4c/source/data/locales/kw.txt b/icu4c/source/data/locales/kw.txt index 162be9cc4e6..0473441c79f 100644 --- a/icu4c/source/data/locales/kw.txt +++ b/icu4c/source/data/locales/kw.txt @@ -7,35 +7,9 @@ kw { Version { "2.0" } - AmPmMarkers { - "a.m.", - "p.m.", - } Countries { GB { "Rywvaneth Unys" } } - DayAbbreviations { - "Sul", - "Lun", - "Mth", - "Mhr", - "Yow", - "Gwe", - "Sad", - } - DayNames { - "De Sul", - "De Lun", - "De Merth", - "De Merher", - "De Yow", - "De Gwener", - "De Sadorn", - } - Eras { - "RC", // BC - "AD" // AD - } ExemplarCharacters { "[a-z]" } LocaleScript:array{ "Latn", // ISO 15924 Name @@ -43,34 +17,6 @@ kw { Languages { kw { "kernewek" } } - MonthAbbreviations { - "Gen", - "Whe", - "Mer", - "Ebr", - "Me", - "Efn", - "Gor", - "Est", - "Gwn", - "Hed", - "Du", - "Kev", - } - MonthNames { - "Mys Genver", - "Mys Whevrel", - "Mys Merth", - "Mys Ebrel", - "Mys Me", - "Mys Efan", - "Mys Gortheren", - "Mye Est", - "Mys Gwyngala", - "Mys Hedra", - "Mys Du", - "Mys Kevardhu", - } // NumberElements { // ".", // ",", @@ -90,4 +36,70 @@ kw { // Languages{} // localPatternChars{} // + calendar{ + gregorian{ + AmPmMarkers{ + "a.m.", + "p.m.", + } + dayNames{ + format{ + abbreviated{ + "Sul", + "Lun", + "Mth", + "Mhr", + "Yow", + "Gwe", + "Sad", + } + wide{ + "De Sul", + "De Lun", + "De Merth", + "De Merher", + "De Yow", + "De Gwener", + "De Sadorn", + } + } + } + eras{ + "RC", // BC + "AD" // AD + } + monthNames{ + format{ + abbreviated{ + "Gen", + "Whe", + "Mer", + "Ebr", + "Me", + "Efn", + "Gor", + "Est", + "Gwn", + "Hed", + "Du", + "Kev", + } + wide{ + "Mys Genver", + "Mys Whevrel", + "Mys Merth", + "Mys Ebrel", + "Mys Me", + "Mys Efan", + "Mys Gortheren", + "Mye Est", + "Mys Gwyngala", + "Mys Hedra", + "Mys Du", + "Mys Kevardhu", + } + } + } + } + } } diff --git a/icu4c/source/data/locales/kw_GB.txt b/icu4c/source/data/locales/kw_GB.txt index 91e7a3224a9..591419bd3d5 100644 --- a/icu4c/source/data/locales/kw_GB.txt +++ b/icu4c/source/data/locales/kw_GB.txt @@ -7,25 +7,30 @@ kw_GB { Version { "2.0" } - DateTimeElements:intvector { - 2, - 1, - } - DateTimePatterns { - "HH:mm:ss z", - "HH:mm:ss", - "HH:mm:ss", - "HH:mm", - "EEEE d MMMM yyyy", - "d MMMM yyyy", - "d MMM yyyy", - "dd/MM/yyyy", - "{1} {0}", - } + NumberPatterns { "#,##0.###;-#,##0.###", "\u00a4#,##0.00;-\u00a4#,##0.00", "#,##0%", "#E0", } + calendar{ + gregorian{ + DateTimeElements:intvector { + 2, + 1, + } + DateTimePatterns{ + "HH:mm:ss z", + "HH:mm:ss", + "HH:mm:ss", + "HH:mm", + "EEEE d MMMM yyyy", + "d MMMM yyyy", + "d MMM yyyy", + "dd/MM/yyyy", + "{1} {0}", + } + } + } } diff --git a/icu4c/source/data/locales/lt.txt b/icu4c/source/data/locales/lt.txt index 406386b0d5c..5a98314cc11 100644 --- a/icu4c/source/data/locales/lt.txt +++ b/icu4c/source/data/locales/lt.txt @@ -249,43 +249,7 @@ lt { ZM { "Zambija" } ZW { "Zimbabv\u0117" } } - DateTimePatterns { - "HH:mm:ss z", - "HH:mm:ss z", - "HH:mm:ss", - "HH:mm", - "yyyy 'm.' MMMM d 'd.',EEEE", - "yyyy 'm.' MMMM d 'd.'", - "yyyy.MM.dd", - "yyyy.MM.dd", - "{1} {0}", - } - DateTimeElements:intvector { - 2, - 4, // "Minimal Days in First Week" Lithuania follows ISO 8601 - } - DayAbbreviations { - "Sk", - "Pr", - "An", - "Tr", - "Kt", - "Pn", - "\u0160t", - } - DayNames { - "Sekmadienis", - "Pirmadienis", - "Antradienis", - "Tre\u010Diadienis", - "Ketvirtadienis", - "Penktadienis", - "\u0160e\u0161tadienis", - } - Eras { - "pr.Kr.", - "po.Kr.", - } + Languages { ar { "Arab\u0173" } bg { "Bulgar\u0173" } @@ -320,34 +284,6 @@ lt { //zh_cn { "Kin\u0173 (supaprastinta)" } //zh_tw { "Kin\u0173 (tadicin\u0117)" } } - MonthAbbreviations { - "Sau", - "Vas", - "Kov", - "Bal", - "Geg", - "Bir", - "Lie", - "Rgp", - "Rgs", - "Spa", - "Lap", - "Grd", - } - MonthNames { - "Sausio", - "Vasario", - "Kovo", - "Baland\u017Eio", - "Gegu\u017E\u0117s", - "Bir\u017Eelio", - "Liepos", - "Rugpj\u016B\u010Dio", - "Rugs\u0117jo", - "Spalio", - "Lapkri\u010Dio", - "Gruod\u017Eio", - } NumberElements { ",", ".", @@ -374,4 +310,81 @@ lt { Currencies { LTL { "Lt", "LTL" } } + calendar{ + gregorian{ + DateTimeElements:intvector { + 2, + 4, // "Minimal Days in First Week" Lithuania follows ISO 8601 + } + DateTimePatterns{ + "HH:mm:ss z", + "HH:mm:ss z", + "HH:mm:ss", + "HH:mm", + "yyyy 'm.' MMMM d 'd.',EEEE", + "yyyy 'm.' MMMM d 'd.'", + "yyyy.MM.dd", + "yyyy.MM.dd", + "{1} {0}", + } + dayNames{ + format{ + abbreviated{ + "Sk", + "Pr", + "An", + "Tr", + "Kt", + "Pn", + "\u0160t", + } + wide{ + "Sekmadienis", + "Pirmadienis", + "Antradienis", + "Tre\u010Diadienis", + "Ketvirtadienis", + "Penktadienis", + "\u0160e\u0161tadienis", + } + } + } + eras{ + "pr.Kr.", + "po.Kr.", + } + monthNames{ + format{ + abbreviated{ + "Sau", + "Vas", + "Kov", + "Bal", + "Geg", + "Bir", + "Lie", + "Rgp", + "Rgs", + "Spa", + "Lap", + "Grd", + } + wide{ + "Sausio", + "Vasario", + "Kovo", + "Baland\u017Eio", + "Gegu\u017E\u0117s", + "Bir\u017Eelio", + "Liepos", + "Rugpj\u016B\u010Dio", + "Rugs\u0117jo", + "Spalio", + "Lapkri\u010Dio", + "Gruod\u017Eio", + } + } + } + } + } } diff --git a/icu4c/source/data/locales/lv.txt b/icu4c/source/data/locales/lv.txt index 4e8c0945907..c29b283f725 100644 --- a/icu4c/source/data/locales/lv.txt +++ b/icu4c/source/data/locales/lv.txt @@ -249,43 +249,7 @@ lv { ZM { "Zambija" } ZW { "Zimbabve" } } - DateTimePatterns { - "HH:mm:ss z", - "HH:mm:ss z", - "HH:mm:ss", - "HH:mm", - "EEEE, yyyy'. gada 'd. MMMM", - "yyyy'. gada 'd. MMMM", - "yyyy.d.M", - "yy.d.M", - "{1} {0}", - } - DateTimeElements:intvector { - 2, - 1, // "Minimal Days in First Week" is unknown. Root value used instead - } - DayAbbreviations { - "Sv", - "P", - "O", - "T", - "C", - "Pk", - "S", - } - DayNames { - "sv\u0113tdiena", - "pirmdiena", - "otrdiena", - "tre\u0161diena", - "ceturtdiena", - "piektdiena", - "sestdiena", - } - Eras { - "pm\u0113", - "m\u0113", - } + Languages { ar { "ar\u0101bu" } bg { "bulg\u0101ru" } @@ -320,34 +284,6 @@ lv { //zh_cn { "\u0137\u012Bnie\u0161u (vienk\u0101r\u0161ot\u0101)" } //zh_tw { "\u0137\u012Bnie\u0161u (tradicion\u0101l\u0101)" } } - MonthAbbreviations { - "Jan", - "Feb", - "Mar", - "Apr", - "Mai", - "J\u016Bn", - "J\u016Bl", - "Aug", - "Sep", - "Okt", - "Nov", - "Dec", - } - MonthNames { - "janv\u0101ris", - "febru\u0101ris", - "marts", - "apr\u012Blis", - "maijs", - "j\u016Bnijs", - "j\u016Blijs", - "augusts", - "septembris", - "oktobris", - "novembris", - "decembris", - } NumberElements { ",", "\u00A0", @@ -373,4 +309,81 @@ lv { Currencies { LVL { "Ls", "LVL" } } + calendar{ + gregorian{ + DateTimeElements:intvector { + 2, + 1, // "Minimal Days in First Week" is unknown. Root value used instead + } + DateTimePatterns{ + "HH:mm:ss z", + "HH:mm:ss z", + "HH:mm:ss", + "HH:mm", + "EEEE, yyyy'. gada 'd. MMMM", + "yyyy'. gada 'd. MMMM", + "yyyy.d.M", + "yy.d.M", + "{1} {0}", + } + dayNames{ + format{ + abbreviated{ + "Sv", + "P", + "O", + "T", + "C", + "Pk", + "S", + } + wide{ + "sv\u0113tdiena", + "pirmdiena", + "otrdiena", + "tre\u0161diena", + "ceturtdiena", + "piektdiena", + "sestdiena", + } + } + } + eras{ + "pm\u0113", + "m\u0113", + } + monthNames{ + format{ + abbreviated{ + "Jan", + "Feb", + "Mar", + "Apr", + "Mai", + "J\u016Bn", + "J\u016Bl", + "Aug", + "Sep", + "Okt", + "Nov", + "Dec", + } + wide{ + "janv\u0101ris", + "febru\u0101ris", + "marts", + "apr\u012Blis", + "maijs", + "j\u016Bnijs", + "j\u016Blijs", + "augusts", + "septembris", + "oktobris", + "novembris", + "decembris", + } + } + } + } + } } diff --git a/icu4c/source/data/locales/mk.txt b/icu4c/source/data/locales/mk.txt index 5f73f4e9aa1..2f55a207689 100644 --- a/icu4c/source/data/locales/mk.txt +++ b/icu4c/source/data/locales/mk.txt @@ -10,74 +10,10 @@ mk { Countries { MK { "\u041C\u0430\u043A\u0435\u0434\u043E\u043D\u0438\u0458\u0430" } } - DateTimePatterns { - "HH:mm:ss z", - "HH:mm:ss z", - "HH:mm:ss", - "HH:mm", - "EEEE, dd MMMM yyyy", - "dd MMMM yyyy", - "dd.M.yyyy", - "dd.M.yy", - "{1} {0}", - } - DateTimeElements:intvector { - 2, - 1, // "Minimal Days in First Week" is unknown. Root value used instead - } - DayAbbreviations { - "\u043D\u0435\u0434.", - "\u043F\u043E\u043D.", - "\u0432\u0442.", - "\u0441\u0440\u0435.", - "\u0447\u0435\u0442.", - "\u043F\u0435\u0442.", - "\u0441\u0430\u0431.", - } - DayNames { - "\u043D\u0435\u0434\u0435\u043B\u0430", - "\u043F\u043E\u043D\u0435\u0434\u0435\u043B\u043D\u0438\u043A", - "\u0432\u0442\u043E\u0440\u043D\u0438\u043A", - "\u0441\u0440\u0435\u0434\u0430", - "\u0447\u0435\u0442\u0432\u0440\u0442\u043E\u043A", - "\u043F\u0435\u0442\u043E\u043A", - "\u0441\u0430\u0431\u043E\u0442\u0430", - } - Eras { - "\u043F\u0440.\u043D.\u0435.", - "\u0430\u0435.", - } + Languages { mk { "\u043C\u0430\u043A\u0435\u0434\u043E\u043D\u0441\u043A\u0438" } } - MonthAbbreviations { - "\u0458\u0430\u043D.", - "\u0444\u0435\u0432.", - "\u043C\u0430\u0440.", - "\u0430\u043F\u0440.", - "\u043C\u0430\u0458.", - "\u0458\u0443\u043D.", - "\u0458\u0443\u043B.", - "\u0430\u0432\u0433.", - "\u0441\u0435\u043F\u0442.", - "\u043E\u043A\u0442.", - "\u043D\u043E\u0435\u043C.", - "\u0434\u0435\u043A\u0435\u043C.", - } - MonthNames { - "\u0458\u0430\u043D\u0443\u0430\u0440\u0438", - "\u0444\u0435\u0432\u0440\u0443\u0430\u0440\u0438", - "\u043C\u0430\u0440\u0442", - "\u0430\u043F\u0440\u0438\u043B", - "\u043C\u0430\u0458", - "\u0458\u0443\u043D\u0438", - "\u0458\u0443\u043B\u0438", - "\u0430\u0432\u0433\u0443\u0441\u0442", - "\u0441\u0435\u043F\u0442\u0435\u043C\u0432\u0440\u0438", - "\u043E\u043A\u0442\u043E\u043C\u0432\u0440\u0438", - "\u043D\u043E\u0435\u043C\u0432\u0440\u0438", - "\u0434\u0435\u043A\u0435\u043C\u0432\u0440\u0438", - } NumberElements { ",", ".", @@ -104,4 +40,81 @@ mk { Currencies { MKD { "Den", "MKD" } } + calendar{ + gregorian{ + DateTimeElements:intvector { + 2, + 1, // "Minimal Days in First Week" is unknown. Root value used instead + } + DateTimePatterns{ + "HH:mm:ss z", + "HH:mm:ss z", + "HH:mm:ss", + "HH:mm", + "EEEE, dd MMMM yyyy", + "dd MMMM yyyy", + "dd.M.yyyy", + "dd.M.yy", + "{1} {0}", + } + dayNames{ + format{ + abbreviated{ + "\u043D\u0435\u0434.", + "\u043F\u043E\u043D.", + "\u0432\u0442.", + "\u0441\u0440\u0435.", + "\u0447\u0435\u0442.", + "\u043F\u0435\u0442.", + "\u0441\u0430\u0431.", + } + wide{ + "\u043D\u0435\u0434\u0435\u043B\u0430", + "\u043F\u043E\u043D\u0435\u0434\u0435\u043B\u043D\u0438\u043A", + "\u0432\u0442\u043E\u0440\u043D\u0438\u043A", + "\u0441\u0440\u0435\u0434\u0430", + "\u0447\u0435\u0442\u0432\u0440\u0442\u043E\u043A", + "\u043F\u0435\u0442\u043E\u043A", + "\u0441\u0430\u0431\u043E\u0442\u0430", + } + } + } + eras{ + "\u043F\u0440.\u043D.\u0435.", + "\u0430\u0435.", + } + monthNames{ + format{ + abbreviated{ + "\u0458\u0430\u043D.", + "\u0444\u0435\u0432.", + "\u043C\u0430\u0440.", + "\u0430\u043F\u0440.", + "\u043C\u0430\u0458.", + "\u0458\u0443\u043D.", + "\u0458\u0443\u043B.", + "\u0430\u0432\u0433.", + "\u0441\u0435\u043F\u0442.", + "\u043E\u043A\u0442.", + "\u043D\u043E\u0435\u043C.", + "\u0434\u0435\u043A\u0435\u043C.", + } + wide{ + "\u0458\u0430\u043D\u0443\u0430\u0440\u0438", + "\u0444\u0435\u0432\u0440\u0443\u0430\u0440\u0438", + "\u043C\u0430\u0440\u0442", + "\u0430\u043F\u0440\u0438\u043B", + "\u043C\u0430\u0458", + "\u0458\u0443\u043D\u0438", + "\u0458\u0443\u043B\u0438", + "\u0430\u0432\u0433\u0443\u0441\u0442", + "\u0441\u0435\u043F\u0442\u0435\u043C\u0432\u0440\u0438", + "\u043E\u043A\u0442\u043E\u043C\u0432\u0440\u0438", + "\u043D\u043E\u0435\u043C\u0432\u0440\u0438", + "\u0434\u0435\u043A\u0435\u043C\u0432\u0440\u0438", + } + } + } + } + } } diff --git a/icu4c/source/data/locales/mr.txt b/icu4c/source/data/locales/mr.txt index 10537ac7d39..2f30ae58641 100644 --- a/icu4c/source/data/locales/mr.txt +++ b/icu4c/source/data/locales/mr.txt @@ -155,57 +155,7 @@ mr { Countries { IN { "\u092d\u093e\u0930\u0924" } } - MonthNames { - "\u091c\u093e\u0928\u0947\u0935\u093e\u0930\u0940", - "\u092b\u0947\u092c\u0943\u0935\u093e\u0930\u0940", - "\u092e\u093e\u0930\u094d\u091a", - "\u090f\u092a\u094d\u0930\u093f\u0932", - "\u092e\u0947", - "\u091c\u0942\u0928", - "\u091c\u0941\u0932\u0948", - "\u0913\u0917\u0938\u094d\u091f", - "\u0938\u0947\u092a\u094d\u091f\u0947\u0902\u092c\u0930", - "\u0913\u0915\u094d\u091f\u094b\u092c\u0930", - "\u0928\u094b\u0935\u094d\u0939\u0947\u0902\u092c\u0930", - "\u0921\u093f\u0938\u0947\u0902\u092c\u0930", - } - MonthAbbreviations { - "\u091c\u093e\u0928\u0947\u0935\u093e\u0930\u0940", - "\u092b\u0947\u092c\u0943\u0935\u093e\u0930\u0940", - "\u092e\u093e\u0930\u094d\u091a", - "\u090f\u092a\u094d\u0930\u093f\u0932", - "\u092e\u0947", - "\u091c\u0942\u0928", - "\u091c\u0941\u0932\u0948", - "\u0913\u0917\u0938\u094d\u091f", - "\u0938\u0947\u092a\u094d\u091f\u0947\u0902\u092c\u0930", - "\u0913\u0915\u094d\u091f\u094b\u092c\u0930", - "\u0928\u094b\u0935\u094d\u0939\u0947\u0902\u092c\u0930", - "\u0921\u093f\u0938\u0947\u0902\u092c\u0930", - } - DayNames { - "\u0930\u0935\u093f\u0935\u093e\u0930", - "\u0938\u094b\u092e\u0935\u093e\u0930", - "\u092e\u0902\u0917\u0933\u0935\u093e\u0930", - "\u092c\u0941\u0927\u0935\u093e\u0930", - "\u0917\u0941\u0930\u0941\u0935\u093e\u0930", - "\u0936\u0941\u0915\u094d\u0930\u0935\u093e\u0930", - "\u0936\u0928\u093f\u0935\u093e\u0930" - } - DayAbbreviations{ - "\u0930\u0935\u093f", - "\u0938\u094b\u092e", - "\u092e\u0902\u0917\u0933", - "\u092c\u0941\u0927", - "\u0917\u0941\u0930\u0941", - "\u0936\u0941\u0915\u094d\u0930", - "\u0936\u0928\u093f" - } - AmPmMarkers { - "\u092e.\u092a\u0942.", - "\u092e.\u0928\u0902." - } // Eras { // "BC", @@ -244,6 +194,66 @@ mr { Currencies { INR { "\u0930\u0941", "INR" } } + calendar{ + gregorian{ + AmPmMarkers{ + "\u092e.\u092a\u0942.", + "\u092e.\u0928\u0902." + } + dayNames{ + format{ + abbreviated{ + "\u0930\u0935\u093f", + "\u0938\u094b\u092e", + "\u092e\u0902\u0917\u0933", + "\u092c\u0941\u0927", + "\u0917\u0941\u0930\u0941", + "\u0936\u0941\u0915\u094d\u0930", + "\u0936\u0928\u093f" + } + wide{ + "\u0930\u0935\u093f\u0935\u093e\u0930", + "\u0938\u094b\u092e\u0935\u093e\u0930", + "\u092e\u0902\u0917\u0933\u0935\u093e\u0930", + "\u092c\u0941\u0927\u0935\u093e\u0930", + "\u0917\u0941\u0930\u0941\u0935\u093e\u0930", + "\u0936\u0941\u0915\u094d\u0930\u0935\u093e\u0930", + "\u0936\u0928\u093f\u0935\u093e\u0930" + } + } + } + monthNames{ + format{ + abbreviated{ + "\u091c\u093e\u0928\u0947\u0935\u093e\u0930\u0940", + "\u092b\u0947\u092c\u0943\u0935\u093e\u0930\u0940", + "\u092e\u093e\u0930\u094d\u091a", + "\u090f\u092a\u094d\u0930\u093f\u0932", + "\u092e\u0947", + "\u091c\u0942\u0928", + "\u091c\u0941\u0932\u0948", + "\u0913\u0917\u0938\u094d\u091f", + "\u0938\u0947\u092a\u094d\u091f\u0947\u0902\u092c\u0930", + "\u0913\u0915\u094d\u091f\u094b\u092c\u0930", + "\u0928\u094b\u0935\u094d\u0939\u0947\u0902\u092c\u0930", + "\u0921\u093f\u0938\u0947\u0902\u092c\u0930", + } + wide{ + "\u091c\u093e\u0928\u0947\u0935\u093e\u0930\u0940", + "\u092b\u0947\u092c\u0943\u0935\u093e\u0930\u0940", + "\u092e\u093e\u0930\u094d\u091a", + "\u090f\u092a\u094d\u0930\u093f\u0932", + "\u092e\u0947", + "\u091c\u0942\u0928", + "\u091c\u0941\u0932\u0948", + "\u0913\u0917\u0938\u094d\u091f", + "\u0938\u0947\u092a\u094d\u091f\u0947\u0902\u092c\u0930", + "\u0913\u0915\u094d\u091f\u094b\u092c\u0930", + "\u0928\u094b\u0935\u094d\u0939\u0947\u0902\u092c\u0930", + "\u0921\u093f\u0938\u0947\u0902\u092c\u0930", + } + } + } + } + } } - - diff --git a/icu4c/source/data/locales/mr_IN.txt b/icu4c/source/data/locales/mr_IN.txt index 9839be27917..cbdce48a22b 100644 --- a/icu4c/source/data/locales/mr_IN.txt +++ b/icu4c/source/data/locales/mr_IN.txt @@ -14,19 +14,19 @@ mr_IN { "##,##,##0%", "#E0", } - DateTimePatterns { - "h:mm:ss a z", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", - "EEEE d MMMM yyyy", - "d MMMM yyyy", - "dd-MM-yyyy", - "d-M-yy", - "{1} {0}" + calendar{ + gregorian{ + DateTimePatterns{ + "h:mm:ss a z", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", + "EEEE d MMMM yyyy", + "d MMMM yyyy", + "dd-MM-yyyy", + "d-M-yy", + "{1} {0}" + } + } } -// DateTimeElements { -// "1", -// "1" -// } } diff --git a/icu4c/source/data/locales/ms.txt b/icu4c/source/data/locales/ms.txt index 23de07a6487..520f27296ca 100644 --- a/icu4c/source/data/locales/ms.txt +++ b/icu4c/source/data/locales/ms.txt @@ -91,24 +91,6 @@ ms{ Currencies { MYR { "RM", "Ringgit Malaysia" } } - DayAbbreviations { - "Ahd", - "Isn", - "Sel", - "Rab", - "Kha", - "Jum", - "Sab", - } - DayNames { - "Ahad", - "Isnin", - "Selasa", - "Rabu", - "Khamis", - "Jumaat", - "Sabtu", - } ExemplarCharacters{ "[a-z]" } LocaleScript{ "Latn", // ISO 15924 Name @@ -116,32 +98,62 @@ ms{ Languages { ms { "Bahasa Melayu" } } - MonthAbbreviations { - "Jan", - "Feb", - "Mac", - "Apr", - "Mei", - "Jun", - "Jul", - "Ogos", - "Sep", - "Okt", - "Nov", - "Dis" - } - MonthNames { - "Januari", - "Februari", - "Mac", - "April", - "Mei", - "Jun", - "Julai", - "Ogos", - "September", - "Oktober", - "November", - "Disember" + calendar{ + gregorian{ + dayNames{ + format{ + abbreviated{ + "Ahd", + "Isn", + "Sel", + "Rab", + "Kha", + "Jum", + "Sab", + } + wide{ + "Ahad", + "Isnin", + "Selasa", + "Rabu", + "Khamis", + "Jumaat", + "Sabtu", + } + } + } + monthNames{ + format{ + abbreviated{ + "Jan", + "Feb", + "Mac", + "Apr", + "Mei", + "Jun", + "Jul", + "Ogos", + "Sep", + "Okt", + "Nov", + "Dis" + } + wide{ + "Januari", + "Februari", + "Mac", + "April", + "Mei", + "Jun", + "Julai", + "Ogos", + "September", + "Oktober", + "November", + "Disember" + } + } + } + } } } diff --git a/icu4c/source/data/locales/ms_BN.txt b/icu4c/source/data/locales/ms_BN.txt index eab80868e0f..482670e0169 100644 --- a/icu4c/source/data/locales/ms_BN.txt +++ b/icu4c/source/data/locales/ms_BN.txt @@ -37,4 +37,4 @@ ms_BN{ BND { "$", "BND" } USD { "US$", "USD" } } -} \ No newline at end of file +} diff --git a/icu4c/source/data/locales/ms_MY.txt b/icu4c/source/data/locales/ms_MY.txt index 08de39cbefd..140fc590f00 100644 --- a/icu4c/source/data/locales/ms_MY.txt +++ b/icu4c/source/data/locales/ms_MY.txt @@ -7,17 +7,6 @@ ms_MY { Version{ "1.0" } - DateTimePatterns { - "h:mm:ss a z", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm", - "EEEE dd MMM yyyy", - "dd MMMM yyyy", - "dd MMMM yyyy", - "dd/MM/yyyy", - "{1} {0}", - } NumberPatterns { "#,##0.###;-#,##0.###", @@ -25,4 +14,19 @@ ms_MY { "#,##0%", "#E0", } + calendar{ + gregorian{ + DateTimePatterns{ + "h:mm:ss a z", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm", + "EEEE dd MMM yyyy", + "dd MMMM yyyy", + "dd MMMM yyyy", + "dd/MM/yyyy", + "{1} {0}", + } + } + } } diff --git a/icu4c/source/data/locales/mt.txt b/icu4c/source/data/locales/mt.txt index 1f927b05c03..507bbd6aeda 100644 --- a/icu4c/source/data/locales/mt.txt +++ b/icu4c/source/data/locales/mt.txt @@ -673,59 +673,9 @@ mt { } - MonthNames { // [MSA 200:2003 4.5.1] - Jannar, - Frar, - Marzu, - April, - Mejju, - Ġunju, - Lulju, - Awissu, - Settembru, - Ottubru, - Novembru, - Diċembru - } - MonthAbbreviations { // [MSA 200:2003 4.5.1] - "Jan", - "Fra", - "Mar", - "Apr", - "Mej", - "Ġun", - "Lul", - "Awi", - "Set", - "Ott", - "Nov", - "Diċ" - } - DayNames { // [MSA 200:2003 4.5.1] - "Il-Ħadd", - "It-Tnejn", - "It-Tlieta", - "L-Erbgħa", - "Il-Ħamis", - "Il-Ġimgħa", - "Is-Sibt" - } - Eras { // [MSA 200:2003 4.5.2.5] - "QK", // "Qabel Kristu" - "WK" // "Wara Kristu" - } - DayAbbreviations { // [MSA 200:2003 4.5.1] - "Ħad", - "Tne", - "Tli", - "Erb", - "Ħam", - "Ġim", - "Sib" - } // NumberElements { // Ex: 12,345.67 [MSA 200:2003 4.3 & 4.4] (duplicated in root) // ".", // Decimal Separator @@ -742,24 +692,6 @@ mt { // } -// illum is-Sibt, 01 ta'' Awissu, 1998 :) - DateTimePatterns { // [MSA 200:2003 4.5.4] - "HH:mm:ss z", // needs to be 24 hour - "HH:mm:ss z", - "HH:mm:ss", - "HH:mm", - "EEEE, d 'ta''' MMMM yyyy", // long day with weekday [MSA 200:2003 4.5.2] - "d 'ta''' MMMM yyyy", // - "dd MMM yyyy", - "dd/MM/yyyy", - "{1} {0}" - } - - DateTimeElements:intvector { - 1, // Sunday (il-Hadd) is first day of calendar week - 4 // four days minimal in first week for week numbering [MSA 200:2003 4.5.5, referencing 8601?] - // Monday is first day of workweek. [MSA 200:2003 4.5.5] - } @@ -984,54 +916,85 @@ mt { // TRUE: 'V' 'v' 'veru' // NO: 'L' 'l' 'le' // FALSE: 'F' 'f' 'falz' + calendar{ + gregorian{ + + // illum is-Sibt, 01 ta'' Awissu, 1998 :) + + DateTimeElements:intvector { + 1, // Sunday (il-Hadd) is first day of calendar week + 4 // four days minimal in first week for week numbering [MSA 200:2003 4.5.5, referencing 8601?] + // Monday is first day of workweek. [MSA 200:2003 4.5.5] + } + DateTimePatterns{ + "HH:mm:ss z", // needs to be 24 hour + "HH:mm:ss z", + "HH:mm:ss", + "HH:mm", + "EEEE, d 'ta''' MMMM yyyy", // long day with weekday [MSA 200:2003 4.5.2] + "d 'ta''' MMMM yyyy", // + "dd MMM yyyy", + "dd/MM/yyyy", + "{1} {0}" + } + dayNames{ + format{ + abbreviated{ + "Ħad", + "Tne", + "Tli", + "Erb", + "Ħam", + "Ġim", + "Sib" + } + wide{ + "Il-Ħadd", + "It-Tnejn", + "It-Tlieta", + "L-Erbgħa", + "Il-Ħamis", + "Il-Ġimgħa", + "Is-Sibt" + } + } + } + eras{ + "QK", // "Qabel Kristu" + "WK" // "Wara Kristu" + } + monthNames{ + format{ + abbreviated{ + "Jan", + "Fra", + "Mar", + "Apr", + "Mej", + "Ġun", + "Lul", + "Awi", + "Set", + "Ott", + "Nov", + "Diċ" + } + wide{ + Jannar, + Frar, + Marzu, + April, + Mejju, + Ġunju, + Lulju, + Awissu, + Settembru, + Ottubru, + Novembru, + Diċembru + } + } + } + } + } } - - -// -- BIBLIOGRAPHY -- -// -// ** Maltese Standardization Authority http://www.msa.org.mt - MSA 200:2003 "Maltese Data and Information Requirements on Information and Communication Technology" is now the normative document for this data file. [MSA 200:2003] -// -// Maltese alphabet: grazzi, to Mr. Karmenu Attard -// -// 'colour image's dictionary order (Malta, 1998) -- [CI] -// a b ċ [c] d e f ġ g għ h ħ i ie j k l m n o p q r s t u v w x y z ż -// Only Colour Image's dictionary has 'ie' as a separate letter. -// (that i have seen so far) -// -// Kapt Pawlu Bugeja's dizzunarju -// (Kelmet il-Malti) [Grima: Marsa, Malta, 1990) - the orange one -- [Kelmet] -// -- same order, but lists ż before z -// -// Lydia Sciriha seems to use the order 'g ġ għ' but 'z ż' in -- [BM] -// Beginning Maltese (Uni ta' Malta, 1996) in the lessons, -// but in the word list (at back) it's 'ġ g għ' and 'ż z' [1st ed.] -// -// J. Aquilina in his 'Teach Yourself:Maltese' book -- [Ty] -// (London: Hodder Headline, 1965 and Chicago, NTC Publishing 1995) -// uses the very different 'ġ g h ħ ... n għ o .. x ż z' ordering, -// placing għ between n and o. (I have heard this is to be similar to the -// Arabic ordering) -// -// Casha, Charles: 'Kun Af - aktar dwar ilsienna' -- [KA] -// (Blata l-Bajda, Malta: Merlin Library Ltd., 1987) - -// CREDITS: above sources and also.. -// - Mirka Mifsud Bonnici for much of the initial translation/inspiration -// - Karmenu Attard -// - MaxMan (Manuel) -// - Ramon Casha -// - Angelo Dalli ( Major updates to ISO lang/country codes) -// - in - in-nazzjon -// - lo - l-orrizont - -// TODO: number spellout needs update - -// Change Log -//2003-11-11 srl v2.1 Continuing update for MSA 200:2003 compliance. -//2003-10-18 srl v2.0 Updating for MSA 200:2003 compliance -//2003-04-17 srl 0.11.0 Updates to be closer to DMS MSA:200-2003 (www.msa.org.mt) (DRAFT standard) -//2001-11-15 srl 0.9.4 MAJOR updates to ISO lang/cty codes from Angelo, -// Number spellout, etc.. -//2001-01-02 srl 0.9.2 Converted to UTF-8. Added: AE/GM/NI/OM/PH/SA/KW -//2000-10-09 gr 0.9.1 [shipped in ICU 1.7] -//2000-07-20 srl 0.9.0 diff --git a/icu4c/source/data/locales/nb.txt b/icu4c/source/data/locales/nb.txt index cf79901de77..0757eefdfbd 100644 --- a/icu4c/source/data/locales/nb.txt +++ b/icu4c/source/data/locales/nb.txt @@ -253,43 +253,7 @@ nb { Currencies { NOK { "kr", "NOK" } } - DateTimeElements:intvector { - 2, - 4, - } - DateTimePatterns { - "'kl. 'HH.mm.ss z", - "HH.mm.ss z", - "HH.mm.ss", - "HH.mm", - "EEEE d. MMMM yyyy", - "d. MMMM yyyy", - "d. MMM. yyyy", - "dd.MM.yy", - "{1} {0}", - } - DayAbbreviations { - "s\u00F8", - "ma", - "ti", - "on", - "to", - "fr", - "l\u00F8", - } - DayNames { - "s\u00F8ndag", - "mandag", - "tirsdag", - "onsdag", - "torsdag", - "fredag", - "l\u00F8rdag", - } - Eras { - "f.Kr.", - "e.Kr.", - } + Languages { af { "afrikaans" } am { "amharisk" } @@ -366,34 +330,6 @@ nb { LocaleScript{ "Latn", // ISO 15924 Name } - MonthAbbreviations { - "jan", - "feb", - "mar", - "apr", - "mai", - "jun", - "jul", - "aug", - "sep", - "okt", - "nov", - "des", - } - MonthNames { - "januar", - "februar", - "mars", - "april", - "mai", - "juni", - "juli", - "august", - "september", - "oktober", - "november", - "desember", - } NumberElements { ",", "\u00A0", @@ -426,4 +362,104 @@ nb { REVISED { "Revidert" } } + calendar{ + gregorian{ + DateTimeElements:intvector { + 2, + 4, + } + DateTimePatterns{ + "'kl. 'HH.mm.ss z", + "HH.mm.ss z", + "HH.mm.ss", + "HH.mm", + "EEEE d. MMMM yyyy", + "d. MMMM yyyy", + "d. MMM. yyyy", + "dd.MM.yy", + "{1} {0}", + } + dayNames{ + format{ + abbreviated{ + "s\u00F8", + "ma", + "ti", + "on", + "to", + "fr", + "l\u00F8", + } + narrow{ + "S", + "M", + "T", + "O", + "T", + "F", + "L", + } + wide{ + "s\u00F8ndag", + "mandag", + "tirsdag", + "onsdag", + "torsdag", + "fredag", + "l\u00F8rdag", + } + } + } + eras{ + "f.Kr.", + "e.Kr.", + } + monthNames{ + format{ + abbreviated{ + "jan", + "feb", + "mar", + "apr", + "mai", + "jun", + "jul", + "aug", + "sep", + "okt", + "nov", + "des", + } + narrow{ + "J", + "F", + "M", + "A", + "M", + "J", + "J", + "A", + "S", + "O", + "N", + "D", + } + wide{ + "januar", + "februar", + "mars", + "april", + "mai", + "juni", + "juli", + "august", + "september", + "oktober", + "november", + "desember", + } + } + } + } + } } diff --git a/icu4c/source/data/locales/nl.txt b/icu4c/source/data/locales/nl.txt index 8dd307146f8..53ca5e92d5a 100644 --- a/icu4c/source/data/locales/nl.txt +++ b/icu4c/source/data/locales/nl.txt @@ -255,43 +255,7 @@ nl { BEF { "BF", "BEF" } NLG { "fl", "NLG" } } - DateTimeElements:intvector { - 2, - 4, - } - DateTimePatterns { - "H:mm:ss' uur' z", - "H:mm:ss z", - "H:mm:ss", - "H:mm", - "EEEE d MMMM yyyy", - "d MMMM yyyy", - "d-MMM-yyyy", - "d-M-yy", - "{1} {0}", - } - DayAbbreviations { - "zo", - "ma", - "di", - "wo", - "do", - "vr", - "za", - } - DayNames { - "zondag", - "maandag", - "dinsdag", - "woensdag", - "donderdag", - "vrijdag", - "zaterdag", - } - Eras { - "v. Chr.", // voor Christus - "n. Chr.", // na Christus - } + ExemplarCharacters { "[a-z\u00e1\u00e9\u00ed\u00f3\u00fa\u00e4\u00eb\u00ef\u00f6\u00fc\u0133]" } Languages { //af { "Afrikaans" } @@ -368,34 +332,6 @@ nl { LocaleScript { "Latn", // ISO 15924 Name } - MonthAbbreviations { - "jan", - "feb", - "mrt", - "apr", - "mei", - "jun", - "jul", - "aug", - "sep", - "okt", - "nov", - "dec", - } - MonthNames { - "januari", - "februari", - "maart", - "april", - "mei", - "juni", - "juli", - "augustus", - "september", - "oktober", - "november", - "december", - } NumberElements { ",", ".", @@ -412,58 +348,7 @@ nl { "+", } - // International Calendars Data. - // NOTE (ICU 2.6) - the format of this data WILL CHANGE in future releases. - // Islamic calendar - Eras_islamic:array { - "Sa'na Hizjria" - } - MonthNames_islamic:array { - "Moeharram", // Muharram - "Safar", // Safar - "Rabi'a al awal", // Rabi' al-awwal - "Rabi'a al thani", // Rabi' al-thani - "Joemad'al awal", // Jumada al-awwal - "Joemad'al thani", // Jumada al-thani - "Rajab", // Rajab - "Sja'aban", // Sha'ban - "Ramadan", // Ramadan - "Sjawal", // Shawwal - "Doe al ka'aba", // Dhu al-Qi'dah - "Doe al hizja", // Dhu al-Hijjah - } - MonthAbbreviations_islamic:alias { // same as MonthNames (no data) - "nl/MonthNames_islamic" - } - // Civil is identical other than in calculations - Eras_islamic-civil:alias { - "nl/Eras_islamic" - } - MonthNames_islamic-civil:alias { - "nl/MonthNames_islamic" - } - MonthAbbreviations_islamic-civil:alias { - "nl/MonthAbbreviations_islamic" - } - MonthNames_hebrew { - "Tisjrie", // Tishri - "Chesjwan", // Heshvan - "Kislev", // Kislev - "Tevet", // Tevet - "Sjevat", // Shevat - "Adar", // Adar I - "Adar B", // Adar - "Nisan", // Nisan - "Ijar", // Iyar - "Sivan", // Sivan - "Tammoez", // Tamuz - "Av", // Av - "Elloel", // Elul - } - MonthAbbreviations_hebrew:alias { - "nl/MonthNames_hebrew" // no data - } //------------------------------------------------------------ // Rule Based Number Format Support @@ -504,4 +389,158 @@ nl { Variants{ REVISED { "Gewijzigd" } } + calendar{ + islamic{ + // Islamic calendar + eras:array { + "Sa'na Hizjria" + } + monthNames{ + format{ + abrreviated:alias{ + "nl/calendar/islamic/monthNames/format/wide" + } + wide:array { + "Moeharram", // Muharram + "Safar", // Safar + "Rabi'a al awal", // Rabi' al-awwal + "Rabi'a al thani", // Rabi' al-thani + "Joemad'al awal", // Jumada al-awwal + "Joemad'al thani", // Jumada al-thani + "Rajab", // Rajab + "Sja'aban", // Sha'ban + "Ramadan", // Ramadan + "Sjawal", // Shawwal + "Doe al ka'aba", // Dhu al-Qi'dah + "Doe al hizja", // Dhu al-Hijjah + } + } + } + } + islamic-civil:alias{ + "nl/calendar/islamic" + } + gregorian{ + DateTimeElements:intvector { + 2, + 4, + } + DateTimePatterns{ + "H:mm:ss' uur' z", + "H:mm:ss z", + "H:mm:ss", + "H:mm", + "EEEE d MMMM yyyy", + "d MMMM yyyy", + "d-MMM-yyyy", + "d-M-yy", + "{1} {0}", + } + dayNames{ + format{ + abbreviated{ + "zo", + "ma", + "di", + "wo", + "do", + "vr", + "za", + } + narrow{ + "Z", + "M", + "D", + "W", + "D", + "V", + "Z", + } + wide{ + "zondag", + "maandag", + "dinsdag", + "woensdag", + "donderdag", + "vrijdag", + "zaterdag", + } + } + } + eras{ + "v. Chr.", // voor Christus + "n. Chr.", // na Christus + } + monthNames{ + format{ + abbreviated{ + "jan", + "feb", + "mrt", + "apr", + "mei", + "jun", + "jul", + "aug", + "sep", + "okt", + "nov", + "dec", + } + narrow{ + "J", + "F", + "M", + "A", + "M", + "J", + "J", + "A", + "S", + "O", + "N", + "D", + } + wide{ + "januari", + "februari", + "maart", + "april", + "mei", + "juni", + "juli", + "augustus", + "september", + "oktober", + "november", + "december", + } + } + } + } + hebrew{ + monthNames{ + format{ + abbreviated:alias{ + "nl/calendar/hebrew/monthNames/format/wide" + } + wide{ + "Tisjrie", // Tishri + "Chesjwan", // Heshvan + "Kislev", // Kislev + "Tevet", // Tevet + "Sjevat", // Shevat + "Adar", // Adar I + "Adar B", // Adar + "Nisan", // Nisan + "Ijar", // Iyar + "Sivan", // Sivan + "Tammoez", // Tamuz + "Av", // Av + "Elloel", // Elul + } + } + } + } + } } diff --git a/icu4c/source/data/locales/nl_BE.txt b/icu4c/source/data/locales/nl_BE.txt index 59d3d2a738a..5f3484a5f80 100644 --- a/icu4c/source/data/locales/nl_BE.txt +++ b/icu4c/source/data/locales/nl_BE.txt @@ -7,21 +7,7 @@ nl_BE { Version{ "2.0" } - DateTimeElements:intvector { - 2, - 1, - } - DateTimePatterns { - "HH.mm' u. 'z", - "HH:mm:ss z", - "HH:mm:ss", - "HH:mm", - "EEEE d MMMM yyyy", - "d MMMM yyyy", - "d-MMM-yy", - "d/MM/yy", - "{1} {0}", - } + NumberPatterns { "#,##0.###;-#,##0.###", "#,##0.00 \u00A4;-#,##0.00 \u00A4", @@ -29,4 +15,23 @@ nl_BE { "#E0", } + calendar{ + gregorian{ + DateTimeElements:intvector { + 2, + 1, + } + DateTimePatterns{ + "HH.mm' u. 'z", + "HH:mm:ss z", + "HH:mm:ss", + "HH:mm", + "EEEE d MMMM yyyy", + "d MMMM yyyy", + "d-MMM-yy", + "d/MM/yy", + "{1} {0}", + } + } + } } diff --git a/icu4c/source/data/locales/nn.txt b/icu4c/source/data/locales/nn.txt index 48fc48c9787..a0f853da9c8 100644 --- a/icu4c/source/data/locales/nn.txt +++ b/icu4c/source/data/locales/nn.txt @@ -15,43 +15,7 @@ nn{ Currencies { NOK { "kr", "NOK" } } - DateTimeElements:intvector { - 2, - 4, - } - DateTimePatterns { - "'kl. 'HH.mm.ss z", - "HH.mm.ss z", - "HH.mm.ss", - "HH.mm", - "EEEE d. MMMM yyyy", - "d. MMMM yyyy", - "d. MMM. yyyy", - "dd.MM.yy", - "{1} {0}", - } - DayAbbreviations { - "su", - "m\u00E5", - "ty", - "on", - "to", - "fr", - "la", - } - DayNames { - "sundag", - "m\u00E5ndag", - "tysdag", - "onsdag", - "torsdag", - "fredag", - "laurdag", - } - Eras { - "f.Kr.", - "e.Kr.", - } + Languages { nb { "norsk bokm\u00E5l" } nn { "norsk nynorsk" } @@ -61,34 +25,6 @@ nn{ LocaleScript{ "Latn", // ISO 15924 Name } - MonthAbbreviations { - "jan", - "feb", - "mar", - "apr", - "mai", - "jun", - "jul", - "aug", - "sep", - "okt", - "nov", - "des", - } - MonthNames { - "januar", - "februar", - "mars", - "april", - "mai", - "juni", - "juli", - "august", - "september", - "oktober", - "november", - "desember", - } NumberElements { ",", "\u00A0", @@ -105,4 +41,81 @@ nn{ "+", } + calendar{ + gregorian{ + DateTimeElements:intvector { + 2, + 4, + } + DateTimePatterns{ + "'kl. 'HH.mm.ss z", + "HH.mm.ss z", + "HH.mm.ss", + "HH.mm", + "EEEE d. MMMM yyyy", + "d. MMMM yyyy", + "d. MMM. yyyy", + "dd.MM.yy", + "{1} {0}", + } + dayNames{ + format{ + abbreviated{ + "su", + "m\u00E5", + "ty", + "on", + "to", + "fr", + "la", + } + wide{ + "sundag", + "m\u00E5ndag", + "tysdag", + "onsdag", + "torsdag", + "fredag", + "laurdag", + } + } + } + eras{ + "f.Kr.", + "e.Kr.", + } + monthNames{ + format{ + abbreviated{ + "jan", + "feb", + "mar", + "apr", + "mai", + "jun", + "jul", + "aug", + "sep", + "okt", + "nov", + "des", + } + wide{ + "januar", + "februar", + "mars", + "april", + "mai", + "juni", + "juli", + "august", + "september", + "oktober", + "november", + "desember", + } + } + } + } + } } diff --git a/icu4c/source/data/locales/om.txt b/icu4c/source/data/locales/om.txt index 773f0f59443..e5792e1600a 100644 --- a/icu4c/source/data/locales/om.txt +++ b/icu4c/source/data/locales/om.txt @@ -17,61 +17,8 @@ om { Version{ "2.0" } - DayAbbreviations { - "Dil", - "Wix", - "Qib", - "Rob", - "Kam", - "Jim", - "San", - } - DayNames { - "Dilbata", - "Wiixata", - "Qibxata", - "Roobii", - "Kamiisa", - "Jimaata", - "Sanbata", - } // LanguageLibraryUse { "orm" } - MonthAbbreviations { - "Ama", - "Gur", - "Bit", - "Elb", - "Cam", - "Wax", - "Ado", - "Hag", - "Ful", - "Onk", - "Sad", - "Mud", - } - MonthNames { - "Amajjii", - "Guraandhala", - "Bitooteessa", - "Elba", - "Caamsa", - "Waxabajjii", - "Adooleessa", - "Hagayya", - "Fuulbana", - "Onkololeessa", - "Sadaasa", - "Muddee", - } - Eras { - "KD", // KD = Kiristoos Dura = Before Christ - "KB", // KB = Kiristoos Booda = After Christ - } - DateTimeElements:intvector { - 7, - 1, - } + Languages { om { "Oromoo" } } @@ -90,4 +37,70 @@ om { ExemplarCharacters{ "[a-z]" } + calendar{ + gregorian{ + DateTimeElements:intvector { + 7, + 1, + } + dayNames{ + format{ + abbreviated{ + "Dil", + "Wix", + "Qib", + "Rob", + "Kam", + "Jim", + "San", + } + wide{ + "Dilbata", + "Wiixata", + "Qibxata", + "Roobii", + "Kamiisa", + "Jimaata", + "Sanbata", + } + } + } + eras{ + "KD", // KD = Kiristoos Dura = Before Christ + "KB", // KB = Kiristoos Booda = After Christ + } + monthNames{ + format{ + abbreviated{ + "Ama", + "Gur", + "Bit", + "Elb", + "Cam", + "Wax", + "Ado", + "Hag", + "Ful", + "Onk", + "Sad", + "Mud", + } + wide{ + "Amajjii", + "Guraandhala", + "Bitooteessa", + "Elba", + "Caamsa", + "Waxabajjii", + "Adooleessa", + "Hagayya", + "Fuulbana", + "Onkololeessa", + "Sadaasa", + "Muddee", + } + } + } + } + } } diff --git a/icu4c/source/data/locales/om_ET.txt b/icu4c/source/data/locales/om_ET.txt index 9a38030e825..4f22587cc26 100644 --- a/icu4c/source/data/locales/om_ET.txt +++ b/icu4c/source/data/locales/om_ET.txt @@ -17,21 +17,6 @@ om_ET { Version{ "2.0" } - AmPmMarkers { - "WD", // WD = Waaree Dura - "WB", // WD = Waaree Booda - } - DateTimePatterns { - "h:mm:ss a", - "h:mm:ss a", - "h:mm:ss a", - "h:mm a", - "EEEE, MMMM d, yyyy", - "dd MMMM yyyy", - "dd-MMM-yy", - "dd/MM/yy", - "{1} {0}", - } // Measurement { "Metric" } // NumberElements { // ".", @@ -62,4 +47,23 @@ om_ET { Currencies { ETB { "$", "ETB" } } + calendar{ + gregorian{ + AmPmMarkers{ + "WD", // WD = Waaree Dura + "WB", // WD = Waaree Booda + } + DateTimePatterns{ + "h:mm:ss a", + "h:mm:ss a", + "h:mm:ss a", + "h:mm a", + "EEEE, MMMM d, yyyy", + "dd MMMM yyyy", + "dd-MMM-yy", + "dd/MM/yy", + "{1} {0}", + } + } + } } diff --git a/icu4c/source/data/locales/om_KE.txt b/icu4c/source/data/locales/om_KE.txt index 710c4657ce2..eeb6d3fe22b 100644 --- a/icu4c/source/data/locales/om_KE.txt +++ b/icu4c/source/data/locales/om_KE.txt @@ -17,21 +17,6 @@ om_KE { Version{ "2.0" } - AmPmMarkers { - "WD", // WD = Waaree Dura - "WB", // WD = Waaree Booda - } - DateTimePatterns { - "h:mm:ss a", - "h:mm:ss a", - "h:mm:ss a", - "h:mm a", - "EEEE, MMMM d, yyyy", - "dd MMMM yyyy", - "dd-MMM-yy", - "dd/MM/yy", - "{1} {0}", - } // Measurement { "Metric" } // NumberElements { // ".", @@ -57,4 +42,23 @@ om_KE { // Width { "210" } // Units { "mm" } // } + calendar{ + gregorian{ + AmPmMarkers{ + "WD", // WD = Waaree Dura + "WB", // WD = Waaree Booda + } + DateTimePatterns{ + "h:mm:ss a", + "h:mm:ss a", + "h:mm:ss a", + "h:mm a", + "EEEE, MMMM d, yyyy", + "dd MMMM yyyy", + "dd-MMM-yy", + "dd/MM/yy", + "{1} {0}", + } + } + } } diff --git a/icu4c/source/data/locales/pa.txt b/icu4c/source/data/locales/pa.txt index bc520bf4074..1083386b3ff 100644 --- a/icu4c/source/data/locales/pa.txt +++ b/icu4c/source/data/locales/pa.txt @@ -13,59 +13,9 @@ pa { Countries { IN { "\u0A2D\u0A3E\u0A30\u0A24" } } - AmPmMarkers{ - "\u0A38\u0A35\u0A47\u0A30\u0A47", - "\u0A36\u0A3E\u0A2E" - } - DayNames{ - "\u0A10\u0A24\u0A35\u0A3E\u0A30", - "\u0A38\u0A4B\u0A2E\u0A35\u0A3E\u0A30", - "\u0A2E\u0A70\u0A17\u0A32\u0A35\u0A3E\u0A30", - "\u0A2C\u0A41\u0A27\u0A35\u0A3E\u0A30", - "\u0A35\u0A40\u0A30\u0A35\u0A3E\u0A30", - "\u0A36\u0A41\u0A71\u0A15\u0A30\u0A35\u0A3E\u0A30", - "\u0A36\u0A28\u0A40\u0A1A\u0A30\u0A35\u0A3E\u0A30" - } - DayAbbreviations{ - "\u0A10\u0A24.", - "\u0A38\u0A4B\u0A2E.", - "\u0A2E\u0A70\u0A17\u0A32.", - "\u0A2C\u0A41\u0A27.", - "\u0A35\u0A40\u0A30.", - "\u0A36\u0A41\u0A15\u0A30.", - "\u0A36\u0A28\u0A40." - } - MonthNames{ - "\u0A1C\u0A28\u0A35\u0A30\u0A40", - "\u0A5E\u0A30\u0A35\u0A30\u0A40", - "\u0A2E\u0A3E\u0A30\u0A1A", - "\u0A05\u0A2A\u0A4D\u0A30\u0A48\u0A32", - "\u0A2E\u0A08", - "\u0A1C\u0A42\u0A28", - "\u0A1C\u0A41\u0A32\u0A3E\u0A08", - "\u0A05\u0A17\u0A38\u0A24", - "\u0A38\u0A24\u0A70\u0A2C\u0A30", - "\u0A05\u0A15\u0A24\u0A42\u0A2C\u0A30", - "\u0A28\u0A35\u0A70\u0A2C\u0A30", - "\u0A26\u0A38\u0A70\u0A2C\u0A30", - } - MonthAbbreviations{ - "\u0A1C\u0A28\u0A35\u0A30\u0A40", - "\u0A5E\u0A30\u0A35\u0A30\u0A40", - "\u0A2E\u0A3E\u0A30\u0A1A", - "\u0A05\u0A2A\u0A4D\u0A30\u0A48\u0A32", - "\u0A2E\u0A08", - "\u0A1C\u0A42\u0A28", - "\u0A1C\u0A41\u0A32\u0A3E\u0A08", - "\u0A05\u0A17\u0A38\u0A24", - "\u0A38\u0A24\u0A70\u0A2C\u0A30", - "\u0A05\u0A15\u0A24\u0A42\u0A2C\u0A30", - "\u0A28\u0A35\u0A70\u0A2C\u0A30", - "\u0A26\u0A38\u0A70\u0A2C\u0A30", - } NumberElements{ ".", @@ -94,4 +44,66 @@ pa { LocaleScript:array { "Guru" } ExemplarCharacters { "[[:Guru:]\u200c\u200d]" } + calendar{ + gregorian{ + AmPmMarkers{ + "\u0A38\u0A35\u0A47\u0A30\u0A47", + "\u0A36\u0A3E\u0A2E" + } + dayNames{ + format{ + abbreviated{ + "\u0A10\u0A24.", + "\u0A38\u0A4B\u0A2E.", + "\u0A2E\u0A70\u0A17\u0A32.", + "\u0A2C\u0A41\u0A27.", + "\u0A35\u0A40\u0A30.", + "\u0A36\u0A41\u0A15\u0A30.", + "\u0A36\u0A28\u0A40." + } + wide{ + "\u0A10\u0A24\u0A35\u0A3E\u0A30", + "\u0A38\u0A4B\u0A2E\u0A35\u0A3E\u0A30", + "\u0A2E\u0A70\u0A17\u0A32\u0A35\u0A3E\u0A30", + "\u0A2C\u0A41\u0A27\u0A35\u0A3E\u0A30", + "\u0A35\u0A40\u0A30\u0A35\u0A3E\u0A30", + "\u0A36\u0A41\u0A71\u0A15\u0A30\u0A35\u0A3E\u0A30", + "\u0A36\u0A28\u0A40\u0A1A\u0A30\u0A35\u0A3E\u0A30" + } + } + } + monthNames{ + format{ + abbreviated{ + "\u0A1C\u0A28\u0A35\u0A30\u0A40", + "\u0A5E\u0A30\u0A35\u0A30\u0A40", + "\u0A2E\u0A3E\u0A30\u0A1A", + "\u0A05\u0A2A\u0A4D\u0A30\u0A48\u0A32", + "\u0A2E\u0A08", + "\u0A1C\u0A42\u0A28", + "\u0A1C\u0A41\u0A32\u0A3E\u0A08", + "\u0A05\u0A17\u0A38\u0A24", + "\u0A38\u0A24\u0A70\u0A2C\u0A30", + "\u0A05\u0A15\u0A24\u0A42\u0A2C\u0A30", + "\u0A28\u0A35\u0A70\u0A2C\u0A30", + "\u0A26\u0A38\u0A70\u0A2C\u0A30", + } + wide{ + "\u0A1C\u0A28\u0A35\u0A30\u0A40", + "\u0A5E\u0A30\u0A35\u0A30\u0A40", + "\u0A2E\u0A3E\u0A30\u0A1A", + "\u0A05\u0A2A\u0A4D\u0A30\u0A48\u0A32", + "\u0A2E\u0A08", + "\u0A1C\u0A42\u0A28", + "\u0A1C\u0A41\u0A32\u0A3E\u0A08", + "\u0A05\u0A17\u0A38\u0A24", + "\u0A38\u0A24\u0A70\u0A2C\u0A30", + "\u0A05\u0A15\u0A24\u0A42\u0A2C\u0A30", + "\u0A28\u0A35\u0A70\u0A2C\u0A30", + "\u0A26\u0A38\u0A70\u0A2C\u0A30", + } + } + } + } + } } diff --git a/icu4c/source/data/locales/pa_IN.txt b/icu4c/source/data/locales/pa_IN.txt index d5ae4023cc1..16867a3884b 100644 --- a/icu4c/source/data/locales/pa_IN.txt +++ b/icu4c/source/data/locales/pa_IN.txt @@ -7,25 +7,26 @@ pa_IN { Version { "1.0" } - DateTimePatterns { - "hh:mm:ss a z", - "hh:mm:ss a z", - "hh:mm:ss a", - "hh:mm a", - "EEEE d MMMM yyyy", - "d MMMM yyyy", - "dd-MM-yyyy", - "d-M-yy", - "{1} {0}" - } -// DateTimeElements:intvector { -// 1, -// 1 -// } + NumberPatterns { "##,##,##0.###;-##,##,##0.###", "\u00A4##,##,##0.00;-\u00A4##,##,##0.00", "##,##,##0%", "#E0", } -} \ No newline at end of file + calendar{ + gregorian{ + DateTimePatterns{ + "hh:mm:ss a z", + "hh:mm:ss a z", + "hh:mm:ss a", + "hh:mm a", + "EEEE d MMMM yyyy", + "d MMMM yyyy", + "dd-MM-yyyy", + "d-M-yy", + "{1} {0}" + } + } + } +} diff --git a/icu4c/source/data/locales/pl.txt b/icu4c/source/data/locales/pl.txt index d9b43b89d98..1180375f0c7 100644 --- a/icu4c/source/data/locales/pl.txt +++ b/icu4c/source/data/locales/pl.txt @@ -249,43 +249,7 @@ pl { //ZM { "Zambia" } //ZW { "Zimbabwe" } } - DateTimeElements:intvector { - 2, - 1, - } - DateTimePatterns { - "HH:mm:ss z", - "HH:mm:ss z", - "HH:mm:ss", - "HH:mm", - "EEEE, d MMMM yyyy", - "d MMMM yyyy", - "yyyy-MM-dd", - "yy-MM-dd", - "{1} {0}", - } - DayAbbreviations { - "N", - "Pn", - "Wt", - "\u015Ar", - "Cz", - "Pt", - "So", - } - DayNames { - "niedziela", - "poniedzia\u0142ek", - "wtorek", - "\u015Broda", - "czwartek", - "pi\u0105tek", - "sobota", - } - Eras { - "p.n.e.", - "n.e.", - } + Languages { ar { "arabski" } bg { "bu\u0142garski" } @@ -320,34 +284,6 @@ pl { //zh_cn { "chi\u0144ski (uproszczony)" } //zh_tw { "chi\u0144ski (tradycyjny)" } } - MonthAbbreviations { - "sty", - "lut", - "mar", - "kwi", - "maj", - "cze", - "lip", - "sie", - "wrz", - "pa\u017A", - "lis", - "gru", - } - MonthNames { - "stycze\u0144", - "luty", - "marzec", - "kwiecie\u0144", - "maj", - "czerwiec", - "lipiec", - "sierpie\u0144", - "wrzesie\u0144", - "pa\u017Adziernik", - "listopad", - "grudzie\u0144", - } NumberElements { ",", "\u00A0", @@ -406,4 +342,81 @@ pl { Currencies { PLN { "z\u0142", "PLN" } } + calendar{ + gregorian{ + DateTimeElements:intvector { + 2, + 1, + } + DateTimePatterns{ + "HH:mm:ss z", + "HH:mm:ss z", + "HH:mm:ss", + "HH:mm", + "EEEE, d MMMM yyyy", + "d MMMM yyyy", + "yyyy-MM-dd", + "yy-MM-dd", + "{1} {0}", + } + dayNames{ + format{ + abbreviated{ + "N", + "Pn", + "Wt", + "\u015Ar", + "Cz", + "Pt", + "So", + } + wide{ + "niedziela", + "poniedzia\u0142ek", + "wtorek", + "\u015Broda", + "czwartek", + "pi\u0105tek", + "sobota", + } + } + } + eras{ + "p.n.e.", + "n.e.", + } + monthNames{ + format{ + abbreviated{ + "sty", + "lut", + "mar", + "kwi", + "maj", + "cze", + "lip", + "sie", + "wrz", + "pa\u017A", + "lis", + "gru", + } + wide{ + "stycze\u0144", + "luty", + "marzec", + "kwiecie\u0144", + "maj", + "czerwiec", + "lipiec", + "sierpie\u0144", + "wrzesie\u0144", + "pa\u017Adziernik", + "listopad", + "grudzie\u0144", + } + } + } + } + } } diff --git a/icu4c/source/data/locales/ps.txt b/icu4c/source/data/locales/ps.txt index c4adc31dc06..578524744d2 100644 --- a/icu4c/source/data/locales/ps.txt +++ b/icu4c/source/data/locales/ps.txt @@ -12,10 +12,6 @@ ps { // The default clock is 24-hour time. abbreviations for AM/PM are not // widespread, but forms are given here in case they are required. - AmPmMarkers { - "\u063a.\u0645.", - "\u063a.\u0648.", - } Countries { AF { "\u0627\u0641\u063a\u0627\u0646\u0633\u062a\u0627\u0646" } AL { "\u0627\u0644\u0628\u0627\u0646\u06cc\u0647" } @@ -87,35 +83,6 @@ ps { AFA { "\u0627\u0641\u063a\u0627\u0646\u06cd", "\u0627\u0641\u063a\u0627\u0646\u06cd" } } - DateTimePatterns { - "H:mm:ss (z)", - "H:mm:ss (z)", - "H:mm:ss", - "H:mm", - "EEEE \u062f yyyy \u062f MMMM d", - "\u062f yyyy \u062f MMMM d", - "d MMMM yyyy", - "yyyy/M/d", - "{1} {0}", - } - DayAbbreviations { - "\u06cc.", - "\u062f.", - "\u0633.", - "\u0686.", - "\u067e.", - "\u062c.", - "\u0634.", - } - DayNames { - "\u06cc\u06a9\u0634\u0646\u0628\u0647", - "\u062f\u0648\u0634\u0646\u0628\u0647", - "\u0633\u0647\u200c\u0634\u0646\u0628\u0647", - "\u0686\u0647\u0627\u0631\u0634\u0646\u0628\u0647", //MoE, MoIC, and PED say "\u0686\u0627\u0631" instead of "\u0686\u0647\u0627\u0631" - "\u067e\u0646\u062c\u0634\u0646\u0628\u0647", - "\u062c\u0645\u0639\u0647", - "\u0634\u0646\u0628\u0647", - } Eras { "\u0642.\u0645.", "\u0645.", @@ -162,35 +129,6 @@ ps { "Arab" } - MonthNames { - //FIXME: check all these with PED. - "\u062c\u0646\u0648\u0631\u064a", - "\u0641\u0628\u0631\u0648\u0631\u064a", - "\u0645\u0627\u0631\u0686", - "\u0627\u067e\u0631\u06cc\u0644", - "\u0645\u06cc", // MoE and PED say "\u0645\u06d0" - "\u062c\u0648\u0646", - "\u062c\u0648\u0644\u0627\u06cc", - "\u0627\u06ab\u0633\u062a", - "\u0633\u067e\u062a\u0645\u0628\u0631", - "\u0627\u06a9\u062a\u0648\u0628\u0631", - "\u0646\u0648\u0645\u0628\u0631", - "\u062f\u0633\u0645\u0628\u0631", - } - MonthAbbreviations { - "\u062c\u0646\u0648", - "\u0641\u0628\u0631", - "\u0645\u0627\u0631", - "\u0627\u067e\u0631", - "\u0645\u0640\u06cc", - "\u062c\u0648\u0646", - "\u062c\u0648\u0644", - "\u0627\u06ab\u0633", - "\u0633\u067e\u062a", - "\u0627\u06a9\u062a", - "\u0646\u0648\u0645", - "\u062f\u0633\u0645", - } zoneStrings { { @@ -202,4 +140,78 @@ ps { "\u06a9\u0627\u0628\u0644", } } + calendar{ + gregorian{ + AmPmMarkers{ + "\u063a.\u0645.", + "\u063a.\u0648.", + } + DateTimePatterns{ + "H:mm:ss (z)", + "H:mm:ss (z)", + "H:mm:ss", + "H:mm", + "EEEE \u062f yyyy \u062f MMMM d", + "\u062f yyyy \u062f MMMM d", + "d MMMM yyyy", + "yyyy/M/d", + "{1} {0}", + } + dayNames{ + format{ + abbreviated{ + "\u06cc.", + "\u062f.", + "\u0633.", + "\u0686.", + "\u067e.", + "\u062c.", + "\u0634.", + } + wide{ + "\u06cc\u06a9\u0634\u0646\u0628\u0647", + "\u062f\u0648\u0634\u0646\u0628\u0647", + "\u0633\u0647\u200c\u0634\u0646\u0628\u0647", + "\u0686\u0647\u0627\u0631\u0634\u0646\u0628\u0647", //MoE, MoIC, and PED say "\u0686\u0627\u0631" instead of "\u0686\u0647\u0627\u0631" + "\u067e\u0646\u062c\u0634\u0646\u0628\u0647", + "\u062c\u0645\u0639\u0647", + "\u0634\u0646\u0628\u0647", + } + } + } + monthNames{ + format{ + abbreviated{ + "\u062c\u0646\u0648", + "\u0641\u0628\u0631", + "\u0645\u0627\u0631", + "\u0627\u067e\u0631", + "\u0645\u0640\u06cc", + "\u062c\u0648\u0646", + "\u062c\u0648\u0644", + "\u0627\u06ab\u0633", + "\u0633\u067e\u062a", + "\u0627\u06a9\u062a", + "\u0646\u0648\u0645", + "\u062f\u0633\u0645", + } + wide{ + //FIXME: check all these with PED. + "\u062c\u0646\u0648\u0631\u064a", + "\u0641\u0628\u0631\u0648\u0631\u064a", + "\u0645\u0627\u0631\u0686", + "\u0627\u067e\u0631\u06cc\u0644", + "\u0645\u06cc", // MoE and PED say "\u0645\u06d0" + "\u062c\u0648\u0646", + "\u062c\u0648\u0644\u0627\u06cc", + "\u0627\u06ab\u0633\u062a", + "\u0633\u067e\u062a\u0645\u0628\u0631", + "\u0627\u06a9\u062a\u0648\u0628\u0631", + "\u0646\u0648\u0645\u0628\u0631", + "\u062f\u0633\u0645\u0628\u0631", + } + } + } + } + } } diff --git a/icu4c/source/data/locales/pt.txt b/icu4c/source/data/locales/pt.txt index 7bf6534a943..58760217d44 100644 --- a/icu4c/source/data/locales/pt.txt +++ b/icu4c/source/data/locales/pt.txt @@ -435,39 +435,6 @@ pt { ZMK { "ZMK", "Kwacha da Z\u00E2mbia" } ZWD { "ZWD", "D\u00F3lar do Zimbabue" } } - DateTimePatterns { - "HH'H'mm'm'ss's' z", - "HH:mm:ss z", - "HH:mm:ss", - "HH:mm", - "EEEE, d' de 'MMMM' de 'yyyy", - "d' de 'MMMM' de 'yyyy", - "d/MMM/yyyy", - "dd-MM-yyyy", - "{1} {0}", - } - DayAbbreviations { - "dom", - "seg", - "ter", - "qua", - "qui", - "sex", - "s\u00E1b", - } - DayNames { - "domingo", - "segunda-feira", - "ter\u00E7a-feira", - "quarta-feira", - "quinta-feira", - "sexta-feira", - "s\u00E1bado", - } - Eras { - "a.C.", // antes de Cristo - "d.C.", // depois de Cristo - } ExemplarCharacters { "[a-z\u00e3\u00f5\u00e7\u00e1\u00e9\u00ed\u00f3\u00fa\u00e0\u00e2\u00ea\u00f4\u00fc\u00f2]" } LocaleScript{ "Latn", // ISO 15924 Name @@ -553,34 +520,6 @@ pt { vi { "vietnamita" } zh { "chin\u00EAs" } } - MonthAbbreviations { - "jan", - "fev", - "mar", - "abr", - "mai", - "jun", - "jul", - "ago", - "set", - "out", - "nov", - "dez", - } - MonthNames { - "janeiro", - "fevereiro", - "mar\u00E7o", - "abril", - "maio", - "junho", - "julho", - "agosto", - "setembro", - "outubro", - "novembro", - "dezembro", - } NumberElements { ",", ".", @@ -644,4 +583,100 @@ pt { REVISED { "Revisado" } } + calendar{ + gregorian{ + DateTimePatterns{ + "HH'H'mm'm'ss's' z", + "HH:mm:ss z", + "HH:mm:ss", + "HH:mm", + "EEEE, d' de 'MMMM' de 'yyyy", + "d' de 'MMMM' de 'yyyy", + "d/MMM/yyyy", + "dd-MM-yyyy", + "{1} {0}", + } + dayNames{ + format{ + abbreviated{ + "dom", + "seg", + "ter", + "qua", + "qui", + "sex", + "s\u00E1b", + } + narrow{ + "D", + "S", + "T", + "Q", + "Q", + "S", + "S", + } + wide{ + "domingo", + "segunda-feira", + "ter\u00E7a-feira", + "quarta-feira", + "quinta-feira", + "sexta-feira", + "s\u00E1bado", + } + } + } + eras{ + "a.C.", // antes de Cristo + "d.C.", // depois de Cristo + } + monthNames{ + format{ + abbreviated{ + "jan", + "fev", + "mar", + "abr", + "mai", + "jun", + "jul", + "ago", + "set", + "out", + "nov", + "dez", + } + narrow{ + "J", + "F", + "M", + "A", + "M", + "J", + "J", + "A", + "S", + "O", + "N", + "D", + } + wide{ + "janeiro", + "fevereiro", + "mar\u00E7o", + "abril", + "maio", + "junho", + "julho", + "agosto", + "setembro", + "outubro", + "novembro", + "dezembro", + } + } + } + } + } } diff --git a/icu4c/source/data/locales/pt_BR.txt b/icu4c/source/data/locales/pt_BR.txt index 9449acafe9a..00314653c3f 100644 --- a/icu4c/source/data/locales/pt_BR.txt +++ b/icu4c/source/data/locales/pt_BR.txt @@ -7,21 +7,25 @@ pt_BR { Version{ "2.0" } - DateTimePatterns { - "HH'h'mm'min'ss's' z", - "H'h'm'min's's' z", - "HH:mm:ss", - "HH:mm", - "EEEE, d' de 'MMMM' de 'yyyy", - "d' de 'MMMM' de 'yyyy", - "dd/MM/yyyy", - "dd/MM/yy", - "{1} {0}", - } // NumberPatterns { // "#,##0.###;-#,##0.###", // "\u00A4 #,##0.00;-\u00A4 #,##0.00", // "#,##0%", // "#E0", // } + calendar{ + gregorian{ + DateTimePatterns{ + "HH'h'mm'min'ss's' z", + "H'h'm'min's's' z", + "HH:mm:ss", + "HH:mm", + "EEEE, d' de 'MMMM' de 'yyyy", + "d' de 'MMMM' de 'yyyy", + "dd/MM/yyyy", + "dd/MM/yy", + "{1} {0}", + } + } + } } diff --git a/icu4c/source/data/locales/pt_PT.txt b/icu4c/source/data/locales/pt_PT.txt index 7c9fdd58b02..509d53892d3 100644 --- a/icu4c/source/data/locales/pt_PT.txt +++ b/icu4c/source/data/locales/pt_PT.txt @@ -87,21 +87,7 @@ pt_PT { YU { "Jugosl\u00E1via" } //ZW { "Zimbabwe" } } - DateTimeElements:intvector { - 2, - 1, - } - DateTimePatterns { - "HH'H'mm'm'ss's' z", - "HH:mm:ss z", - "HH:mm:ss", - "HH:mm", - "EEEE, d' de 'MMMM' de 'yyyy", - "d' de 'MMMM' de 'yyyy", - "yyyy/MM/dd", - "yy/MM/dd", - "{1} {0}", - } + Languages { ar { "\u00E1rabe" } cs { "checo" } @@ -132,4 +118,23 @@ pt_PT { // ",", // "+", // } -} \ No newline at end of file + calendar{ + gregorian{ + DateTimeElements:intvector { + 2, + 1, + } + DateTimePatterns{ + "HH'H'mm'm'ss's' z", + "HH:mm:ss z", + "HH:mm:ss", + "HH:mm", + "EEEE, d' de 'MMMM' de 'yyyy", + "d' de 'MMMM' de 'yyyy", + "yyyy/MM/dd", + "yy/MM/dd", + "{1} {0}", + } + } + } +} diff --git a/icu4c/source/data/locales/ro.txt b/icu4c/source/data/locales/ro.txt index dd4ea454866..b3861dfe840 100644 --- a/icu4c/source/data/locales/ro.txt +++ b/icu4c/source/data/locales/ro.txt @@ -250,43 +250,7 @@ ro { //ZM { "Zambia" } //ZW { "Zimbabwe" } } - DateTimePatterns { - "HH:mm:ss z", - "HH:mm:ss z", - "HH:mm:ss", - "HH:mm", - "d MMMM yyyy", - "d MMMM yyyy", - "dd.MM.yyyy", - "dd.MM.yyyy", - "{1} {0}", - } - DateTimeElements:intvector { - 2, - 1, // "Minimal Days in First Week" is unknown. Root value used instead - } - DayAbbreviations { - "D", - "L", - "Ma", - "Mi", - "J", - "V", - "S", - } - DayNames { - "duminic\u0103", - "luni", - "mar\u0163i", - "miercuri", - "joi", - "vineri", - "s\u00EEmb\u0103t\u0103", - } - Eras { - "d.C.", - "\u00EE.d.C.", - } + Languages { ar { "Arab\u0103" } bg { "Bulgar\u0103" } @@ -321,34 +285,6 @@ ro { //zh_cn { "Chinez\u0103 (Simplificat\u0103)" } //zh_tw { "Chinez\u0103 (Tradi\u0163ional\u0103)" } } - MonthAbbreviations { - "Ian", - "Feb", - "Mar", - "Apr", - "Mai", - "Iun", - "Iul", - "Aug", - "Sep", - "Oct", - "Nov", - "Dec", - } - MonthNames { - "ianuarie", - "februarie", - "martie", - "aprilie", - "mai", - "iunie", - "iulie", - "august", - "septembrie", - "octombrie", - "noiembrie", - "decembrie", - } NumberElements { ",", ".", @@ -374,4 +310,81 @@ ro { Currencies { ROL { "lei", "ROL" } } + calendar{ + gregorian{ + DateTimeElements:intvector { + 2, + 1, // "Minimal Days in First Week" is unknown. Root value used instead + } + DateTimePatterns{ + "HH:mm:ss z", + "HH:mm:ss z", + "HH:mm:ss", + "HH:mm", + "d MMMM yyyy", + "d MMMM yyyy", + "dd.MM.yyyy", + "dd.MM.yyyy", + "{1} {0}", + } + dayNames{ + format{ + abbreviated{ + "D", + "L", + "Ma", + "Mi", + "J", + "V", + "S", + } + wide{ + "duminic\u0103", + "luni", + "mar\u0163i", + "miercuri", + "joi", + "vineri", + "s\u00EEmb\u0103t\u0103", + } + } + } + eras{ + "d.C.", + "\u00EE.d.C.", + } + monthNames{ + format{ + abbreviated{ + "Ian", + "Feb", + "Mar", + "Apr", + "Mai", + "Iun", + "Iul", + "Aug", + "Sep", + "Oct", + "Nov", + "Dec", + } + wide{ + "ianuarie", + "februarie", + "martie", + "aprilie", + "mai", + "iunie", + "iulie", + "august", + "septembrie", + "octombrie", + "noiembrie", + "decembrie", + } + } + } + } + } } diff --git a/icu4c/source/data/locales/root.txt b/icu4c/source/data/locales/root.txt index f235c3c4538..b8bcb91f4f1 100644 --- a/icu4c/source/data/locales/root.txt +++ b/icu4c/source/data/locales/root.txt @@ -14,11 +14,6 @@ root { Version { "5.0" } - AmPmMarkers { - "AM", - "PM", - } - // The official list list of ISO-3166 country codes are located at: // http://www.din.de/gremien/nas/nabd/iso3166ma/codlstp1/en_listp1.html Countries { @@ -306,6 +301,14 @@ root { ITL { "\u20A4", "ITL" } // Italian Lira JPY { "\u00A5", "JPY" } // Japanese Yen USD { "$", "USD" } // US Dollar + PTE { + "Esc.", "Escudo", + Elements{ + "\u00A5 #,##0.00;(\u00A5 #,##0.00)", /*currency pattern*/ + "$", /*decimal sperator*/ + "." /*grouping separator*/ + } + } } // Currency metadata. Unlike the "Currencies" element, this is @@ -595,44 +598,531 @@ root { ZW { "ZWD" } // ZIMBABWE: Zimbabwe Dollar } - DateTimeElements:intvector { - 1, - 1, - } + // International Calendars Data. + // NOTE (ICU 3.0) - the format of this data WILL CHANGE in future releases. - DateTimePatterns { - "HH:mm:ss z", - "HH:mm:ss z", - "HH:mm:ss ", - "HH:mm", - "EEEE, yyyy MMMM dd ", - "yyyy MMMM d ", - "yyyy MMM d ", - "yy/MM/dd", // Changing this will break binary compatibility. - "{1} {0}", - } - - DayAbbreviations { - "1", - "2", - "3", - "4", - "5", - "6", - "7" - } - DayNames { - "1", - "2", - "3", - "4", - "5", - "6", - "7" - } - Eras { - "BCE", // BC - "CE" // AD + calendar{ + default{"gregorian"} + islamic{ + // Islamic calendar - the Religious (Astronomical) variant first + eras:array { + "AH" // Anno Hijri + } + monthNames { + default{"format"} + format{ + default{"wide"} + abbreviated:alias{ + "root/calendar/islamic/monthNames/format/wide" + } + wide{ + "Muharram", + "Safar", + "Rabi' I", + "Rabi' II", + "Jumada I", + "Jumada II", + "Rajab", + "Sha'ban", + "Ramadan", + "Shawwal", + "Dhu'l-Qi'dah", + "Dhu'l-Hijjah" + } + } + } + + } + islamic-civil{ + // Civil is identical other than in calculations + eras:alias { + "root/calendar/islamic/eras" + } + monthNames:alias { + "root/calendar/islamic/monthNames" + } + } + buddhist{ + // Buddhist calendar data + eras:array { + "BE" // Buddhist Era = 543 BC Gregorian + } + DateTimePatterns{ // shorten year, use Era + "h:mm:ss a z", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", + "EEEE, MMMM d, yyyy G", + "MMMM d, yyyy G", + "MMM d, yyyy G", + "M/d/yyyy", + "{1} {0}", + } + } + gregorian{ + AmPmMarkers { + "AM", + "PM", + } + DateTimeElements:intvector { + 1, + 1, + } + DateTimePatterns{ + "HH:mm:ss z", + "HH:mm:ss z", + "HH:mm:ss ", + "HH:mm", + "EEEE, yyyy MMMM dd ", + "yyyy MMMM d ", + "yyyy MMM d ", + "yy/MM/dd", // Changing this will break binary compatibility. + "{1} {0}", + } + dayNames{ + default{"format"} + format{ + default{"wide"} + abbreviated { + "1", + "2", + "3", + "4", + "5", + "6", + "7" + } + narrow{ + "1", + "2", + "3", + "4", + "5", + "6", + "7" + } + wide { + "1", + "2", + "3", + "4", + "5", + "6", + "7" + } + } + stand-alone{ + default{"wide"} + abbreviated { + "1", + "2", + "3", + "4", + "5", + "6", + "7" + } + narrow{ + "1", + "2", + "3", + "4", + "5", + "6", + "7" + } + wide { + "1", + "2", + "3", + "4", + "5", + "6", + "7" + } + } + } + eras { + "BCE", // BC + "CE" // AD + } + monthNames{ + default{"format"} + format{ + default{"wide"} + abbreviated{ + "1", + "2", + "3", + "4", + "5", + "6", + "7", + "8", + "9", + "10", + "11", + "12" + } + narrow { + "1", + "2", + "3", + "4", + "5", + "6", + "7", + "8", + "9", + "10", + "11", + "12" + } + wide { + "1", + "2", + "3", + "4", + "5", + "6", + "7", + "8", + "9", + "10", + "11", + "12" + } + } + stand-alone{ + default{"wide"} + abbreviated{ + "1", + "2", + "3", + "4", + "5", + "6", + "7", + "8", + "9", + "10", + "11", + "12" + } + narrow { + "1", + "2", + "3", + "4", + "5", + "6", + "7", + "8", + "9", + "10", + "11", + "12" + } + wide { + "1", + "2", + "3", + "4", + "5", + "6", + "7", + "8", + "9", + "10", + "11", + "12" + } + } + } + } + hebrew{ + monthNames{ + default{"format"} + format{ + default{"wide"} + abbreviated:alias{ + "root/calendar/hebrew/monthNames/format/wide" + } + wide{ + "Tishri", + "Heshvan", + "Kislev", + "Tevet", + "Shevat", + "Adar I", // Leap years only + "Adar", + "Nisan", + "Iyar", + "Sivan", + "Tamuz", + "Av", + "Elul" + } + + } + } + eras:array { + "AM" // Anno Mundi + } + } + japanese{ + DateTimePatterns:array { + "h:mm:ss a z", // full time pattern + "h:mm:ss a z", // long time pattern + "h:mm:ss a", // medium time pattern + "h:mm a", // short time pattern + "EEEE, MMMM d, y G", // full date pattern + "MMMM d, y G", // long date pattern + "MMM d, y G", // medium date pattern + "M/d/yy", // short date pattern + "{1} {0}" // date-time pattern + } + // Japanese calendar data + eras { + // Name Gregorian Year + "Taika", // 645 + "Hakuchi", // 650 + "Hakuh\u014D", // 672 + "Shuch\u014D", // 686 + "Taih\u014D", // 701 + "Keiun", // 704 + "Wad\u014D", // 708 + "Reiki", // 715 + "Y\u014Dr\u014D", // 717 + "Jinki", // 724 + "Tempy\u014D", // 729 + "Tempy\u014D-kamp\u014D", // 749 + "Tempy\u014D-sh\u014Dh\u014D", // 749 + "Tempy\u014D-h\u014Dji", // 757 + "Temph\u014D-jingo", // 765 + "Jingo-keiun", // 767 + "H\u014Dki", // 770 + "Ten-\u014D", // 781 + "Enryaku", // 782 + "Daid\u014D", // 806 + "K\u014Dnin", // 810 + "Tench\u014D", // 824 + "Sh\u014Dwa", // 834 + "Kaj\u014D", // 848 + "Ninju", // 851 + "Saiko", // 854 + "Tennan", // 857 + "J\u014Dgan", // 859 + "Genkei", // 877 + "Ninna", // 885 + "Kampy\u014D", // 889 + "Sh\u014Dtai", // 898 + "Engi", // 901 + "Ench\u014D", // 923 + "Sh\u014Dhei", // 931 + "Tengy\u014D", // 938 + "Tenryaku", // 947 + "Tentoku", // 957 + "\u014Cwa", // 961 + "K\u014Dh\u014D", // 964 + "Anna", // 968 + "Tenroku", // 970 + "Ten-en", // 973 + "J\u014Dgen", // 976 + "Tengen", // 978 + "Eikan", // 983 + "Kanna", // 985 + "Ei-en", // 987 + "Eiso", // 989 + "Sh\u014Dryaku", // 990 + "Ch\u014Dtoku", // 995 + "Ch\u014Dh\u014D", // 999 + "Kank\u014D", // 1004 + "Ch\u014Dwa", // 1012 + "Kannin", // 1017 + "Jian", // 1021 + "Manju", // 1024 + "Ch\u014Dgen", // 1028 + "Ch\u014Dryaku", // 1037 + "Ch\u014Dky\u016B", // 1040 + "Kantoku", // 1044 + "Eish\u014D", // 1046 + "Tengi", // 1053 + "K\u014Dhei", // 1058 + "Jiryaku", // 1065 + "Enky\u016B", // 1069 + "Sh\u014Dho", // 1074 + "Sh\u014Dryaku", // 1077 + "Eiho", // 1081 + "\u014Ctoku", // 1084 + "Kanji", // 1087 + "Kaho", // 1094 + "Eich\u014D", // 1096 + "Sh\u014Dtoku", // 1097 + "K\u014Dwa", // 1099 + "Ch\u014Dji", // 1104 + "Kash\u014D", // 1106 + "Tennin", // 1108 + "Ten-ei", // 1110 + "Eiky\u016B", // 1113 + "Gen-ei", // 1118 + "Hoan", // 1120 + "Tenji", // 1124 + "Daiji", // 1126 + "Tensh\u014D", // 1131 + "Ch\u014Dsh\u014D", // 1132 + "Hoen", // 1135 + "Eiji", // 1141 + "K\u014Dji", // 1142 + "Teny\u014D", // 1144 + "Ky\u016Ban", // 1145 + "Ninpei", // 1151 + "Ky\u016Bju", // 1154 + "Hogen", // 1156 + "Heiji", // 1159 + "Eiryaku", // 1160 + "\u014Cho", // 1161 + "Ch\u014Dkan", // 1163 + "Eiman", // 1165 + "Nin-an", // 1166 + "Ka\u014D", // 1169 + "Sh\u014Dan", // 1171 + "Angen", // 1175 + "Jish\u014D", // 1177 + "Y\u014Dwa", // 1181 + "Juei", // 1182 + "Genryuku", // 1184 + "Bunji", // 1185 + "Kenky\u016B", // 1190 + "Sh\u014Dji", // 1199 + "Kennin", // 1201 + "Genky\u016B", // 1204 + "Ken-ei", // 1206 + "Sh\u014Dgen", // 1207 + "Kenryaku", // 1211 + "Kenp\u014D", // 1213 + "Sh\u014Dky\u016B", // 1219 + "J\u014D\u014D", // 1222 + "Gennin", // 1224 + "Karoku", // 1225 + "Antei", // 1227 + "Kanki", // 1229 + "J\u014Dei", // 1232 + "Tempuku", // 1233 + "Bunryaku", // 1234 + "Katei", // 1235 + "Ryakunin", // 1238 + "En-\u014D", // 1239 + "Ninji", // 1240 + "Kangen", // 1243 + "H\u014Dji", // 1247 + "Kench\u014D", // 1249 + "K\u014Dgen", // 1256 + "Sh\u014Dka", // 1257 + "Sh\u014Dgen", // 1259 + "Bun-\u014D", // 1260 + "K\u014Dch\u014D", // 1261 + "Bun-ei", // 1264 + "Kenji", // 1275 + "K\u014Dan", // 1278 + "Sh\u014D\u014D", // 1288 + "Einin", // 1293 + "Sh\u014Dan", // 1299 + "Kengen", // 1302 + "Kagen", // 1303 + "Tokuji", // 1306 + "Enkei", // 1308 + "\u014Cch\u014D", // 1311 + "Sh\u014Dwa", // 1312 + "Bunp\u014D", // 1317 + "Gen\u014D", // 1319 + "Genky\u014D", // 1321 + "Sh\u014Dch\u016B", // 1324 + "Kareki", // 1326 + "Gentoku", // 1329 + "Genk\u014D", // 1331 + "Kemmu", // 1334 + "Engen", // 1336 + "K\u014Dkoku", // 1340 + "Sh\u014Dhei", // 1346 + "Kentoku", // 1370 + "Bunch\u0169", // 1372 + "Tenju", // 1375 + "K\u014Dwa", // 1381 + "Gench\u0169", // 1384 + "Meitoku", // 1384 + "K\u014Dryaku", // 1379 + "Kakei", // 1387 + "K\u014D\u014D", // 1389 + "Meitoku", // 1390 + "\u014Cei", // 1394 + "Sh\u014Dch\u014D", // 1428 + "Eiky\u014D", // 1429 + "Kakitsu", // 1441 + "Bun-an", // 1444 + "H\u014Dtoku", // 1449 + "Ky\u014Dtoku", // 1452 + "K\u014Dsh\u014D", // 1455 + "Ch\u014Droku", // 1457 + "Kansh\u014D", // 1460 + "Bunsh\u014D", // 1466 + "\u014Cnin", // 1467 + "Bunmei", // 1469 + "Ch\u014Dky\u014D", // 1487 + "Entoku", // 1489 + "Mei\u014D", // 1492 + "Bunki", // 1501 + "Eish\u014D", // 1504 + "Taiei", // 1521 + "Ky\u014Droku", // 1528 + "Tenmon", // 1532 + "K\u014Dji", // 1555 + "Eiroku", // 1558 + "Genki", // 1570 + "Tensh\u014D", // 1573 + "Bunroku", // 1592 + "Keich\u014D", // 1596 + "Genwa", // 1615 + "Kan-ei", // 1624 + "Sh\u014Dho", // 1644 + "Keian", // 1648 + "Sh\u014D\u014D", // 1652 + "Meiryaku", // 1655 + "Manji", // 1658 + "Kanbun", // 1661 + "Enp\u014D", // 1673 + "Tenwa", // 1681 + "J\u014Dky\u014D", // 1684 + "Genroku", // 1688 + "H\u014Dei", // 1704 + "Sh\u014Dtoku", // 1711 + "Ky\u014Dh\u014D", // 1716 + "Genbun", // 1736 + "Kanp\u014D", // 1741 + "Enky\u014D", // 1744 + "Kan-en", // 1748 + "H\u014Dryaku", // 1751 + "Meiwa", // 1764 + "An-ei", // 1772 + "Tenmei", // 1781 + "Kansei", // 1789 + "Ky\u014Dwa", // 1801 + "Bunka", // 1804 + "Bunsei", // 1818 + "Tenp\u014D", // 1830 + "K\u014Dka", // 1844 + "Kaei", // 1848 + "Ansei", // 1854 + "Man-en", // 1860 + "Bunky\u016B", // 1861 + "Genji", // 1864 + "Kei\u014D", // 1865 + "Meiji", // 1868 + "Taish\u014D", // 1912 + "Sh\u014Dwa", // 1926 + "Heisei", // 1989 + } + } } // If there is a two letter abbreviation (ISO-639-1) for a three letter @@ -1120,34 +1610,6 @@ root { LocaleScript:array { "Zyyy" } - MonthAbbreviations { - "1", - "2", - "3", - "4", - "5", - "6", - "7", - "8", - "9", - "10", - "11", - "12" - } - MonthNames { - "1", - "2", - "3", - "4", - "5", - "6", - "7", - "8", - "9", - "10", - "11", - "12" - } MeasurementSystem:int{ 0 } // ISO/Metric system // the PaperSize units are in mm PaperSize:intvector{ @@ -1279,340 +1741,6 @@ root { // END Transliterator support //------------------------------------------------------------ - // International Calendars Data. - // NOTE (ICU 2.6) - the format of this data WILL CHANGE in future releases. - - // The type of the default calendar - looked up in the registry - DefaultCalendar { "gregorian" } - - // Japanese calendar data - Eras_japanese { - // Name Gregorian Year - "Taika", // 645 - "Hakuchi", // 650 - "Hakuh\u014D", // 672 - "Shuch\u014D", // 686 - "Taih\u014D", // 701 - "Keiun", // 704 - "Wad\u014D", // 708 - "Reiki", // 715 - "Y\u014Dr\u014D", // 717 - "Jinki", // 724 - "Tempy\u014D", // 729 - "Tempy\u014D-kamp\u014D", // 749 - "Tempy\u014D-sh\u014Dh\u014D", // 749 - "Tempy\u014D-h\u014Dji", // 757 - "Temph\u014D-jingo", // 765 - "Jingo-keiun", // 767 - "H\u014Dki", // 770 - "Ten-\u014D", // 781 - "Enryaku", // 782 - "Daid\u014D", // 806 - "K\u014Dnin", // 810 - "Tench\u014D", // 824 - "Sh\u014Dwa", // 834 - "Kaj\u014D", // 848 - "Ninju", // 851 - "Saiko", // 854 - "Tennan", // 857 - "J\u014Dgan", // 859 - "Genkei", // 877 - "Ninna", // 885 - "Kampy\u014D", // 889 - "Sh\u014Dtai", // 898 - "Engi", // 901 - "Ench\u014D", // 923 - "Sh\u014Dhei", // 931 - "Tengy\u014D", // 938 - "Tenryaku", // 947 - "Tentoku", // 957 - "\u014Cwa", // 961 - "K\u014Dh\u014D", // 964 - "Anna", // 968 - "Tenroku", // 970 - "Ten-en", // 973 - "J\u014Dgen", // 976 - "Tengen", // 978 - "Eikan", // 983 - "Kanna", // 985 - "Ei-en", // 987 - "Eiso", // 989 - "Sh\u014Dryaku", // 990 - "Ch\u014Dtoku", // 995 - "Ch\u014Dh\u014D", // 999 - "Kank\u014D", // 1004 - "Ch\u014Dwa", // 1012 - "Kannin", // 1017 - "Jian", // 1021 - "Manju", // 1024 - "Ch\u014Dgen", // 1028 - "Ch\u014Dryaku", // 1037 - "Ch\u014Dky\u016B", // 1040 - "Kantoku", // 1044 - "Eish\u014D", // 1046 - "Tengi", // 1053 - "K\u014Dhei", // 1058 - "Jiryaku", // 1065 - "Enky\u016B", // 1069 - "Sh\u014Dho", // 1074 - "Sh\u014Dryaku", // 1077 - "Eiho", // 1081 - "\u014Ctoku", // 1084 - "Kanji", // 1087 - "Kaho", // 1094 - "Eich\u014D", // 1096 - "Sh\u014Dtoku", // 1097 - "K\u014Dwa", // 1099 - "Ch\u014Dji", // 1104 - "Kash\u014D", // 1106 - "Tennin", // 1108 - "Ten-ei", // 1110 - "Eiky\u016B", // 1113 - "Gen-ei", // 1118 - "Hoan", // 1120 - "Tenji", // 1124 - "Daiji", // 1126 - "Tensh\u014D", // 1131 - "Ch\u014Dsh\u014D", // 1132 - "Hoen", // 1135 - "Eiji", // 1141 - "K\u014Dji", // 1142 - "Teny\u014D", // 1144 - "Ky\u016Ban", // 1145 - "Ninpei", // 1151 - "Ky\u016Bju", // 1154 - "Hogen", // 1156 - "Heiji", // 1159 - "Eiryaku", // 1160 - "\u014Cho", // 1161 - "Ch\u014Dkan", // 1163 - "Eiman", // 1165 - "Nin-an", // 1166 - "Ka\u014D", // 1169 - "Sh\u014Dan", // 1171 - "Angen", // 1175 - "Jish\u014D", // 1177 - "Y\u014Dwa", // 1181 - "Juei", // 1182 - "Genryuku", // 1184 - "Bunji", // 1185 - "Kenky\u016B", // 1190 - "Sh\u014Dji", // 1199 - "Kennin", // 1201 - "Genky\u016B", // 1204 - "Ken-ei", // 1206 - "Sh\u014Dgen", // 1207 - "Kenryaku", // 1211 - "Kenp\u014D", // 1213 - "Sh\u014Dky\u016B", // 1219 - "J\u014D\u014D", // 1222 - "Gennin", // 1224 - "Karoku", // 1225 - "Antei", // 1227 - "Kanki", // 1229 - "J\u014Dei", // 1232 - "Tempuku", // 1233 - "Bunryaku", // 1234 - "Katei", // 1235 - "Ryakunin", // 1238 - "En-\u014D", // 1239 - "Ninji", // 1240 - "Kangen", // 1243 - "H\u014Dji", // 1247 - "Kench\u014D", // 1249 - "K\u014Dgen", // 1256 - "Sh\u014Dka", // 1257 - "Sh\u014Dgen", // 1259 - "Bun-\u014D", // 1260 - "K\u014Dch\u014D", // 1261 - "Bun-ei", // 1264 - "Kenji", // 1275 - "K\u014Dan", // 1278 - "Sh\u014D\u014D", // 1288 - "Einin", // 1293 - "Sh\u014Dan", // 1299 - "Kengen", // 1302 - "Kagen", // 1303 - "Tokuji", // 1306 - "Enkei", // 1308 - "\u014Cch\u014D", // 1311 - "Sh\u014Dwa", // 1312 - "Bunp\u014D", // 1317 - "Gen\u014D", // 1319 - "Genky\u014D", // 1321 - "Sh\u014Dch\u016B", // 1324 - "Kareki", // 1326 - "Gentoku", // 1329 - "Genk\u014D", // 1331 - "Kemmu", // 1334 - "Engen", // 1336 - "K\u014Dkoku", // 1340 - "Sh\u014Dhei", // 1346 - "Kentoku", // 1370 - "Bunch\u0169", // 1372 - "Tenju", // 1375 - "K\u014Dwa", // 1381 - "Gench\u0169", // 1384 - "Meitoku", // 1384 - "K\u014Dryaku", // 1379 - "Kakei", // 1387 - "K\u014D\u014D", // 1389 - "Meitoku", // 1390 - "\u014Cei", // 1394 - "Sh\u014Dch\u014D", // 1428 - "Eiky\u014D", // 1429 - "Kakitsu", // 1441 - "Bun-an", // 1444 - "H\u014Dtoku", // 1449 - "Ky\u014Dtoku", // 1452 - "K\u014Dsh\u014D", // 1455 - "Ch\u014Droku", // 1457 - "Kansh\u014D", // 1460 - "Bunsh\u014D", // 1466 - "\u014Cnin", // 1467 - "Bunmei", // 1469 - "Ch\u014Dky\u014D", // 1487 - "Entoku", // 1489 - "Mei\u014D", // 1492 - "Bunki", // 1501 - "Eish\u014D", // 1504 - "Taiei", // 1521 - "Ky\u014Droku", // 1528 - "Tenmon", // 1532 - "K\u014Dji", // 1555 - "Eiroku", // 1558 - "Genki", // 1570 - "Tensh\u014D", // 1573 - "Bunroku", // 1592 - "Keich\u014D", // 1596 - "Genwa", // 1615 - "Kan-ei", // 1624 - "Sh\u014Dho", // 1644 - "Keian", // 1648 - "Sh\u014D\u014D", // 1652 - "Meiryaku", // 1655 - "Manji", // 1658 - "Kanbun", // 1661 - "Enp\u014D", // 1673 - "Tenwa", // 1681 - "J\u014Dky\u014D", // 1684 - "Genroku", // 1688 - "H\u014Dei", // 1704 - "Sh\u014Dtoku", // 1711 - "Ky\u014Dh\u014D", // 1716 - "Genbun", // 1736 - "Kanp\u014D", // 1741 - "Enky\u014D", // 1744 - "Kan-en", // 1748 - "H\u014Dryaku", // 1751 - "Meiwa", // 1764 - "An-ei", // 1772 - "Tenmei", // 1781 - "Kansei", // 1789 - "Ky\u014Dwa", // 1801 - "Bunka", // 1804 - "Bunsei", // 1818 - "Tenp\u014D", // 1830 - "K\u014Dka", // 1844 - "Kaei", // 1848 - "Ansei", // 1854 - "Man-en", // 1860 - "Bunky\u016B", // 1861 - "Genji", // 1864 - "Kei\u014D", // 1865 - "Meiji", // 1868 - "Taish\u014D", // 1912 - "Sh\u014Dwa", // 1926 - "Heisei", // 1989 - } - - - // Buddhist calendar data - Eras_buddhist:array { - "BE" // Buddhist Era = 543 BC Gregorian - } - - DateTimePatterns_japanese:array { - "h:mm:ss a z", // full time pattern - "h:mm:ss a z", // long time pattern - "h:mm:ss a", // medium time pattern - "h:mm a", // short time pattern - "EEEE, MMMM d, y G", // full date pattern - "MMMM d, y G", // long date pattern - "MMM d, y G", // medium date pattern - "M/d/yy", // short date pattern - "{1} {0}" // date-time pattern - } - - DateTimePatterns_buddhist { // shorten year, use Era - "h:mm:ss a z", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", - "EEEE, MMMM d, yyyy G", - "MMMM d, yyyy G", - "MMM d, yyyy G", - "M/d/yyyy", - "{1} {0}", - } - - // Islamic calendar - the Religious (Astronomical) variant first - Eras_islamic:array { - "AH" // Anno Hijri - } - - MonthNames_islamic { - "Muharram", - "Safar", - "Rabi' I", - "Rabi' II", - "Jumada I", - "Jumada II", - "Rajab", - "Sha'ban", - "Ramadan", - "Shawwal", - "Dhu'l-Qi'dah", - "Dhu'l-Hijjah" - } - MonthAbbreviations_islamic:alias { // same as MonthNames (no data) - "root/MonthNames_islamic" - } - // Civil is identical other than in calculations - Eras_islamic-civil:alias { - "root/Eras_islamic" - } - MonthNames_islamic-civil:alias { - "root/MonthNames_islamic" - } - MonthAbbreviations_islamic-civil:alias { - "root/MonthAbbreviations_islamic" - } - - MonthNames_hebrew { - "Tishri", - "Heshvan", - "Kislev", - "Tevet", - "Shevat", - "Adar I", // Leap years only - "Adar", - "Nisan", - "Iyar", - "Sivan", - "Tamuz", - "Av", - "Elul" - } - - Eras_hebrew:array { - "AM" // Anno Mundi - } - - MonthAbbreviations_hebrew:alias { - "root/MonthNames_hebrew" // no data - } - Keys{ collation { "COLLATION" } calendar { "CALENDAR" } @@ -1658,5 +1786,5 @@ root { "" } } -} +} diff --git a/icu4c/source/data/locales/ru.txt b/icu4c/source/data/locales/ru.txt index 65cb4b4f800..6caf8ce6051 100644 --- a/icu4c/source/data/locales/ru.txt +++ b/icu4c/source/data/locales/ru.txt @@ -258,43 +258,7 @@ ru { ZM { "\u0417\u0430\u043C\u0431\u0438\u044F" } ZW { "\u0417\u0438\u043C\u0431\u0430\u0431\u0432\u0435" } } - DateTimeElements:intvector { - 2, - 1, - } - DateTimePatterns { - "H:mm:ss z", - "H:mm:ss z", - "H:mm:ss", - "H:mm", - "d MMMM yyyy '\u0433.'", - "d MMMM yyyy '\u0433.'", - "dd.MM.yyyy", - "dd.MM.yy", - "{1} {0}", - } - DayAbbreviations { - "\u0412\u0441", - "\u041F\u043D", - "\u0412\u0442", - "\u0421\u0440", - "\u0427\u0442", - "\u041F\u0442", - "\u0421\u0431", - } - DayNames { - "\u0432\u043E\u0441\u043A\u0440\u0435\u0441\u0435\u043D\u044C\u0435", - "\u043F\u043E\u043D\u0435\u0434\u0435\u043B\u044C\u043D\u0438\u043A", - "\u0432\u0442\u043E\u0440\u043D\u0438\u043A", - "\u0441\u0440\u0435\u0434\u0430", - "\u0447\u0435\u0442\u0432\u0435\u0440\u0433", - "\u043F\u044F\u0442\u043D\u0438\u0446\u0430", - "\u0441\u0443\u0431\u0431\u043E\u0442\u0430", - } - Eras { - "\u0434\u043E \u043D.\u044D.", - "\u043D.\u044D.", - } + Languages { aa { "\u0410\u0444\u0430\u0440" } ab { "\u0410\u0431\u0445\u0430\u0437\u0441\u043A\u0438\u0439" } @@ -438,34 +402,6 @@ ru { zh { "\u041A\u0438\u0442\u0430\u0439\u0441\u043A\u0438\u0439" } zu { "\u0417\u0443\u043B\u0443\u0441\u0441\u043A\u0438\u0439" } } - MonthAbbreviations { - "\u044F\u043D\u0432", - "\u0444\u0435\u0432", - "\u043C\u0430\u0440", - "\u0430\u043F\u0440", - "\u043C\u0430\u0439", - "\u0438\u044E\u043D", - "\u0438\u044E\u043B", - "\u0430\u0432\u0433", - "\u0441\u0435\u043D", - "\u043E\u043A\u0442", - "\u043D\u043E\u044F", - "\u0434\u0435\u043A", - } - MonthNames { - "\u042F\u043D\u0432\u0430\u0440\u044C", - "\u0424\u0435\u0432\u0440\u0430\u043B\u044C", - "\u041C\u0430\u0440\u0442", - "\u0410\u043F\u0440\u0435\u043B\u044C", - "\u041C\u0430\u0439", - "\u0418\u044E\u043D\u044C", - "\u0418\u044E\u043B\u044C", - "\u0410\u0432\u0433\u0443\u0441\u0442", - "\u0421\u0435\u043D\u0442\u044F\u0431\u0440\u044C", - "\u041E\u043A\u0442\u044F\u0431\u0440\u044C", - "\u041D\u043E\u044F\u0431\u0440\u044C", - "\u0414\u0435\u043A\u0430\u0431\u0440\u044C", - } localPatternChars { "GanjkHmsSEDFwWxhKzAeugXZ" } LocaleScript:array { @@ -518,4 +454,81 @@ ru { RUR { "\u0440.", "RUR" } UAH { "\u0433\u0440\u043D.", "UAH" } } + calendar{ + gregorian{ + DateTimeElements:intvector { + 2, + 1, + } + DateTimePatterns{ + "H:mm:ss z", + "H:mm:ss z", + "H:mm:ss", + "H:mm", + "d MMMM yyyy '\u0433.'", + "d MMMM yyyy '\u0433.'", + "dd.MM.yyyy", + "dd.MM.yy", + "{1} {0}", + } + dayNames{ + format{ + abbreviated{ + "\u0412\u0441", + "\u041F\u043D", + "\u0412\u0442", + "\u0421\u0440", + "\u0427\u0442", + "\u041F\u0442", + "\u0421\u0431", + } + wide{ + "\u0432\u043E\u0441\u043A\u0440\u0435\u0441\u0435\u043D\u044C\u0435", + "\u043F\u043E\u043D\u0435\u0434\u0435\u043B\u044C\u043D\u0438\u043A", + "\u0432\u0442\u043E\u0440\u043D\u0438\u043A", + "\u0441\u0440\u0435\u0434\u0430", + "\u0447\u0435\u0442\u0432\u0435\u0440\u0433", + "\u043F\u044F\u0442\u043D\u0438\u0446\u0430", + "\u0441\u0443\u0431\u0431\u043E\u0442\u0430", + } + } + } + eras{ + "\u0434\u043E \u043D.\u044D.", + "\u043D.\u044D.", + } + monthNames{ + format{ + abbreviated{ + "\u044F\u043D\u0432", + "\u0444\u0435\u0432", + "\u043C\u0430\u0440", + "\u0430\u043F\u0440", + "\u043C\u0430\u0439", + "\u0438\u044E\u043D", + "\u0438\u044E\u043B", + "\u0430\u0432\u0433", + "\u0441\u0435\u043D", + "\u043E\u043A\u0442", + "\u043D\u043E\u044F", + "\u0434\u0435\u043A", + } + wide{ + "\u042F\u043D\u0432\u0430\u0440\u044C", + "\u0424\u0435\u0432\u0440\u0430\u043B\u044C", + "\u041C\u0430\u0440\u0442", + "\u0410\u043F\u0440\u0435\u043B\u044C", + "\u041C\u0430\u0439", + "\u0418\u044E\u043D\u044C", + "\u0418\u044E\u043B\u044C", + "\u0410\u0432\u0433\u0443\u0441\u0442", + "\u0421\u0435\u043D\u0442\u044F\u0431\u0440\u044C", + "\u041E\u043A\u0442\u044F\u0431\u0440\u044C", + "\u041D\u043E\u044F\u0431\u0440\u044C", + "\u0414\u0435\u043A\u0430\u0431\u0440\u044C", + } + } + } + } + } } diff --git a/icu4c/source/data/locales/ru_UA.txt b/icu4c/source/data/locales/ru_UA.txt index a6a48f7fd78..b4eef6efcae 100644 --- a/icu4c/source/data/locales/ru_UA.txt +++ b/icu4c/source/data/locales/ru_UA.txt @@ -7,17 +7,6 @@ ru_UA { Version { "2.0" } - DateTimePatterns { - "HH:mm:ss z", - "HH:mm:ss z", - "HH:mm:ss", - "HH:mm", - "EEEE, d MMMM yyyy '\u0433.'", - "d MMMM yyyy", - "d MMM yyyy", - "dd.MM.yy", - "{1} {0}", - } NumberElements { ",", "\u00A0", @@ -39,4 +28,19 @@ ru_UA { "#,##0%", "#E0", } + calendar{ + gregorian{ + DateTimePatterns{ + "HH:mm:ss z", + "HH:mm:ss z", + "HH:mm:ss", + "HH:mm", + "EEEE, d MMMM yyyy '\u0433.'", + "d MMMM yyyy", + "d MMM yyyy", + "dd.MM.yy", + "{1} {0}", + } + } + } } diff --git a/icu4c/source/data/locales/sh.txt b/icu4c/source/data/locales/sh.txt index cf5a5f8ae7b..12979320b10 100644 --- a/icu4c/source/data/locales/sh.txt +++ b/icu4c/source/data/locales/sh.txt @@ -197,45 +197,7 @@ sh { ZM { "Zambija" } ZW { "Zimbabve" } } - DateTimePatterns { - "HH.mm.ss z", - "HH.mm.ss z", - "HH.mm.ss", - "HH.mm", - "EEEE, dd. MMMM yyyy.", - "EEEE, d.MM.yyyy.", - "dd.MM.yyyy.", - "d.M.yy.", - "{1} {0}", - } - DateTimeElements:intvector { - 2, - 1, // "Minimal Days in First Week" is unknown. Root value used instead - } - - DayAbbreviations { - "ned", - "pon", - "uto", - "sre", - "\u010Det", - "pet", - "sub", - } - DayNames { - "nedelja", - "ponedeljak", - "utorak", - "sreda", - "\u010Detvrtak", - "petak", - "subota", - } - Eras { - "p. n. e.", - "n. e.", - } Languages { af { "Afrikanerski" } sq { "Albanski" } @@ -300,34 +262,6 @@ sh { //ji { "Jidi\u0161" } // Use "yi" instead yi { "Jidi\u0161" } } - MonthAbbreviations { - "jan", - "feb", - "mar", - "apr", - "maj", - "jun", - "jul", - "avg", - "sep", - "okt", - "nov", - "dec", - } - MonthNames { - "januar", - "februar", - "mart", - "april", - "maj", - "juni", - "juli", - "avgust", - "septembar", - "oktobar", - "novembar", - "decembar", - } NumberElements { ",", ".", @@ -362,4 +296,81 @@ sh { Currencies { YUN { "Din", "YUN" } } + calendar{ + gregorian{ + DateTimeElements:intvector { + 2, + 1, // "Minimal Days in First Week" is unknown. Root value used instead + } + DateTimePatterns{ + "HH.mm.ss z", + "HH.mm.ss z", + "HH.mm.ss", + "HH.mm", + "EEEE, dd. MMMM yyyy.", + "EEEE, d.MM.yyyy.", + "dd.MM.yyyy.", + "d.M.yy.", + "{1} {0}", + } + dayNames{ + format{ + abbreviated{ + "ned", + "pon", + "uto", + "sre", + "\u010Det", + "pet", + "sub", + } + wide{ + "nedelja", + "ponedeljak", + "utorak", + "sreda", + "\u010Detvrtak", + "petak", + "subota", + } + } + } + eras{ + "p. n. e.", + "n. e.", + } + monthNames{ + format{ + abbreviated{ + "jan", + "feb", + "mar", + "apr", + "maj", + "jun", + "jul", + "avg", + "sep", + "okt", + "nov", + "dec", + } + wide{ + "januar", + "februar", + "mart", + "april", + "maj", + "juni", + "juli", + "avgust", + "septembar", + "oktobar", + "novembar", + "decembar", + } + } + } + } + } } diff --git a/icu4c/source/data/locales/sk.txt b/icu4c/source/data/locales/sk.txt index 298da49c8f1..20913ce044e 100644 --- a/icu4c/source/data/locales/sk.txt +++ b/icu4c/source/data/locales/sk.txt @@ -250,44 +250,7 @@ sk { //ZM { "Zambia" } //ZW { "Zimbabwe" } } - DateTimePatterns { - "H:mm:ss z", - "H:mm:ss z", - "H:mm:ss", - "H:mm", - "EEEE, d. MMMM yyyy", - "d. MMMM yyyy", - "d.M.yyyy", - "d.M.yyyy", - "{1} {0}", - } - DayAbbreviations { - "Ne", - "Po", - "Ut", - "St", - "\u0160t", - "Pi", - "So", - } - DayNames { - "Nede\u013Ea", // Is this Nede\u013Ea or Nede\u013Ee? - "Pondelok", - "Utorok", - "Streda", - "\u0160tvrtok", - "Piatok", - "Sobota", - } - Eras { - "pred n.l.", - "n.l.", - } - DateTimeElements:intvector { - 2, - 4 - } - Languages { + Languages { ar { "arabsk\u00FD" } bg { "bulharsk\u00FD" } cs { "\u010Desk\u00FD" } @@ -322,34 +285,6 @@ sk { //zh_cn { "\u010D\u00EDnsky (zjednodu\u0161en\u00FD)" } //zh_tw { "\u010D\u00EDnsky (tradi\u010Dn\u00FD)" } } - MonthAbbreviations { - "jan", - "feb", - "mar", - "apr", - "m\u00E1j", - "j\u00FAn", - "j\u00FAl", - "aug", - "sep", - "okt", - "nov", - "dec", - } - MonthNames { - "janu\u00E1r", - "febru\u00E1r", - "marec", - "apr\u00EDl", - "m\u00E1j", - "j\u00FAn", - "j\u00FAl", - "august", - "september", - "okt\u00F3ber", - "november", - "december", - } NumberElements { ",", "\u00A0", @@ -376,4 +311,81 @@ sk { Currencies { SKK { "Sk", "SKK" } } + calendar{ + gregorian{ + DateTimeElements:intvector { + 2, + 4 + } + DateTimePatterns{ + "H:mm:ss z", + "H:mm:ss z", + "H:mm:ss", + "H:mm", + "EEEE, d. MMMM yyyy", + "d. MMMM yyyy", + "d.M.yyyy", + "d.M.yyyy", + "{1} {0}", + } + dayNames{ + format{ + abbreviated{ + "Ne", + "Po", + "Ut", + "St", + "\u0160t", + "Pi", + "So", + } + wide{ + "Nede\u013Ea", // Is this Nede\u013Ea or Nede\u013Ee? + "Pondelok", + "Utorok", + "Streda", + "\u0160tvrtok", + "Piatok", + "Sobota", + } + } + } + eras{ + "pred n.l.", + "n.l.", + } + monthNames{ + format{ + abbreviated{ + "jan", + "feb", + "mar", + "apr", + "m\u00E1j", + "j\u00FAn", + "j\u00FAl", + "aug", + "sep", + "okt", + "nov", + "dec", + } + wide{ + "janu\u00E1r", + "febru\u00E1r", + "marec", + "apr\u00EDl", + "m\u00E1j", + "j\u00FAn", + "j\u00FAl", + "august", + "september", + "okt\u00F3ber", + "november", + "december", + } + } + } + } + } } diff --git a/icu4c/source/data/locales/sl.txt b/icu4c/source/data/locales/sl.txt index ef4dccb398b..fa92ca5c712 100644 --- a/icu4c/source/data/locales/sl.txt +++ b/icu4c/source/data/locales/sl.txt @@ -249,45 +249,8 @@ sl { ZM { "Zambija" } ZW { "Zimbabve" } } - DateTimePatterns { - "H:mm:ss z", - "H:mm:ss z", - "H:mm:ss", - "H:mm", - "EEEE, dd. MMMM yyyy", - "dd. MMMM yyyy", - "yyyy.M.d", - "yy.M.d", - "{1} {0}", - } - DateTimeElements:intvector { - 2, - 1, // "Minimal Days in First Week" is unknown. Root value used instead - } - DayAbbreviations { - "ned", - "pon", - "tor", - "sre", - "\u010det", - "pet", - "sob", - } - DayNames { - "nedelja", - "ponedeljek", - "torek", - "sreda", - "\u010detrtek", - "petek", - "sobota", - } - Eras { - "pr.n.\u0161.", - "po Kr.", - } Languages { ar { "Arab\u0161\u010Dina" } bg { "Bolgar\u0161\u010Dina" } @@ -322,34 +285,6 @@ sl { //zh_cn { "Kitaj\u0161\u010Dina (poenostavljena)" } //zh_tw { "Kitaj\u0161\u010Dina (tradicionalna)" } } - MonthAbbreviations { - "jan", - "feb", - "mar", - "apr", - "maj", - "jun", - "jul", - "avg", - "sep", - "okt", - "nov", - "dec", - } - MonthNames { - "januar", - "februar", - "marec", - "april", - "maj", - "junij", - "julij", - "avgust", - "september", - "oktober", - "november", - "december", - } NumberElements { ",", ".", @@ -376,4 +311,81 @@ sl { Currencies { SIT { "SIT", "SIT" } } + calendar{ + gregorian{ + DateTimeElements:intvector { + 2, + 1, // "Minimal Days in First Week" is unknown. Root value used instead + } + DateTimePatterns{ + "H:mm:ss z", + "H:mm:ss z", + "H:mm:ss", + "H:mm", + "EEEE, dd. MMMM yyyy", + "dd. MMMM yyyy", + "yyyy.M.d", + "yy.M.d", + "{1} {0}", + } + dayNames{ + format{ + abbreviated{ + "ned", + "pon", + "tor", + "sre", + "\u010det", + "pet", + "sob", + } + wide{ + "nedelja", + "ponedeljek", + "torek", + "sreda", + "\u010detrtek", + "petek", + "sobota", + } + } + } + eras{ + "pr.n.\u0161.", + "po Kr.", + } + monthNames{ + format{ + abbreviated{ + "jan", + "feb", + "mar", + "apr", + "maj", + "jun", + "jul", + "avg", + "sep", + "okt", + "nov", + "dec", + } + wide{ + "januar", + "februar", + "marec", + "april", + "maj", + "junij", + "julij", + "avgust", + "september", + "oktober", + "november", + "december", + } + } + } + } + } } diff --git a/icu4c/source/data/locales/so.txt b/icu4c/source/data/locales/so.txt index f081b6506d5..5f6faa28c28 100644 --- a/icu4c/source/data/locales/so.txt +++ b/icu4c/source/data/locales/so.txt @@ -12,10 +12,6 @@ so{ Version{ "2.0" } - AmPmMarkers { - "sn", - "gn", - } Countries { AE { "Imaaraadka Carabta ee Midoobay" } AF { "Afgaanistaan" } @@ -144,43 +140,7 @@ so{ Currencies { KES { "Ksh", "KES" } } - DateTimeElements:intvector { - 7, - 1, - } - DateTimePatterns { - "h:mm:ss a", - "h:mm:ss a", - "h:mm:ss a", - "h:mm a", - "EEEE, MMMM dd, yyyy", - "dd MMMM yyyy", - "dd-MMM-yyyy", - "dd/MM/yy", - "{1} {0}", - } - DayAbbreviations { - "Axa", - "Isn", - "Sal", - "Arb", - "Kha", - "Jim", - "Sab", - } - DayNames { - "Axad", - "Isniin", - "Salaaso", - "Arbaco", - "Khamiis", - "Jimco", - "Sabti", - } - Eras { - "Ciise ka hor", - "Ciise ka dib" - } + ExemplarCharacters { "[a-z]" } LocaleScript:array{ "Latn", // ISO 15924 Name @@ -188,34 +148,85 @@ so{ Languages { so { "Soomaali" } } - MonthAbbreviations { - "Kob", - "Lab", - "Sad", - "Afr", - "Sha", - "Lix", - "Tod", - "Sid", - "Sag", - "Tob", - "KIT", - "LIT", - } - MonthNames { - "Bisha Koobaad", - "Bisha Labaad", - "Bisha Saddexaad", - "Bisha Afraad", - "Bisha Shanaad", - "Bisha Lixaad", - "Bisha Todobaad", - "Bisha Sideedaad", - "Bisha Sagaalaad", - "Bisha Tobnaad", - "Bisha Kow iyo Tobnaad", - "Bisha Laba iyo Tobnaad", + calendar{ + gregorian{ + AmPmMarkers{ + "sn", + "gn", + } + DateTimeElements:intvector { + 7, + 1, + } + DateTimePatterns{ + "h:mm:ss a", + "h:mm:ss a", + "h:mm:ss a", + "h:mm a", + "EEEE, MMMM dd, yyyy", + "dd MMMM yyyy", + "dd-MMM-yyyy", + "dd/MM/yy", + "{1} {0}", + } + dayNames{ + format{ + abbreviated{ + "Axa", + "Isn", + "Sal", + "Arb", + "Kha", + "Jim", + "Sab", + } + wide{ + "Axad", + "Isniin", + "Salaaso", + "Arbaco", + "Khamiis", + "Jimco", + "Sabti", + } + } + } + eras{ + "Ciise ka hor", + "Ciise ka dib" + } + monthNames{ + format{ + abbreviated{ + "Kob", + "Lab", + "Sad", + "Afr", + "Sha", + "Lix", + "Tod", + "Sid", + "Sag", + "Tob", + "KIT", + "LIT", + } + wide{ + "Bisha Koobaad", + "Bisha Labaad", + "Bisha Saddexaad", + "Bisha Afraad", + "Bisha Shanaad", + "Bisha Lixaad", + "Bisha Todobaad", + "Bisha Sideedaad", + "Bisha Sagaalaad", + "Bisha Tobnaad", + "Bisha Kow iyo Tobnaad", + "Bisha Laba iyo Tobnaad", + } + } + } + } } } - - diff --git a/icu4c/source/data/locales/so_DJ.txt b/icu4c/source/data/locales/so_DJ.txt index 4a135723e44..81fe031e7cb 100644 --- a/icu4c/source/data/locales/so_DJ.txt +++ b/icu4c/source/data/locales/so_DJ.txt @@ -44,4 +44,4 @@ so_DJ { Currencies { DJF { "$", "DJF" } } - } +} diff --git a/icu4c/source/data/locales/so_ET.txt b/icu4c/source/data/locales/so_ET.txt index ef53f74e9de..3bb95064462 100644 --- a/icu4c/source/data/locales/so_ET.txt +++ b/icu4c/source/data/locales/so_ET.txt @@ -43,4 +43,4 @@ so_ET { Currencies { ETB { "$", "ETB" } } - } +} diff --git a/icu4c/source/data/locales/so_KE.txt b/icu4c/source/data/locales/so_KE.txt index 587931f2b51..65c36369bea 100644 --- a/icu4c/source/data/locales/so_KE.txt +++ b/icu4c/source/data/locales/so_KE.txt @@ -13,10 +13,6 @@ so_KE { Version{ "2.0" } - AmPmMarkers { - "sn", - "gn", - } // Measurement { "Metric" } // NumberElements { // ".", @@ -42,4 +38,4 @@ so_KE { // Width { "210" } // Units { "mm" } // } - } +} diff --git a/icu4c/source/data/locales/so_SO.txt b/icu4c/source/data/locales/so_SO.txt index 165d521a62d..5fefb1accc4 100644 --- a/icu4c/source/data/locales/so_SO.txt +++ b/icu4c/source/data/locales/so_SO.txt @@ -43,4 +43,4 @@ so_SO { Currencies { SOS { "$", "SOS" } } - } +} diff --git a/icu4c/source/data/locales/sq.txt b/icu4c/source/data/locales/sq.txt index 9ba3d7c9d7b..cc10d4bc8b6 100644 --- a/icu4c/source/data/locales/sq.txt +++ b/icu4c/source/data/locales/sq.txt @@ -7,10 +7,6 @@ sq { Version{ "2.0" } - AmPmMarkers { - "PD", - "MD", - } Countries { AD { "Andorr\u00eb" } AE { "Emiratet Arabe te Bashkuara" } @@ -233,43 +229,7 @@ sq { Currencies { ALL { "Lek", "ALL" } } - DateTimePatterns { - "h.mm.ss.a z", - "h.mm.ss.a z", - "h:mm:ss.a", - "h.mm.a", - "EEEE, dd MMMM yyyy", - "dd MMMM yyyy", - "yyyy-MM-dd", - "yy-MM-dd", - "{1} {0}", - } - DateTimeElements:intvector { - 2, - 1, // "Minimal Days in First Week" is unknown. Root value used instead - } - DayAbbreviations { - "Die", - "H\u00EBn", - "Mar", - "M\u00EBr", - "Enj", - "Pre", - "Sht", - } - DayNames { - "e diel", - "e h\u00EBn\u00EB", - "e mart\u00EB", - "e m\u00EBrkur\u00EB", - "e enjte", - "e premte", - "e shtun\u00EB", - } - Eras { - "p.e.r.", - "n.e.r.", - } + Languages { sq { "shqipe" } } @@ -278,34 +238,6 @@ sq { "Latn", // ISO 15924 Name } ExemplarCharacters { "[a-z\u00e7\u00eb{dh}{gj}{ll}{nj}{rr}{sh}{th}{xh}{zh}]" } - MonthAbbreviations { - "Jan", - "Shk", - "Mar", - "Pri", - "Maj", - "Qer", - "Kor", - "Gsh", - "Sht", - "Tet", - "N\u00EBn", - "Dhj", - } - MonthNames { - "janar", - "shkurt", - "mars", - "prill", - "maj", - "qershor", - "korrik", - "gusht", - "shtator", - "tetor", - "n\u00EBntor", - "dhjetor", - } NumberElements { ",", ".", @@ -331,4 +263,85 @@ sq { } } */ + calendar{ + gregorian{ + DateTimeElements:intvector { + 2, + 1, // "Minimal Days in First Week" is unknown. Root value used instead + } + AmPmMarkers{ + "PD", + "MD", + } + DateTimePatterns{ + "h.mm.ss.a z", + "h.mm.ss.a z", + "h:mm:ss.a", + "h.mm.a", + "EEEE, dd MMMM yyyy", + "dd MMMM yyyy", + "yyyy-MM-dd", + "yy-MM-dd", + "{1} {0}", + } + dayNames{ + format{ + abbreviated{ + "Die", + "H\u00EBn", + "Mar", + "M\u00EBr", + "Enj", + "Pre", + "Sht", + } + wide{ + "e diel", + "e h\u00EBn\u00EB", + "e mart\u00EB", + "e m\u00EBrkur\u00EB", + "e enjte", + "e premte", + "e shtun\u00EB", + } + } + } + eras{ + "p.e.r.", + "n.e.r.", + } + monthNames{ + format{ + abbreviated{ + "Jan", + "Shk", + "Mar", + "Pri", + "Maj", + "Qer", + "Kor", + "Gsh", + "Sht", + "Tet", + "N\u00EBn", + "Dhj", + } + wide{ + "janar", + "shkurt", + "mars", + "prill", + "maj", + "qershor", + "korrik", + "gusht", + "shtator", + "tetor", + "n\u00EBntor", + "dhjetor", + } + } + } + } + } } diff --git a/icu4c/source/data/locales/sr.txt b/icu4c/source/data/locales/sr.txt index aff4ccf9f27..d0710dd3d4f 100644 --- a/icu4c/source/data/locales/sr.txt +++ b/icu4c/source/data/locales/sr.txt @@ -196,43 +196,7 @@ sr { ZM { "\u0417\u0430\u043C\u0431\u0438\u0458\u0430" } ZW { "\u0417\u0438\u043C\u0431\u0430\u0431\u0432\u0435" } } - DateTimePatterns { - "HH.mm.ss z", - "HH.mm.ss z", - "HH.mm.ss", - "HH.mm", - "EEEE, dd.MMMM.yyyy.", - "dd.MM.yyyy.", - "dd.MM.yyyy.", - "d.M.yy.", - "{1} {0}", - } - DateTimeElements:intvector { - 2, - 1, // "Minimal Days in First Week" is unknown. Root value used instead - } - DayAbbreviations { - "\u043D\u0435\u0434", - "\u043F\u043E\u043D", - "\u0443\u0442\u043E", - "\u0441\u0440\u0435", - "\u0447\u0435\u0442", - "\u043F\u0435\u0442", - "\u0441\u0443\u0431", - } - DayNames { - "\u043D\u0435\u0434\u0435\u0459\u0430", - "\u043F\u043E\u043D\u0435\u0434\u0435\u0459\u0430\u043A", - "\u0443\u0442\u043E\u0440\u0430\u043A", - "\u0441\u0440\u0435\u0434\u0430", - "\u0447\u0435\u0442\u0432\u0440\u0442\u0430\u043A", - "\u043F\u0435\u0442\u0430\u043A", - "\u0441\u0443\u0431\u043E\u0442\u0430", - } - Eras { - "\u043F. \u043D. \u0435.", - "\u043D. \u0435", - } + Languages { af { "\u0410\u0444\u0440\u0438\u043A\u0430\u043D\u0435\u0440\u0441\u043A\u0438" } sq { "\u0410\u043B\u0431\u0430\u043D\u0441\u043A\u0438" } @@ -295,34 +259,6 @@ sr { vi { "\u0412\u0438\u0458\u0435\u0442\u043D\u0430\u043C\u0441\u043A\u0438" } yi { "\u0408\u0438\u0434\u0438\u0448" } } - MonthAbbreviations { - "\u0458\u0430\u043D", - "\u0444\u0435\u0431", - "\u043C\u0430\u0440", - "\u0430\u043F\u0440", - "\u043C\u0430\u0458", - "\u0458\u0443\u043D", - "\u0458\u0443\u043B", - "\u0430\u0432\u0433", - "\u0441\u0435\u043F", - "\u043E\u043A\u0442", - "\u043D\u043E\u0432", - "\u0434\u0435\u0446", - } - MonthNames { - "\u0458\u0430\u043D\u0443\u0430\u0440", - "\u0444\u0435\u0431\u0440\u0443\u0430\u0440", - "\u043C\u0430\u0440\u0442", - "\u0430\u043F\u0440\u0438\u043B", - "\u043C\u0430\u0458", - "\u0458\u0443\u043D\u0438", - "\u0458\u0443\u043B\u0438", - "\u0430\u0432\u0433\u0443\u0441\u0442", - "\u0441\u0435\u043F\u0442\u0435\u043C\u0431\u0430\u0440", - "\u043E\u043A\u0442\u043E\u0431\u0430\u0440", - "\u043D\u043E\u0432\u0435\u043C\u0431\u0430\u0440", - "\u0434\u0435\u0446\u0435\u043C\u0431\u0430\u0440", - } NumberElements { ",", ".", @@ -357,4 +293,81 @@ sr { Currencies { YUN { "\u0414\u0438\u043D", "YUN" } } + calendar{ + gregorian{ + DateTimeElements:intvector { + 2, + 1, // "Minimal Days in First Week" is unknown. Root value used instead + } + DateTimePatterns{ + "HH.mm.ss z", + "HH.mm.ss z", + "HH.mm.ss", + "HH.mm", + "EEEE, dd.MMMM.yyyy.", + "dd.MM.yyyy.", + "dd.MM.yyyy.", + "d.M.yy.", + "{1} {0}", + } + dayNames{ + format{ + abbreviated{ + "\u043D\u0435\u0434", + "\u043F\u043E\u043D", + "\u0443\u0442\u043E", + "\u0441\u0440\u0435", + "\u0447\u0435\u0442", + "\u043F\u0435\u0442", + "\u0441\u0443\u0431", + } + wide{ + "\u043D\u0435\u0434\u0435\u0459\u0430", + "\u043F\u043E\u043D\u0435\u0434\u0435\u0459\u0430\u043A", + "\u0443\u0442\u043E\u0440\u0430\u043A", + "\u0441\u0440\u0435\u0434\u0430", + "\u0447\u0435\u0442\u0432\u0440\u0442\u0430\u043A", + "\u043F\u0435\u0442\u0430\u043A", + "\u0441\u0443\u0431\u043E\u0442\u0430", + } + } + } + eras{ + "\u043F. \u043D. \u0435.", + "\u043D. \u0435", + } + monthNames{ + format{ + abbreviated{ + "\u0458\u0430\u043D", + "\u0444\u0435\u0431", + "\u043C\u0430\u0440", + "\u0430\u043F\u0440", + "\u043C\u0430\u0458", + "\u0458\u0443\u043D", + "\u0458\u0443\u043B", + "\u0430\u0432\u0433", + "\u0441\u0435\u043F", + "\u043E\u043A\u0442", + "\u043D\u043E\u0432", + "\u0434\u0435\u0446", + } + wide{ + "\u0458\u0430\u043D\u0443\u0430\u0440", + "\u0444\u0435\u0431\u0440\u0443\u0430\u0440", + "\u043C\u0430\u0440\u0442", + "\u0430\u043F\u0440\u0438\u043B", + "\u043C\u0430\u0458", + "\u0458\u0443\u043D\u0438", + "\u0458\u0443\u043B\u0438", + "\u0430\u0432\u0433\u0443\u0441\u0442", + "\u0441\u0435\u043F\u0442\u0435\u043C\u0431\u0430\u0440", + "\u043E\u043A\u0442\u043E\u0431\u0430\u0440", + "\u043D\u043E\u0432\u0435\u043C\u0431\u0430\u0440", + "\u0434\u0435\u0446\u0435\u043C\u0431\u0430\u0440", + } + } + } + } + } } diff --git a/icu4c/source/data/locales/sv.txt b/icu4c/source/data/locales/sv.txt index 58420905f59..5afa07b33db 100644 --- a/icu4c/source/data/locales/sv.txt +++ b/icu4c/source/data/locales/sv.txt @@ -7,10 +7,6 @@ sv { Version{ "2.0" } - AmPmMarkers { - "fm", - "em", - } Countries { Fallback{ "en"} // AD {"Andorra"} @@ -261,39 +257,6 @@ sv { JPY { "\u00A5","Japansk yen" } SEK { "kr", "Svensk krona" } } - DateTimeElements:intvector { - 2, - 4, - } - DateTimePatterns { - "'kl. 'HH.mm.ss z", - "HH.mm.ss z", - "HH.mm.ss", - "HH.mm", - "'den 'd MMMM yyyy", - "'den 'd MMM yyyy", - "yyyy-MM-dd", - "yyyy-MM-dd", - "{1} {0}", - } - DayAbbreviations { - "s\u00F6", - "m\u00E5", - "ti", - "on", - "to", - "fr", - "l\u00F6", - } - DayNames { - "s\u00F6ndag", - "m\u00E5ndag", - "tisdag", - "onsdag", - "torsdag", - "fredag", - "l\u00F6rdag", - } Eras { "f.Kr.", "e.Kr.", @@ -667,34 +630,6 @@ sv { zu {"zulu"} zun {"zu\u00F1i"} } - MonthAbbreviations { - "jan", - "feb", - "mar", - "apr", - "maj", - "jun", - "jul", - "aug", - "sep", - "okt", - "nov", - "dec", - } - MonthNames { - "januari", - "februari", - "mars", - "april", - "maj", - "juni", - "juli", - "augusti", - "september", - "oktober", - "november", - "december", - } NumberElements { ",", "\u00A0", @@ -897,5 +832,81 @@ sv { } } */ + calendar{ + gregorian{ + AmPmMarkers{ + "fm", + "em", + } + DateTimeElements:intvector{ + 2, + 4, + } + DateTimePatterns{ + "'kl. 'HH.mm.ss z", + "HH.mm.ss z", + "HH.mm.ss", + "HH.mm", + "'den 'd MMMM yyyy", + "'den 'd MMM yyyy", + "yyyy-MM-dd", + "yyyy-MM-dd", + "{1} {0}", + } + dayNames{ + format{ + abbreviated{ + "s\u00F6", + "m\u00E5", + "ti", + "on", + "to", + "fr", + "l\u00F6", + } + wide{ + "s\u00F6ndag", + "m\u00E5ndag", + "tisdag", + "onsdag", + "torsdag", + "fredag", + "l\u00F6rdag", + } + } + } + monthNames{ + format{ + abbreviated{ + "jan", + "feb", + "mar", + "apr", + "maj", + "jun", + "jul", + "aug", + "sep", + "okt", + "nov", + "dec", + } + wide{ + "januari", + "februari", + "mars", + "april", + "maj", + "juni", + "juli", + "augusti", + "september", + "oktober", + "november", + "december", + } + } + } + } + } } - diff --git a/icu4c/source/data/locales/sv_FI.txt b/icu4c/source/data/locales/sv_FI.txt index 781145b2f78..00d6afb44ac 100644 --- a/icu4c/source/data/locales/sv_FI.txt +++ b/icu4c/source/data/locales/sv_FI.txt @@ -13,4 +13,4 @@ sv_FI { "#,##0%", "#E0", } -} \ No newline at end of file +} diff --git a/icu4c/source/data/locales/sw.txt b/icu4c/source/data/locales/sw.txt index 6547ed5fb7a..60392f93354 100644 --- a/icu4c/source/data/locales/sw.txt +++ b/icu4c/source/data/locales/sw.txt @@ -117,63 +117,9 @@ sw { //ZM { "Zambia" } //ZW { "Zimbabwe" } } - DateTimeElements:intvector { - 7, - 1, - } - DayAbbreviations { // The DayNames are correct, but DayAbbreviations are only guesses. - "Jpi", - "Jtt", - "Jnn", - "Jtn", - "Alh", - "Iju", - "Jmo", - } - DayNames { - "Jumapili", - "Jumatatu", - "Jumanne", - "Jumatano", - "Alhamisi", - "Ijumaa", - "Jumamosi", - } - Eras { - "KK", - "BK", - } Languages { sw { "Kiswahili" } } - MonthAbbreviations { - "Jan", - "Feb", - "Mar", - "Apr", - "Mei", - "Jun", - "Jul", - "Ago", - "Sep", - "Okt", - "Nov", - "Des", - } - MonthNames { - "Januari", - "Februari", - "Machi", - "Aprili", - "Mei", - "Juni", - "Julai", - "Agosti", - "Septemba", - "Oktoba", - "Novemba", - "Desemba", - } zoneStrings { { "Africa/Nairobi", @@ -201,4 +147,70 @@ sw { KES { "KSh", "KES" } TZS { "TSh", "TZS" } } + calendar{ + gregorian{ + DateTimeElements:intvector { + 7, + 1, + } + dayNames{ + format{ + abbreviated{ + "Jpi", + "Jtt", + "Jnn", + "Jtn", + "Alh", + "Iju", + "Jmo", + } + wide{ + "Jumapili", + "Jumatatu", + "Jumanne", + "Jumatano", + "Alhamisi", + "Ijumaa", + "Jumamosi", + } + } + } + eras{ + "KK", + "BK", + } + monthNames{ + format{ + abbreviated{ + "Jan", + "Feb", + "Mar", + "Apr", + "Mei", + "Jun", + "Jul", + "Ago", + "Sep", + "Okt", + "Nov", + "Des", + } + wide{ + "Januari", + "Februari", + "Machi", + "Aprili", + "Mei", + "Juni", + "Julai", + "Agosti", + "Septemba", + "Oktoba", + "Novemba", + "Desemba", + } + } + } + } + } } diff --git a/icu4c/source/data/locales/ta.txt b/icu4c/source/data/locales/ta.txt index ebffc0c39ba..9c08cb6ce0b 100644 --- a/icu4c/source/data/locales/ta.txt +++ b/icu4c/source/data/locales/ta.txt @@ -7,10 +7,6 @@ ta { Version { "2.0" } - AmPmMarkers { - "\u0b95\u0bbe\u0bb2\u0bc8", - "\u0bae\u0bbe\u0bb2\u0bc8" - } Countries { AD { "\u0b85\u0ba9\u0bcd\u0b9f\u0bcb\u0bb0\u0bbe" } AE { "\u0b90\u0b95\u0bcd\u0b95\u0bbf\u0baf \u0b85\u0bb0\u0baa\u0bc1 \u0b95\u0bc2\u0b9f\u0bcd\u0b9f\u0bbe\u0b9f\u0bcd\u0b9a\u0bbf" } @@ -209,28 +205,6 @@ ta { Currencies { INR { "\u0BB0\u0BC2", "INR" } } - DayAbbreviations { - "\u0b9e\u0bbe", - "\u0ba4\u0bbf", - "\u0b9a\u0bc6", - "\u0baa\u0bc1", - "\u0bb5\u0bbf", - "\u0bb5\u0bc6", - "\u0b9a", - } - DayNames { - "\u0b9e\u0bbe\u0baf\u0bbf\u0bb1\u0bc1", - "\u0ba4\u0bbf\u0b99\u0bcd\u0b95\u0bb3\u0bcd", - "\u0b9a\u0bc6\u0bb5\u0bcd\u0bb5\u0bbe\u0baf\u0bcd", - "\u0baa\u0bc1\u0ba4\u0ba9\u0bcd", - "\u0bb5\u0bbf\u0baf\u0bbe\u0bb4\u0ba9\u0bcd", - "\u0bb5\u0bc6\u0bb3\u0bcd\u0bb3\u0bbf", - "\u0b9a\u0ba9\u0bbf", - } - Eras { - "\u0b95\u0bbf\u0bae\u0bc1", - "\u0b95\u0bbf\u0baa\u0bbf", - } Languages { root { "\u0ba4\u0bae\u0bbf\u0bb4\u0bcd" } @@ -376,38 +350,10 @@ ta { zh { "\u0b9a\u0bc0\u0ba9\u0bae\u0bcd" } zu { "\u0b9c\u0bc2\u0bb2\u0bc2" } } - MonthNames { - "\u0b9c\u0ba9\u0bb5\u0bb0\u0bbf", - "\u0baa\u0bbf\u0baa\u0bcd\u0bb0\u0bb5\u0bb0\u0bbf", - "\u0bae\u0bbe\u0bb0\u0bcd\u0b9a\u0bcd", - "\u0b8f\u0baa\u0bcd\u0bb0\u0bb2\u0bcd", - "\u0bae\u0bc7", - "\u0b9c\u0bc2\u0ba9\u0bcd", - "\u0b9c\u0bc2\u0bb2\u0bc8", - "\u0b86\u0b95\u0bb8\u0bcd\u0b9f\u0bcd", - "\u0b9a\u0bc6\u0baa\u0bcd\u0b9f\u0bae\u0bcd\u0baa\u0bb0\u0bcd", - "\u0b85\u0b95\u0bcd\u0b9f\u0bcb\u0baa\u0bb0\u0bcd", - "\u0ba8\u0bb5\u0bae\u0bcd\u0baa\u0bb0\u0bcd", - "\u0b9f\u0bbf\u0b9a\u0bae\u0bcd\u0baa\u0bb0\u0bcd", - } LocaleScript:array { "Taml" // ISO 15924 Name } ExemplarCharacters{"[[:Taml:]\u200c\u200d]"} - MonthAbbreviations { - "\u0b9c\u0ba9.", - "\u0baa\u0bbf\u0baa\u0bcd.", - "\u0bae\u0bbe\u0bb0\u0bcd.", - "\u0b8f\u0baa\u0bcd.", - "\u0bae\u0bc7", - "\u0b9c\u0bc2\u0ba9\u0bcd", - "\u0b9c\u0bc2\u0bb2\u0bc8", - "\u0b86\u0b95.", - "\u0b9a\u0bc6\u0baa\u0bcd.", - "\u0b85\u0b95\u0bcd.", - "\u0ba8\u0bb5.", - "\u0b9f\u0bbf\u0b9a.", - } // NumberElements { // ".", // ",", @@ -436,4 +382,70 @@ ta { "IST" } } + calendar{ + gregorian{ + AmPmMarkers{ + "\u0b95\u0bbe\u0bb2\u0bc8", + "\u0bae\u0bbe\u0bb2\u0bc8" + } + dayNames{ + format{ + abbreviated{ + "\u0b9e\u0bbe", + "\u0ba4\u0bbf", + "\u0b9a\u0bc6", + "\u0baa\u0bc1", + "\u0bb5\u0bbf", + "\u0bb5\u0bc6", + "\u0b9a", + } + wide{ + "\u0b9e\u0bbe\u0baf\u0bbf\u0bb1\u0bc1", + "\u0ba4\u0bbf\u0b99\u0bcd\u0b95\u0bb3\u0bcd", + "\u0b9a\u0bc6\u0bb5\u0bcd\u0bb5\u0bbe\u0baf\u0bcd", + "\u0baa\u0bc1\u0ba4\u0ba9\u0bcd", + "\u0bb5\u0bbf\u0baf\u0bbe\u0bb4\u0ba9\u0bcd", + "\u0bb5\u0bc6\u0bb3\u0bcd\u0bb3\u0bbf", + "\u0b9a\u0ba9\u0bbf", + } + } + } + eras{ + "\u0b95\u0bbf\u0bae\u0bc1", + "\u0b95\u0bbf\u0baa\u0bbf", + } + monthNames{ + format{ + abbreviated{ + "\u0b9c\u0ba9.", + "\u0baa\u0bbf\u0baa\u0bcd.", + "\u0bae\u0bbe\u0bb0\u0bcd.", + "\u0b8f\u0baa\u0bcd.", + "\u0bae\u0bc7", + "\u0b9c\u0bc2\u0ba9\u0bcd", + "\u0b9c\u0bc2\u0bb2\u0bc8", + "\u0b86\u0b95.", + "\u0b9a\u0bc6\u0baa\u0bcd.", + "\u0b85\u0b95\u0bcd.", + "\u0ba8\u0bb5.", + "\u0b9f\u0bbf\u0b9a.", + } + wide{ + "\u0b9c\u0ba9\u0bb5\u0bb0\u0bbf", + "\u0baa\u0bbf\u0baa\u0bcd\u0bb0\u0bb5\u0bb0\u0bbf", + "\u0bae\u0bbe\u0bb0\u0bcd\u0b9a\u0bcd", + "\u0b8f\u0baa\u0bcd\u0bb0\u0bb2\u0bcd", + "\u0bae\u0bc7", + "\u0b9c\u0bc2\u0ba9\u0bcd", + "\u0b9c\u0bc2\u0bb2\u0bc8", + "\u0b86\u0b95\u0bb8\u0bcd\u0b9f\u0bcd", + "\u0b9a\u0bc6\u0baa\u0bcd\u0b9f\u0bae\u0bcd\u0baa\u0bb0\u0bcd", + "\u0b85\u0b95\u0bcd\u0b9f\u0bcb\u0baa\u0bb0\u0bcd", + "\u0ba8\u0bb5\u0bae\u0bcd\u0baa\u0bb0\u0bcd", + "\u0b9f\u0bbf\u0b9a\u0bae\u0bcd\u0baa\u0bb0\u0bcd", + } + } + } + } + } } diff --git a/icu4c/source/data/locales/ta_IN.txt b/icu4c/source/data/locales/ta_IN.txt index d5453fc4c14..f414caf5ad0 100644 --- a/icu4c/source/data/locales/ta_IN.txt +++ b/icu4c/source/data/locales/ta_IN.txt @@ -15,20 +15,19 @@ ta_IN { "##,##,##0%", "#E0", } - DateTimePatterns { - "h:mm:ss a z", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", - "EEEE d MMMM yyyy", - "d MMMM yyyy", - "dd-MM-yyyy", - "d-M-yy", - "{1} {0}" + calendar{ + gregorian{ + DateTimePatterns{ + "h:mm:ss a z", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", + "EEEE d MMMM yyyy", + "d MMMM yyyy", + "dd-MM-yyyy", + "d-M-yy", + "{1} {0}" + } + } } -// DateTimeElements { -// "1", -// "1" -// } - -} \ No newline at end of file +} diff --git a/icu4c/source/data/locales/te.txt b/icu4c/source/data/locales/te.txt index 7d5ec187ecd..02d71500384 100644 --- a/icu4c/source/data/locales/te.txt +++ b/icu4c/source/data/locales/te.txt @@ -9,10 +9,6 @@ te { Version{ "2.0" } - AmPmMarkers { - "\u0c2a\u0c42\u0c30\u0c4d\u0c35\u0c3e\u0c39\u0c4d\u0c28", - "\u0c05\u0c2a\u0c30\u0c3e\u0c39\u0c4d\u0c28", - } Countries { IN { "\u0c2d\u0c3e\u0c30\u0c24 \u0c26\u0c47\u0c33\u0c66" } } @@ -20,24 +16,6 @@ te { Currencies { INR { "\u0C30\u0C42.", "INR" } } - DayAbbreviations { - "\u0c06\u0c26\u0c3f", - "\u0c38\u0c4b\u0c2e", - "\u0c2e\u0c02\u0c17\u0c33", - "\u0c2c\u0c41\u0c27", - "\u0c17\u0c41\u0c30\u0c41", - "\u0c36\u0c41\u0c15\u0c4d\u0c30", - "\u0c36\u0c28\u0c3f", - } - DayNames { - "\u0c06\u0c26\u0c3f\u0c35\u0c3e\u0c30\u0c02", - "\u0c38\u0c4b\u0c2e\u0c35\u0c3e\u0c30\u0c02", - "\u0c2e\u0c02\u0c17\u0c33\u0c35\u0c3e\u0c30\u0c02", - "\u0c2c\u0c41\u0c27\u0c35\u0c3e\u0c30\u0c02", - "\u0c17\u0c41\u0c30\u0c41\u0c35\u0c3e\u0c30\u0c02", - "\u0c36\u0c41\u0c15\u0c4d\u0c30\u0c35\u0c3e\u0c30\u0c02", - "\u0c36\u0c28\u0c3f\u0c35\u0c3e\u0c30\u0c02", - } ExemplarCharacters{"[[:Telu:]\u200c\u200d]"} LocaleScript{ "Telu", // ISO 15924 Name @@ -45,34 +23,6 @@ te { Languages { te { "\u0c24\u0c46\u0c32\u0c41\u0c17\u0c41" } } - MonthAbbreviations { - "\u0c1c\u0c28\u0c35\u0c30\u0c3f", - "\u0c2b\u0c3f\u0c2c\u0c4d\u0c30\u0c35\u0c30\u0c3f", - "\u0c2e\u0c3e\u0c30\u0c4d\u0c1a\u0c3f", - "\u0c0f\u0c2a\u0c4d\u0c30\u0c3f\u0c32\u0c4d", - "\u0c2e\u0c47", - "\u0c1c\u0c42\u0c28\u0c4d", - "\u0c1c\u0c42\u0c32\u0c48", - "\u0c06\u0c17\u0c38\u0c4d\u0c1f\u0c41", - "\u0c38\u0c46\u0c2a\u0c4d\u0c1f\u0c46\u0c02\u0c2c\u0c30\u0c4d", - "\u0c05\u0c15\u0c4d\u0c1f\u0c4b\u0c2c\u0c30\u0c4d", - "\u0c28\u0c35\u0c02\u0c2c\u0c30\u0c4d", - "\u0c21\u0c3f\u0c38\u0c46\u0c02\u0c2c\u0c30\u0c4d", - } - MonthNames { - "\u0c1c\u0c28\u0c35\u0c30\u0c3f", - "\u0c2b\u0c3f\u0c2c\u0c4d\u0c30\u0c35\u0c30\u0c3f", - "\u0c2e\u0c3e\u0c30\u0c4d\u0c1a\u0c3f", - "\u0c0f\u0c2a\u0c4d\u0c30\u0c3f\u0c32\u0c4d", - "\u0c2e\u0c47", - "\u0c1c\u0c42\u0c28\u0c4d", - "\u0c1c\u0c42\u0c32\u0c48", - "\u0c06\u0c17\u0c38\u0c4d\u0c1f\u0c41", - "\u0c38\u0c46\u0c2a\u0c4d\u0c1f\u0c46\u0c02\u0c2c\u0c30\u0c4d", - "\u0c05\u0c15\u0c4d\u0c1f\u0c4b\u0c2c\u0c30\u0c4d", - "\u0c28\u0c35\u0c02\u0c2c\u0c30\u0c4d", - "\u0c21\u0c3f\u0c38\u0c46\u0c02\u0c2c\u0c30\u0c4d", - } NumberElements { ".", ",", @@ -92,4 +42,66 @@ te { // Eras{} // localPatternChars{} // + calendar{ + gregorian{ + AmPmMarkers{ + "\u0c2a\u0c42\u0c30\u0c4d\u0c35\u0c3e\u0c39\u0c4d\u0c28", + "\u0c05\u0c2a\u0c30\u0c3e\u0c39\u0c4d\u0c28", + } + dayNames{ + format{ + abbreviated{ + "\u0c06\u0c26\u0c3f", + "\u0c38\u0c4b\u0c2e", + "\u0c2e\u0c02\u0c17\u0c33", + "\u0c2c\u0c41\u0c27", + "\u0c17\u0c41\u0c30\u0c41", + "\u0c36\u0c41\u0c15\u0c4d\u0c30", + "\u0c36\u0c28\u0c3f", + } + wide{ + "\u0c06\u0c26\u0c3f\u0c35\u0c3e\u0c30\u0c02", + "\u0c38\u0c4b\u0c2e\u0c35\u0c3e\u0c30\u0c02", + "\u0c2e\u0c02\u0c17\u0c33\u0c35\u0c3e\u0c30\u0c02", + "\u0c2c\u0c41\u0c27\u0c35\u0c3e\u0c30\u0c02", + "\u0c17\u0c41\u0c30\u0c41\u0c35\u0c3e\u0c30\u0c02", + "\u0c36\u0c41\u0c15\u0c4d\u0c30\u0c35\u0c3e\u0c30\u0c02", + "\u0c36\u0c28\u0c3f\u0c35\u0c3e\u0c30\u0c02", + } + } + } + monthNames{ + format{ + abbreviated{ + "\u0c1c\u0c28\u0c35\u0c30\u0c3f", + "\u0c2b\u0c3f\u0c2c\u0c4d\u0c30\u0c35\u0c30\u0c3f", + "\u0c2e\u0c3e\u0c30\u0c4d\u0c1a\u0c3f", + "\u0c0f\u0c2a\u0c4d\u0c30\u0c3f\u0c32\u0c4d", + "\u0c2e\u0c47", + "\u0c1c\u0c42\u0c28\u0c4d", + "\u0c1c\u0c42\u0c32\u0c48", + "\u0c06\u0c17\u0c38\u0c4d\u0c1f\u0c41", + "\u0c38\u0c46\u0c2a\u0c4d\u0c1f\u0c46\u0c02\u0c2c\u0c30\u0c4d", + "\u0c05\u0c15\u0c4d\u0c1f\u0c4b\u0c2c\u0c30\u0c4d", + "\u0c28\u0c35\u0c02\u0c2c\u0c30\u0c4d", + "\u0c21\u0c3f\u0c38\u0c46\u0c02\u0c2c\u0c30\u0c4d", + } + wide{ + "\u0c1c\u0c28\u0c35\u0c30\u0c3f", + "\u0c2b\u0c3f\u0c2c\u0c4d\u0c30\u0c35\u0c30\u0c3f", + "\u0c2e\u0c3e\u0c30\u0c4d\u0c1a\u0c3f", + "\u0c0f\u0c2a\u0c4d\u0c30\u0c3f\u0c32\u0c4d", + "\u0c2e\u0c47", + "\u0c1c\u0c42\u0c28\u0c4d", + "\u0c1c\u0c42\u0c32\u0c48", + "\u0c06\u0c17\u0c38\u0c4d\u0c1f\u0c41", + "\u0c38\u0c46\u0c2a\u0c4d\u0c1f\u0c46\u0c02\u0c2c\u0c30\u0c4d", + "\u0c05\u0c15\u0c4d\u0c1f\u0c4b\u0c2c\u0c30\u0c4d", + "\u0c28\u0c35\u0c02\u0c2c\u0c30\u0c4d", + "\u0c21\u0c3f\u0c38\u0c46\u0c02\u0c2c\u0c30\u0c4d", + } + } + } + } + } } diff --git a/icu4c/source/data/locales/te_IN.txt b/icu4c/source/data/locales/te_IN.txt index 068c3fae752..3d1d04fe2d8 100644 --- a/icu4c/source/data/locales/te_IN.txt +++ b/icu4c/source/data/locales/te_IN.txt @@ -9,17 +9,6 @@ te_IN { Version{ "2.0" } - DateTimePatterns { - "h:mm:ss a z", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", - "EEEE d MMMM yyyy", - "d MMMM yyyy", - "dd-MM-yyyy", - "dd-MM-yy", - "{1} {0}", - } // LanguageLibraryUse { "Te" } // Measurement { "Metric" } @@ -34,5 +23,19 @@ te_IN { // Width { "210" } // Units { "mm" } //} + calendar{ + gregorian{ + DateTimePatterns{ + "h:mm:ss a z", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", + "EEEE d MMMM yyyy", + "d MMMM yyyy", + "dd-MM-yyyy", + "dd-MM-yy", + "{1} {0}", + } + } + } } - diff --git a/icu4c/source/data/locales/th.txt b/icu4c/source/data/locales/th.txt index f5a7dab9872..2915972e862 100644 --- a/icu4c/source/data/locales/th.txt +++ b/icu4c/source/data/locales/th.txt @@ -6,7 +6,7 @@ // *************************************************************************** th { - BreakDictionaryData:import { "../brkitr/thaidict.brk" } + //BreakDictionaryData:import { "../brkitr/thaidict.brk" } Version{ "2.0" } Countries { AF { "\u0e2d\u0e31\u0e1f\u0e01\u0e32\u0e19\u0e34\u0e2a\u0e16\u0e32\u0e19" } @@ -209,46 +209,6 @@ th { ZM { "\u0e41\u0e0b\u0e21\u0e40\u0e1a\u0e35\u0e22" } ZW { "\u0e0b\u0e34\u0e21\u0e1a\u0e32\u0e1a\u0e40\u0e27" } } - DateTimePatterns { - "H' \u0E19\u0E32\u0E2C\u0E34\u0E01\u0E32 'm' \u0E19\u0E32\u0E17\u0E35 'ss' \u0E27" - "\u0E34\u0E19\u0E32\u0E17\u0E35'", - "H' \u0E19\u0E32\u0E2C\u0E34\u0E01\u0E32 'm' \u0E19\u0E32\u0E17\u0E35'", - "H:mm:ss", - "H:mm", - "EEEE'\u0E17\u0E35\u0E48 'd MMMM G yyyy", - "d MMMM yyyy", - "d MMM yyyy", - "d/M/yyyy", - "{1}, {0}", - } - DayAbbreviations { - "\u0E2D\u0E32.", - "\u0E08.", - "\u0E2D.", - "\u0E1E.", - "\u0E1E\u0E24.", - "\u0E28.", - "\u0E2A.", - } - DayNames { - "\u0E27\u0E31\u0E19\u0E2D\u0E32\u0E17\u0E34\u0E15\u0E22\u0E4C", - "\u0E27\u0E31\u0E19\u0E08\u0E31\u0E19\u0E17\u0E23\u0E4C", - "\u0E27\u0E31\u0E19\u0E2D\u0E31\u0E07\u0E04\u0E32\u0E23", - "\u0E27\u0E31\u0E19\u0E1E\u0E38\u0E18", - "\u0E27\u0E31\u0E19\u0E1E\u0E24\u0E2B\u0E31\u0E2A\u0E1A\u0E14\u0E35", - "\u0E27\u0E31\u0E19\u0E28\u0E38\u0E01\u0E23\u0E4C", - "\u0E27\u0E31\u0E19\u0E40\u0E2A\u0E32\u0E23\u0E4C", - } - AmPmMarkers { - "\u0E01\u0E48\u0E2D\u0E19\u0E40\u0E17\u0E35\u0E48\u0E22\u0E07", - "\u0E2B\u0E25\u0E31\u0E07\u0E40\u0E17\u0E35\u0E48\u0E22\u0E07", - } - Eras { - "\u0E1B\u0E35\u0E01\u0E48\u0E2D\u0E19\u0E04\u0E23\u0E34\u0E2A\u0E15\u0E4C\u0E01\u0E32" - "\u0E25\u0E17\u0E35\u0E48", - - "\u0E04.\u0E28.", - } Languages { ab { "\u0e41\u0e2d\u0e1a\u0e01\u0e32\u0e40\u0e0b\u0e35\u0e22" } aa { "\u0e2d\u0e32\u0e1f\u0e32" } @@ -391,34 +351,6 @@ th { za { "\u0e08\u0e27\u0e07" } zu { "\u0e0b\u0e39\u0e25\u0e39" } } - MonthAbbreviations { - "\u0E21.\u0E04.", - "\u0E01.\u0E1E.", - "\u0E21\u0E35.\u0E04.", - "\u0E40\u0E21.\u0E22.", - "\u0E1E.\u0E04.", - "\u0E21\u0E34.\u0E22.", - "\u0E01.\u0E04.", - "\u0E2A.\u0E04.", - "\u0E01.\u0E22.", - "\u0E15.\u0E04.", - "\u0E1E.\u0E22.", - "\u0E18.\u0E04.", - } - MonthNames { - "\u0E21\u0E01\u0E23\u0E32\u0E04\u0E21", - "\u0E01\u0E38\u0E21\u0E20\u0E32\u0E1E\u0E31\u0E19\u0E18\u0E4C", - "\u0E21\u0E35\u0E19\u0E32\u0E04\u0E21", - "\u0E40\u0E21\u0E29\u0E32\u0E22\u0E19", - "\u0E1E\u0E24\u0E29\u0E20\u0E32\u0E04\u0E21", - "\u0E21\u0E34\u0E16\u0E38\u0E19\u0E32\u0E22\u0E19", - "\u0E01\u0E23\u0E01\u0E0E\u0E32\u0E04\u0E21", - "\u0E2A\u0E34\u0E07\u0E2B\u0E32\u0E04\u0E21", - "\u0E01\u0E31\u0E19\u0E22\u0E32\u0E22\u0E19", - "\u0E15\u0E38\u0E25\u0E32\u0E04\u0E21", - "\u0E1E\u0E24\u0E28\u0E08\u0E34\u0E01\u0E32\u0E22\u0E19", - "\u0E18\u0E31\u0E19\u0E27\u0E32\u0E04\u0E21", - } localPatternChars { "GanjkHmsSEDFwWxhKzAeugXZ" } /* zoneStrings { @@ -481,18 +413,99 @@ th { } // (ICU 2.6) International Calendar Data. Note, THE FORMAT OF THIS DATA WILL CHANGE IN FUTURE RELEASES. - Eras_buddhist:array { "\u0e1e.\u0e28." } - DateTimePatterns_buddhist { - "H' \u0E19\u0E32\u0E2C\u0E34\u0E01\u0E32 'm' \u0E19\u0E32\u0E17\u0E35 'ss' \u0E27\u0E34\u0E19\u0E32\u0E17\u0E35'", - "H' \u0E19\u0E32\u0E2C\u0E34\u0E01\u0E32 'm' \u0E19\u0E32\u0E17\u0E35'", - "H:mm:ss", - "H:mm", - "EEEE'\u0E17\u0E35\u0E48 'd MMMM G yyyy", - "d MMMM yyyy", - "d MMM yyyy", - "d/M/yyyy", - "{1}, {0}", + calendar{ + buddhist{ + eras:array { "\u0e1e.\u0e28." } + DateTimePatterns { + "H' \u0E19\u0E32\u0E2C\u0E34\u0E01\u0E32 'm' \u0E19\u0E32\u0E17\u0E35 'ss' \u0E27\u0E34\u0E19\u0E32\u0E17\u0E35'", + "H' \u0E19\u0E32\u0E2C\u0E34\u0E01\u0E32 'm' \u0E19\u0E32\u0E17\u0E35'", + "H:mm:ss", + "H:mm", + "EEEE'\u0E17\u0E35\u0E48 'd MMMM G yyyy", + "d MMMM yyyy", + "d MMM yyyy", + "d/M/yyyy", + "{1}, {0}", + } + } + gregorian{ + AmPmMarkers{ + "\u0E01\u0E48\u0E2D\u0E19\u0E40\u0E17\u0E35\u0E48\u0E22\u0E07", + "\u0E2B\u0E25\u0E31\u0E07\u0E40\u0E17\u0E35\u0E48\u0E22\u0E07", + } + DateTimePatterns{ + "H' \u0E19\u0E32\u0E2C\u0E34\u0E01\u0E32 'm' \u0E19\u0E32\u0E17\u0E35 'ss' \u0E27" + "\u0E34\u0E19\u0E32\u0E17\u0E35'", + "H' \u0E19\u0E32\u0E2C\u0E34\u0E01\u0E32 'm' \u0E19\u0E32\u0E17\u0E35'", + "H:mm:ss", + "H:mm", + "EEEE'\u0E17\u0E35\u0E48 'd MMMM G yyyy", + "d MMMM yyyy", + "d MMM yyyy", + "d/M/yyyy", + "{1}, {0}", + } + dayNames{ + format{ + abbreviated{ + "\u0E2D\u0E32.", + "\u0E08.", + "\u0E2D.", + "\u0E1E.", + "\u0E1E\u0E24.", + "\u0E28.", + "\u0E2A.", + } + wide{ + "\u0E27\u0E31\u0E19\u0E2D\u0E32\u0E17\u0E34\u0E15\u0E22\u0E4C", + "\u0E27\u0E31\u0E19\u0E08\u0E31\u0E19\u0E17\u0E23\u0E4C", + "\u0E27\u0E31\u0E19\u0E2D\u0E31\u0E07\u0E04\u0E32\u0E23", + "\u0E27\u0E31\u0E19\u0E1E\u0E38\u0E18", + "\u0E27\u0E31\u0E19\u0E1E\u0E24\u0E2B\u0E31\u0E2A\u0E1A\u0E14\u0E35", + "\u0E27\u0E31\u0E19\u0E28\u0E38\u0E01\u0E23\u0E4C", + "\u0E27\u0E31\u0E19\u0E40\u0E2A\u0E32\u0E23\u0E4C", + } + } + } + eras{ + "\u0E1B\u0E35\u0E01\u0E48\u0E2D\u0E19\u0E04\u0E23\u0E34\u0E2A\u0E15\u0E4C\u0E01\u0E32" + "\u0E25\u0E17\u0E35\u0E48", + + "\u0E04.\u0E28.", + } + monthNames{ + format{ + abbreviated{ + "\u0E21.\u0E04.", + "\u0E01.\u0E1E.", + "\u0E21\u0E35.\u0E04.", + "\u0E40\u0E21.\u0E22.", + "\u0E1E.\u0E04.", + "\u0E21\u0E34.\u0E22.", + "\u0E01.\u0E04.", + "\u0E2A.\u0E04.", + "\u0E01.\u0E22.", + "\u0E15.\u0E04.", + "\u0E1E.\u0E22.", + "\u0E18.\u0E04.", + } + wide{ + "\u0E21\u0E01\u0E23\u0E32\u0E04\u0E21", + "\u0E01\u0E38\u0E21\u0E20\u0E32\u0E1E\u0E31\u0E19\u0E18\u0E4C", + "\u0E21\u0E35\u0E19\u0E32\u0E04\u0E21", + "\u0E40\u0E21\u0E29\u0E32\u0E22\u0E19", + "\u0E1E\u0E24\u0E29\u0E20\u0E32\u0E04\u0E21", + "\u0E21\u0E34\u0E16\u0E38\u0E19\u0E32\u0E22\u0E19", + "\u0E01\u0E23\u0E01\u0E0E\u0E32\u0E04\u0E21", + "\u0E2A\u0E34\u0E07\u0E2B\u0E32\u0E04\u0E21", + "\u0E01\u0E31\u0E19\u0E22\u0E32\u0E22\u0E19", + "\u0E15\u0E38\u0E25\u0E32\u0E04\u0E21", + "\u0E1E\u0E24\u0E28\u0E08\u0E34\u0E01\u0E32\u0E22\u0E19", + "\u0E18\u0E31\u0E19\u0E27\u0E32\u0E04\u0E21", + } + } + } + } } - } diff --git a/icu4c/source/data/locales/th_TH_TRADITIONAL.txt b/icu4c/source/data/locales/th_TH_TRADITIONAL.txt index f4cb8fa6987..8a7e58d6021 100644 --- a/icu4c/source/data/locales/th_TH_TRADITIONAL.txt +++ b/icu4c/source/data/locales/th_TH_TRADITIONAL.txt @@ -10,5 +10,7 @@ th_TH_TRADITIONAL { // International Calendars Data. // NOTE (ICU 2.6) - the format of this data WILL CHANGE in future releases. - DefaultCalendar { "buddhist" } + calendar{ + default{"buddhist" } + } } diff --git a/icu4c/source/data/locales/ti.txt b/icu4c/source/data/locales/ti.txt index 087d060e95e..e0d8abb207f 100644 --- a/icu4c/source/data/locales/ti.txt +++ b/icu4c/source/data/locales/ti.txt @@ -9,67 +9,79 @@ ti{ Version{ "2.0" } - AmPmMarkers { - "\u1295\u1309\u1206 \u1230\u12D3\u1270", - "\u12F5\u1215\u122D \u1230\u12D3\u1275", - } Countries:alias { "am" } - DayAbbreviations { - "\u1230\u1295\u1260", - "\u1230\u1291\u12ED", - "\u1220\u1209\u1235", - "\u1228\u1261\u12D5", - "\u1283\u1219\u1235", - "\u12D3\u122D\u1262", - "\u1240\u12F3\u121D", - } - DayNames { - "\u1230\u1295\u1260\u1275", - "\u1230\u1291\u12ED", - "\u1220\u1209\u1235", - "\u1228\u1261\u12D5", - "\u1283\u1219\u1235", - "\u12D3\u122D\u1262", - "\u1240\u12F3\u121D", - } - Eras { - "\u12D3/\u12D3", - "\u12D3/\u121D" - } - MonthAbbreviations { - "\u1303\u1295\u12E9", - "\u134C\u1265\u1229", - "\u121B\u122D\u127D", - "\u12A4\u1355\u1228", - "\u121C\u12ED", - "\u1301\u1295", - "\u1301\u120B\u12ED", - "\u12A6\u1308\u1235", - "\u1234\u1355\u1274", - "\u12A6\u12AD\u1270", - "\u1296\u126C\u121D", - "\u12F2\u1234\u121D", - } - MonthNames { - "\u1303\u1295\u12E9\u12C8\u122A", - "\u134C\u1265\u1229\u12C8\u122A", - "\u121B\u122D\u127D", - "\u12A4\u1355\u1228\u120D", - "\u121C\u12ED", - "\u1301\u1295", - "\u1301\u120B\u12ED", - "\u12A6\u1308\u1235\u1275", - "\u1234\u1355\u1274\u121D\u1260\u122D", - "\u12A6\u12AD\u1270\u12CD\u1260\u122D", - "\u1296\u126C\u121D\u1260\u122D", - "\u12F2\u1234\u121D\u1260\u122D", - } - DateTimeElements:intvector { - 7, - 1, - } + Languages:alias { "am" } LocaleScript{ "Ethi", } ExemplarCharacters{"[:Ethi:]"} + calendar{ + gregorian{ + AmPmMarkers{ + "\u1295\u1309\u1206 \u1230\u12D3\u1270", + "\u12F5\u1215\u122D \u1230\u12D3\u1275", + } + DateTimeElements:intvector { + 7, + 1, + } + dayNames{ + format{ + abbreviated{ + "\u1230\u1295\u1260", + "\u1230\u1291\u12ED", + "\u1220\u1209\u1235", + "\u1228\u1261\u12D5", + "\u1283\u1219\u1235", + "\u12D3\u122D\u1262", + "\u1240\u12F3\u121D", + } + wide{ + "\u1230\u1295\u1260\u1275", + "\u1230\u1291\u12ED", + "\u1220\u1209\u1235", + "\u1228\u1261\u12D5", + "\u1283\u1219\u1235", + "\u12D3\u122D\u1262", + "\u1240\u12F3\u121D", + } + } + } + eras{ + "\u12D3/\u12D3", + "\u12D3/\u121D" + } + monthNames{ + format{ + abbreviated{ + "\u1303\u1295\u12E9", + "\u134C\u1265\u1229", + "\u121B\u122D\u127D", + "\u12A4\u1355\u1228", + "\u121C\u12ED", + "\u1301\u1295", + "\u1301\u120B\u12ED", + "\u12A6\u1308\u1235", + "\u1234\u1355\u1274", + "\u12A6\u12AD\u1270", + "\u1296\u126C\u121D", + "\u12F2\u1234\u121D", + } + wide{ + "\u1303\u1295\u12E9\u12C8\u122A", + "\u134C\u1265\u1229\u12C8\u122A", + "\u121B\u122D\u127D", + "\u12A4\u1355\u1228\u120D", + "\u121C\u12ED", + "\u1301\u1295", + "\u1301\u120B\u12ED", + "\u12A6\u1308\u1235\u1275", + "\u1234\u1355\u1274\u121D\u1260\u122D", + "\u12A6\u12AD\u1270\u12CD\u1260\u122D", + "\u1296\u126C\u121D\u1260\u122D", + "\u12F2\u1234\u121D\u1260\u122D", + } + } + } + } + } } - diff --git a/icu4c/source/data/locales/ti_ER.txt b/icu4c/source/data/locales/ti_ER.txt index b054cbdddac..a5183ee0ccc 100644 --- a/icu4c/source/data/locales/ti_ER.txt +++ b/icu4c/source/data/locales/ti_ER.txt @@ -9,63 +9,6 @@ ti_ER{ Version{ "2.0" } - DayAbbreviations { - "\u1230\u1295\u1260", - "\u1230\u1291\u12ED", - "\u1230\u1209\u1235", - "\u1228\u1261\u12D5", - "\u1213\u1219\u1235", - "\u12D3\u122D\u1262", - "\u1240\u12F3\u121D", - } - DayNames { - "\u1230\u1295\u1260\u1275", - "\u1230\u1291\u12ED", - "\u1230\u1209\u1235", - "\u1228\u1261\u12D5", - "\u1213\u1219\u1235", - "\u12D3\u122D\u1262", - "\u1240\u12F3\u121D", - } - MonthAbbreviations { - "\u1325\u122A", - "\u1208\u12AB\u1272", - "\u1218\u130B\u1262", - "\u121A\u12EB\u12DD", - "\u130D\u1295\u1266", - "\u1230\u1290", - "\u1213\u121D\u1208", - "\u1290\u1213\u1230", - "\u1218\u1235\u12A8", - "\u1325\u1245\u121D", - "\u1215\u12F3\u122D", - "\u1273\u1215\u1233", - } - MonthNames { - "\u1325\u122A", - "\u1208\u12AB\u1272\u1275", - "\u1218\u130B\u1262\u1275", - "\u121A\u12EB\u12DD\u12EB", - "\u130D\u1295\u1266\u1275", - "\u1230\u1290", - "\u1213\u121D\u1208", - "\u1290\u1213\u1230", - "\u1218\u1235\u12A8\u1228\u121D", - "\u1325\u1245\u121D\u1272", - "\u1215\u12F3\u122D", - "\u1273\u1215\u1233\u1235", - } - DateTimePatterns { - "h:mm:ss a", - "h:mm:ss a", - "h:mm:ss a", - "h:mm a", - "EEEE\u1361 dd MMMM \u1218\u12D3\u120D\u1272 yyyy G", - "dd MMMM yyyy", - "dd-MMM-yy", - "dd/MM/yy", - "{1} {0}", - } // Measurement { "Metric" } // NumberElements { // ".", @@ -91,4 +34,73 @@ ti_ER{ Currencies { ERN { "$", "ERN" } } + calendar{ + gregorian{ + DateTimePatterns{ + "h:mm:ss a", + "h:mm:ss a", + "h:mm:ss a", + "h:mm a", + "EEEE\u1361 dd MMMM \u1218\u12D3\u120D\u1272 yyyy G", + "dd MMMM yyyy", + "dd-MMM-yy", + "dd/MM/yy", + "{1} {0}", + } + dayNames{ + format{ + abbreviated{ + "\u1230\u1295\u1260", + "\u1230\u1291\u12ED", + "\u1230\u1209\u1235", + "\u1228\u1261\u12D5", + "\u1213\u1219\u1235", + "\u12D3\u122D\u1262", + "\u1240\u12F3\u121D", + } + wide{ + "\u1230\u1295\u1260\u1275", + "\u1230\u1291\u12ED", + "\u1230\u1209\u1235", + "\u1228\u1261\u12D5", + "\u1213\u1219\u1235", + "\u12D3\u122D\u1262", + "\u1240\u12F3\u121D", + } + } + } + monthNames{ + format{ + abbreviated{ + "\u1325\u122A", + "\u1208\u12AB\u1272", + "\u1218\u130B\u1262", + "\u121A\u12EB\u12DD", + "\u130D\u1295\u1266", + "\u1230\u1290", + "\u1213\u121D\u1208", + "\u1290\u1213\u1230", + "\u1218\u1235\u12A8", + "\u1325\u1245\u121D", + "\u1215\u12F3\u122D", + "\u1273\u1215\u1233", + } + wide{ + "\u1325\u122A", + "\u1208\u12AB\u1272\u1275", + "\u1218\u130B\u1262\u1275", + "\u121A\u12EB\u12DD\u12EB", + "\u130D\u1295\u1266\u1275", + "\u1230\u1290", + "\u1213\u121D\u1208", + "\u1290\u1213\u1230", + "\u1218\u1235\u12A8\u1228\u121D", + "\u1325\u1245\u121D\u1272", + "\u1215\u12F3\u122D", + "\u1273\u1215\u1233\u1235", + } + } + } + } + } } diff --git a/icu4c/source/data/locales/ti_ET.txt b/icu4c/source/data/locales/ti_ET.txt index a4450a517ca..e889464f3a7 100644 --- a/icu4c/source/data/locales/ti_ET.txt +++ b/icu4c/source/data/locales/ti_ET.txt @@ -9,17 +9,6 @@ ti_ET { Version{ "2.0" } - DateTimePatterns { - "h:mm:ss a", - "h:mm:ss a", - "h:mm:ss a", - "h:mm a", - "EEEE\u1363 dd MMMM \u1218\u12D3\u120D\u1272 yyyy G", - "dd MMMM yyyy", - "dd-MMM-yy", - "dd/MM/yy", - "{1} {0}", - } // Measurement { "Metric" } // NumberElements { // ".", @@ -50,4 +39,19 @@ ti_ET { Currencies { ETB { "$", "ETB" } } + calendar{ + gregorian{ + DateTimePatterns{ + "h:mm:ss a", + "h:mm:ss a", + "h:mm:ss a", + "h:mm a", + "EEEE\u1363 dd MMMM \u1218\u12D3\u120D\u1272 yyyy G", + "dd MMMM yyyy", + "dd-MMM-yy", + "dd/MM/yy", + "{1} {0}", + } + } + } } diff --git a/icu4c/source/data/locales/tr.txt b/icu4c/source/data/locales/tr.txt index cd1a5f06ec5..e49547160c0 100644 --- a/icu4c/source/data/locales/tr.txt +++ b/icu4c/source/data/locales/tr.txt @@ -249,43 +249,7 @@ tr { ZM { "Zambiya" } //ZW { "Zimbabwe" } } - DateTimeElements:intvector { - 2, - 1, - } - DateTimePatterns { - "HH:mm:ss z", - "HH:mm:ss z", - "HH:mm:ss", - "HH:mm", - "dd MMMM yyyy EEEE", - "dd MMMM yyyy EEEE", - "dd.MMM.yyyy", - "dd.MM.yyyy", - "{1} {0}", - } - DayAbbreviations { - "Paz", - "Pzt", - "Sal", - "\u00C7ar", - "Per", - "Cum", - "Cmt", - } - DayNames { - "Pazar", - "Pazartesi", - "Sal\u0131", - "\u00C7ar\u015Famba", - "Per\u015Fembe", - "Cuma", - "Cumartesi", - } - Eras { - "M\u00D6", - "MS", - } + Languages { aa { "Afar" } ab { "Abazca" } @@ -429,34 +393,6 @@ tr { //zh_cn { "\u00C7ince (Basitle\u015Ftirilmi\u015F)" } //zh_tw { "\u00C7ince (Geleneksel)" } } - MonthAbbreviations { - "Oca", - "\u015Eub", - "Mar", - "Nis", - "May", - "Haz", - "Tem", - "A\u011Fu", - "Eyl", - "Eki", - "Kas", - "Ara", - } - MonthNames { - "Ocak", - "\u015Eubat", - "Mart", - "Nisan", - "May\u0131s", - "Haziran", - "Temmuz", - "A\u011Fustos", - "Eyl\u00FCl", - "Ekim", - "Kas\u0131m", - "Aral\u0131k", - } NumberElements { ",", ".", @@ -485,4 +421,81 @@ tr { // TRL { "\u20A4", "TRL" } // Turkish Lira (Rarely used) TRL { "TL", "TRL" } // Turkish Lira } + calendar{ + gregorian{ + DateTimeElements:intvector { + 2, + 1, + } + DateTimePatterns{ + "HH:mm:ss z", + "HH:mm:ss z", + "HH:mm:ss", + "HH:mm", + "dd MMMM yyyy EEEE", + "dd MMMM yyyy EEEE", + "dd.MMM.yyyy", + "dd.MM.yyyy", + "{1} {0}", + } + dayNames{ + format{ + abbreviated{ + "Paz", + "Pzt", + "Sal", + "\u00C7ar", + "Per", + "Cum", + "Cmt", + } + wide{ + "Pazar", + "Pazartesi", + "Sal\u0131", + "\u00C7ar\u015Famba", + "Per\u015Fembe", + "Cuma", + "Cumartesi", + } + } + } + eras{ + "M\u00D6", + "MS", + } + monthNames{ + format{ + abbreviated{ + "Oca", + "\u015Eub", + "Mar", + "Nis", + "May", + "Haz", + "Tem", + "A\u011Fu", + "Eyl", + "Eki", + "Kas", + "Ara", + } + wide{ + "Ocak", + "\u015Eubat", + "Mart", + "Nisan", + "May\u0131s", + "Haziran", + "Temmuz", + "A\u011Fustos", + "Eyl\u00FCl", + "Ekim", + "Kas\u0131m", + "Aral\u0131k", + } + } + } + } + } } diff --git a/icu4c/source/data/locales/uk.txt b/icu4c/source/data/locales/uk.txt index 58f85c8cad8..954d40ecb6e 100644 --- a/icu4c/source/data/locales/uk.txt +++ b/icu4c/source/data/locales/uk.txt @@ -253,39 +253,6 @@ uk { Currencies { UAH { "\u0433\u0440\u043D.", "UAH" } } - DateTimeElements:intvector { - 2, - 1, - } - DateTimePatterns { - "HH:mm:ss z", - "HH:mm:ss z", - "HH:mm:ss", - "HH:mm", - "EEEE, d MMMM yyyy '\u0440.'", - "d MMMM yyyy", - "d MMM yyyy", - "dd.MM.yy", - "{1} {0}", - } - DayAbbreviations { - "\u041D\u0434", - "\u041F\u043D", - "\u0412\u0442", - "\u0421\u0440", - "\u0427\u0442", - "\u041F\u0442", - "\u0421\u0431", - } - DayNames { - "\u041D\u0435\u0434\u0456\u043B\u044F", - "\u041F\u043E\u043D\u0435\u0434\u0456\u043B\u043E\u043A", - "\u0412\u0456\u0432\u0442\u043E\u0440\u043E\u043A", - "\u0421\u0435\u0440\u0435\u0434\u0430", - "\u0427\u0435\u0442\u0432\u0435\u0440", - "\u041F'\u044F\u0442\u043D\u0438\u0446\u044F", - "\u0421\u0443\u0431\u043E\u0442\u0430", - } // Eras { // Old value // "\u0434\u043E \u043D.\u0435.", // "\u043F\u0456\u0441\u043B\u044F \u043D.\u0435.", @@ -443,34 +410,6 @@ uk { "Cyrl" // ISO 15924 Name } localPatternChars { "GanjkHmsSEDFwWxhKzAeugXZ" } - MonthAbbreviations { - "\u0441\u0456\u0447", - "\u043B\u044E\u0442", - "\u0431\u0435\u0440", - "\u043A\u0432\u0456\u0442", - "\u0442\u0440\u0430\u0432", - "\u0447\u0435\u0440\u0432", - "\u043B\u0438\u043F", - "\u0441\u0435\u0440\u043F", - "\u0432\u0435\u0440", - "\u0436\u043E\u0432\u0442", - "\u043B\u0438\u0441\u0442", - "\u0433\u0440\u0443\u0434", - } - MonthNames { - "\u0441\u0456\u0447\u043D\u044F", - "\u043B\u044E\u0442\u043E\u0433\u043E", - "\u0431\u0435\u0440\u0435\u0437\u043d\u044f", - "\u043A\u0432\u0456\u0442\u043D\u044F", - "\u0442\u0440\u0430\u0432\u043D\u044F", - "\u0447\u0435\u0440\u0432\u043D\u044F", - "\u043B\u0438\u043F\u043D\u044F", - "\u0441\u0435\u0440\u043F\u043D\u044F", - "\u0432\u0435\u0440\u0435\u0441\u043D\u044F", - "\u0436\u043E\u0432\u0442\u043D\u044F", - "\u043B\u0438\u0441\u0442\u043E\u043F\u0430\u0434\u0430", - "\u0433\u0440\u0443\u0434\u043D\u044F", - } NumberElements { ",", "\u00A0", @@ -530,4 +469,77 @@ uk { "5,000,000: << \u043C\u0456\u043B\u044C\u0439\u043E\u043D\u0456\u0432[ >>];\n" "1,000,000,000: << \u043C\u0456\u043B\u044C\u044F\u0440\u0434[ >>];" } + calendar{ + gregorian{ + DateTimeElements:intvector{ + 2, + 1, + } + DateTimePatterns{ + "HH:mm:ss z", + "HH:mm:ss z", + "HH:mm:ss", + "HH:mm", + "EEEE, d MMMM yyyy '\u0440.'", + "d MMMM yyyy", + "d MMM yyyy", + "dd.MM.yy", + "{1} {0}", + } + dayNames{ + format{ + abbreviated{ + "\u041D\u0434", + "\u041F\u043D", + "\u0412\u0442", + "\u0421\u0440", + "\u0427\u0442", + "\u041F\u0442", + "\u0421\u0431", + } + wide{ + "\u041D\u0435\u0434\u0456\u043B\u044F", + "\u041F\u043E\u043D\u0435\u0434\u0456\u043B\u043E\u043A", + "\u0412\u0456\u0432\u0442\u043E\u0440\u043E\u043A", + "\u0421\u0435\u0440\u0435\u0434\u0430", + "\u0427\u0435\u0442\u0432\u0435\u0440", + "\u041F'\u044F\u0442\u043D\u0438\u0446\u044F", + "\u0421\u0443\u0431\u043E\u0442\u0430", + } + } + } + monthNames{ + format{ + abbreviated{ + "\u0441\u0456\u0447", + "\u043B\u044E\u0442", + "\u0431\u0435\u0440", + "\u043A\u0432\u0456\u0442", + "\u0442\u0440\u0430\u0432", + "\u0447\u0435\u0440\u0432", + "\u043B\u0438\u043F", + "\u0441\u0435\u0440\u043F", + "\u0432\u0435\u0440", + "\u0436\u043E\u0432\u0442", + "\u043B\u0438\u0441\u0442", + "\u0433\u0440\u0443\u0434", + } + wide{ + "\u0441\u0456\u0447\u043D\u044F", + "\u043B\u044E\u0442\u043E\u0433\u043E", + "\u0431\u0435\u0440\u0435\u0437\u043d\u044f", + "\u043A\u0432\u0456\u0442\u043D\u044F", + "\u0442\u0440\u0430\u0432\u043D\u044F", + "\u0447\u0435\u0440\u0432\u043D\u044F", + "\u043B\u0438\u043F\u043D\u044F", + "\u0441\u0435\u0440\u043F\u043D\u044F", + "\u0432\u0435\u0440\u0435\u0441\u043D\u044F", + "\u0436\u043E\u0432\u0442\u043D\u044F", + "\u043B\u0438\u0441\u0442\u043E\u043F\u0430\u0434\u0430", + "\u0433\u0440\u0443\u0434\u043D\u044F", + } + } + } + } + } } diff --git a/icu4c/source/data/locales/vi.txt b/icu4c/source/data/locales/vi.txt index d3454bc28bf..5c1a9622d37 100644 --- a/icu4c/source/data/locales/vi.txt +++ b/icu4c/source/data/locales/vi.txt @@ -7,10 +7,6 @@ vi { Version { "2.1" } - AmPmMarkers { - "SA", - "CH", - } // Note many of the country names have dashes in the name. This seems to be correct. // Translations that are done poorly seem to remove them. This doesn't mean that all the dashes are correct, // but care should be taken before removing them. @@ -231,43 +227,7 @@ vi { Currencies { VND { "\u0111", "\u0111\u1ED3ng" } // Vietnamese Dong. More people use \u0111 rather than \u20AB } - DateTimeElements:intvector { - 2, - 1, - } - DateTimePatterns { - "HH:mm:ss z", - "HH:mm:ss z", - "HH:mm:ss", - "HH:mm", - "EEEE, 'ng\u00E0y' dd MMMM 'n\u0103m' yyyy", - "'Ng\u00E0y' dd 'th\u00E1ng' M 'n\u0103m' yyyy", - "dd-MM-yyyy", - "dd/MM/yyyy", - "{0} {1}", - } - DayAbbreviations { - "CN", - "Th 2", - "Th 3", - "Th 4", - "Th 5", - "Th 6", - "Th 7" - } - DayNames { - "Ch\u1EE7 nh\u1EADt", - "Th\u1EE9 hai", - "Th\u1EE9 ba", - "Th\u1EE9 t\u01B0", - "Th\u1EE9 n\u0103m", - "Th\u1EE9 s\u00E1u", - "Th\u1EE9 b\u1EA3y" - } - Eras { - "tr. CN", - "sau CN" - } + // The case of the letters may be wrong for languages because Ti\u1EBFng is used. // Ti\u1EBFng is used in order to clarify some of the names, and ti\u1EBFng means "language". // Ti\u1EBFng is used to differentiate similar words like English from England and German from Germany, @@ -339,34 +299,6 @@ vi { "Latn", // ISO 15924 Name } ExemplarCharacters{ "[a-z\u1EA0-\u1Ef9\u0111\u01A1\u00E0-\u00E3\u00E8-\u00EA\u00EC\u00ED\u00F2-\u00F5\u00F9\u00FA\u00FD\u0103\u0129\u0169\u01B0]" } - MonthAbbreviations { - "thg 1", - "thg 2", - "thg 3", - "thg 4", - "thg 5", - "thg 6", - "thg 7", - "thg 8", - "thg 9", - "thg 10", - "thg 11", - "thg 12", - } - MonthNames { - "th\u00E1ng m\u1ED9t", - "th\u00E1ng hai", - "th\u00E1ng ba", - "th\u00E1ng t\u01B0", - "th\u00E1ng n\u0103m", - "th\u00E1ng s\u00E1u", - "th\u00E1ng b\u1EA3y", - "th\u00E1ng t\u00E1m", - "th\u00E1ng ch\u00EDn", - "th\u00E1ng m\u01B0\u1EDDi", - "th\u00E1ng m\u01B0\u1EDDi m\u1ED9t", - "th\u00E1ng m\u01B0\u1EDDi hai", - } NumberElements { ",", ".", @@ -388,6 +320,85 @@ vi { "#,##0%", "#E0", } + calendar{ + gregorian{ + DateTimeElements:intvector { + 2, + 1, + } + AmPmMarkers{ + "SA", + "CH", + } + DateTimePatterns{ + "HH:mm:ss z", + "HH:mm:ss z", + "HH:mm:ss", + "HH:mm", + "EEEE, 'ng\u00E0y' dd MMMM 'n\u0103m' yyyy", + "'Ng\u00E0y' dd 'th\u00E1ng' M 'n\u0103m' yyyy", + "dd-MM-yyyy", + "dd/MM/yyyy", + "{0} {1}", + } + dayNames{ + format{ + abbreviated{ + "CN", + "Th 2", + "Th 3", + "Th 4", + "Th 5", + "Th 6", + "Th 7" + } + wide{ + "Ch\u1EE7 nh\u1EADt", + "Th\u1EE9 hai", + "Th\u1EE9 ba", + "Th\u1EE9 t\u01B0", + "Th\u1EE9 n\u0103m", + "Th\u1EE9 s\u00E1u", + "Th\u1EE9 b\u1EA3y" + } + } + } + eras{ + "tr. CN", + "sau CN" + } + monthNames{ + format{ + abbreviated{ + "thg 1", + "thg 2", + "thg 3", + "thg 4", + "thg 5", + "thg 6", + "thg 7", + "thg 8", + "thg 9", + "thg 10", + "thg 11", + "thg 12", + } + wide{ + "th\u00E1ng m\u1ED9t", + "th\u00E1ng hai", + "th\u00E1ng ba", + "th\u00E1ng t\u01B0", + "th\u00E1ng n\u0103m", + "th\u00E1ng s\u00E1u", + "th\u00E1ng b\u1EA3y", + "th\u00E1ng t\u00E1m", + "th\u00E1ng ch\u00EDn", + "th\u00E1ng m\u01B0\u1EDDi", + "th\u00E1ng m\u01B0\u1EDDi m\u1ED9t", + "th\u00E1ng m\u01B0\u1EDDi hai", + } + } + } + } + } } - - diff --git a/icu4c/source/data/locales/zh.txt b/icu4c/source/data/locales/zh.txt index 8167a64ccf5..2d0304012a4 100644 --- a/icu4c/source/data/locales/zh.txt +++ b/icu4c/source/data/locales/zh.txt @@ -7,10 +7,6 @@ zh { Version{ "2.0" } - AmPmMarkers { - "\u4E0A\u5348", - "\u4E0B\u5348", - } Countries { AD { "\u5B89\u9053\u5C14" } AE { "\u963F\u62C9\u4F2F\u8054\u5408\u914B\u957F\u56FD" } @@ -640,24 +636,6 @@ zh { ZRZ { "ZRZ", "\u624E\u4F0A\u5C14\u5143" } ZWD { "Z$", "\u6D25\u5DF4\u5E03\u97E6\u5143" } } - DayAbbreviations { - "\u65E5", - "\u4E00", - "\u4E8C", - "\u4E09", - "\u56DB", - "\u4E94", - "\u516D", - } - DayNames { - "\u661F\u671F\u65E5", - "\u661F\u671F\u4E00", - "\u661F\u671F\u4E8C", - "\u661F\u671F\u4E09", - "\u661F\u671F\u56DB", - "\u661F\u671F\u4E94", - "\u661F\u671F\u516D", - } Eras { "\u516C\u5143\u524D", "\u516C\u5143", @@ -857,34 +835,6 @@ zh { zu { "\u7956\u9C81\u6587" } } localPatternChars { "GanjkHmsSEDFwWxhKzAeugXZ" } - MonthAbbreviations { - "\u4E00\u6708", - "\u4E8C\u6708", - "\u4E09\u6708", - "\u56DB\u6708", - "\u4E94\u6708", - "\u516D\u6708", - "\u4E03\u6708", - "\u516B\u6708", - "\u4E5D\u6708", - "\u5341\u6708", - "\u5341\u4E00\u6708", - "\u5341\u4E8C\u6708", - } - MonthNames { - "\u4E00\u6708", - "\u4E8C\u6708", - "\u4E09\u6708", - "\u56DB\u6708", - "\u4E94\u6708", - "\u516D\u6708", - "\u4E03\u6708", - "\u516B\u6708", - "\u4E5D\u6708", - "\u5341\u6708", - "\u5341\u4E00\u6708", - "\u5341\u4E8C\u6708", - } Scripts { Arab { "\u963F\u62C9\u4F2F\u8BED" } Armn { "\u4E9A\u7F8E\u5C3C\u4E9A\u8BED" } @@ -1145,4 +1095,66 @@ zh { REVISED { "\u5df2\u4fee\u8ba2" } } + calendar{ + gregorian{ + AmPmMarkers{ + "\u4E0A\u5348", + "\u4E0B\u5348", + } + dayNames{ + format{ + abbreviated{ + "\u65E5", + "\u4E00", + "\u4E8C", + "\u4E09", + "\u56DB", + "\u4E94", + "\u516D", + } + wide{ + "\u661F\u671F\u65E5", + "\u661F\u671F\u4E00", + "\u661F\u671F\u4E8C", + "\u661F\u671F\u4E09", + "\u661F\u671F\u56DB", + "\u661F\u671F\u4E94", + "\u661F\u671F\u516D", + } + } + } + monthNames{ + format{ + abbreviated{ + "\u4E00\u6708", + "\u4E8C\u6708", + "\u4E09\u6708", + "\u56DB\u6708", + "\u4E94\u6708", + "\u516D\u6708", + "\u4E03\u6708", + "\u516B\u6708", + "\u4E5D\u6708", + "\u5341\u6708", + "\u5341\u4E00\u6708", + "\u5341\u4E8C\u6708", + } + wide{ + "\u4E00\u6708", + "\u4E8C\u6708", + "\u4E09\u6708", + "\u56DB\u6708", + "\u4E94\u6708", + "\u516D\u6708", + "\u4E03\u6708", + "\u516B\u6708", + "\u4E5D\u6708", + "\u5341\u6708", + "\u5341\u4E00\u6708", + "\u5341\u4E8C\u6708", + } + } + } + } + } } diff --git a/icu4c/source/data/locales/zh_CN.txt b/icu4c/source/data/locales/zh_CN.txt index 56d2fd703cc..631fd40a1f8 100644 --- a/icu4c/source/data/locales/zh_CN.txt +++ b/icu4c/source/data/locales/zh_CN.txt @@ -14,16 +14,19 @@ zh_CN { "#E0", } // use 12-hour time (24-hour time is also known to be used) - DateTimePatterns { - "ahh'\u65F6'mm'\u5206'ss'\u79D2' z", - "ahh'\u65F6'mm'\u5206'ss'\u79D2'", - "ahh:mm:ss", - "ah:mm", - "yyyy'\u5E74'M'\u6708'd'\u65E5'EEEE", - "yyyy'\u5E74'M'\u6708'd'\u65E5'", - "yyyy-M-d", - "yy-M-d", - "{1} {0}", + calendar{ + gregorian{ + DateTimePatterns{ + "ahh'\u65F6'mm'\u5206'ss'\u79D2' z", + "ahh'\u65F6'mm'\u5206'ss'\u79D2'", + "ahh:mm:ss", + "ah:mm", + "yyyy'\u5E74'M'\u6708'd'\u65E5'EEEE", + "yyyy'\u5E74'M'\u6708'd'\u65E5'", + "yyyy-M-d", + "yy-M-d", + "{1} {0}", + } + } } } - \ No newline at end of file diff --git a/icu4c/source/data/locales/zh_HK.txt b/icu4c/source/data/locales/zh_HK.txt index c36d8622a74..8d2c048ccb4 100644 --- a/icu4c/source/data/locales/zh_HK.txt +++ b/icu4c/source/data/locales/zh_HK.txt @@ -9,42 +9,8 @@ zh_HK { Version{ "2.0" } Countries:alias { "zh_TW" } - DateTimePatterns { - "ahh'\u6642'mm'\u5206'ss'\u79D2' z", - "ahh'\u6642'mm'\u5206'ss'\u79D2'", - "ahh:mm:ss", - "ah:mm", - "yyyy'\u5E74'MM'\u6708'dd'\u65E5' EEEE", - "yyyy'\u5E74'MM'\u6708'dd'\u65E5'", - "yyyy'\u5E74'M'\u6708'd'\u65E5'", - "yy'\u5E74'M'\u6708'd'\u65E5'", - "{1} {0}", - } - DayAbbreviations { - "\u65E5", - "\u4E00", - "\u4E8C", - "\u4E09", - "\u56DB", - "\u4E94", - "\u516D", - } ExemplarCharacters:alias { "zh_TW" } Languages:alias { "zh_TW" } - MonthAbbreviations { - "1\u6708", - "2\u6708", - "3\u6708", - "4\u6708", - "5\u6708", - "6\u6708", - "7\u6708", - "8\u6708", - "9\u6708", - "10\u6708", - "11\u6708", - "12\u6708", - } NumberPatterns { "#,##0.###;-#,##0.###", "\u00A4#,##0.00;(\u00A4#,##0.00)", @@ -65,4 +31,50 @@ zh_HK { } } */ + calendar{ + gregorian{ + DateTimePatterns{ + "ahh'\u6642'mm'\u5206'ss'\u79D2' z", + "ahh'\u6642'mm'\u5206'ss'\u79D2'", + "ahh:mm:ss", + "ah:mm", + "yyyy'\u5E74'MM'\u6708'dd'\u65E5' EEEE", + "yyyy'\u5E74'MM'\u6708'dd'\u65E5'", + "yyyy'\u5E74'M'\u6708'd'\u65E5'", + "yy'\u5E74'M'\u6708'd'\u65E5'", + "{1} {0}", + } + dayNames{ + format{ + abbreviated{ + "\u65E5", + "\u4E00", + "\u4E8C", + "\u4E09", + "\u56DB", + "\u4E94", + "\u516D", + } + } + } + monthNames{ + format{ + abbreviated{ + "1\u6708", + "2\u6708", + "3\u6708", + "4\u6708", + "5\u6708", + "6\u6708", + "7\u6708", + "8\u6708", + "9\u6708", + "10\u6708", + "11\u6708", + "12\u6708", + } + } + } + } + } } diff --git a/icu4c/source/data/locales/zh_MO.txt b/icu4c/source/data/locales/zh_MO.txt index 8398db33ba0..a07c2856780 100644 --- a/icu4c/source/data/locales/zh_MO.txt +++ b/icu4c/source/data/locales/zh_MO.txt @@ -8,42 +8,8 @@ zh_MO { Version{ "2.0" } Countries:alias { "zh_TW" } - DateTimePatterns { - "ahh'\u6642'mm'\u5206'ss'\u79D2' z", - "ahh'\u6642'mm'\u5206'ss'\u79D2'", - "ahh:mm:ss", - "ah:mm", - "yyyy'\u5E74'MM'\u6708'dd'\u65E5' EEEE", - "yyyy'\u5E74'MM'\u6708'dd'\u65E5'", - "yyyy'\u5E74'M'\u6708'd'\u65E5'", - "yy'\u5E74'M'\u6708'd'\u65E5'", - "{1} {0}", - } - DayAbbreviations { - "\u65E5", - "\u4E00", - "\u4E8C", - "\u4E09", - "\u56DB", - "\u4E94", - "\u516D", - } ExemplarCharacters:alias { "zh_TW" } Languages:alias { "zh_TW" } - MonthAbbreviations { - "1\u6708", - "2\u6708", - "3\u6708", - "4\u6708", - "5\u6708", - "6\u6708", - "7\u6708", - "8\u6708", - "9\u6708", - "10\u6708", - "11\u6708", - "12\u6708", - } NumberPatterns { "#,##0.###;-#,##0.###", "\u00A4#,##0.00;(\u00A4#,##0.00)", @@ -63,5 +29,50 @@ zh_MO { // "Hong Kong", // } // } + calendar{ + gregorian{ + DateTimePatterns{ + "ahh'\u6642'mm'\u5206'ss'\u79D2' z", + "ahh'\u6642'mm'\u5206'ss'\u79D2'", + "ahh:mm:ss", + "ah:mm", + "yyyy'\u5E74'MM'\u6708'dd'\u65E5' EEEE", + "yyyy'\u5E74'MM'\u6708'dd'\u65E5'", + "yyyy'\u5E74'M'\u6708'd'\u65E5'", + "yy'\u5E74'M'\u6708'd'\u65E5'", + "{1} {0}", + } + dayNames{ + format{ + abbreviated{ + "\u65E5", + "\u4E00", + "\u4E8C", + "\u4E09", + "\u56DB", + "\u4E94", + "\u516D", + } + } + } + monthNames{ + format{ + abbreviated{ + "1\u6708", + "2\u6708", + "3\u6708", + "4\u6708", + "5\u6708", + "6\u6708", + "7\u6708", + "8\u6708", + "9\u6708", + "10\u6708", + "11\u6708", + "12\u6708", + } + } + } + } + } } - diff --git a/icu4c/source/data/locales/zh_SG.txt b/icu4c/source/data/locales/zh_SG.txt index 8bc0b58e3fe..a59e0488410 100644 --- a/icu4c/source/data/locales/zh_SG.txt +++ b/icu4c/source/data/locales/zh_SG.txt @@ -10,57 +10,4 @@ zh_SG { Version { "2.0" } -// AmPmMarkers { -// "\u4E0A\u5348", // am -// "\u4E0B\u5348" // pm -// } - DateTimePatterns { - // most commonly used formal time format - "a hh:mm:ss", - "a hh:mm:ss", - "a hh:mm", - "a hh:mm", - // most commonly used date format - "dd MMMM yyyy", - "dd MMM yyyy", - "dd-MMM-yy", - "dd/MM/yy", - "{1} {0}" - } - - // Duplicates from zh locale have been removed. - Countries { - AU { "\u6FB3\u6D32" } - CZ { "\u6377\u514B" } - ID { "\u5370\u5C3C" } - KR { "\u5357\u97E9" } - MK { "\u9A6C\u5176\u987F" } - NZ { "\u7EBD\u897F\u5170" } - SA { "\u6C99\u5730\u963F\u62C9\u4F2F" } - } - // Duplicates from zh locale have been removed. - Languages { - root { "\u6839 \u6e90" } - - ko { "\u97e9\u6587" } // Korean - sh { "\u585e\u5c14\u7ef4\u4e9a\u514b\u7f57\u5730\u4e9a\u6587" } // SerboCroatian - } - NumberPatterns { - "#,##0.###;-#,##0.###", - "\u00A4#,##0.00;-\u00A4#,##0.00", - "#,##0%", - "#E0", - } -/* - zoneStrings { - { - "SST", - "Singapore Standard Time", - "SST", - "Singapore Standard Time", - "SST", -// "Singapore" - } - } -*/ } diff --git a/icu4c/source/data/locales/zh_TW.txt b/icu4c/source/data/locales/zh_TW.txt index 9f4021af77b..88333f5c7ab 100644 --- a/icu4c/source/data/locales/zh_TW.txt +++ b/icu4c/source/data/locales/zh_TW.txt @@ -250,21 +250,6 @@ zh_TW { ZM { "\u5C1A\u6BD4\u4E9E" } ZW { "\u8F9B\u5DF4\u5A01" } } - DateTimePatterns { - "ahh'\u6642'mm'\u5206'ss'\u79D2' z", - "ahh'\u6642'mm'\u5206'ss'\u79D2'", - "a h:mm:ss", - "a h:mm", - "yyyy'\u5E74'M'\u6708'd'\u65E5'EEEE", - "yyyy'\u5E74'M'\u6708'd'\u65E5'", - "yyyy/M/d", - "yyyy/M/d", - "{1} {0}", - } - Eras { - "\u6C11\u570B\u524D", - "\u6C11\u570B", - } Languages { //aa { "\u963F\u6CD5\u6587" } // Same as zh ab { "\u963F\u5E03\u54C8\u897F\u4E9E\u6587" } @@ -713,4 +698,23 @@ zh_TW { REVISED { "\u5DF2\u4FEE\u8A02" } } + calendar{ + gregorian{ + DateTimePatterns{ + "ahh'\u6642'mm'\u5206'ss'\u79D2' z", + "ahh'\u6642'mm'\u5206'ss'\u79D2'", + "a h:mm:ss", + "a h:mm", + "yyyy'\u5E74'M'\u6708'd'\u65E5'EEEE", + "yyyy'\u5E74'M'\u6708'd'\u65E5'", + "yyyy/M/d", + "yyyy/M/d", + "{1} {0}", + } + eras{ + "\u6C11\u570B\u524D", + "\u6C11\u570B", + } + } + } }