From edfbe1704a7fbe758ff77f43e471a36b727c4c5b Mon Sep 17 00:00:00 2001 From: Peter Edberg Date: Wed, 25 May 2022 15:39:19 -0700 Subject: [PATCH] ICU-21957 integrate CLDR release-42-m1 (early milestone) to ICU main for 72 (rebased on main) + FormattedStringBuilderTest::testInsertOverflow infolns,logKnownIssue skip for CI exhaustive crash --- icu4c/source/data/brkitr/LOCALE_DEPS.json | 2 +- icu4c/source/data/brkitr/root.txt | 2 +- icu4c/source/data/coll/LOCALE_DEPS.json | 2 +- icu4c/source/data/coll/af.txt | 2 +- icu4c/source/data/coll/am.txt | 2 +- icu4c/source/data/coll/ar.txt | 4 +- icu4c/source/data/coll/as.txt | 2 +- icu4c/source/data/coll/az.txt | 4 +- icu4c/source/data/coll/be.txt | 2 +- icu4c/source/data/coll/bg.txt | 2 +- icu4c/source/data/coll/bn.txt | 4 +- icu4c/source/data/coll/bo.txt | 2 +- icu4c/source/data/coll/br.txt | 2 +- icu4c/source/data/coll/bs.txt | 4 +- icu4c/source/data/coll/bs_Cyrl.txt | 2 +- icu4c/source/data/coll/ca.txt | 2 +- icu4c/source/data/coll/ceb.txt | 2 +- icu4c/source/data/coll/chr.txt | 2 +- icu4c/source/data/coll/cs.txt | 2 +- icu4c/source/data/coll/cy.txt | 2 +- icu4c/source/data/coll/da.txt | 4 +- icu4c/source/data/coll/de.txt | 4 +- icu4c/source/data/coll/de_AT.txt | 2 +- icu4c/source/data/coll/dsb.txt | 2 +- icu4c/source/data/coll/ee.txt | 2 +- icu4c/source/data/coll/el.txt | 2 +- icu4c/source/data/coll/en_US_POSIX.txt | 2 +- icu4c/source/data/coll/eo.txt | 2 +- icu4c/source/data/coll/es.txt | 6 +- icu4c/source/data/coll/et.txt | 2 +- icu4c/source/data/coll/fa.txt | 2 +- icu4c/source/data/coll/fa_AF.txt | 2 +- icu4c/source/data/coll/ff_Adlm.txt | 2 +- icu4c/source/data/coll/fi.txt | 6 +- icu4c/source/data/coll/fil.txt | 2 +- icu4c/source/data/coll/fo.txt | 4 +- icu4c/source/data/coll/fr_CA.txt | 2 +- icu4c/source/data/coll/gl.txt | 4 +- icu4c/source/data/coll/gu.txt | 2 +- icu4c/source/data/coll/ha.txt | 2 +- icu4c/source/data/coll/haw.txt | 2 +- icu4c/source/data/coll/he.txt | 4 +- icu4c/source/data/coll/hi.txt | 2 +- icu4c/source/data/coll/hr.txt | 4 +- icu4c/source/data/coll/hsb.txt | 2 +- icu4c/source/data/coll/hu.txt | 2 +- icu4c/source/data/coll/hy.txt | 2 +- icu4c/source/data/coll/ig.txt | 2 +- icu4c/source/data/coll/is.txt | 4 +- icu4c/source/data/coll/ja.txt | 6 +- icu4c/source/data/coll/ka.txt | 2 +- icu4c/source/data/coll/kk.txt | 2 +- icu4c/source/data/coll/kl.txt | 4 +- icu4c/source/data/coll/km.txt | 2 +- icu4c/source/data/coll/kn.txt | 4 +- icu4c/source/data/coll/ko.txt | 8 +- icu4c/source/data/coll/kok.txt | 2 +- icu4c/source/data/coll/ku.txt | 2 +- icu4c/source/data/coll/ky.txt | 2 +- icu4c/source/data/coll/lkt.txt | 2 +- icu4c/source/data/coll/ln.txt | 4 +- icu4c/source/data/coll/lo.txt | 2 +- icu4c/source/data/coll/lt.txt | 2 +- icu4c/source/data/coll/lv.txt | 2 +- icu4c/source/data/coll/mk.txt | 2 +- icu4c/source/data/coll/ml.txt | 2 +- icu4c/source/data/coll/mn.txt | 2 +- icu4c/source/data/coll/mr.txt | 2 +- icu4c/source/data/coll/mt.txt | 2 +- icu4c/source/data/coll/my.txt | 2 +- icu4c/source/data/coll/ne.txt | 2 +- icu4c/source/data/coll/no.txt | 4 +- icu4c/source/data/coll/om.txt | 2 +- icu4c/source/data/coll/or.txt | 2 +- icu4c/source/data/coll/pa.txt | 2 +- icu4c/source/data/coll/pl.txt | 2 +- icu4c/source/data/coll/ps.txt | 2 +- icu4c/source/data/coll/ro.txt | 2 +- icu4c/source/data/coll/root.txt | 82 +- icu4c/source/data/coll/ru.txt | 2 +- icu4c/source/data/coll/se.txt | 4 +- icu4c/source/data/coll/si.txt | 4 +- icu4c/source/data/coll/sk.txt | 4 +- icu4c/source/data/coll/sl.txt | 2 +- icu4c/source/data/coll/smn.txt | 4 +- icu4c/source/data/coll/sq.txt | 2 +- icu4c/source/data/coll/sr.txt | 2 +- icu4c/source/data/coll/sr_Latn.txt | 4 +- icu4c/source/data/coll/sv.txt | 6 +- icu4c/source/data/coll/ta.txt | 2 +- icu4c/source/data/coll/te.txt | 2 +- icu4c/source/data/coll/th.txt | 2 +- icu4c/source/data/coll/tk.txt | 2 +- icu4c/source/data/coll/to.txt | 2 +- icu4c/source/data/coll/tr.txt | 4 +- icu4c/source/data/coll/ug.txt | 2 +- icu4c/source/data/coll/uk.txt | 2 +- icu4c/source/data/coll/ur.txt | 2 +- icu4c/source/data/coll/uz.txt | 2 +- icu4c/source/data/coll/vi.txt | 4 +- icu4c/source/data/coll/wo.txt | 2 +- icu4c/source/data/coll/yi.txt | 4 +- icu4c/source/data/coll/yo.txt | 2 +- icu4c/source/data/curr/LOCALE_DEPS.json | 2 +- icu4c/source/data/curr/en.txt | 6 +- icu4c/source/data/curr/mt.txt | 3 + icu4c/source/data/curr/root.txt | 2 +- .../source/data/dtd/cldr/common/dtd/ldml.dtd | 79 +- icu4c/source/data/lang/LOCALE_DEPS.json | 2 +- icu4c/source/data/lang/en.txt | 8 +- icu4c/source/data/lang/en_GB.txt | 1 + icu4c/source/data/lang/hi_Latn.txt | 1 + icu4c/source/data/lang/root.txt | 2 +- icu4c/source/data/locales/LOCALE_DEPS.json | 2 +- icu4c/source/data/locales/af.txt | 268 +- icu4c/source/data/locales/af_NA.txt | 8 +- icu4c/source/data/locales/agq.txt | 8 +- icu4c/source/data/locales/ak.txt | 20 +- icu4c/source/data/locales/ar.txt | 34 +- icu4c/source/data/locales/ar_IL.txt | 4 +- icu4c/source/data/locales/ar_KM.txt | 4 +- icu4c/source/data/locales/ar_MA.txt | 4 +- icu4c/source/data/locales/asa.txt | 4 +- icu4c/source/data/locales/ast.txt | 622 +- icu4c/source/data/locales/az.txt | 238 +- icu4c/source/data/locales/bas.txt | 8 +- icu4c/source/data/locales/be.txt | 90 +- icu4c/source/data/locales/bem.txt | 20 +- icu4c/source/data/locales/bez.txt | 4 +- icu4c/source/data/locales/bg.txt | 216 +- icu4c/source/data/locales/br.txt | 884 +- icu4c/source/data/locales/brx.txt | 12 + icu4c/source/data/locales/bs.txt | 246 +- icu4c/source/data/locales/bs_Cyrl.txt | 50 +- icu4c/source/data/locales/ca.txt | 282 +- icu4c/source/data/locales/ceb.txt | 282 +- icu4c/source/data/locales/cgg.txt | 4 +- icu4c/source/data/locales/chr.txt | 12 + icu4c/source/data/locales/cs.txt | 544 +- icu4c/source/data/locales/cy.txt | 204 +- icu4c/source/data/locales/da.txt | 72 +- icu4c/source/data/locales/dav.txt | 4 +- icu4c/source/data/locales/de.txt | 190 +- icu4c/source/data/locales/de_CH.txt | 3 + icu4c/source/data/locales/de_LU.txt | 2 +- icu4c/source/data/locales/dje.txt | 8 +- icu4c/source/data/locales/doi.txt | 12 + icu4c/source/data/locales/dsb.txt | 214 +- icu4c/source/data/locales/dua.txt | 8 +- icu4c/source/data/locales/dyo.txt | 8 +- icu4c/source/data/locales/ebu.txt | 4 +- icu4c/source/data/locales/ee.txt | 88 +- icu4c/source/data/locales/el.txt | 116 +- icu4c/source/data/locales/en.txt | 722 +- icu4c/source/data/locales/en_001.txt | 236 +- icu4c/source/data/locales/en_150.txt | 4 +- icu4c/source/data/locales/en_AE.txt | 172 +- icu4c/source/data/locales/en_AI.txt | 4 +- icu4c/source/data/locales/en_AU.txt | 87 +- icu4c/source/data/locales/en_BE.txt | 8 +- icu4c/source/data/locales/en_BI.txt | 4 +- icu4c/source/data/locales/en_BW.txt | 8 +- icu4c/source/data/locales/en_BZ.txt | 8 +- icu4c/source/data/locales/en_CA.txt | 76 +- icu4c/source/data/locales/en_CC.txt | 4 +- icu4c/source/data/locales/en_CK.txt | 4 +- icu4c/source/data/locales/en_CM.txt | 4 +- icu4c/source/data/locales/en_CX.txt | 4 +- icu4c/source/data/locales/en_DG.txt | 4 +- icu4c/source/data/locales/en_DK.txt | 28 +- icu4c/source/data/locales/en_FI.txt | 28 +- icu4c/source/data/locales/en_FK.txt | 4 +- icu4c/source/data/locales/en_GB.txt | 34 +- icu4c/source/data/locales/en_GG.txt | 4 +- icu4c/source/data/locales/en_GI.txt | 4 +- icu4c/source/data/locales/en_HK.txt | 84 +- icu4c/source/data/locales/en_IE.txt | 42 +- icu4c/source/data/locales/en_IL.txt | 4 +- icu4c/source/data/locales/en_IM.txt | 4 +- icu4c/source/data/locales/en_IN.txt | 98 +- icu4c/source/data/locales/en_IO.txt | 4 +- icu4c/source/data/locales/en_JE.txt | 4 +- icu4c/source/data/locales/en_KE.txt | 4 +- icu4c/source/data/locales/en_MG.txt | 4 +- icu4c/source/data/locales/en_MS.txt | 4 +- icu4c/source/data/locales/en_MT.txt | 8 +- icu4c/source/data/locales/en_MU.txt | 4 +- icu4c/source/data/locales/en_NF.txt | 4 +- icu4c/source/data/locales/en_NG.txt | 4 +- icu4c/source/data/locales/en_NR.txt | 4 +- icu4c/source/data/locales/en_NU.txt | 4 +- icu4c/source/data/locales/en_NZ.txt | 76 +- icu4c/source/data/locales/en_PK.txt | 24 +- icu4c/source/data/locales/en_PN.txt | 4 +- icu4c/source/data/locales/en_RW.txt | 4 +- icu4c/source/data/locales/en_SC.txt | 4 +- icu4c/source/data/locales/en_SE.txt | 8 +- icu4c/source/data/locales/en_SG.txt | 68 +- icu4c/source/data/locales/en_SH.txt | 4 +- icu4c/source/data/locales/en_SX.txt | 4 +- icu4c/source/data/locales/en_TK.txt | 4 +- icu4c/source/data/locales/en_TV.txt | 4 +- icu4c/source/data/locales/en_TZ.txt | 4 +- icu4c/source/data/locales/en_UG.txt | 4 +- icu4c/source/data/locales/en_ZA.txt | 8 +- icu4c/source/data/locales/en_ZW.txt | 8 +- icu4c/source/data/locales/es.txt | 270 +- icu4c/source/data/locales/es_419.txt | 85 +- icu4c/source/data/locales/es_AR.txt | 36 +- icu4c/source/data/locales/es_CL.txt | 50 +- icu4c/source/data/locales/es_CO.txt | 36 +- icu4c/source/data/locales/es_DO.txt | 16 +- icu4c/source/data/locales/es_GT.txt | 90 +- icu4c/source/data/locales/es_MX.txt | 91 +- icu4c/source/data/locales/es_PA.txt | 20 +- icu4c/source/data/locales/es_PH.txt | 8 +- icu4c/source/data/locales/es_PR.txt | 16 +- icu4c/source/data/locales/es_PY.txt | 10 +- icu4c/source/data/locales/es_US.txt | 50 +- icu4c/source/data/locales/es_VE.txt | 8 +- icu4c/source/data/locales/et.txt | 188 +- icu4c/source/data/locales/eu.txt | 206 +- icu4c/source/data/locales/ewo.txt | 8 +- icu4c/source/data/locales/ff_Adlm.txt | 6 + icu4c/source/data/locales/ff_Adlm_GH.txt | 4 +- icu4c/source/data/locales/ff_Adlm_GM.txt | 4 +- icu4c/source/data/locales/ff_Adlm_LR.txt | 4 +- icu4c/source/data/locales/ff_Adlm_MR.txt | 4 +- icu4c/source/data/locales/ff_Adlm_SL.txt | 4 +- icu4c/source/data/locales/ff_Latn_GH.txt | 8 +- icu4c/source/data/locales/ff_Latn_GM.txt | 8 +- icu4c/source/data/locales/ff_Latn_LR.txt | 8 +- icu4c/source/data/locales/ff_Latn_MR.txt | 8 +- icu4c/source/data/locales/ff_Latn_SL.txt | 8 +- icu4c/source/data/locales/fi.txt | 244 +- icu4c/source/data/locales/fil.txt | 914 +- icu4c/source/data/locales/fo.txt | 152 +- icu4c/source/data/locales/fr.txt | 230 +- icu4c/source/data/locales/fr_BE.txt | 8 +- icu4c/source/data/locales/fr_CA.txt | 216 +- icu4c/source/data/locales/fr_CD.txt | 2 +- icu4c/source/data/locales/fr_CH.txt | 56 +- icu4c/source/data/locales/fr_CM.txt | 20 +- icu4c/source/data/locales/fr_DJ.txt | 12 +- icu4c/source/data/locales/fr_DZ.txt | 12 +- icu4c/source/data/locales/fr_ML.txt | 4 +- icu4c/source/data/locales/fr_MR.txt | 12 +- icu4c/source/data/locales/fr_SY.txt | 12 +- icu4c/source/data/locales/fr_TD.txt | 12 +- icu4c/source/data/locales/fr_TN.txt | 12 +- icu4c/source/data/locales/fr_VU.txt | 12 +- icu4c/source/data/locales/fur.txt | 140 +- icu4c/source/data/locales/fy.txt | 160 +- icu4c/source/data/locales/ga.txt | 332 +- icu4c/source/data/locales/gd.txt | 568 +- icu4c/source/data/locales/gl.txt | 256 +- icu4c/source/data/locales/gsw.txt | 108 +- icu4c/source/data/locales/gu.txt | 6 + icu4c/source/data/locales/guz.txt | 4 +- icu4c/source/data/locales/ha.txt | 42 +- icu4c/source/data/locales/ha_GH.txt | 10 +- icu4c/source/data/locales/haw.txt | 94 +- icu4c/source/data/locales/he.txt | 20 +- icu4c/source/data/locales/hi.txt | 16 +- icu4c/source/data/locales/hi_Latn.txt | 65 +- icu4c/source/data/locales/hr.txt | 188 +- icu4c/source/data/locales/hr_BA.txt | 4 +- icu4c/source/data/locales/hsb.txt | 214 +- icu4c/source/data/locales/hu.txt | 110 +- icu4c/source/data/locales/ia.txt | 188 +- icu4c/source/data/locales/id.txt | 468 +- icu4c/source/data/locales/ig.txt | 78 +- icu4c/source/data/locales/is.txt | 604 +- icu4c/source/data/locales/it.txt | 276 +- icu4c/source/data/locales/it_CH.txt | 4 +- icu4c/source/data/locales/jmc.txt | 4 +- icu4c/source/data/locales/jv.txt | 268 +- icu4c/source/data/locales/kab.txt | 16 +- icu4c/source/data/locales/kam.txt | 4 +- icu4c/source/data/locales/kde.txt | 4 +- icu4c/source/data/locales/kea.txt | 298 +- icu4c/source/data/locales/kgp.txt | 298 +- icu4c/source/data/locales/ki.txt | 4 +- icu4c/source/data/locales/kk.txt | 184 +- icu4c/source/data/locales/kln.txt | 4 +- icu4c/source/data/locales/km.txt | 12 + icu4c/source/data/locales/kn.txt | 6 + icu4c/source/data/locales/ks.txt | 12 + icu4c/source/data/locales/ks_Deva.txt | 14 +- icu4c/source/data/locales/ksb.txt | 4 +- icu4c/source/data/locales/ksf.txt | 8 +- icu4c/source/data/locales/ksh.txt | 54 +- icu4c/source/data/locales/ky.txt | 46 +- icu4c/source/data/locales/lag.txt | 4 +- icu4c/source/data/locales/lb.txt | 94 +- icu4c/source/data/locales/lg.txt | 4 +- icu4c/source/data/locales/lkt.txt | 8 +- icu4c/source/data/locales/ln.txt | 8 +- icu4c/source/data/locales/lt.txt | 200 +- icu4c/source/data/locales/lu.txt | 8 +- icu4c/source/data/locales/luo.txt | 4 +- icu4c/source/data/locales/luy.txt | 4 +- icu4c/source/data/locales/lv.txt | 110 +- icu4c/source/data/locales/mai.txt | 12 + icu4c/source/data/locales/mas.txt | 4 +- icu4c/source/data/locales/mer.txt | 4 +- icu4c/source/data/locales/mg.txt | 78 +- icu4c/source/data/locales/mgh.txt | 8 +- icu4c/source/data/locales/mi.txt | 74 +- icu4c/source/data/locales/mk.txt | 184 +- icu4c/source/data/locales/mn.txt | 180 +- icu4c/source/data/locales/mni.txt | 12 + icu4c/source/data/locales/mr.txt | 12 + icu4c/source/data/locales/ms.txt | 344 +- icu4c/source/data/locales/ms_BN.txt | 16 +- icu4c/source/data/locales/ms_ID.txt | 28 +- icu4c/source/data/locales/mt.txt | 403 +- icu4c/source/data/locales/mua.txt | 8 +- icu4c/source/data/locales/naq.txt | 20 +- icu4c/source/data/locales/nd.txt | 4 +- icu4c/source/data/locales/ne.txt | 6 + icu4c/source/data/locales/nl.txt | 1026 +-- icu4c/source/data/locales/nl_BE.txt | 56 +- icu4c/source/data/locales/nmg.txt | 8 +- icu4c/source/data/locales/nn.txt | 15 - icu4c/source/data/locales/no.txt | 178 +- icu4c/source/data/locales/nus.txt | 24 +- icu4c/source/data/locales/nyn.txt | 4 +- icu4c/source/data/locales/om.txt | 94 +- icu4c/source/data/locales/or.txt | 12 + icu4c/source/data/locales/os.txt | 64 +- icu4c/source/data/locales/pa.txt | 6 + icu4c/source/data/locales/pcm.txt | 240 +- icu4c/source/data/locales/pl.txt | 206 +- icu4c/source/data/locales/ps_PK.txt | 1 + icu4c/source/data/locales/pt.txt | 252 +- icu4c/source/data/locales/pt_MO.txt | 12 +- icu4c/source/data/locales/pt_PT.txt | 166 +- icu4c/source/data/locales/qu.txt | 206 +- icu4c/source/data/locales/rm.txt | 194 +- icu4c/source/data/locales/rn.txt | 8 +- icu4c/source/data/locales/ro.txt | 326 +- icu4c/source/data/locales/rof.txt | 4 +- icu4c/source/data/locales/root.txt | 5 +- icu4c/source/data/locales/ru.txt | 222 +- icu4c/source/data/locales/rw.txt | 78 +- icu4c/source/data/locales/rwk.txt | 4 +- icu4c/source/data/locales/sa.txt | 12 + icu4c/source/data/locales/sah.txt | 40 +- icu4c/source/data/locales/saq.txt | 4 +- icu4c/source/data/locales/sbp.txt | 8 +- icu4c/source/data/locales/sc.txt | 248 +- icu4c/source/data/locales/sd_Deva.txt | 12 + icu4c/source/data/locales/se.txt | 78 +- icu4c/source/data/locales/se_FI.txt | 78 +- icu4c/source/data/locales/sk.txt | 248 +- icu4c/source/data/locales/sl.txt | 64 +- icu4c/source/data/locales/smn.txt | 82 +- icu4c/source/data/locales/sn.txt | 80 +- icu4c/source/data/locales/so.txt | 270 +- icu4c/source/data/locales/so_KE.txt | 8 +- icu4c/source/data/locales/sq.txt | 320 +- icu4c/source/data/locales/sq_MK.txt | 4 +- icu4c/source/data/locales/sq_XK.txt | 4 +- icu4c/source/data/locales/sr.txt | 64 +- icu4c/source/data/locales/sr_Latn.txt | 128 +- icu4c/source/data/locales/sr_Latn_BA.txt | 28 +- icu4c/source/data/locales/sr_Latn_ME.txt | 4 +- icu4c/source/data/locales/sr_Latn_XK.txt | 4 +- icu4c/source/data/locales/su.txt | 26 +- icu4c/source/data/locales/sv.txt | 276 +- icu4c/source/data/locales/sv_FI.txt | 12 +- icu4c/source/data/locales/sw.txt | 296 +- icu4c/source/data/locales/sw_KE.txt | 6 + icu4c/source/data/locales/ta.txt | 12 + icu4c/source/data/locales/ta_LK.txt | 4 +- icu4c/source/data/locales/te.txt | 6 + icu4c/source/data/locales/teo.txt | 4 +- icu4c/source/data/locales/tg.txt | 44 +- icu4c/source/data/locales/ti.txt | 12 + icu4c/source/data/locales/ti_ER.txt | 4 +- icu4c/source/data/locales/tk.txt | 196 +- icu4c/source/data/locales/to.txt | 300 +- icu4c/source/data/locales/tr.txt | 248 +- icu4c/source/data/locales/tr_CY.txt | 8 +- icu4c/source/data/locales/tt.txt | 190 +- icu4c/source/data/locales/twq.txt | 8 +- icu4c/source/data/locales/tzm.txt | 4 +- icu4c/source/data/locales/uk.txt | 212 +- icu4c/source/data/locales/uz.txt | 236 +- icu4c/source/data/locales/uz_Cyrl.txt | 34 +- icu4c/source/data/locales/vai_Latn.txt | 24 +- icu4c/source/data/locales/vi.txt | 310 +- icu4c/source/data/locales/vun.txt | 4 +- icu4c/source/data/locales/wae.txt | 180 +- icu4c/source/data/locales/wo.txt | 26 +- icu4c/source/data/locales/xh.txt | 78 +- icu4c/source/data/locales/xog.txt | 4 +- icu4c/source/data/locales/yav.txt | 8 +- icu4c/source/data/locales/yo.txt | 82 +- icu4c/source/data/locales/yrl.txt | 242 +- icu4c/source/data/locales/yrl_CO.txt | 8 +- icu4c/source/data/locales/yrl_VE.txt | 8 +- icu4c/source/data/locales/zu.txt | 182 +- icu4c/source/data/misc/icuver.txt | 6 +- icu4c/source/data/misc/langInfo.txt | 1241 +-- icu4c/source/data/misc/likelySubtags.txt | 4 +- icu4c/source/data/misc/metadata.txt | 23 + icu4c/source/data/misc/plurals.txt | 44 +- icu4c/source/data/misc/supplementalData.txt | 190 +- icu4c/source/data/misc/units.txt | 6 +- icu4c/source/data/rbnf/LOCALE_DEPS.json | 2 +- icu4c/source/data/rbnf/root.txt | 2 +- icu4c/source/data/region/LOCALE_DEPS.json | 2 +- icu4c/source/data/region/root.txt | 2 +- icu4c/source/data/unit/LOCALE_DEPS.json | 2 +- icu4c/source/data/unit/en.txt | 20 + icu4c/source/data/unit/en_AU.txt | 2 + icu4c/source/data/unit/mt.txt | 29 +- icu4c/source/data/unit/root.txt | 7 +- icu4c/source/data/zone/LOCALE_DEPS.json | 2 +- icu4c/source/data/zone/hi_Latn.txt | 2 +- icu4c/source/data/zone/root.txt | 2 +- icu4c/source/i18n/dtitvfmt.cpp | 6 + icu4c/source/i18n/dtptngen.cpp | 71 +- icu4c/source/i18n/measunit.cpp | 65 +- icu4c/source/i18n/reldatefmt.cpp | 66 +- icu4c/source/i18n/smpdtfmt.cpp | 39 +- icu4c/source/i18n/unicode/measunit.h | 30 +- icu4c/source/test/cintltst/ccaltst.c | 4 +- .../test/cintltst/cdateintervalformattest.c | 87 +- icu4c/source/test/cintltst/cdattst.c | 10 +- icu4c/source/test/cintltst/cdtrgtst.c | 10 +- icu4c/source/test/cintltst/cmsgtst.c | 4 +- icu4c/source/test/cintltst/creststn.c | 2 +- icu4c/source/test/cintltst/udatpg_test.c | 36 +- icu4c/source/test/intltest/dtfmrgts.cpp | 6 +- icu4c/source/test/intltest/dtfmttst.cpp | 178 +- icu4c/source/test/intltest/dtifmtts.cpp | 406 +- icu4c/source/test/intltest/dtptngts.cpp | 156 +- .../formatted_string_builder_test.cpp | 28 +- icu4c/source/test/intltest/measfmttest.cpp | 385 + icu4c/source/test/intltest/numfmtst.cpp | 14 +- icu4c/source/test/intltest/reldatefmttest.cpp | 71 +- icu4c/source/test/intltest/tmsgfmt.cpp | 54 +- icu4c/source/test/testdata/format.txt | 20 +- icu4c/source/test/testdata/root.txt | 4 +- icu4c/source/test/testdata/structLocale.txt | 7602 ++++++++++++++--- .../src/com/ibm/icu/impl/PatternProps.java | 2 +- .../com/ibm/icu/text/DateIntervalFormat.java | 8 + .../icu/text/DateTimePatternGenerator.java | 2 +- .../icu/text/RelativeDateTimeFormatter.java | 27 +- .../com/ibm/icu/text/SimpleDateFormat.java | 22 +- .../core/src/com/ibm/icu/util/Calendar.java | 63 +- .../src/com/ibm/icu/util/MeasureUnit.java | 10 +- icu4j/main/shared/data/icudata.jar | 4 +- icu4j/main/shared/data/icutzdata.jar | 4 +- icu4j/main/shared/data/testdata.jar | 4 +- .../test/calendar/CalendarRegressionTest.java | 12 +- .../test/format/DateFormatRegressionTest.java | 6 +- .../format/DateFormatRegressionTestJ.java | 2 +- .../icu/dev/test/format/DateFormatTest.java | 14 +- .../test/format/DateIntervalFormatTest.java | 454 +- .../test/format/DateTimeGeneratorTest.java | 104 +- .../icu/dev/test/format/MeasureUnitTest.java | 208 +- .../icu/dev/test/format/PluralRulesTest.java | 45 +- .../format/RelativeDateTimeFormatterTest.java | 124 +- .../dev/test/format/TestMessageFormat.java | 16 +- tools/cldr/cldr-to-icu/build-icu-data.xml | 4 +- tools/cldr/cldr-to-icu/pom.xml | 2 +- .../icu/tool/cldrtoicu/LdmlConverter.java | 1 + .../src/main/resources/ldml2icu_locale.txt | 10 +- .../main/resources/ldml2icu_supplemental.txt | 3 + 473 files changed, 22637 insertions(+), 15391 deletions(-) diff --git a/icu4c/source/data/brkitr/LOCALE_DEPS.json b/icu4c/source/data/brkitr/LOCALE_DEPS.json index c3b7333295f5..0ab9f65c049b 100644 --- a/icu4c/source/data/brkitr/LOCALE_DEPS.json +++ b/icu4c/source/data/brkitr/LOCALE_DEPS.json @@ -3,5 +3,5 @@ // Generated using tools/cldr/cldr-to-icu/build-icu-data.xml { - "cldrVersion": "41" + "cldrVersion": "42" } diff --git a/icu4c/source/data/brkitr/root.txt b/icu4c/source/data/brkitr/root.txt index a3d5113f6e50..31bb0d92d736 100644 --- a/icu4c/source/data/brkitr/root.txt +++ b/icu4c/source/data/brkitr/root.txt @@ -2,7 +2,7 @@ // License & terms of use: http://www.unicode.org/copyright.html // Generated using tools/cldr/cldr-to-icu/build-icu-data.xml root{ - Version{"41"} + Version{"42"} boundaries{ grapheme:process(dependency){"char.brk"} line:process(dependency){"line.brk"} diff --git a/icu4c/source/data/coll/LOCALE_DEPS.json b/icu4c/source/data/coll/LOCALE_DEPS.json index e1cef0f6d0d7..7665abd367a0 100644 --- a/icu4c/source/data/coll/LOCALE_DEPS.json +++ b/icu4c/source/data/coll/LOCALE_DEPS.json @@ -3,7 +3,7 @@ // Generated using tools/cldr/cldr-to-icu/build-icu-data.xml { - "cldrVersion": "41", + "cldrVersion": "42", "aliases": { "ars": "ar_SA", "in": "id", diff --git a/icu4c/source/data/coll/af.txt b/icu4c/source/data/coll/af.txt index d367a85df03b..88dcc3c2bbc4 100644 --- a/icu4c/source/data/coll/af.txt +++ b/icu4c/source/data/coll/af.txt @@ -5,7 +5,7 @@ af{ collations{ standard{ Sequence{"&N<<<ʼn"} - Version{"41"} + Version{"42"} } } } diff --git a/icu4c/source/data/coll/am.txt b/icu4c/source/data/coll/am.txt index 442fddde4d6f..0d6bdc698587 100644 --- a/icu4c/source/data/coll/am.txt +++ b/icu4c/source/data/coll/am.txt @@ -5,7 +5,7 @@ am{ collations{ standard{ Sequence{"[reorder Ethi]"} - Version{"41"} + Version{"42"} } } } diff --git a/icu4c/source/data/coll/ar.txt b/icu4c/source/data/coll/ar.txt index e77fd0edf1d9..90aea5599e45 100644 --- a/icu4c/source/data/coll/ar.txt +++ b/icu4c/source/data/coll/ar.txt @@ -9,7 +9,7 @@ ar{ "&ت<<ة<<<ﺔ<<<ﺓ" "&ي<<ى<<<ﯨ<<<ﯩ<<<ﻰ<<<ﻯ<<<ﲐ<<<ﱝ" } - Version{"41"} + Version{"42"} } standard{ Sequence{ @@ -397,7 +397,7 @@ ar{ "‎&ۓ‎=ﮰ‎=ﮱ" "‎&ۀ‎=ﮤ‎=ﮥ" } - Version{"41"} + Version{"42"} } } } diff --git a/icu4c/source/data/coll/as.txt b/icu4c/source/data/coll/as.txt index d5627ae9a04c..c082c6cc5d44 100644 --- a/icu4c/source/data/coll/as.txt +++ b/icu4c/source/data/coll/as.txt @@ -11,7 +11,7 @@ as{ "&[before 1]ত<ৎ=ত্\u200D" "&হ<ক্ষ" } - Version{"41"} + Version{"42"} } } } diff --git a/icu4c/source/data/coll/az.txt b/icu4c/source/data/coll/az.txt index 9087f51d9f60..f536b1a0e0d1 100644 --- a/icu4c/source/data/coll/az.txt +++ b/icu4c/source/data/coll/az.txt @@ -9,7 +9,7 @@ az{ "[import az-u-co-standard]" "[reorder others]" } - Version{"41"} + Version{"42"} } standard{ Sequence{ @@ -26,7 +26,7 @@ az{ "&H - + @@ -42,7 +42,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - + @@ -1429,7 +1429,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - + @@ -1526,7 +1526,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - + @@ -2353,7 +2353,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - + @@ -2429,6 +2429,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + + + + + + + @@ -3150,6 +3158,67 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icu4c/source/data/lang/LOCALE_DEPS.json b/icu4c/source/data/lang/LOCALE_DEPS.json index 93facb19926a..b0667cbdf0a5 100644 --- a/icu4c/source/data/lang/LOCALE_DEPS.json +++ b/icu4c/source/data/lang/LOCALE_DEPS.json @@ -3,7 +3,7 @@ // Generated using tools/cldr/cldr-to-icu/build-icu-data.xml { - "cldrVersion": "41", + "cldrVersion": "42", "aliases": { "ars": "ar_SA", "az_AZ": "az_Latn_AZ", diff --git a/icu4c/source/data/lang/en.txt b/icu4c/source/data/lang/en.txt index c8b958c6a4db..da8981c93ce8 100644 --- a/icu4c/source/data/lang/en.txt +++ b/icu4c/source/data/lang/en.txt @@ -62,6 +62,7 @@ en{ am{"Amharic"} an{"Aragonese"} ang{"Old English"} + ann{"Obolo"} anp{"Angika"} ar{"Arabic"} ar_001{"Modern Standard Arabic"} @@ -107,7 +108,7 @@ en{ bin{"Bini"} bjn{"Banjar"} bkm{"Kom"} - bla{"Siksika"} + bla{"Siksiká"} blt{"Tai Dam"} bm{"Bambara"} bn{"Bangla"} @@ -384,6 +385,7 @@ en{ lou{"Louisiana Creole"} loz{"Lozi"} lrc{"Northern Luri"} + lsm{"Saamia"} lt{"Lithuanian"} ltg{"Latgalian"} lu{"Luba-Katanga"} @@ -500,11 +502,12 @@ en{ pfl{"Palatine German"} phn{"Phoenician"} pi{"Pali"} + pis{"Pijin"} pl{"Polish"} pms{"Piedmontese"} pnt{"Pontic"} pon{"Pohnpeian"} - pqm{"Malecite"} + pqm{"Maliseet-Passamaquoddy"} prg{"Prussian"} pro{"Old Provençal"} ps{"Pashto"} @@ -625,6 +628,7 @@ en{ tn{"Tswana"} to{"Tongan"} tog{"Nyasa Tonga"} + tok{"Toki Pona"} tpi{"Tok Pisin"} tr{"Turkish"} tru{"Turoyo"} diff --git a/icu4c/source/data/lang/en_GB.txt b/icu4c/source/data/lang/en_GB.txt index 4f375f8077b9..93fbd9ee1070 100644 --- a/icu4c/source/data/lang/en_GB.txt +++ b/icu4c/source/data/lang/en_GB.txt @@ -5,6 +5,7 @@ en_GB{ %%Parent{"en_001"} Languages{ ar_001{"Modern Standard Arabic"} + bla{"Siksika"} de_AT{"Austrian German"} de_CH{"Swiss High German"} en_AU{"Australian English"} diff --git a/icu4c/source/data/lang/hi_Latn.txt b/icu4c/source/data/lang/hi_Latn.txt index 560065821dd1..d97b56612a52 100644 --- a/icu4c/source/data/lang/hi_Latn.txt +++ b/icu4c/source/data/lang/hi_Latn.txt @@ -17,6 +17,7 @@ hi_Latn{ af{"Afreeki"} ar_001{"Modern Standard Arabic"} as{"Aasaami"} + bla{"Siksika"} bn{"Bangla"} bo{"Tibbati"} ckb{"Kurdish, Sorani"} diff --git a/icu4c/source/data/lang/root.txt b/icu4c/source/data/lang/root.txt index 476383d6d46e..bf92e81637f7 100644 --- a/icu4c/source/data/lang/root.txt +++ b/icu4c/source/data/lang/root.txt @@ -2,7 +2,7 @@ // License & terms of use: http://www.unicode.org/copyright.html // Generated using tools/cldr/cldr-to-icu/build-icu-data.xml root{ - Version{"41"} + Version{"42"} characterLabelPattern{ all{"{0} — all"} category-list{"{0}: {1}"} diff --git a/icu4c/source/data/locales/LOCALE_DEPS.json b/icu4c/source/data/locales/LOCALE_DEPS.json index 93facb19926a..b0667cbdf0a5 100644 --- a/icu4c/source/data/locales/LOCALE_DEPS.json +++ b/icu4c/source/data/locales/LOCALE_DEPS.json @@ -3,7 +3,7 @@ // Generated using tools/cldr/cldr-to-icu/build-icu-data.xml { - "cldrVersion": "41", + "cldrVersion": "42", "aliases": { "ars": "ar_SA", "az_AZ": "az_Latn_AZ", diff --git a/icu4c/source/data/locales/af.txt b/icu4c/source/data/locales/af.txt index ee4eff8fc5f6..68cfc799b526 100644 --- a/icu4c/source/data/locales/af.txt +++ b/icu4c/source/data/locales/af.txt @@ -228,6 +228,12 @@ af{ "dd MMM y G", "y-MM-dd GGGGG", "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + } + DateTimePatterns%atTime{ "{1} 'om' {0}", "{1} 'om' {0}", "{1} {0}", @@ -253,8 +259,8 @@ af{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"E d"} - Ehm{"E hh:mm a"} - Ehms{"E hh:mm:ss a"} + Ehm{"E hh:mm a"} + Ehms{"E hh:mm:ss a"} Gy{"y G"} GyMMM{"MMM y G"} GyMMMEd{"E d MMM y G"} @@ -272,9 +278,9 @@ af{ MMMd{"d MMM"} Md{"d/M"} d{"d"} - h{"h a"} - hm{"hh:mm a"} - hms{"hh:mm:ss a"} + h{"h a"} + hm{"hh:mm a"} + hms{"hh:mm:ss a"} ms{"mm:ss"} y{"y G"} yyyy{"y G"} @@ -290,46 +296,46 @@ af{ } intervalFormats{ Bh{ - B{"h B – h B"} + B{"h B – h B"} h{"h–h B"} } Gy{ - G{"y G – y G"} + G{"y G – y G"} y{"y–y G"} } GyM{ - G{"y-M GGGGG – y-M GGGGG"} - M{"y-M – y-M GGGGG"} - y{"y-M – y-M GGGGG"} + G{"y-M GGGGG – y-M GGGGG"} + M{"y-M – y-M GGGGG"} + y{"y-M – y-M GGGGG"} } GyMEd{ - G{"E d-M-y GGGGG – E d-M-y GGGGG"} - M{"E d-M-y – E d-M-y GGGGG"} - d{"E d-M-y – E d-M-y GGGGG"} - y{"E d-M-y – E d-M-y GGGGG"} + G{"E d-M-y GGGGG – E d-M-y GGGGG"} + M{"E d-M-y – E d-M-y GGGGG"} + d{"E d-M-y – E d-M-y GGGGG"} + y{"E d-M-y – E d-M-y GGGGG"} } GyMMM{ - G{"MMM y G – MMM y G"} - M{"MMM – MMM y G"} - y{"MMM y – MMM y G"} + G{"MMM y G – MMM y G"} + M{"MMM – MMM y G"} + y{"MMM y – MMM y G"} } GyMMMEd{ - G{"E d MMM y G – E d MMM y G"} - M{"E d MMM – E d MMM y G"} - d{"E d MMM – E d MMM y G"} - y{"E d MMM y – E d MMM y G"} + G{"E d MMM y G – E d MMM y G"} + M{"E d MMM – E d MMM y G"} + d{"E d MMM – E d MMM y G"} + y{"E d MMM y – E d MMM y G"} } GyMMMd{ - G{"d MMM y G – d MMM y G"} - M{"d MMM – d MMM y G"} + G{"d MMM y G – d MMM y G"} + M{"d MMM – d MMM y G"} d{"d–d MMM y G"} - y{"d MMM y – d MMM y G"} + y{"d MMM y – d MMM y G"} } GyMd{ - G{"d-M-y GGGGG – d-M-y GGGGG"} - M{"d-M-y – d-M-y GGGGG"} - d{"d-M-y – d-M-y GGGGG"} - y{"d-M-y – d-M-y GGGGG"} + G{"d-M-y GGGGG – d-M-y GGGGG"} + M{"d-M-y – d-M-y GGGGG"} + d{"d-M-y – d-M-y GGGGG"} + y{"d-M-y – d-M-y GGGGG"} } H{ H{"HH–HH"} @@ -346,83 +352,83 @@ af{ H{"HH–HH v"} } M{ - M{"M – M"} + M{"M – M"} } MEd{ - M{"E d/M – E d/M"} - d{"E d/M – E d/M"} + M{"E d/M – E d/M"} + d{"E d/M – E d/M"} } MMM{ - M{"MMM – MMM"} + M{"MMM – MMM"} } MMMEd{ - M{"E d MMM – E d MMM"} - d{"E d MMM – E d MMM"} + M{"E d MMM – E d MMM"} + d{"E d MMM – E d MMM"} } MMMd{ - M{"d MMM – d MMM"} - d{"d – d MMM"} + M{"d MMM – d MMM"} + d{"d – d MMM"} } Md{ - M{"d/M – d/M"} - d{"d/M – d/M"} + M{"d/M – d/M"} + d{"d/M – d/M"} } d{ - d{"d – d"} + d{"d – d"} } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ - y{"y – y G"} + y{"y – y G"} } yM{ - M{"M/y – M/y GGGGG"} - y{"M/y – M/y GGGGG"} + M{"M/y – M/y GGGGG"} + y{"M/y – M/y GGGGG"} } yMEd{ - M{"E d/M/y – E d/M/y GGGGG"} - d{"E d/M/y – E d/M/y GGGGG"} - y{"E d/M/y – E d/M/y GGGGG"} + M{"E d/M/y – E d/M/y GGGGG"} + d{"E d/M/y – E d/M/y GGGGG"} + y{"E d/M/y – E d/M/y GGGGG"} } yMMM{ M{"MMM–MMM y G"} - y{"MMM y – MMM y G"} + y{"MMM y – MMM y G"} } yMMMEd{ - M{"E d MMM – E d MMM y G"} - d{"E d MMM – E d MMM y G"} - y{"E d MMM y – E d MMM y G"} + M{"E d MMM – E d MMM y G"} + d{"E d MMM – E d MMM y G"} + y{"E d MMM y – E d MMM y G"} } yMMMM{ M{"MMMM–MMMM y G"} - y{"MMMM y – MMMM y G"} + y{"MMMM y – MMMM y G"} } yMMMd{ - M{"d MMM – d MMM y G"} + M{"d MMM – d MMM y G"} d{"d–d MMM y G"} - y{"d MMM y – d MMM y G"} + y{"d MMM y – d MMM y G"} } yMd{ - M{"d/M/y – d/M/y GGGGG"} - d{"d/M/y – d/M/y GGGGG"} - y{"d/M/y – d/M/y GGGGG"} + M{"d/M/y – d/M/y GGGGG"} + d{"d/M/y – d/M/y GGGGG"} + y{"d/M/y – d/M/y GGGGG"} } } } @@ -477,8 +483,8 @@ af{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"E d"} - Ehm{"E hh:mm a"} - Ehms{"E hh:mm:ss a"} + Ehm{"E hh:mm a"} + Ehms{"E hh:mm:ss a"} Gy{"y G"} GyMMM{"MMM y G"} GyMMMEd{"E dd MMM y G"} @@ -501,11 +507,11 @@ af{ MMMd{"d MMM"} Md{"dd-MM"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} - hmsv{"h:mm:ss a v"} - hmv{"h:mm a v"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} + hmsv{"h:mm:ss a v"} + hmv{"h:mm a v"} ms{"mm:ss"} y{"y"} yM{"MM-y"} @@ -678,51 +684,51 @@ af{ } intervalFormats{ Bh{ - B{"h B – h B"} + B{"h B – h B"} h{"h–h B"} } Bhm{ - B{"hh:mm B – hh:mm B"} - h{"hh:mm B – hh:mm B"} + B{"hh:mm B – hh:mm B"} + h{"hh:mm B – hh:mm B"} m{"hh:mm–hh:mm"} } Gy{ - G{"y G – y G"} - y{"y – y G"} + G{"y G – y G"} + y{"y – y G"} } GyM{ - G{"y-M GGGGG – y-M GGGGG"} - M{"y-M – y-M GGGGG"} - y{"y-M – y-M GGGGG"} + G{"y-M GGGGG – y-M GGGGG"} + M{"y-M – y-M GGGGG"} + y{"y-M – y-M GGGGG"} } GyMEd{ - G{"E y-M-d GGGGG – E y-M-d GGGGG"} - M{"E y-M-d – E y-M-d GGGGG"} - d{"E y-M-d – E y-M-d GGGGG"} - y{"E y-M-d – E y-M-d GGGGG"} + G{"E y-M-d GGGGG – E y-M-d GGGGG"} + M{"E y-M-d – E y-M-d GGGGG"} + d{"E y-M-d – E y-M-d GGGGG"} + y{"E y-M-d – E y-M-d GGGGG"} } GyMMM{ - G{"MMM y G – MMM y G"} - M{"MMM – MMM y G"} - y{"MMM y – MMM y G"} + G{"MMM y G – MMM y G"} + M{"MMM – MMM y G"} + y{"MMM y – MMM y G"} } GyMMMEd{ - G{"E d MMM y G – E d MMM y G"} - M{"E d MMM – E d MMM y G"} - d{"E d MMM – E d MMM y G"} - y{"E d MMM y – E d MMM y G"} + G{"E d MMM y G – E d MMM y G"} + M{"E d MMM – E d MMM y G"} + d{"E d MMM – E d MMM y G"} + y{"E d MMM y – E d MMM y G"} } GyMMMd{ - G{"d MMM y G – d MMM y G"} - M{"d MMM – d MMM y G"} + G{"d MMM y G – d MMM y G"} + M{"d MMM – d MMM y G"} d{"d–d MMM y G"} - y{"d MMM y – d MMM y G"} + y{"d MMM y – d MMM y G"} } GyMd{ - G{"y-M-d GGGGG – y-M-d GGGGG"} - M{"y-M-d – y-M-d GGGGG"} - d{"y-M-d – y-M-d GGGGG"} - y{"y-M-d – y-M-d GGGGG"} + G{"y-M-d GGGGG – y-M-d GGGGG"} + M{"y-M-d – y-M-d GGGGG"} + d{"y-M-d – y-M-d GGGGG"} + y{"y-M-d – y-M-d GGGGG"} } H{ H{"HH–HH"} @@ -742,80 +748,80 @@ af{ M{"M–M"} } MEd{ - M{"E d/M – E d/M"} - d{"E d/M – E d/M"} + M{"E d/M – E d/M"} + d{"E d/M – E d/M"} } MMM{ M{"MMM–MMM"} } MMMEd{ - M{"E d MMM – E d MMM"} - d{"E d MMM – E d MMM"} + M{"E d MMM – E d MMM"} + d{"E d MMM – E d MMM"} } MMMd{ - M{"d MMM – d MMM"} + M{"d MMM – d MMM"} d{"d–d MMM"} } Md{ - M{"d/M – d/M"} - d{"d/M – d/M"} + M{"d/M – d/M"} + d{"d/M – d/M"} } d{ d{"d–d"} } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h – h a"} + a{"h a – h a"} + h{"h – h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm – h:mm a"} - m{"h:mm – h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm – h:mm a"} + m{"h:mm – h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm a – h:mm a v"} - m{"h:mm a – h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm a – h:mm a v"} + m{"h:mm a – h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h – h a v"} + a{"h a – h a v"} + h{"h – h a v"} } y{ y{"y–y"} } yM{ - M{"M/y – M/y"} - y{"M/y – M/y"} + M{"M/y – M/y"} + y{"M/y – M/y"} } yMEd{ - M{"E d/M/y – E d/M/y"} - d{"E d/M/y – E d/M/y"} - y{"E d/M/y – E d/M/y"} + M{"E d/M/y – E d/M/y"} + d{"E d/M/y – E d/M/y"} + y{"E d/M/y – E d/M/y"} } yMMM{ M{"MMM–MMM y"} - y{"MMM y – MMM y"} + y{"MMM y – MMM y"} } yMMMEd{ - M{"E d MMM – E d MMM y"} - d{"E d MMM – E d MMM y"} - y{"E d MMM y – E d MMM y"} + M{"E d MMM – E d MMM y"} + d{"E d MMM – E d MMM y"} + y{"E d MMM y – E d MMM y"} } yMMMM{ - M{"MMMM – MMMM y"} - y{"MMMM y – MMMM y"} + M{"MMMM – MMMM y"} + y{"MMMM y – MMMM y"} } yMMMd{ - M{"d MMM – d MMM y"} + M{"d MMM – d MMM y"} d{"d–d MMM y"} - y{"d MMM y – d MMM y"} + y{"d MMM y – d MMM y"} } yMd{ - M{"d/M/y – d/M/y"} - d{"d/M/y – d/M/y"} - y{"d/M/y – d/M/y"} + M{"d/M/y – d/M/y"} + d{"d/M/y – d/M/y"} + y{"d/M/y – d/M/y"} } } monthNames{ diff --git a/icu4c/source/data/locales/af_NA.txt b/icu4c/source/data/locales/af_NA.txt index 5046b88dd411..1784f8341184 100644 --- a/icu4c/source/data/locales/af_NA.txt +++ b/icu4c/source/data/locales/af_NA.txt @@ -5,10 +5,10 @@ af_NA{ calendar{ gregorian{ DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE dd MMMM y", "dd MMMM y", "dd MMM y", diff --git a/icu4c/source/data/locales/agq.txt b/icu4c/source/data/locales/agq.txt index 4389adfb301a..315985ced349 100644 --- a/icu4c/source/data/locales/agq.txt +++ b/icu4c/source/data/locales/agq.txt @@ -62,8 +62,8 @@ agq{ MMMd{"d MMM"} Md{"d/M"} d{"d"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"m:ss"} y{"y"} yM{"M/y"} @@ -121,8 +121,8 @@ agq{ MMMd{"d MMM"} Md{"d/M"} d{"d"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"m:ss"} y{"y"} yM{"M/y"} diff --git a/icu4c/source/data/locales/ak.txt b/icu4c/source/data/locales/ak.txt index 90edc7b4ea92..abc9bb406fed 100644 --- a/icu4c/source/data/locales/ak.txt +++ b/icu4c/source/data/locales/ak.txt @@ -29,10 +29,10 @@ ak{ calendar{ generic{ DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE, G y MMMM dd", "G y MMMM d", "G y MMM d", @@ -65,7 +65,7 @@ ak{ MMMd{"MMM d"} Md{"M/d"} d{"d"} - hm{"h:mm a"} + hm{"h:mm a"} ms{"mm:ss"} y{"y"} yM{"M/y"} @@ -88,10 +88,10 @@ ak{ "EW", } DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE, y MMMM dd", "y MMMM d", "y MMM d", @@ -124,7 +124,7 @@ ak{ MMMd{"MMM d"} Md{"M/d"} d{"d"} - hm{"h:mm a"} + hm{"h:mm a"} ms{"mm:ss"} y{"y"} yM{"M/y"} diff --git a/icu4c/source/data/locales/ar.txt b/icu4c/source/data/locales/ar.txt index 6726efa825ca..f4b51d683ef4 100644 --- a/icu4c/source/data/locales/ar.txt +++ b/icu4c/source/data/locales/ar.txt @@ -533,7 +533,13 @@ ar{ "d MMMM y G", "dd‏/MM‏/y G", "d‏/M‏/y GGGGG", - "{1} في {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{1} في {0}", "{1} في {0}", "{1} في {0}", @@ -753,6 +759,12 @@ ar{ "dd‏/MM‏/y", "d‏/M‏/y", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{1} في {0}", "{1} في {0}", "{1}, {0}", @@ -1278,11 +1290,11 @@ ar{ "d MMMM y G", "dd‏/MM‏/y G", "d‏/M‏/y GGGGG", - "{1} في {0}", - "{1} في {0}", - "{1} في {0}", - "{1} في {0}", - "{1} في {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", } DateTimeSkeletons{ "ahmmsszzzz", @@ -1380,11 +1392,11 @@ ar{ "d MMMM y G", "d MMM y G", "d‏/M‏/y GGGGG", - "{1} في {0}", - "{1} في {0}", - "{1} في {0}", - "{1} في {0}", - "{1} في {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", } DateTimeSkeletons{ "ahmmsszzzz", diff --git a/icu4c/source/data/locales/ar_IL.txt b/icu4c/source/data/locales/ar_IL.txt index 2bf1c120d7b9..90c4e69d080f 100644 --- a/icu4c/source/data/locales/ar_IL.txt +++ b/icu4c/source/data/locales/ar_IL.txt @@ -17,8 +17,8 @@ ar_IL{ "dd‏/MM‏/y", "d‏/M‏/y", "{1}, {0}", - "{1} في {0}", - "{1} في {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } diff --git a/icu4c/source/data/locales/ar_KM.txt b/icu4c/source/data/locales/ar_KM.txt index cc744cab035b..5e612126feff 100644 --- a/icu4c/source/data/locales/ar_KM.txt +++ b/icu4c/source/data/locales/ar_KM.txt @@ -17,8 +17,8 @@ ar_KM{ "dd‏/MM‏/y", "d‏/M‏/y", "{1}, {0}", - "{1} في {0}", - "{1} في {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } diff --git a/icu4c/source/data/locales/ar_MA.txt b/icu4c/source/data/locales/ar_MA.txt index 83e4413906b3..c146c39f9d70 100644 --- a/icu4c/source/data/locales/ar_MA.txt +++ b/icu4c/source/data/locales/ar_MA.txt @@ -25,8 +25,8 @@ ar_MA{ "dd‏/MM‏/y", "d‏/M‏/y", "{1}, {0}", - "{1} في {0}", - "{1} في {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } diff --git a/icu4c/source/data/locales/asa.txt b/icu4c/source/data/locales/asa.txt index 7bce81c9ed1c..c62ebabc21b9 100644 --- a/icu4c/source/data/locales/asa.txt +++ b/icu4c/source/data/locales/asa.txt @@ -51,7 +51,7 @@ asa{ MMMd{"MMM d"} Md{"M/d"} d{"d"} - hm{"h:mm a"} + hm{"h:mm a"} ms{"mm:ss"} y{"y"} yM{"M/y"} @@ -111,7 +111,7 @@ asa{ MMMd{"MMM d"} Md{"M/d"} d{"d"} - hm{"h:mm a"} + hm{"h:mm a"} ms{"mm:ss"} y{"y"} yM{"M/y"} diff --git a/icu4c/source/data/locales/ast.txt b/icu4c/source/data/locales/ast.txt index d26a8a8bbef4..c0cca3873185 100644 --- a/icu4c/source/data/locales/ast.txt +++ b/icu4c/source/data/locales/ast.txt @@ -249,10 +249,16 @@ ast{ "d MMM y G", "d/M/yy GGGGG", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{1} 'a' 'les' {0}", "{1} 'a' 'les' {0}", "{1}, {0}", - "{1}, {0}", + "{1} {0}", } DateTimeSkeletons{ "HHmmsszzzz", @@ -312,97 +318,97 @@ ast{ } intervalFormats{ H{ - H{"HH – HH"} + H{"HH – HH"} } Hm{ - H{"HH:mm – HH:mm"} - m{"HH:mm – HH:mm"} + H{"HH:mm – HH:mm"} + m{"HH:mm – HH:mm"} } Hmv{ - H{"HH:mm – HH:mm v"} - m{"HH:mm – HH:mm v"} + H{"HH:mm – HH:mm v"} + m{"HH:mm – HH:mm v"} } Hv{ - H{"HH – HH v"} + H{"HH – HH v"} } M{ - M{"M – M"} + M{"M – M"} } MEd{ - M{"E, dd/MM – E, dd/MM"} - d{"E, dd – E, dd/MM"} + M{"E, dd/MM – E, dd/MM"} + d{"E, dd – E, dd/MM"} } MMM{ - M{"LLL – LLL"} + M{"LLL – LLL"} } MMMEd{ - M{"E, d MMM – E, d MMM"} - d{"E, d MMM – E, d MMM"} + M{"E, d MMM – E, d MMM"} + d{"E, d MMM – E, d MMM"} } MMMd{ - M{"d MMM – d MMM"} - d{"d – d MMM"} + M{"d MMM – d MMM"} + d{"d – d MMM"} } Md{ - M{"dd/MM – dd/MM"} - d{"dd – dd/MM"} + M{"dd/MM – dd/MM"} + d{"dd – dd/MM"} } d{ - d{"d – d"} + d{"d – d"} } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm – h:mm a"} - m{"h:mm – h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm – h:mm a"} + m{"h:mm – h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm – h:mm a v"} - m{"h:mm – h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm – h:mm a v"} + m{"h:mm – h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h – h a v"} + a{"h a – h a v"} + h{"h – h a v"} } y{ - y{"y – y G"} + y{"y – y G"} } yM{ - M{"M/y – M/y GGGG"} - y{"M/y – M/y GGGG"} + M{"M/y – M/y GGGG"} + y{"M/y – M/y GGGG"} } yMEd{ - M{"E, d/M/y – E, d/M/y GGGG"} - d{"E, d/M/y – E, d/M/y GGGG"} - y{"E, d/M/y – E, d/M/y GGGG"} + M{"E, d/M/y – E, d/M/y GGGG"} + d{"E, d/M/y – E, d/M/y GGGG"} + y{"E, d/M/y – E, d/M/y GGGG"} } yMMM{ - M{"LLL – LLL y G"} - y{"LLL y – LLL y G"} + M{"LLL – LLL y G"} + y{"LLL y – LLL y G"} } yMMMEd{ - M{"E, d MMM – E, d MMM y G"} - d{"E, d MMM – E, d MMM y G"} - y{"E, d MMM y – E, d MMM y"} + M{"E, d MMM – E, d MMM y G"} + d{"E, d MMM – E, d MMM y G"} + y{"E, d MMM y – E, d MMM y"} } yMMMM{ - M{"LLLL – LLLL 'de' y G"} - y{"LLLL 'de' y – LLLL 'de' y G"} + M{"LLLL – LLLL 'de' y G"} + y{"LLLL 'de' y – LLLL 'de' y G"} } yMMMd{ - M{"d MMM – d MMM 'de' y G"} - d{"d – d MMM 'de' y G"} - y{"d MMM y – d MMM y G"} + M{"d MMM – d MMM 'de' y G"} + d{"d – d MMM 'de' y G"} + y{"d MMM y – d MMM y G"} } yMd{ - M{"d/M/y – d/M/y GGGG"} - d{"d/M/y – d/M/y GGGG"} - y{"d/M/y – d/M/y GGGG"} + M{"d/M/y – d/M/y GGGG"} + d{"d/M/y – d/M/y GGGG"} + y{"d/M/y – d/M/y GGGG"} } } } @@ -822,22 +828,22 @@ ast{ } intervalFormats{ M{ - M{"M – M"} + M{"M – M"} } MMM{ - M{"LLL – LLL"} + M{"LLL – LLL"} } d{ - d{"d – d"} + d{"d – d"} } y{ - y{"y – y G"} + y{"y – y G"} } yMMM{ - M{"LLL – LLL y G"} + M{"LLL – LLL y G"} } yMMMd{ - d{"d – d MMM 'de' y"} + d{"d – d MMM 'de' y"} } } monthNames{ @@ -948,6 +954,12 @@ ast{ "d MMM y G", "d/M/yy GGGGG", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1} {0}", + } + DateTimePatterns%atTime{ "{1} 'a' 'les' {0}", "{1} 'a' 'les' {0}", "{1}, {0}", @@ -968,8 +980,8 @@ ast{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"E d"} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"y G"} GyMMM{"MMM y G"} GyMMMEd{"E, d MMM 'de' y G"} @@ -1018,83 +1030,83 @@ ast{ H{"HH–HH v"} } M{ - M{"M – M"} + M{"M – M"} } MEd{ - M{"E, dd/MM – E, dd/MM"} - d{"E, dd – E, dd/MM"} + M{"E, dd/MM – E, dd/MM"} + d{"E, dd – E, dd/MM"} } MMM{ - M{"LLL – LLL"} + M{"LLL – LLL"} } MMMEd{ - M{"E, d MMM – E, d MMM"} - d{"E, d MMM – E, d MMM"} + M{"E, d MMM – E, d MMM"} + d{"E, d MMM – E, d MMM"} } MMMd{ - M{"d/MM – d/MM"} - d{"d – d MMM"} + M{"d/MM – d/MM"} + d{"d – d MMM"} } Md{ - M{"dd/MM – dd/MM"} - d{"dd – dd/MM"} + M{"dd/MM – dd/MM"} + d{"dd – dd/MM"} } d{ - d{"d – d"} + d{"d – d"} } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ - y{"y – y G"} + y{"y – y G"} } yM{ - M{"MM – MM/y GGGGG"} - y{"MM/y – MM/y GGGGG"} + M{"MM – MM/y GGGGG"} + y{"MM/y – MM/y GGGGG"} } yMEd{ - M{"E, d/M/y – E, d/M/y GGGGG"} - d{"E, d/M/y – E, d/M/y GGGGG"} - y{"E, d/M/y – E, d/M/y GGGGG"} + M{"E, d/M/y – E, d/M/y GGGGG"} + d{"E, d/M/y – E, d/M/y GGGGG"} + y{"E, d/M/y – E, d/M/y GGGGG"} } yMMM{ - M{"LLL – LLL y G"} - y{"MMM y – MMM y G"} + M{"LLL – LLL y G"} + y{"MMM y – MMM y G"} } yMMMEd{ - M{"E, d MMM – E, d MMM y"} - d{"E, d MMM – E, d MMM y"} - y{"E, d MMM y – E, d MMM y"} + M{"E, d MMM – E, d MMM y"} + d{"E, d MMM – E, d MMM y"} + y{"E, d MMM y – E, d MMM y"} } yMMMM{ - M{"LLLL – LLLL 'de' y G"} - y{"LLLL y – LLLL y"} + M{"LLLL – LLLL 'de' y G"} + y{"LLLL y – LLLL y"} } yMMMd{ - M{"d MMM – d MMM 'de' y G"} - d{"d – d MMM 'de' y G"} - y{"d MMM y – d MMM y"} + M{"d MMM – d MMM 'de' y G"} + d{"d – d MMM 'de' y G"} + y{"d MMM y – d MMM y"} } yMd{ - M{"d/M/y – d/M/y GGGGG"} - d{"d/M/y – d/M/y GGGGG"} - y{"d/M/y – d/M/y GGGGG"} + M{"d/M/y – d/M/y GGGGG"} + d{"d/M/y – d/M/y GGGGG"} + y{"d/M/y – d/M/y GGGGG"} } } } @@ -1121,6 +1133,12 @@ ast{ "d MMM y", "d/M/yy", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1} {0}", + } + DateTimePatterns%atTime{ "{1} 'a' 'les' {0}", "{1} 'a' 'les' {0}", "{1}, {0}", @@ -1144,8 +1162,8 @@ ast{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"E d"} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"y G"} GyMMM{"MMM y G"} GyMMMEd{"E, d MMM y G"} @@ -1167,11 +1185,11 @@ ast{ MMMd{"d MMM"} Md{"d/M"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} - hmsv{"h:mm:ss a v"} - hmv{"h:mm a v"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} + hmsv{"h:mm:ss a v"} + hmv{"h:mm a v"} ms{"mm:ss"} y{"y"} yM{"M/y"} @@ -1302,97 +1320,97 @@ ast{ } intervalFormats{ H{ - H{"HH – HH"} + H{"HH – HH"} } Hm{ - H{"HH:mm – HH:mm"} - m{"HH:mm – HH:mm"} + H{"HH:mm – HH:mm"} + m{"HH:mm – HH:mm"} } Hmv{ - H{"HH:mm – HH:mm v"} - m{"HH:mm – HH:mm v"} + H{"HH:mm – HH:mm v"} + m{"HH:mm – HH:mm v"} } Hv{ - H{"HH – HH v"} + H{"HH – HH v"} } M{ - M{"M – M"} + M{"M – M"} } MEd{ - M{"E, dd/MM – E, dd/MM"} - d{"E, dd – E, dd/MM"} + M{"E, dd/MM – E, dd/MM"} + d{"E, dd – E, dd/MM"} } MMM{ - M{"LLL – LLL"} + M{"LLL – LLL"} } MMMEd{ - M{"E, d MMM – E, d MMM"} - d{"E, d MMM – E, d MMM"} + M{"E, d MMM – E, d MMM"} + d{"E, d MMM – E, d MMM"} } MMMd{ - M{"d/MM – d/MM"} - d{"d – d MMM"} + M{"d/MM – d/MM"} + d{"d – d MMM"} } Md{ - M{"dd/MM – dd/MM"} - d{"dd – dd/MM"} + M{"dd/MM – dd/MM"} + d{"dd – dd/MM"} } d{ - d{"d – d"} + d{"d – d"} } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h – h a"} + a{"h a – h a"} + h{"h – h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm – h:mm a"} - m{"h:mm – h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm – h:mm a"} + m{"h:mm – h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm – h:mm a v"} - m{"h:mm – h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm – h:mm a v"} + m{"h:mm – h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h – h a v"} + a{"h a – h a v"} + h{"h – h a v"} } y{ - y{"y – y"} + y{"y – y"} } yM{ - M{"MM – MM/y"} - y{"MM/y – MM/y"} + M{"MM – MM/y"} + y{"MM/y – MM/y"} } yMEd{ - M{"E, d/M/y – E, d/M/y"} - d{"E, d/M/y – E, d/M/y"} - y{"E, d/M/y – E, d/M/y"} + M{"E, d/M/y – E, d/M/y"} + d{"E, d/M/y – E, d/M/y"} + y{"E, d/M/y – E, d/M/y"} } yMMM{ - M{"MMM – MMM y"} - y{"MMM y – MMM y"} + M{"MMM – MMM y"} + y{"MMM y – MMM y"} } yMMMEd{ - M{"E, d MMM – E, d MMM 'de' y"} - d{"E, d MMM – E, d MMM 'de' y"} - y{"E, d MMM 'de' y – E, d MMM 'de' y"} + M{"E, d MMM – E, d MMM 'de' y"} + d{"E, d MMM – E, d MMM 'de' y"} + y{"E, d MMM 'de' y – E, d MMM 'de' y"} } yMMMM{ - M{"LLLL – LLLL 'de' y"} - y{"LLLL 'de' y – LLLL 'de' y"} + M{"LLLL – LLLL 'de' y"} + y{"LLLL 'de' y – LLLL 'de' y"} } yMMMd{ - M{"d MMM – d MMM 'de' y"} - d{"d – d MMM 'de' y"} - y{"d MMM 'de' y – d MMM 'de' y"} + M{"d MMM – d MMM 'de' y"} + d{"d – d MMM 'de' y"} + y{"d MMM 'de' y – d MMM 'de' y"} } yMd{ - M{"d/M/y – d/M/y"} - d{"d/M/y – d/M/y"} - y{"d/M/y – d/M/y"} + M{"d/M/y – d/M/y"} + d{"d/M/y – d/M/y"} + y{"d/M/y – d/M/y"} } } monthNames{ @@ -1579,6 +1597,12 @@ ast{ "d MMM y G", "d/M/yy GGGGG", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1} {0}", + } + DateTimePatterns%atTime{ "{1} 'a' 'les' {0}", "{1} 'a' 'les' {0}", "{1}, {0}", @@ -1656,83 +1680,83 @@ ast{ H{"HH–HH v"} } M{ - M{"M – M"} + M{"M – M"} } MEd{ - M{"E, dd/MM – E, dd/MM"} - d{"E, dd – E, dd/MM"} + M{"E, dd/MM – E, dd/MM"} + d{"E, dd – E, dd/MM"} } MMM{ - M{"LLL – LLL"} + M{"LLL – LLL"} } MMMEd{ - M{"E, d MMM – E, d MMM"} - d{"E, d MMM – E, d MMM"} + M{"E, d MMM – E, d MMM"} + d{"E, d MMM – E, d MMM"} } MMMd{ - M{"d/MM – d/MM"} - d{"d – d MMM"} + M{"d/MM – d/MM"} + d{"d – d MMM"} } Md{ - M{"dd/MM – dd/MM"} - d{"dd – dd/MM"} + M{"dd/MM – dd/MM"} + d{"dd – dd/MM"} } d{ - d{"d – d"} + d{"d – d"} } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ - y{"y – y G"} + y{"y – y G"} } yM{ - M{"MM – MM/y GGGGG"} - y{"MM/y – MM/y GGGGG"} + M{"MM – MM/y GGGGG"} + y{"MM/y – MM/y GGGGG"} } yMEd{ - M{"E, d/M/y – E, d/M/y GGGGG"} - d{"E, d/M/y – E, d/M/y GGGGG"} - y{"E, d/M/y – E, d/M/y GGGGG"} + M{"E, d/M/y – E, d/M/y GGGGG"} + d{"E, d/M/y – E, d/M/y GGGGG"} + y{"E, d/M/y – E, d/M/y GGGGG"} } yMMM{ - M{"LLL – LLL y G"} - y{"MMM y – MMM y G"} + M{"LLL – LLL y G"} + y{"MMM y – MMM y G"} } yMMMEd{ - M{"E, d MMM – E, d MMM y"} - d{"E, d MMM – E, d MMM y"} - y{"E, d MMM y – E, d MMM y"} + M{"E, d MMM – E, d MMM y"} + d{"E, d MMM – E, d MMM y"} + y{"E, d MMM y – E, d MMM y"} } yMMMM{ - M{"LLLL – LLLL 'de' y G"} - y{"LLLL y – LLLL y"} + M{"LLLL – LLLL 'de' y G"} + y{"LLLL y – LLLL y"} } yMMMd{ - M{"d MMM – d MMM 'de' y G"} - d{"d – d MMM 'de' y G"} - y{"d MMM y – d MMM y"} + M{"d MMM – d MMM 'de' y G"} + d{"d – d MMM 'de' y G"} + y{"d MMM y – d MMM y"} } yMd{ - M{"d/M/y – d/M/y GGGGG"} - d{"d/M/y – d/M/y GGGGG"} - y{"d/M/y – d/M/y GGGGG"} + M{"d/M/y – d/M/y GGGGG"} + d{"d/M/y – d/M/y GGGGG"} + y{"d/M/y – d/M/y GGGGG"} } } monthNames{ @@ -1837,6 +1861,12 @@ ast{ "d MMM y G", "d/M/yy GGGGG", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1} {0}", + } + DateTimePatterns%atTime{ "{1} 'a' 'les' {0}", "{1} 'a' 'les' {0}", "{1}, {0}", @@ -1914,83 +1944,83 @@ ast{ H{"HH–HH v"} } M{ - M{"M – M"} + M{"M – M"} } MEd{ - M{"E, dd/MM – E, dd/MM"} - d{"E, dd – E, dd/MM"} + M{"E, dd/MM – E, dd/MM"} + d{"E, dd – E, dd/MM"} } MMM{ - M{"LLL – LLL"} + M{"LLL – LLL"} } MMMEd{ - M{"E, d MMM – E, d MMM"} - d{"E, d MMM – E, d MMM"} + M{"E, d MMM – E, d MMM"} + d{"E, d MMM – E, d MMM"} } MMMd{ - M{"d/MM – d/MM"} - d{"d – d MMM"} + M{"d/MM – d/MM"} + d{"d – d MMM"} } Md{ - M{"dd/MM – dd/MM"} - d{"dd – dd/MM"} + M{"dd/MM – dd/MM"} + d{"dd – dd/MM"} } d{ - d{"d – d"} + d{"d – d"} } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ - y{"y – y G"} + y{"y – y G"} } yM{ - M{"MM – MM/y GGGGG"} - y{"MM/y – MM/y GGGGG"} + M{"MM – MM/y GGGGG"} + y{"MM/y – MM/y GGGGG"} } yMEd{ - M{"E, d/M/y – E, d/M/y GGGGG"} - d{"E, d/M/y – E, d/M/y GGGGG"} - y{"E, d/M/y – E, d/M/y GGGGG"} + M{"E, d/M/y – E, d/M/y GGGGG"} + d{"E, d/M/y – E, d/M/y GGGGG"} + y{"E, d/M/y – E, d/M/y GGGGG"} } yMMM{ - M{"LLL – LLL y G"} - y{"MMM y – MMM y G"} + M{"LLL – LLL y G"} + y{"MMM y – MMM y G"} } yMMMEd{ - M{"E, d MMM – E, d MMM y"} - d{"E, d MMM – E, d MMM y"} - y{"E, d MMM y – E, d MMM y"} + M{"E, d MMM – E, d MMM y"} + d{"E, d MMM – E, d MMM y"} + y{"E, d MMM y – E, d MMM y"} } yMMMM{ - M{"LLLL – LLLL 'de' y G"} - y{"LLLL y – LLLL y"} + M{"LLLL – LLLL 'de' y G"} + y{"LLLL y – LLLL y"} } yMMMd{ - M{"d MMM – d MMM 'de' y G"} - d{"d – d MMM 'de' y G"} - y{"d MMM y – d MMM y"} + M{"d MMM – d MMM 'de' y G"} + d{"d – d MMM 'de' y G"} + y{"d MMM y – d MMM y"} } yMd{ - M{"d/M/y – d/M/y GGGGG"} - d{"d/M/y – d/M/y GGGGG"} - y{"d/M/y – d/M/y GGGGG"} + M{"d/M/y – d/M/y GGGGG"} + d{"d/M/y – d/M/y GGGGG"} + y{"d/M/y – d/M/y GGGGG"} } } monthNames{ @@ -2095,6 +2125,12 @@ ast{ "d MMM y G", "d/M/yy GGGGG", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1} {0}", + } + DateTimePatterns%atTime{ "{1} 'a' 'les' {0}", "{1} 'a' 'les' {0}", "{1}, {0}", @@ -2837,60 +2873,60 @@ ast{ } intervalFormats{ M{ - M{"M – M"} + M{"M – M"} } MMM{ - M{"LLL – LLL"} + M{"LLL – LLL"} } d{ - d{"d – d"} + d{"d – d"} } y{ - y{"y – y G"} + y{"y – y G"} } yM{ - M{"MM – MM/y GGGGG"} - y{"MM/y – MM/y GGGGG"} + M{"MM – MM/y GGGGG"} + y{"MM/y – MM/y GGGGG"} } yMEd{ - M{"E, d/M/y – E, d/M/y GGGGG"} - d{"E, d/M/y – E, d/M/y GGGGG"} - y{"E, d/M/y – E, d/M/y GGGGG"} + M{"E, d/M/y – E, d/M/y GGGGG"} + d{"E, d/M/y – E, d/M/y GGGGG"} + y{"E, d/M/y – E, d/M/y GGGGG"} } yMMM{ - M{"LLL – LLL y G"} - y{"MMM y – MMM y G"} + M{"LLL – LLL y G"} + y{"MMM y – MMM y G"} } yMMMd{ - M{"d MMM – d MMM 'de' y G"} - d{"d – d MMM 'de' y"} + M{"d MMM – d MMM 'de' y G"} + d{"d – d MMM 'de' y"} } yMd{ - M{"d/M/y – d/M/y GGGGG"} - d{"d/M/y – d/M/y GGGGG"} - y{"d/M/y – d/M/y GGGGG"} + M{"d/M/y – d/M/y GGGGG"} + d{"d/M/y – d/M/y GGGGG"} + y{"d/M/y – d/M/y GGGGG"} } } } persian{ intervalFormats{ M{ - M{"M – M"} + M{"M – M"} } MMM{ - M{"LLL – LLL"} + M{"LLL – LLL"} } d{ - d{"d – d"} + d{"d – d"} } y{ - y{"y – y G"} + y{"y – y G"} } yMMM{ - M{"LLL – LLL y G"} + M{"LLL – LLL y G"} } yMMMd{ - d{"d – d MMM 'de' y"} + d{"d – d MMM 'de' y"} } } } @@ -2905,6 +2941,12 @@ ast{ "d MMM y G", "d/M/yy GGGGG", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1} {0}", + } + DateTimePatterns%atTime{ "{1} 'a' 'les' {0}", "{1} 'a' 'les' {0}", "{1}, {0}", @@ -2985,83 +3027,83 @@ ast{ H{"HH–HH v"} } M{ - M{"M – M"} + M{"M – M"} } MEd{ - M{"E, dd/MM – E, dd/MM"} - d{"E, dd – E, dd/MM"} + M{"E, dd/MM – E, dd/MM"} + d{"E, dd – E, dd/MM"} } MMM{ - M{"LLL – LLL"} + M{"LLL – LLL"} } MMMEd{ - M{"E, d MMM – E, d MMM"} - d{"E, d MMM – E, d MMM"} + M{"E, d MMM – E, d MMM"} + d{"E, d MMM – E, d MMM"} } MMMd{ - M{"d/MM – d/MM"} - d{"d – d MMM"} + M{"d/MM – d/MM"} + d{"d – d MMM"} } Md{ - M{"dd/MM – dd/MM"} - d{"dd – dd/MM"} + M{"dd/MM – dd/MM"} + d{"dd – dd/MM"} } d{ - d{"d – d"} + d{"d – d"} } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ - y{"y – y G"} + y{"y – y G"} } yM{ - M{"MM – MM/y GGGGG"} - y{"MM/y – MM/y GGGGG"} + M{"MM – MM/y GGGGG"} + y{"MM/y – MM/y GGGGG"} } yMEd{ - M{"E, d/M/y – E, d/M/y GGGGG"} - d{"E, d/M/y – E, d/M/y GGGGG"} - y{"E, d/M/y – E, d/M/y GGGGG"} + M{"E, d/M/y – E, d/M/y GGGGG"} + d{"E, d/M/y – E, d/M/y GGGGG"} + y{"E, d/M/y – E, d/M/y GGGGG"} } yMMM{ - M{"LLL – LLL y G"} - y{"MMM y – MMM y G"} + M{"LLL – LLL y G"} + y{"MMM y – MMM y G"} } yMMMEd{ - M{"E, d MMM – E, d MMM y G"} - d{"E, d MMM – E, d MMM y"} - y{"E, d MMM y – E, d MMM y G"} + M{"E, d MMM – E, d MMM y G"} + d{"E, d MMM – E, d MMM y"} + y{"E, d MMM y – E, d MMM y G"} } yMMMM{ - M{"LLLL – LLLL 'de' y G"} - y{"LLLL y – LLLL y G"} + M{"LLLL – LLLL 'de' y G"} + y{"LLLL y – LLLL y G"} } yMMMd{ - M{"d MMM – d MMM 'de' y G"} - d{"d – d MMM 'de' y G"} - y{"d MMM y – d MMM y G"} + M{"d MMM – d MMM 'de' y G"} + d{"d – d MMM 'de' y G"} + y{"d MMM y – d MMM y G"} } yMd{ - M{"d/M/y – d/M/y GGGGG"} - d{"d/M/y – d/M/y GGGGG"} - y{"d/M/y – d/M/y GGGGG"} + M{"d/M/y – d/M/y GGGGG"} + d{"d/M/y – d/M/y GGGGG"} + y{"d/M/y – d/M/y GGGGG"} } } } diff --git a/icu4c/source/data/locales/az.txt b/icu4c/source/data/locales/az.txt index 92fcf1d2fd64..8436f22fdef4 100644 --- a/icu4c/source/data/locales/az.txt +++ b/icu4c/source/data/locales/az.txt @@ -257,8 +257,8 @@ az{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"d, E"} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"G y"} GyMMM{"G MMM y"} GyMMMEd{"G d MMM y, E"} @@ -275,9 +275,9 @@ az{ MMMd{"d MMM"} Md{"dd.MM"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"mm:ss"} y{"G y"} yyyy{"G y"} @@ -294,37 +294,37 @@ az{ intervalFormats{ GyM{ G{"GGGGG MM/y– GGGGG MM/y"} - M{"GGGGG MM/y – MM/y"} - y{"GGGGG MM/y – MM/y"} + M{"GGGGG MM/y – MM/y"} + y{"GGGGG MM/y – MM/y"} } GyMEd{ - G{"GGGGG dd/MM/y, E – GGGGG dd/MM/y, E"} - M{"GGGGG dd/MM/y, E – dd/MM/y, E"} - d{"GGGGG dd/MM/y, E – dd/MM/y, E"} - y{"GGGGG dd/MM/y, E – dd/MM/y, E"} + G{"GGGGG dd/MM/y, E – GGGGG dd/MM/y, E"} + M{"GGGGG dd/MM/y, E – dd/MM/y, E"} + d{"GGGGG dd/MM/y, E – dd/MM/y, E"} + y{"GGGGG dd/MM/y, E – dd/MM/y, E"} } GyMMM{ - G{"G MMM y – G MMM y"} - M{"G MMM – MMM y"} - y{"G MMM y – MMM y"} + G{"G MMM y – G MMM y"} + M{"G MMM – MMM y"} + y{"G MMM y – MMM y"} } GyMMMEd{ - G{"G d MMM y, E – G d MMM y, E"} - M{"G d MMM, E – d MMM y, E"} - d{"G d MMM, E – d MMM y, E"} - y{"G d MMM y, E – d MMM y, E"} + G{"G d MMM y, E – G d MMM y, E"} + M{"G d MMM, E – d MMM y, E"} + d{"G d MMM, E – d MMM y, E"} + y{"G d MMM y, E – d MMM y, E"} } GyMMMd{ - G{"G d MMM y – G d MMM y"} - M{"G d MMM – d MMM y"} - d{"G d – d MMM y"} - y{"G d MMM y – d MMM y"} + G{"G d MMM y – G d MMM y"} + M{"G d MMM – d MMM y"} + d{"G d – d MMM y"} + y{"G d MMM y – d MMM y"} } GyMd{ - G{"GGGGG dd/MM/y – GGGGG dd/MM/y"} - M{"GGGGG dd/MM/y – dd/MM/y"} - d{"GGGGG dd/MM/y – dd/MM/y"} - y{"GGGGG dd/MM/y – dd/MM/y"} + G{"GGGGG dd/MM/y – GGGGG dd/MM/y"} + M{"GGGGG dd/MM/y – dd/MM/y"} + d{"GGGGG dd/MM/y – dd/MM/y"} + y{"GGGGG dd/MM/y – dd/MM/y"} } H{ H{"HH–HH"} @@ -344,80 +344,80 @@ az{ M{"MM–MM"} } MEd{ - M{"dd.MM, E – dd.MM, E"} - d{"dd.MM, E – dd.MM, E"} + M{"dd.MM, E – dd.MM, E"} + d{"dd.MM, E – dd.MM, E"} } MMM{ M{"LLL–LLL"} } MMMEd{ - M{"MMM d, E – MMM d, E"} - d{"MMM d, E – MMM d, E"} + M{"MMM d, E – MMM d, E"} + d{"MMM d, E – MMM d, E"} } MMMd{ - M{"MMM d – MMM d"} + M{"MMM d – MMM d"} d{"MMM d–d"} } Md{ - M{"dd.MM – dd.MM"} - d{"dd.MM – dd.MM"} + M{"dd.MM – dd.MM"} + d{"dd.MM – dd.MM"} } d{ d{"d–d"} } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"G y–y"} } yM{ - M{"GGGGG MM/y – MM/y"} - y{"GGGGG MM/y – MM/y"} + M{"GGGGG MM/y – MM/y"} + y{"GGGGG MM/y – MM/y"} } yMEd{ - M{"GGGGG dd/MM/y , E – dd/MM/y, E"} - d{"GGGGG dd/MM/y , E – dd/MM/y, E"} - y{"GGGGG dd/MM/y , E – dd/MM/y, E"} + M{"GGGGG dd/MM/y , E – dd/MM/y, E"} + d{"GGGGG dd/MM/y , E – dd/MM/y, E"} + y{"GGGGG dd/MM/y , E – dd/MM/y, E"} } yMMM{ M{"G MMM–MMM y"} - y{"G MMM y – MMM y"} + y{"G MMM y – MMM y"} } yMMMEd{ - M{"G d MMM y, E – d MMM, E"} - d{"G d MMM y, E – d MMM, E"} - y{"G d MMM y, E – d MMM y, E"} + M{"G d MMM y, E – d MMM, E"} + d{"G d MMM y, E – d MMM, E"} + y{"G d MMM y, E – d MMM y, E"} } yMMMM{ M{"G MMMM y –MMMM"} - y{"G MMMM y – MMMM y"} + y{"G MMMM y – MMMM y"} } yMMMd{ - M{"G d MMM y – d MMM"} + M{"G d MMM y – d MMM"} d{"G d–d MMM y"} - y{"G d MMM y – d MMM y"} + y{"G d MMM y – d MMM y"} } yMd{ - M{"GGGGG dd/MM/y – dd/MM/y"} - d{"GGGGG dd/MM/y – dd/MM/y"} - y{"GGGGG dd/MM/y – dd/MM/y"} + M{"GGGGG dd/MM/y – dd/MM/y"} + d{"GGGGG dd/MM/y – dd/MM/y"} + y{"GGGGG dd/MM/y – dd/MM/y"} } } } @@ -472,8 +472,8 @@ az{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"d E"} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"G y"} GyMMM{"G MMM y"} GyMMMEd{"G d MMM y, E"} @@ -496,11 +496,11 @@ az{ MMMd{"d MMM"} Md{"dd.MM"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} - hmsv{"h:mm:ss a v"} - hmv{"h:mm a v"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} + hmsv{"h:mm:ss a v"} + hmv{"h:mm a v"} ms{"mm:ss"} y{"y"} yM{"MM.y"} @@ -687,38 +687,38 @@ az{ } intervalFormats{ GyM{ - G{"GGGGG MM.y – GGGGG MM.y"} - M{"GGGGG MM.y – MM.y"} - y{"GGGGG MM.y – MM.y"} + G{"GGGGG MM.y – GGGGG MM.y"} + M{"GGGGG MM.y – MM.y"} + y{"GGGGG MM.y – MM.y"} } GyMEd{ - G{"GGGGG dd.MM.y, E – GGGGG dd.MM.y, E"} - M{"GGGGG dd.MM.y, E – dd.MM.y, E"} - d{"GGGGG dd.MM.y, E – dd.MM.y, E"} - y{"GGGGG dd.MM.y, E – dd.MM.y, E"} + G{"GGGGG dd.MM.y, E – GGGGG dd.MM.y, E"} + M{"GGGGG dd.MM.y, E – dd.MM.y, E"} + d{"GGGGG dd.MM.y, E – dd.MM.y, E"} + y{"GGGGG dd.MM.y, E – dd.MM.y, E"} } GyMMM{ - G{"G MMM y – G MMM y"} - M{"G MMM – MMM y"} - y{"G MMM y – MMM y"} + G{"G MMM y – G MMM y"} + M{"G MMM – MMM y"} + y{"G MMM y – MMM y"} } GyMMMEd{ - G{"G d MMM y, E – d MMM y, E"} - M{"G d MMM, E – d MMM y, E"} - d{"G d MMM, E – d MMM y, E"} - y{"G d MMM y, E – d MMM y, E"} + G{"G d MMM y, E – d MMM y, E"} + M{"G d MMM, E – d MMM y, E"} + d{"G d MMM, E – d MMM y, E"} + y{"G d MMM y, E – d MMM y, E"} } GyMMMd{ - G{"G d MMM y – G d MMM y"} - M{"G d MMM – d MMM y"} - d{"G d – d MMM y"} - y{"G d MMM y – d MMM y"} + G{"G d MMM y – G d MMM y"} + M{"G d MMM – d MMM y"} + d{"G d – d MMM y"} + y{"G d MMM y – d MMM y"} } GyMd{ - G{"GGGGG dd.MM.y – GGGGG dd.MM.y"} - M{"GGGGG dd.MM.y – dd.MM.y"} - d{"GGGGG dd.MM.y – dd.MM.y"} - y{"GGGGG dd.MM.y – dd.MM.y"} + G{"GGGGG dd.MM.y – GGGGG dd.MM.y"} + M{"GGGGG dd.MM.y – dd.MM.y"} + d{"GGGGG dd.MM.y – dd.MM.y"} + y{"GGGGG dd.MM.y – dd.MM.y"} } H{ H{"HH–HH"} @@ -738,80 +738,80 @@ az{ M{"MM–MM"} } MEd{ - M{"dd.MM, E – dd.MM, E"} - d{"dd.MM, E – dd.MM, E"} + M{"dd.MM, E – dd.MM, E"} + d{"dd.MM, E – dd.MM, E"} } MMM{ M{"LLL–LLL"} } MMMEd{ - M{"d MMM, E – d MMM, E"} - d{"d MMM, E – d MMM, E"} + M{"d MMM, E – d MMM, E"} + d{"d MMM, E – d MMM, E"} } MMMd{ - M{"d MMM – d MMM"} + M{"d MMM – d MMM"} d{"d–d MMM"} } Md{ - M{"dd.MM – dd.MM"} - d{"dd.MM – dd.MM"} + M{"dd.MM – dd.MM"} + d{"dd.MM – dd.MM"} } d{ d{"d–d"} } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y"} } yM{ - M{"MM.y – MM.y"} - y{"MM.y – MM.y"} + M{"MM.y – MM.y"} + y{"MM.y – MM.y"} } yMEd{ - M{"dd.MM.y, E – dd.MM.y, E"} - d{"dd.MM.y, E – dd.MM.y, E"} - y{"dd.MM.y, E – dd.MM.y, E"} + M{"dd.MM.y, E – dd.MM.y, E"} + d{"dd.MM.y, E – dd.MM.y, E"} + y{"dd.MM.y, E – dd.MM.y, E"} } yMMM{ M{"MMM–MMM y"} - y{"MMM y – MMM y"} + y{"MMM y – MMM y"} } yMMMEd{ - M{"d MMM y, E – d MMM, E"} - d{"d MMM y, E – d MMM, E"} - y{"d MMM y, E – d MMM y, E"} + M{"d MMM y, E – d MMM, E"} + d{"d MMM y, E – d MMM, E"} + y{"d MMM y, E – d MMM y, E"} } yMMMM{ M{"MMMM–MMMM y"} - y{"MMMM y – MMMM y"} + y{"MMMM y – MMMM y"} } yMMMd{ - M{"d MMM y – d MMM"} + M{"d MMM y – d MMM"} d{"y MMM d–d"} - y{"d MMM y – d MMM y"} + y{"d MMM y – d MMM y"} } yMd{ - M{"dd.MM.y – dd.MM.y"} - d{"dd.MM.y – dd.MM.y"} - y{"dd.MM.y – dd.MM.y"} + M{"dd.MM.y – dd.MM.y"} + d{"dd.MM.y – dd.MM.y"} + y{"dd.MM.y – dd.MM.y"} } } monthNames{ diff --git a/icu4c/source/data/locales/bas.txt b/icu4c/source/data/locales/bas.txt index d4fa2022eeac..3757e113dde1 100644 --- a/icu4c/source/data/locales/bas.txt +++ b/icu4c/source/data/locales/bas.txt @@ -63,8 +63,8 @@ bas{ MMMd{"d MMM"} Md{"d/M"} d{"d"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"m:ss"} y{"y"} yM{"M/y"} @@ -122,8 +122,8 @@ bas{ MMMd{"d MMM"} Md{"d/M"} d{"d"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"m:ss"} y{"y"} yM{"M/y"} diff --git a/icu4c/source/data/locales/be.txt b/icu4c/source/data/locales/be.txt index 33934ae320e9..96556203a14b 100644 --- a/icu4c/source/data/locales/be.txt +++ b/icu4c/source/data/locales/be.txt @@ -303,8 +303,8 @@ be{ "d MMM y G", "d.M.yy", "{1}, {0}", - "{1} 'у' {0}", - "{1} 'у' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } @@ -330,8 +330,8 @@ be{ MMMd{"d MMM"} Md{"d.M"} d{"d"} - hm{"h.mm a"} - hms{"h.mm.ss a"} + hm{"h.mm a"} + hms{"h.mm.ss a"} y{"G y"} yM{"M.y"} yMEd{"E, d.M.y"} @@ -407,6 +407,12 @@ be{ "d.M.y G", "d.M.y GGGGG", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{1} 'у' {0}", "{1} 'у' {0}", "{1}, {0}", @@ -432,8 +438,8 @@ be{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"E, d"} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"y G"} GyMMM{"LLL y G"} GyMMMEd{"E, d MMM y G"} @@ -450,9 +456,9 @@ be{ MMMd{"d MMM"} Md{"d.M"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"mm:ss"} y{"y G"} yyyy{"y G"} @@ -555,18 +561,18 @@ be{ } fallback{"{0} – {1}"} h{ - h{"h–h a"} + h{"h–h a"} } hm{ - h{"h.mm–h.mm a"} - m{"h.mm–h.mm a"} + h{"h.mm–h.mm a"} + m{"h.mm–h.mm a"} } hmv{ - h{"h.mm–h.mm a v"} - m{"h:mm – h:mm a v"} + h{"h.mm–h.mm a v"} + m{"h:mm – h:mm a v"} } hv{ - h{"h–h a v"} + h{"h–h a v"} } y{ y{"y – y G"} @@ -623,11 +629,17 @@ be{ "HH:mm:ss z", "HH:mm:ss", "HH:mm", - "EEEE, d MMMM y 'г'.", - "d MMMM y 'г'.", - "d MMM y 'г'.", + "EEEE, d MMMM y 'г'.", + "d MMMM y 'г'.", + "d MMM y 'г'.", "d.MM.yy", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{1} 'у' {0}", "{1} 'у' {0}", "{1}, {0}", @@ -656,12 +668,12 @@ be{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"d, E"} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} - Gy{"y 'г'. G"} - GyMMM{"LLL y 'г'. G"} - GyMMMEd{"E, d MMM y 'г'. G"} - GyMMMd{"d MMM y 'г'. G"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} + Gy{"y 'г'. G"} + GyMMM{"LLL y 'г'. G"} + GyMMMEd{"E, d MMM y 'г'. G"} + GyMMMd{"d MMM y 'г'. G"} GyMd{"dd.MM.y GGGGG"} H{"HH"} Hm{"HH:mm"} @@ -683,11 +695,11 @@ be{ MMMd{"d MMM"} Md{"d.M"} d{"d"} - h{"hh a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} - hmsv{"h:mm:ss a v"} - hmv{"h:mm a v"} + h{"hh a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} + hmsv{"h:mm:ss a v"} + hmv{"h:mm a v"} ms{"mm.ss"} y{"y"} yM{"M.y"} @@ -903,22 +915,22 @@ be{ } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y"} diff --git a/icu4c/source/data/locales/bem.txt b/icu4c/source/data/locales/bem.txt index 293a21dfe0c0..3f2c882c4dac 100644 --- a/icu4c/source/data/locales/bem.txt +++ b/icu4c/source/data/locales/bem.txt @@ -16,10 +16,10 @@ bem{ calendar{ generic{ DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE, d MMMM y G", "d MMMM y G", "d MMM y G", @@ -52,7 +52,7 @@ bem{ MMMd{"MMM d"} Md{"M/d"} d{"d"} - hm{"h:mm a"} + hm{"h:mm a"} ms{"mm:ss"} y{"y"} yM{"M/y"} @@ -76,10 +76,10 @@ bem{ "akasuba", } DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE, d MMMM y", "d MMMM y", "d MMM y", @@ -112,7 +112,7 @@ bem{ MMMd{"MMM d"} Md{"M/d"} d{"d"} - hm{"h:mm a"} + hm{"h:mm a"} ms{"mm:ss"} y{"y"} yM{"M/y"} diff --git a/icu4c/source/data/locales/bez.txt b/icu4c/source/data/locales/bez.txt index 856224552756..61f96c8f3e14 100644 --- a/icu4c/source/data/locales/bez.txt +++ b/icu4c/source/data/locales/bez.txt @@ -51,7 +51,7 @@ bez{ MMMd{"MMM d"} Md{"M/d"} d{"d"} - hm{"h:mm a"} + hm{"h:mm a"} ms{"mm:ss"} y{"y"} yM{"M/y"} @@ -111,7 +111,7 @@ bez{ MMMd{"MMM d"} Md{"M/d"} d{"d"} - hm{"h:mm a"} + hm{"h:mm a"} ms{"mm:ss"} y{"y"} yM{"M/y"} diff --git a/icu4c/source/data/locales/bg.txt b/icu4c/source/data/locales/bg.txt index 397e09f529f6..9db6da572a81 100644 --- a/icu4c/source/data/locales/bg.txt +++ b/icu4c/source/data/locales/bg.txt @@ -220,9 +220,9 @@ bg{ "H:mm:ss 'ч'. z", "H:mm:ss 'ч'.", "H:mm 'ч'.", - "EEEE, d MMMM y 'г'. G", - "d MMMM y 'г'. G", - "d.MM.y 'г'. G", + "EEEE, d MMMM y 'г'. G", + "d MMMM y 'г'. G", + "d.MM.y 'г'. G", "d.MM.yy G", "{1}, {0}", "{1}, {0}", @@ -252,14 +252,14 @@ bg{ Ed{"E, d"} Ehm{"E, h:mm 'ч'. a"} Ehms{"E, h:mm:ss 'ч'. a"} - Gy{"y 'г'. G"} - GyMMM{"MM.y 'г'. G"} - GyMMMEd{"E, d.MM.y 'г'. G"} - GyMMMM{"MMMM y 'г'. G"} - GyMMMMEd{"E, d MMMM y 'г'. G"} - GyMMMMd{"d MMMM y 'г'. G"} - GyMMMd{"d.MM.y 'г'. G"} - GyMd{"dd.MM.y 'г'. GGGGG"} + Gy{"y 'г'. G"} + GyMMM{"MM.y 'г'. G"} + GyMMMEd{"E, d.MM.y 'г'. G"} + GyMMMM{"MMMM y 'г'. G"} + GyMMMMEd{"E, d MMMM y 'г'. G"} + GyMMMMd{"d MMMM y 'г'. G"} + GyMMMd{"d.MM.y 'г'. G"} + GyMd{"dd.MM.y 'г'. GGGGG"} H{"HH 'ч'."} Hm{"HH:mm 'ч'."} Hms{"HH:mm:ss 'ч'."} @@ -277,19 +277,19 @@ bg{ hm{"h:mm 'ч'. a"} hms{"h:mm:ss 'ч'. a"} ms{"mm:ss"} - y{"y 'г'. G"} - yyyy{"y 'г'. G"} - yyyyM{"M.y 'г'. G"} - yyyyMEd{"E, d.MM.y 'г'. G"} - yyyyMMM{"MM.y 'г'. G"} - yyyyMMMEd{"E, d.MM.y 'г'. G"} - yyyyMMMM{"MMMM y 'г'. G"} - yyyyMMMMEd{"E, d MMMM y 'г'. G"} - yyyyMMMMd{"d MMMM y 'г'. G"} - yyyyMMMd{"d.MM.y 'г'. G"} - yyyyMd{"d.MM.y 'г'. G"} - yyyyQQQ{"QQQ y 'г'. G"} - yyyyQQQQ{"QQQQ y 'г'. G"} + y{"y 'г'. G"} + yyyy{"y 'г'. G"} + yyyyM{"M.y 'г'. G"} + yyyyMEd{"E, d.MM.y 'г'. G"} + yyyyMMM{"MM.y 'г'. G"} + yyyyMMMEd{"E, d.MM.y 'г'. G"} + yyyyMMMM{"MMMM y 'г'. G"} + yyyyMMMMEd{"E, d MMMM y 'г'. G"} + yyyyMMMMd{"d MMMM y 'г'. G"} + yyyyMMMd{"d.MM.y 'г'. G"} + yyyyMd{"d.MM.y 'г'. G"} + yyyyQQQ{"QQQ y 'г'. G"} + yyyyQQQQ{"QQQQ y 'г'. G"} } intervalFormats{ Bh{ @@ -390,67 +390,67 @@ bg{ } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ - y{"y – y 'г'.G"} + y{"y – y 'г'.G"} } yM{ - M{"MM – MM.y 'г'. G"} - y{"MM.y 'г'. – MM.y 'г'. G"} + M{"MM – MM.y 'г'. G"} + y{"MM.y 'г'. – MM.y 'г'. G"} } yMEd{ - M{"E, d.MM – E, d.MM.y 'г'. G"} - d{"E, d.MM – E, d.MM.y 'г'. G"} - y{"E, d.MM.y 'г'. – E, d.MM.y 'г'. G"} + M{"E, d.MM – E, d.MM.y 'г'. G"} + d{"E, d.MM – E, d.MM.y 'г'. G"} + y{"E, d.MM.y 'г'. – E, d.MM.y 'г'. G"} } yMMM{ - M{"MM – MM.y 'г'. G"} - y{"MM.y 'г'. – MM.y 'г'. G"} + M{"MM – MM.y 'г'. G"} + y{"MM.y 'г'. – MM.y 'г'. G"} } yMMMEd{ - M{"E, d.MM – E, d.MM.y 'г'. G"} - d{"E, d.MM – E, d.MM.y 'г'. G"} - y{"E, d.MM.y 'г'. – E, d.MM.y 'г'. G"} + M{"E, d.MM – E, d.MM.y 'г'. G"} + d{"E, d.MM – E, d.MM.y 'г'. G"} + y{"E, d.MM.y 'г'. – E, d.MM.y 'г'. G"} } yMMMM{ - M{"MMMM – MMMM y 'г'. G"} - y{"MMMM y 'г'. – MMMM y 'г'. G"} + M{"MMMM – MMMM y 'г'. G"} + y{"MMMM y 'г'. – MMMM y 'г'. G"} } yMMMMEd{ - M{"E, d MMMM – E, d MMMM y 'г'. G"} - d{"E, d MMMM – E, d MMMM y 'г'. G"} - y{"E, d MMMM y 'г'. – E, d MMMM y 'г'. G"} + M{"E, d MMMM – E, d MMMM y 'г'. G"} + d{"E, d MMMM – E, d MMMM y 'г'. G"} + y{"E, d MMMM y 'г'. – E, d MMMM y 'г'. G"} } yMMMMd{ - M{"d MMMM – d MMMM y 'г'. G"} - d{"d – d MMMM y 'г'. G"} - y{"d MMMM y 'г'. – d MMMM y 'г'. G"} + M{"d MMMM – d MMMM y 'г'. G"} + d{"d – d MMMM y 'г'. G"} + y{"d MMMM y 'г'. – d MMMM y 'г'. G"} } yMMMd{ - M{"d.MM – d.MM.y 'г'. G"} - d{"d.MM – d.MM.y 'г'. G"} - y{"d.MM.y 'г'. – d.MM.y 'г'. G"} + M{"d.MM – d.MM.y 'г'. G"} + d{"d.MM – d.MM.y 'г'. G"} + y{"d.MM.y 'г'. – d.MM.y 'г'. G"} } yMd{ - M{"d.MM – d.MM.y 'г'. G"} - d{"d.MM – d.MM.y 'г'. G"} - y{"d.MM.y 'г'. – d.MM.y 'г'. G"} + M{"d.MM – d.MM.y 'г'. G"} + d{"d.MM – d.MM.y 'г'. G"} + y{"d.MM.y 'г'. – d.MM.y 'г'. G"} } } } @@ -472,10 +472,10 @@ bg{ "H:mm:ss 'ч'. z", "H:mm:ss 'ч'.", "H:mm 'ч'.", - "EEEE, d MMMM y 'г'.", - "d MMMM y 'г'.", - "d.MM.y 'г'.", - "d.MM.yy 'г'.", + "EEEE, d MMMM y 'г'.", + "d MMMM y 'г'.", + "d.MM.y 'г'.", + "d.MM.yy 'г'.", "{1}, {0}", "{1}, {0}", "{1}, {0}", @@ -507,14 +507,14 @@ bg{ Ed{"E, d"} Ehm{"E, h:mm 'ч'. a"} Ehms{"E, h:mm:ss 'ч'. a"} - Gy{"y 'г'. G"} - GyMMM{"MM.y 'г'. G"} - GyMMMEd{"E, d.MM.y 'г'. G"} - GyMMMM{"MMMM y 'г'. G"} - GyMMMMEd{"E, d MMMM y 'г'. G"} - GyMMMMd{"d MMMM y 'г'. G"} - GyMMMd{"d.MM.y 'г'. G"} - GyMd{"dd.MM.y 'г'. GGGGG"} + Gy{"y 'г'. G"} + GyMMM{"MM.y 'г'. G"} + GyMMMEd{"E, d.MM.y 'г'. G"} + GyMMMM{"MMMM y 'г'. G"} + GyMMMMEd{"E, d MMMM y 'г'. G"} + GyMMMMd{"d MMMM y 'г'. G"} + GyMMMd{"d.MM.y 'г'. G"} + GyMd{"dd.MM.y 'г'. GGGGG"} H{"HH 'ч'."} Hm{"HH:mm 'ч'."} Hms{"HH:mm:ss 'ч'."} @@ -541,18 +541,18 @@ bg{ hmsv{"h:mm:ss 'ч'. a v"} hmv{"h:mm 'ч'. a v"} ms{"m:ss"} - y{"y 'г'."} - yM{"MM.y 'г'."} - yMEd{"E, d.MM.y 'г'."} - yMMM{"MM.y 'г'."} - yMMMEd{"E, d.MM.y 'г'."} - yMMMM{"MMMM y 'г'."} - yMMMMEd{"E, d MMMM y 'г'."} - yMMMMd{"d MMMM y 'г'."} - yMMMd{"d.MM.y 'г'."} - yMd{"d.MM.y 'г'."} - yQQQ{"QQQ y 'г'."} - yQQQQ{"QQQQ y 'г'."} + y{"y 'г'."} + yM{"MM.y 'г'."} + yMEd{"E, d.MM.y 'г'."} + yMMM{"MM.y 'г'."} + yMMMEd{"E, d.MM.y 'г'."} + yMMMM{"MMMM y 'г'."} + yMMMMEd{"E, d MMMM y 'г'."} + yMMMMd{"d MMMM y 'г'."} + yMMMd{"d.MM.y 'г'."} + yMd{"d.MM.y 'г'."} + yQQQ{"QQQ y 'г'."} + yQQQQ{"QQQQ y 'г'."} yw{ one{"'седмица' w 'от' Y 'г'."} other{"'седмица' w 'от' Y 'г'."} @@ -830,49 +830,49 @@ bg{ h{"h 'ч'. – h 'ч'. a v"} } y{ - y{"y – y 'г'."} + y{"y – y 'г'."} } yM{ - M{"MM.y 'г'. – MM.y 'г'."} - y{"MM.y 'г'. – MM.y 'г'."} + M{"MM.y 'г'. – MM.y 'г'."} + y{"MM.y 'г'. – MM.y 'г'."} } yMEd{ - M{"E, d.MM – E, d.MM.y 'г'."} - d{"E, d.MM – E, d.MM.y 'г'."} - y{"E, d.MM.y 'г'. – E, d.MM.y 'г'."} + M{"E, d.MM – E, d.MM.y 'г'."} + d{"E, d.MM – E, d.MM.y 'г'."} + y{"E, d.MM.y 'г'. – E, d.MM.y 'г'."} } yMMM{ - M{"MM.y 'г'. – MM.y 'г'."} - y{"MM.y 'г'. – MM.y 'г'."} + M{"MM.y 'г'. – MM.y 'г'."} + y{"MM.y 'г'. – MM.y 'г'."} } yMMMEd{ - M{"E, d.MM – E, d.MM.y 'г'."} - d{"E, d.MM – E, d.MM.y 'г'."} - y{"E, d.MM.y 'г'. – E, d.MM.y 'г'."} + M{"E, d.MM – E, d.MM.y 'г'."} + d{"E, d.MM – E, d.MM.y 'г'."} + y{"E, d.MM.y 'г'. – E, d.MM.y 'г'."} } yMMMM{ - M{"MMMM – MMMM y 'г'."} - y{"MMMM y 'г'. – MMMM y 'г'."} + M{"MMMM – MMMM y 'г'."} + y{"MMMM y 'г'. – MMMM y 'г'."} } yMMMMEd{ - M{"E, d MMMM – E, d MMMM y 'г'."} - d{"E, d MMMM – E, d MMMM y 'г'."} - y{"E, d MMMM y 'г'. – E, d MMMM y 'г'."} + M{"E, d MMMM – E, d MMMM y 'г'."} + d{"E, d MMMM – E, d MMMM y 'г'."} + y{"E, d MMMM y 'г'. – E, d MMMM y 'г'."} } yMMMMd{ - M{"d MMMM – d MMMM y 'г'."} - d{"d – d MMMM y 'г'."} - y{"d MMMM y 'г'. – d MMMM y 'г'."} + M{"d MMMM – d MMMM y 'г'."} + d{"d – d MMMM y 'г'."} + y{"d MMMM y 'г'. – d MMMM y 'г'."} } yMMMd{ - M{"d.MM – d.MM.y 'г'."} - d{"d.MM – d.MM.y 'г'."} - y{"d.MM.y 'г'. – d.MM.y 'г'."} + M{"d.MM – d.MM.y 'г'."} + d{"d.MM – d.MM.y 'г'."} + y{"d.MM.y 'г'. – d.MM.y 'г'."} } yMd{ - M{"d.MM – d.MM.y 'г'."} - d{"d.MM – d.MM.y 'г'."} - y{"d.MM.y 'г'. – d.MM.y 'г'."} + M{"d.MM – d.MM.y 'г'."} + d{"d.MM – d.MM.y 'г'."} + y{"d.MM.y 'г'. – d.MM.y 'г'."} } } monthNames{ diff --git a/icu4c/source/data/locales/br.txt b/icu4c/source/data/locales/br.txt index 94642ebcfb42..f53e18ae5f58 100644 --- a/icu4c/source/data/locales/br.txt +++ b/icu4c/source/data/locales/br.txt @@ -573,6 +573,12 @@ br{ "d MMM y G", "dd/MM/y GGGG", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1} {0}", + } + DateTimePatterns%atTime{ "{1} 'da' {0}", "{1} 'da' {0}", "{1}, {0}", @@ -625,13 +631,13 @@ br{ } intervalFormats{ Gy{ - G{"y G – y G"} - y{"y – y G"} + G{"y G – y G"} + y{"y – y G"} } GyMMM{ - G{"MMM y G – MMM y G"} - M{"MMM – MMM y G"} - y{"MMM y – MMM y G"} + G{"MMM y G – MMM y G"} + M{"MMM – MMM y G"} + y{"MMM y – MMM y G"} } H{ H{"HH–HH"} @@ -651,18 +657,18 @@ br{ M{"MM–MM"} } MEd{ - M{"E dd/MM – E dd/MM"} - d{"E dd/MM – E dd/MM"} + M{"E dd/MM – E dd/MM"} + d{"E dd/MM – E dd/MM"} } MMM{ M{"LLL–LLL"} } MMMEd{ - M{"E d MMM – E d MMM"} - d{"E d MMM – E d MMM"} + M{"E d MMM – E d MMM"} + d{"E d MMM – E d MMM"} } MMMd{ - M{"d MMM – d MMM"} + M{"d MMM – d MMM"} d{"d–d MMM"} } Md{ @@ -671,22 +677,22 @@ br{ } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y G"} @@ -696,27 +702,27 @@ br{ y{"MM/y–MM/y GGGGG"} } yMEd{ - M{"E dd/MM/y – E dd/MM/y GGGGG"} - d{"E dd/MM/y – E dd/MM/y GGGGG"} - y{"E dd/MM/y – E dd/MM/y GGGGG"} + M{"E dd/MM/y – E dd/MM/y GGGGG"} + d{"E dd/MM/y – E dd/MM/y GGGGG"} + y{"E dd/MM/y – E dd/MM/y GGGGG"} } yMMM{ - M{"MMM – MMM y G"} - y{"MMM y – MMM y G"} + M{"MMM – MMM y G"} + y{"MMM y – MMM y G"} } yMMMEd{ - M{"E d MMM – E d MMM y G"} - d{"E d MMM – E d MMM y G"} - y{"E d MMM y – E d MMM y G"} + M{"E d MMM – E d MMM y G"} + d{"E d MMM – E d MMM y G"} + y{"E d MMM y – E d MMM y G"} } yMMMM{ - M{"MMMM – MMMM y G"} - y{"MMMM y – MMMM y G"} + M{"MMMM – MMMM y G"} + y{"MMMM y – MMMM y G"} } yMMMd{ - M{"d MMM – d MMM y G"} + M{"d MMM – d MMM y G"} d{"d–d MMM y G"} - y{"d MMM y – d MMM y G"} + y{"d MMM y – d MMM y G"} } yMd{ M{"dd/MM/y–dd/MM/y GGGGG"} @@ -736,6 +742,12 @@ br{ "d MMM r", "dd/MM/r", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1} {0}", + } + DateTimePatterns%atTime{ "{1} 'da' {0}", "{1} 'da' {0}", "{1}, {0}", @@ -767,9 +779,9 @@ br{ M{"L"} MMM{"LLL"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"mm:ss"} } cyclicNameSets{ @@ -1416,22 +1428,22 @@ br{ } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"U–U"} @@ -1539,6 +1551,12 @@ br{ "d MMM y G", "dd/MM/y GGGG", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1} {0}", + } + DateTimePatterns%atTime{ "{1} 'da' {0}", "{1} 'da' {0}", "{1}, {0}", @@ -1593,15 +1611,15 @@ br{ H{"HH–HH v"} } MEd{ - M{"E dd/MM – E dd/MM"} - d{"E dd/MM – E dd/MM"} + M{"E dd/MM – E dd/MM"} + d{"E dd/MM – E dd/MM"} } MMMEd{ - M{"E d MMM – E d MMM"} - d{"E d MMM – E d MMM"} + M{"E d MMM – E d MMM"} + d{"E d MMM – E d MMM"} } MMMd{ - M{"d MMM – d MMM"} + M{"d MMM – d MMM"} d{"d–d MMM"} } Md{ @@ -1609,22 +1627,22 @@ br{ d{"dd/MM–dd/MM"} } h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y G"} @@ -1634,27 +1652,27 @@ br{ y{"MM/y–MM/y GGGGG"} } yMEd{ - M{"E dd/MM/y – E dd/MM/y GGGGG"} - d{"E dd/MM/y – E dd/MM/y GGGGG"} - y{"E dd/MM/y – E dd/MM/y GGGGG"} + M{"E dd/MM/y – E dd/MM/y GGGGG"} + d{"E dd/MM/y – E dd/MM/y GGGGG"} + y{"E dd/MM/y – E dd/MM/y GGGGG"} } yMMM{ - M{"MMM – MMM y G"} - y{"MMM y – MMM y G"} + M{"MMM – MMM y G"} + y{"MMM y – MMM y G"} } yMMMEd{ - M{"E d MMM – E d MMM y G"} - d{"E d MMM – E d MMM y G"} - y{"E d MMM y – E d MMM y G"} + M{"E d MMM – E d MMM y G"} + d{"E d MMM – E d MMM y G"} + y{"E d MMM y – E d MMM y G"} } yMMMM{ - M{"MMMM – MMMM y G"} - y{"MMMM y – MMMM y G"} + M{"MMMM – MMMM y G"} + y{"MMMM y – MMMM y G"} } yMMMd{ - M{"d MMM – d MMM y G"} + M{"d MMM – d MMM y G"} d{"d–d MMM y G"} - y{"d MMM y – d MMM y G"} + y{"d MMM y – d MMM y G"} } yMd{ M{"dd/MM/y–dd/MM/y GGGGG"} @@ -1770,6 +1788,12 @@ br{ "d MMM r", "dd/MM/r", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1} {0}", + } + DateTimePatterns%atTime{ "{1} 'da' {0}", "{1} 'da' {0}", "{1}, {0}", @@ -2510,49 +2534,49 @@ br{ M{"MM–MM"} } MEd{ - M{"E dd/MM – E dd/MM"} - d{"E dd/MM – E dd/MM"} + M{"E dd/MM – E dd/MM"} + d{"E dd/MM – E dd/MM"} } MMM{ M{"LLL–LLL"} } MMMEd{ - M{"E d MMM – E d MMM"} - d{"E d MMM – E d MMM"} + M{"E d MMM – E d MMM"} + d{"E d MMM – E d MMM"} } MMMd{ - M{"d MMM – d MMM"} + M{"d MMM – d MMM"} d{"d–d MMM"} } Md{ - M{"dd/MM – dd/MM"} - d{"dd/MM – dd/MM"} + M{"dd/MM – dd/MM"} + d{"dd/MM – dd/MM"} } d{ d{"d–d"} } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } yM{ - M{"MM/y – MM/y"} - y{"MM/y – MM/y"} + M{"MM/y – MM/y"} + y{"MM/y – MM/y"} } } monthNames{ @@ -2657,6 +2681,12 @@ br{ "d MMM y G", "dd/MM/y GGGG", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1} {0}", + } + DateTimePatterns%atTime{ "{1} 'da' {0}", "{1} 'da' {0}", "{1}, {0}", @@ -2711,15 +2741,15 @@ br{ H{"HH–HH v"} } MEd{ - M{"E dd/MM – E dd/MM"} - d{"E dd/MM – E dd/MM"} + M{"E dd/MM – E dd/MM"} + d{"E dd/MM – E dd/MM"} } MMMEd{ - M{"E d MMM – E d MMM"} - d{"E d MMM – E d MMM"} + M{"E d MMM – E d MMM"} + d{"E d MMM – E d MMM"} } MMMd{ - M{"d MMM – d MMM"} + M{"d MMM – d MMM"} d{"d–d MMM"} } Md{ @@ -2727,22 +2757,22 @@ br{ d{"dd/MM–dd/MM"} } h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y G"} @@ -2752,27 +2782,27 @@ br{ y{"MM/y–MM/y GGGGG"} } yMEd{ - M{"E dd/MM/y – E dd/MM/y GGGGG"} - d{"E dd/MM/y – E dd/MM/y GGGGG"} - y{"E dd/MM/y – E dd/MM/y GGGGG"} + M{"E dd/MM/y – E dd/MM/y GGGGG"} + d{"E dd/MM/y – E dd/MM/y GGGGG"} + y{"E dd/MM/y – E dd/MM/y GGGGG"} } yMMM{ - M{"MMM – MMM y G"} - y{"MMM y – MMM y G"} + M{"MMM – MMM y G"} + y{"MMM y – MMM y G"} } yMMMEd{ - M{"E d MMM – E d MMM y G"} - d{"E d MMM – E d MMM y G"} - y{"E d MMM y – E d MMM y G"} + M{"E d MMM – E d MMM y G"} + d{"E d MMM – E d MMM y G"} + y{"E d MMM y – E d MMM y G"} } yMMMM{ - M{"MMMM – MMMM y G"} - y{"MMMM y – MMMM y G"} + M{"MMMM – MMMM y G"} + y{"MMMM y – MMMM y G"} } yMMMd{ - M{"d MMM – d MMM y G"} + M{"d MMM – d MMM y G"} d{"d–d MMM y G"} - y{"d MMM y – d MMM y G"} + y{"d MMM y – d MMM y G"} } yMd{ M{"dd/MM/y–dd/MM/y GGGGG"} @@ -2888,6 +2918,12 @@ br{ "d MMM y G", "dd/MM/y GGGG", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1} {0}", + } + DateTimePatterns%atTime{ "{1} 'da' {0}", "{1} 'da' {0}", "{1}, {0}", @@ -2913,8 +2949,8 @@ br{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"E d"} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"y G"} GyMMM{"MMM y G"} GyMMMEd{"E d MMM y G"} @@ -2930,9 +2966,9 @@ br{ MMMd{"d MMM"} Md{"dd/MM"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"mm:ss"} y{"y G"} yyyy{"y G"} @@ -2948,42 +2984,42 @@ br{ } intervalFormats{ Gy{ - G{"y G – y G"} - y{"y – y G"} + G{"y G – y G"} + y{"y – y G"} } GyM{ - G{"MM/y GGGGG – MM/y GGGGG"} - M{"MM/y – MM/y GGGGG"} - y{"MM/y – MM/y GGGGG"} + G{"MM/y GGGGG – MM/y GGGGG"} + M{"MM/y – MM/y GGGGG"} + y{"MM/y – MM/y GGGGG"} } GyMEd{ - G{"E dd/MM/y GGGGG – E dd/MM/y GGGGG"} - M{"E dd/MM/y – E dd/MM/y GGGGG"} - d{"E dd/MM/y – E dd/MM/y GGGGG"} - y{"E dd/MM/y – E dd/MM/y GGGGG"} + G{"E dd/MM/y GGGGG – E dd/MM/y GGGGG"} + M{"E dd/MM/y – E dd/MM/y GGGGG"} + d{"E dd/MM/y – E dd/MM/y GGGGG"} + y{"E dd/MM/y – E dd/MM/y GGGGG"} } GyMMM{ - G{"MMM y G – MMM y G"} - M{"MMM – MMM y G"} - y{"MMM y – MMM y G"} + G{"MMM y G – MMM y G"} + M{"MMM – MMM y G"} + y{"MMM y – MMM y G"} } GyMMMEd{ - G{"E d MMM y G – E d MMM y G"} - M{"E d MMM – E d MMM y G"} - d{"E d MMM y – E d MMM y G"} - y{"E d MMM y – E d MMM y G"} + G{"E d MMM y G – E d MMM y G"} + M{"E d MMM – E d MMM y G"} + d{"E d MMM y – E d MMM y G"} + y{"E d MMM y – E d MMM y G"} } GyMMMd{ - G{"d MMM y G – d MMM y G"} - M{"d MMM – d MMM y G"} - d{"d – d MMM y G"} - y{"d MMM y – d MMM y G"} + G{"d MMM y G – d MMM y G"} + M{"d MMM – d MMM y G"} + d{"d – d MMM y G"} + y{"d MMM y – d MMM y G"} } GyMd{ - G{"dd/MM/y GGGGG – dd/MM/y GGGGG"} - M{"dd/MM/y – dd/MM/y GGGGG"} - d{"dd/MM/y – dd/MM/y GGGGG"} - y{"dd/MM/y – dd/MM/y GGGGG"} + G{"dd/MM/y GGGGG – dd/MM/y GGGGG"} + M{"dd/MM/y – dd/MM/y GGGGG"} + d{"dd/MM/y – dd/MM/y GGGGG"} + y{"dd/MM/y – dd/MM/y GGGGG"} } H{ H{"HH–HH"} @@ -3003,18 +3039,18 @@ br{ M{"MM–MM"} } MEd{ - M{"E dd/MM – E dd/MM"} - d{"E dd/MM – E dd/MM"} + M{"E dd/MM – E dd/MM"} + d{"E dd/MM – E dd/MM"} } MMM{ M{"LLL–LLL"} } MMMEd{ - M{"E d MMM – E d MMM"} - d{"E d MMM – E d MMM"} + M{"E d MMM – E d MMM"} + d{"E d MMM – E d MMM"} } MMMd{ - M{"d MMM – d MMM"} + M{"d MMM – d MMM"} d{"d–d MMM"} } Md{ @@ -3026,22 +3062,22 @@ br{ } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y G"} @@ -3051,27 +3087,27 @@ br{ y{"MM/y–MM/y GGGGG"} } yMEd{ - M{"E dd/MM/y – E dd/MM/y GGGGG"} - d{"E dd/MM/y – E dd/MM/y GGGGG"} - y{"E dd/MM/y – E dd/MM/y GGGGG"} + M{"E dd/MM/y – E dd/MM/y GGGGG"} + d{"E dd/MM/y – E dd/MM/y GGGGG"} + y{"E dd/MM/y – E dd/MM/y GGGGG"} } yMMM{ - M{"MMM – MMM y G"} - y{"MMM y – MMM y G"} + M{"MMM – MMM y G"} + y{"MMM y – MMM y G"} } yMMMEd{ - M{"E d MMM – E d MMM y G"} - d{"E d MMM – E d MMM y G"} - y{"E d MMM y – E d MMM y G"} + M{"E d MMM – E d MMM y G"} + d{"E d MMM – E d MMM y G"} + y{"E d MMM y – E d MMM y G"} } yMMMM{ - M{"MMMM – MMMM y G"} - y{"MMMM y – MMMM y G"} + M{"MMMM – MMMM y G"} + y{"MMMM y – MMMM y G"} } yMMMd{ - M{"d MMM – d MMM y G"} + M{"d MMM – d MMM y G"} d{"d–d MMM y G"} - y{"d MMM y – d MMM y G"} + y{"d MMM y – d MMM y G"} } yMd{ M{"dd/MM/y–dd/MM/y GGGGG"} @@ -3103,6 +3139,12 @@ br{ "d MMM y", "dd/MM/y", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1} {0}", + } + DateTimePatterns%atTime{ "{1} 'da' {0}", "{1} 'da' {0}", "{1}, {0}", @@ -3131,8 +3173,8 @@ br{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"E d"} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"y G"} GyMMM{"MMM y G"} GyMMMEd{"E d MMM y G"} @@ -3157,11 +3199,11 @@ br{ MMMd{"d MMM"} Md{"dd/MM"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} - hmsv{"h:mm:ss a v"} - hmv{"h:mm a v"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} + hmsv{"h:mm:ss a v"} + hmv{"h:mm a v"} ms{"mm:ss"} y{"y"} yM{"MM/y"} @@ -3303,42 +3345,42 @@ br{ } intervalFormats{ Gy{ - G{"y G – y G"} - y{"y – y G"} + G{"y G – y G"} + y{"y – y G"} } GyM{ - G{"MM/y GGGGG – MM/y GGGGG"} - M{"MM/y – MM/y GGGGG"} - y{"MM/y – MM/y GGGGG"} + G{"MM/y GGGGG – MM/y GGGGG"} + M{"MM/y – MM/y GGGGG"} + y{"MM/y – MM/y GGGGG"} } GyMEd{ - G{"E dd/MM/y GGGGG – E dd/MM/y GGGGG"} - M{"E dd/MM/y – E dd/MM/y GGGGG"} - d{"E dd/MM/y – E dd/MM/y GGGGG"} - y{"E dd/MM/y – E dd/MM/y GGGGG"} + G{"E dd/MM/y GGGGG – E dd/MM/y GGGGG"} + M{"E dd/MM/y – E dd/MM/y GGGGG"} + d{"E dd/MM/y – E dd/MM/y GGGGG"} + y{"E dd/MM/y – E dd/MM/y GGGGG"} } GyMMM{ - G{"MMM y G – MMM y G"} - M{"MMM – MMM y G"} - y{"MMM y – MMM y G"} + G{"MMM y G – MMM y G"} + M{"MMM – MMM y G"} + y{"MMM y – MMM y G"} } GyMMMEd{ - G{"E d MMM y G – E d MMM y G"} - M{"E d MMM – E d MMM y G"} - d{"E d MMM – E d MMM y G"} - y{"E d MMM y – E d MMM y G"} + G{"E d MMM y G – E d MMM y G"} + M{"E d MMM – E d MMM y G"} + d{"E d MMM – E d MMM y G"} + y{"E d MMM y – E d MMM y G"} } GyMMMd{ - G{"d MMM y G – d MMM y G"} - M{"d MMM – d MMM y G"} - d{"d – d MMM y G"} - y{"d MMM y – d MMM y G"} + G{"d MMM y G – d MMM y G"} + M{"d MMM – d MMM y G"} + d{"d – d MMM y G"} + y{"d MMM y – d MMM y G"} } GyMd{ - G{"dd/MM/y GGGGG – dd/MM/y GGGGG"} - M{"dd/MM/y – dd/MM/y GGGGG"} - d{"dd/MM/y – dd/MM/y GGGGG"} - y{"dd/MM/y – dd/MM/y GGGGG"} + G{"dd/MM/y GGGGG – dd/MM/y GGGGG"} + M{"dd/MM/y – dd/MM/y GGGGG"} + d{"dd/MM/y – dd/MM/y GGGGG"} + y{"dd/MM/y – dd/MM/y GGGGG"} } H{ H{"HH–HH"} @@ -3358,80 +3400,80 @@ br{ M{"MM–MM"} } MEd{ - M{"E dd/MM – E dd/MM"} - d{"E dd/MM – E dd/MM"} + M{"E dd/MM – E dd/MM"} + d{"E dd/MM – E dd/MM"} } MMM{ M{"LLL–LLL"} } MMMEd{ - M{"E d MMM – E d MMM"} - d{"E d MMM – E d MMM"} + M{"E d MMM – E d MMM"} + d{"E d MMM – E d MMM"} } MMMd{ - M{"d MMM – d MMM"} + M{"d MMM – d MMM"} d{"d–d MMM"} } Md{ - M{"dd/MM – dd/MM"} - d{"dd/MM – dd/MM"} + M{"dd/MM – dd/MM"} + d{"dd/MM – dd/MM"} } d{ d{"d–d"} } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y"} } yM{ - M{"MM/y – MM/y"} - y{"MM/y – MM/y"} + M{"MM/y – MM/y"} + y{"MM/y – MM/y"} } yMEd{ - M{"E dd/MM/y – E dd/MM/y"} - d{"E dd/MM/y – E dd/MM/y"} - y{"E dd/MM/y – E dd/MM/y"} + M{"E dd/MM/y – E dd/MM/y"} + d{"E dd/MM/y – E dd/MM/y"} + y{"E dd/MM/y – E dd/MM/y"} } yMMM{ - M{"MMM – MMM y"} - y{"MMM y – MMM y"} + M{"MMM – MMM y"} + y{"MMM y – MMM y"} } yMMMEd{ - M{"E d MMM – E d MMM y"} - d{"E d MMM – E d MMM y"} - y{"E d MMM y – E d MMM y"} + M{"E d MMM – E d MMM y"} + d{"E d MMM – E d MMM y"} + y{"E d MMM y – E d MMM y"} } yMMMM{ - M{"MMMM – MMMM y"} - y{"MMMM y – MMMM y"} + M{"MMMM – MMMM y"} + y{"MMMM y – MMMM y"} } yMMMd{ - M{"d MMM – d MMM y"} + M{"d MMM – d MMM y"} d{"d–d MMM y"} - y{"d MMM y – d MMM y"} + y{"d MMM y – d MMM y"} } yMd{ - M{"dd/MM/y – dd/MM/y"} - d{"dd/MM/y – dd/MM/y"} - y{"dd/MM/y – dd/MM/y"} + M{"dd/MM/y – dd/MM/y"} + d{"dd/MM/y – dd/MM/y"} + y{"dd/MM/y – dd/MM/y"} } } monthNames{ @@ -3578,6 +3620,12 @@ br{ "d MMM y G", "dd/MM/y GGGG", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1} {0}", + } + DateTimePatterns%atTime{ "{1} 'da' {0}", "{1} 'da' {0}", "{1}, {0}", @@ -3636,73 +3684,73 @@ br{ H{"HH–HH v"} } MEd{ - M{"E d MMM – E d MMM"} - d{"E d MMM – E d MMM"} + M{"E d MMM – E d MMM"} + d{"E d MMM – E d MMM"} } MMMEd{ - M{"E d MMM – E d MMM"} - d{"E d MMM – E d MMM"} + M{"E d MMM – E d MMM"} + d{"E d MMM – E d MMM"} } MMMd{ - M{"d MMM – d MMM"} + M{"d MMM – d MMM"} d{"d–d MMM"} } Md{ - M{"d MMM – d MMM"} + M{"d MMM – d MMM"} } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y G"} } yM{ - M{"MMM y – MMM y GGGGG"} - y{"MMM y – MMM y GGGGG"} + M{"MMM y – MMM y GGGGG"} + y{"MMM y – MMM y GGGGG"} } yMEd{ - M{"E d MMM – E d MMM y GGGGG"} - d{"E d MMM – E d MMM y GGGGG"} - y{"E d MMM y – E d MMM y GGGGG"} + M{"E d MMM – E d MMM y GGGGG"} + d{"E d MMM – E d MMM y GGGGG"} + y{"E d MMM y – E d MMM y GGGGG"} } yMMM{ - M{"MMM y – MMM y G"} - y{"MMM y – MMM y G"} + M{"MMM y – MMM y G"} + y{"MMM y – MMM y G"} } yMMMEd{ - M{"E d MMM – E d MMM y G"} - d{"E d MMM – E d MMM y G"} - y{"E d MMM y – E d MMM y G"} + M{"E d MMM – E d MMM y G"} + d{"E d MMM – E d MMM y G"} + y{"E d MMM y – E d MMM y G"} } yMMMM{ - M{"MMMM – MMMM y G"} - y{"MMMM y – MMMM y G"} + M{"MMMM – MMMM y G"} + y{"MMMM y – MMMM y G"} } yMMMd{ - M{"d MMM – d MMM y G"} + M{"d MMM – d MMM y G"} d{"d–d MMM y G"} - y{"d MMM y – d MMM y G"} + y{"d MMM y – d MMM y G"} } yMd{ - M{"d MMM y – d MMM y GGGGG"} + M{"d MMM y – d MMM y GGGGG"} d{"d–d MMM y GGGGG"} - y{"d MMM y – d MMM y GGGGG"} + y{"d MMM y – d MMM y GGGGG"} } } monthNames{ @@ -3772,15 +3820,15 @@ br{ H{"HH–HH v"} } MEd{ - M{"E dd/MM – E dd/MM"} - d{"E dd/MM – E dd/MM"} + M{"E dd/MM – E dd/MM"} + d{"E dd/MM – E dd/MM"} } MMMEd{ - M{"E d MMM – E d MMM"} - d{"E d MMM – E d MMM"} + M{"E d MMM – E d MMM"} + d{"E d MMM – E d MMM"} } MMMd{ - M{"d MMM – d MMM"} + M{"d MMM – d MMM"} d{"d–d MMM"} } Md{ @@ -3788,22 +3836,22 @@ br{ d{"dd/MM–dd/MM"} } h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y G"} @@ -3813,27 +3861,27 @@ br{ y{"MM/y–MM/y GGGGG"} } yMEd{ - M{"E dd/MM/y – E dd/MM/y GGGGG"} - d{"E dd/MM/y – E dd/MM/y GGGGG"} - y{"E dd/MM/y – E dd/MM/y GGGGG"} + M{"E dd/MM/y – E dd/MM/y GGGGG"} + d{"E dd/MM/y – E dd/MM/y GGGGG"} + y{"E dd/MM/y – E dd/MM/y GGGGG"} } yMMM{ - M{"MMM – MMM y G"} - y{"MMM y – MMM y G"} + M{"MMM – MMM y G"} + y{"MMM y – MMM y G"} } yMMMEd{ - M{"E d MMM – E d MMM y G"} - d{"E d MMM – E d MMM y G"} - y{"E d MMM y – E d MMM y G"} + M{"E d MMM – E d MMM y G"} + d{"E d MMM – E d MMM y G"} + y{"E d MMM y – E d MMM y G"} } yMMMM{ - M{"MMMM – MMMM y G"} - y{"MMMM y – MMMM y G"} + M{"MMMM – MMMM y G"} + y{"MMMM y – MMMM y G"} } yMMMd{ - M{"d MMM – d MMM y G"} + M{"d MMM – d MMM y G"} d{"d–d MMM y G"} - y{"d MMM y – d MMM y G"} + y{"d MMM y – d MMM y G"} } yMd{ M{"dd/MM/y–dd/MM/y GGGGG"} @@ -3887,6 +3935,12 @@ br{ "d MMM y G", "dd/MM/y GGGG", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1} {0}", + } + DateTimePatterns%atTime{ "{1} 'da' {0}", "{1} 'da' {0}", "{1}, {0}", @@ -3931,15 +3985,15 @@ br{ H{"HH–HH v"} } MEd{ - M{"E dd/MM – E dd/MM"} - d{"E dd/MM – E dd/MM"} + M{"E dd/MM – E dd/MM"} + d{"E dd/MM – E dd/MM"} } MMMEd{ - M{"E d MMM – E d MMM"} - d{"E d MMM – E d MMM"} + M{"E d MMM – E d MMM"} + d{"E d MMM – E d MMM"} } MMMd{ - M{"d MMM – d MMM"} + M{"d MMM – d MMM"} d{"d–d MMM"} } Md{ @@ -3947,22 +4001,22 @@ br{ } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y G"} @@ -3972,27 +4026,27 @@ br{ y{"MM/y–MM/y GGGGG"} } yMEd{ - M{"E dd/MM/y – E dd/MM/y GGGGG"} - d{"E dd/MM/y – E dd/MM/y GGGGG"} - y{"E dd/MM/y – E dd/MM/y GGGGG"} + M{"E dd/MM/y – E dd/MM/y GGGGG"} + d{"E dd/MM/y – E dd/MM/y GGGGG"} + y{"E dd/MM/y – E dd/MM/y GGGGG"} } yMMM{ - M{"MMM – MMM y G"} - y{"MMM y – MMM y G"} + M{"MMM – MMM y G"} + y{"MMM y – MMM y G"} } yMMMEd{ - M{"E d MMM – E d MMM y G"} - d{"E d MMM – E d MMM y G"} - y{"E d MMM y – E d MMM y G"} + M{"E d MMM – E d MMM y G"} + d{"E d MMM – E d MMM y G"} + y{"E d MMM y – E d MMM y G"} } yMMMM{ - M{"MMMM – MMMM y G"} - y{"MMMM y – MMMM y G"} + M{"MMMM – MMMM y G"} + y{"MMMM y – MMMM y G"} } yMMMd{ - M{"d MMM – d MMM y G"} + M{"d MMM – d MMM y G"} d{"d–d MMM y G"} - y{"d MMM y – d MMM y G"} + y{"d MMM y – d MMM y G"} } yMd{ M{"dd/MM/y–dd/MM/y GGGGG"} @@ -4046,6 +4100,12 @@ br{ "d MMM y G", "dd/MM/y GGGG", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1} {0}", + } + DateTimePatterns%atTime{ "{1} 'da' {0}", "{1} 'da' {0}", "{1}, {0}", @@ -4819,15 +4879,15 @@ br{ H{"HH–HH v"} } MEd{ - M{"E dd/MM – E dd/MM"} - d{"E dd/MM – E dd/MM"} + M{"E dd/MM – E dd/MM"} + d{"E dd/MM – E dd/MM"} } MMMEd{ - M{"E d MMM – E d MMM"} - d{"E d MMM – E d MMM"} + M{"E d MMM – E d MMM"} + d{"E d MMM – E d MMM"} } MMMd{ - M{"d MMM – d MMM"} + M{"d MMM – d MMM"} d{"d–d MMM"} } Md{ @@ -4836,22 +4896,22 @@ br{ } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y G"} @@ -4861,27 +4921,27 @@ br{ y{"MM/y–MM/y GGGGG"} } yMEd{ - M{"E dd/MM/y – E dd/MM/y GGGGG"} - d{"E dd/MM/y – E dd/MM/y GGGGG"} - y{"E dd/MM/y – E dd/MM/y GGGGG"} + M{"E dd/MM/y – E dd/MM/y GGGGG"} + d{"E dd/MM/y – E dd/MM/y GGGGG"} + y{"E dd/MM/y – E dd/MM/y GGGGG"} } yMMM{ - M{"MMM – MMM y G"} - y{"MMM y – MMM y G"} + M{"MMM – MMM y G"} + y{"MMM y – MMM y G"} } yMMMEd{ - M{"E d MMM – E d MMM y G"} - d{"E d MMM – E d MMM y G"} - y{"E d MMM y – E d MMM y G"} + M{"E d MMM – E d MMM y G"} + d{"E d MMM – E d MMM y G"} + y{"E d MMM y – E d MMM y G"} } yMMMM{ - M{"MMMM – MMMM y G"} - y{"MMMM y – MMMM y G"} + M{"MMMM – MMMM y G"} + y{"MMMM y – MMMM y G"} } yMMMd{ - M{"d MMM – d MMM y G"} + M{"d MMM – d MMM y G"} d{"d–d MMM y G"} - y{"d MMM y – d MMM y G"} + y{"d MMM y – d MMM y G"} } yMd{ M{"dd/MM/y–dd/MM/y GGGGG"} @@ -4901,6 +4961,12 @@ br{ "d MMM y G", "dd/MM/y GGGG", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1} {0}", + } + DateTimePatterns%atTime{ "{1} 'da' {0}", "{1} 'da' {0}", "{1}, {0}", @@ -4955,15 +5021,15 @@ br{ H{"HH–HH v"} } MEd{ - M{"E dd/MM – E dd/MM"} - d{"E dd/MM – E dd/MM"} + M{"E dd/MM – E dd/MM"} + d{"E dd/MM – E dd/MM"} } MMMEd{ - M{"E d MMM – E d MMM"} - d{"E d MMM – E d MMM"} + M{"E d MMM – E d MMM"} + d{"E d MMM – E d MMM"} } MMMd{ - M{"d MMM – d MMM"} + M{"d MMM – d MMM"} d{"d–d MMM"} } Md{ @@ -4971,22 +5037,22 @@ br{ d{"dd/MM–dd/MM"} } h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y G"} @@ -4996,27 +5062,27 @@ br{ y{"MM/y–MM/y GGGGG"} } yMEd{ - M{"E dd/MM/y – E dd/MM/y GGGGG"} - d{"E dd/MM/y – E dd/MM/y GGGGG"} - y{"E dd/MM/y – E dd/MM/y GGGGG"} + M{"E dd/MM/y – E dd/MM/y GGGGG"} + d{"E dd/MM/y – E dd/MM/y GGGGG"} + y{"E dd/MM/y – E dd/MM/y GGGGG"} } yMMM{ - M{"MMM – MMM y G"} - y{"MMM y – MMM y G"} + M{"MMM – MMM y G"} + y{"MMM y – MMM y G"} } yMMMEd{ - M{"E d MMM – E d MMM y G"} - d{"E d MMM – E d MMM y G"} - y{"E d MMM y – E d MMM y G"} + M{"E d MMM – E d MMM y G"} + d{"E d MMM – E d MMM y G"} + y{"E d MMM y – E d MMM y G"} } yMMMM{ - M{"MMMM – MMMM y G"} - y{"MMMM y – MMMM y G"} + M{"MMMM – MMMM y G"} + y{"MMMM y – MMMM y G"} } yMMMd{ - M{"d MMM – d MMM y G"} + M{"d MMM – d MMM y G"} d{"d–d MMM y G"} - y{"d MMM y – d MMM y G"} + y{"d MMM y – d MMM y G"} } yMd{ M{"dd/MM/y–dd/MM/y GGGGG"} @@ -5070,6 +5136,12 @@ br{ "d MMM y G", "dd/MM/y GGGG", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1} {0}", + } + DateTimePatterns%atTime{ "{1} 'da' {0}", "{1} 'da' {0}", "{1}, {0}", @@ -5138,15 +5210,15 @@ br{ H{"HH–HH v"} } MEd{ - M{"E dd/MM – E dd/MM"} - d{"E dd/MM – E dd/MM"} + M{"E dd/MM – E dd/MM"} + d{"E dd/MM – E dd/MM"} } MMMEd{ - M{"E d MMM – E d MMM"} - d{"E d MMM – E d MMM"} + M{"E d MMM – E d MMM"} + d{"E d MMM – E d MMM"} } MMMd{ - M{"d MMM – d MMM"} + M{"d MMM – d MMM"} d{"d–d MMM"} } Md{ @@ -5155,22 +5227,22 @@ br{ } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y G"} @@ -5180,27 +5252,27 @@ br{ y{"MM/y–MM/y GGGGG"} } yMEd{ - M{"E dd/MM/y – E dd/MM/y GGGGG"} - d{"E dd/MM/y – E dd/MM/y GGGGG"} - y{"E dd/MM/y – E dd/MM/y GGGGG"} + M{"E dd/MM/y – E dd/MM/y GGGGG"} + d{"E dd/MM/y – E dd/MM/y GGGGG"} + y{"E dd/MM/y – E dd/MM/y GGGGG"} } yMMM{ - M{"MMM – MMM y G"} - y{"MMM y – MMM y G"} + M{"MMM – MMM y G"} + y{"MMM y – MMM y G"} } yMMMEd{ - M{"E d MMM – E d MMM y G"} - d{"E d MMM – E d MMM y G"} - y{"E d MMM y – E d MMM y G"} + M{"E d MMM – E d MMM y G"} + d{"E d MMM – E d MMM y G"} + y{"E d MMM y – E d MMM y G"} } yMMMM{ - M{"MMMM – MMMM y G"} - y{"MMMM y – MMMM y G"} + M{"MMMM – MMMM y G"} + y{"MMMM y – MMMM y G"} } yMMMd{ - M{"d MMM – d MMM y G"} + M{"d MMM – d MMM y G"} d{"d–d MMM y G"} - y{"d MMM y – d MMM y G"} + y{"d MMM y – d MMM y G"} } yMd{ M{"dd/MM/y–dd/MM/y GGGGG"} diff --git a/icu4c/source/data/locales/brx.txt b/icu4c/source/data/locales/brx.txt index deca6160be66..bbfc844b331d 100644 --- a/icu4c/source/data/locales/brx.txt +++ b/icu4c/source/data/locales/brx.txt @@ -53,6 +53,12 @@ brx{ "MMM d, y G", "M/d/yy GGGGG", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{1} नि {0} आव", "{1} नि {0} आव", "{1}, {0}", @@ -115,6 +121,12 @@ brx{ "MMM d, y", "y-MM-dd", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{1} नि {0} याव", "{1} नि {0} याव", "{1}, {0}", diff --git a/icu4c/source/data/locales/bs.txt b/icu4c/source/data/locales/bs.txt index 7ace3c6f5d72..ba699c72299d 100644 --- a/icu4c/source/data/locales/bs.txt +++ b/icu4c/source/data/locales/bs.txt @@ -269,6 +269,12 @@ bs{ "d.M.y.", "d.M.y.", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{1} 'u' {0}", "{1} 'u' {0}", "{1}, {0}", @@ -436,6 +442,12 @@ bs{ "dd.MM.y. G", "dd.MM.y. GGGGG", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{1} 'u' {0}", "{1} 'u' {0}", "{1}, {0}", @@ -461,8 +473,8 @@ bs{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"E, d."} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"y. G"} GyMMM{"MMM y. G"} GyMMMEd{"E, d. MMM y. G"} @@ -479,9 +491,9 @@ bs{ MMMd{"d. MMM"} Md{"d.M."} d{"d"} - h{"h a"} - hm{"hh:mm a"} - hms{"hh:mm:ss a"} + h{"h a"} + hm{"hh:mm a"} + hms{"hh:mm:ss a"} ms{"mm:ss"} y{"y. G"} yyyy{"y. G"} @@ -497,54 +509,54 @@ bs{ } intervalFormats{ Bh{ - B{"h B – h B"} - h{"h – h B"} + B{"h B – h B"} + h{"h – h B"} } Bhm{ - B{"h:mm B – h:mm B"} - h{"h:mm – h:mm B"} - m{"h:mm – h:mm B"} + B{"h:mm B – h:mm B"} + h{"h:mm – h:mm B"} + m{"h:mm – h:mm B"} } Gy{ - G{"G y – G y"} + G{"G y – G y"} y{"G y–y"} } GyM{ - G{"GGGGG y-MM – GGGGG y-MM"} - M{"GGGGG y-MM – y-MM"} - y{"GGGGG y-MM – y-MM"} + G{"GGGGG y-MM – GGGGG y-MM"} + M{"GGGGG y-MM – y-MM"} + y{"GGGGG y-MM – y-MM"} } GyMEd{ - G{"GGGGG y-MM-dd, E – GGGGG y-MM-dd, E"} - M{"GGGGG y-MM-dd, E – y-MM-dd, E"} - d{"GGGGG y-MM-dd, E – y-MM-dd, E"} - y{"GGGGG y-MM-dd, E – y-MM-dd, E"} + G{"GGGGG y-MM-dd, E – GGGGG y-MM-dd, E"} + M{"GGGGG y-MM-dd, E – y-MM-dd, E"} + d{"GGGGG y-MM-dd, E – y-MM-dd, E"} + y{"GGGGG y-MM-dd, E – y-MM-dd, E"} } GyMMM{ - G{"G y MMM – G y MMM"} + G{"G y MMM – G y MMM"} M{"G y MMM–MMM"} - y{"G y MMM – y MMM"} + y{"G y MMM – y MMM"} } GyMMMEd{ - G{"G y MMM d, E – G y MMM d, E"} - M{"G y MMM d, E – MMM d, E"} - d{"G y MMM d, E – MMM d, E"} - y{"G y MMM d, E – y MMM d, E"} + G{"G y MMM d, E – G y MMM d, E"} + M{"G y MMM d, E – MMM d, E"} + d{"G y MMM d, E – MMM d, E"} + y{"G y MMM d, E – y MMM d, E"} } GyMMMd{ - G{"G y MMM d – G y MMM d"} - M{"G y MMM d – MMM d"} + G{"G y MMM d – G y MMM d"} + M{"G y MMM d – MMM d"} d{"G y MMM d–d"} - y{"G y MMM d – y MMM d"} + y{"G y MMM d – y MMM d"} } GyMd{ - G{"GGGGG y-MM-dd – GGGGG y-MM-dd"} - M{"GGGGG y-MM-dd – y-MM-dd"} - d{"GGGGG y-MM-dd – y-MM-dd"} - y{"GGGGG y-MM-dd – y-MM-dd"} + G{"GGGGG y-MM-dd – GGGGG y-MM-dd"} + M{"GGGGG y-MM-dd – y-MM-dd"} + d{"GGGGG y-MM-dd – y-MM-dd"} + y{"GGGGG y-MM-dd – y-MM-dd"} } H{ - H{"HH – HH'h'"} + H{"HH – HH'h'"} } Hm{ H{"HH:mm–HH:mm"} @@ -555,7 +567,7 @@ bs{ m{"HH:mm–HH:mm v"} } Hv{ - H{"HH – HH 'h' v"} + H{"HH – HH 'h' v"} } M{ M{"M. – M."} @@ -568,11 +580,11 @@ bs{ M{"LLL–LLL"} } MMMEd{ - M{"E, dd. MMM – E, dd. MMM"} + M{"E, dd. MMM – E, dd. MMM"} d{"E, dd. – E, dd. MMM"} } MMMd{ - M{"dd. MMM – dd. MMM"} + M{"dd. MMM – dd. MMM"} d{"dd. – dd. MMM"} } Md{ @@ -584,29 +596,29 @@ bs{ } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h – h'h' a"} + a{"h a – h a"} + h{"h – h'h' a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h – h 'h' a v"} + a{"h a – h a v"} + h{"h – h 'h' a v"} } y{ y{"y. – y. G"} } yM{ - M{"MM/y – MM/y G"} - y{"MM/y – MM/y G"} + M{"MM/y – MM/y G"} + y{"MM/y – MM/y G"} } yMEd{ M{"E, d.M.y. – E, d.M.y. G"} @@ -618,18 +630,18 @@ bs{ y{"LLL y. – LLL y. G"} } yMMMEd{ - M{"E, d. MMM – E, d. MMM y. G"} + M{"E, d. MMM – E, d. MMM y. G"} d{"E, dd. – E, dd. MMM y. G"} y{"E, d. MMM y. – E, d. MMM y. G"} } yMMMM{ - M{"LLLL – LLLL y. G"} + M{"LLLL – LLLL y. G"} y{"LLLL y. – LLLL y. G"} } yMMMd{ - M{"d. MMM – d. MMM y. G"} + M{"d. MMM – d. MMM y. G"} d{"d. – d. MMM y. G"} - y{"G y MMM d – y MMM d"} + y{"G y MMM d – y MMM d"} } yMd{ M{"d.M.y. – d.M.y. G"} @@ -661,6 +673,12 @@ bs{ "d. MMM y.", "d. M. y.", "{1} {0}", + "{1}, {0}", + "{1}, {0}", + "{1} {0}", + "{1} {0}", + } + DateTimePatterns%atTime{ "{1} 'u' {0}", "{1} 'u' {0}", "{1} {0}", @@ -689,8 +707,8 @@ bs{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"E, d."} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"y. G"} GyMMM{"MMM y. G"} GyMMMEd{"E, d. MMM y. G"} @@ -715,11 +733,11 @@ bs{ MMdd{"d. M."} Md{"d.M."} d{"d."} - h{"h a"} - hm{"hh:mm a"} - hms{"hh:mm:ss a"} - hmsv{"h:mm:ss a (v)"} - hmv{"h:mm a (v)"} + h{"h a"} + hm{"hh:mm a"} + hms{"hh:mm:ss a"} + hmsv{"h:mm:ss a (v)"} + hmv{"h:mm a (v)"} ms{"mm:ss"} y{"y."} yM{"MM/y"} @@ -900,65 +918,65 @@ bs{ } intervalFormats{ Bh{ - B{"h B – h B"} - h{"h – h B"} + B{"h B – h B"} + h{"h – h B"} } Bhm{ - B{"h:mm B – h:mm B"} - h{"h:mm – h:mm B"} - m{"h:mm – h:mm B"} + B{"h:mm B – h:mm B"} + h{"h:mm – h:mm B"} + m{"h:mm – h:mm B"} } Gy{ - G{"G y – G y"} + G{"G y – G y"} y{"G y–y"} } GyM{ - G{"GGGGG y-MM – GGGGG y-MM"} - M{"GGGGG y-MM – y-MM"} - y{"GGGGG y-MM – y-MM"} + G{"GGGGG y-MM – GGGGG y-MM"} + M{"GGGGG y-MM – y-MM"} + y{"GGGGG y-MM – y-MM"} } GyMEd{ - G{"GGGGG y-MM-dd, E – GGGGG y-MM-dd, E"} - M{"GGGGG y-MM-dd, E – y-MM-dd, E"} - d{"GGGGG y-MM-dd, E – y-MM-dd, E"} - y{"GGGGG y-MM-dd, E – y-MM-dd, E"} + G{"GGGGG y-MM-dd, E – GGGGG y-MM-dd, E"} + M{"GGGGG y-MM-dd, E – y-MM-dd, E"} + d{"GGGGG y-MM-dd, E – y-MM-dd, E"} + y{"GGGGG y-MM-dd, E – y-MM-dd, E"} } GyMMM{ - G{"G y MMM – G y MMM"} + G{"G y MMM – G y MMM"} M{"G y MMM–MMM"} - y{"G y MMM – y MMM"} + y{"G y MMM – y MMM"} } GyMMMEd{ - G{"G y MMM d, E – G y MMM d, E"} - M{"G y MMM d, E – MMM d, E"} - d{"G y MMM d, E – MMM d, E"} - y{"G y MMM d, E – y MMM d, E"} + G{"G y MMM d, E – G y MMM d, E"} + M{"G y MMM d, E – MMM d, E"} + d{"G y MMM d, E – MMM d, E"} + y{"G y MMM d, E – y MMM d, E"} } GyMMMd{ - G{"G y MMM d – G y MMM d"} - M{"G y MMM d – MMM d"} + G{"G y MMM d – G y MMM d"} + M{"G y MMM d – MMM d"} d{"G y MMM d–d"} - y{"G y MMM d – y MMM d"} + y{"G y MMM d – y MMM d"} } GyMd{ - G{"GGGGG y-MM-dd – GGGGG y-MM-dd"} - M{"GGGGG y-MM-dd – y-MM-dd"} - d{"GGGGG y-MM-dd – y-MM-dd"} - y{"GGGGG y-MM-dd – y-MM-dd"} + G{"GGGGG y-MM-dd – GGGGG y-MM-dd"} + M{"GGGGG y-MM-dd – y-MM-dd"} + d{"GGGGG y-MM-dd – y-MM-dd"} + y{"GGGGG y-MM-dd – y-MM-dd"} } H{ - H{"HH – HH'h'"} + H{"HH – HH'h'"} } Hm{ - H{"HH:mm – HH:mm"} - m{"HH:mm – HH:mm"} + H{"HH:mm – HH:mm"} + m{"HH:mm – HH:mm"} } Hmv{ - H{"HH:mm – HH:mm v"} - m{"HH:mm – HH:mm v"} + H{"HH:mm – HH:mm v"} + m{"HH:mm – HH:mm v"} } Hv{ - H{"HH – HH 'h' v"} + H{"HH – HH 'h' v"} } M{ M{"M–M."} @@ -971,45 +989,45 @@ bs{ M{"LLL–LLL"} } MMMEd{ - M{"E, d. MMM – E, d. MMM"} + M{"E, d. MMM – E, d. MMM"} d{"E, d. – E, d. MMM"} } MMMd{ - M{"d. MMM – d. MMM"} + M{"d. MMM – d. MMM"} d{"d.–d. MMM"} } Md{ - M{"d. M – d. M."} - d{"d. M – d. M."} + M{"d. M – d. M."} + d{"d. M – d. M."} } d{ d{"d–d."} } fallback{"{0} - {1}"} h{ - a{"h a – h a"} - h{"h – h'h' a"} + a{"h a – h a"} + h{"h – h'h' a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm – h:mm a"} - m{"h:mm – h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm – h:mm a"} + m{"h:mm – h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm – h:mm a v"} - m{"h:mm – h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm – h:mm a v"} + m{"h:mm – h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h – h 'h' a v"} + a{"h a – h a v"} + h{"h – h 'h' a v"} } y{ y{"y–y"} } yM{ - M{"M/y – M/y"} - y{"M/y – M/y"} + M{"M/y – M/y"} + y{"M/y – M/y"} } yMEd{ M{"E, d.M.y. – E, d.M.y."} @@ -1017,20 +1035,20 @@ bs{ y{"E, d.M.y. – E, d.M.y."} } yMMM{ - M{"LLL – LLL y."} + M{"LLL – LLL y."} y{"LLL y. – LLL y."} } yMMMEd{ - M{"E, d. MMM – E, d. MMM y."} + M{"E, d. MMM – E, d. MMM y."} d{"E, d. – E, d. MMM y."} y{"E, d. MMM y. – E, d. MMM y."} } yMMMM{ - M{"LLLL – LLLL y."} + M{"LLLL – LLLL y."} y{"LLLL y. – LLLL y."} } yMMMd{ - M{"d. MMM – d. MMM y."} + M{"d. MMM – d. MMM y."} d{"d. – d. MMM y."} y{"d. MMM y. – d. MMM y."} } @@ -1191,8 +1209,8 @@ bs{ "dd.MM.y. G", "dd.MM.y. G", "{1}, {0}", - "{1} 'u' {0}", - "{1} 'u' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } @@ -1217,8 +1235,8 @@ bs{ MMMd{"dd. MMM"} Md{"dd.MM."} d{"d"} - hm{"hh:mm a"} - hms{"hh:mm:ss a"} + hm{"hh:mm a"} + hms{"hh:mm:ss a"} ms{"mm:ss"} y{"y. G"} yM{"MM.y. G"} diff --git a/icu4c/source/data/locales/bs_Cyrl.txt b/icu4c/source/data/locales/bs_Cyrl.txt index 6991d902d61c..2b4570ee9067 100644 --- a/icu4c/source/data/locales/bs_Cyrl.txt +++ b/icu4c/source/data/locales/bs_Cyrl.txt @@ -325,9 +325,9 @@ bs_Cyrl{ MMMd{"dd. MMM"} Md{"dd.MM."} d{"d"} - h{"hh a"} - hm{"hh:mm a"} - hms{"hh:mm:ss a"} + h{"hh a"} + hm{"hh:mm a"} + hms{"hh:mm:ss a"} ms{"mm:ss"} y{"y. G"} yyyy{"y. G"} @@ -381,22 +381,22 @@ bs_Cyrl{ d{"d–d"} } h{ - a{"hh a – hh a"} - h{"hh–hh a"} + a{"hh a – hh a"} + h{"hh–hh a"} } hm{ - a{"hh:mm a – hh:mm a"} - h{"hh:mm–hh:mm a"} - m{"hh:mm–hh:mm a"} + a{"hh:mm a – hh:mm a"} + h{"hh:mm–hh:mm a"} + m{"hh:mm–hh:mm a"} } hmv{ - a{"hh:mm a – hh:mm a v"} - h{"hh:mm–hh:mm a v"} - m{"hh:mm–hh:mm a v"} + a{"hh:mm a – hh:mm a v"} + h{"hh:mm–hh:mm a v"} + m{"hh:mm–hh:mm a v"} } hv{ - a{"hh a – hh a v"} - h{"hh–hh a v"} + a{"hh a – hh a v"} + h{"hh–hh a v"} } y{ y{"y–y G"} @@ -664,22 +664,22 @@ bs_Cyrl{ d{"d–d"} } h{ - a{"hh a – hh a"} - h{"hh–hh a"} + a{"hh a – hh a"} + h{"hh–hh a"} } hm{ - a{"hh:mm a – hh:mm a"} - h{"hh:mm–hh:mm a"} - m{"hh:mm–hh:mm a"} + a{"hh:mm a – hh:mm a"} + h{"hh:mm–hh:mm a"} + m{"hh:mm–hh:mm a"} } hmv{ - a{"hh:mm a – hh:mm a v"} - h{"hh:mm–hh:mm a v"} - m{"hh:mm–hh:mm a v"} + a{"hh:mm a – hh:mm a v"} + h{"hh:mm–hh:mm a v"} + m{"hh:mm–hh:mm a v"} } hv{ - a{"hh a – hh a v"} - h{"hh–hh a v"} + a{"hh a – hh a v"} + h{"hh–hh a v"} } y{ y{"y–y"} @@ -908,8 +908,8 @@ bs_Cyrl{ MMMd{"dd. MMM"} Md{"dd.MM."} d{"d"} - hm{"hh:mm a"} - hms{"hh:mm:ss a"} + hm{"hh:mm a"} + hms{"hh:mm:ss a"} ms{"mm:ss"} y{"y. G"} yM{"MM.y. G"} diff --git a/icu4c/source/data/locales/ca.txt b/icu4c/source/data/locales/ca.txt index 220e9de8ccfc..90fe5e2e3b0e 100644 --- a/icu4c/source/data/locales/ca.txt +++ b/icu4c/source/data/locales/ca.txt @@ -369,6 +369,12 @@ ca{ "d/M/y G", "d/M/yy GGGGG", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{1} 'a' 'les' {0}", "{1} 'a' 'les' {0}", "{1}, {0}", @@ -394,8 +400,8 @@ ca{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"E d"} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"y G"} GyMMM{"LLL y G"} GyMMMEd{"E, d MMM y G"} @@ -416,9 +422,9 @@ ca{ MMMd{"d MMM"} Md{"d/M"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"mm:ss"} y{"y G"} yyyy{"y G"} @@ -436,51 +442,51 @@ ca{ } intervalFormats{ Bh{ - B{"h B – h B"} + B{"h B – h B"} h{"h–h B"} } Bhm{ - B{"h:mm B – h:mm B"} + B{"h:mm B – h:mm B"} h{"h:mm–h:mm B"} m{"h:mm–h:mm B"} } Gy{ - G{"y G – y G"} - y{"y – y G"} + G{"y G – y G"} + y{"y – y G"} } GyM{ - G{"M/y GGGGG – M/y GGGGG"} - M{"M/y – M/y GGGGG"} - y{"M/y – M/y GGGGG"} + G{"M/y GGGGG – M/y GGGGG"} + M{"M/y – M/y GGGGG"} + y{"M/y – M/y GGGGG"} } GyMEd{ - G{"E, d/M/y GGGGG – E, d/M/y GGGGG"} - M{"E, d/M/y – E, d/M/y GGGGG"} - d{"E, d/M/y – E, d/M/y GGGGG"} - y{"E, d/M/y – E, d/M/y GGGGG"} + G{"E, d/M/y GGGGG – E, d/M/y GGGGG"} + M{"E, d/M/y – E, d/M/y GGGGG"} + d{"E, d/M/y – E, d/M/y GGGGG"} + y{"E, d/M/y – E, d/M/y GGGGG"} } GyMMM{ - G{"MMM y G – MMM y G"} - M{"MMM – MMM y G"} - y{"MMM y – MMM y G"} + G{"MMM y G – MMM y G"} + M{"MMM – MMM y G"} + y{"MMM y – MMM y G"} } GyMMMEd{ - G{"E, d MMM, y G – E, d MMM, y G"} - M{"E, d MMM, y – E, d MMM, y G"} - d{"E, d MMM – E, d MMM, y G"} - y{"E, d MMM, y – E, d MMM, y G"} + G{"E, d MMM, y G – E, d MMM, y G"} + M{"E, d MMM, y – E, d MMM, y G"} + d{"E, d MMM – E, d MMM, y G"} + y{"E, d MMM, y – E, d MMM, y G"} } GyMMMd{ - G{"d MMM, y – d MMM, y G"} - M{"d MMM, y – d MMM, y G"} - d{"d – d MMM, y G"} - y{"d MMM, y – d MMM, y G"} + G{"d MMM, y – d MMM, y G"} + M{"d MMM, y – d MMM, y G"} + d{"d – d MMM, y G"} + y{"d MMM, y – d MMM, y G"} } GyMd{ - G{"d/M/y GGGGG – d/M/y GGGGG"} - M{"d/M/y – d/M/y GGGGG"} - d{"d/M/y – d/M/y GGGGG"} - y{"d/M/y – d/M/y GGGGG"} + G{"d/M/y GGGGG – d/M/y GGGGG"} + M{"d/M/y – d/M/y GGGGG"} + d{"d/M/y – d/M/y GGGGG"} + y{"d/M/y – d/M/y GGGGG"} } H{ H{"H–H"} @@ -500,82 +506,82 @@ ca{ M{"M–M"} } MEd{ - M{"E, d/M – E, d/M"} - d{"E, d/M – E, d/M"} + M{"E, d/M – E, d/M"} + d{"E, d/M – E, d/M"} } MMM{ M{"MMM–MMM"} } MMMEd{ - M{"E, d MMM – E, d MMM"} - d{"E, d – E, d MMM"} + M{"E, d MMM – E, d MMM"} + d{"E, d – E, d MMM"} } MMMd{ - M{"d MMM – d MMM"} + M{"d MMM – d MMM"} d{"d–d MMM"} } Md{ - M{"d/M – d/M"} - d{"d/M – d/M"} + M{"d/M – d/M"} + d{"d/M – d/M"} } d{ d{"d–d"} } fallback{"{0} - {1}"} hm{ - a{"h:mm a –h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a –h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } y{ y{"y–y G"} } yM{ - M{"M/y – M/y GGGGG"} - y{"M/y – M/y GGGGG"} + M{"M/y – M/y GGGGG"} + y{"M/y – M/y GGGGG"} } yMEd{ - M{"E, d/M/y – E, d/M/y GGGGG"} - d{"E, d/M/y – E, d/M/y GGGGG"} - y{"E, d/M/y – E, d/M/y GGGGG"} + M{"E, d/M/y – E, d/M/y GGGGG"} + d{"E, d/M/y – E, d/M/y GGGGG"} + y{"E, d/M/y – E, d/M/y GGGGG"} } yMMM{ M{"MMM–MMM y G"} - y{"MMM 'de' y – MMM 'de' y G"} + y{"MMM 'de' y – MMM 'de' y G"} } yMMMEd{ - M{"E, d MMM – E, d MMM 'de' y G"} - d{"E, d MMM – E, d MMM 'de' y G"} - y{"E, d MMM 'de' y – E, d MMM 'de' y G"} + M{"E, d MMM – E, d MMM 'de' y G"} + d{"E, d MMM – E, d MMM 'de' y G"} + y{"E, d MMM 'de' y – E, d MMM 'de' y G"} } yMMMM{ M{"MMMM–MMMM 'de' y G"} - y{"MMMM 'de' y – MMMM 'de' y G"} + y{"MMMM 'de' y – MMMM 'de' y G"} } yMMMMEd{ - M{"E, d MMMM – E, d MMMM 'de' y G"} - d{"E, d MMMM – E, d MMMM 'de' y G"} - y{"E, d MMMM 'de' y – E, d MMMM 'de' y G"} + M{"E, d MMMM – E, d MMMM 'de' y G"} + d{"E, d MMMM – E, d MMMM 'de' y G"} + y{"E, d MMMM 'de' y – E, d MMMM 'de' y G"} } yMMMMd{ - M{"d MMMM – d MMMM 'de' y G"} + M{"d MMMM – d MMMM 'de' y G"} d{"d–d MMMM 'de' y G"} - y{"d MMMM 'de' y – d MMMM 'de' y G"} + y{"d MMMM 'de' y – d MMMM 'de' y G"} } yMMMd{ - M{"d MMM – d MMM 'de' y G"} + M{"d MMM – d MMM 'de' y G"} d{"d–d MMM 'de' y G"} - y{"d MMM 'de' y – d MMM 'de' y G"} + y{"d MMM 'de' y – d MMM 'de' y G"} } yMd{ - M{"d/M/y – d/M/y GGGGG"} - d{"d/M/y – d/M/y GGGGG"} - y{"d/M/y – d/M/y GGGGG"} + M{"d/M/y – d/M/y GGGGG"} + d{"d/M/y – d/M/y GGGGG"} + y{"d/M/y – d/M/y GGGGG"} } } } @@ -602,6 +608,12 @@ ca{ "d MMM y", "d/M/yy", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1} {0}", + } + DateTimePatterns%atTime{ "{1}, 'a' 'les' {0}", "{1}, 'a' 'les' {0}", "{1}, {0}", @@ -630,8 +642,8 @@ ca{ EHm{"E H:mm"} EHms{"E H:mm:ss"} Ed{"E d"} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"y G"} GyMMM{"LLL y G"} GyMMMEd{"E, d MMM 'de' y G"} @@ -660,13 +672,13 @@ ca{ MMMd{"d MMM"} Md{"d/M"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} - hmsv{"h:mm:ss a v"} - hmsvvvv{"h:mm:ss a (vvvv)"} - hmv{"h:mm a v"} - hmvvvv{"h:mm a (vvvv)"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} + hmsv{"h:mm:ss a v"} + hmsvvvv{"h:mm:ss a (vvvv)"} + hmv{"h:mm a v"} + hmvvvv{"h:mm a (vvvv)"} ms{"mm:ss"} y{"y"} yM{"M/y"} @@ -857,42 +869,42 @@ ca{ } intervalFormats{ Gy{ - G{"y G – y G"} + G{"y G – y G"} y{"y–y G"} } GyM{ - G{"M/y GGGGG – M/y GGGGG"} - M{"M/y – M/y GGGGG"} - y{"M/y – M/y GGGGG"} + G{"M/y GGGGG – M/y GGGGG"} + M{"M/y – M/y GGGGG"} + y{"M/y – M/y GGGGG"} } GyMEd{ - G{"E, d/M/y GGGGG – E, d/M/y GGGGG"} - M{"E, d/M/y – E, d/M/y GGGGG"} - d{"E, d/M/y – E, d/M/y GGGGG"} - y{"E, d/M/y – E, d/M/y GGGGG"} + G{"E, d/M/y GGGGG – E, d/M/y GGGGG"} + M{"E, d/M/y – E, d/M/y GGGGG"} + d{"E, d/M/y – E, d/M/y GGGGG"} + y{"E, d/M/y – E, d/M/y GGGGG"} } GyMMM{ - G{"LLL y G – LLL y G"} - M{"LLL – LLL y G"} - y{"LLL y – LLL y G"} + G{"LLL y G – LLL y G"} + M{"LLL – LLL y G"} + y{"LLL y – LLL y G"} } GyMMMEd{ - G{"E, d MMM, y G – E, d MMM, y G"} - M{"E, d MMM – E, d MMM, y G"} - d{"E, d MMM – E, d MMM, y G"} - y{"E, d MMM, y – E, d MMM, y G"} + G{"E, d MMM, y G – E, d MMM, y G"} + M{"E, d MMM – E, d MMM, y G"} + d{"E, d MMM – E, d MMM, y G"} + y{"E, d MMM, y – E, d MMM, y G"} } GyMMMd{ - G{"d MMM, y G – d MMM, y G"} - M{"d MMM – d MMM, y G"} + G{"d MMM, y G – d MMM, y G"} + M{"d MMM – d MMM, y G"} d{"d–d LLL, y G"} - y{"d MMM, y – d MMM, y G"} + y{"d MMM, y – d MMM, y G"} } GyMd{ - G{"d/M/y GGGGG – d/M/y GGGGG"} - M{"d/M/y – d/M/y GGGGG"} - d{"d/M/y – d/M/y GGGGG"} - y{"d/M/y – d/M/y GGGGG"} + G{"d/M/y GGGGG – d/M/y GGGGG"} + M{"d/M/y – d/M/y GGGGG"} + d{"d/M/y – d/M/y GGGGG"} + y{"d/M/y – d/M/y GGGGG"} } H{ H{"H–H"} @@ -912,90 +924,90 @@ ca{ M{"M–M"} } MEd{ - M{"E, d/M – E, d/M"} - d{"E, d/M – E, d/M"} + M{"E, d/M – E, d/M"} + d{"E, d/M – E, d/M"} } MMM{ - M{"LLL – LLL"} + M{"LLL – LLL"} } MMMEd{ - M{"E, d MMM – E, d MMM"} - d{"E, d – E, d MMM"} + M{"E, d MMM – E, d MMM"} + d{"E, d – E, d MMM"} } MMMd{ - M{"d MMM – d MMM"} + M{"d MMM – d MMM"} d{"d–d MMM"} } Md{ - M{"d/M – d/M"} - d{"d/M – d/M"} + M{"d/M – d/M"} + d{"d/M – d/M"} } d{ d{"d–d"} } fallback{"{0} - {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y"} } yM{ - M{"M/y – M/y"} - y{"M/y – M/y"} + M{"M/y – M/y"} + y{"M/y – M/y"} } yMEd{ - M{"E, d/M/y – E, d/M/y"} - d{"E, d/M/y – E, d/M/y"} - y{"E, d/M/y – E, d/M/y"} + M{"E, d/M/y – E, d/M/y"} + d{"E, d/M/y – E, d/M/y"} + y{"E, d/M/y – E, d/M/y"} } yMMM{ M{"LLL–LLL y"} - y{"LLL y – LLL y"} + y{"LLL y – LLL y"} } yMMMEd{ - M{"E, d MMM – E, d MMM y"} - d{"E, d – E, d MMM y"} - y{"E, d MMM y – E, d MMM y"} + M{"E, d MMM – E, d MMM y"} + d{"E, d – E, d MMM y"} + y{"E, d MMM y – E, d MMM y"} } yMMMM{ M{"LLLL–LLLL 'de' y"} - y{"LLLL 'de' y – LLLL 'de' y"} + y{"LLLL 'de' y – LLLL 'de' y"} } yMMMMEd{ - M{"E, d MMMM – E, d MMMM 'de' y"} - d{"E, d – E, d MMMM 'de' y"} - y{"E, d MMMM 'de' y – E, d MMMM 'de' y"} + M{"E, d MMMM – E, d MMMM 'de' y"} + d{"E, d – E, d MMMM 'de' y"} + y{"E, d MMMM 'de' y – E, d MMMM 'de' y"} } yMMMMd{ - M{"d MMMM – d MMMM 'de' y"} + M{"d MMMM – d MMMM 'de' y"} d{"d–d MMMM 'de' y"} - y{"d MMMM 'de' y – d MMMM 'de' y"} + y{"d MMMM 'de' y – d MMMM 'de' y"} } yMMMd{ - M{"d MMM – d MMM y"} + M{"d MMM – d MMM y"} d{"d–d MMM y"} - y{"d MMM y – d MMM y"} + y{"d MMM y – d MMM y"} } yMd{ - M{"d/M/y – d/M/y"} - d{"d/M/y – d/M/y"} - y{"d/M/y – d/M/y"} + M{"d/M/y – d/M/y"} + d{"d/M/y – d/M/y"} + y{"d/M/y – d/M/y"} } } monthNames{ @@ -1142,8 +1154,8 @@ ca{ "dd/MM/y G", "dd/MM/y GGGGG", "{1}, {0}", - "{1} 'a' 'les' {0}", - "{1} 'a' 'les' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } diff --git a/icu4c/source/data/locales/ceb.txt b/icu4c/source/data/locales/ceb.txt index b3e7687297ef..70a3ea6305aa 100644 --- a/icu4c/source/data/locales/ceb.txt +++ b/icu4c/source/data/locales/ceb.txt @@ -38,15 +38,21 @@ ceb{ calendar{ generic{ DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE, MMMM d, y G", "MMMM d, y G", "MMM d, y G", "M/d/y GGGGG", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{1} 'sa' {0}", "{1} 'sa' {0}", "{1}, {0}", @@ -64,8 +70,8 @@ ceb{ } availableFormats{ Ed{"d E"} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"y G"} GyMMM{"MMM y G"} GyMMMEd{"E, MMM d, y G"} @@ -89,102 +95,102 @@ ceb{ } intervalFormats{ Gy{ - G{"y G – y G"} - y{"y – y G"} + G{"y G – y G"} + y{"y – y G"} } GyM{ - G{"M/y GGGGG – M/y GGGGG"} - M{"M/y – M/y GGGGG"} - y{"M/y – M/y GGGGG"} + G{"M/y GGGGG – M/y GGGGG"} + M{"M/y – M/y GGGGG"} + y{"M/y – M/y GGGGG"} } GyMEd{ - G{"E, M/d/y GGGGG – E, M/d/y GGGGG"} - M{"E, M/d/y – E, M/d/y GGGGG"} - d{"E, M/d/y – E, M/d/y GGGGG"} - y{"E, M/d/y – E, M/d/y GGGGG"} + G{"E, M/d/y GGGGG – E, M/d/y GGGGG"} + M{"E, M/d/y – E, M/d/y GGGGG"} + d{"E, M/d/y – E, M/d/y GGGGG"} + y{"E, M/d/y – E, M/d/y GGGGG"} } GyMMM{ - G{"MMM y G – MMM y G"} - M{"MMM – MMM y G"} - y{"MMM y – MMM y G"} + G{"MMM y G – MMM y G"} + M{"MMM – MMM y G"} + y{"MMM y – MMM y G"} } GyMMMEd{ - G{"E, MMM d, y G – E, MMM d, y G"} - M{"E, MMM d – E, MMM d, y G"} - d{"E, MMM d – E, MMM d, y G"} - y{"E, MMM d, y – E, MMM d, y G"} + G{"E, MMM d, y G – E, MMM d, y G"} + M{"E, MMM d – E, MMM d, y G"} + d{"E, MMM d – E, MMM d, y G"} + y{"E, MMM d, y – E, MMM d, y G"} } GyMMMd{ - G{"MMM d, y G – MMM d, y G"} - M{"MMM d – MMM d, y G"} - d{"MMM d – d, y G"} - y{"MMM d, y – MMM d, y G"} + G{"MMM d, y G – MMM d, y G"} + M{"MMM d – MMM d, y G"} + d{"MMM d – d, y G"} + y{"MMM d, y – MMM d, y G"} } GyMd{ - G{"M/d/y GGGGG – M/d/y GGGGG"} - M{"M/d/y – M/d/y GGGGG"} - d{"M/d/y – M/d/y GGGGG"} - y{"M/d/y – M/d/y GGGGG"} + G{"M/d/y GGGGG – M/d/y GGGGG"} + M{"M/d/y – M/d/y GGGGG"} + d{"M/d/y – M/d/y GGGGG"} + y{"M/d/y – M/d/y GGGGG"} } M{ - M{"M – M"} + M{"M – M"} } MEd{ - M{"E, M/d – E, M/d"} - d{"E, M/d – E, M/d"} + M{"E, M/d – E, M/d"} + d{"E, M/d – E, M/d"} } MMM{ - M{"MMM – MMM"} + M{"MMM – MMM"} } MMMEd{ - M{"E, MMM d – E, MMM d"} - d{"E, MMM d – E, MMM d"} + M{"E, MMM d – E, MMM d"} + d{"E, MMM d – E, MMM d"} } MMMd{ - d{"MMM d – d"} + d{"MMM d – d"} } Md{ - M{"M/d – M/d"} - d{"M/d – M/d"} + M{"M/d – M/d"} + d{"M/d – M/d"} } d{ - d{"d – d"} + d{"d – d"} } fallback{"{0} – {1}"} y{ - y{"y – y G"} + y{"y – y G"} } yM{ - M{"M/y – M/y GGGGG"} - y{"M/y – M/y GGGGG"} + M{"M/y – M/y GGGGG"} + y{"M/y – M/y GGGGG"} } yMEd{ - M{"E, M/d/y – E, M/d/y GGGGG"} - d{"E, M/d/y – E, M/d/y GGGGG"} - y{"E, M/d/y – E, M/d/y GGGGG"} + M{"E, M/d/y – E, M/d/y GGGGG"} + d{"E, M/d/y – E, M/d/y GGGGG"} + y{"E, M/d/y – E, M/d/y GGGGG"} } yMMM{ - M{"MMM – MMM y G"} - y{"MMM y – MMM y G"} + M{"MMM – MMM y G"} + y{"MMM y – MMM y G"} } yMMMEd{ - M{"E, MMM d – E, MMM d, y G"} - d{"E, MMM d – E, MMM d, y G"} - y{"E, MMM d, y – E, MMM d, y G"} + M{"E, MMM d – E, MMM d, y G"} + d{"E, MMM d – E, MMM d, y G"} + y{"E, MMM d, y – E, MMM d, y G"} } yMMMM{ - M{"MMMM – MMMM y G"} - y{"MMMM y – MMMM y G"} + M{"MMMM – MMMM y G"} + y{"MMMM y – MMMM y G"} } yMMMd{ - M{"MMM d – MMM d, y G"} - d{"MMM d – d, y G"} - y{"MMM d, y – MMM d, y G"} + M{"MMM d – MMM d, y G"} + d{"MMM d – d, y G"} + y{"MMM d, y – MMM d, y G"} } yMd{ - M{"M/d/y – M/d/y GGGGG"} - d{"M/d/y – M/d/y GGGGG"} - y{"M/d/y – M/d/y GGGGG"} + M{"M/d/y – M/d/y GGGGG"} + d{"M/d/y – M/d/y GGGGG"} + y{"M/d/y – M/d/y GGGGG"} } } } @@ -198,15 +204,21 @@ ceb{ "p", } DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE, MMMM d, y", "MMMM d, y", "MMM d, y", "M/d/yy", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{1} 'sa' {0}", "{1} 'sa' {0}", "{1}, {0}", @@ -232,8 +244,8 @@ ceb{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"d E"} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"y G"} GyMMM{"MMM y G"} GyMMMEd{"E, MMM d, y G"} @@ -256,11 +268,11 @@ ceb{ MMMd{"MMM d"} Md{"M/d"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} - hmsv{"h:mm:ss a v"} - hmv{"h:mm a v"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} + hmsv{"h:mm:ss a v"} + hmv{"h:mm a v"} ms{"mm:ss"} y{"y"} yM{"M/y"} @@ -357,130 +369,130 @@ ceb{ } intervalFormats{ Gy{ - G{"y G – y G"} - y{"y – y G"} + G{"y G – y G"} + y{"y – y G"} } GyM{ - G{"M/y GGGGG – M/y GGGGG"} - M{"M/y – M/y GGGGG"} - y{"M/y – M/y GGGGG"} + G{"M/y GGGGG – M/y GGGGG"} + M{"M/y – M/y GGGGG"} + y{"M/y – M/y GGGGG"} } GyMEd{ - G{"E, M/d/y GGGGG – E, M/d/y GGGGG"} - M{"E, M/d/y – E, M/d/y GGGGG"} - d{"E, M/d/y – E, M/d/y GGGGG"} - y{"E, M/d/y – E, M/d/y GGGGG"} + G{"E, M/d/y GGGGG – E, M/d/y GGGGG"} + M{"E, M/d/y – E, M/d/y GGGGG"} + d{"E, M/d/y – E, M/d/y GGGGG"} + y{"E, M/d/y – E, M/d/y GGGGG"} } GyMMM{ - G{"MMM y G – MMM y G"} - M{"MMM – MMM y G"} - y{"MMM y – MMM y G"} + G{"MMM y G – MMM y G"} + M{"MMM – MMM y G"} + y{"MMM y – MMM y G"} } GyMMMEd{ - G{"E, MMM d, y G – E, MMM d, y G"} - M{"E, MMM d – E, MMM d, y G"} - d{"E, MMM d – E, MMM d, y G"} - y{"E, MMM d, y – E, MMM d, y G"} + G{"E, MMM d, y G – E, MMM d, y G"} + M{"E, MMM d – E, MMM d, y G"} + d{"E, MMM d – E, MMM d, y G"} + y{"E, MMM d, y – E, MMM d, y G"} } GyMMMd{ - G{"MMM d, y G – MMM d, y G"} - M{"MMM d – MMM d, y G"} - d{"MMM d – d, y G"} - y{"MMM d, y – MMM d, y G"} + G{"MMM d, y G – MMM d, y G"} + M{"MMM d – MMM d, y G"} + d{"MMM d – d, y G"} + y{"MMM d, y – MMM d, y G"} } GyMd{ - G{"M/d/y GGGGG – M/d/y GGGGG"} - M{"M/d/y – M/d/y GGGGG"} - d{"M/d/y – M/d/y GGGGG"} - y{"M/d/y – M/d/y GGGGG"} + G{"M/d/y GGGGG – M/d/y GGGGG"} + M{"M/d/y – M/d/y GGGGG"} + d{"M/d/y – M/d/y GGGGG"} + y{"M/d/y – M/d/y GGGGG"} } H{ - H{"HH – HH"} + H{"HH – HH"} } Hm{ - H{"HH:mm – HH:mm"} - m{"HH:mm – HH:mm"} + H{"HH:mm – HH:mm"} + m{"HH:mm – HH:mm"} } Hmv{ - H{"HH:mm – HH:mm v"} - m{"HH:mm – HH:mm v"} + H{"HH:mm – HH:mm v"} + m{"HH:mm – HH:mm v"} } Hv{ - H{"HH – HH v"} + H{"HH – HH v"} } M{ - M{"M – M"} + M{"M – M"} } MEd{ - M{"E, M/d – E, M/d"} - d{"E, M/d – E, M/d"} + M{"E, M/d – E, M/d"} + d{"E, M/d – E, M/d"} } MMM{ - M{"MMM – MMM"} + M{"MMM – MMM"} } MMMEd{ - M{"E, MMM d – E, MMM d"} - d{"E, MMM d – E, MMM d"} + M{"E, MMM d – E, MMM d"} + d{"E, MMM d – E, MMM d"} } MMMd{ - d{"MMM d – d"} + d{"MMM d – d"} } Md{ - M{"M/d – M/d"} - d{"M/d – M/d"} + M{"M/d – M/d"} + d{"M/d – M/d"} } d{ - d{"d – d"} + d{"d – d"} } fallback{"{0} – {1}"} h{ - h{"h – h a"} + h{"h – h a"} } hm{ - h{"h:mm – h:mm a"} - m{"h:mm – h:mm a"} + h{"h:mm – h:mm a"} + m{"h:mm – h:mm a"} } hmv{ - h{"h:mm – h:mm a v"} - m{"h:mm – h:mm a v"} + h{"h:mm – h:mm a v"} + m{"h:mm – h:mm a v"} } hv{ - h{"h – h a v"} + h{"h – h a v"} } y{ - y{"y – y"} + y{"y – y"} } yM{ - M{"M/y – M/y"} - y{"M/y – M/y"} + M{"M/y – M/y"} + y{"M/y – M/y"} } yMEd{ - M{"E, M/d/y – E, M/d/y"} - d{"E, M/d/y – E, M/d/y"} - y{"E, M/d/y – E, M/d/y"} + M{"E, M/d/y – E, M/d/y"} + d{"E, M/d/y – E, M/d/y"} + y{"E, M/d/y – E, M/d/y"} } yMMM{ - M{"MMM – MMM y"} - y{"MMM y – MMM y"} + M{"MMM – MMM y"} + y{"MMM y – MMM y"} } yMMMEd{ - M{"E, MMM d – E, MMM d, y"} - d{"E, MMM d – E, MMM d, y"} - y{"E, MMM d, y – E, MMM d, y"} + M{"E, MMM d – E, MMM d, y"} + d{"E, MMM d – E, MMM d, y"} + y{"E, MMM d, y – E, MMM d, y"} } yMMMM{ - M{"MMMM – MMMM y"} - y{"MMMM y – MMMM y"} + M{"MMMM – MMMM y"} + y{"MMMM y – MMMM y"} } yMMMd{ - M{"MMM d – MMM d, y"} - d{"MMM d – d, y"} - y{"MMM d, y – MMM d, y"} + M{"MMM d – MMM d, y"} + d{"MMM d – d, y"} + y{"MMM d, y – MMM d, y"} } yMd{ - M{"M/d/y – M/d/y"} - d{"M/d/y – M/d/y"} - y{"M/d/y – M/d/y"} + M{"M/d/y – M/d/y"} + d{"M/d/y – M/d/y"} + y{"M/d/y – M/d/y"} } } monthNames{ diff --git a/icu4c/source/data/locales/cgg.txt b/icu4c/source/data/locales/cgg.txt index 349802042625..5b796c50262e 100644 --- a/icu4c/source/data/locales/cgg.txt +++ b/icu4c/source/data/locales/cgg.txt @@ -50,7 +50,7 @@ cgg{ MMMd{"MMM d"} Md{"M/d"} d{"d"} - hm{"h:mm a"} + hm{"h:mm a"} ms{"mm:ss"} y{"y"} yM{"M/y"} @@ -102,7 +102,7 @@ cgg{ MMMd{"MMM d"} Md{"M/d"} d{"d"} - hm{"h:mm a"} + hm{"h:mm a"} ms{"mm:ss"} y{"y"} yM{"M/y"} diff --git a/icu4c/source/data/locales/chr.txt b/icu4c/source/data/locales/chr.txt index eaac2068345e..073a2b855182 100644 --- a/icu4c/source/data/locales/chr.txt +++ b/icu4c/source/data/locales/chr.txt @@ -232,6 +232,12 @@ chr{ "MMM d, y G", "M/d/y GGGGG", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{1} ᎤᎾᎢ {0}", "{1} ᎤᎾᎢ {0}", "{1}, {0}", @@ -425,6 +431,12 @@ chr{ "MMM d, y", "M/d/yy", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{1} ᎤᎾᎢ {0}", "{1} ᎤᎾᎢ {0}", "{1}, {0}", diff --git a/icu4c/source/data/locales/cs.txt b/icu4c/source/data/locales/cs.txt index acd75025b19a..a5b5717ad871 100644 --- a/icu4c/source/data/locales/cs.txt +++ b/icu4c/source/data/locales/cs.txt @@ -646,57 +646,57 @@ cs{ } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y G"} } yM{ - M{"M/y – M/y G"} - y{"M/y – M/y G"} + M{"M/y – M/y G"} + y{"M/y – M/y G"} } yMEd{ - M{"E dd.MM.y – E dd.MM.y G"} - d{"E dd.MM.y – E dd.MM.y G"} - y{"E dd.MM.y – E dd.MM.y G"} + M{"E dd.MM.y – E dd.MM.y G"} + d{"E dd.MM.y – E dd.MM.y G"} + y{"E dd.MM.y – E dd.MM.y G"} } yMMM{ M{"MMM–MMM y G"} - y{"MMM y – MMM y G"} + y{"MMM y – MMM y G"} } yMMMEd{ M{"E d. M. – E d. M. y G"} d{"E d. M. – E d. M. y G"} - y{"E d. M. y – E d. M. y G"} + y{"E d. M. y – E d. M. y G"} } yMMMM{ M{"LLLL–LLLL y G"} - y{"LLLL y – LLLL y G"} + y{"LLLL y – LLLL y G"} } yMMMd{ M{"d. M. – d. M. y G"} d{"d.–d. M. y G"} - y{"d. M. y – d. M. y G"} + y{"d. M. y – d. M. y G"} } yMd{ - M{"dd.MM.y – dd.MM.y G"} - d{"dd.MM.y – dd.MM.y G"} - y{"dd.MM.y – dd.MM.y G"} + M{"dd.MM.y – dd.MM.y G"} + d{"dd.MM.y – dd.MM.y G"} + y{"dd.MM.y – dd.MM.y G"} } } } @@ -1539,57 +1539,57 @@ cs{ } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y G"} } yM{ - M{"M/y – M/y G"} - y{"M/y – M/y G"} + M{"M/y – M/y G"} + y{"M/y – M/y G"} } yMEd{ - M{"E dd.MM.y – E dd.MM.y G"} - d{"E dd.MM.y – E dd.MM.y G"} - y{"E dd.MM.y – E dd.MM.y G"} + M{"E dd.MM.y – E dd.MM.y G"} + d{"E dd.MM.y – E dd.MM.y G"} + y{"E dd.MM.y – E dd.MM.y G"} } yMMM{ M{"MMM–MMM y G"} - y{"MMM y – MMM y G"} + y{"MMM y – MMM y G"} } yMMMEd{ M{"E d. M. – E d. M. y G"} d{"E d. M. – E d. M. y G"} - y{"E d. M. y – E d. M. y G"} + y{"E d. M. y – E d. M. y G"} } yMMMM{ M{"LLLL–LLLL y G"} - y{"LLLL y – LLLL y G"} + y{"LLLL y – LLLL y G"} } yMMMd{ M{"d. M. – d. M. y G"} d{"d.–d. M. y G"} - y{"d. M. y – d. M. y G"} + y{"d. M. y – d. M. y G"} } yMd{ - M{"dd.MM.y – dd.MM.y G"} - d{"dd.MM.y – dd.MM.y G"} - y{"dd.MM.y – dd.MM.y G"} + M{"dd.MM.y – dd.MM.y G"} + d{"dd.MM.y – dd.MM.y G"} + y{"dd.MM.y – dd.MM.y G"} } } monthNames{ @@ -2588,57 +2588,57 @@ cs{ } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y G"} } yM{ - M{"M/y – M/y G"} - y{"M/y – M/y G"} + M{"M/y – M/y G"} + y{"M/y – M/y G"} } yMEd{ - M{"E dd.MM.y – E dd.MM.y G"} - d{"E dd.MM.y – E dd.MM.y G"} - y{"E dd.MM.y – E dd.MM.y G"} + M{"E dd.MM.y – E dd.MM.y G"} + d{"E dd.MM.y – E dd.MM.y G"} + y{"E dd.MM.y – E dd.MM.y G"} } yMMM{ M{"MMM–MMM y G"} - y{"MMM y – MMM y G"} + y{"MMM y – MMM y G"} } yMMMEd{ M{"E d. M. – E d. M. y G"} d{"E d. M. – E d. M. y G"} - y{"E d. M. y – E d. M. y G"} + y{"E d. M. y – E d. M. y G"} } yMMMM{ M{"LLLL–LLLL y G"} - y{"LLLL y – LLLL y G"} + y{"LLLL y – LLLL y G"} } yMMMd{ M{"d. M. – d. M. y G"} d{"d.–d. M. y G"} - y{"d. M. y – d. M. y G"} + y{"d. M. y – d. M. y G"} } yMd{ - M{"dd.MM.y – dd.MM.y G"} - d{"dd.MM.y – dd.MM.y G"} - y{"dd.MM.y – dd.MM.y G"} + M{"dd.MM.y – dd.MM.y G"} + d{"dd.MM.y – dd.MM.y G"} + y{"dd.MM.y – dd.MM.y G"} } } monthNames{ @@ -2774,8 +2774,8 @@ cs{ EHm{"E H:mm"} EHms{"E H:mm:ss"} Ed{"E d."} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"y G"} GyMMM{"LLLL y G"} GyMMMEd{"E d. M. y G"} @@ -2795,9 +2795,9 @@ cs{ MMMd{"d. M."} Md{"d. M."} d{"d."} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"mm:ss"} y{"y G"} yyyy{"y G"} @@ -2815,51 +2815,51 @@ cs{ } intervalFormats{ Bh{ - B{"h B – h B"} + B{"h B – h B"} h{"h–h B"} } Bhm{ - B{"h:mm B – h:mm B"} + B{"h:mm B – h:mm B"} h{"h:mm–h:mm B"} m{"h:mm–h:mm B"} } Gy{ - G{"y G – y G"} + G{"y G – y G"} y{"y–y G"} } GyM{ - G{"M/y GGGGG – M/y GGGGG"} - M{"M/y – M/y GGGGG"} - y{"M/y – M/y GGGGG"} + G{"M/y GGGGG – M/y GGGGG"} + M{"M/y – M/y GGGGG"} + y{"M/y – M/y GGGGG"} } GyMEd{ - G{"E d. M. y GGGGG – E d. M. y GGGGG"} - M{"E d. M. y – E d. M. y GGGGG"} - d{"E d. M. y – E d. M. y GGGGG"} - y{"E d. M. y – E d. M. y GGGGG"} + G{"E d. M. y GGGGG – E d. M. y GGGGG"} + M{"E d. M. y – E d. M. y GGGGG"} + d{"E d. M. y – E d. M. y GGGGG"} + y{"E d. M. y – E d. M. y GGGGG"} } GyMMM{ - G{"LLLL y G – LLLL y G"} + G{"LLLL y G – LLLL y G"} M{"LLLL–LLLL y G"} - y{"LLLL y – LLLL y G"} + y{"LLLL y – LLLL y G"} } GyMMMEd{ - G{"E d. M. y G – E d. M. y G"} + G{"E d. M. y G – E d. M. y G"} M{"E d. M. – E d. M. y G"} d{"E d. M. – E d. M. y G"} - y{"E d. M. y – E d. M. y G"} + y{"E d. M. y – E d. M. y G"} } GyMMMd{ - G{"d. M. y G – d. M. y G"} + G{"d. M. y G – d. M. y G"} M{"d. M. – d. M. y G"} d{"d.–d. M. y G"} - y{"d. M. y – d. M. y G"} + y{"d. M. y – d. M. y G"} } GyMd{ - G{"d. M. y GGGGG – d. M. y GGGGG"} - M{"d. M. y – d. M. y GGGGG"} - d{"d. M. y – d. M. y GGGGG"} - y{"d. M. y – d. M. y GGGGG"} + G{"d. M. y GGGGG – d. M. y GGGGG"} + M{"d. M. y – d. M. y GGGGG"} + d{"d. M. y – d. M. y GGGGG"} + y{"d. M. y – d. M. y GGGGG"} } H{ H{"H–H"} @@ -2902,57 +2902,57 @@ cs{ } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y G"} } yM{ - M{"M/y – M/y G"} - y{"M/y – M/y G"} + M{"M/y – M/y G"} + y{"M/y – M/y G"} } yMEd{ - M{"E dd.MM.y – E dd.MM.y G"} - d{"E dd.MM.y – E dd.MM.y G"} - y{"E dd.MM.y – E dd.MM.y G"} + M{"E dd.MM.y – E dd.MM.y G"} + d{"E dd.MM.y – E dd.MM.y G"} + y{"E dd.MM.y – E dd.MM.y G"} } yMMM{ M{"MMM–MMM y G"} - y{"MMM y – MMM y G"} + y{"MMM y – MMM y G"} } yMMMEd{ M{"E d. M. – E d. M. y G"} d{"E d. M. – E d. M. y G"} - y{"E d. M. y – E d. M. y G"} + y{"E d. M. y – E d. M. y G"} } yMMMM{ M{"LLLL–LLLL y G"} - y{"LLLL y – LLLL y G"} + y{"LLLL y – LLLL y G"} } yMMMd{ M{"d. M. – d. M. y G"} d{"d.–d. M. y G"} - y{"d. M. y – d. M. y G"} + y{"d. M. y – d. M. y G"} } yMd{ - M{"dd.MM.y – dd.MM.y G"} - d{"dd.MM.y – dd.MM.y G"} - y{"dd.MM.y – dd.MM.y G"} + M{"dd.MM.y – dd.MM.y G"} + d{"dd.MM.y – dd.MM.y G"} + y{"dd.MM.y – dd.MM.y G"} } } } @@ -3007,8 +3007,8 @@ cs{ EHm{"E H:mm"} EHms{"E H:mm:ss"} Ed{"E d."} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"y G"} GyMMM{"LLLL y G"} GyMMMEd{"E d. M. y G"} @@ -3036,11 +3036,11 @@ cs{ MMMd{"d. M."} Md{"d. M."} d{"d."} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} - hmsv{"h:mm:ss a v"} - hmv{"h:mm a v"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} + hmsv{"h:mm:ss a v"} + hmv{"h:mm a v"} ms{"mm:ss"} y{"y"} yM{"M/y"} @@ -3225,51 +3225,51 @@ cs{ } intervalFormats{ Bh{ - B{"h B – h B"} + B{"h B – h B"} h{"h–h B"} } Bhm{ - B{"h:mm B – h:mm B"} + B{"h:mm B – h:mm B"} h{"h:mm–h:mm B"} m{"h:mm–h:mm B"} } Gy{ - G{"y G – y G"} + G{"y G – y G"} y{"y–y G"} } GyM{ - G{"M/y GGGGG – M/y GGGGG"} - M{"M/y – M/y GGGGG"} - y{"M/y – M/y GGGGG"} + G{"M/y GGGGG – M/y GGGGG"} + M{"M/y – M/y GGGGG"} + y{"M/y – M/y GGGGG"} } GyMEd{ - G{"E d. M. y GGGGG – E d. M. y GGGGG"} - M{"E d. M. y – E d. M. y GGGGG"} - d{"E d. M. y – E d. M. y GGGGG"} - y{"E d. M. y – E d. M. y GGGGG"} + G{"E d. M. y GGGGG – E d. M. y GGGGG"} + M{"E d. M. y – E d. M. y GGGGG"} + d{"E d. M. y – E d. M. y GGGGG"} + y{"E d. M. y – E d. M. y GGGGG"} } GyMMM{ - G{"LLLL y G – LLLL y G"} + G{"LLLL y G – LLLL y G"} M{"LLLL–LLLL y G"} - y{"LLLL y – LLLL y G"} + y{"LLLL y – LLLL y G"} } GyMMMEd{ - G{"E d. M. y G – E d. M. y G"} + G{"E d. M. y G – E d. M. y G"} M{"E d. M. – E d. M. y G"} d{"E d. M. – E d. M. y G"} - y{"E d. M. y – E d. M. y G"} + y{"E d. M. y – E d. M. y G"} } GyMMMd{ - G{"d. M. y G – d. M. y G"} + G{"d. M. y G – d. M. y G"} M{"d. M. – d. M. y G"} d{"d.–d. M. y G"} - y{"d. M. y – d. M. y G"} + y{"d. M. y – d. M. y G"} } GyMd{ - G{"d. M. y GGGGG – d. M. y GGGGG"} - M{"d. M. y – d. M. y GGGGG"} - d{"d. M. y – d. M. y GGGGG"} - y{"d. M. y – d. M. y GGGGG"} + G{"d. M. y GGGGG – d. M. y GGGGG"} + M{"d. M. y – d. M. y GGGGG"} + d{"d. M. y – d. M. y GGGGG"} + y{"d. M. y – d. M. y GGGGG"} } H{ H{"H–H"} @@ -3312,57 +3312,57 @@ cs{ } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y"} } yM{ - M{"M/y – M/y"} - y{"M/y – M/y"} + M{"M/y – M/y"} + y{"M/y – M/y"} } yMEd{ - M{"E dd.MM.y – E dd.MM.y"} - d{"E dd.MM.y – E dd.MM.y"} - y{"E dd.MM.y – E dd.MM.y"} + M{"E dd.MM.y – E dd.MM.y"} + d{"E dd.MM.y – E dd.MM.y"} + y{"E dd.MM.y – E dd.MM.y"} } yMMM{ M{"MMM–MMM y"} - y{"MMM y – MMM y"} + y{"MMM y – MMM y"} } yMMMEd{ M{"E d. M. – E d. M. y"} d{"E d. M. – E d. M. y"} - y{"E d. M. y – E d. M. y"} + y{"E d. M. y – E d. M. y"} } yMMMM{ M{"LLLL–LLLL y"} - y{"LLLL y – LLLL y"} + y{"LLLL y – LLLL y"} } yMMMd{ M{"d. M. – d. M. y"} d{"d.–d. M. y"} - y{"d. M. y – d. M. y"} + y{"d. M. y – d. M. y"} } yMd{ - M{"dd.MM.y – dd.MM.y"} - d{"dd.MM.y – dd.MM.y"} - y{"dd.MM.y – dd.MM.y"} + M{"dd.MM.y – dd.MM.y"} + d{"dd.MM.y – dd.MM.y"} + y{"dd.MM.y – dd.MM.y"} } } monthNames{ @@ -3609,57 +3609,57 @@ cs{ } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y G"} } yM{ - M{"M/y – M/y G"} - y{"M/y – M/y G"} + M{"M/y – M/y G"} + y{"M/y – M/y G"} } yMEd{ - M{"E dd.MM.y – E dd.MM.y G"} - d{"E dd.MM.y – E dd.MM.y G"} - y{"E dd.MM.y – E dd.MM.y G"} + M{"E dd.MM.y – E dd.MM.y G"} + d{"E dd.MM.y – E dd.MM.y G"} + y{"E dd.MM.y – E dd.MM.y G"} } yMMM{ M{"MMM–MMM y G"} - y{"MMM y – MMM y G"} + y{"MMM y – MMM y G"} } yMMMEd{ M{"E d. M. – E d. M. y G"} d{"E d. M. – E d. M. y G"} - y{"E d. M. y – E d. M. y G"} + y{"E d. M. y – E d. M. y G"} } yMMMM{ M{"LLLL–LLLL y G"} - y{"LLLL y – LLLL y G"} + y{"LLLL y – LLLL y G"} } yMMMd{ M{"d. M. – d. M. y G"} d{"d.–d. M. y G"} - y{"d. M. y – d. M. y G"} + y{"d. M. y – d. M. y G"} } yMd{ - M{"dd.MM.y – dd.MM.y G"} - d{"dd.MM.y – dd.MM.y G"} - y{"dd.MM.y – dd.MM.y G"} + M{"dd.MM.y – dd.MM.y G"} + d{"dd.MM.y – dd.MM.y G"} + y{"dd.MM.y – dd.MM.y G"} } } monthNames{ @@ -3876,57 +3876,57 @@ cs{ } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y G"} } yM{ - M{"M/y – M/y G"} - y{"M/y – M/y G"} + M{"M/y – M/y G"} + y{"M/y – M/y G"} } yMEd{ - M{"E dd.MM.y – E dd.MM.y G"} - d{"E dd.MM.y – E dd.MM.y G"} - y{"E dd.MM.y – E dd.MM.y G"} + M{"E dd.MM.y – E dd.MM.y G"} + d{"E dd.MM.y – E dd.MM.y G"} + y{"E dd.MM.y – E dd.MM.y G"} } yMMM{ M{"MMM–MMM y G"} - y{"MMM y – MMM y G"} + y{"MMM y – MMM y G"} } yMMMEd{ M{"E d. M. – E d. M. y G"} d{"E d. M. – E d. M. y G"} - y{"E d. M. y – E d. M. y G"} + y{"E d. M. y – E d. M. y G"} } yMMMM{ M{"LLLL–LLLL y G"} - y{"LLLL y – LLLL y G"} + y{"LLLL y – LLLL y G"} } yMMMd{ M{"d. M. – d. M. y G"} d{"d.–d. M. y G"} - y{"d. M. y – d. M. y G"} + y{"d. M. y – d. M. y G"} } yMd{ - M{"dd.MM.y – dd.MM.y G"} - d{"dd.MM.y – dd.MM.y G"} - y{"dd.MM.y – dd.MM.y G"} + M{"dd.MM.y – dd.MM.y G"} + d{"dd.MM.y – dd.MM.y G"} + y{"dd.MM.y – dd.MM.y G"} } } monthNames{ @@ -4131,57 +4131,57 @@ cs{ } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y G"} } yM{ - M{"M/y – M/y G"} - y{"M/y – M/y G"} + M{"M/y – M/y G"} + y{"M/y – M/y G"} } yMEd{ - M{"E dd.MM.y – E dd.MM.y G"} - d{"E dd.MM.y – E dd.MM.y G"} - y{"E dd.MM.y – E dd.MM.y G"} + M{"E dd.MM.y – E dd.MM.y G"} + d{"E dd.MM.y – E dd.MM.y G"} + y{"E dd.MM.y – E dd.MM.y G"} } yMMM{ M{"MMM–MMM y G"} - y{"MMM y – MMM y G"} + y{"MMM y – MMM y G"} } yMMMEd{ M{"E d. M. – E d. M. y G"} d{"E d. M. – E d. M. y G"} - y{"E d. M. y – E d. M. y G"} + y{"E d. M. y – E d. M. y G"} } yMMMM{ M{"LLLL–LLLL y G"} - y{"LLLL y – LLLL y G"} + y{"LLLL y – LLLL y G"} } yMMMd{ M{"d. M. – d. M. y G"} d{"d.–d. M. y G"} - y{"d. M. y – d. M. y G"} + y{"d. M. y – d. M. y G"} } yMd{ - M{"dd.MM.y – dd.MM.y G"} - d{"dd.MM.y – dd.MM.y G"} - y{"dd.MM.y – dd.MM.y G"} + M{"dd.MM.y – dd.MM.y G"} + d{"dd.MM.y – dd.MM.y G"} + y{"dd.MM.y – dd.MM.y G"} } } monthNames{ @@ -5094,57 +5094,57 @@ cs{ } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y G"} } yM{ - M{"M/y – M/y G"} - y{"M/y – M/y G"} + M{"M/y – M/y G"} + y{"M/y – M/y G"} } yMEd{ - M{"E dd.MM.y – E dd.MM.y G"} - d{"E dd.MM.y – E dd.MM.y G"} - y{"E dd.MM.y – E dd.MM.y G"} + M{"E dd.MM.y – E dd.MM.y G"} + d{"E dd.MM.y – E dd.MM.y G"} + y{"E dd.MM.y – E dd.MM.y G"} } yMMM{ M{"MMM–MMM y G"} - y{"MMM y – MMM y G"} + y{"MMM y – MMM y G"} } yMMMEd{ M{"E d. M. – E d. M. y G"} d{"E d. M. – E d. M. y G"} - y{"E d. M. y – E d. M. y G"} + y{"E d. M. y – E d. M. y G"} } yMMMM{ M{"LLLL–LLLL y G"} - y{"LLLL y – LLLL y G"} + y{"LLLL y – LLLL y G"} } yMMMd{ M{"d. M. – d. M. y G"} d{"d.–d. M. y G"} - y{"d. M. y – d. M. y G"} + y{"d. M. y – d. M. y G"} } yMd{ - M{"dd.MM.y – dd.MM.y G"} - d{"dd.MM.y – dd.MM.y G"} - y{"dd.MM.y – dd.MM.y G"} + M{"dd.MM.y – dd.MM.y G"} + d{"dd.MM.y – dd.MM.y G"} + y{"dd.MM.y – dd.MM.y G"} } } } @@ -5259,57 +5259,57 @@ cs{ } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y G"} } yM{ - M{"M/y – M/y G"} - y{"M/y – M/y G"} + M{"M/y – M/y G"} + y{"M/y – M/y G"} } yMEd{ - M{"E dd.MM.y – E dd.MM.y G"} - d{"E dd.MM.y – E dd.MM.y G"} - y{"E dd.MM.y – E dd.MM.y G"} + M{"E dd.MM.y – E dd.MM.y G"} + d{"E dd.MM.y – E dd.MM.y G"} + y{"E dd.MM.y – E dd.MM.y G"} } yMMM{ M{"MMM–MMM y G"} - y{"MMM y – MMM y G"} + y{"MMM y – MMM y G"} } yMMMEd{ M{"E d. M. – E d. M. y G"} d{"E d. M. – E d. M. y G"} - y{"E d. M. y – E d. M. y G"} + y{"E d. M. y – E d. M. y G"} } yMMMM{ M{"LLLL–LLLL y G"} - y{"LLLL y – LLLL y G"} + y{"LLLL y – LLLL y G"} } yMMMd{ M{"d. M. – d. M. y G"} d{"d.–d. M. y G"} - y{"d. M. y – d. M. y G"} + y{"d. M. y – d. M. y G"} } yMd{ - M{"dd.MM.y – dd.MM.y G"} - d{"dd.MM.y – dd.MM.y G"} - y{"dd.MM.y – dd.MM.y G"} + M{"dd.MM.y – dd.MM.y G"} + d{"dd.MM.y – dd.MM.y G"} + y{"dd.MM.y – dd.MM.y G"} } } monthNames{ diff --git a/icu4c/source/data/locales/cy.txt b/icu4c/source/data/locales/cy.txt index d8abe9eabbad..528c0c7aea86 100644 --- a/icu4c/source/data/locales/cy.txt +++ b/icu4c/source/data/locales/cy.txt @@ -408,6 +408,12 @@ cy{ "d MMM y G", "dd/MM/y GGGGG", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{1} 'am' {0}", "{1} 'am' {0}", "{1}, {0}", @@ -433,8 +439,8 @@ cy{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"E, d"} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"y G"} GyMMM{"MMM y G"} GyMMMEd{"E, d MMM y G"} @@ -451,9 +457,9 @@ cy{ MMMd{"d MMM"} Md{"d/M"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"mm:ss"} y{"y G"} yyyy{"y G"} @@ -469,100 +475,100 @@ cy{ } intervalFormats{ H{ - H{"HH – HH"} + H{"HH – HH"} } Hm{ - H{"HH:mm – HH:mm"} - m{"HH:mm – HH:mm"} + H{"HH:mm – HH:mm"} + m{"HH:mm – HH:mm"} } Hmv{ - H{"HH:mm – HH:mm v"} - m{"HH:mm – HH:mm v"} + H{"HH:mm – HH:mm v"} + m{"HH:mm – HH:mm v"} } Hv{ - H{"HH – HH v"} + H{"HH – HH v"} } M{ - M{"M – M"} + M{"M – M"} } MEd{ - M{"E, d/M – E, d/M"} - d{"E, d/M – E, d/M"} + M{"E, d/M – E, d/M"} + d{"E, d/M – E, d/M"} } MMM{ - M{"MMM – MMM"} + M{"MMM – MMM"} } MMMEd{ - M{"E, d MMM – E, d MMM"} - d{"E, d MMM – E, d MMM"} + M{"E, d MMM – E, d MMM"} + d{"E, d MMM – E, d MMM"} } MMMM{ M{"LLLL–LLLL"} } MMMd{ - M{"d MMM – d MMM"} - d{"d – d MMM"} + M{"d MMM – d MMM"} + d{"d – d MMM"} } Md{ - M{"d/M – d/M"} - d{"d/M – d/M"} + M{"d/M – d/M"} + d{"d/M – d/M"} } d{ - d{"d – d"} + d{"d – d"} } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h – h a"} + a{"h a – h a"} + h{"h – h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm – h:mm a"} - m{"h:mm – h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm – h:mm a"} + m{"h:mm – h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm – h:mm a v"} - m{"h:mm – h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm – h:mm a v"} + m{"h:mm – h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h – h a v"} + a{"h a – h a v"} + h{"h – h a v"} } y{ y{"y–y G"} } yM{ - M{"M/y – M/y GGGGG"} - y{"M/y – M/y GGGGG"} + M{"M/y – M/y GGGGG"} + y{"M/y – M/y GGGGG"} } yMEd{ - M{"E, d/M/y – E, d/M/y GGGGG"} - d{"E, d/M/y – E, d/M/y GGGGG"} - y{"E, d/M/y – E, d/M/y GGGGG"} + M{"E, d/M/y – E, d/M/y GGGGG"} + d{"E, d/M/y – E, d/M/y GGGGG"} + y{"E, d/M/y – E, d/M/y GGGGG"} } yMMM{ - M{"MMM – MMM y G"} - y{"MMM y – MMM y G"} + M{"MMM – MMM y G"} + y{"MMM y – MMM y G"} } yMMMEd{ - M{"E, d MMM – E, d MMM y G"} - d{"E, d MMM – E, d MMM y G"} - y{"E, d MMM, y – E, d MMM y G"} + M{"E, d MMM – E, d MMM y G"} + d{"E, d MMM – E, d MMM y G"} + y{"E, d MMM, y – E, d MMM y G"} } yMMMM{ M{"MMMM–MMMM y G"} - y{"MMMM y – MMMM y G"} + y{"MMMM y – MMMM y G"} } yMMMd{ - M{"d MMM – d MMM y G"} + M{"d MMM – d MMM y G"} d{"d–d MMM y G"} - y{"d MMM y – d MMM y G"} + y{"d MMM y – d MMM y G"} } yMd{ - M{"d/M/y – d/M/y GGGGG"} - d{"d/M/y – d/M/y GGGGG"} - y{"d/M/y – d/M/y GGGGG"} + M{"d/M/y – d/M/y GGGGG"} + d{"d/M/y – d/M/y GGGGG"} + y{"d/M/y – d/M/y GGGGG"} } } } @@ -585,6 +591,12 @@ cy{ "d MMM y", "dd/MM/yy", "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + } + DateTimePatterns%atTime{ "{1} 'am' {0}", "{1} 'am' {0}", "{1} {0}", @@ -613,8 +625,8 @@ cy{ EHm{"E, HH:mm"} EHms{"E, HH:mm:ss"} Ed{"d, E"} - Ehm{"E, h:mm a"} - Ehms{"E, h:mm:ss a"} + Ehm{"E, h:mm a"} + Ehms{"E, h:mm:ss a"} Gy{"y G"} GyMMM{"MMM y G"} GyMMMEd{"E, d MMM y G"} @@ -641,11 +653,11 @@ cy{ MMMd{"d MMM"} Md{"d/M"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} - hmsv{"h:mm:ss a v"} - hmv{"h:mm a v"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} + hmsv{"h:mm:ss a v"} + hmv{"h:mm a v"} ms{"mm:ss"} y{"y"} yM{"M/y"} @@ -821,100 +833,100 @@ cy{ } intervalFormats{ H{ - H{"HH – HH"} + H{"HH – HH"} } Hm{ - H{"HH:mm – HH:mm"} - m{"HH:mm – HH:mm"} + H{"HH:mm – HH:mm"} + m{"HH:mm – HH:mm"} } Hmv{ - H{"HH:mm – HH:mm v"} - m{"HH:mm – HH:mm v"} + H{"HH:mm – HH:mm v"} + m{"HH:mm – HH:mm v"} } Hv{ - H{"HH – HH v"} + H{"HH – HH v"} } M{ M{"M–M"} } MEd{ - M{"E, d/M – E, d/M"} - d{"E, d/M – E, d/M"} + M{"E, d/M – E, d/M"} + d{"E, d/M – E, d/M"} } MMM{ M{"MMM–MMM"} } MMMEd{ - M{"E, d MMM – E, d MMM"} - d{"E, d MMM – E, d MMM"} + M{"E, d MMM – E, d MMM"} + d{"E, d MMM – E, d MMM"} } MMMM{ M{"LLLL–LLLL"} } MMMd{ - M{"d MMM – d MMM"} - d{"d – d MMM"} + M{"d MMM – d MMM"} + d{"d – d MMM"} } Md{ - M{"d/M – d/M"} - d{"d/M – d/M"} + M{"d/M – d/M"} + d{"d/M – d/M"} } d{ d{"d–d"} } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h – h a"} + a{"h a – h a"} + h{"h – h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm h:mm a"} - m{"h:mm – h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm h:mm a"} + m{"h:mm – h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm – h:mm a v"} - m{"h:mm – h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm – h:mm a v"} + m{"h:mm – h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h – h a v"} + a{"h a – h a v"} + h{"h – h a v"} } y{ y{"y–y"} } yM{ - M{"M/y – M/y"} - y{"M/y – M/y"} + M{"M/y – M/y"} + y{"M/y – M/y"} } yMEd{ - M{"E, d/M/y – E, d/M/y"} - d{"E, d/M/y – E, d/M/y"} - y{"E, d/M/y – E, d/M/y"} + M{"E, d/M/y – E, d/M/y"} + d{"E, d/M/y – E, d/M/y"} + y{"E, d/M/y – E, d/M/y"} } yMMM{ - M{"MMM – MMM y"} - y{"MMM y – MMM y"} + M{"MMM – MMM y"} + y{"MMM y – MMM y"} } yMMMEd{ - M{"E, d MMM – E, d MMM y"} - d{"E, d MMM – E, d MMM y"} - y{"E, d MMM y – E, d MMM y"} + M{"E, d MMM – E, d MMM y"} + d{"E, d MMM – E, d MMM y"} + y{"E, d MMM y – E, d MMM y"} } yMMMM{ - M{"MMMM – MMMM y"} - y{"MMMM y – MMMM y"} + M{"MMMM – MMMM y"} + y{"MMMM y – MMMM y"} } yMMMd{ - M{"d MMM – d MMM y"} + M{"d MMM – d MMM y"} d{"d–d MMM y"} - y{"d MMM, y – d MMM y"} + y{"d MMM, y – d MMM y"} } yMd{ - M{"d/M/y – d/M/y"} - d{"d/M/y – d/M/y"} - y{"d/M/y – d/M/y"} + M{"d/M/y – d/M/y"} + d{"d/M/y – d/M/y"} + y{"d/M/y – d/M/y"} } } monthNames{ diff --git a/icu4c/source/data/locales/da.txt b/icu4c/source/data/locales/da.txt index 4ee088512101..3aa9061523c3 100644 --- a/icu4c/source/data/locales/da.txt +++ b/icu4c/source/data/locales/da.txt @@ -341,8 +341,8 @@ da{ EHm{"E HH.mm"} EHms{"E HH.mm.ss"} Ed{"E 'd'. d."} - Ehm{"E h.mm a"} - Ehms{"E h.mm.ss a"} + Ehm{"E h.mm a"} + Ehms{"E h.mm.ss a"} Gy{"y G"} GyMMM{"MMM y G"} GyMMMEd{"E d. MMM y G"} @@ -360,9 +360,9 @@ da{ MMMd{"d. MMM"} Md{"d/M"} d{"d."} - h{"h a"} - hm{"h.mm a"} - hms{"h.mm.ss a"} + h{"h a"} + hm{"h.mm a"} + hms{"h.mm.ss a"} ms{"mm.ss"} y{"y G"} yyyy{"y G"} @@ -464,22 +464,22 @@ da{ } fallback{"{0}-{1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h.mm a – h.mm a"} - h{"h.mm–h.mm a"} - m{"h.mm–h.mm a"} + a{"h.mm a – h.mm a"} + h{"h.mm–h.mm a"} + m{"h.mm–h.mm a"} } hmv{ - a{"h.mm a – h.mm a v"} - h{"h.mm–h.mm a v"} - m{"h.mm–h.mm a v"} + a{"h.mm a – h.mm a v"} + h{"h.mm–h.mm a v"} + m{"h.mm–h.mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y G"} @@ -541,6 +541,12 @@ da{ "d. MMM y", "dd.MM.y", "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + } + DateTimePatterns%atTime{ "{1} 'kl'. {0}", "{1} 'kl'. {0}", "{1} {0}", @@ -579,8 +585,8 @@ da{ EHm{"E HH.mm"} EHms{"E HH.mm.ss"} Ed{"E 'den' d."} - Ehm{"E h.mm a"} - Ehms{"E h.mm.ss a"} + Ehm{"E h.mm a"} + Ehms{"E h.mm.ss a"} Gy{"y G"} GyMMM{"MMM y G"} GyMMMEd{"E d. MMM y G"} @@ -605,11 +611,11 @@ da{ MMdd{"dd.MM"} Md{"d.M"} d{"d."} - h{"h a"} - hm{"h.mm a"} - hms{"h.mm.ss a"} - hmsv{"h.mm.ss a v"} - hmv{"h.mm a v"} + h{"h a"} + hm{"h.mm a"} + hms{"h.mm.ss a"} + hmsv{"h.mm.ss a v"} + hmv{"h.mm a v"} ms{"mm.ss"} y{"y"} yM{"M.y"} @@ -802,7 +808,7 @@ da{ m{"h.mm–h.mm B"} } Gy{ - G{"y G – y G"} + G{"y G – y G"} y{"y–y G"} } GyM{ @@ -880,22 +886,22 @@ da{ } fallback{"{0}-{1}"} h{ - a{"h a–h a"} - h{"h–h a"} + a{"h a–h a"} + h{"h–h a"} } hm{ - a{"h.mm a–h.mm a"} - h{"h.mm–h.mm a"} - m{"h.mm–h.mm a"} + a{"h.mm a–h.mm a"} + h{"h.mm–h.mm a"} + m{"h.mm–h.mm a"} } hmv{ - a{"h.mm a–h.mm a v"} - h{"h.mm–h.mm a v"} - m{"h.mm–h.mm a v"} + a{"h.mm a–h.mm a v"} + h{"h.mm–h.mm a v"} + m{"h.mm–h.mm a v"} } hv{ - a{"h a–h a v"} - h{"h–h a v"} + a{"h a–h a v"} + h{"h–h a v"} } y{ y{"y–y"} diff --git a/icu4c/source/data/locales/dav.txt b/icu4c/source/data/locales/dav.txt index b3c801ba73e1..eb6b98430d83 100644 --- a/icu4c/source/data/locales/dav.txt +++ b/icu4c/source/data/locales/dav.txt @@ -52,7 +52,7 @@ dav{ MMMd{"MMM d"} Md{"M/d"} d{"d"} - hm{"h:mm a"} + hm{"h:mm a"} ms{"mm:ss"} y{"y"} yM{"M/y"} @@ -112,7 +112,7 @@ dav{ MMMd{"MMM d"} Md{"M/d"} d{"d"} - hm{"h:mm a"} + hm{"h:mm a"} ms{"mm:ss"} y{"y"} yM{"M/y"} diff --git a/icu4c/source/data/locales/de.txt b/icu4c/source/data/locales/de.txt index f3b41a307246..a1e919c57fb7 100644 --- a/icu4c/source/data/locales/de.txt +++ b/icu4c/source/data/locales/de.txt @@ -290,9 +290,9 @@ de{ MMMd{"d. MMM"} Md{"d.M."} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"mm:ss"} y{"U"} yyyy{"U"} @@ -504,6 +504,12 @@ de{ "dd.MM.y G", "dd.MM.yy GGGGG", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{1} 'um' {0}", "{1} 'um' {0}", "{1}, {0}", @@ -529,8 +535,8 @@ de{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"E, d."} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"y G"} GyMMM{"MMM y G"} GyMMMEd{"E, d. MMM y G"} @@ -547,9 +553,9 @@ de{ MMMd{"d. MMM"} Md{"d.M."} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"mm:ss"} y{"y G"} yyyy{"y G"} @@ -589,14 +595,14 @@ de{ M{"MMM–MMM"} } MMMEd{ - M{"E, d. MMM – E, d. MMM"} + M{"E, d. MMM – E, d. MMM"} d{"E, d. – E, d. MMM"} } MMMM{ M{"LLLL–LLLL"} } MMMd{ - M{"d. MMM – d. MMM"} + M{"d. MMM – d. MMM"} d{"d.–d. MMM"} } Md{ @@ -608,57 +614,57 @@ de{ } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y G"} } yM{ - M{"MM.y – MM.y G"} - y{"MM.y – MM.y G"} + M{"MM.y – MM.y G"} + y{"MM.y – MM.y G"} } yMEd{ - M{"E, dd.MM.y – E, dd.MM.y G"} - d{"E, dd.MM.y – E, dd.MM.y G"} - y{"E, dd.MM.y – E, dd.MM.y G"} + M{"E, dd.MM.y – E, dd.MM.y G"} + d{"E, dd.MM.y – E, dd.MM.y G"} + y{"E, dd.MM.y – E, dd.MM.y G"} } yMMM{ M{"MMM–MMM y G"} - y{"MMM y – MMM y G"} + y{"MMM y – MMM y G"} } yMMMEd{ - M{"E, d. MMM – E, d. MMM y G"} + M{"E, d. MMM – E, d. MMM y G"} d{"E, d. – E, d. MMM y G"} - y{"E, d. MMM y – E, d. MMM y G"} + y{"E, d. MMM y – E, d. MMM y G"} } yMMMM{ M{"MMMM–MMMM y G"} - y{"MMMM y – MMMM y G"} + y{"MMMM y – MMMM y G"} } yMMMd{ - M{"d. MMM – d. MMM y G"} + M{"d. MMM – d. MMM y G"} d{"d.–d. MMM y G"} - y{"d. MMM y – d. MMM y G"} + y{"d. MMM y – d. MMM y G"} } yMd{ - M{"dd.MM.y – dd.MM.y G"} - d{"dd.MM.y – dd.MM.y G"} - y{"dd.MM.y – dd.MM.y G"} + M{"dd.MM.y – dd.MM.y G"} + d{"dd.MM.y – dd.MM.y G"} + y{"dd.MM.y – dd.MM.y G"} } } } @@ -681,6 +687,12 @@ de{ "dd.MM.y", "dd.MM.yy", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{1} 'um' {0}", "{1} 'um' {0}", "{1}, {0}", @@ -709,13 +721,13 @@ de{ EHm{"E, HH:mm"} EHms{"E, HH:mm:ss"} Ed{"E, d."} - Ehm{"E h:mm a"} - Ehms{"E, h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E, h:mm:ss a"} Gy{"y G"} GyMMM{"MMM y G"} GyMMMEd{"E, d. MMM y G"} GyMMMd{"d. MMM y G"} - GyMd{"dd.MM.y GGGGG"} + GyMd{"dd.MM.y G"} H{"HH 'Uhr'"} Hm{"HH:mm"} Hms{"HH:mm:ss"} @@ -737,10 +749,10 @@ de{ Md{"d.M."} d{"d"} h{"h 'Uhr' a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} - hmsv{"h:mm:ss a v"} - hmv{"h:mm a v"} + hm{"h:mm a"} + hms{"h:mm:ss a"} + hmsv{"h:mm:ss a v"} + hmv{"h:mm a v"} ms{"mm:ss"} y{"y"} yM{"M.y"} @@ -929,51 +941,51 @@ de{ } intervalFormats{ Bh{ - B{"h 'Uhr' B – h 'Uhr' B"} + B{"h 'Uhr' B – h 'Uhr' B"} h{"h–h 'Uhr' B"} } Bhm{ - B{"h:mm 'Uhr' B – h:mm 'Uhr' B"} - h{"h:mm – h:mm 'Uhr' B"} - m{"h:mm – h:mm 'Uhr' B"} + B{"h:mm 'Uhr' B – h:mm 'Uhr' B"} + h{"h:mm – h:mm 'Uhr' B"} + m{"h:mm – h:mm 'Uhr' B"} } Gy{ - G{"y G – y G"} + G{"y G – y G"} y{"y–y G"} } GyM{ - G{"MM.y GGGGG – MM.y GGGGG"} - M{"MM.y – MM.y GGGGG"} - y{"MM.y – MM.y GGGGG"} + G{"MM.y G – MM.y G"} + M{"MM.y – MM.y G"} + y{"MM.y – MM.y G"} } GyMEd{ - G{"E, dd.MM.y GGGGG – E, dd.MM.y GGGGG"} - M{"E, dd.MM. – E, dd.MM.y GGGGG"} - d{"E, dd.MM.y – E, dd.MM.y GGGGG"} - y{"E, dd.MM.y – E, dd.MM.y GGGGG"} + G{"E, dd.MM.y G – E, dd.MM.y G"} + M{"E, dd.MM. – E, dd.MM.y G"} + d{"E, dd.MM.y – E, dd.MM.y G"} + y{"E, dd.MM.y – E, dd.MM.y G"} } GyMMM{ - G{"MMM y G – MMM y G"} + G{"MMM y G – MMM y G"} M{"MMM–MMM y G"} - y{"MMM y – MMM y G"} + y{"MMM y – MMM y G"} } GyMMMEd{ - G{"E, d. MMM y G – E E, d. MMM y G"} - M{"E, d. MMM – E, d. MMM y G"} + G{"E, d. MMM y G – E E, d. MMM y G"} + M{"E, d. MMM – E, d. MMM y G"} d{"E, d. – E, d. MMM y G"} - y{"E, d. MMM y – E, d. MMM y G"} + y{"E, d. MMM y – E, d. MMM y G"} } GyMMMd{ - G{"d. MMM y G – d. MMM y G"} - M{"d. MMM – d. MMM y G"} + G{"d. MMM y G – d. MMM y G"} + M{"d. MMM – d. MMM y G"} d{"d.–d. MMM y G"} - y{"d. MMM y – d. MMM y G"} + y{"d. MMM y – d. MMM y G"} } GyMd{ - G{"dd.MM.y GGGGG – dd.MM.y GGGGG"} - M{"dd.MM. – dd.MM.y GGGGG"} - d{"dd.–dd.MM.y GGGGG"} - y{"dd.MM.y – dd.MM.y GGGGG"} + G{"dd.MM.y G – dd.MM.y G"} + M{"dd.MM. – dd.MM.y G"} + d{"dd.–dd.MM.y G"} + y{"dd.MM.y – dd.MM.y G"} } H{ H{"HH–HH 'Uhr'"} @@ -1000,14 +1012,14 @@ de{ M{"MMM–MMM"} } MMMEd{ - M{"E, d. MMM – E, d. MMM"} + M{"E, d. MMM – E, d. MMM"} d{"E, d. – E, d. MMM"} } MMMM{ M{"LLLL–LLLL"} } MMMd{ - M{"d. MMM – d. MMM"} + M{"d. MMM – d. MMM"} d{"d.–d. MMM"} } Md{ @@ -1019,57 +1031,57 @@ de{ } fallback{"{0} – {1}"} h{ - a{"h 'Uhr' a – h 'Uhr' a"} - h{"h – h 'Uhr' a"} + a{"h 'Uhr' a – h 'Uhr' a"} + h{"h – h 'Uhr' a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y"} } yM{ - M{"MM.y – MM.y"} - y{"MM.y – MM.y"} + M{"MM.y – MM.y"} + y{"MM.y – MM.y"} } yMEd{ M{"E, dd.MM. – E, dd.MM.y"} d{"E, dd. – E, dd.MM.y"} - y{"E, dd.MM.y – E, dd.MM.y"} + y{"E, dd.MM.y – E, dd.MM.y"} } yMMM{ M{"MMM–MMM y"} - y{"MMM y – MMM y"} + y{"MMM y – MMM y"} } yMMMEd{ - M{"E, d. MMM – E, d. MMM y"} + M{"E, d. MMM – E, d. MMM y"} d{"E, d. – E, d. MMM y"} - y{"E, d. MMM y – E, d. MMM y"} + y{"E, d. MMM y – E, d. MMM y"} } yMMMM{ M{"MMMM–MMMM y"} - y{"MMMM y – MMMM y"} + y{"MMMM y – MMMM y"} } yMMMd{ - M{"d. MMM – d. MMM y"} + M{"d. MMM – d. MMM y"} d{"d.–d. MMM y"} - y{"d. MMM y – d. MMM y"} + y{"d. MMM y – d. MMM y"} } yMd{ M{"dd.MM. – dd.MM.y"} d{"dd.–dd.MM.y"} - y{"dd.MM.y – dd.MM.y"} + y{"dd.MM.y – dd.MM.y"} } } monthNames{ @@ -1449,8 +1461,8 @@ de{ "dd.MM.y G", "dd.MM.yy GGGGG", "{1}, {0}", - "{1} 'um' {0}", - "{1} 'um' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } diff --git a/icu4c/source/data/locales/de_CH.txt b/icu4c/source/data/locales/de_CH.txt index f9acb7666d5e..9ec2ea54a8e9 100644 --- a/icu4c/source/data/locales/de_CH.txt +++ b/icu4c/source/data/locales/de_CH.txt @@ -18,6 +18,9 @@ de_CH{ } calendar{ gregorian{ + availableFormats{ + GyMd{"dd.MM.y GGGGG"} + } dayNames{ format{ short{ diff --git a/icu4c/source/data/locales/de_LU.txt b/icu4c/source/data/locales/de_LU.txt index 12bf52d8c0d1..4f39a89ec45a 100644 --- a/icu4c/source/data/locales/de_LU.txt +++ b/icu4c/source/data/locales/de_LU.txt @@ -9,7 +9,7 @@ de_LU{ "nachm.", } availableFormats{ - h{"h a"} + h{"h a"} } } } diff --git a/icu4c/source/data/locales/dje.txt b/icu4c/source/data/locales/dje.txt index 4a834916fdad..9d8339372b2d 100644 --- a/icu4c/source/data/locales/dje.txt +++ b/icu4c/source/data/locales/dje.txt @@ -57,8 +57,8 @@ dje{ MMMd{"d MMM"} Md{"d/M"} d{"d"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"m:ss"} y{"y"} yM{"M/y"} @@ -116,8 +116,8 @@ dje{ MMMd{"d MMM"} Md{"d/M"} d{"d"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"m:ss"} y{"y"} yM{"M/y"} diff --git a/icu4c/source/data/locales/doi.txt b/icu4c/source/data/locales/doi.txt index a5ed79939335..8e8d87d545f3 100644 --- a/icu4c/source/data/locales/doi.txt +++ b/icu4c/source/data/locales/doi.txt @@ -46,6 +46,12 @@ doi{ "MMM d, y G", "M/d/y GGGGG", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{1} गी {0}", "{1} गी {0}", "{1}, {0}", @@ -88,6 +94,12 @@ doi{ "d, MMM y", "d/M/yy", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{1} गी {0}", "{1} गी {0}", "{1}, {0}", diff --git a/icu4c/source/data/locales/dsb.txt b/icu4c/source/data/locales/dsb.txt index 33a02b0aafb0..e8996e62a0bd 100644 --- a/icu4c/source/data/locales/dsb.txt +++ b/icu4c/source/data/locales/dsb.txt @@ -321,8 +321,8 @@ dsb{ EHm{"E, HH:mm"} EHms{"E, HH:mm:ss"} Ed{"E, d."} - Ehm{"E h:mm a"} - Ehms{"E, h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E, h:mm:ss a"} Gy{"y G"} GyMMM{"MMM y G"} GyMMMEd{"E, d. MMM y G"} @@ -340,8 +340,8 @@ dsb{ Md{"d.M."} d{"d"} h{"h 'hodź'. a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"mm:ss"} y{"y G"} yyyy{"y G"} @@ -357,51 +357,51 @@ dsb{ } intervalFormats{ Bh{ - B{"h 'hodź'. B – h 'hodź'. B"} + B{"h 'hodź'. B – h 'hodź'. B"} h{"h–h B"} } Bhm{ - B{"h:mm 'hodź'. B – h:mm 'hodź'. B"} + B{"h:mm 'hodź'. B – h:mm 'hodź'. B"} h{"h:mm–h:mm B"} m{"h:mm–h:mm B"} } Gy{ - G{"G y – G y"} + G{"G y – G y"} y{"G y–y"} } GyM{ - G{"GGGGG y-MM – GGGGG y-MM"} - M{"GGGGG y-MM – y-MM"} - y{"GGGGG y-MM – y-MM"} + G{"GGGGG y-MM – GGGGG y-MM"} + M{"GGGGG y-MM – y-MM"} + y{"GGGGG y-MM – y-MM"} } GyMEd{ - G{"GGGGG y-MM-dd, E – GGGGG y-MM-dd, E"} - M{"GGGGG y-MM-dd, E – y-MM-dd, E"} - d{"GGGGG y-MM-dd, E – y-MM-dd, E"} - y{"GGGGG y-MM-dd, E – y-MM-dd, E"} + G{"GGGGG y-MM-dd, E – GGGGG y-MM-dd, E"} + M{"GGGGG y-MM-dd, E – y-MM-dd, E"} + d{"GGGGG y-MM-dd, E – y-MM-dd, E"} + y{"GGGGG y-MM-dd, E – y-MM-dd, E"} } GyMMM{ - G{"G y MMM – G y MMM"} + G{"G y MMM – G y MMM"} M{"G y MMM–MMM"} - y{"G y MMM – y MMM"} + y{"G y MMM – y MMM"} } GyMMMEd{ - G{"G y MMM d, E – G y MMM d, E"} - M{"G y MMM d, E – MMM d, E"} - d{"G y MMM d, E – MMM d, E"} - y{"G y MMM d, E – y MMM d, E"} + G{"G y MMM d, E – G y MMM d, E"} + M{"G y MMM d, E – MMM d, E"} + d{"G y MMM d, E – MMM d, E"} + y{"G y MMM d, E – y MMM d, E"} } GyMMMd{ - G{"G y MMM d – G y MMM d"} - M{"G y MMM d – MMM d"} + G{"G y MMM d – G y MMM d"} + M{"G y MMM d – MMM d"} d{"G y MMM d–d"} - y{"G y MMM d – y MMM d"} + y{"G y MMM d – y MMM d"} } GyMd{ - G{"GGGGG y-MM-dd – GGGGG y-MM-dd"} - M{"GGGGG y-MM-dd – y-MM-dd"} - d{"GGGGG y-MM-dd – y-MM-dd"} - y{"GGGGG y-MM-dd – y-MM-dd"} + G{"GGGGG y-MM-dd – GGGGG y-MM-dd"} + M{"GGGGG y-MM-dd – y-MM-dd"} + d{"GGGGG y-MM-dd – y-MM-dd"} + y{"GGGGG y-MM-dd – y-MM-dd"} } M{ M{"M. – M."} @@ -411,14 +411,14 @@ dsb{ d{"E, d.M. – E, d.M."} } MMM{ - M{"LLL – LLL"} + M{"LLL – LLL"} } MMMEd{ - M{"E, d. MMM – E, d. MMM"} + M{"E, d. MMM – E, d. MMM"} d{"E, d. – E, d. MMM"} } MMMd{ - M{"d. MMM – d. MMM"} + M{"d. MMM – d. MMM"} d{"d. – d. MMM"} } Md{ @@ -433,36 +433,36 @@ dsb{ y{"y–y G"} } yM{ - M{"M.y – M.y G"} - y{"M.y – M.y G"} + M{"M.y – M.y G"} + y{"M.y – M.y G"} } yMEd{ - M{"E, d.M.y – E, d.M.y G"} - d{"E, d.M.y – E, d.M.y G"} - y{"E, d.M.y – E, d.M.y G"} + M{"E, d.M.y – E, d.M.y G"} + d{"E, d.M.y – E, d.M.y G"} + y{"E, d.M.y – E, d.M.y G"} } yMMM{ - M{"LLL – LLL y G"} - y{"LLL y – LLL y G"} + M{"LLL – LLL y G"} + y{"LLL y – LLL y G"} } yMMMEd{ - M{"E, d. MMM – E, d. MMM y G"} + M{"E, d. MMM – E, d. MMM y G"} d{"E, d. – E, d. MMM y G"} - y{"E, d. MMM y – E, d. MMM y G"} + y{"E, d. MMM y – E, d. MMM y G"} } yMMMM{ - M{"LLLL – LLLL y G"} - y{"LLLL y – LLLL y G"} + M{"LLLL – LLLL y G"} + y{"LLLL y – LLLL y G"} } yMMMd{ - M{"d. MMM – d. MMM y G"} + M{"d. MMM – d. MMM y G"} d{"d. – d. MMM y G"} - y{"d. MMM y – d. MMM y G"} + y{"d. MMM y – d. MMM y G"} } yMd{ - M{"d.M.y – d.M.y G"} - d{"d.M.y – d.M.y G"} - y{"d.M.y – d.M.y G"} + M{"d.M.y – d.M.y G"} + d{"d.M.y – d.M.y G"} + y{"d.M.y – d.M.y G"} } } } @@ -512,8 +512,8 @@ dsb{ EHm{"E, 'zeg'. H:mm"} EHms{"E, HH:mm:ss"} Ed{"E, d."} - Ehm{"E, h:mm a"} - Ehms{"E, h:mm:ss a"} + Ehm{"E, h:mm a"} + Ehms{"E, h:mm:ss a"} Gy{"y G"} GyMMM{"MMM y G"} GyMMMEd{"E, d. MMM y G"} @@ -538,9 +538,9 @@ dsb{ MMMd{"d. MMM"} Md{"d.M."} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"mm:ss"} y{"y"} yM{"M.y"} @@ -669,62 +669,62 @@ dsb{ } intervalFormats{ Bh{ - B{"h 'hodź'. B – h 'hodź'. B"} + B{"h 'hodź'. B – h 'hodź'. B"} h{"h–h B"} } Bhm{ - B{"h:mm 'hodź'. B – h:mm 'hodź'. B"} + B{"h:mm 'hodź'. B – h:mm 'hodź'. B"} h{"h:mm–h:mm B"} m{"h:mm–h:mm B"} } Gy{ - G{"G y – G y"} + G{"G y – G y"} y{"G y–y"} } GyM{ - G{"GGGGG y-MM – GGGGG y-MM"} - M{"GGGGG y-MM – y-MM"} - y{"GGGGG y-MM – y-MM"} + G{"GGGGG y-MM – GGGGG y-MM"} + M{"GGGGG y-MM – y-MM"} + y{"GGGGG y-MM – y-MM"} } GyMEd{ - G{"GGGGG y-MM-dd, E – GGGGG y-MM-dd, E"} - M{"GGGGG y-MM-dd, E – y-MM-dd, E"} - d{"GGGGG y-MM-dd, E – y-MM-dd, E"} - y{"GGGGG y-MM-dd, E – y-MM-dd, E"} + G{"GGGGG y-MM-dd, E – GGGGG y-MM-dd, E"} + M{"GGGGG y-MM-dd, E – y-MM-dd, E"} + d{"GGGGG y-MM-dd, E – y-MM-dd, E"} + y{"GGGGG y-MM-dd, E – y-MM-dd, E"} } GyMMM{ - G{"G y MMM – G y MMM"} + G{"G y MMM – G y MMM"} M{"G y MMM–MMM"} - y{"G y MMM – y MMM"} + y{"G y MMM – y MMM"} } GyMMMEd{ - G{"G y MMM d, E – G y MMM d, E"} - M{"G y MMM d, E – MMM d, E"} - d{"G y MMM d, E – MMM d, E"} - y{"G y MMM d, E – y MMM d, E"} + G{"G y MMM d, E – G y MMM d, E"} + M{"G y MMM d, E – MMM d, E"} + d{"G y MMM d, E – MMM d, E"} + y{"G y MMM d, E – y MMM d, E"} } GyMMMd{ - G{"G y MMM d – G y MMM d"} - M{"G y MMM d – MMM d"} + G{"G y MMM d – G y MMM d"} + M{"G y MMM d – MMM d"} d{"G y MMM d–d"} - y{"G y MMM d – y MMM d"} + y{"G y MMM d – y MMM d"} } GyMd{ - G{"GGGGG y-MM-dd – GGGGG y-MM-dd"} - M{"GGGGG y-MM-dd – y-MM-dd"} - d{"GGGGG y-MM-dd – y-MM-dd"} - y{"GGGGG y-MM-dd – y-MM-dd"} + G{"GGGGG y-MM-dd – GGGGG y-MM-dd"} + M{"GGGGG y-MM-dd – y-MM-dd"} + d{"GGGGG y-MM-dd – y-MM-dd"} + y{"GGGGG y-MM-dd – y-MM-dd"} } H{ H{"'zeg'. H–H"} } Hm{ - H{"'zeg'. H:mm – H:mm"} - m{"'zeg'. H:mm – H:mm"} + H{"'zeg'. H:mm – H:mm"} + m{"'zeg'. H:mm – H:mm"} } Hmv{ - H{"'zeg'. H:mm – H:mm v"} - m{"'zeg'. H:mm – H:mm v"} + H{"'zeg'. H:mm – H:mm v"} + m{"'zeg'. H:mm – H:mm v"} } Hv{ H{"H–H v"} @@ -737,14 +737,14 @@ dsb{ d{"E, d.M. – E, d.M."} } MMM{ - M{"LLL – LLL"} + M{"LLL – LLL"} } MMMEd{ - M{"E, d. MMM – E, d. MMM"} + M{"E, d. MMM – E, d. MMM"} d{"E, d. – E, d. MMM"} } MMMd{ - M{"d. MMM – d. MMM"} + M{"d. MMM – d. MMM"} d{"d. – d. MMM"} } Md{ @@ -756,57 +756,57 @@ dsb{ } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm – h:mm a"} - m{"h:mm – h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm – h:mm a"} + m{"h:mm – h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm – h:mm a v"} - m{"h:mm – h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm – h:mm a v"} + m{"h:mm – h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y"} } yM{ - M{"M.y – M.y"} - y{"M.y – M.y"} + M{"M.y – M.y"} + y{"M.y – M.y"} } yMEd{ - M{"E, d.M.y – E, d.M.y"} - d{"E, d.M.y – E, d.M.y"} - y{"E, d.M.y – E, d.M.y"} + M{"E, d.M.y – E, d.M.y"} + d{"E, d.M.y – E, d.M.y"} + y{"E, d.M.y – E, d.M.y"} } yMMM{ - M{"LLL – LLL y"} - y{"LLL y – LLL y"} + M{"LLL – LLL y"} + y{"LLL y – LLL y"} } yMMMEd{ - M{"E, d. MMM – E, d. MMM y"} + M{"E, d. MMM – E, d. MMM y"} d{"E, d. – E, d. MMM y"} - y{"E, d. MMM y – E, d. MMM y"} + y{"E, d. MMM y – E, d. MMM y"} } yMMMM{ - M{"LLLL – LLLL y"} - y{"LLLL y – LLLL y"} + M{"LLLL – LLLL y"} + y{"LLLL y – LLLL y"} } yMMMd{ - M{"d. MMM – d. MMM y"} + M{"d. MMM – d. MMM y"} d{"d. – d. MMM y"} - y{"d. MMM y – d. MMM y"} + y{"d. MMM y – d. MMM y"} } yMd{ - M{"d.M.y – d.M.y"} - d{"d.M.y – d.M.y"} - y{"d.M.y – d.M.y"} + M{"d.M.y – d.M.y"} + d{"d.M.y – d.M.y"} + y{"d.M.y – d.M.y"} } } monthNames{ diff --git a/icu4c/source/data/locales/dua.txt b/icu4c/source/data/locales/dua.txt index 8cb135b56629..c9560d426f2f 100644 --- a/icu4c/source/data/locales/dua.txt +++ b/icu4c/source/data/locales/dua.txt @@ -60,8 +60,8 @@ dua{ MMMd{"d MMM"} Md{"d/M"} d{"d"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"m:ss"} y{"y"} yM{"M/y"} @@ -119,8 +119,8 @@ dua{ MMMd{"d MMM"} Md{"d/M"} d{"d"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"m:ss"} y{"y"} yM{"M/y"} diff --git a/icu4c/source/data/locales/dyo.txt b/icu4c/source/data/locales/dyo.txt index 6c85ee169c7c..602064734df9 100644 --- a/icu4c/source/data/locales/dyo.txt +++ b/icu4c/source/data/locales/dyo.txt @@ -57,8 +57,8 @@ dyo{ MMMd{"d MMM"} Md{"d/M"} d{"d"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"m:ss"} y{"y"} yM{"M/y"} @@ -108,8 +108,8 @@ dyo{ MMMd{"d MMM"} Md{"d/M"} d{"d"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"m:ss"} y{"y"} yM{"M/y"} diff --git a/icu4c/source/data/locales/ebu.txt b/icu4c/source/data/locales/ebu.txt index 6e9d25afe20c..503200a4203c 100644 --- a/icu4c/source/data/locales/ebu.txt +++ b/icu4c/source/data/locales/ebu.txt @@ -51,7 +51,7 @@ ebu{ MMMd{"MMM d"} Md{"M/d"} d{"d"} - hm{"h:mm a"} + hm{"h:mm a"} ms{"mm:ss"} y{"y"} yM{"M/y"} @@ -111,7 +111,7 @@ ebu{ MMMd{"MMM d"} Md{"M/d"} d{"d"} - hm{"h:mm a"} + hm{"h:mm a"} ms{"mm:ss"} y{"y"} yM{"M/y"} diff --git a/icu4c/source/data/locales/ee.txt b/icu4c/source/data/locales/ee.txt index 6c7c9d712580..40191b8bce35 100644 --- a/icu4c/source/data/locales/ee.txt +++ b/icu4c/source/data/locales/ee.txt @@ -282,8 +282,8 @@ ee{ M{"'ɣleti' M 'lia' – 'ɣleti' M 'lia'"} } MEd{ - M{"E, M/d – E, M/d"} - d{"E, M/d – E, M/d"} + M{"E, M/d – E, M/d"} + d{"E, M/d – E, M/d"} } MMM{ M{"MMM–MMM"} @@ -297,65 +297,65 @@ ee{ d{"MMM d 'lia' – d 'lia'"} } Md{ - M{"M/d – M/d"} - d{"M/d – M/d"} + M{"M/d – M/d"} + d{"M/d – M/d"} } d{ d{"d–d"} } fallback{"{0} - {1}"} h{ - a{"a h – a h"} - h{"a h–h"} + a{"a h – a h"} + h{"a h–h"} } hm{ - a{"a 'ga' h:mm – a 'ga' h:mm"} + a{"a 'ga' h:mm – a 'ga' h:mm"} h{"a 'ga' h:mm - 'ga' h:mm"} m{"a 'ga' h:mm – 'ga' h:mm"} } hmv{ - a{"a 'ga' h:mm – a 'ga' h:mm v"} + a{"a 'ga' h:mm – a 'ga' h:mm v"} h{"a 'ga' h:mm–h:mm v"} - m{"a h:mm–h:mm v"} + m{"a h:mm–h:mm v"} } hv{ - a{"a h – a h v"} + a{"a h – a h v"} h{"a 'ga' h–h v"} } y{ y{"G y–y"} } yM{ - M{"M/y – M/y G"} - y{"M/y – M/y G"} + M{"M/y – M/y G"} + y{"M/y – M/y G"} } yMEd{ - M{"E, M/d/y – E, M/d/y G"} - d{"E, M/d/y – E, M/d/y G"} - y{"E, M/d/y – E, M/d/y G"} + M{"E, M/d/y – E, M/d/y G"} + d{"E, M/d/y – E, M/d/y G"} + y{"E, M/d/y – E, M/d/y G"} } yMMM{ M{"MMM–MMM y G"} - y{"MMM y – MMM y G"} + y{"MMM y – MMM y G"} } yMMMEd{ M{"E, MMM d 'lia' – E, MMM d 'lia', y G"} d{"E, MMM d 'lia' – E, MMM d 'lia', y G"} - y{"E, MMM d 'lia', y – E, MMM d 'lia', y G"} + y{"E, MMM d 'lia', y – E, MMM d 'lia', y G"} } yMMMM{ M{"MMMM–MMMM y G"} - y{"MMMM y – MMMM y G"} + y{"MMMM y – MMMM y G"} } yMMMd{ M{"MMM d 'lia' – MMM d 'lia', y G"} d{"MMM d 'lia' – d 'lia' , y G"} - y{"MMM d 'lia' , y – MMM d 'lia', y G"} + y{"MMM d 'lia' , y – MMM d 'lia', y G"} } yMd{ - M{"M/d/y – M/d/y G"} - d{"M/d/y – M/d/y G"} - y{"M/d/y – M/d/y G"} + M{"M/d/y – M/d/y G"} + d{"M/d/y – M/d/y G"} + y{"M/d/y – M/d/y G"} } } } @@ -630,8 +630,8 @@ ee{ M{"'ɣleti' M 'lia' – 'ɣleti' M 'lia'"} } MEd{ - M{"E, M/d – E, M/d"} - d{"E, M/d – E, M/d"} + M{"E, M/d – E, M/d"} + d{"E, M/d – E, M/d"} } MMM{ M{"MMM–MMM"} @@ -645,65 +645,65 @@ ee{ d{"MMM d 'lia' – d 'lia'"} } Md{ - M{"M/d – M/d"} - d{"M/d – M/d"} + M{"M/d – M/d"} + d{"M/d – M/d"} } d{ d{"d–d"} } fallback{"{0} - {1}"} h{ - a{"a h – a h"} - h{"a h–h"} + a{"a h – a h"} + h{"a h–h"} } hm{ - a{"a 'ga' h:mm – a 'ga' h:mm"} + a{"a 'ga' h:mm – a 'ga' h:mm"} h{"a 'ga' h:mm - 'ga' h:mm"} m{"a 'ga' h:mm – 'ga' h:mm"} } hmv{ - a{"a 'ga' h:mm – a 'ga' h:mm v"} + a{"a 'ga' h:mm – a 'ga' h:mm v"} h{"a 'ga' h:mm–h:mm v"} - m{"a h:mm–h:mm v"} + m{"a h:mm–h:mm v"} } hv{ - a{"a h – a h v"} + a{"a h – a h v"} h{"a 'ga' h–h v"} } y{ y{"y–y"} } yM{ - M{"M/y – M/y"} - y{"M/y – M/y"} + M{"M/y – M/y"} + y{"M/y – M/y"} } yMEd{ - M{"E, M/d/y – E, M/d/y"} - d{"E, M/d/y – E, M/d/y"} - y{"E, M/d/y – E, M/d/y"} + M{"E, M/d/y – E, M/d/y"} + d{"E, M/d/y – E, M/d/y"} + y{"E, M/d/y – E, M/d/y"} } yMMM{ M{"MMM–MMM y"} - y{"MMM y – MMM y"} + y{"MMM y – MMM y"} } yMMMEd{ M{"E, MMM d 'lia' – E, MMM d 'lia', y"} d{"E, MMM d 'lia' – E, MMM d 'lia', y"} - y{"E, MMM d 'lia', y – E, MMM d 'lia', y"} + y{"E, MMM d 'lia', y – E, MMM d 'lia', y"} } yMMMM{ M{"MMMM–MMMM y"} - y{"MMMM y – MMMM y"} + y{"MMMM y – MMMM y"} } yMMMd{ M{"MMM d 'lia' – MMM d 'lia', y"} d{"MMM d 'lia' – d 'lia' , y"} - y{"MMM d 'lia' , y – MMM d 'lia', y"} + y{"MMM d 'lia' , y – MMM d 'lia', y"} } yMd{ - M{"M/d/y – M/d/y"} - d{"M/d/y – M/d/y"} - y{"M/d/y – M/d/y"} + M{"M/d/y – M/d/y"} + d{"M/d/y – M/d/y"} + y{"M/d/y – M/d/y"} } } monthNames{ diff --git a/icu4c/source/data/locales/el.txt b/icu4c/source/data/locales/el.txt index acc26905951e..1fe7e4655a24 100644 --- a/icu4c/source/data/locales/el.txt +++ b/icu4c/source/data/locales/el.txt @@ -230,10 +230,10 @@ el{ calendar{ buddhist{ DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE, d MMMM y G", "d MMMM y G", "d MMM y G", @@ -335,22 +335,22 @@ el{ } fallback{"{0} - {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y G"} @@ -555,10 +555,10 @@ el{ } generic{ DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE, d MMMM y G", "d MMMM y G", "d MMM y G", @@ -589,8 +589,8 @@ el{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"E d"} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"y G"} GyMMM{"MMM y G"} GyMMMEd{"E, d MMM y G"} @@ -608,9 +608,9 @@ el{ MMMd{"d MMM"} Md{"d/M"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"mm:ss"} y{"y G"} yyyy{"y G"} @@ -713,22 +713,22 @@ el{ } fallback{"{0} - {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y G"} @@ -781,10 +781,10 @@ el{ "μμ", } DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE d MMMM y", "d MMMM y", "d MMM y", @@ -818,8 +818,8 @@ el{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"E d"} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"y G"} GyMMM{"LLL y G"} GyMMMEd{"E d MMM y G"} @@ -843,11 +843,11 @@ el{ MMMd{"d MMM"} Md{"d/M"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} - hmsv{"h:mm:ss a v"} - hmv{"h:mm a v"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} + hmsv{"h:mm:ss a v"} + hmv{"h:mm a v"} ms{"mm:ss"} y{"y"} yM{"M/y"} @@ -1097,22 +1097,22 @@ el{ } fallback{"{0} - {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y"} @@ -1518,10 +1518,10 @@ el{ } japanese{ DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE, d MMMM, y G", "d MMMM, y G", "d MMM, y G", diff --git a/icu4c/source/data/locales/en.txt b/icu4c/source/data/locales/en.txt index db3ee8e754f1..d59627cee973 100644 --- a/icu4c/source/data/locales/en.txt +++ b/icu4c/source/data/locales/en.txt @@ -20,7 +20,11 @@ en{ } patterns{ accountingFormat{"¤#,##0.00;(¤#,##0.00)"} + accountingFormat%alphaNextToNumber{"¤ #,##0.00;(¤ #,##0.00)"} + accountingFormat%noCurrency{"#,##0.00;(#,##0.00)"} currencyFormat{"¤#,##0.00"} + currencyFormat%alphaNextToNumber{"¤ #,##0.00"} + currencyFormat%noCurrency{"#,##0.00"} decimalFormat{"#,##0.###"} percentFormat{"#,##0%"} scientificFormat{"#E0"} @@ -128,6 +132,56 @@ en{ other{"¤000T"} } } + currencyFormat%alphaNextToNumber{ + 1000{ + one{"¤ 0K"} + other{"¤ 0K"} + } + 10000{ + one{"¤ 00K"} + other{"¤ 00K"} + } + 100000{ + one{"¤ 000K"} + other{"¤ 000K"} + } + 1000000{ + one{"¤ 0M"} + other{"¤ 0M"} + } + 10000000{ + one{"¤ 00M"} + other{"¤ 00M"} + } + 100000000{ + one{"¤ 000M"} + other{"¤ 000M"} + } + 1000000000{ + one{"¤ 0B"} + other{"¤ 0B"} + } + 10000000000{ + one{"¤ 00B"} + other{"¤ 00B"} + } + 100000000000{ + one{"¤ 000B"} + other{"¤ 000B"} + } + 1000000000000{ + one{"¤ 0T"} + other{"¤ 0T"} + } + 10000000000000{ + one{"¤ 00T"} + other{"¤ 00T"} + } + 100000000000000{ + one{"¤ 000T"} + other{"¤ 000T"} + } + } decimalFormat{ 1000{ one{"0K"} @@ -216,15 +270,21 @@ en{ } chinese{ DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE, MMMM d, r(U)", "MMMM d, r(U)", "MMM d, r", "M/d/r", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{1} 'at' {0}", "{1} 'at' {0}", "{1}, {0}", @@ -250,8 +310,8 @@ en{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"d E"} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"r(U)"} GyMMM{"MMM r"} GyMMMEd{"E, MMM d, r"} @@ -274,9 +334,9 @@ en{ UMMMd{"MMM d, U"} UMd{"M/d/U"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"mm:ss"} y{"r(U)"} yyyy{"r(U)"} @@ -314,106 +374,106 @@ en{ } intervalFormats{ Bh{ - B{"h B – h B"} - h{"h – h B"} + B{"h B – h B"} + h{"h – h B"} } Bhm{ - B{"h:mm B – h:mm B"} - h{"h:mm – h:mm B"} - m{"h:mm – h:mm B"} + B{"h:mm B – h:mm B"} + h{"h:mm – h:mm B"} + m{"h:mm – h:mm B"} } H{ - H{"HH – HH"} + H{"HH – HH"} } Hm{ - H{"HH:mm – HH:mm"} - m{"HH:mm – HH:mm"} + H{"HH:mm – HH:mm"} + m{"HH:mm – HH:mm"} } Hmv{ - H{"HH:mm – HH:mm v"} - m{"HH:mm – HH:mm v"} + H{"HH:mm – HH:mm v"} + m{"HH:mm – HH:mm v"} } Hv{ - H{"HH – HH v"} + H{"HH – HH v"} } M{ - M{"M – M"} + M{"M – M"} } MEd{ - M{"E, M/d – E, M/d"} - d{"E, M/d – E, M/d"} + M{"E, M/d – E, M/d"} + d{"E, M/d – E, M/d"} } MMM{ - M{"MMM – MMM"} + M{"MMM – MMM"} } MMMEd{ - M{"E, MMM d – E, MMM d"} - d{"E, MMM d – E, MMM d"} + M{"E, MMM d – E, MMM d"} + d{"E, MMM d – E, MMM d"} } MMMd{ - M{"MMM d – MMM d"} - d{"MMM d – d"} + M{"MMM d – MMM d"} + d{"MMM d – d"} } Md{ - M{"M/d – M/d"} - d{"M/d – M/d"} + M{"M/d – M/d"} + d{"M/d – M/d"} } d{ - d{"d – d"} + d{"d – d"} } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h – h a"} + a{"h a – h a"} + h{"h – h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm – h:mm a"} - m{"h:mm – h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm – h:mm a"} + m{"h:mm – h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm – h:mm a v"} - m{"h:mm – h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm – h:mm a v"} + m{"h:mm – h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h – h a v"} + a{"h a – h a v"} + h{"h – h a v"} } y{ - y{"U – U"} + y{"U – U"} } yM{ - M{"M/y – M/y"} - y{"M/y – M/y"} + M{"M/y – M/y"} + y{"M/y – M/y"} } yMEd{ - M{"E, M/d/y – E, M/d/y"} - d{"E, M/d/y – E, M/d/y"} - y{"E, M/d/y – E, M/d/y"} + M{"E, M/d/y – E, M/d/y"} + d{"E, M/d/y – E, M/d/y"} + y{"E, M/d/y – E, M/d/y"} } yMMM{ - M{"MMM – MMM U"} - y{"MMM U – MMM U"} + M{"MMM – MMM U"} + y{"MMM U – MMM U"} } yMMMEd{ - M{"E, MMM d – E, MMM d, U"} - d{"E, MMM d – E, MMM d, U"} - y{"E, MMM d, U – E, MMM d, U"} + M{"E, MMM d – E, MMM d, U"} + d{"E, MMM d – E, MMM d, U"} + y{"E, MMM d, U – E, MMM d, U"} } yMMMM{ - M{"MMMM – MMMM U"} - y{"MMMM U – MMMM U"} + M{"MMMM – MMMM U"} + y{"MMMM U – MMMM U"} } yMMMd{ - M{"MMM d – MMM d, U"} - d{"MMM d – d, U"} - y{"MMM d, U – MMM d, U"} + M{"MMM d – MMM d, U"} + d{"MMM d – d, U"} + y{"MMM d, U – MMM d, U"} } yMd{ - M{"M/d/y – M/d/y"} - d{"M/d/y – M/d/y"} - y{"M/d/y – M/d/y"} + M{"M/d/y – M/d/y"} + d{"M/d/y – M/d/y"} + y{"M/d/y – M/d/y"} } } monthNames{ @@ -451,15 +511,21 @@ en{ } generic{ DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE, MMMM d, y G", "MMMM d, y G", "MMM d, y G", "M/d/y GGGGG", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{1} 'at' {0}", "{1} 'at' {0}", "{1}, {0}", @@ -498,8 +564,8 @@ en{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"d E"} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"y G"} GyMMM{"MMM y G"} GyMMMEd{"E, MMM d, y G"} @@ -516,9 +582,9 @@ en{ MMMd{"MMM d"} Md{"M/d"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"mm:ss"} y{"y G"} yyyy{"y G"} @@ -534,144 +600,144 @@ en{ } intervalFormats{ Bh{ - B{"h B – h B"} - h{"h – h B"} + B{"h B – h B"} + h{"h – h B"} } Bhm{ - B{"h:mm B – h:mm B"} - h{"h:mm – h:mm B"} - m{"h:mm – h:mm B"} + B{"h:mm B – h:mm B"} + h{"h:mm – h:mm B"} + m{"h:mm – h:mm B"} } Gy{ - G{"y G – y G"} - y{"y – y G"} + G{"y G – y G"} + y{"y – y G"} } GyM{ - G{"M/y GGGGG – M/y GGGGG"} - M{"M/y – M/y GGGGG"} - y{"M/y – M/y GGGGG"} + G{"M/y GGGGG – M/y GGGGG"} + M{"M/y – M/y GGGGG"} + y{"M/y – M/y GGGGG"} } GyMEd{ - G{"E, M/d/y GGGGG – E, M/d/y GGGGG"} - M{"E, M/d/y – E, M/d/y GGGGG"} - d{"E, M/d/y – E, M/d/y GGGGG"} - y{"E, M/d/y – E, M/d/y GGGGG"} + G{"E, M/d/y GGGGG – E, M/d/y GGGGG"} + M{"E, M/d/y – E, M/d/y GGGGG"} + d{"E, M/d/y – E, M/d/y GGGGG"} + y{"E, M/d/y – E, M/d/y GGGGG"} } GyMMM{ - G{"MMM y G – MMM y G"} - M{"MMM – MMM y G"} - y{"MMM y – MMM y G"} + G{"MMM y G – MMM y G"} + M{"MMM – MMM y G"} + y{"MMM y – MMM y G"} } GyMMMEd{ - G{"E, MMM d, y G – E, MMM d, y G"} - M{"E, MMM d – E, MMM d, y G"} - d{"E, MMM d – E, MMM d, y G"} - y{"E, MMM d, y – E, MMM d, y G"} + G{"E, MMM d, y G – E, MMM d, y G"} + M{"E, MMM d – E, MMM d, y G"} + d{"E, MMM d – E, MMM d, y G"} + y{"E, MMM d, y – E, MMM d, y G"} } GyMMMd{ - G{"MMM d, y G – MMM d, y G"} - M{"MMM d – MMM d, y G"} - d{"MMM d – d, y G"} - y{"MMM d, y – MMM d, y G"} + G{"MMM d, y G – MMM d, y G"} + M{"MMM d – MMM d, y G"} + d{"MMM d – d, y G"} + y{"MMM d, y – MMM d, y G"} } GyMd{ - G{"M/d/y GGGGG – M/d/y GGGGG"} - M{"M/d/y – M/d/y GGGGG"} - d{"M/d/y – M/d/y GGGGG"} - y{"M/d/y – M/d/y GGGGG"} + G{"M/d/y GGGGG – M/d/y GGGGG"} + M{"M/d/y – M/d/y GGGGG"} + d{"M/d/y – M/d/y GGGGG"} + y{"M/d/y – M/d/y GGGGG"} } H{ - H{"HH – HH"} + H{"HH – HH"} } Hm{ - H{"HH:mm – HH:mm"} - m{"HH:mm – HH:mm"} + H{"HH:mm – HH:mm"} + m{"HH:mm – HH:mm"} } Hmv{ - H{"HH:mm – HH:mm v"} - m{"HH:mm – HH:mm v"} + H{"HH:mm – HH:mm v"} + m{"HH:mm – HH:mm v"} } Hv{ - H{"HH – HH v"} + H{"HH – HH v"} } M{ - M{"M – M"} + M{"M – M"} } MEd{ - M{"E, M/d – E, M/d"} - d{"E, M/d – E, M/d"} + M{"E, M/d – E, M/d"} + d{"E, M/d – E, M/d"} } MMM{ - M{"MMM – MMM"} + M{"MMM – MMM"} } MMMEd{ - M{"E, MMM d – E, MMM d"} - d{"E, MMM d – E, MMM d"} + M{"E, MMM d – E, MMM d"} + d{"E, MMM d – E, MMM d"} } MMMd{ - M{"MMM d – MMM d"} - d{"MMM d – d"} + M{"MMM d – MMM d"} + d{"MMM d – d"} } Md{ - M{"M/d – M/d"} - d{"M/d – M/d"} + M{"M/d – M/d"} + d{"M/d – M/d"} } d{ - d{"d – d"} + d{"d – d"} } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h – h a"} + a{"h a – h a"} + h{"h – h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm – h:mm a"} - m{"h:mm – h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm – h:mm a"} + m{"h:mm – h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm – h:mm a v"} - m{"h:mm – h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm – h:mm a v"} + m{"h:mm – h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h – h a v"} + a{"h a – h a v"} + h{"h – h a v"} } y{ - y{"y – y G"} + y{"y – y G"} } yM{ - M{"M/y – M/y GGGGG"} - y{"M/y – M/y GGGGG"} + M{"M/y – M/y GGGGG"} + y{"M/y – M/y GGGGG"} } yMEd{ - M{"E, M/d/y – E, M/d/y GGGGG"} - d{"E, M/d/y – E, M/d/y GGGGG"} - y{"E, M/d/y – E, M/d/y GGGGG"} + M{"E, M/d/y – E, M/d/y GGGGG"} + d{"E, M/d/y – E, M/d/y GGGGG"} + y{"E, M/d/y – E, M/d/y GGGGG"} } yMMM{ - M{"MMM – MMM y G"} - y{"MMM y – MMM y G"} + M{"MMM – MMM y G"} + y{"MMM y – MMM y G"} } yMMMEd{ - M{"E, MMM d – E, MMM d, y G"} - d{"E, MMM d – E, MMM d, y G"} - y{"E, MMM d, y – E, MMM d, y G"} + M{"E, MMM d – E, MMM d, y G"} + d{"E, MMM d – E, MMM d, y G"} + y{"E, MMM d, y – E, MMM d, y G"} } yMMMM{ - M{"MMMM – MMMM y G"} - y{"MMMM y – MMMM y G"} + M{"MMMM – MMMM y G"} + y{"MMMM y – MMMM y G"} } yMMMd{ - M{"MMM d – MMM d, y G"} - d{"MMM d – d, y G"} - y{"MMM d, y – MMM d, y G"} + M{"MMM d – MMM d, y G"} + d{"MMM d – d, y G"} + y{"MMM d, y – MMM d, y G"} } yMd{ - M{"M/d/y – M/d/y GGGGG"} - d{"M/d/y – M/d/y GGGGG"} - y{"M/d/y – M/d/y GGGGG"} + M{"M/d/y – M/d/y GGGGG"} + d{"M/d/y – M/d/y GGGGG"} + y{"M/d/y – M/d/y GGGGG"} } } } @@ -697,15 +763,21 @@ en{ "p", } DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE, MMMM d, y", "MMMM d, y", "MMM d, y", "M/d/yy", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{1} 'at' {0}", "{1} 'at' {0}", "{1}, {0}", @@ -744,13 +816,13 @@ en{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"d E"} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"y G"} GyMMM{"MMM y G"} GyMMMEd{"E, MMM d, y G"} GyMMMd{"MMM d, y G"} - GyMd{"M/d/y GGGGG"} + GyMd{"M/d/y G"} H{"HH"} Hm{"HH:mm"} Hms{"HH:mm:ss"} @@ -768,11 +840,11 @@ en{ MMMd{"MMM d"} Md{"M/d"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} - hmsv{"h:mm:ss a v"} - hmv{"h:mm a v"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} + hmsv{"h:mm:ss a v"} + hmv{"h:mm a v"} ms{"mm:ss"} y{"y"} yM{"M/y"} @@ -905,144 +977,144 @@ en{ } intervalFormats{ Bh{ - B{"h B – h B"} - h{"h – h B"} + B{"h B – h B"} + h{"h – h B"} } Bhm{ - B{"h:mm B – h:mm B"} - h{"h:mm – h:mm B"} - m{"h:mm – h:mm B"} + B{"h:mm B – h:mm B"} + h{"h:mm – h:mm B"} + m{"h:mm – h:mm B"} } Gy{ - G{"y G – y G"} - y{"y – y G"} + G{"y G – y G"} + y{"y – y G"} } GyM{ - G{"M/y GGGGG – M/y GGGGG"} - M{"M/y – M/y GGGGG"} - y{"M/y – M/y GGGGG"} + G{"M/y G – M/y G"} + M{"M/y – M/y G"} + y{"M/y – M/y G"} } GyMEd{ - G{"E, M/d/y GGGGG – E, M/d/y GGGGG"} - M{"E, M/d/y – E, M/d/y GGGGG"} - d{"E, M/d/y – E, M/d/y GGGGG"} - y{"E, M/d/y – E, M/d/y GGGGG"} + G{"E, M/d/y G – E, M/d/y G"} + M{"E, M/d/y – E, M/d/y G"} + d{"E, M/d/y – E, M/d/y G"} + y{"E, M/d/y – E, M/d/y G"} } GyMMM{ - G{"MMM y G – MMM y G"} - M{"MMM – MMM y G"} - y{"MMM y – MMM y G"} + G{"MMM y G – MMM y G"} + M{"MMM – MMM y G"} + y{"MMM y – MMM y G"} } GyMMMEd{ - G{"E, MMM d, y G – E, MMM d, y G"} - M{"E, MMM d – E, MMM d, y G"} - d{"E, MMM d – E, MMM d, y G"} - y{"E, MMM d, y – E, MMM d, y G"} + G{"E, MMM d, y G – E, MMM d, y G"} + M{"E, MMM d – E, MMM d, y G"} + d{"E, MMM d – E, MMM d, y G"} + y{"E, MMM d, y – E, MMM d, y G"} } GyMMMd{ - G{"MMM d, y G – MMM d, y G"} - M{"MMM d – MMM d, y G"} - d{"MMM d – d, y G"} - y{"MMM d, y – MMM d, y G"} + G{"MMM d, y G – MMM d, y G"} + M{"MMM d – MMM d, y G"} + d{"MMM d – d, y G"} + y{"MMM d, y – MMM d, y G"} } GyMd{ - G{"M/d/y GGGGG – M/d/y GGGGG"} - M{"M/d/y – M/d/y GGGGG"} - d{"M/d/y – M/d/y GGGGG"} - y{"M/d/y – M/d/y GGGGG"} + G{"M/d/y G – M/d/y G"} + M{"M/d/y – M/d/y G"} + d{"M/d/y – M/d/y G"} + y{"M/d/y – M/d/y G"} } H{ - H{"HH – HH"} + H{"HH – HH"} } Hm{ - H{"HH:mm – HH:mm"} - m{"HH:mm – HH:mm"} + H{"HH:mm – HH:mm"} + m{"HH:mm – HH:mm"} } Hmv{ - H{"HH:mm – HH:mm v"} - m{"HH:mm – HH:mm v"} + H{"HH:mm – HH:mm v"} + m{"HH:mm – HH:mm v"} } Hv{ - H{"HH – HH v"} + H{"HH – HH v"} } M{ - M{"M – M"} + M{"M – M"} } MEd{ - M{"E, M/d – E, M/d"} - d{"E, M/d – E, M/d"} + M{"E, M/d – E, M/d"} + d{"E, M/d – E, M/d"} } MMM{ - M{"MMM – MMM"} + M{"MMM – MMM"} } MMMEd{ - M{"E, MMM d – E, MMM d"} - d{"E, MMM d – E, MMM d"} + M{"E, MMM d – E, MMM d"} + d{"E, MMM d – E, MMM d"} } MMMd{ - M{"MMM d – MMM d"} - d{"MMM d – d"} + M{"MMM d – MMM d"} + d{"MMM d – d"} } Md{ - M{"M/d – M/d"} - d{"M/d – M/d"} + M{"M/d – M/d"} + d{"M/d – M/d"} } d{ - d{"d – d"} + d{"d – d"} } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h – h a"} + a{"h a – h a"} + h{"h – h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm – h:mm a"} - m{"h:mm – h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm – h:mm a"} + m{"h:mm – h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm – h:mm a v"} - m{"h:mm – h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm – h:mm a v"} + m{"h:mm – h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h – h a v"} + a{"h a – h a v"} + h{"h – h a v"} } y{ - y{"y – y"} + y{"y – y"} } yM{ - M{"M/y – M/y"} - y{"M/y – M/y"} + M{"M/y – M/y"} + y{"M/y – M/y"} } yMEd{ - M{"E, M/d/y – E, M/d/y"} - d{"E, M/d/y – E, M/d/y"} - y{"E, M/d/y – E, M/d/y"} + M{"E, M/d/y – E, M/d/y"} + d{"E, M/d/y – E, M/d/y"} + y{"E, M/d/y – E, M/d/y"} } yMMM{ - M{"MMM – MMM y"} - y{"MMM y – MMM y"} + M{"MMM – MMM y"} + y{"MMM y – MMM y"} } yMMMEd{ - M{"E, MMM d – E, MMM d, y"} - d{"E, MMM d – E, MMM d, y"} - y{"E, MMM d, y – E, MMM d, y"} + M{"E, MMM d – E, MMM d, y"} + d{"E, MMM d – E, MMM d, y"} + y{"E, MMM d, y – E, MMM d, y"} } yMMMM{ - M{"MMMM – MMMM y"} - y{"MMMM y – MMMM y"} + M{"MMMM – MMMM y"} + y{"MMMM y – MMMM y"} } yMMMd{ - M{"MMM d – MMM d, y"} - d{"MMM d – d, y"} - y{"MMM d, y – MMM d, y"} + M{"MMM d – MMM d, y"} + d{"MMM d – d, y"} + y{"MMM d, y – MMM d, y"} } yMd{ - M{"M/d/y – M/d/y"} - d{"M/d/y – M/d/y"} - y{"M/d/y – M/d/y"} + M{"M/d/y – M/d/y"} + d{"M/d/y – M/d/y"} + y{"M/d/y – M/d/y"} } } monthNames{ @@ -1120,17 +1192,17 @@ en{ } hebrew{ DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE, d MMMM y", "d MMMM y", "d MMM y", "d MMM y", "{1}, {0}", - "{1} 'at' {0}", - "{1} 'at' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } @@ -1149,7 +1221,7 @@ en{ GyMMM{"MMM y G"} GyMMMEd{"E, d MMM y G"} GyMMMd{"d MMM y G"} - GyMd{"d MMM y GGGGG"} + GyMd{"d MMM y G"} M{"L"} MEd{"E, d MMM"} MMM{"LLL"} @@ -1175,61 +1247,61 @@ en{ } intervalFormats{ M{ - M{"MMM – MMM"} + M{"MMM – MMM"} } MEd{ - M{"E, d MMM – E, d MMM"} - d{"E, d MMM – E, d MMM"} + M{"E, d MMM – E, d MMM"} + d{"E, d MMM – E, d MMM"} } MMM{ - M{"MMM – MMM"} + M{"MMM – MMM"} } MMMEd{ - M{"E, d MMM – E, d MMM"} - d{"E, d MMM – E, d MMM"} + M{"E, d MMM – E, d MMM"} + d{"E, d MMM – E, d MMM"} } MMMd{ - M{"d MMM – d MMM"} - d{"d – d MMM"} + M{"d MMM – d MMM"} + d{"d – d MMM"} } Md{ - M{"d MMM – d MMM"} - d{"d – d MMM"} + M{"d MMM – d MMM"} + d{"d – d MMM"} } y{ - y{"y – y G"} + y{"y – y G"} } yM{ - M{"MMM – MMM y"} - y{"MMM y – MMM y"} + M{"MMM – MMM y"} + y{"MMM y – MMM y"} } yMEd{ - M{"E, d MMM – E, d MMM y"} - d{"E, d MMM – E, d MMM y"} - y{"E, d MMM y – E, d MMM y"} + M{"E, d MMM – E, d MMM y"} + d{"E, d MMM – E, d MMM y"} + y{"E, d MMM y – E, d MMM y"} } yMMM{ - M{"MMM – MMM y"} - y{"MMM y – MMM y"} + M{"MMM – MMM y"} + y{"MMM y – MMM y"} } yMMMEd{ - M{"E, d MMM – E, d MMM y"} - d{"E, d MMM – E, d MMM y"} - y{"E, d MMM y – E, d MMM y"} + M{"E, d MMM – E, d MMM y"} + d{"E, d MMM – E, d MMM y"} + y{"E, d MMM y – E, d MMM y"} } yMMMM{ - M{"MMMM – MMMM y"} - y{"MMMM y – MMMM y"} + M{"MMMM – MMMM y"} + y{"MMMM y – MMMM y"} } yMMMd{ - M{"d MMM – d MMM y"} - d{"d – d MMM y"} - y{"d MMM y – d MMM y"} + M{"d MMM – d MMM y"} + d{"d – d MMM y"} + y{"d MMM y – d MMM y"} } yMd{ - M{"d MMM – d MMM y"} - d{"d – d MMM y"} - y{"d MMM y – d MMM y"} + M{"d MMM – d MMM y"} + d{"d – d MMM y"} + y{"d MMM y – d MMM y"} } } } @@ -1242,17 +1314,17 @@ en{ } japanese{ DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE, MMMM d, y G", "MMMM d, y G", "MMM d, y G", "M/d/y GGGGG", "{1}, {0}", - "{1} 'at' {0}", - "{1} 'at' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } @@ -1411,6 +1483,19 @@ en{ } } } + day-narrow{ + dn{"day"} + relativeTime{ + future{ + one{"in {0}d"} + other{"in {0}d"} + } + past{ + one{"{0}d ago"} + other{"{0}d ago"} + } + } + } day-short{ dn{"day"} relativeTime{ @@ -1511,6 +1596,19 @@ en{ } } } + hour-narrow{ + dn{"hr"} + relativeTime{ + future{ + one{"in {0}h"} + other{"in {0}h"} + } + past{ + one{"{0}h ago"} + other{"{0}h ago"} + } + } + } hour-short{ dn{"hr."} relativeTime{ @@ -1540,6 +1638,19 @@ en{ } } } + minute-narrow{ + dn{"min"} + relativeTime{ + future{ + one{"in {0}m"} + other{"in {0}m"} + } + past{ + one{"{0}m ago"} + other{"{0}m ago"} + } + } + } minute-short{ dn{"min."} relativeTime{ @@ -1622,6 +1733,19 @@ en{ } } } + month-narrow{ + dn{"mo"} + relativeTime{ + future{ + one{"in {0}mo"} + other{"in {0}mo"} + } + past{ + one{"{0}mo ago"} + other{"{0}mo ago"} + } + } + } month-short{ dn{"mo."} relative{ @@ -1658,6 +1782,19 @@ en{ } } } + quarter-narrow{ + dn{"qtr"} + relativeTime{ + future{ + one{"in {0}q"} + other{"in {0}q"} + } + past{ + one{"{0}q ago"} + other{"{0}q ago"} + } + } + } quarter-short{ dn{"qtr."} relative{ @@ -1743,6 +1880,19 @@ en{ } } } + second-narrow{ + dn{"sec"} + relativeTime{ + future{ + one{"in {0}s"} + other{"in {0}s"} + } + past{ + one{"{0}s ago"} + other{"{0}s ago"} + } + } + } second-short{ dn{"sec."} relative{ @@ -1982,6 +2132,19 @@ en{ } } } + week-narrow{ + dn{"wk"} + relativeTime{ + future{ + one{"in {0}w"} + other{"in {0}w"} + } + past{ + one{"{0}w ago"} + other{"{0}w ago"} + } + } + } week-short{ dn{"wk."} relative{ @@ -2036,6 +2199,19 @@ en{ } } } + year-narrow{ + dn{"yr"} + relativeTime{ + future{ + one{"in {0}y"} + other{"in {0}y"} + } + past{ + one{"{0}y ago"} + other{"{0}y ago"} + } + } + } year-short{ dn{"yr."} relative{ diff --git a/icu4c/source/data/locales/en_001.txt b/icu4c/source/data/locales/en_001.txt index dbd078db8162..57b8474e28f7 100644 --- a/icu4c/source/data/locales/en_001.txt +++ b/icu4c/source/data/locales/en_001.txt @@ -5,17 +5,17 @@ en_001{ calendar{ chinese{ DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE, d MMMM r(U)", "d MMMM r(U)", "d MMM r", "dd/MM/r", "{1}, {0}", - "{1} 'at' {0}", - "{1} 'at' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } @@ -53,60 +53,60 @@ en_001{ } intervalFormats{ MEd{ - M{"E dd/MM – E dd/MM"} - d{"E dd/MM – E dd/MM"} + M{"E dd/MM – E dd/MM"} + d{"E dd/MM – E dd/MM"} } MMMEd{ - M{"E d MMM – E d MMM"} - d{"E d – E d MMM"} + M{"E d MMM – E d MMM"} + d{"E d – E d MMM"} } MMMd{ - M{"d MMM – d MMM"} - d{"d – d MMM"} + M{"d MMM – d MMM"} + d{"d – d MMM"} } Md{ - M{"dd/MM – dd/MM"} - d{"dd/MM – dd/MM"} + M{"dd/MM – dd/MM"} + d{"dd/MM – dd/MM"} } yM{ - M{"MM/y – MM/y"} - y{"MM/y – MM/y"} + M{"MM/y – MM/y"} + y{"MM/y – MM/y"} } yMEd{ - M{"E, dd/MM/y – E, dd/MM/y"} - d{"E, dd/MM/y – E, dd/MM/y"} - y{"E, dd/MM/y – E, dd/MM/y"} + M{"E, dd/MM/y – E, dd/MM/y"} + d{"E, dd/MM/y – E, dd/MM/y"} + y{"E, dd/MM/y – E, dd/MM/y"} } yMMMEd{ - M{"E, d MMM – E, d MMM U"} - d{"E, d – E, d MMM U"} - y{"E, d MMM U – E, d MMM U"} + M{"E, d MMM – E, d MMM U"} + d{"E, d – E, d MMM U"} + y{"E, d MMM U – E, d MMM U"} } yMMMd{ - M{"d MMM – d MMM U"} - d{"d – d MMM U"} - y{"d MMM U – d MMM U"} + M{"d MMM – d MMM U"} + d{"d – d MMM U"} + y{"d MMM U – d MMM U"} } yMd{ - M{"dd/MM/y – dd/MM/y"} - d{"dd/MM/y – dd/MM/y"} - y{"dd/MM/y – dd/MM/y"} + M{"dd/MM/y – dd/MM/y"} + d{"dd/MM/y – dd/MM/y"} + y{"dd/MM/y – dd/MM/y"} } } } generic{ DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE, d MMMM y G", "d MMMM y G", "d MMM y G", "dd/MM/y GGGGG", "{1}, {0}", - "{1} 'at' {0}", - "{1} 'at' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } @@ -126,8 +126,8 @@ en_001{ EHm{"E, HH:mm"} EHms{"E, HH:mm:ss"} Ed{"E d"} - Ehm{"E, h:mm a"} - Ehms{"E, h:mm:ss a"} + Ehm{"E, h:mm a"} + Ehms{"E, h:mm:ss a"} GyMMMEd{"E, d MMM y G"} GyMMMd{"d MMM y G"} GyMd{"dd/MM/y GGGGG"} @@ -148,47 +148,47 @@ en_001{ y{"y–y G"} } GyMEd{ - G{"E, dd/MM/y GGGGG – E, dd/MM/y GGGGG"} - M{"E, dd/MM/y – E, dd/MM/y GGGGG"} - d{"E, dd/MM/y – E, dd/MM/y GGGGG"} - y{"E, dd/MM/y – E, dd/MM/y GGGGG"} + G{"E, dd/MM/y GGGGG – E, dd/MM/y GGGGG"} + M{"E, dd/MM/y – E, dd/MM/y GGGGG"} + d{"E, dd/MM/y – E, dd/MM/y GGGGG"} + y{"E, dd/MM/y – E, dd/MM/y GGGGG"} } GyMMMEd{ - G{"E, d MMM y G – E, d MMM y G"} - M{"E, d MMM – E, d MMM y G"} - d{"E, d MMM – E, d MMM y G"} - y{"E, d MMM y – E, d MMM y G"} + G{"E, d MMM y G – E, d MMM y G"} + M{"E, d MMM – E, d MMM y G"} + d{"E, d MMM – E, d MMM y G"} + y{"E, d MMM y – E, d MMM y G"} } GyMMMd{ - G{"d MMM y G – d MMM y G"} - M{"d MMM – d MMM y G"} + G{"d MMM y G – d MMM y G"} + M{"d MMM – d MMM y G"} d{"d–d MMM y G"} - y{"d MMM y – d MMM y G"} + y{"d MMM y – d MMM y G"} } GyMd{ - G{"dd/MM/y GGGGG – dd/MM/y GGGGG"} - M{"dd/MM/y – dd/MM/y GGGGG"} - d{"dd/MM/y – dd/MM/y GGGGG"} - y{"dd/MM/y – dd/MM/y GGGGG"} + G{"dd/MM/y GGGGG – dd/MM/y GGGGG"} + M{"dd/MM/y – dd/MM/y GGGGG"} + d{"dd/MM/y – dd/MM/y GGGGG"} + y{"dd/MM/y – dd/MM/y GGGGG"} } M{ M{"M–M"} } MEd{ - M{"E dd/MM – E dd/MM"} - d{"E dd/MM – E dd/MM"} + M{"E dd/MM – E dd/MM"} + d{"E dd/MM – E dd/MM"} } MMMEd{ - M{"E d MMM – E d MMM"} - d{"E d – E d MMM"} + M{"E d MMM – E d MMM"} + d{"E d – E d MMM"} } MMMd{ - M{"d MMM – d MMM"} + M{"d MMM – d MMM"} d{"d–d MMM"} } Md{ - M{"dd/MM – dd/MM"} - d{"dd/MM – dd/MM"} + M{"dd/MM – dd/MM"} + d{"dd/MM – dd/MM"} } d{ d{"d–d"} @@ -197,28 +197,28 @@ en_001{ y{"y–y G"} } yM{ - M{"MM/y – MM/y GGGGG"} - y{"MM/y – MM/y GGGGG"} + M{"MM/y – MM/y GGGGG"} + y{"MM/y – MM/y GGGGG"} } yMEd{ - M{"E, dd/MM/y – E, dd/MM/y GGGGG"} - d{"E, dd/MM/y – E, dd/MM/y GGGGG"} - y{"E, dd/MM/y – E, dd/MM/y GGGGG"} + M{"E, dd/MM/y – E, dd/MM/y GGGGG"} + d{"E, dd/MM/y – E, dd/MM/y GGGGG"} + y{"E, dd/MM/y – E, dd/MM/y GGGGG"} } yMMMEd{ - M{"E, d MMM – E, d MMM y G"} - d{"E, d – E, d MMM y G"} - y{"E, d MMM y – E, d MMM y G"} + M{"E, d MMM – E, d MMM y G"} + d{"E, d – E, d MMM y G"} + y{"E, d MMM y – E, d MMM y G"} } yMMMd{ - M{"d MMM – d MMM y G"} + M{"d MMM – d MMM y G"} d{"d–d MMM y G"} - y{"d MMM y – d MMM y G"} + y{"d MMM y – d MMM y G"} } yMd{ - M{"dd/MM/y – dd/MM/y GGGGG"} - d{"dd/MM/y – dd/MM/y GGGGG"} - y{"dd/MM/y – dd/MM/y GGGGG"} + M{"dd/MM/y – dd/MM/y GGGGG"} + d{"dd/MM/y – dd/MM/y GGGGG"} + y{"dd/MM/y – dd/MM/y GGGGG"} } } } @@ -232,17 +232,17 @@ en_001{ "pm", } DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE, d MMMM y", "d MMMM y", "d MMM y", "dd/MM/y", "{1}, {0}", - "{1} 'at' {0}", - "{1} 'at' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } @@ -262,7 +262,7 @@ en_001{ Ed{"E d"} GyMMMEd{"E, d MMM y G"} GyMMMd{"d MMM y G"} - GyMd{"d/M/y GGGGG"} + GyMd{"d/M/y G"} MEd{"E, dd/MM"} MMMEd{"E, d MMM"} MMMMd{"d MMMM"} @@ -292,28 +292,28 @@ en_001{ } intervalFormats{ GyMEd{ - G{"E, dd/MM/y GGGGG – E, dd/MM/y GGGGG"} - M{"E, dd/MM/y – E, dd/MM/y GGGGG"} - d{"E, dd/MM/y – E, dd/MM/y GGGGG"} - y{"E, dd/MM/y – E, dd/MM/y GGGGG"} + G{"E, dd/MM/y G – E, dd/MM/y G"} + M{"E, dd/MM/y – E, dd/MM/y G"} + d{"E, dd/MM/y – E, dd/MM/y G"} + y{"E, dd/MM/y – E, dd/MM/y G"} } GyMMMEd{ - G{"E, d MMM y G – E, d MMM y G"} - M{"E, d MMM – E, d MMM y G"} - d{"E, d MMM – E, d MMM y G"} - y{"E, d MMM y – E, d MMM y G"} + G{"E, d MMM y G – E, d MMM y G"} + M{"E, d MMM – E, d MMM y G"} + d{"E, d MMM – E, d MMM y G"} + y{"E, d MMM y – E, d MMM y G"} } GyMMMd{ - G{"d MMM y G – d MMM y G"} - M{"d MMM – d MMM y G"} - d{"d – d MMM y G"} - y{"d MMM y – d MMM y G"} + G{"d MMM y G – d MMM y G"} + M{"d MMM – d MMM y G"} + d{"d – d MMM y G"} + y{"d MMM y – d MMM y G"} } GyMd{ - G{"dd/MM/y GGGGG – dd/MM/y GGGGG"} - M{"dd/MM/y – dd/MM/y GGGGG"} - d{"dd/MM/y – dd/MM/y GGGGG"} - y{"dd/MM/y – dd/MM/y GGGGG"} + G{"dd/MM/y G – dd/MM/y G"} + M{"dd/MM/y – dd/MM/y G"} + d{"dd/MM/y – dd/MM/y G"} + y{"dd/MM/y – dd/MM/y G"} } H{ H{"HH–HH"} @@ -333,56 +333,56 @@ en_001{ M{"M–M"} } MEd{ - M{"E dd/MM – E dd/MM"} - d{"E dd/MM – E dd/MM"} + M{"E dd/MM – E dd/MM"} + d{"E dd/MM – E dd/MM"} } MMMEd{ - M{"E d MMM – E d MMM"} - d{"E d – E d MMM"} + M{"E d MMM – E d MMM"} + d{"E d – E d MMM"} } MMMd{ - M{"d MMM – d MMM"} + M{"d MMM – d MMM"} d{"d–d MMM"} } Md{ - M{"dd/MM – dd/MM"} - d{"dd/MM – dd/MM"} + M{"dd/MM – dd/MM"} + d{"dd/MM – dd/MM"} } d{ d{"d–d"} } h{ - h{"h–h a"} + h{"h–h a"} } hv{ - h{"h–h a v"} + h{"h–h a v"} } y{ y{"y–y"} } yM{ - M{"MM/y – MM/y"} - y{"MM/y – MM/y"} + M{"MM/y – MM/y"} + y{"MM/y – MM/y"} } yMEd{ - M{"E, dd/MM/y – E, dd/MM/y"} - d{"E, dd/MM/y – E, dd/MM/y"} - y{"E, dd/MM/y – E, dd/MM/y"} + M{"E, dd/MM/y – E, dd/MM/y"} + d{"E, dd/MM/y – E, dd/MM/y"} + y{"E, dd/MM/y – E, dd/MM/y"} } yMMMEd{ - M{"E, d MMM – E, d MMM y"} - d{"E, d – E, d MMM y"} - y{"E, d MMM y – E, d MMM y"} + M{"E, d MMM – E, d MMM y"} + d{"E, d – E, d MMM y"} + y{"E, d MMM y – E, d MMM y"} } yMMMd{ - M{"d MMM – d MMM y"} + M{"d MMM – d MMM y"} d{"d–d MMM y"} - y{"d MMM y – d MMM y"} + y{"d MMM y – d MMM y"} } yMd{ - M{"dd/MM/y – dd/MM/y"} - d{"dd/MM/y – dd/MM/y"} - y{"dd/MM/y – dd/MM/y"} + M{"dd/MM/y – dd/MM/y"} + d{"dd/MM/y – dd/MM/y"} + y{"dd/MM/y – dd/MM/y"} } } monthNames{ @@ -489,7 +489,6 @@ en_001{ } } minute-narrow{ - dn{"min"} relativeTime{ future{ one{"in {0} min"} @@ -532,7 +531,6 @@ en_001{ } } month-narrow{ - dn{"mo"} relative{ "-1"{"last mo"} "0"{"this mo"} @@ -568,7 +566,6 @@ en_001{ } } quarter-narrow{ - dn{"qtr"} relativeTime{ future{ one{"in {0} qtr"} @@ -704,7 +701,6 @@ en_001{ } } week-narrow{ - dn{"wk"} relative{ "-1"{"last wk"} "0"{"this wk"} diff --git a/icu4c/source/data/locales/en_150.txt b/icu4c/source/data/locales/en_150.txt index 29a68e0fa4e2..d09773014a35 100644 --- a/icu4c/source/data/locales/en_150.txt +++ b/icu4c/source/data/locales/en_150.txt @@ -23,8 +23,8 @@ en_150{ "d MMM y", "dd/MM/y", "{1}, {0}", - "{1} 'at' {0}", - "{1} 'at' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } diff --git a/icu4c/source/data/locales/en_AE.txt b/icu4c/source/data/locales/en_AE.txt index 922076d124b5..4927152e460d 100644 --- a/icu4c/source/data/locales/en_AE.txt +++ b/icu4c/source/data/locales/en_AE.txt @@ -5,17 +5,17 @@ en_AE{ calendar{ chinese{ DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE, d MMMM r(U)", "d MMMM r(U)", "d MMM r", "dd/MM/r", "{1}, {0}", - "{1} 'at' {0}", - "{1} 'at' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } @@ -50,60 +50,60 @@ en_AE{ } intervalFormats{ MEd{ - M{"E dd/MM – E dd/MM"} - d{"E dd/MM – E dd/MM"} + M{"E dd/MM – E dd/MM"} + d{"E dd/MM – E dd/MM"} } MMMEd{ - M{"E d MMM – E d MMM"} - d{"E d – E d MMM"} + M{"E d MMM – E d MMM"} + d{"E d – E d MMM"} } MMMd{ - M{"d MMM – d MMM"} - d{"d – d MMM"} + M{"d MMM – d MMM"} + d{"d – d MMM"} } Md{ - M{"dd/MM – dd/MM"} - d{"dd/MM – dd/MM"} + M{"dd/MM – dd/MM"} + d{"dd/MM – dd/MM"} } yM{ - M{"MM/y – MM/y"} - y{"MM/y – MM/y"} + M{"MM/y – MM/y"} + y{"MM/y – MM/y"} } yMEd{ - M{"E, dd/MM/y – E, dd/MM/y"} - d{"E, dd/MM/y – E, dd/MM/y"} - y{"E, dd/MM/y – E, dd/MM/y"} + M{"E, dd/MM/y – E, dd/MM/y"} + d{"E, dd/MM/y – E, dd/MM/y"} + y{"E, dd/MM/y – E, dd/MM/y"} } yMMMEd{ - M{"E, d MMM – E, d MMM U"} - d{"E, d – E, d MMM U"} - y{"E, d MMM U – E, d MMM U"} + M{"E, d MMM – E, d MMM U"} + d{"E, d – E, d MMM U"} + y{"E, d MMM U – E, d MMM U"} } yMMMd{ - M{"d MMM – d MMM U"} - d{"d – d MMM U"} - y{"d MMM U – d MMM U"} + M{"d MMM – d MMM U"} + d{"d – d MMM U"} + y{"d MMM U – d MMM U"} } yMd{ - M{"dd/MM/y – dd/MM/y"} - d{"dd/MM/y – dd/MM/y"} - y{"dd/MM/y – dd/MM/y"} + M{"dd/MM/y – dd/MM/y"} + d{"dd/MM/y – dd/MM/y"} + y{"dd/MM/y – dd/MM/y"} } } } generic{ DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE, d MMMM y G", "d MMMM y G", "d MMM y G", "dd/MM/y GGGGG", "{1}, {0}", - "{1} 'at' {0}", - "{1} 'at' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } @@ -123,8 +123,8 @@ en_AE{ EHm{"E, HH:mm"} EHms{"E, HH:mm:ss"} Ed{"E d"} - Ehm{"E, h:mm a"} - Ehms{"E, h:mm:ss a"} + Ehm{"E, h:mm a"} + Ehms{"E, h:mm:ss a"} GyMMMEd{"E, d MMM y G"} GyMMMd{"d MMM y G"} M{"LL"} @@ -141,60 +141,60 @@ en_AE{ } intervalFormats{ MEd{ - M{"E dd/MM – E dd/MM"} - d{"E dd/MM – E dd/MM"} + M{"E dd/MM – E dd/MM"} + d{"E dd/MM – E dd/MM"} } MMMEd{ - M{"E d MMM – E d MMM"} - d{"E d – E d MMM"} + M{"E d MMM – E d MMM"} + d{"E d – E d MMM"} } MMMd{ - M{"d MMM – d MMM"} - d{"d – d MMM"} + M{"d MMM – d MMM"} + d{"d – d MMM"} } Md{ - M{"dd/MM – dd/MM"} - d{"dd/MM – dd/MM"} + M{"dd/MM – dd/MM"} + d{"dd/MM – dd/MM"} } yM{ - M{"MM/y – MM/y GGGGG"} - y{"MM/y – MM/y GGGGG"} + M{"MM/y – MM/y GGGGG"} + y{"MM/y – MM/y GGGGG"} } yMEd{ - M{"E, dd/MM/y – E, dd/MM/y GGGGG"} - d{"E, dd/MM/y – E, dd/MM/y GGGGG"} - y{"E, dd/MM/y – E, dd/MM/y GGGGG"} + M{"E, dd/MM/y – E, dd/MM/y GGGGG"} + d{"E, dd/MM/y – E, dd/MM/y GGGGG"} + y{"E, dd/MM/y – E, dd/MM/y GGGGG"} } yMMMEd{ - M{"E, d MMM – E, d MMM y G"} - d{"E, d – E, d MMM y G"} - y{"E, d MMM y – E, d MMM y G"} + M{"E, d MMM – E, d MMM y G"} + d{"E, d – E, d MMM y G"} + y{"E, d MMM y – E, d MMM y G"} } yMMMd{ - M{"d MMM – d MMM y G"} - d{"d – d MMM y G"} - y{"d MMM y – d MMM y G"} + M{"d MMM – d MMM y G"} + d{"d – d MMM y G"} + y{"d MMM y – d MMM y G"} } yMd{ - M{"dd/MM/y – dd/MM/y GGGGG"} - d{"dd/MM/y – dd/MM/y GGGGG"} - y{"dd/MM/y – dd/MM/y GGGGG"} + M{"dd/MM/y – dd/MM/y GGGGG"} + d{"dd/MM/y – dd/MM/y GGGGG"} + y{"dd/MM/y – dd/MM/y GGGGG"} } } } gregorian{ DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE, d MMMM y", "d MMMM y", "d MMM y", "dd/MM/y", "{1}, {0}", - "{1} 'at' {0}", - "{1} 'at' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } @@ -228,44 +228,44 @@ en_AE{ } intervalFormats{ MEd{ - M{"E dd/MM – E dd/MM"} - d{"E dd/MM – E dd/MM"} + M{"E dd/MM – E dd/MM"} + d{"E dd/MM – E dd/MM"} } MMMEd{ - M{"E d MMM – E d MMM"} - d{"E d – E d MMM"} + M{"E d MMM – E d MMM"} + d{"E d – E d MMM"} } MMMd{ - M{"d MMM – d MMM"} - d{"d – d MMM"} + M{"d MMM – d MMM"} + d{"d – d MMM"} } Md{ - M{"dd/MM – dd/MM"} - d{"dd/MM – dd/MM"} + M{"dd/MM – dd/MM"} + d{"dd/MM – dd/MM"} } yM{ - M{"MM/y – MM/y"} - y{"MM/y – MM/y"} + M{"MM/y – MM/y"} + y{"MM/y – MM/y"} } yMEd{ - M{"E, dd/MM/y – E, dd/MM/y"} - d{"E, dd/MM/y – E, dd/MM/y"} - y{"E, dd/MM/y – E, dd/MM/y"} + M{"E, dd/MM/y – E, dd/MM/y"} + d{"E, dd/MM/y – E, dd/MM/y"} + y{"E, dd/MM/y – E, dd/MM/y"} } yMMMEd{ - M{"E, d MMM – E, d MMM y"} - d{"E, d – E, d MMM y"} - y{"E, d MMM y – E, d MMM y"} + M{"E, d MMM – E, d MMM y"} + d{"E, d – E, d MMM y"} + y{"E, d MMM y – E, d MMM y"} } yMMMd{ - M{"d MMM – d MMM y"} - d{"d – d MMM y"} - y{"d MMM y – d MMM y"} + M{"d MMM – d MMM y"} + d{"d – d MMM y"} + y{"d MMM y – d MMM y"} } yMd{ - M{"dd/MM/y – dd/MM/y"} - d{"dd/MM/y – dd/MM/y"} - y{"dd/MM/y – dd/MM/y"} + M{"dd/MM/y – dd/MM/y"} + d{"dd/MM/y – dd/MM/y"} + y{"dd/MM/y – dd/MM/y"} } } } diff --git a/icu4c/source/data/locales/en_AI.txt b/icu4c/source/data/locales/en_AI.txt index c06b6fe6797f..f27e3decc5b8 100644 --- a/icu4c/source/data/locales/en_AI.txt +++ b/icu4c/source/data/locales/en_AI.txt @@ -15,8 +15,8 @@ en_AI{ "d MMM y", "dd/MM/y", "{1}, {0}", - "{1} 'at' {0}", - "{1} 'at' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } diff --git a/icu4c/source/data/locales/en_AU.txt b/icu4c/source/data/locales/en_AU.txt index d35653eb8c6b..e11dc265ef26 100644 --- a/icu4c/source/data/locales/en_AU.txt +++ b/icu4c/source/data/locales/en_AU.txt @@ -85,27 +85,27 @@ en_AU{ } intervalFormats{ GyMEd{ - G{"E dd/MM/y GGGGG – E dd/MM/y GGGGG"} - M{"E dd/MM/y – E dd/MM/y GGGGG"} - d{"E dd/MM/y – E dd/MM/y GGGGG"} - y{"E dd/MM/y – E dd/MM/y GGGGG"} + G{"E dd/MM/y GGGGG – E dd/MM/y GGGGG"} + M{"E dd/MM/y – E dd/MM/y GGGGG"} + d{"E dd/MM/y – E dd/MM/y GGGGG"} + y{"E dd/MM/y – E dd/MM/y GGGGG"} } GyMMMEd{ - G{"E d MMM y G – E d MMM y G"} - M{"E d MMM – E d MMM y G"} - d{"E d MMM – E d MMM y G"} - y{"E d MMM y – E d MMM y G"} + G{"E d MMM y G – E d MMM y G"} + M{"E d MMM – E d MMM y G"} + d{"E d MMM – E d MMM y G"} + y{"E d MMM y – E d MMM y G"} } MEd{ - M{"E, d/M – E, d/M"} - d{"E, d/M – E, d/M"} + M{"E, d/M – E, d/M"} + d{"E, d/M – E, d/M"} } MMMEd{ - M{"E, d MMM – E, d MMM"} - d{"E, d MMM – E, d MMM"} + M{"E, d MMM – E, d MMM"} + d{"E, d MMM – E, d MMM"} } yMMMEd{ - d{"E, d MMM – E, d MMM y G"} + d{"E, d MMM – E, d MMM y G"} } } } @@ -115,17 +115,17 @@ en_AU{ "pm", } DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE, d MMMM y", "d MMMM y", "d MMM y", "d/M/yy", "{1}, {0}", - "{1} 'at' {0}", - "{1} 'at' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } @@ -140,6 +140,7 @@ en_AU{ "yyMd", } availableFormats{ + GyMd{"d/M/y GGGGG"} MEd{"E, d/M"} Md{"d/M"} } @@ -251,31 +252,31 @@ en_AU{ } intervalFormats{ GyMEd{ - G{"E, d/M/y GGGGG – E, d/M/y GGGGG"} - M{"E, d/M/y – E, d/M/y GGGGG"} - d{"E, d/M/y – E, d/M/y GGGGG"} - y{"E, d/M/y – E, d/M/y GGGGG"} + G{"E, d/M/y GGGGG – E, d/M/y GGGGG"} + M{"E, d/M/y – E, d/M/y GGGGG"} + d{"E, d/M/y – E, d/M/y GGGGG"} + y{"E, d/M/y – E, d/M/y GGGGG"} } GyMMMEd{ - G{"E, d MMM, y G – E, d MMM, y G"} - M{"E, d MMM – E, d MMM, y G"} - d{"E, d MMM – E, d MMM, y G"} - y{"E, d MMM, y – E, d MMM, y G"} + G{"E, d MMM, y G – E, d MMM, y G"} + M{"E, d MMM – E, d MMM, y G"} + d{"E, d MMM – E, d MMM, y G"} + y{"E, d MMM, y – E, d MMM, y G"} } GyMMMd{ - G{"d MMM, y G – d MMM, y G"} - M{"d MMM – d MMM, y G"} - d{"d – d MMM, y G"} - y{"d MMM, y – d MMM, y G"} + G{"d MMM, y G – d MMM, y G"} + M{"d MMM – d MMM, y G"} + d{"d – d MMM, y G"} + y{"d MMM, y – d MMM, y G"} } GyMd{ - G{"d/M/y GGGGG – d/M/y GGGGG"} - M{"d/M/y – d/M/y GGGGG"} - d{"d/M/y – d/M/y GGGGG"} - y{"d/M/y – d/M/y GGGGG"} + G{"d/M/y GGGGG – d/M/y GGGGG"} + M{"d/M/y – d/M/y GGGGG"} + d{"d/M/y – d/M/y GGGGG"} + y{"d/M/y – d/M/y GGGGG"} } MMMd{ - d{"d – d MMM"} + d{"d – d MMM"} } } monthNames{ @@ -459,17 +460,17 @@ en_AU{ } islamic{ DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE, d MMMM y G", "d MMMM y G", "d MMM y G", "dd/MM/y GGGGG", "{1}, {0}", - "{1} 'at' {0}", - "{1} 'at' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } @@ -618,7 +619,7 @@ en_AU{ day-narrow{ relativeTime{ future{ - one{"in {0} day"} + one{"in {0}d"} other{"in {0} days"} } past{ diff --git a/icu4c/source/data/locales/en_BE.txt b/icu4c/source/data/locales/en_BE.txt index 1f3b7e4cdb9e..41812ca77f39 100644 --- a/icu4c/source/data/locales/en_BE.txt +++ b/icu4c/source/data/locales/en_BE.txt @@ -23,8 +23,8 @@ en_BE{ "dd MMM y G", "dd/MM/y GGGGG", "{1}, {0}", - "{1} 'at' {0}", - "{1} 'at' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } @@ -55,8 +55,8 @@ en_BE{ "dd MMM y", "dd/MM/yy", "{1}, {0}", - "{1} 'at' {0}", - "{1} 'at' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } diff --git a/icu4c/source/data/locales/en_BI.txt b/icu4c/source/data/locales/en_BI.txt index 0d75e673300c..33bd53680a9a 100644 --- a/icu4c/source/data/locales/en_BI.txt +++ b/icu4c/source/data/locales/en_BI.txt @@ -14,8 +14,8 @@ en_BI{ "MMM d, y", "M/d/yy", "{1}, {0}", - "{1} 'at' {0}", - "{1} 'at' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } diff --git a/icu4c/source/data/locales/en_BW.txt b/icu4c/source/data/locales/en_BW.txt index 680f118c2df7..072ed9ad05ed 100644 --- a/icu4c/source/data/locales/en_BW.txt +++ b/icu4c/source/data/locales/en_BW.txt @@ -15,8 +15,8 @@ en_BW{ "dd MMM y G", "dd/MM/y GGGGG", "{1}, {0}", - "{1} 'at' {0}", - "{1} 'at' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } @@ -53,8 +53,8 @@ en_BW{ "dd MMM y", "dd/MM/yy", "{1}, {0}", - "{1} 'at' {0}", - "{1} 'at' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } diff --git a/icu4c/source/data/locales/en_BZ.txt b/icu4c/source/data/locales/en_BZ.txt index 2570ebcc466a..9565226f3de4 100644 --- a/icu4c/source/data/locales/en_BZ.txt +++ b/icu4c/source/data/locales/en_BZ.txt @@ -15,8 +15,8 @@ en_BZ{ "dd-MMM-y G", "dd/MM/y GGGGG", "{1}, {0}", - "{1} 'at' {0}", - "{1} 'at' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } @@ -51,8 +51,8 @@ en_BZ{ "dd-MMM-y", "dd/MM/yy", "{1}, {0}", - "{1} 'at' {0}", - "{1} 'at' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } diff --git a/icu4c/source/data/locales/en_CA.txt b/icu4c/source/data/locales/en_CA.txt index f230fa04db48..8eff56bea734 100644 --- a/icu4c/source/data/locales/en_CA.txt +++ b/icu4c/source/data/locales/en_CA.txt @@ -5,17 +5,17 @@ en_CA{ calendar{ chinese{ DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE, MMMM d, r(U)", "MMMM d, r(U)", "MMM d, r", "r-MM-dd", "{1}, {0}", - "{1} 'at' {0}", - "{1} 'at' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } @@ -36,26 +36,26 @@ en_CA{ } intervalFormats{ MEd{ - M{"E, MM-dd – E, MM-dd"} - d{"E, MM-dd – E, MM-dd"} + M{"E, MM-dd – E, MM-dd"} + d{"E, MM-dd – E, MM-dd"} } Md{ - M{"MM-dd – MM-dd"} - d{"MM-dd – MM-dd"} + M{"MM-dd – MM-dd"} + d{"MM-dd – MM-dd"} } yM{ - M{"y-MM – y-MM"} - y{"y-MM – y-MM"} + M{"y-MM – y-MM"} + y{"y-MM – y-MM"} } yMEd{ - M{"E, y-MM-dd – E, y-MM-dd"} - d{"E, y-MM-dd – E, y-MM-dd"} - y{"E, y-MM-dd – E, y-MM-dd"} + M{"E, y-MM-dd – E, y-MM-dd"} + d{"E, y-MM-dd – E, y-MM-dd"} + y{"E, y-MM-dd – E, y-MM-dd"} } yMd{ - M{"y-MM-dd – y-MM-dd"} - d{"y-MM-dd – y-MM-dd"} - y{"y-MM-dd – y-MM-dd"} + M{"y-MM-dd – y-MM-dd"} + d{"y-MM-dd – y-MM-dd"} + y{"y-MM-dd – y-MM-dd"} } } } @@ -66,8 +66,8 @@ en_CA{ EHm{"E, HH:mm"} EHms{"E, HH:mm:ss"} Ed{"E d"} - Ehm{"E, h:mm a"} - Ehms{"E, h:mm:ss a"} + Ehm{"E, h:mm a"} + Ehms{"E, h:mm:ss a"} } intervalFormats{ Bh{ @@ -194,17 +194,17 @@ en_CA{ "pm", } DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE, MMMM d, y", "MMMM d, y", "MMM d, y", "y-MM-dd", "{1}, {0}", - "{1} 'at' {0}", - "{1} 'at' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } @@ -337,22 +337,22 @@ en_CA{ } fallback{"{0}–{1}"} h{ - a{"h a–h a"} - h{"h–h a"} + a{"h a–h a"} + h{"h–h a"} } hm{ - a{"h:mm a–h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a–h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a–h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a–h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a–h a v"} - h{"h–h a v"} + a{"h a–h a v"} + h{"h–h a v"} } y{ y{"y–y"} @@ -511,7 +511,6 @@ en_CA{ } } minute-narrow{ - dn{"min"} relativeTime{ future{ one{"in {0} min"} @@ -564,7 +563,6 @@ en_CA{ } } month-narrow{ - dn{"mo"} relative{ "-1"{"last mo"} "0"{"this mo"} @@ -600,7 +598,6 @@ en_CA{ } } quarter-narrow{ - dn{"qtr"} relativeTime{ future{ one{"in {0} qtr"} @@ -786,7 +783,6 @@ en_CA{ } } week-narrow{ - dn{"wk"} relative{ "-1"{"last wk"} "0"{"this wk"} diff --git a/icu4c/source/data/locales/en_CC.txt b/icu4c/source/data/locales/en_CC.txt index 438c1293421a..788a751f88dc 100644 --- a/icu4c/source/data/locales/en_CC.txt +++ b/icu4c/source/data/locales/en_CC.txt @@ -15,8 +15,8 @@ en_CC{ "d MMM y", "dd/MM/y", "{1}, {0}", - "{1} 'at' {0}", - "{1} 'at' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } diff --git a/icu4c/source/data/locales/en_CK.txt b/icu4c/source/data/locales/en_CK.txt index 24918a8792d2..b19e4d7a67de 100644 --- a/icu4c/source/data/locales/en_CK.txt +++ b/icu4c/source/data/locales/en_CK.txt @@ -15,8 +15,8 @@ en_CK{ "d MMM y", "dd/MM/y", "{1}, {0}", - "{1} 'at' {0}", - "{1} 'at' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } diff --git a/icu4c/source/data/locales/en_CM.txt b/icu4c/source/data/locales/en_CM.txt index 4b82d7453e72..dbde3f68e504 100644 --- a/icu4c/source/data/locales/en_CM.txt +++ b/icu4c/source/data/locales/en_CM.txt @@ -15,8 +15,8 @@ en_CM{ "d MMM y", "dd/MM/y", "{1}, {0}", - "{1} 'at' {0}", - "{1} 'at' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } diff --git a/icu4c/source/data/locales/en_CX.txt b/icu4c/source/data/locales/en_CX.txt index 85331cf428b4..c5cb039d71b6 100644 --- a/icu4c/source/data/locales/en_CX.txt +++ b/icu4c/source/data/locales/en_CX.txt @@ -15,8 +15,8 @@ en_CX{ "d MMM y", "dd/MM/y", "{1}, {0}", - "{1} 'at' {0}", - "{1} 'at' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } diff --git a/icu4c/source/data/locales/en_DG.txt b/icu4c/source/data/locales/en_DG.txt index e5d2a9aca829..4f4862044c93 100644 --- a/icu4c/source/data/locales/en_DG.txt +++ b/icu4c/source/data/locales/en_DG.txt @@ -15,8 +15,8 @@ en_DG{ "d MMM y", "dd/MM/y", "{1}, {0}", - "{1} 'at' {0}", - "{1} 'at' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } diff --git a/icu4c/source/data/locales/en_DK.txt b/icu4c/source/data/locales/en_DK.txt index 2734d64d5de8..e9e45873bc58 100644 --- a/icu4c/source/data/locales/en_DK.txt +++ b/icu4c/source/data/locales/en_DK.txt @@ -21,16 +21,16 @@ en_DK{ availableFormats{ EHm{"E HH.mm"} EHms{"E HH.mm.ss"} - Ehm{"E h.mm a"} - Ehms{"E h.mm.ss a"} + Ehm{"E h.mm a"} + Ehms{"E h.mm.ss a"} Hm{"HH.mm"} Hms{"HH.mm.ss"} Hmsv{"HH.mm.ss v"} Hmv{"HH.mm v"} - hm{"h.mm a"} - hms{"h.mm.ss a"} - hmsv{"h.mm.ss a v"} - hmv{"h.mm a v"} + hm{"h.mm a"} + hms{"h.mm.ss a"} + hmsv{"h.mm.ss a v"} + hmv{"h.mm a v"} ms{"mm.ss"} } } @@ -45,24 +45,24 @@ en_DK{ "d MMM y", "dd/MM/y", "{1}, {0}", - "{1} 'at' {0}", - "{1} 'at' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } availableFormats{ EHm{"E HH.mm"} EHms{"E HH.mm.ss"} - Ehm{"E h.mm a"} - Ehms{"E h.mm.ss a"} + Ehm{"E h.mm a"} + Ehms{"E h.mm.ss a"} Hm{"HH.mm"} Hms{"HH.mm.ss"} Hmsv{"HH.mm.ss v"} Hmv{"HH.mm v"} - hm{"h.mm a"} - hms{"h.mm.ss a"} - hmsv{"h.mm.ss a v"} - hmv{"h.mm a v"} + hm{"h.mm a"} + hms{"h.mm.ss a"} + hmsv{"h.mm.ss a v"} + hmv{"h.mm a v"} ms{"mm.ss"} } } diff --git a/icu4c/source/data/locales/en_FI.txt b/icu4c/source/data/locales/en_FI.txt index 17b957ff2dde..4289909379c7 100644 --- a/icu4c/source/data/locales/en_FI.txt +++ b/icu4c/source/data/locales/en_FI.txt @@ -21,16 +21,16 @@ en_FI{ availableFormats{ EHm{"E H.mm"} EHms{"E H.mm.ss"} - Ehm{"E h.mm a"} - Ehms{"E h.mm.ss a"} + Ehm{"E h.mm a"} + Ehms{"E h.mm.ss a"} Hm{"H.mm"} Hms{"H.mm.ss"} Hmsv{"H.mm.ss v"} Hmv{"H.mm v"} - hm{"h.mm a"} - hms{"h.mm.ss a"} - hmsv{"h.mm.ss a v"} - hmv{"h.mm a v"} + hm{"h.mm a"} + hms{"h.mm.ss a"} + hmsv{"h.mm.ss a v"} + hmv{"h.mm a v"} ms{"mm.ss"} } } @@ -45,8 +45,8 @@ en_FI{ "d MMM y", "dd/MM/y", "{1}, {0}", - "{1} 'at' {0}", - "{1} 'at' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } @@ -63,16 +63,16 @@ en_FI{ availableFormats{ EHm{"E H.mm"} EHms{"E H.mm.ss"} - Ehm{"E h.mm a"} - Ehms{"E h.mm.ss a"} + Ehm{"E h.mm a"} + Ehms{"E h.mm.ss a"} Hm{"H.mm"} Hms{"H.mm.ss"} Hmsv{"H.mm.ss v"} Hmv{"H.mm v"} - hm{"h.mm a"} - hms{"h.mm.ss a"} - hmsv{"h.mm.ss a v"} - hmv{"h.mm a v"} + hm{"h.mm a"} + hms{"h.mm.ss a"} + hmsv{"h.mm.ss a v"} + hmv{"h.mm a v"} ms{"mm.ss"} } } diff --git a/icu4c/source/data/locales/en_FK.txt b/icu4c/source/data/locales/en_FK.txt index dace8e97e17b..7cb5747c5d15 100644 --- a/icu4c/source/data/locales/en_FK.txt +++ b/icu4c/source/data/locales/en_FK.txt @@ -15,8 +15,8 @@ en_FK{ "d MMM y", "dd/MM/y", "{1}, {0}", - "{1} 'at' {0}", - "{1} 'at' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } diff --git a/icu4c/source/data/locales/en_GB.txt b/icu4c/source/data/locales/en_GB.txt index 81e1bf9446e5..22230907a966 100644 --- a/icu4c/source/data/locales/en_GB.txt +++ b/icu4c/source/data/locales/en_GB.txt @@ -19,14 +19,14 @@ en_GB{ } intervalFormats{ MMMEd{ - d{"E d MMM – E d MMM"} + d{"E d MMM – E d MMM"} } Md{ M{"dd/MM–dd/MM"} d{"dd/MM–dd/MM"} } yMMMEd{ - d{"E, d MMM – E, d MMM y G"} + d{"E, d MMM – E, d MMM y G"} } } } @@ -41,8 +41,8 @@ en_GB{ "d MMM y", "dd/MM/y", "{1}, {0}", - "{1} 'at' {0}", - "{1} 'at' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } @@ -59,6 +59,7 @@ en_GB{ availableFormats{ EBhm{"E h:mm B"} EBhms{"E h:mm:ss B"} + GyMd{"d/M/y GGGGG"} } dayNames{ format{ @@ -111,11 +112,23 @@ en_GB{ } } intervalFormats{ + GyMEd{ + G{"E, dd/MM/y GGGGG – E, dd/MM/y GGGGG"} + M{"E, dd/MM/y – E, dd/MM/y GGGGG"} + d{"E, dd/MM/y – E, dd/MM/y GGGGG"} + y{"E, dd/MM/y – E, dd/MM/y GGGGG"} + } + GyMd{ + G{"dd/MM/y GGGGG – dd/MM/y GGGGG"} + M{"dd/MM/y – dd/MM/y GGGGG"} + d{"dd/MM/y – dd/MM/y GGGGG"} + y{"dd/MM/y – dd/MM/y GGGGG"} + } MMMEd{ - d{"E d MMM – E d MMM"} + d{"E d MMM – E d MMM"} } yMMMEd{ - d{"E, d MMM – E, d MMM y"} + d{"E, d MMM – E, d MMM y"} } } monthNames{ @@ -205,14 +218,5 @@ en_GB{ } } } - hour-narrow{ - dn{"hr"} - } - second-narrow{ - dn{"sec"} - } - year-narrow{ - dn{"yr"} - } } } diff --git a/icu4c/source/data/locales/en_GG.txt b/icu4c/source/data/locales/en_GG.txt index a36df8dca0c7..cf2dd9eca585 100644 --- a/icu4c/source/data/locales/en_GG.txt +++ b/icu4c/source/data/locales/en_GG.txt @@ -15,8 +15,8 @@ en_GG{ "d MMM y", "dd/MM/y", "{1}, {0}", - "{1} 'at' {0}", - "{1} 'at' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } diff --git a/icu4c/source/data/locales/en_GI.txt b/icu4c/source/data/locales/en_GI.txt index c507e183cb87..07d78318e6e4 100644 --- a/icu4c/source/data/locales/en_GI.txt +++ b/icu4c/source/data/locales/en_GI.txt @@ -15,8 +15,8 @@ en_GI{ "d MMM y", "dd/MM/y", "{1}, {0}", - "{1} 'at' {0}", - "{1} 'at' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } diff --git a/icu4c/source/data/locales/en_HK.txt b/icu4c/source/data/locales/en_HK.txt index b5f760701cb5..69f877fed8c3 100644 --- a/icu4c/source/data/locales/en_HK.txt +++ b/icu4c/source/data/locales/en_HK.txt @@ -6,17 +6,17 @@ en_HK{ calendar{ generic{ DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE, d MMMM, y G", "d MMMM, y G", "d MMM, y G", "d/M/yy GGGGG", "{1}, {0}", - "{1} 'at' {0}", - "{1} 'at' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } @@ -39,52 +39,52 @@ en_HK{ } intervalFormats{ MEd{ - M{"E, d/M – E, d/M"} - d{"E, d/M – E, d/M"} + M{"E, d/M – E, d/M"} + d{"E, d/M – E, d/M"} } MMMEd{ - M{"E, d MMM – E, d MMM"} - d{"E, d MMM – E, d MMM"} + M{"E, d MMM – E, d MMM"} + d{"E, d MMM – E, d MMM"} } Md{ - M{"d/M – d/M"} - d{"d/M – d/M"} + M{"d/M – d/M"} + d{"d/M – d/M"} } yMEd{ - M{"E, d/M/y – E, d/M/y G"} - d{"E, d/M/y – E, d/M/y G"} - y{"E, d/M/y – E, d/M/y G"} + M{"E, d/M/y – E, d/M/y G"} + d{"E, d/M/y – E, d/M/y G"} + y{"E, d/M/y – E, d/M/y G"} } yMMMEd{ - M{"E, d MMM – E, d MMM, y G"} - d{"E, d MMM – E, d MMM, y G"} - y{"E, d MMM, y – E, d MMM, y G"} + M{"E, d MMM – E, d MMM, y G"} + d{"E, d MMM – E, d MMM, y G"} + y{"E, d MMM, y – E, d MMM, y G"} } yMMMd{ - M{"d MMM – d MMM, y G"} - d{"d – d MMM, y G"} - y{"d MMM, y – d MMM, y G"} + M{"d MMM – d MMM, y G"} + d{"d – d MMM, y G"} + y{"d MMM, y – d MMM, y G"} } yMd{ - M{"d/M/y – d/M/y G"} - d{"d/M/y – d/M/y G"} - y{"d/M/y – d/M/y G"} + M{"d/M/y – d/M/y G"} + d{"d/M/y – d/M/y G"} + y{"d/M/y – d/M/y G"} } } } gregorian{ DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE, d MMMM y", "d MMMM y", "d MMM y", "d/M/y", "{1}, {0}", - "{1} 'at' {0}", - "{1} 'at' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } @@ -104,26 +104,26 @@ en_HK{ } intervalFormats{ MEd{ - M{"E, d/M – E, d/M"} - d{"E, d/M – E, d/M"} + M{"E, d/M – E, d/M"} + d{"E, d/M – E, d/M"} } MMMEd{ - M{"E, d MMM – E, d MMM"} - d{"E, d MMM – E, d MMM"} + M{"E, d MMM – E, d MMM"} + d{"E, d MMM – E, d MMM"} } Md{ - M{"d/M – d/M"} - d{"d/M – d/M"} + M{"d/M – d/M"} + d{"d/M – d/M"} } yMEd{ - M{"E, d/M/y – E, d/M/y"} - d{"E, d/M/y – E, d/M/y"} - y{"E, d/M/y – E, d/M/y"} + M{"E, d/M/y – E, d/M/y"} + d{"E, d/M/y – E, d/M/y"} + y{"E, d/M/y – E, d/M/y"} } yMd{ - M{"d/M/y – d/M/y"} - d{"d/M/y – d/M/y"} - y{"d/M/y – d/M/y"} + M{"d/M/y – d/M/y"} + d{"d/M/y – d/M/y"} + y{"d/M/y – d/M/y"} } } } diff --git a/icu4c/source/data/locales/en_IE.txt b/icu4c/source/data/locales/en_IE.txt index 83c893c7bcb4..bd11f9825b56 100644 --- a/icu4c/source/data/locales/en_IE.txt +++ b/icu4c/source/data/locales/en_IE.txt @@ -15,8 +15,8 @@ en_IE{ "d MMM y G", "dd/MM/y GGGGG", "{1}, {0}", - "{1} 'at' {0}", - "{1} 'at' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } @@ -28,23 +28,23 @@ en_IE{ } intervalFormats{ yM{ - M{"MM/y – MM/y G"} - y{"MM/y – MM/y G"} + M{"MM/y – MM/y G"} + y{"MM/y – MM/y G"} } yMEd{ - M{"E dd/MM/y – E dd/MM/y G"} - d{"E dd/MM/y – E dd/MM/y G"} - y{"E dd/MM/y – E dd/MM/y G"} + M{"E dd/MM/y – E dd/MM/y G"} + d{"E dd/MM/y – E dd/MM/y G"} + y{"E dd/MM/y – E dd/MM/y G"} } yMMMEd{ - M{"E d MMM – E d MMM y G"} - d{"E d – E d MMM y G"} - y{"E d MMM y – E d MMM y G"} + M{"E d MMM – E d MMM y G"} + d{"E d – E d MMM y G"} + y{"E d MMM y – E d MMM y G"} } yMd{ - M{"dd/MM/y – dd/MM/y G"} - d{"dd/MM/y – dd/MM/y G"} - y{"dd/MM/y – dd/MM/y G"} + M{"dd/MM/y – dd/MM/y G"} + d{"dd/MM/y – dd/MM/y G"} + y{"dd/MM/y – dd/MM/y G"} } } } @@ -63,8 +63,8 @@ en_IE{ "d MMM y", "dd/MM/y", "{1}, {0}", - "{1} 'at' {0}", - "{1} 'at' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } @@ -87,14 +87,14 @@ en_IE{ } intervalFormats{ yMEd{ - M{"E dd/MM/y – E dd/MM/y"} - d{"E dd/MM/y – E dd/MM/y"} - y{"E dd/MM/y – E dd/MM/y"} + M{"E dd/MM/y – E dd/MM/y"} + d{"E dd/MM/y – E dd/MM/y"} + y{"E dd/MM/y – E dd/MM/y"} } yMMMEd{ - M{"E d MMM – E d MMM y"} - d{"E d – E d MMM y"} - y{"E d MMM y – E d MMM y"} + M{"E d MMM – E d MMM y"} + d{"E d – E d MMM y"} + y{"E d MMM y – E d MMM y"} } } } diff --git a/icu4c/source/data/locales/en_IL.txt b/icu4c/source/data/locales/en_IL.txt index 32f297e2b298..8ea1815499de 100644 --- a/icu4c/source/data/locales/en_IL.txt +++ b/icu4c/source/data/locales/en_IL.txt @@ -24,8 +24,8 @@ en_IL{ "d MMM y", "dd/MM/y", "{1}, {0}", - "{1} 'at' {0}", - "{1} 'at' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } diff --git a/icu4c/source/data/locales/en_IM.txt b/icu4c/source/data/locales/en_IM.txt index 33b7e2ebb311..236f3af23006 100644 --- a/icu4c/source/data/locales/en_IM.txt +++ b/icu4c/source/data/locales/en_IM.txt @@ -15,8 +15,8 @@ en_IM{ "d MMM y", "dd/MM/y", "{1}, {0}", - "{1} 'at' {0}", - "{1} 'at' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } diff --git a/icu4c/source/data/locales/en_IN.txt b/icu4c/source/data/locales/en_IN.txt index 42ca6bc6abed..dda7f46a5d73 100644 --- a/icu4c/source/data/locales/en_IN.txt +++ b/icu4c/source/data/locales/en_IN.txt @@ -120,17 +120,17 @@ en_IN{ calendar{ generic{ DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE, d MMMM, y G", "d MMMM, y G", "d MMM, y G", "d/M/y/ GGGGG", "{1}, {0}", - "{1} 'at' {0}", - "{1} 'at' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } @@ -160,63 +160,63 @@ en_IN{ } intervalFormats{ GyMEd{ - G{"E, d/M/y GGGGG – E, d/M/y GGGGG"} - M{"E, d/M/y – E, d/M/y GGGGG"} - d{"E, d/M/y – E, d/M/y GGGGG"} - y{"E, d/M/y – E, d/M/y GGGGG"} + G{"E, d/M/y GGGGG – E, d/M/y GGGGG"} + M{"E, d/M/y – E, d/M/y GGGGG"} + d{"E, d/M/y – E, d/M/y GGGGG"} + y{"E, d/M/y – E, d/M/y GGGGG"} } GyMd{ - G{"d/M/y GGGGG – d/M/y GGGGG"} - M{"d/M/y – d/M/y GGGGG"} - d{"d/M/y – d/M/y GGGGG"} - y{"d/M/y – d/M/y GGGGG"} + G{"d/M/y GGGGG – d/M/y GGGGG"} + M{"d/M/y – d/M/y GGGGG"} + d{"d/M/y – d/M/y GGGGG"} + y{"d/M/y – d/M/y GGGGG"} } MEd{ - M{"E, dd/MM – E, dd/MM"} - d{"E, dd/MM – E, dd/MM"} + M{"E, dd/MM – E, dd/MM"} + d{"E, dd/MM – E, dd/MM"} } MMMEd{ - M{"E, d MMM – E, d MMM"} - d{"E, d – E, d MMM"} + M{"E, d MMM – E, d MMM"} + d{"E, d – E, d MMM"} } Md{ - M{"d/M – d/M"} - d{"d/M – d/M"} + M{"d/M – d/M"} + d{"d/M – d/M"} } yM{ - M{"MM/y – MM/y G"} - y{"MM/y – MM/y G"} + M{"MM/y – MM/y G"} + y{"MM/y – MM/y G"} } yMEd{ - M{"E, dd/MM/y – E, dd/MM/y G"} - d{"E, dd/MM/y – E, dd/MM/y G"} - y{"E, dd/MM/y – E, dd/MM/y G"} + M{"E, dd/MM/y – E, dd/MM/y G"} + d{"E, dd/MM/y – E, dd/MM/y G"} + y{"E, dd/MM/y – E, dd/MM/y G"} } yMMMEd{ - M{"E d MMM – E d MMM y G"} - d{"E d – E d MMM y G"} - y{"E d MMM y – E d MMM y G"} + M{"E d MMM – E d MMM y G"} + d{"E d – E d MMM y G"} + y{"E d MMM y – E d MMM y G"} } yMd{ - M{"dd/MM/y – dd/MM/y G"} - d{"dd/MM/y – dd/MM/y G"} - y{"dd/MM/y – dd/MM/y G"} + M{"dd/MM/y – dd/MM/y G"} + d{"dd/MM/y – dd/MM/y G"} + y{"dd/MM/y – dd/MM/y G"} } } } gregorian{ DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE, d MMMM, y", "d MMMM y", "dd-MMM-y", "dd/MM/yy", "{1}, {0}", - "{1} 'at' {0}", - "{1} 'at' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } @@ -233,36 +233,36 @@ en_IN{ availableFormats{ EHm{"E, HH:mm"} EHms{"E, HH:mm:ss"} - Ehm{"E, h:mm a"} - Ehms{"E, h:mm:ss a"} + Ehm{"E, h:mm a"} + Ehms{"E, h:mm:ss a"} yMEd{"E, d/M/y"} yMMMEd{"E, d MMM, y"} yMd{"d/M/y"} } intervalFormats{ MEd{ - M{"E, dd/MM – E, dd/MM"} - d{"E, dd/MM – E, dd/MM"} + M{"E, dd/MM – E, dd/MM"} + d{"E, dd/MM – E, dd/MM"} } MMMEd{ - M{"E, d MMM – E, d MMM"} - d{"E, d – E, d MMM"} + M{"E, d MMM – E, d MMM"} + d{"E, d – E, d MMM"} } } } islamic{ DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE d MMMM y G", "d MMMM, y G", "dd-MMM-y G", "d/M/y/ GGGGG", "{1}, {0}", - "{1} 'at' {0}", - "{1} 'at' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } diff --git a/icu4c/source/data/locales/en_IO.txt b/icu4c/source/data/locales/en_IO.txt index f058ec29d405..50d729add945 100644 --- a/icu4c/source/data/locales/en_IO.txt +++ b/icu4c/source/data/locales/en_IO.txt @@ -15,8 +15,8 @@ en_IO{ "d MMM y", "dd/MM/y", "{1}, {0}", - "{1} 'at' {0}", - "{1} 'at' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } diff --git a/icu4c/source/data/locales/en_JE.txt b/icu4c/source/data/locales/en_JE.txt index 3569330ba56e..7b09e5afa37f 100644 --- a/icu4c/source/data/locales/en_JE.txt +++ b/icu4c/source/data/locales/en_JE.txt @@ -15,8 +15,8 @@ en_JE{ "d MMM y", "dd/MM/y", "{1}, {0}", - "{1} 'at' {0}", - "{1} 'at' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } diff --git a/icu4c/source/data/locales/en_KE.txt b/icu4c/source/data/locales/en_KE.txt index 2422f5390488..1c4d6c213b6c 100644 --- a/icu4c/source/data/locales/en_KE.txt +++ b/icu4c/source/data/locales/en_KE.txt @@ -15,8 +15,8 @@ en_KE{ "d MMM y", "dd/MM/y", "{1}, {0}", - "{1} 'at' {0}", - "{1} 'at' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } diff --git a/icu4c/source/data/locales/en_MG.txt b/icu4c/source/data/locales/en_MG.txt index 254750c398fe..23ce896ae344 100644 --- a/icu4c/source/data/locales/en_MG.txt +++ b/icu4c/source/data/locales/en_MG.txt @@ -15,8 +15,8 @@ en_MG{ "d MMM y", "dd/MM/y", "{1}, {0}", - "{1} 'at' {0}", - "{1} 'at' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } diff --git a/icu4c/source/data/locales/en_MS.txt b/icu4c/source/data/locales/en_MS.txt index 885f2f45b789..ef6b46600127 100644 --- a/icu4c/source/data/locales/en_MS.txt +++ b/icu4c/source/data/locales/en_MS.txt @@ -15,8 +15,8 @@ en_MS{ "d MMM y", "dd/MM/y", "{1}, {0}", - "{1} 'at' {0}", - "{1} 'at' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } diff --git a/icu4c/source/data/locales/en_MT.txt b/icu4c/source/data/locales/en_MT.txt index 966ae31b7ef0..5b16c2410929 100644 --- a/icu4c/source/data/locales/en_MT.txt +++ b/icu4c/source/data/locales/en_MT.txt @@ -15,8 +15,8 @@ en_MT{ "dd MMM y G", "dd/MM/y GGGGG", "{1}, {0}", - "{1} 'at' {0}", - "{1} 'at' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } @@ -47,8 +47,8 @@ en_MT{ "dd MMM y", "dd/MM/y", "{1}, {0}", - "{1} 'at' {0}", - "{1} 'at' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } diff --git a/icu4c/source/data/locales/en_MU.txt b/icu4c/source/data/locales/en_MU.txt index e0788b32a141..91c92fd5c162 100644 --- a/icu4c/source/data/locales/en_MU.txt +++ b/icu4c/source/data/locales/en_MU.txt @@ -15,8 +15,8 @@ en_MU{ "d MMM y", "dd/MM/y", "{1}, {0}", - "{1} 'at' {0}", - "{1} 'at' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } diff --git a/icu4c/source/data/locales/en_NF.txt b/icu4c/source/data/locales/en_NF.txt index 2326d75cfc40..05bb8599b27f 100644 --- a/icu4c/source/data/locales/en_NF.txt +++ b/icu4c/source/data/locales/en_NF.txt @@ -15,8 +15,8 @@ en_NF{ "d MMM y", "dd/MM/y", "{1}, {0}", - "{1} 'at' {0}", - "{1} 'at' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } diff --git a/icu4c/source/data/locales/en_NG.txt b/icu4c/source/data/locales/en_NG.txt index b76583b8037c..ca4d8dc00e0a 100644 --- a/icu4c/source/data/locales/en_NG.txt +++ b/icu4c/source/data/locales/en_NG.txt @@ -15,8 +15,8 @@ en_NG{ "d MMM y", "dd/MM/y", "{1}, {0}", - "{1} 'at' {0}", - "{1} 'at' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } diff --git a/icu4c/source/data/locales/en_NR.txt b/icu4c/source/data/locales/en_NR.txt index b41e9148b57a..423e9184df6b 100644 --- a/icu4c/source/data/locales/en_NR.txt +++ b/icu4c/source/data/locales/en_NR.txt @@ -15,8 +15,8 @@ en_NR{ "d MMM y", "dd/MM/y", "{1}, {0}", - "{1} 'at' {0}", - "{1} 'at' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } diff --git a/icu4c/source/data/locales/en_NU.txt b/icu4c/source/data/locales/en_NU.txt index 190cff7a0f2a..6dc4b0f9b0d5 100644 --- a/icu4c/source/data/locales/en_NU.txt +++ b/icu4c/source/data/locales/en_NU.txt @@ -15,8 +15,8 @@ en_NU{ "d MMM y", "dd/MM/y", "{1}, {0}", - "{1} 'at' {0}", - "{1} 'at' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } diff --git a/icu4c/source/data/locales/en_NZ.txt b/icu4c/source/data/locales/en_NZ.txt index 1998f20a6b90..33ca5eee3564 100644 --- a/icu4c/source/data/locales/en_NZ.txt +++ b/icu4c/source/data/locales/en_NZ.txt @@ -6,17 +6,17 @@ en_NZ{ calendar{ generic{ DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE, d MMMM y G", "d MMMM y G", "d/MM/y G", "d/MM/y GGGGG", "{1}, {0}", - "{1} 'at' {0}", - "{1} 'at' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } @@ -36,46 +36,46 @@ en_NZ{ } intervalFormats{ MEd{ - M{"E, d/MM – E, d/MM"} - d{"E, d/MM – E, d/MM"} + M{"E, d/MM – E, d/MM"} + d{"E, d/MM – E, d/MM"} } MMMEd{ - M{"E, d MMM – E, d MMM"} - d{"E, d – E, d MMM"} + M{"E, d MMM – E, d MMM"} + d{"E, d – E, d MMM"} } Md{ - M{"d/MM – d/MM"} - d{"d/MM – d/MM"} + M{"d/MM – d/MM"} + d{"d/MM – d/MM"} } yM{ - M{"MM/y – MM/y G"} - y{"MM/y – MM/y G"} + M{"MM/y – MM/y G"} + y{"MM/y – MM/y G"} } yMEd{ - M{"E, d/MM/y – E, d/MM/y G"} - d{"E, d/MM/y – E, d/MM/y G"} - y{"E, d/MM/y – E, d/MM/y G"} + M{"E, d/MM/y – E, d/MM/y G"} + d{"E, d/MM/y – E, d/MM/y G"} + y{"E, d/MM/y – E, d/MM/y G"} } yMd{ - M{"d/MM/y – d/MM/y G"} - d{"d/MM/y – d/MM/y G"} - y{"d/MM/y – d/MM/y G"} + M{"d/MM/y – d/MM/y G"} + d{"d/MM/y – d/MM/y G"} + y{"d/MM/y – d/MM/y G"} } } } gregorian{ DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE, d MMMM y", "d MMMM y", "d/MM/y", "d/MM/yy", "{1}, {0}", - "{1} 'at' {0}", - "{1} 'at' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } @@ -95,26 +95,26 @@ en_NZ{ } intervalFormats{ MEd{ - M{"E, d/MM – E, d/MM"} - d{"E, d/MM – E, d/MM"} + M{"E, d/MM – E, d/MM"} + d{"E, d/MM – E, d/MM"} } MMMEd{ - M{"E, d MMM – E, d MMM"} - d{"E, d – E, d MMM"} + M{"E, d MMM – E, d MMM"} + d{"E, d – E, d MMM"} } Md{ - M{"d/MM – d/MM"} - d{"d/MM – d/MM"} + M{"d/MM – d/MM"} + d{"d/MM – d/MM"} } yMEd{ - M{"E, d/MM/y – E, d/MM/y"} - d{"E, d/MM/y – E, d/MM/y"} - y{"E, d/MM/y – E, d/MM/y"} + M{"E, d/MM/y – E, d/MM/y"} + d{"E, d/MM/y – E, d/MM/y"} + y{"E, d/MM/y – E, d/MM/y"} } yMd{ - M{"d/MM/y – d/MM/y"} - d{"d/MM/y – d/MM/y"} - y{"d/MM/y – d/MM/y"} + M{"d/MM/y – d/MM/y"} + d{"d/MM/y – d/MM/y"} + y{"d/MM/y – d/MM/y"} } } } diff --git a/icu4c/source/data/locales/en_PK.txt b/icu4c/source/data/locales/en_PK.txt index 454047fffa81..1cc79bb429ab 100644 --- a/icu4c/source/data/locales/en_PK.txt +++ b/icu4c/source/data/locales/en_PK.txt @@ -6,17 +6,17 @@ en_PK{ calendar{ generic{ DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE, d MMMM y G", "d MMMM y G", "dd-MMM-y G", "dd/MM/y GGGGG", "{1}, {0}", - "{1} 'at' {0}", - "{1} 'at' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } @@ -33,17 +33,17 @@ en_PK{ } gregorian{ DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE, d MMMM y", "d MMMM y", "dd-MMM-y", "dd/MM/y", "{1}, {0}", - "{1} 'at' {0}", - "{1} 'at' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } diff --git a/icu4c/source/data/locales/en_PN.txt b/icu4c/source/data/locales/en_PN.txt index e32eb5dd755c..b22ef5834bab 100644 --- a/icu4c/source/data/locales/en_PN.txt +++ b/icu4c/source/data/locales/en_PN.txt @@ -15,8 +15,8 @@ en_PN{ "d MMM y", "dd/MM/y", "{1}, {0}", - "{1} 'at' {0}", - "{1} 'at' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } diff --git a/icu4c/source/data/locales/en_RW.txt b/icu4c/source/data/locales/en_RW.txt index 089a5204d392..4bd342caacd2 100644 --- a/icu4c/source/data/locales/en_RW.txt +++ b/icu4c/source/data/locales/en_RW.txt @@ -15,8 +15,8 @@ en_RW{ "d MMM y", "dd/MM/y", "{1}, {0}", - "{1} 'at' {0}", - "{1} 'at' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } diff --git a/icu4c/source/data/locales/en_SC.txt b/icu4c/source/data/locales/en_SC.txt index b386596219f6..8ec89b52f7c2 100644 --- a/icu4c/source/data/locales/en_SC.txt +++ b/icu4c/source/data/locales/en_SC.txt @@ -15,8 +15,8 @@ en_SC{ "d MMM y", "dd/MM/y", "{1}, {0}", - "{1} 'at' {0}", - "{1} 'at' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } diff --git a/icu4c/source/data/locales/en_SE.txt b/icu4c/source/data/locales/en_SE.txt index 89d823103380..7137adec4d17 100644 --- a/icu4c/source/data/locales/en_SE.txt +++ b/icu4c/source/data/locales/en_SE.txt @@ -28,8 +28,8 @@ en_SE{ "d MMM y G", "G y-MM-dd", "{1}, {0}", - "{1} 'at' {0}", - "{1} 'at' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } @@ -60,8 +60,8 @@ en_SE{ "d MMM y", "y-MM-dd", "{1}, {0}", - "{1} 'at' {0}", - "{1} 'at' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } diff --git a/icu4c/source/data/locales/en_SG.txt b/icu4c/source/data/locales/en_SG.txt index 1bb8a8867b2b..c9a1f56c73a8 100644 --- a/icu4c/source/data/locales/en_SG.txt +++ b/icu4c/source/data/locales/en_SG.txt @@ -6,17 +6,17 @@ en_SG{ calendar{ generic{ DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE, d MMMM y G", "d MMMM y G", "d MMM y G", "d/M/yy GGGGG", "{1}, {0}", - "{1} 'at' {0}", - "{1} 'at' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } @@ -35,41 +35,41 @@ en_SG{ } intervalFormats{ MEd{ - M{"E, d/M – E, d/M"} - d{"E, d/M – E, d/M"} + M{"E, d/M – E, d/M"} + d{"E, d/M – E, d/M"} } MMMEd{ - M{"E, d MMM – E, d MMM"} - d{"E, d MMM – E, d MMM"} + M{"E, d MMM – E, d MMM"} + d{"E, d MMM – E, d MMM"} } yMEd{ - M{"E, d/M/y – E, d/M/y G"} - d{"E, d/M/y – E, d/M/y G"} - y{"E, d/M/y – E, d/M/y G"} + M{"E, d/M/y – E, d/M/y G"} + d{"E, d/M/y – E, d/M/y G"} + y{"E, d/M/y – E, d/M/y G"} } yMMMEd{ - d{"E, d MMM – E, d MMM y G"} + d{"E, d MMM – E, d MMM y G"} } yMd{ - M{"d/M/y – d/M/y G"} - d{"d/M/y – d/M/y G"} - y{"d/M/y – d/M/y G"} + M{"d/M/y – d/M/y G"} + d{"d/M/y – d/M/y G"} + y{"d/M/y – d/M/y G"} } } } gregorian{ DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE, d MMMM y", "d MMMM y", "d MMM y", "d/M/yy", "{1}, {0}", - "{1} 'at' {0}", - "{1} 'at' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } @@ -85,25 +85,25 @@ en_SG{ } intervalFormats{ MEd{ - M{"E, d/M – E, d/M"} - d{"E, d/M – E, d/M"} + M{"E, d/M – E, d/M"} + d{"E, d/M – E, d/M"} } MMMEd{ - M{"E, d MMM – E, d MMM"} - d{"E, d MMM – E, d MMM"} + M{"E, d MMM – E, d MMM"} + d{"E, d MMM – E, d MMM"} } yMEd{ - M{"E, d/M/y – E, d/M/y"} - d{"E, d/M/y – E, d/M/y"} - y{"E, d/M/y – E, d/M/y"} + M{"E, d/M/y – E, d/M/y"} + d{"E, d/M/y – E, d/M/y"} + y{"E, d/M/y – E, d/M/y"} } yMMMEd{ - d{"E, d MMM – E, d MMM y"} + d{"E, d MMM – E, d MMM y"} } yMd{ - M{"d/M/y – d/M/y"} - d{"d/M/y – d/M/y"} - y{"d/M/y – d/M/y"} + M{"d/M/y – d/M/y"} + d{"d/M/y – d/M/y"} + y{"d/M/y – d/M/y"} } } } diff --git a/icu4c/source/data/locales/en_SH.txt b/icu4c/source/data/locales/en_SH.txt index e54baf3f8d52..f355ed574ead 100644 --- a/icu4c/source/data/locales/en_SH.txt +++ b/icu4c/source/data/locales/en_SH.txt @@ -15,8 +15,8 @@ en_SH{ "d MMM y", "dd/MM/y", "{1}, {0}", - "{1} 'at' {0}", - "{1} 'at' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } diff --git a/icu4c/source/data/locales/en_SX.txt b/icu4c/source/data/locales/en_SX.txt index 8492482cb250..5423617e550a 100644 --- a/icu4c/source/data/locales/en_SX.txt +++ b/icu4c/source/data/locales/en_SX.txt @@ -15,8 +15,8 @@ en_SX{ "d MMM y", "dd/MM/y", "{1}, {0}", - "{1} 'at' {0}", - "{1} 'at' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } diff --git a/icu4c/source/data/locales/en_TK.txt b/icu4c/source/data/locales/en_TK.txt index ada2deb90d69..d1232f96caca 100644 --- a/icu4c/source/data/locales/en_TK.txt +++ b/icu4c/source/data/locales/en_TK.txt @@ -15,8 +15,8 @@ en_TK{ "d MMM y", "dd/MM/y", "{1}, {0}", - "{1} 'at' {0}", - "{1} 'at' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } diff --git a/icu4c/source/data/locales/en_TV.txt b/icu4c/source/data/locales/en_TV.txt index 0ba26692ddd6..8a87fdfeb537 100644 --- a/icu4c/source/data/locales/en_TV.txt +++ b/icu4c/source/data/locales/en_TV.txt @@ -15,8 +15,8 @@ en_TV{ "d MMM y", "dd/MM/y", "{1}, {0}", - "{1} 'at' {0}", - "{1} 'at' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } diff --git a/icu4c/source/data/locales/en_TZ.txt b/icu4c/source/data/locales/en_TZ.txt index 1b681b0c8db8..dbc34e0f66c1 100644 --- a/icu4c/source/data/locales/en_TZ.txt +++ b/icu4c/source/data/locales/en_TZ.txt @@ -15,8 +15,8 @@ en_TZ{ "d MMM y", "dd/MM/y", "{1}, {0}", - "{1} 'at' {0}", - "{1} 'at' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } diff --git a/icu4c/source/data/locales/en_UG.txt b/icu4c/source/data/locales/en_UG.txt index d5813fa581ec..f2ce5b51d972 100644 --- a/icu4c/source/data/locales/en_UG.txt +++ b/icu4c/source/data/locales/en_UG.txt @@ -15,8 +15,8 @@ en_UG{ "d MMM y", "dd/MM/y", "{1}, {0}", - "{1} 'at' {0}", - "{1} 'at' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } diff --git a/icu4c/source/data/locales/en_ZA.txt b/icu4c/source/data/locales/en_ZA.txt index d99386622fec..a25db3f8d3b7 100644 --- a/icu4c/source/data/locales/en_ZA.txt +++ b/icu4c/source/data/locales/en_ZA.txt @@ -28,8 +28,8 @@ en_ZA{ "dd MMM y G", "GGGGG y/MM/dd", "{1}, {0}", - "{1} 'at' {0}", - "{1} 'at' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } @@ -65,8 +65,8 @@ en_ZA{ "dd MMM y", "y/MM/dd", "{1}, {0}", - "{1} 'at' {0}", - "{1} 'at' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } diff --git a/icu4c/source/data/locales/en_ZW.txt b/icu4c/source/data/locales/en_ZW.txt index 273760083447..dc245e7384a5 100644 --- a/icu4c/source/data/locales/en_ZW.txt +++ b/icu4c/source/data/locales/en_ZW.txt @@ -15,8 +15,8 @@ en_ZW{ "dd MMM,y G", "d/M/y GGGGG", "{1}, {0}", - "{1} 'at' {0}", - "{1} 'at' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } @@ -51,8 +51,8 @@ en_ZW{ "dd MMM,y", "d/M/y", "{1}, {0}", - "{1} 'at' {0}", - "{1} 'at' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } diff --git a/icu4c/source/data/locales/es.txt b/icu4c/source/data/locales/es.txt index 858a39afe189..c9ee13eb73d1 100644 --- a/icu4c/source/data/locales/es.txt +++ b/icu4c/source/data/locales/es.txt @@ -277,9 +277,9 @@ es{ MMMd{"d-M"} Md{"d-M"} d{"d"} - h{"hh a"} - hm{"hh:mm a"} - hms{"hh:mm:ss a"} + h{"hh a"} + hm{"hh:mm a"} + hms{"hh:mm:ss a"} ms{"mm:ss"} y{"r"} yyyy{"r"} @@ -554,8 +554,8 @@ es{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"E d"} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"y G"} GyMMM{"MMM y G"} GyMMMEd{"E, d MMM y G"} @@ -576,9 +576,9 @@ es{ MMMd{"d MMM"} Md{"d/M"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"mm:ss"} y{"y G"} yyyy{"y G"} @@ -596,131 +596,131 @@ es{ } intervalFormats{ Gy{ - G{"y G – y G"} - y{"y – y G"} + G{"y G – y G"} + y{"y – y G"} } GyM{ - G{"M/y GGGGG – M/y GGGG"} - M{"M/y – M/y GGGGG"} - y{"M/y – M/y GGGGG"} + G{"M/y GGGGG – M/y GGGG"} + M{"M/y – M/y GGGGG"} + y{"M/y – M/y GGGGG"} } GyMEd{ - G{"E d/M/y GGGGG – E d/M/y GGGGG"} - M{"E d/M/y – E d/M/y GGGGG"} - d{"E d/M/y – E d/M/y GGGGG"} - y{"E d/M/y – E d/M/y GGGGG"} + G{"E d/M/y GGGGG – E d/M/y GGGGG"} + M{"E d/M/y – E d/M/y GGGGG"} + d{"E d/M/y – E d/M/y GGGGG"} + y{"E d/M/y – E d/M/y GGGGG"} } GyMMM{ - G{"MMM 'de' y G – MMM 'de' y G"} + G{"MMM 'de' y G – MMM 'de' y G"} M{"MMM–MMM 'de' y G"} - y{"MMM 'de' y – MMM 'de' y G"} + y{"MMM 'de' y – MMM 'de' y G"} } GyMMMEd{ - G{"E d 'de' MMM 'de' y G – E d 'de' MMM 'de' y G"} - M{"E d 'de' MMM – E d 'de' MMM 'de' y G"} - d{"E d 'de' MMM – E d 'de' MMM 'de' y G"} - y{"E d 'de' MMM 'de' y – E d 'de' MMM 'de' y G"} + G{"E d 'de' MMM 'de' y G – E d 'de' MMM 'de' y G"} + M{"E d 'de' MMM – E d 'de' MMM 'de' y G"} + d{"E d 'de' MMM – E d 'de' MMM 'de' y G"} + y{"E d 'de' MMM 'de' y – E d 'de' MMM 'de' y G"} } GyMMMd{ - G{"d 'de' MMM 'de' y G – d 'de' MMM 'de' y G"} - M{"d 'de' MMM – d 'de' MMM 'de' y G"} + G{"d 'de' MMM 'de' y G – d 'de' MMM 'de' y G"} + M{"d 'de' MMM – d 'de' MMM 'de' y G"} d{"d–d 'de' MMM 'de' y G"} - y{"d 'de' MMM 'de' y – d 'de' MMM 'de' y G"} + y{"d 'de' MMM 'de' y – d 'de' MMM 'de' y G"} } GyMd{ - G{"d/M/y GGGGG – d/M/y GGGGG"} - M{"d/M/y – d/M/y GGGGG"} - d{"d/M/y – d/M/y GGGGG"} - y{"d/M/y – d/M/y GGGGG"} + G{"d/M/y GGGGG – d/M/y GGGGG"} + M{"d/M/y – d/M/y GGGGG"} + d{"d/M/y – d/M/y GGGGG"} + y{"d/M/y – d/M/y GGGGG"} } H{ H{"HH–HH"} } Hm{ - H{"HH:mm – HH:mm"} - m{"HH:mm – HH:mm"} + H{"HH:mm – HH:mm"} + m{"HH:mm – HH:mm"} } Hmv{ - H{"HH:mm – HH:mm v"} - m{"HH:mm – HH:mm v"} + H{"HH:mm – HH:mm v"} + m{"HH:mm – HH:mm v"} } M{ M{"M–M"} } MEd{ - M{"E, d/M – E, d/M"} - d{"E, d/M – E, d/M"} + M{"E, d/M – E, d/M"} + d{"E, d/M – E, d/M"} } MMM{ M{"MMM–MMM"} } MMMEd{ - M{"E, d 'de' MMM – E, d 'de' MMM"} - d{"E, d 'de' MMM – E, d 'de' MMM"} + M{"E, d 'de' MMM – E, d 'de' MMM"} + d{"E, d 'de' MMM – E, d 'de' MMM"} } MMMd{ - M{"d 'de' MMM – d 'de' MMM"} + M{"d 'de' MMM – d 'de' MMM"} d{"d–d 'de' MMM"} } Md{ - M{"d/M – d/M"} - d{"d/M – d/M"} + M{"d/M – d/M"} + d{"d/M – d/M"} } d{ d{"d–d"} } h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm – h:mm a"} - m{"h:mm – h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm – h:mm a"} + m{"h:mm – h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm – h:mm a v"} - m{"h:mm – h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm – h:mm a v"} + m{"h:mm – h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y G"} } yM{ - M{"M/y – M/y G"} - y{"M/y – M/y G"} + M{"M/y – M/y G"} + y{"M/y – M/y G"} } yMEd{ - M{"E, d/M/y – E, d/M/y G"} - d{"E, d/M/y – E, d/M/y G"} - y{"E, d/M/y – E, d/M/y G"} + M{"E, d/M/y – E, d/M/y G"} + d{"E, d/M/y – E, d/M/y G"} + y{"E, d/M/y – E, d/M/y G"} } yMMM{ M{"MMM–MMM 'de' y G"} - y{"MMM 'de' y – MMM 'de' y G"} + y{"MMM 'de' y – MMM 'de' y G"} } yMMMEd{ - M{"E, d 'de' MMM – E, d 'de' MMM 'de' y G"} - d{"E, d 'de' MMM – E, d 'de' MMM 'de' y G"} - y{"E, d 'de' MMM 'de' y – E, d 'de' MMM 'de' y G"} + M{"E, d 'de' MMM – E, d 'de' MMM 'de' y G"} + d{"E, d 'de' MMM – E, d 'de' MMM 'de' y G"} + y{"E, d 'de' MMM 'de' y – E, d 'de' MMM 'de' y G"} } yMMMM{ M{"MMMM–MMMM 'de' y G"} - y{"MMMM 'de' y – MMMM 'de' y G"} + y{"MMMM 'de' y – MMMM 'de' y G"} } yMMMd{ - M{"d 'de' MMM – d 'de' MMM y G"} + M{"d 'de' MMM – d 'de' MMM y G"} d{"d–d 'de' MMM 'de' y G"} - y{"d 'de' MMM 'de' y – d 'de' MMM 'de' y G"} + y{"d 'de' MMM 'de' y – d 'de' MMM 'de' y G"} } yMd{ - M{"d/M/y – d/M/y G"} - d{"d/M/y – d/M/y G"} - y{"d/M/y – d/M/y G"} + M{"d/M/y – d/M/y G"} + d{"d/M/y – d/M/y G"} + y{"d/M/y – d/M/y G"} } } } @@ -775,8 +775,8 @@ es{ EHm{"E, H:mm"} EHms{"E, H:mm:ss"} Ed{"E d"} - Ehm{"E, h:mm a"} - Ehms{"E, h:mm:ss a"} + Ehm{"E, h:mm a"} + Ehms{"E, h:mm:ss a"} Gy{"y G"} GyMMM{"MMM y G"} GyMMMEd{"E, d MMM y G"} @@ -806,12 +806,12 @@ es{ MMdd{"d/M"} Md{"d/M"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} - hmsv{"h:mm:ss a v"} - hmsvvvv{"h:mm:ss a (vvvv)"} - hmv{"h:mm a v"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} + hmsv{"h:mm:ss a v"} + hmsvvvv{"h:mm:ss a (vvvv)"} + hmv{"h:mm a v"} ms{"mm:ss"} y{"y"} yM{"M/y"} @@ -983,42 +983,42 @@ es{ } intervalFormats{ Gy{ - G{"y G – y G"} + G{"y G – y G"} y{"y–y G"} } GyM{ - G{"M/y GGGGG – M/y GGGGG"} - M{"M/y – M/y GGGGG"} - y{"M/y – M/y GGGGG"} + G{"M/y GGGGG – M/y GGGGG"} + M{"M/y – M/y GGGGG"} + y{"M/y – M/y GGGGG"} } GyMEd{ - G{"E, d/M/y GGGGG – E, d/M/y GGGGG"} - M{"E, d/M/y – E, d/M/y GGGGG"} - d{"E, d/M/y – E, d/M/y GGGGG"} - y{"E, d/M/y – E, d/M/y GGGGG"} + G{"E, d/M/y GGGGG – E, d/M/y GGGGG"} + M{"E, d/M/y – E, d/M/y GGGGG"} + d{"E, d/M/y – E, d/M/y GGGGG"} + y{"E, d/M/y – E, d/M/y GGGGG"} } GyMMM{ - G{"MMM y G – MMM y G"} + G{"MMM y G – MMM y G"} M{"MMM–MMM y G"} - y{"MMM y – MMM y G"} + y{"MMM y – MMM y G"} } GyMMMEd{ - G{"E, d MMM y G – E, d MMM y G"} - M{"E, d MMM – E, d MMM y G"} - d{"E, d MMM – E, d MMM y G"} - y{"E, d MMM y – E, d MMM y G"} + G{"E, d MMM y G – E, d MMM y G"} + M{"E, d MMM – E, d MMM y G"} + d{"E, d MMM – E, d MMM y G"} + y{"E, d MMM y – E, d MMM y G"} } GyMMMd{ - G{"d MMM y G – d MMM y G"} - M{"d MMM – d MMM y G"} + G{"d MMM y G – d MMM y G"} + M{"d MMM – d MMM y G"} d{"d–d MMM y G"} - y{"d MMM y – d MMM y G"} + y{"d MMM y – d MMM y G"} } GyMd{ - G{"d/M/y GGGGG – d/M/y GGGGG"} - M{"d/M/y – d/M/y GGGGG"} - d{"d/M/y – d/M/y GGGGG"} - y{"d/M/y – d/M/y GGGGG"} + G{"d/M/y GGGGG – d/M/y GGGGG"} + M{"d/M/y – d/M/y GGGGG"} + d{"d/M/y – d/M/y GGGGG"} + y{"d/M/y – d/M/y GGGGG"} } H{ H{"H–H"} @@ -1038,97 +1038,97 @@ es{ M{"M–M"} } MEd{ - M{"E, d/M – E, d/M"} - d{"E, d/M – E, d/M"} + M{"E, d/M – E, d/M"} + d{"E, d/M – E, d/M"} } MMM{ M{"MMM–MMM"} } MMMEd{ - M{"E, d MMM – E, d MMM"} - d{"E, d MMM – E, d MMM"} + M{"E, d MMM – E, d MMM"} + d{"E, d MMM – E, d MMM"} } MMMMEd{ - M{"E, d 'de' MMMM – E, d 'de' MMMM"} - d{"E, d 'de' MMMM – E, d 'de' MMMM"} + M{"E, d 'de' MMMM – E, d 'de' MMMM"} + d{"E, d 'de' MMMM – E, d 'de' MMMM"} } MMMMd{ - M{"d 'de' MMMM – d 'de' MMMM"} + M{"d 'de' MMMM – d 'de' MMMM"} d{"d–d 'de' MMMM"} } MMMd{ - M{"d MMM – d MMM"} + M{"d MMM – d MMM"} d{"d–d MMM"} } Md{ - M{"d/M – d/M"} - d{"d/M – d/M"} + M{"d/M – d/M"} + d{"d/M – d/M"} } d{ d{"d–d"} } h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm – h:mm a"} - m{"h:mm – h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm – h:mm a"} + m{"h:mm – h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y"} } yM{ - M{"M/y – M/y"} - y{"M/y – M/y"} + M{"M/y – M/y"} + y{"M/y – M/y"} } yMEd{ - M{"E, d/M/y – E, d/M/y"} - d{"E, d/M/y – E, d/M/y"} - y{"E, d/M/y – E, d/M/y"} + M{"E, d/M/y – E, d/M/y"} + d{"E, d/M/y – E, d/M/y"} + y{"E, d/M/y – E, d/M/y"} } yMMM{ M{"MMM–MMM y"} - y{"MMM y – MMM y"} + y{"MMM y – MMM y"} } yMMMEd{ - M{"E, d MMM – E, d MMM y"} - d{"E, d MMM – E, d MMM y"} - y{"E, d MMM y – E, d MMM y"} + M{"E, d MMM – E, d MMM y"} + d{"E, d MMM – E, d MMM y"} + y{"E, d MMM y – E, d MMM y"} } yMMMM{ M{"MMMM–MMMM 'de' y"} - y{"MMMM 'de' y – MMMM 'de' y"} + y{"MMMM 'de' y – MMMM 'de' y"} } yMMMMEd{ - M{"E, d 'de' MMMM – E, d 'de' MMMM 'de' y"} - d{"E, d 'de' MMMM – E, d 'de' MMMM 'de' y"} - y{"E, d 'de' MMMM 'de' y – E, d 'de' MMMM 'de' y"} + M{"E, d 'de' MMMM – E, d 'de' MMMM 'de' y"} + d{"E, d 'de' MMMM – E, d 'de' MMMM 'de' y"} + y{"E, d 'de' MMMM 'de' y – E, d 'de' MMMM 'de' y"} } yMMMMd{ - M{"d 'de' MMMM – d 'de' MMMM 'de' y"} + M{"d 'de' MMMM – d 'de' MMMM 'de' y"} d{"d–d 'de' MMMM 'de' y"} - y{"d 'de' MMMM 'de' y – d 'de' MMMM 'de' y"} + y{"d 'de' MMMM 'de' y – d 'de' MMMM 'de' y"} } yMMMd{ - M{"d MMM – d MMM y"} + M{"d MMM – d MMM y"} d{"d–d MMM y"} - y{"d MMM y – d MMM y"} + y{"d MMM y – d MMM y"} } yMd{ - M{"d/M/y – d/M/y"} - d{"d/M/y – d/M/y"} - y{"d/M/y – d/M/y"} + M{"d/M/y – d/M/y"} + d{"d/M/y – d/M/y"} + y{"d/M/y – d/M/y"} } } monthNames{ diff --git a/icu4c/source/data/locales/es_419.txt b/icu4c/source/data/locales/es_419.txt index 0cb1bb544922..61f9ac986a9a 100644 --- a/icu4c/source/data/locales/es_419.txt +++ b/icu4c/source/data/locales/es_419.txt @@ -11,15 +11,12 @@ es_419{ patternsLong{ decimalFormat{ 1000000000000{ - one{"0 billón"} other{"0 billón"} } 10000000000000{ - one{"00 billones"} other{"00 billones"} } 100000000000000{ - one{"000 billones"} other{"000 billones"} } } @@ -211,7 +208,7 @@ es_419{ y{"y–y G"} } GyM{ - y{"MM/y – MM/y GGGGG"} + y{"MM/y – MM/y GGGGG"} } MEd{ M{"E, d/M–E, d/M"} @@ -230,18 +227,18 @@ es_419{ } fallback{"{0}–{1}"} yM{ - M{"M/y – M/y GGGGG"} - y{"M/y – M/y GGGGG"} + M{"M/y – M/y GGGGG"} + y{"M/y – M/y GGGGG"} } yMEd{ - M{"E, d/M/y – E, d/M/y GGGGG"} - d{"E, d/M/y – E, d/M/y GGGGG"} - y{"E, d/M/y – E, d/M/y GGGGG"} + M{"E, d/M/y – E, d/M/y GGGGG"} + d{"E, d/M/y – E, d/M/y GGGGG"} + y{"E, d/M/y – E, d/M/y GGGGG"} } yMd{ - M{"d/M/y – d/M/y GGGGG"} - d{"d/M/y – d/M/y GGGGG"} - y{"d/M/y – d/M/y GGGGG"} + M{"d/M/y – d/M/y GGGGG"} + d{"d/M/y – d/M/y GGGGG"} + y{"d/M/y – d/M/y GGGGG"} } } } @@ -312,58 +309,58 @@ es_419{ } intervalFormats{ GyM{ - G{"MM/y GGGGG – MM/y GGGGG"} - M{"MM/y – MM/y GGGGG"} - y{"MM/y – MM/y GGGGG"} + G{"MM/y GGGGG – MM/y GGGGG"} + M{"MM/y – MM/y GGGGG"} + y{"MM/y – MM/y GGGGG"} } GyMEd{ - G{"E, dd/MM/y GGGGG – E, dd/MM/y GGGGG"} - M{"E, dd/MM/y – E, dd/MM/y GGGGG"} - d{"E, dd/MM/y – E, dd/MM/y GGGGG"} - y{"E, dd/MM/y – E, dd/MM/y GGGGG"} + G{"E, dd/MM/y GGGGG – E, dd/MM/y GGGGG"} + M{"E, dd/MM/y – E, dd/MM/y GGGGG"} + d{"E, dd/MM/y – E, dd/MM/y GGGGG"} + y{"E, dd/MM/y – E, dd/MM/y GGGGG"} } GyMMMEd{ - G{"E d MMM 'de' y G – E d MMM 'de' y G"} - M{"E d MMM – E d MMM 'de' y G"} - d{"E d MMM – E d MMM 'de' y G"} - y{"E d MMM 'de' y – E d MMM 'de' y G"} + G{"E d MMM 'de' y G – E d MMM 'de' y G"} + M{"E d MMM – E d MMM 'de' y G"} + d{"E d MMM – E d MMM 'de' y G"} + y{"E d MMM 'de' y – E d MMM 'de' y G"} } GyMMMd{ - G{"d MMM 'de' y G – d MMM 'de' y G"} - M{"d MMM – d MMM 'de' y G"} + G{"d MMM 'de' y G – d MMM 'de' y G"} + M{"d MMM – d MMM 'de' y G"} d{"d–d MMM 'de' y G"} - y{"d MMM 'de' y – d MMM 'de' y G"} + y{"d MMM 'de' y – d MMM 'de' y G"} } GyMd{ - G{"dd/MM/y GGGGG – dd/MM/y GGGGG"} - M{"dd/MM/y – dd/MM/y GGGGG"} - d{"dd/MM/y – dd/MM/y GGGGG"} - y{"dd/MM/y – dd/MM/y GGGGG"} + G{"dd/MM/y GGGGG – dd/MM/y GGGGG"} + M{"dd/MM/y – dd/MM/y GGGGG"} + d{"dd/MM/y – dd/MM/y GGGGG"} + y{"dd/MM/y – dd/MM/y GGGGG"} } MEd{ M{"E, d/M–E, d/M"} d{"E, d/M–E, d/M"} } MMMEd{ - M{"E, d 'de' MMM – E, d 'de' MMM"} - d{"E, d 'de' MMM – E, d 'de' MMM"} + M{"E, d 'de' MMM – E, d 'de' MMM"} + d{"E, d 'de' MMM – E, d 'de' MMM"} } MMMd{ - M{"d 'de' MMM – d 'de' MMM"} - d{"d – d 'de' MMM"} + M{"d 'de' MMM – d 'de' MMM"} + d{"d – d 'de' MMM"} } Md{ M{"d/M–d/M"} d{"d/M–d/M"} } h{ - a{"h a–h a"} + a{"h a–h a"} } hmv{ - a{"h:mm a–h:mm a v"} + a{"h:mm a–h:mm a v"} } hv{ - a{"h a–h a v"} + a{"h a–h a v"} } yM{ M{"M/y–M/y"} @@ -375,20 +372,20 @@ es_419{ y{"E, d/M/y–E, d/M/y"} } yMMM{ - y{"MMM 'de' y – MMM 'de' y"} + y{"MMM 'de' y – MMM 'de' y"} } yMMMEd{ - M{"E, d 'de' MMM – E, d 'de' MMM 'de' y"} - d{"E, d 'de' MMM – E, d 'de' MMM 'de' y"} - y{"E, d 'de' MMM 'de' y – E, d 'de' MMM 'de' y"} + M{"E, d 'de' MMM – E, d 'de' MMM 'de' y"} + d{"E, d 'de' MMM – E, d 'de' MMM 'de' y"} + y{"E, d 'de' MMM 'de' y – E, d 'de' MMM 'de' y"} } yMMMM{ y{"MMMM 'de' y–MMMM 'de' y"} } yMMMd{ - M{"d 'de' MMM – d 'de' MMM 'de' y"} - d{"d – d 'de' MMM 'de' y"} - y{"d 'de' MMM 'de' y – d 'de' MMM 'de' y"} + M{"d 'de' MMM – d 'de' MMM 'de' y"} + d{"d – d 'de' MMM 'de' y"} + y{"d 'de' MMM 'de' y – d 'de' MMM 'de' y"} } yMd{ M{"d/M/y–d/M/y"} diff --git a/icu4c/source/data/locales/es_AR.txt b/icu4c/source/data/locales/es_AR.txt index d1a27a1b8827..abcc1f0955a9 100644 --- a/icu4c/source/data/locales/es_AR.txt +++ b/icu4c/source/data/locales/es_AR.txt @@ -85,8 +85,8 @@ es_AR{ H{"HH–HH v"} } MEd{ - M{"E dd/MM – E dd/MM"} - d{"E dd/MM – E dd/MM"} + M{"E dd/MM – E dd/MM"} + d{"E dd/MM – E dd/MM"} } MMMEd{ M{"E d 'de' MMM 'al' E d 'de' MMM"} @@ -94,34 +94,34 @@ es_AR{ } MMMd{ M{"d 'de' MMM 'al' d 'de' MMM"} - d{"dd – dd 'de' MM"} + d{"dd – dd 'de' MM"} } Md{ - M{"dd/MM – dd/MM"} - d{"dd/MM – dd/MM"} + M{"dd/MM – dd/MM"} + d{"dd/MM – dd/MM"} } fallback{"{0} a el {1}"} h{ - a{"h a – h a"} + a{"h a – h a"} } hm{ - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} + a{"h:mm a – h:mm a v"} } hv{ - a{"h a – h a v"} + a{"h a – h a v"} } yM{ - M{"MM/y – MM/y"} - y{"MM/y – MM/y"} + M{"MM/y – MM/y"} + y{"MM/y – MM/y"} } yMEd{ - M{"E, dd/MM/y – E, dd/MM/y"} - d{"E, dd/MM/y – E, dd/MM/y"} - y{"E, dd/MM/y – E, dd/MM/y"} + M{"E, dd/MM/y – E, dd/MM/y"} + d{"E, dd/MM/y – E, dd/MM/y"} + y{"E, dd/MM/y – E, dd/MM/y"} } yMMM{ y{"MMM 'de' y 'a' MMM 'de' y"} @@ -140,9 +140,9 @@ es_AR{ y{"d 'de' MMM 'de' y 'al' d 'de' MMM 'de' y"} } yMd{ - M{"dd/MM/y – dd/MM/y"} - d{"dd/MM/y – dd/MM/y"} - y{"dd/MM/y – dd/MM/y"} + M{"dd/MM/y – dd/MM/y"} + d{"dd/MM/y – dd/MM/y"} + y{"dd/MM/y – dd/MM/y"} } } quarters{ diff --git a/icu4c/source/data/locales/es_CL.txt b/icu4c/source/data/locales/es_CL.txt index 667d7c5ff9c4..7661877c6405 100644 --- a/icu4c/source/data/locales/es_CL.txt +++ b/icu4c/source/data/locales/es_CL.txt @@ -50,8 +50,8 @@ es_CL{ } intervalFormats{ MEd{ - M{"E dd-MM – E dd-MM"} - d{"E dd-MM – E dd-MM"} + M{"E dd-MM – E dd-MM"} + d{"E dd-MM – E dd-MM"} } MMMEd{ M{"E d 'de' MMM 'al' E d 'de' MMM"} @@ -61,18 +61,18 @@ es_CL{ M{"d 'de' MMM 'al' d 'de' MMM"} } Md{ - M{"dd-MM – dd-MM"} - d{"dd-MM – dd-MM"} + M{"dd-MM – dd-MM"} + d{"dd-MM – dd-MM"} } fallback{"{0} a el {1}"} yM{ - M{"MM-y – MM-y G"} - y{"MM-y – MM-y G"} + M{"MM-y – MM-y G"} + y{"MM-y – MM-y G"} } yMEd{ - M{"E dd-MM-y – E dd-MM-y G"} - d{"E dd-MM-y – E dd-MM-y G"} - y{"E dd-MM-y – E dd-MM-y G"} + M{"E dd-MM-y – E dd-MM-y G"} + d{"E dd-MM-y – E dd-MM-y G"} + y{"E dd-MM-y – E dd-MM-y G"} } yMMM{ y{"MMM 'de' y 'a' MMM 'de' y G"} @@ -87,9 +87,9 @@ es_CL{ y{"d 'de' MMM 'de' y 'al' d 'de' MMM 'de' y G"} } yMd{ - M{"dd-MM-y – dd-MM-y G"} - d{"dd-MM-y – dd-MM-y G"} - y{"dd-MM-y – dd-MM-y G"} + M{"dd-MM-y – dd-MM-y G"} + d{"dd-MM-y – dd-MM-y G"} + y{"dd-MM-y – dd-MM-y G"} } } } @@ -142,8 +142,8 @@ es_CL{ } intervalFormats{ MEd{ - M{"E dd-MM – E dd-MM"} - d{"E dd-MM – E dd-MM"} + M{"E dd-MM – E dd-MM"} + d{"E dd-MM – E dd-MM"} } MMMEd{ M{"E d 'de' MMM 'al' E d 'de' MMM"} @@ -153,21 +153,21 @@ es_CL{ M{"d 'de' MMM 'al' d 'de' MMM"} } Md{ - M{"dd-MM – dd-MM"} - d{"dd-MM – dd-MM"} + M{"dd-MM – dd-MM"} + d{"dd-MM – dd-MM"} } fallback{"{0} a el {1}"} hm{ - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } yM{ - M{"MM-y – MM-y"} - y{"MM-y – MM-y"} + M{"MM-y – MM-y"} + y{"MM-y – MM-y"} } yMEd{ - M{"E dd-MM-y – E dd-MM-y"} - d{"E dd-MM-y – E dd-MM-y"} + M{"E dd-MM-y – E dd-MM-y"} + d{"E dd-MM-y – E dd-MM-y"} } yMMM{ y{"MMM 'de' y 'a' MMM 'de' y"} @@ -182,9 +182,9 @@ es_CL{ y{"d 'de' MMM 'de' y 'al' d 'de' MMM 'de' y"} } yMd{ - M{"dd-MM-y – dd-MM-y"} - d{"dd-MM-y – dd-MM-y"} - y{"dd-MM-y – dd-MM-y"} + M{"dd-MM-y – dd-MM-y"} + d{"dd-MM-y – dd-MM-y"} + y{"dd-MM-y – dd-MM-y"} } } monthNames{ diff --git a/icu4c/source/data/locales/es_CO.txt b/icu4c/source/data/locales/es_CO.txt index 63e7be44b686..c6d8028d9bd0 100644 --- a/icu4c/source/data/locales/es_CO.txt +++ b/icu4c/source/data/locales/es_CO.txt @@ -17,10 +17,10 @@ es_CO{ calendar{ generic{ DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE, d 'de' MMMM 'de' y G", "d 'de' MMMM 'de' y G", "d/MM/y G", @@ -110,10 +110,10 @@ es_CO{ } gregorian{ DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE, d 'de' MMMM 'de' y", "d 'de' MMMM 'de' y", "d/MM/y", @@ -231,22 +231,22 @@ es_CO{ } fallback{"{0} ‘al’ {1}"} h{ - a{"h a 'a' h a"} - h{"h 'a' h a"} + a{"h a 'a' h a"} + h{"h 'a' h a"} } hm{ - a{"h:mm a 'a' h:mm a"} - h{"h:mm 'a' h:mm a"} - m{"h:mm 'a' h:mm a"} + a{"h:mm a 'a' h:mm a"} + h{"h:mm 'a' h:mm a"} + m{"h:mm 'a' h:mm a"} } hmv{ - a{"h:mm a 'a' h:mm a v"} - h{"h:mm 'a' h:mm a v"} - m{"h:mm 'a' h:mm a v"} + a{"h:mm a 'a' h:mm a v"} + h{"h:mm 'a' h:mm a v"} + m{"h:mm 'a' h:mm a v"} } hv{ - a{"h a 'a' h a v"} - h{"h 'a' h a v"} + a{"h a 'a' h a v"} + h{"h 'a' h a v"} } y{ y{"y 'a' y"} diff --git a/icu4c/source/data/locales/es_DO.txt b/icu4c/source/data/locales/es_DO.txt index e9e934ce2568..48b6497a16c8 100644 --- a/icu4c/source/data/locales/es_DO.txt +++ b/icu4c/source/data/locales/es_DO.txt @@ -13,10 +13,10 @@ es_DO{ calendar{ generic{ DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE, d 'de' MMMM 'de' y G", "d 'de' MMMM 'de' y G", "dd/MM/y G", @@ -40,10 +40,10 @@ es_DO{ } gregorian{ DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE, d 'de' MMMM 'de' y", "d 'de' MMMM 'de' y", "d MMM y", diff --git a/icu4c/source/data/locales/es_GT.txt b/icu4c/source/data/locales/es_GT.txt index 7c799f55ff07..627ab07c5631 100644 --- a/icu4c/source/data/locales/es_GT.txt +++ b/icu4c/source/data/locales/es_GT.txt @@ -44,6 +44,44 @@ es_GT{ other{"¤000MRD"} } } + currencyFormat%alphaNextToNumber{ + 1000{ + one{"¤ 0K"} + other{"¤ 0K"} + } + 10000{ + one{"¤ 00K"} + other{"¤ 00K"} + } + 100000{ + one{"¤ 000K"} + other{"¤ 000K"} + } + 1000000{ + one{"¤ 0M"} + other{"¤ 0M"} + } + 10000000{ + one{"¤ 00M"} + other{"¤ 00M"} + } + 100000000{ + one{"¤ 000M"} + other{"¤ 000M"} + } + 1000000000{ + one{"¤ 0000M"} + other{"¤ 0000M"} + } + 10000000000{ + one{"¤ 00MRD"} + other{"¤ 00MRD"} + } + 100000000000{ + one{"¤ 000MRD"} + other{"¤ 000MRD"} + } + } } } } @@ -76,8 +114,8 @@ es_GT{ } intervalFormats{ MEd{ - M{"E d/MM – E d/MM"} - d{"E d/MM – E d/MM"} + M{"E d/MM – E d/MM"} + d{"E d/MM – E d/MM"} } MMMEd{ M{"E d 'de' MMM 'al' E d 'de' MMM"} @@ -87,18 +125,18 @@ es_GT{ M{"d 'de' MMM 'al' d 'de' MMM"} } Md{ - M{"d/MM – d/MM"} - d{"d/MM – d/MM"} + M{"d/MM – d/MM"} + d{"d/MM – d/MM"} } fallback{"{0} a el {1}"} yM{ - M{"MM/y – MM/y"} - y{"MM/y – MM/y"} + M{"MM/y – MM/y"} + y{"MM/y – MM/y"} } yMEd{ - M{"E d/MM/y – E d/MM/y"} - d{"E d/MM/y – E d/MM/y"} - y{"E d/MM/y – E d/MM/y"} + M{"E d/MM/y – E d/MM/y"} + d{"E d/MM/y – E d/MM/y"} + y{"E d/MM/y – E d/MM/y"} } yMMM{ M{"MMM–MMM 'de' y"} @@ -115,9 +153,9 @@ es_GT{ y{"d 'de' MMM 'de' y 'al' d 'de' MMM 'de' y"} } yMd{ - M{"d/MM/y – d/MM/y"} - d{"d/MM/y – d/MM/y"} - y{"d/MM/y – d/MM/y"} + M{"d/MM/y – d/MM/y"} + d{"d/MM/y – d/MM/y"} + y{"d/MM/y – d/MM/y"} } } } @@ -149,8 +187,8 @@ es_GT{ } intervalFormats{ MEd{ - M{"E d/MM – E d/MM"} - d{"E d/MM – E d/MM"} + M{"E d/MM – E d/MM"} + d{"E d/MM – E d/MM"} } MMMEd{ M{"E d 'de' MMM 'al' E d 'de' MMM"} @@ -160,24 +198,24 @@ es_GT{ M{"d 'de' MMM 'al' d 'de' MMM"} } Md{ - M{"d/MM – d/MM"} - d{"d/MM – d/MM"} + M{"d/MM – d/MM"} + d{"d/MM – d/MM"} } hm{ - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } y{ y{"y 'al' y"} } yM{ - M{"MM/y – MM/y"} - y{"MM/y – MM/y"} + M{"MM/y – MM/y"} + y{"MM/y – MM/y"} } yMEd{ - M{"E d/MM/y – E d/MM/y"} - d{"E d/MM/y – E d/MM/y"} - y{"E d/MM/y – E d/MM/y"} + M{"E d/MM/y – E d/MM/y"} + d{"E d/MM/y – E d/MM/y"} + y{"E d/MM/y – E d/MM/y"} } yMMM{ y{"MMM 'de' y 'a' MMM 'de' y"} @@ -192,9 +230,9 @@ es_GT{ y{"d 'de' MMM 'de' y 'al' d 'de' MMM 'de' y"} } yMd{ - M{"d/MM/y – d/MM/y"} - d{"d/MM/y – d/MM/y"} - y{"d/MM/y – d/MM/y"} + M{"d/MM/y – d/MM/y"} + d{"d/MM/y – d/MM/y"} + y{"d/MM/y – d/MM/y"} } } } diff --git a/icu4c/source/data/locales/es_MX.txt b/icu4c/source/data/locales/es_MX.txt index 96725f255c6f..c107644edf66 100644 --- a/icu4c/source/data/locales/es_MX.txt +++ b/icu4c/source/data/locales/es_MX.txt @@ -9,15 +9,12 @@ es_MX{ patternsLong{ decimalFormat{ 1000000000000{ - one{"0 billón"} other{"0 billones"} } 10000000000000{ - one{"00 billones"} other{"00 billones"} } 100000000000000{ - one{"000 billones"} other{"000 billones"} } } @@ -109,9 +106,9 @@ es_MX{ } availableFormats{ MMMEd{"E d MMM"} - h{"hh a"} - hm{"hh:mm a"} - hms{"hh:mm:ss a"} + h{"hh a"} + hm{"hh:mm a"} + hms{"hh:mm:ss a"} yyyyMEd{"E, d/M/y GGGGG"} yyyyMMM{"MMM y G"} yyyyMMMEd{"EEE, d MMM y G"} @@ -120,13 +117,13 @@ es_MX{ } intervalFormats{ Md{ - M{"d/M – d/M"} - d{"d/M – d/M"} + M{"d/M – d/M"} + d{"d/M – d/M"} } fallback{"{0} – {1}"} yM{ - M{"M/y – M/y G"} - y{"M/y – M/y G"} + M{"M/y – M/y G"} + y{"M/y – M/y G"} } yMEd{ M{"E, d/M/y–E, d/M/y G"} @@ -134,9 +131,9 @@ es_MX{ y{"E, d/M/y–E, d/M/y G"} } yMd{ - M{"d/M/y – d/M/y G"} - d{"d/M/y – d/M/y G"} - y{"d/M/y – d/M/y G"} + M{"d/M/y – d/M/y G"} + d{"d/M/y – d/M/y G"} + y{"d/M/y – d/M/y G"} } } } @@ -169,8 +166,8 @@ es_MX{ availableFormats{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} GyMMMd{"d MMM y G"} Hmsvvvv{"HH:mm:ss (vvvv)"} MMMEd{"E d 'de' MMM"} @@ -207,21 +204,21 @@ es_MX{ } intervalFormats{ GyMMM{ - G{"MMM 'de' y G – MMM 'de' y G"} + G{"MMM 'de' y G – MMM 'de' y G"} M{"MMM–MMM 'de' y G"} - y{"MMM 'de' y – MMM 'de' y G"} + y{"MMM 'de' y – MMM 'de' y G"} } GyMMMEd{ - G{"E d 'de' MMM 'de' y G – E d 'de' MMM 'de' y G"} - M{"E d 'de' MMM – E d 'de' MMM 'de' y G"} - d{"E d 'de' MMM – E d 'de' MMM 'de' y G"} - y{"E d 'de' MMM 'de' y – E d 'de' MMM 'de' y G"} + G{"E d 'de' MMM 'de' y G – E d 'de' MMM 'de' y G"} + M{"E d 'de' MMM – E d 'de' MMM 'de' y G"} + d{"E d 'de' MMM – E d 'de' MMM 'de' y G"} + y{"E d 'de' MMM 'de' y – E d 'de' MMM 'de' y G"} } GyMMMd{ - G{"d 'de' MMM 'de' y G – d 'de' MMM 'de' y G"} - M{"d 'de' MMM – d 'de' MMM 'de' y G"} + G{"d 'de' MMM 'de' y G – d 'de' MMM 'de' y G"} + M{"d 'de' MMM – d 'de' MMM 'de' y G"} d{"d–d 'de' MMM 'de' y G"} - y{"d 'de' MMM 'de' y – d 'de' MMM 'de' y G"} + y{"d 'de' MMM 'de' y – d 'de' MMM 'de' y G"} } H{ H{"HH–HH"} @@ -239,61 +236,61 @@ es_MX{ } MEd{ M{"E, M/d–E, M/d"} - d{"E, d/M – E, d/M"} + d{"E, d/M – E, d/M"} } MMMEd{ - M{"E d 'de' MMM – E d 'de' MMM"} - d{"E d 'de' MMM – E d 'de' MMM"} + M{"E d 'de' MMM – E d 'de' MMM"} + d{"E d 'de' MMM – E d 'de' MMM"} } MMMd{ d{"d–d 'de' MMM"} } Md{ - M{"d/M – d/M"} - d{"d/M – d/M"} + M{"d/M – d/M"} + d{"d/M – d/M"} } fallback{"{0} – {1}"} h{ - a{"h a – h a"} + a{"h a – h a"} } hm{ - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} + a{"h:mm a – h:mm a v"} } hv{ - a{"h a – h a v"} + a{"h a – h a v"} } yM{ - M{"M/y – M/y"} - y{"M/y – M/y"} + M{"M/y – M/y"} + y{"M/y – M/y"} } yMEd{ - M{"E, d/M/y – E, d/M/y"} - d{"E, d/M/y – E, d/M/y"} - y{"E, d/M/y – E, d/M/y"} + M{"E, d/M/y – E, d/M/y"} + d{"E, d/M/y – E, d/M/y"} + y{"E, d/M/y – E, d/M/y"} } yMMM{ M{"MMM–MMM 'de' y"} } yMMMEd{ - M{"E d 'de' MMM – E d 'de' MMM 'de' y"} - d{"E d 'de' MMM – E d 'de' MMM 'de' y"} - y{"E d 'de' MMM 'de' y – E d 'de' MMM 'de' y"} + M{"E d 'de' MMM – E d 'de' MMM 'de' y"} + d{"E d 'de' MMM – E d 'de' MMM 'de' y"} + y{"E d 'de' MMM 'de' y – E d 'de' MMM 'de' y"} } yMMMM{ - y{"MMMM 'de' y – MMMM 'de' y"} + y{"MMMM 'de' y – MMMM 'de' y"} } yMMMd{ - M{"d 'de' MMM – d 'de' MMM y"} + M{"d 'de' MMM – d 'de' MMM y"} d{"d–d 'de' MMM 'de' y"} } yMd{ - M{"d/M/y – d/M/y"} - d{"d/M/y – d/M/y"} - y{"d/M/y – d/M/y"} + M{"d/M/y – d/M/y"} + d{"d/M/y – d/M/y"} + y{"d/M/y – d/M/y"} } } quarters{ diff --git a/icu4c/source/data/locales/es_PA.txt b/icu4c/source/data/locales/es_PA.txt index 813402ab8176..f77d642c1e36 100644 --- a/icu4c/source/data/locales/es_PA.txt +++ b/icu4c/source/data/locales/es_PA.txt @@ -6,10 +6,10 @@ es_PA{ calendar{ generic{ DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE, d 'de' MMMM 'de' y G", "d 'de' MMMM 'de' y G", "MM/dd/y G", @@ -67,10 +67,10 @@ es_PA{ } gregorian{ DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE, d 'de' MMMM 'de' y", "d 'de' MMMM 'de' y", "MM/dd/y", @@ -125,8 +125,8 @@ es_PA{ M{"d 'de' MMM 'al' d 'de' MMM"} } yM{ - M{"MM/y – MM/y"} - y{"MM/y – MM/y"} + M{"MM/y – MM/y"} + y{"MM/y – MM/y"} } yMMM{ y{"MMM 'de' y 'a' MMM 'de' y"} diff --git a/icu4c/source/data/locales/es_PH.txt b/icu4c/source/data/locales/es_PH.txt index 101f9ce72d52..eac7bd4d0106 100644 --- a/icu4c/source/data/locales/es_PH.txt +++ b/icu4c/source/data/locales/es_PH.txt @@ -5,10 +5,10 @@ es_PH{ calendar{ gregorian{ DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE, d 'de' MMMM 'de' y", "d 'de' MMMM 'de' y", "d MMM y", diff --git a/icu4c/source/data/locales/es_PR.txt b/icu4c/source/data/locales/es_PR.txt index c4165c108e78..b3b573dc9479 100644 --- a/icu4c/source/data/locales/es_PR.txt +++ b/icu4c/source/data/locales/es_PR.txt @@ -6,10 +6,10 @@ es_PR{ calendar{ generic{ DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE, d 'de' MMMM 'de' y G", "d 'de' MMMM 'de' y G", "MM/dd/y G", @@ -40,10 +40,10 @@ es_PR{ } gregorian{ DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE, d 'de' MMMM 'de' y", "d 'de' MMMM 'de' y", "MM/dd/y", diff --git a/icu4c/source/data/locales/es_PY.txt b/icu4c/source/data/locales/es_PY.txt index f537082056b2..5f95d619354e 100644 --- a/icu4c/source/data/locales/es_PY.txt +++ b/icu4c/source/data/locales/es_PY.txt @@ -53,13 +53,13 @@ es_PY{ d{"d/M 'al' d/M"} } h{ - a{"h a 'a' h a"} - h{"h 'a' h a"} + a{"h a 'a' h a"} + h{"h 'a' h a"} } hm{ - a{"h:mm a 'a' h:mm a"} - h{"h:mm 'a' h:mm a"} - m{"h:mm 'a' h:mm a"} + a{"h:mm a 'a' h:mm a"} + h{"h:mm 'a' h:mm a"} + m{"h:mm 'a' h:mm a"} } yMMM{ M{"MMM 'a' MMM y"} diff --git a/icu4c/source/data/locales/es_US.txt b/icu4c/source/data/locales/es_US.txt index 129b255b5cc0..30882bb710e4 100644 --- a/icu4c/source/data/locales/es_US.txt +++ b/icu4c/source/data/locales/es_US.txt @@ -59,27 +59,27 @@ es_US{ } intervalFormats{ GyMEd{ - G{"E, dd/MM/y GGGGG – E, dd/MM/y GGGGG"} - M{"E, dd/MM/y – E, dd/MM/y GGGGG"} - d{"E, dd/MM/y – E, dd/MM/y GGGGG"} - y{"E, dd/MM/y – E, dd/MM/y GGGGG"} + G{"E, dd/MM/y GGGGG – E, dd/MM/y GGGGG"} + M{"E, dd/MM/y – E, dd/MM/y GGGGG"} + d{"E, dd/MM/y – E, dd/MM/y GGGGG"} + y{"E, dd/MM/y – E, dd/MM/y GGGGG"} } Md{ - M{"d/M – d/M"} - d{"d/M – d/M"} + M{"d/M – d/M"} + d{"d/M – d/M"} } fallback{"{0}-{1}"} yMMMd{ - M{"d 'de' MMM – d 'de' MMM 'de' y G"} + M{"d 'de' MMM – d 'de' MMM 'de' y G"} } } } gregorian{ DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE, d 'de' MMMM 'de' y", "d 'de' MMMM 'de' y", "d MMM y", @@ -103,8 +103,8 @@ es_US{ availableFormats{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} GyMMMd{"d MMM y G"} Hmsvvvv{"HH:mm:ss (vvvv)"} MMMEd{"E, d 'de' MMM"} @@ -144,39 +144,39 @@ es_US{ H{"HH–HH v"} } MEd{ - M{"E, d/M – E, d/M"} - d{"E, d/M – E, d/M"} + M{"E, d/M – E, d/M"} + d{"E, d/M – E, d/M"} } MMMd{ d{"d–d 'de' MMM"} } fallback{"{0} – {1}"} h{ - a{"h a – h a"} + a{"h a – h a"} } hm{ - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} + a{"h:mm a – h:mm a v"} } hv{ - a{"h a – h a v"} + a{"h a – h a v"} } yMEd{ - M{"E, d/M/y – E, d/M/y"} - d{"E, d/M/y – E, d/M/y"} - y{"E, d/M/y – E, d/M/y"} + M{"E, d/M/y – E, d/M/y"} + d{"E, d/M/y – E, d/M/y"} + y{"E, d/M/y – E, d/M/y"} } yMMM{ M{"MMM–MMM 'de' y"} } yMMMM{ - y{"MMMM 'de' y – MMMM 'de' y"} + y{"MMMM 'de' y – MMMM 'de' y"} } yMMMd{ - M{"d 'de' MMM – d 'de' MMM y"} + M{"d 'de' MMM – d 'de' MMM y"} d{"d–d 'de' MMM 'de' y"} } } diff --git a/icu4c/source/data/locales/es_VE.txt b/icu4c/source/data/locales/es_VE.txt index d016d645e03e..44d65740c6d3 100644 --- a/icu4c/source/data/locales/es_VE.txt +++ b/icu4c/source/data/locales/es_VE.txt @@ -17,10 +17,10 @@ es_VE{ calendar{ gregorian{ DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE, d 'de' MMMM 'de' y", "d 'de' MMMM 'de' y", "d MMM y", diff --git a/icu4c/source/data/locales/et.txt b/icu4c/source/data/locales/et.txt index 2b3823581b23..d935fa6b5b14 100644 --- a/icu4c/source/data/locales/et.txt +++ b/icu4c/source/data/locales/et.txt @@ -292,6 +292,12 @@ et{ "dd.MM.y G", "dd.MM.y GGGGG", "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + } + DateTimePatterns%atTime{ "{1}, 'kell' {0}", "{1}, 'kell' {0}", "{1} {0}", @@ -317,8 +323,8 @@ et{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"E, d"} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"y G"} GyMMM{"MMM y G"} GyMMMEd{"E, d. MMMM y G"} @@ -336,9 +342,9 @@ et{ MMMd{"d. MMM"} Md{"d.M"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} mmss{"mm:ss"} ms{"mm:ss"} y{"y G"} @@ -355,39 +361,39 @@ et{ } intervalFormats{ Gy{ - G{"y G – y G"} + G{"y G – y G"} y{"y–y G"} } GyM{ - G{"M.y GGGGG – M.y GGGGG"} + G{"M.y GGGGG – M.y GGGGG"} M{"M.y–M.y GGGGG"} y{"M.y–M.y GGGGG"} } GyMEd{ - G{"E, d.MM.y GGGGG – E, d.MM.y GGGGG"} - M{"E, d.MM.y – E, d.MM.y GGGGG"} - d{"E, d.MM.y – E, d.MM.y GGGGG"} - y{"E, d.MM.y – E, d.MM.y GGGGG"} + G{"E, d.MM.y GGGGG – E, d.MM.y GGGGG"} + M{"E, d.MM.y – E, d.MM.y GGGGG"} + d{"E, d.MM.y – E, d.MM.y GGGGG"} + y{"E, d.MM.y – E, d.MM.y GGGGG"} } GyMMM{ - G{"MMM y G – MMM y G"} + G{"MMM y G – MMM y G"} M{"MMM–MMM y G"} - y{"MMM y G – MMM y"} + y{"MMM y G – MMM y"} } GyMMMEd{ - G{"E, d. MMM y G – E, d. MMM y G"} - M{"E, d. MMM y G – E, d. MMM"} - d{"E, d. MMM y G – E, d. MMM"} - y{"E, d. MMM y G – E, d. MMM y"} + G{"E, d. MMM y G – E, d. MMM y G"} + M{"E, d. MMM y G – E, d. MMM"} + d{"E, d. MMM y G – E, d. MMM"} + y{"E, d. MMM y G – E, d. MMM y"} } GyMMMd{ - G{"d. MMM y G – d. MMM y G"} - M{"d. MMM y G – d. MMM"} + G{"d. MMM y G – d. MMM y G"} + M{"d. MMM y G – d. MMM"} d{"d.–d. MMM y G"} - y{"d. MMM y G – d. MMM y"} + y{"d. MMM y G – d. MMM y"} } GyMd{ - G{"d.MM.y GGGGG – d.MM.y GGGGG"} + G{"d.MM.y GGGGG – d.MM.y GGGGG"} M{"d.MM.y–d.MM.y GGGGG"} d{"d.MM.y–d.MM.y GGGGG"} y{"d.MM.y–d.MM.y GGGGG"} @@ -410,18 +416,18 @@ et{ M{"M–M"} } MEd{ - M{"E, dd.MM – E, dd.MM"} - d{"E, dd.MM – E, dd.MM"} + M{"E, dd.MM – E, dd.MM"} + d{"E, dd.MM – E, dd.MM"} } MMM{ M{"MMM–MMM"} } MMMEd{ - M{"E, d. MMM – E, d. MMM"} - d{"E, d. MMM – E, d. MMM"} + M{"E, d. MMM – E, d. MMM"} + d{"E, d. MMM – E, d. MMM"} } MMMd{ - M{"d. MMM – d. MMM"} + M{"d. MMM – d. MMM"} d{"d.–d. MMM"} } Md{ @@ -433,19 +439,19 @@ et{ } fallback{"{0}–{1}"} h{ - h{"h–h a"} + h{"h–h a"} } hm{ - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - h{"h–h a v"} + h{"h–h a v"} } y{ y{"y–y G"} @@ -455,27 +461,27 @@ et{ y{"MM.y–MM.y G"} } yMEd{ - M{"E, dd.MM.y – E, dd.MM.y G"} - d{"E, dd.MM.y – E, dd.MM.y G"} - y{"E, dd.MM.y – E, dd.MM.y G"} + M{"E, dd.MM.y – E, dd.MM.y G"} + d{"E, dd.MM.y – E, dd.MM.y G"} + y{"E, dd.MM.y – E, dd.MM.y G"} } yMMM{ M{"MMM–MMM y G"} - y{"MMM y – MMM y G"} + y{"MMM y – MMM y G"} } yMMMEd{ - M{"E, d. MMM – E, d. MMM y G"} - d{"E, d. MMM – E, d. MMM y G"} - y{"E, d. MMM y – E, d. MMM y G"} + M{"E, d. MMM – E, d. MMM y G"} + d{"E, d. MMM – E, d. MMM y G"} + y{"E, d. MMM y – E, d. MMM y G"} } yMMMM{ M{"MMMM–MMMM y G"} - y{"MMMM y – MMMM y G"} + y{"MMMM y – MMMM y G"} } yMMMd{ - M{"d. MMM – d. MMM y G"} + M{"d. MMM – d. MMM y G"} d{"d.–d. MMM y G"} - y{"d. MMM y – d. MMM y G"} + y{"d. MMM y – d. MMM y G"} } yMd{ M{"dd.MM.y–dd.MM.y G"} @@ -535,8 +541,8 @@ et{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"E, d"} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"y G"} GyMMM{"MMM y G"} GyMMMEd{"E, d. MMMM y G"} @@ -560,11 +566,11 @@ et{ MMMd{"d. MMM"} Md{"d.M"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} - hmsv{"h:mm:ss a v"} - hmv{"h:mm a v"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} + hmsv{"h:mm:ss a v"} + hmv{"h:mm a v"} mmss{"mm:ss"} ms{"mm:ss"} y{"y"} @@ -748,39 +754,39 @@ et{ } intervalFormats{ Gy{ - G{"y G – y G"} + G{"y G – y G"} y{"y–y G"} } GyM{ - G{"M.y GGGGG – M.y GGGGG"} + G{"M.y GGGGG – M.y GGGGG"} M{"M.y–M.y GGGGG"} y{"M.y–M.y GGGGG"} } GyMEd{ - G{"E, d.MM.y GGGGG – E, d.MM.y GGGGG"} - M{"E, d.MM.y – E, d.MM.y GGGGG"} - d{"E, d.MM.y – E, d.MM.y GGGGG"} - y{"E, d.MM.y – E, d.MM.y GGGGG"} + G{"E, d.MM.y GGGGG – E, d.MM.y GGGGG"} + M{"E, d.MM.y – E, d.MM.y GGGGG"} + d{"E, d.MM.y – E, d.MM.y GGGGG"} + y{"E, d.MM.y – E, d.MM.y GGGGG"} } GyMMM{ - G{"MMM y G – MMM y G"} + G{"MMM y G – MMM y G"} M{"MMM–MMM y G"} - y{"MMM y – MMM y G"} + y{"MMM y – MMM y G"} } GyMMMEd{ - G{"E, d. MMM y G – E, d. MMM y G"} - M{"E, d. MMM – E, d. MMM y G"} - d{"E, d. MMM – E, d. MMM y G"} - y{"E, d. MMM y – E, d. MMM y G"} + G{"E, d. MMM y G – E, d. MMM y G"} + M{"E, d. MMM – E, d. MMM y G"} + d{"E, d. MMM – E, d. MMM y G"} + y{"E, d. MMM y – E, d. MMM y G"} } GyMMMd{ - G{"d. MMM y G – d. MMM y G"} - M{"d. MMM – d. MMM y G"} + G{"d. MMM y G – d. MMM y G"} + M{"d. MMM – d. MMM y G"} d{"d.–d. MMM y G"} - y{"d. MMM y – d. MMM y G"} + y{"d. MMM y – d. MMM y G"} } GyMd{ - G{"d.MM.y GGGGG – d.MM.y GGGGG"} + G{"d.MM.y GGGGG – d.MM.y GGGGG"} M{"d.MM.y–d.MM.y GGGGG"} d{"d.MM.y–d.MM.y GGGGG"} y{"d.MM.y–d.MM.y GGGGG"} @@ -803,18 +809,18 @@ et{ M{"MM–MM"} } MEd{ - M{"E, dd.MM – E, dd.MM"} - d{"E, dd.MM – E, dd.MM"} + M{"E, dd.MM – E, dd.MM"} + d{"E, dd.MM – E, dd.MM"} } MMM{ M{"MMM–MMM"} } MMMEd{ - M{"E, d. MMM – E, d. MMM"} - d{"E, d. MMM – E, d. MMM"} + M{"E, d. MMM – E, d. MMM"} + d{"E, d. MMM – E, d. MMM"} } MMMd{ - M{"d. MMM – d. MMM"} + M{"d. MMM – d. MMM"} d{"d.–d. MMM"} } Md{ @@ -826,22 +832,22 @@ et{ } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y"} @@ -851,27 +857,27 @@ et{ y{"MM.y–MM.y"} } yMEd{ - M{"E, dd.MM.y – E, dd.MM.y"} - d{"E, dd.MM.y – E, dd.MM.y"} - y{"E, dd.MM.y – E, dd.MM.y"} + M{"E, dd.MM.y – E, dd.MM.y"} + d{"E, dd.MM.y – E, dd.MM.y"} + y{"E, dd.MM.y – E, dd.MM.y"} } yMMM{ M{"MMM–MMM y"} - y{"MMM y – MMM y"} + y{"MMM y – MMM y"} } yMMMEd{ - M{"E, d. MMM – E, d. MMM y"} - d{"E, d. MMM – E, d. MMM y"} - y{"E, d. MMM y – E, d. MMM y"} + M{"E, d. MMM – E, d. MMM y"} + d{"E, d. MMM – E, d. MMM y"} + y{"E, d. MMM y – E, d. MMM y"} } yMMMM{ M{"MMMM–MMMM y"} - y{"MMMM y – MMMM y"} + y{"MMMM y – MMMM y"} } yMMMd{ - M{"d. MMM – d. MMM y"} + M{"d. MMM – d. MMM y"} d{"d.–d. MMM y"} - y{"d. MMM y – d. MMM y"} + y{"d. MMM y – d. MMM y"} } yMd{ M{"dd.MM.y–dd.MM.y"} diff --git a/icu4c/source/data/locales/eu.txt b/icu4c/source/data/locales/eu.txt index 66af20dc1f03..5d4512666a0f 100644 --- a/icu4c/source/data/locales/eu.txt +++ b/icu4c/source/data/locales/eu.txt @@ -268,8 +268,8 @@ eu{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"d, EEEE"} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"G. 'aroko' y. 'urtea'"} GyMMM{"G. 'aroko' y('e')'ko' MMMM"} GyMMMEd{"G. 'aroko' y('e')'ko' MMMM d, EEEE"} @@ -286,9 +286,9 @@ eu{ MMMd{"MMM'k' d"} Md{"MM/dd"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"mm:ss"} y{"y"} yM{"y/MM"} @@ -314,37 +314,37 @@ eu{ } intervalFormats{ Bh{ - B{"B h – B h"} + B{"B h – B h"} h{"B h–h"} } Bhm{ - B{"B h:mm – B h:mm"} + B{"B h:mm – B h:mm"} h{"B h:mm–h:mm"} m{"B h:mm–h:mm"} } GyMMM{ - G{"G y, MMM – G y, MMM"} + G{"G y, MMM – G y, MMM"} M{"G y, MMM–MMM"} - y{"G y, MMM – G y, MMM"} + y{"G y, MMM – G y, MMM"} } GyMMMEd{ - G{"G y, MMM d, E – G y, MMM d, E"} - M{"G y, MMM d, E – MMM d, E"} - d{"G y, MMM d, E – MMM d, E"} - y{"G y, MMM d, E – G y, MMM d, E"} + G{"G y, MMM d, E – G y, MMM d, E"} + M{"G y, MMM d, E – MMM d, E"} + d{"G y, MMM d, E – MMM d, E"} + y{"G y, MMM d, E – G y, MMM d, E"} } GyMMMd{ - G{"G y, MMM d – G y, MMM d"} - M{"G y, MMM d – MMM d"} + G{"G y, MMM d – G y, MMM d"} + M{"G y, MMM d – MMM d"} d{"G y, MMM d–d"} - y{"G y, MMM d – G y, MMM d"} + y{"G y, MMM d – G y, MMM d"} } H{ - H{"HH – HH"} + H{"HH – HH"} } Hm{ - H{"HH:mm – HH:mm"} - m{"HH:mm – HH:mm"} + H{"HH:mm – HH:mm"} + m{"HH:mm – HH:mm"} } Hmv{ H{"HH:mm–HH:mm v"} @@ -357,80 +357,80 @@ eu{ M{"MM–MM"} } MEd{ - M{"MM/dd, EEEE – MM/dd, EEEE"} - d{"MM/dd, EEEE – MM/dd, EEEE"} + M{"MM/dd, EEEE – MM/dd, EEEE"} + d{"MM/dd, EEEE – MM/dd, EEEE"} } MMM{ - M{"MMM – MMM"} + M{"MMM – MMM"} } MMMEd{ - M{"MMM'k' d, EEEE – MMM'k' d, EEEE"} - d{"MMM'k' d, EEEE – MMM'k' d, EEEE"} + M{"MMM'k' d, EEEE – MMM'k' d, EEEE"} + d{"MMM'k' d, EEEE – MMM'k' d, EEEE"} } MMMd{ - M{"MMM'k' d – MMMM'k' d"} + M{"MMM'k' d – MMMM'k' d"} d{"MMMM d–d"} } Md{ - M{"MM/dd – MM/dd"} - d{"MM/dd – MM/dd"} + M{"MM/dd – MM/dd"} + d{"MM/dd – MM/dd"} } d{ d{"dd–dd"} } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h – h a"} + a{"h a – h a"} + h{"h – h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm – h:mm a"} - m{"h:mm – h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm – h:mm a"} + m{"h:mm – h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm – h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm – h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"G y–y"} } yM{ - M{"G y/MM – y/MM"} - y{"G y/MM – y/MM"} + M{"G y/MM – y/MM"} + y{"G y/MM – y/MM"} } yMEd{ - M{"G y/MM/dd, EEEE – y/MM/dd, EEEE"} - d{"G y/MM/dd, EEEE – y/MM/dd, EEEE"} - y{"G y/MM/dd, EEEE – y/MM/dd, EEEE"} + M{"G y/MM/dd, EEEE – y/MM/dd, EEEE"} + d{"G y/MM/dd, EEEE – y/MM/dd, EEEE"} + y{"G y/MM/dd, EEEE – y/MM/dd, EEEE"} } yMMM{ M{"G y('e')'ko' MMMM–MMMM"} - y{"G y('e')'ko' MMMM – y('e')'ko' MMMM"} + y{"G y('e')'ko' MMMM – y('e')'ko' MMMM"} } yMMMEd{ - M{"G y('e')'ko' MMMM dd, EEEE – MMMM dd, EEEE"} - d{"G y('e')'ko' MMMM dd, EEEE – MMMM dd, EEEE"} - y{"G y('e')'ko' MMMM dd, EEEE – y('e')'ko' MMMM dd, EEEE"} + M{"G y('e')'ko' MMMM dd, EEEE – MMMM dd, EEEE"} + d{"G y('e')'ko' MMMM dd, EEEE – MMMM dd, EEEE"} + y{"G y('e')'ko' MMMM dd, EEEE – y('e')'ko' MMMM dd, EEEE"} } yMMMM{ - M{"G y('e')'ko' MMMM – MMMM"} - y{"G y('e')'ko' MMMM – y('e')'ko' MMMM"} + M{"G y('e')'ko' MMMM – MMMM"} + y{"G y('e')'ko' MMMM – y('e')'ko' MMMM"} } yMMMd{ - M{"G y('e')'ko' MMMM dd – MMMM dd"} + M{"G y('e')'ko' MMMM dd – MMMM dd"} d{"G y('e')'ko' MMMM dd–dd"} - y{"G y('e')'ko' MMMM dd – y('e')'ko' MMMM dd"} + y{"G y('e')'ko' MMMM dd – y('e')'ko' MMMM dd"} } yMd{ - M{"G y/MM/dd – y/MM/dd"} - d{"G y/MM/dd – y/MM/dd"} - y{"G y/MM/dd – y/MM/dd"} + M{"G y/MM/dd – y/MM/dd"} + d{"G y/MM/dd – y/MM/dd"} + y{"G y/MM/dd – y/MM/dd"} } } } @@ -485,8 +485,8 @@ eu{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"d, E"} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"G y"} GyMMM{"G y. 'urteko' MMM"} GyMMMEd{"G y. 'urteko' MMM d, E"} @@ -508,11 +508,11 @@ eu{ MMMd{"MMM d"} Md{"M/d"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} - hmsv{"h:mm:ss a v"} - hmv{"h:mm a v"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} + hmsv{"h:mm:ss a v"} + hmv{"h:mm a v"} ms{"mm:ss"} y{"y"} yM{"y/M"} @@ -699,30 +699,30 @@ eu{ } intervalFormats{ Bh{ - B{"B h – B h"} + B{"B h – B h"} h{"B h–h"} } Bhm{ - B{"B h:mm – B h:mm"} + B{"B h:mm – B h:mm"} h{"B h:mm–h:mm"} m{"B h:mm–h:mm"} } GyMMM{ - G{"G y, MMM – G y, MMM"} + G{"G y, MMM – G y, MMM"} M{"G y, MMM–MMM"} - y{"G y, MMM – G y, MMM"} + y{"G y, MMM – G y, MMM"} } GyMMMEd{ - G{"G y, MMM d, E – G y, MMM d, E"} - M{"G y, MMM d, E – MMM d, E"} - d{"G y, MMM d, E – MMM d, E"} - y{"G y, MMM d, E – G y, MMM d, E"} + G{"G y, MMM d, E – G y, MMM d, E"} + M{"G y, MMM d, E – MMM d, E"} + d{"G y, MMM d, E – MMM d, E"} + y{"G y, MMM d, E – G y, MMM d, E"} } GyMMMd{ - G{"G y, MMM d – G y, MMM d"} - M{"G y, MMM d – MMM d"} + G{"G y, MMM d – G y, MMM d"} + M{"G y, MMM d – MMM d"} d{"G y, MMM d–d"} - y{"G y, MMM d – G y, MMM d"} + y{"G y, MMM d – G y, MMM d"} } H{ H{"HH–HH"} @@ -742,80 +742,80 @@ eu{ M{"M–M"} } MEd{ - M{"M/d, E – M/d, E"} - d{"M/d, E – M/d, E"} + M{"M/d, E – M/d, E"} + d{"M/d, E – M/d, E"} } MMM{ M{"MMM–MMM"} } MMMEd{ - M{"MMM d, E – MMM d, E"} - d{"MMM d, E – MMM d, E"} + M{"MMM d, E – MMM d, E"} + d{"MMM d, E – MMM d, E"} } MMMd{ - M{"MMM d – MMM d"} + M{"MMM d – MMM d"} d{"MMM d–d"} } Md{ - M{"M/d – M/d"} - d{"M/d – M/d"} + M{"M/d – M/d"} + d{"M/d – M/d"} } d{ d{"d–d"} } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y"} } yM{ - M{"y/M – y/M"} - y{"y/M – y/M"} + M{"y/M – y/M"} + y{"y/M – y/M"} } yMEd{ - M{"y/M/d, E – y/M/d, E"} - d{"y/M/d, E – y/M/d, E"} - y{"y/M/d, E – y/M/d, E"} + M{"y/M/d, E – y/M/d, E"} + d{"y/M/d, E – y/M/d, E"} + y{"y/M/d, E – y/M/d, E"} } yMMM{ M{"y('e')'ko' MMM–MMM"} - y{"y('e')'ko' MMM – y('e')'ko' MMM"} + y{"y('e')'ko' MMM – y('e')'ko' MMM"} } yMMMEd{ - M{"y('e')'ko' MMM d, E – MMM d, E"} - d{"y('e')'ko' MMM d, E – y('e')'ko' MMM d, E"} - y{"y('e')'ko' MMM d, E – y('e')'ko' MMM d, E"} + M{"y('e')'ko' MMM d, E – MMM d, E"} + d{"y('e')'ko' MMM d, E – y('e')'ko' MMM d, E"} + y{"y('e')'ko' MMM d, E – y('e')'ko' MMM d, E"} } yMMMM{ M{"y('e')'ko' MMMM–MMMM"} - y{"y('e')'ko' MMMM – y('e')'ko' MMMM"} + y{"y('e')'ko' MMMM – y('e')'ko' MMMM"} } yMMMd{ - M{"y('e')'ko' MMM d – MMM d"} + M{"y('e')'ko' MMM d – MMM d"} d{"y('e')'ko' MMM d–d"} - y{"y('e')'ko' MMM d – y('e')'ko' MMM d"} + y{"y('e')'ko' MMM d – y('e')'ko' MMM d"} } yMd{ - M{"y/M/d – y/M/d"} - d{"y/M/d – y/M/d"} - y{"y/M/d – y/M/d"} + M{"y/M/d – y/M/d"} + d{"y/M/d – y/M/d"} + y{"y/M/d – y/M/d"} } } monthNames{ diff --git a/icu4c/source/data/locales/ewo.txt b/icu4c/source/data/locales/ewo.txt index 11f50c552b05..386ebcc84f98 100644 --- a/icu4c/source/data/locales/ewo.txt +++ b/icu4c/source/data/locales/ewo.txt @@ -62,8 +62,8 @@ ewo{ MMMd{"d MMM"} Md{"d/M"} d{"d"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"m:ss"} y{"y"} yM{"M/y"} @@ -121,8 +121,8 @@ ewo{ MMMd{"d MMM"} Md{"d/M"} d{"d"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"m:ss"} y{"y"} yM{"M/y"} diff --git a/icu4c/source/data/locales/ff_Adlm.txt b/icu4c/source/data/locales/ff_Adlm.txt index 6867e0de42e8..120b5869fcd7 100644 --- a/icu4c/source/data/locales/ff_Adlm.txt +++ b/icu4c/source/data/locales/ff_Adlm.txt @@ -172,6 +172,12 @@ ff_Adlm{ "d MMM⹁ y", "d-M-y", "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + } + DateTimePatterns%atTime{ "{1} 𞤉 {0}", "{1} 𞤉 {0}", "{1} {0}", diff --git a/icu4c/source/data/locales/ff_Adlm_GH.txt b/icu4c/source/data/locales/ff_Adlm_GH.txt index 13b0efd6d611..4d0abdf6c37f 100644 --- a/icu4c/source/data/locales/ff_Adlm_GH.txt +++ b/icu4c/source/data/locales/ff_Adlm_GH.txt @@ -14,8 +14,8 @@ ff_Adlm_GH{ "d MMM⹁ y", "d-M-y", "{1} {0}", - "{1} 𞤉 {0}", - "{1} 𞤉 {0}", + "{1} {0}", + "{1} {0}", "{1} {0}", "{1} {0}", } diff --git a/icu4c/source/data/locales/ff_Adlm_GM.txt b/icu4c/source/data/locales/ff_Adlm_GM.txt index 58dc42ef6e5b..d0881a35432d 100644 --- a/icu4c/source/data/locales/ff_Adlm_GM.txt +++ b/icu4c/source/data/locales/ff_Adlm_GM.txt @@ -14,8 +14,8 @@ ff_Adlm_GM{ "d MMM⹁ y", "d-M-y", "{1} {0}", - "{1} 𞤉 {0}", - "{1} 𞤉 {0}", + "{1} {0}", + "{1} {0}", "{1} {0}", "{1} {0}", } diff --git a/icu4c/source/data/locales/ff_Adlm_LR.txt b/icu4c/source/data/locales/ff_Adlm_LR.txt index 8846bee7c6fa..9eed1750cd96 100644 --- a/icu4c/source/data/locales/ff_Adlm_LR.txt +++ b/icu4c/source/data/locales/ff_Adlm_LR.txt @@ -14,8 +14,8 @@ ff_Adlm_LR{ "d MMM⹁ y", "d-M-y", "{1} {0}", - "{1} 𞤉 {0}", - "{1} 𞤉 {0}", + "{1} {0}", + "{1} {0}", "{1} {0}", "{1} {0}", } diff --git a/icu4c/source/data/locales/ff_Adlm_MR.txt b/icu4c/source/data/locales/ff_Adlm_MR.txt index 5d481df893ae..3d478283ed7f 100644 --- a/icu4c/source/data/locales/ff_Adlm_MR.txt +++ b/icu4c/source/data/locales/ff_Adlm_MR.txt @@ -14,8 +14,8 @@ ff_Adlm_MR{ "d MMM⹁ y", "d-M-y", "{1} {0}", - "{1} 𞤉 {0}", - "{1} 𞤉 {0}", + "{1} {0}", + "{1} {0}", "{1} {0}", "{1} {0}", } diff --git a/icu4c/source/data/locales/ff_Adlm_SL.txt b/icu4c/source/data/locales/ff_Adlm_SL.txt index 42e6b0e68e58..0f542ec11571 100644 --- a/icu4c/source/data/locales/ff_Adlm_SL.txt +++ b/icu4c/source/data/locales/ff_Adlm_SL.txt @@ -14,8 +14,8 @@ ff_Adlm_SL{ "d MMM⹁ y", "d-M-y", "{1} {0}", - "{1} 𞤉 {0}", - "{1} 𞤉 {0}", + "{1} {0}", + "{1} {0}", "{1} {0}", "{1} {0}", } diff --git a/icu4c/source/data/locales/ff_Latn_GH.txt b/icu4c/source/data/locales/ff_Latn_GH.txt index 916d62efaff7..881edbba4ad9 100644 --- a/icu4c/source/data/locales/ff_Latn_GH.txt +++ b/icu4c/source/data/locales/ff_Latn_GH.txt @@ -5,10 +5,10 @@ ff_Latn_GH{ calendar{ gregorian{ DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE d MMMM y", "d MMMM y", "d MMM, y", diff --git a/icu4c/source/data/locales/ff_Latn_GM.txt b/icu4c/source/data/locales/ff_Latn_GM.txt index eef241133638..c12bc69ad806 100644 --- a/icu4c/source/data/locales/ff_Latn_GM.txt +++ b/icu4c/source/data/locales/ff_Latn_GM.txt @@ -5,10 +5,10 @@ ff_Latn_GM{ calendar{ gregorian{ DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE d MMMM y", "d MMMM y", "d MMM, y", diff --git a/icu4c/source/data/locales/ff_Latn_LR.txt b/icu4c/source/data/locales/ff_Latn_LR.txt index 3b6ca4dc973b..1f4b2963cdce 100644 --- a/icu4c/source/data/locales/ff_Latn_LR.txt +++ b/icu4c/source/data/locales/ff_Latn_LR.txt @@ -5,10 +5,10 @@ ff_Latn_LR{ calendar{ gregorian{ DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE d MMMM y", "d MMMM y", "d MMM, y", diff --git a/icu4c/source/data/locales/ff_Latn_MR.txt b/icu4c/source/data/locales/ff_Latn_MR.txt index 551d56953aae..246f90df3d04 100644 --- a/icu4c/source/data/locales/ff_Latn_MR.txt +++ b/icu4c/source/data/locales/ff_Latn_MR.txt @@ -5,10 +5,10 @@ ff_Latn_MR{ calendar{ gregorian{ DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE d MMMM y", "d MMMM y", "d MMM, y", diff --git a/icu4c/source/data/locales/ff_Latn_SL.txt b/icu4c/source/data/locales/ff_Latn_SL.txt index 9f0ad3a1986d..43a3d4566e7c 100644 --- a/icu4c/source/data/locales/ff_Latn_SL.txt +++ b/icu4c/source/data/locales/ff_Latn_SL.txt @@ -5,10 +5,10 @@ ff_Latn_SL{ calendar{ gregorian{ DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE d MMMM y", "d MMMM y", "d MMM, y", diff --git a/icu4c/source/data/locales/fi.txt b/icu4c/source/data/locales/fi.txt index 7d9b91e43b1b..f17f8b06ba61 100644 --- a/icu4c/source/data/locales/fi.txt +++ b/icu4c/source/data/locales/fi.txt @@ -236,10 +236,10 @@ fi{ "d. MMMM y G", "d.M.y G", "d.M.y GGGGG", - "{1} 'klo' {0}", - "{1} 'klo' {0}", - "{1} 'klo' {0}", - "{1} 'klo' {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", "{1} {0}", } DateTimeSkeletons{ @@ -317,8 +317,8 @@ fi{ MMMEd{"E d.M."} MMMd{"d.M."} Md{"d.M."} - hm{"h.mm a"} - hms{"h.mm.ss a"} + hm{"h.mm a"} + hms{"h.mm.ss a"} ms{"mm.ss"} y{"y"} yyyy{"y"} @@ -474,7 +474,13 @@ fi{ "d. MMMM y G", "d.M.y G", "d.M.y GGGGG", - "{1} 'klo' {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + } + DateTimePatterns%atTime{ "{1} 'klo' {0}", "{1} 'klo' {0}", "{1} 'klo' {0}", @@ -500,8 +506,8 @@ fi{ EHm{"E HH.mm"} EHms{"E HH.mm.ss"} Ed{"E d."} - Ehm{"E h.mm a"} - Ehms{"E h.mm.ss a"} + Ehm{"E h.mm a"} + Ehms{"E h.mm.ss a"} Gy{"y G"} GyMMM{"LLL y G"} GyMMMEd{"E d. MMM y G"} @@ -518,9 +524,9 @@ fi{ MMMd{"d. MMM"} Md{"d.M."} d{"d"} - h{"h a"} - hm{"h.mm a"} - hms{"h.mm.ss a"} + h{"h a"} + hm{"h.mm a"} + hms{"h.mm.ss a"} ms{"mm.ss"} y{"y G"} yyyy{"y G"} @@ -538,61 +544,61 @@ fi{ } intervalFormats{ Bhm{ - B{"h.mm B – h.mm B"} + B{"h.mm B – h.mm B"} h{"h.mm–h.mm B"} m{"h.mm–h.mm B"} } Gy{ - G{"y G – y G"} + G{"y G – y G"} y{"y–y G"} } GyM{ - G{"M/y GGGGG – M/y GGGGG"} + G{"M/y GGGGG – M/y GGGGG"} M{"M/y–M/y GGGGG"} y{"M/y–M/y GGGGG"} } GyMEd{ - G{"E d.M.y GGGGG – E d.M.y GGGGG"} - M{"E d.M.y – E d.M.y GGGGG"} - d{"E d.M.y – E d.M.y GGGGG"} - y{"E d.M.y – E d.M.y GGGGG"} + G{"E d.M.y GGGGG – E d.M.y GGGGG"} + M{"E d.M.y – E d.M.y GGGGG"} + d{"E d.M.y – E d.M.y GGGGG"} + y{"E d.M.y – E d.M.y GGGGG"} } GyMMM{ - G{"M.y G – M.y G"} + G{"M.y G – M.y G"} M{"M.–M.y G"} y{"M.y–M.y G"} } GyMMMEd{ - G{"E d.M.y – E d.M.y G"} + G{"E d.M.y – E d.M.y G"} M{"E d.M. – E d.M.y G"} d{"E d.M. – E d.M.y G"} - y{"E d.M.y – E d.M.y G"} + y{"E d.M.y – E d.M.y G"} } GyMMMM{ - G{"LLLL y G – LLLL y G"} + G{"LLLL y G – LLLL y G"} M{"LLLL–LLLL y G"} - y{"LLLL y – LLLL y G"} + y{"LLLL y – LLLL y G"} } GyMMMMEd{ - G{"E d. MMMM y G – E d. MMMM y G"} - M{"E d. MMMM – E d. MMMM y G"} + G{"E d. MMMM y G – E d. MMMM y G"} + M{"E d. MMMM – E d. MMMM y G"} d{"E d. – E d. MMMM y G"} - y{"E d. MMMM y – E d. MMMM y G"} + y{"E d. MMMM y – E d. MMMM y G"} } GyMMMMd{ - G{"d. MMMM y G – d. MMMM y G"} - M{"d. MMMM – d. MMMM y G"} + G{"d. MMMM y G – d. MMMM y G"} + M{"d. MMMM – d. MMMM y G"} d{"d.–d. MMMM y G"} - y{"d. MMMM y – d. MMMM y G"} + y{"d. MMMM y – d. MMMM y G"} } GyMMMd{ - G{"d.M.y G – d.M.y G"} + G{"d.M.y G – d.M.y G"} M{"d.M.–d.M.y G"} d{"d.–d.M.y G"} - y{"d.M.y – d.M.y G"} + y{"d.M.y – d.M.y G"} } GyMd{ - G{"d.M.y GGGGG – d.M.y GGGGG"} + G{"d.M.y GGGGG – d.M.y GGGGG"} M{"d.M.y–d.M.y GGGGG"} d{"d.M.y–d.M.y GGGGG"} y{"d.M.y–d.M.y GGGGG"} @@ -622,14 +628,14 @@ fi{ M{"LLL–LLLL"} } MMMEd{ - M{"E d. MMMM – E d. MMMM"} + M{"E d. MMMM – E d. MMMM"} d{"E d. – E d. MMMM"} } MMMM{ M{"LLL–LLLL"} } MMMd{ - M{"d. MMMM – d. MMMM"} + M{"d. MMMM – d. MMMM"} d{"d.–d. MMMM"} } Md{ @@ -641,52 +647,52 @@ fi{ } fallback{"{0}–{1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h.mm a – h.mm a"} - h{"h.mm–h.mm a"} - m{"h.mm–h.mm a"} + a{"h.mm a – h.mm a"} + h{"h.mm–h.mm a"} + m{"h.mm–h.mm a"} } hmv{ - a{"h.mm a – h.mm a v"} - h{"h.mm–h.mm a v"} - m{"h.mm–h.mm a v"} + a{"h.mm a – h.mm a v"} + h{"h.mm–h.mm a v"} + m{"h.mm–h.mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y G"} } yM{ M{"LLL–LLLL y G"} - y{"LLLL y – LLLL y G"} + y{"LLLL y – LLLL y G"} } yMEd{ - M{"E d.M.y – E d.M.y G"} - d{"E d.M.y – E d.M.y G"} - y{"E d.M.y – E d.M.y G"} + M{"E d.M.y – E d.M.y G"} + d{"E d.M.y – E d.M.y G"} + y{"E d.M.y – E d.M.y G"} } yMMM{ M{"LLL–LLLL y G"} - y{"LLLL y – LLLL y G"} + y{"LLLL y – LLLL y G"} } yMMMEd{ - M{"E d. MMMM – E d. MMMM y G"} + M{"E d. MMMM – E d. MMMM y G"} d{"E d. – E d. MMMM y G"} - y{"E d. MMMM y – E d. MMMM y G"} + y{"E d. MMMM y – E d. MMMM y G"} } yMMMM{ M{"LLL–LLLL y G"} - y{"LLLL y – LLLL y G"} + y{"LLLL y – LLLL y G"} } yMMMd{ - M{"d. MMMM – d. MMMM y G"} + M{"d. MMMM – d. MMMM y G"} d{"d.–d. MMMM y G"} - y{"d. MMMM y – d. MMMM y G"} + y{"d. MMMM y – d. MMMM y G"} } yMd{ M{"d.M.–d.M.y G"} @@ -717,7 +723,13 @@ fi{ "d. MMMM y", "d.M.y", "d.M.y", - "{1} 'klo' {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + } + DateTimePatterns%atTime{ "{1} 'klo' {0}", "{1} 'klo' {0}", "{1} 'klo' {0}", @@ -746,8 +758,8 @@ fi{ EHm{"E H.mm"} EHms{"E H.mm.ss"} Ed{"E d."} - Ehm{"E h.mm a"} - Ehms{"E h.mm.ss a"} + Ehm{"E h.mm a"} + Ehms{"E h.mm.ss a"} Gy{"y G"} GyMMM{"LLL y G"} GyMMMEd{"E d. MMM y G"} @@ -773,11 +785,11 @@ fi{ MMMd{"d. MMM"} Md{"d.M."} d{"d"} - h{"h a"} - hm{"h.mm a"} - hms{"h.mm.ss a"} - hmsv{"h.mm.ss a v"} - hmv{"h.mm a v"} + h{"h a"} + hm{"h.mm a"} + hms{"h.mm.ss a"} + hmsv{"h.mm.ss a v"} + hmv{"h.mm a v"} ms{"m.ss"} y{"y"} yM{"L.y"} @@ -970,61 +982,61 @@ fi{ } intervalFormats{ Bhm{ - B{"h.mm B – h.mm B"} + B{"h.mm B – h.mm B"} h{"h.mm–h.mm B"} m{"h.mm–h.mm B"} } Gy{ - G{"y G – y G"} + G{"y G – y G"} y{"y–y G"} } GyM{ - G{"M/y GGGGG – M/y GGGGG"} + G{"M/y GGGGG – M/y GGGGG"} M{"M/y–M/y GGGGG"} y{"M/y–M/y GGGGG"} } GyMEd{ - G{"E d.M.y GGGGG – E d.M.y GGGGG"} - M{"E d.M.y – E d.M.y GGGGG"} - d{"E d.M.y – E d.M.y GGGGG"} - y{"E d.M.y – E d.M.y GGGGG"} + G{"E d.M.y GGGGG – E d.M.y GGGGG"} + M{"E d.M.y – E d.M.y GGGGG"} + d{"E d.M.y – E d.M.y GGGGG"} + y{"E d.M.y – E d.M.y GGGGG"} } GyMMM{ - G{"M.y G – M.y G"} + G{"M.y G – M.y G"} M{"M.–M.y G"} y{"M.y–M.y G"} } GyMMMEd{ - G{"E d.M.y – E d.M.y G"} + G{"E d.M.y – E d.M.y G"} M{"E d.M. – E d.M.y G"} - d{"E d.M – E d.M.y G"} - y{"E d.M.y – E d.M.y G"} + d{"E d.M – E d.M.y G"} + y{"E d.M.y – E d.M.y G"} } GyMMMM{ - G{"LLLL y G – LLLL y G"} + G{"LLLL y G – LLLL y G"} M{"LLLL–LLLL y G"} - y{"LLLL y – LLLL y G"} + y{"LLLL y – LLLL y G"} } GyMMMMEd{ - G{"E d. MMMM y G – E d. MMMM y G"} - M{"E d. MMMM – E d. MMMM y G"} + G{"E d. MMMM y G – E d. MMMM y G"} + M{"E d. MMMM – E d. MMMM y G"} d{"E d. – E d. MMMM y G"} - y{"E d. MMMM y – E d. MMMM y G"} + y{"E d. MMMM y – E d. MMMM y G"} } GyMMMMd{ - G{"d. MMMM y G – d. MMMM y G"} - M{"d. MMMM – d. MMMM y G"} + G{"d. MMMM y G – d. MMMM y G"} + M{"d. MMMM – d. MMMM y G"} d{"d.–d. MMMM y G"} - y{"d. MMMM y – d. MMMM y G"} + y{"d. MMMM y – d. MMMM y G"} } GyMMMd{ - G{"d.M.y. G – d.M.y G"} + G{"d.M.y. G – d.M.y G"} M{"d.M–d.M.y G"} d{"d.–d.M.y G"} y{"d.M.y–d.M.y G"} } GyMd{ - G{"d.M.y GGGGG – d.M.y GGGGG"} + G{"d.M.y GGGGG – d.M.y GGGGG"} M{"d.M.y–d.M.y GGGGG"} d{"d.M.y–d.M.y GGGGG"} y{"d.M.y–d.M.y GGGGG"} @@ -1054,22 +1066,22 @@ fi{ M{"LLL–LLLL"} } MMMEd{ - M{"E d. MMMM – E d. MMMM"} + M{"E d. MMMM – E d. MMMM"} d{"E d. – E d. MMMM"} } MMMM{ M{"LLL–LLLL"} } MMMMEd{ - M{"E d. MMMM – E d. MMMM"} + M{"E d. MMMM – E d. MMMM"} d{"E d. – E d. MMMM"} } MMMMd{ - M{"d. MMMM – d. MMMM"} + M{"d. MMMM – d. MMMM"} d{"d.–d. MMMM"} } MMMd{ - M{"d. MMMM – d. MMMM"} + M{"d. MMMM – d. MMMM"} d{"d.–d. MMMM"} } Md{ @@ -1081,62 +1093,62 @@ fi{ } fallback{"{0}–{1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h.mm a – h.mm a"} - h{"h.mm–h.mm a"} - m{"h.mm–h.mm a"} + a{"h.mm a – h.mm a"} + h{"h.mm–h.mm a"} + m{"h.mm–h.mm a"} } hmv{ - a{"h.mm a – h.mm a v"} - h{"h.mm–h.mm a v"} - m{"h.mm–h.mm a v"} + a{"h.mm a – h.mm a v"} + h{"h.mm–h.mm a v"} + m{"h.mm–h.mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y"} } yM{ M{"LLL–LLLL y"} - y{"LLLL y – LLLL y"} + y{"LLLL y – LLLL y"} } yMEd{ - M{"E d.M.y – E d.M.y"} - d{"E d.M.y – E d.M.y"} - y{"E d.M.y – E d.M.y"} + M{"E d.M.y – E d.M.y"} + d{"E d.M.y – E d.M.y"} + y{"E d.M.y – E d.M.y"} } yMMM{ M{"LLL–LLLL y"} - y{"LLLL y – LLLL y"} + y{"LLLL y – LLLL y"} } yMMMEd{ - M{"E d. MMMM – E d. MMMM y"} + M{"E d. MMMM – E d. MMMM y"} d{"E d. – E d. MMMM y"} - y{"E d. MMMM y – E d. MMMM y"} + y{"E d. MMMM y – E d. MMMM y"} } yMMMM{ M{"LLL–LLLL y"} - y{"LLLL y – LLLL y"} + y{"LLLL y – LLLL y"} } yMMMMEd{ - M{"E d. MMMM – E d. MMMM y"} + M{"E d. MMMM – E d. MMMM y"} d{"E d. – E d. MMMM y"} - y{"E d. MMMM y – E d. MMMM y"} + y{"E d. MMMM y – E d. MMMM y"} } yMMMMd{ - M{"d. MMMM – d. MMMM y"} + M{"d. MMMM – d. MMMM y"} d{"d.–d. MMMM y"} - y{"d. MMMM y – d. MMMM y"} + y{"d. MMMM y – d. MMMM y"} } yMMMd{ - M{"d. MMMM – d. MMMM y"} + M{"d. MMMM – d. MMMM y"} d{"d.–d. MMMM y"} - y{"d. MMMM y – d. MMMM y"} + y{"d. MMMM y – d. MMMM y"} } yMd{ M{"d.M.–d.M.y"} @@ -1490,10 +1502,10 @@ fi{ "d. MMMM y G", "d.M.y G", "d.M.y GGGGG", - "{1} 'klo' {0}", - "{1} 'klo' {0}", - "{1} 'klo' {0}", - "{1} 'klo' {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", "{1} {0}", } DateTimeSkeletons{ diff --git a/icu4c/source/data/locales/fil.txt b/icu4c/source/data/locales/fil.txt index 09a16c5ac7e3..461365b58b4f 100644 --- a/icu4c/source/data/locales/fil.txt +++ b/icu4c/source/data/locales/fil.txt @@ -214,15 +214,21 @@ fil{ calendar{ buddhist{ DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE, MMMM d, y G", "MMMM d, y G", "MMM d, y G", "M/d/y GGGGG", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{1} 'nang' {0}", "{1} 'nang' {0}", "{1}, {0}", @@ -297,94 +303,100 @@ fil{ M{"M–M"} } MEd{ - M{"E, M/d – E, M/d"} - d{"E, M/d – E, M/d"} + M{"E, M/d – E, M/d"} + d{"E, M/d – E, M/d"} } MMM{ M{"MMM–MMM"} } MMMEd{ - M{"E, MMM d – E, MMM d"} - d{"E, MMM d – E, MMM d"} + M{"E, MMM d – E, MMM d"} + d{"E, MMM d – E, MMM d"} } MMMd{ - M{"MMM d – MMM d"} + M{"MMM d – MMM d"} d{"MMM d–d"} } Md{ - M{"M/d – M/d"} - d{"M/d – M/d"} + M{"M/d – M/d"} + d{"M/d – M/d"} } d{ d{"d–d"} } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y G"} } yM{ - M{"M/y – M/y GGGGG"} - y{"M/y – M/y GGGGG"} + M{"M/y – M/y GGGGG"} + y{"M/y – M/y GGGGG"} } yMEd{ - M{"E, M/d/y – E, M/d/y GGGGG"} - d{"E, M/d/y – E, M/d/y GGGGG"} - y{"E, M/d/y – E, M/d/y GGGGG"} + M{"E, M/d/y – E, M/d/y GGGGG"} + d{"E, M/d/y – E, M/d/y GGGGG"} + y{"E, M/d/y – E, M/d/y GGGGG"} } yMMM{ M{"MMM–MMM y G"} - y{"MMM y – MMM y G"} + y{"MMM y – MMM y G"} } yMMMEd{ - M{"E, MMM d – E, MMM d, y G"} - d{"E, MMM d – E, MMM d, y G"} - y{"E, MMM d, y – E, MMM d, y G"} + M{"E, MMM d – E, MMM d, y G"} + d{"E, MMM d – E, MMM d, y G"} + y{"E, MMM d, y – E, MMM d, y G"} } yMMMM{ M{"MMMM–MMMM y G"} - y{"MMMM y – MMMM y G"} + y{"MMMM y – MMMM y G"} } yMMMd{ - M{"MMM d – MMM d, y G"} + M{"MMM d – MMM d, y G"} d{"MMM d–d, y G"} - y{"MMM d, y – MMM d, y G"} + y{"MMM d, y – MMM d, y G"} } yMd{ - M{"M/d/y – M/d/y GGGGG"} - d{"M/d/y – M/d/y GGGGG"} - y{"M/d/y – M/d/y GGGGG"} + M{"M/d/y – M/d/y GGGGG"} + d{"M/d/y – M/d/y GGGGG"} + y{"M/d/y – M/d/y GGGGG"} } } } coptic{ DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE, MMMM d, y G", "MMMM d, y G", "MMM d, y G", "M/d/y GGGGG", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{1} 'nang' {0}", "{1} 'nang' {0}", "{1}, {0}", @@ -462,80 +474,80 @@ fil{ M{"M–M"} } MEd{ - M{"E, M/d – E, M/d"} - d{"E, M/d – E, M/d"} + M{"E, M/d – E, M/d"} + d{"E, M/d – E, M/d"} } MMM{ M{"MMM–MMM"} } MMMEd{ - M{"E, MMM d – E, MMM d"} - d{"E, MMM d – E, MMM d"} + M{"E, MMM d – E, MMM d"} + d{"E, MMM d – E, MMM d"} } MMMd{ - M{"MMM d – MMM d"} + M{"MMM d – MMM d"} d{"MMM d–d"} } Md{ - M{"M/d – M/d"} - d{"M/d – M/d"} + M{"M/d – M/d"} + d{"M/d – M/d"} } d{ d{"d–d"} } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y G"} } yM{ - M{"M/y – M/y GGGGG"} - y{"M/y – M/y GGGGG"} + M{"M/y – M/y GGGGG"} + y{"M/y – M/y GGGGG"} } yMEd{ - M{"E, M/d/y – E, M/d/y GGGGG"} - d{"E, M/d/y – E, M/d/y GGGGG"} - y{"E, M/d/y – E, M/d/y GGGGG"} + M{"E, M/d/y – E, M/d/y GGGGG"} + d{"E, M/d/y – E, M/d/y GGGGG"} + y{"E, M/d/y – E, M/d/y GGGGG"} } yMMM{ M{"MMM–MMM y G"} - y{"MMM y – MMM y G"} + y{"MMM y – MMM y G"} } yMMMEd{ - M{"E, MMM d – E, MMM d, y G"} - d{"E, MMM d – E, MMM d, y G"} - y{"E, MMM d, y – E, MMM d, y G"} + M{"E, MMM d – E, MMM d, y G"} + d{"E, MMM d – E, MMM d, y G"} + y{"E, MMM d, y – E, MMM d, y G"} } yMMMM{ M{"MMMM–MMMM y G"} - y{"MMMM y – MMMM y G"} + y{"MMMM y – MMMM y G"} } yMMMd{ - M{"MMM d – MMM d, y G"} + M{"MMM d – MMM d, y G"} d{"MMM d–d, y G"} - y{"MMM d, y – MMM d, y G"} + y{"MMM d, y – MMM d, y G"} } yMd{ - M{"M/d/y – M/d/y GGGGG"} - d{"M/d/y – M/d/y GGGGG"} - y{"M/d/y – M/d/y GGGGG"} + M{"M/d/y – M/d/y GGGGG"} + d{"M/d/y – M/d/y GGGGG"} + y{"M/d/y – M/d/y GGGGG"} } } monthNames{ @@ -637,15 +649,21 @@ fil{ } ethiopic{ DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE, MMMM d, y G", "MMMM d, y G", "MMM d, y G", "M/d/y GGGGG", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{1} 'nang' {0}", "{1} 'nang' {0}", "{1}, {0}", @@ -723,80 +741,80 @@ fil{ M{"M–M"} } MEd{ - M{"E, M/d – E, M/d"} - d{"E, M/d – E, M/d"} + M{"E, M/d – E, M/d"} + d{"E, M/d – E, M/d"} } MMM{ M{"MMM–MMM"} } MMMEd{ - M{"E, MMM d – E, MMM d"} - d{"E, MMM d – E, MMM d"} + M{"E, MMM d – E, MMM d"} + d{"E, MMM d – E, MMM d"} } MMMd{ - M{"MMM d – MMM d"} + M{"MMM d – MMM d"} d{"MMM d–d"} } Md{ - M{"M/d – M/d"} - d{"M/d – M/d"} + M{"M/d – M/d"} + d{"M/d – M/d"} } d{ d{"d–d"} } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y G"} } yM{ - M{"M/y – M/y GGGGG"} - y{"M/y – M/y GGGGG"} + M{"M/y – M/y GGGGG"} + y{"M/y – M/y GGGGG"} } yMEd{ - M{"E, M/d/y – E, M/d/y GGGGG"} - d{"E, M/d/y – E, M/d/y GGGGG"} - y{"E, M/d/y – E, M/d/y GGGGG"} + M{"E, M/d/y – E, M/d/y GGGGG"} + d{"E, M/d/y – E, M/d/y GGGGG"} + y{"E, M/d/y – E, M/d/y GGGGG"} } yMMM{ M{"MMM–MMM y G"} - y{"MMM y – MMM y G"} + y{"MMM y – MMM y G"} } yMMMEd{ - M{"E, MMM d – E, MMM d, y G"} - d{"E, MMM d – E, MMM d, y G"} - y{"E, MMM d, y – E, MMM d, y G"} + M{"E, MMM d – E, MMM d, y G"} + d{"E, MMM d – E, MMM d, y G"} + y{"E, MMM d, y – E, MMM d, y G"} } yMMMM{ M{"MMMM–MMMM y G"} - y{"MMMM y – MMMM y G"} + y{"MMMM y – MMMM y G"} } yMMMd{ - M{"MMM d – MMM d, y G"} + M{"MMM d – MMM d, y G"} d{"MMM d–d, y G"} - y{"MMM d, y – MMM d, y G"} + y{"MMM d, y – MMM d, y G"} } yMd{ - M{"M/d/y – M/d/y GGGGG"} - d{"M/d/y – M/d/y GGGGG"} - y{"M/d/y – M/d/y GGGGG"} + M{"M/d/y – M/d/y GGGGG"} + d{"M/d/y – M/d/y GGGGG"} + y{"M/d/y – M/d/y GGGGG"} } } monthNames{ @@ -898,15 +916,21 @@ fil{ } generic{ DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE, MMMM d, y G", "MMMM d, y G", "MMM d, y G", "M/d/y GGGGG", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{1} 'nang' {0}", "{1} 'nang' {0}", "{1}, {0}", @@ -932,8 +956,8 @@ fil{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"d E"} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"y G"} GyMMM{"MMM y G"} GyMMMEd{"E, MMM d, y G"} @@ -951,9 +975,9 @@ fil{ MMMd{"MMM d"} Md{"M/d"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"mm:ss"} y{"y G"} yyyy{"y G"} @@ -970,49 +994,49 @@ fil{ } intervalFormats{ Bh{ - h{"h – h B"} + h{"h – h B"} } Bhm{ - h{"h:mm – h:mm B"} - m{"h:mm – h:mm B"} + h{"h:mm – h:mm B"} + m{"h:mm – h:mm B"} } Gy{ - G{"y G – y G"} - y{"y – y G"} + G{"y G – y G"} + y{"y – y G"} } GyM{ - G{"M/y GGGGG – M/y GGGGG"} - M{"M/y – M/y GGGGG"} - y{"M/y – M/y GGGGG"} + G{"M/y GGGGG – M/y GGGGG"} + M{"M/y – M/y GGGGG"} + y{"M/y – M/y GGGGG"} } GyMEd{ - G{"E, M/d/y GGGGG – E, M/d/y GGGGG"} - M{"E, M/d/y – E, M/d/y GGGGG"} - d{"E, M/d/y – E, M/d/y GGGGG"} - y{"E, M/d/y – E, M/d/y GGGGG"} + G{"E, M/d/y GGGGG – E, M/d/y GGGGG"} + M{"E, M/d/y – E, M/d/y GGGGG"} + d{"E, M/d/y – E, M/d/y GGGGG"} + y{"E, M/d/y – E, M/d/y GGGGG"} } GyMMM{ - G{"MMM y G – MMM y G"} - M{"MMM – MMM y G"} - y{"MMM y – MMM y G"} + G{"MMM y G – MMM y G"} + M{"MMM – MMM y G"} + y{"MMM y – MMM y G"} } GyMMMEd{ - G{"E, MMM d, y G – E, MMM d, y G"} - M{"E, MMM d – E, MMM d, y G"} - d{"E, MMM d – E, MMM d, y G"} - y{"E, MMM d, y – E, MMM d, y G"} + G{"E, MMM d, y G – E, MMM d, y G"} + M{"E, MMM d – E, MMM d, y G"} + d{"E, MMM d – E, MMM d, y G"} + y{"E, MMM d, y – E, MMM d, y G"} } GyMMMd{ - G{"MMM d, y G – MMM d, y G"} - M{"MMM d – MMM d, y G"} - d{"MMM d – d, y G"} - y{"MMM d, y – MMM d, y G"} + G{"MMM d, y G – MMM d, y G"} + M{"MMM d – MMM d, y G"} + d{"MMM d – d, y G"} + y{"MMM d, y – MMM d, y G"} } GyMd{ - G{"M/d/y GGGGG – M/d/y GGGGG"} - M{"M/d/y – M/d/y GGGGG"} - d{"M/d/y – M/d/y GGGGG"} - y{"M/d/y – M/d/y GGGGG"} + G{"M/d/y GGGGG – M/d/y GGGGG"} + M{"M/d/y – M/d/y GGGGG"} + d{"M/d/y – M/d/y GGGGG"} + y{"M/d/y – M/d/y GGGGG"} } H{ H{"HH–HH"} @@ -1032,80 +1056,80 @@ fil{ M{"M–M"} } MEd{ - M{"E, M/d – E, M/d"} - d{"E, M/d – E, M/d"} + M{"E, M/d – E, M/d"} + d{"E, M/d – E, M/d"} } MMM{ M{"MMM–MMM"} } MMMEd{ - M{"E, MMM d – E, MMM d"} - d{"E, MMM d – E, MMM d"} + M{"E, MMM d – E, MMM d"} + d{"E, MMM d – E, MMM d"} } MMMd{ - M{"MMM d – MMM d"} + M{"MMM d – MMM d"} d{"MMM d–d"} } Md{ - M{"M/d – M/d"} - d{"M/d – M/d"} + M{"M/d – M/d"} + d{"M/d – M/d"} } d{ d{"d–d"} } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y G"} } yM{ - M{"M/y – M/y GGGGG"} - y{"M/y – M/y GGGGG"} + M{"M/y – M/y GGGGG"} + y{"M/y – M/y GGGGG"} } yMEd{ - M{"E, M/d/y – E, M/d/y GGGGG"} - d{"E, M/d/y – E, M/d/y GGGGG"} - y{"E, M/d/y – E, M/d/y GGGGG"} + M{"E, M/d/y – E, M/d/y GGGGG"} + d{"E, M/d/y – E, M/d/y GGGGG"} + y{"E, M/d/y – E, M/d/y GGGGG"} } yMMM{ M{"MMM–MMM y G"} - y{"MMM y – MMM y G"} + y{"MMM y – MMM y G"} } yMMMEd{ - M{"E, MMM d – E, MMM d, y G"} - d{"E, MMM d – E, MMM d, y G"} - y{"E, MMM d, y – E, MMM d, y G"} + M{"E, MMM d – E, MMM d, y G"} + d{"E, MMM d – E, MMM d, y G"} + y{"E, MMM d, y – E, MMM d, y G"} } yMMMM{ M{"MMMM–MMMM y G"} - y{"MMMM y – MMMM y G"} + y{"MMMM y – MMMM y G"} } yMMMd{ - M{"MMM d – MMM d, y G"} + M{"MMM d – MMM d, y G"} d{"MMM d–d, y G"} - y{"MMM d, y – MMM d, y G"} + y{"MMM d, y – MMM d, y G"} } yMd{ - M{"M/d/y – M/d/y GGGGG"} - d{"M/d/y – M/d/y GGGGG"} - y{"M/d/y – M/d/y GGGGG"} + M{"M/d/y – M/d/y GGGGG"} + d{"M/d/y – M/d/y GGGGG"} + y{"M/d/y – M/d/y GGGGG"} } } } @@ -1123,15 +1147,21 @@ fil{ "pm", } DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE, MMMM d, y", "MMMM d, y", "MMM d, y", "M/d/yy", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{1} 'nang' {0}", "{1} 'nang' {0}", "{1}, {0}", @@ -1160,8 +1190,8 @@ fil{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"d E"} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"G y"} GyMMM{"MMM y G"} GyMMMEd{"E, MMM d, y G"} @@ -1185,11 +1215,11 @@ fil{ MMMd{"MMM d"} Md{"M/d"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} - hmsv{"h:mm:ss a v"} - hmv{"h:mm a v"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} + hmsv{"h:mm:ss a v"} + hmv{"h:mm a v"} ms{"mm:ss"} y{"y"} yM{"M/y"} @@ -1371,49 +1401,49 @@ fil{ } intervalFormats{ Bh{ - h{"h – h B"} + h{"h – h B"} } Bhm{ - h{"h:mm – h:mm B"} - m{"h:mm – h:mm B"} + h{"h:mm – h:mm B"} + m{"h:mm – h:mm B"} } Gy{ - G{"y G – y G"} - y{"y – y G"} + G{"y G – y G"} + y{"y – y G"} } GyM{ - G{"M/y GGGGG – M/y GGGGG"} - M{"M/y – M/y GGGGG"} - y{"M/y – M/y GGGGG"} + G{"M/y GGGGG – M/y GGGGG"} + M{"M/y – M/y GGGGG"} + y{"M/y – M/y GGGGG"} } GyMEd{ - G{"E, M/d/y GGGGG – E, M/d/y GGGGG"} - M{"E, M/d/y – E, M/d/y GGGGG"} - d{"E, M/d/y – E, M/d/y GGGGG"} - y{"E, M/d/y – E, M/d/y GGGGG"} + G{"E, M/d/y GGGGG – E, M/d/y GGGGG"} + M{"E, M/d/y – E, M/d/y GGGGG"} + d{"E, M/d/y – E, M/d/y GGGGG"} + y{"E, M/d/y – E, M/d/y GGGGG"} } GyMMM{ - G{"MMM y G – MMM y G"} - M{"MMM – MMM y G"} - y{"MMM y – MMM y G"} + G{"MMM y G – MMM y G"} + M{"MMM – MMM y G"} + y{"MMM y – MMM y G"} } GyMMMEd{ - G{"E, MMM d, y G – E, MMM d, y G"} - M{"E, MMM d – E, MMM d, y G"} - d{"E, MMM d – E, MMM d, y G"} - y{"E, MMM d, y – E, MMM d, y G"} + G{"E, MMM d, y G – E, MMM d, y G"} + M{"E, MMM d – E, MMM d, y G"} + d{"E, MMM d – E, MMM d, y G"} + y{"E, MMM d, y – E, MMM d, y G"} } GyMMMd{ - G{"MMM d, y G – MMM d, y G"} - M{"MMM d – MMM d, y G"} - d{"MMM d – d, y G"} - y{"MMM d, y – MMM d, y G"} + G{"MMM d, y G – MMM d, y G"} + M{"MMM d – MMM d, y G"} + d{"MMM d – d, y G"} + y{"MMM d, y – MMM d, y G"} } GyMd{ - G{"M/d/y GGGGG – M/d/y GGGGG"} - M{"M/d/y – M/d/y GGGGG"} - d{"M/d/y – M/d/y GGGGG"} - y{"M/d/y – M/d/y GGGGG"} + G{"M/d/y GGGGG – M/d/y GGGGG"} + M{"M/d/y – M/d/y GGGGG"} + d{"M/d/y – M/d/y GGGGG"} + y{"M/d/y – M/d/y GGGGG"} } H{ H{"HH–HH"} @@ -1433,80 +1463,80 @@ fil{ M{"M–M"} } MEd{ - M{"E, M/d – E, M/d"} - d{"E, M/d – E, M/d"} + M{"E, M/d – E, M/d"} + d{"E, M/d – E, M/d"} } MMM{ M{"MMM–MMM"} } MMMEd{ - M{"E, MMM d – E, MMM d"} - d{"E, MMM d – E, MMM d"} + M{"E, MMM d – E, MMM d"} + d{"E, MMM d – E, MMM d"} } MMMd{ - M{"MMM d – MMM d"} + M{"MMM d – MMM d"} d{"MMM d–d"} } Md{ - M{"M/d – M/d"} - d{"M/d – M/d"} + M{"M/d – M/d"} + d{"M/d – M/d"} } d{ d{"d–d"} } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y"} } yM{ - M{"M/y – M/y"} - y{"M/y – M/y"} + M{"M/y – M/y"} + y{"M/y – M/y"} } yMEd{ - M{"E, M/d/y – E, M/d/y"} - d{"E, M/d/y – E, M/d/y"} - y{"E, M/d/y – E, M/d/y"} + M{"E, M/d/y – E, M/d/y"} + d{"E, M/d/y – E, M/d/y"} + y{"E, M/d/y – E, M/d/y"} } yMMM{ M{"MMM–MMM y"} - y{"MMM y – MMM y"} + y{"MMM y – MMM y"} } yMMMEd{ - M{"E, MMM d – E, MMM d, y"} - d{"E, MMM d – E, MMM d, y"} - y{"E, MMM d, y – E, MMM d, y"} + M{"E, MMM d – E, MMM d, y"} + d{"E, MMM d – E, MMM d, y"} + y{"E, MMM d, y – E, MMM d, y"} } yMMMM{ M{"MMMM–MMMM y"} - y{"MMMM y – MMMM y"} + y{"MMMM y – MMMM y"} } yMMMd{ - M{"MMM d – MMM d, y"} + M{"MMM d – MMM d, y"} d{"MMM d–d, y"} - y{"MMM d, y – MMM d, y"} + y{"MMM d, y – MMM d, y"} } yMd{ - M{"M/d/y – M/d/y"} - d{"M/d/y – M/d/y"} - y{"M/d/y – M/d/y"} + M{"M/d/y – M/d/y"} + d{"M/d/y – M/d/y"} + y{"M/d/y – M/d/y"} } } monthNames{ @@ -1644,15 +1674,21 @@ fil{ } hebrew{ DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE, MMMM d y", "MMMM d y", "MMM d y", "MMM d y", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{1} 'nang' {0}", "{1} 'nang' {0}", "{1}, {0}", @@ -1727,80 +1763,80 @@ fil{ M{"M–M"} } MEd{ - M{"E, MMM d – E, MMM d"} - d{"E, MMM d – E, MMM d"} + M{"E, MMM d – E, MMM d"} + d{"E, MMM d – E, MMM d"} } MMM{ M{"MMM–MMM"} } MMMEd{ - M{"E, MMM d – E, MMM d"} - d{"E, MMM d – E, MMM d"} + M{"E, MMM d – E, MMM d"} + d{"E, MMM d – E, MMM d"} } MMMd{ - M{"MMM d – MMM d"} + M{"MMM d – MMM d"} d{"MMM d–d"} } Md{ - M{"MMM d – MMM d"} - d{"M/d – M/d"} + M{"MMM d – MMM d"} + d{"M/d – M/d"} } d{ d{"d–d"} } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y G"} } yM{ - M{"MMM – MMM y"} - y{"MMM y – MMM y"} + M{"MMM – MMM y"} + y{"MMM y – MMM y"} } yMEd{ - M{"E, MMM d – E, MMM d y"} - d{"E, MMM d – E, MMM d y"} - y{"E, MMM d y – E, MMM d y"} + M{"E, MMM d – E, MMM d y"} + d{"E, MMM d – E, MMM d y"} + y{"E, MMM d y – E, MMM d y"} } yMMM{ - M{"MMM – MMM y"} - y{"MMM y – MMM y"} + M{"MMM – MMM y"} + y{"MMM y – MMM y"} } yMMMEd{ - M{"E, MMM d – E, MMM d y"} - d{"E, MMM d – E, MMM d y"} - y{"E, MMM d y – E, MMM d y"} + M{"E, MMM d – E, MMM d y"} + d{"E, MMM d – E, MMM d y"} + y{"E, MMM d y – E, MMM d y"} } yMMMM{ - M{"MMMM – MMMM y"} - y{"MMMM y – MMMM y"} + M{"MMMM – MMMM y"} + y{"MMMM y – MMMM y"} } yMMMd{ - M{"MMM d – MMM d y"} + M{"MMM d – MMM d y"} d{"d – MMM d y"} - y{"MMM d y – MMM d y"} + y{"MMM d y – MMM d y"} } yMd{ - M{"MMM d – MMM d y"} + M{"MMM d – MMM d y"} d{"d – MMM d y"} - y{"MMM d y – MMM d y"} + y{"MMM d y – MMM d y"} } } monthNames{ @@ -1908,15 +1944,21 @@ fil{ } indian{ DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE, MMMM d, y G", "MMMM d, y G", "MMM d, y G", "M/d/y GGGGG", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{1} 'nang' {0}", "{1} 'nang' {0}", "{1}, {0}", @@ -1991,80 +2033,80 @@ fil{ M{"M–M"} } MEd{ - M{"E, M/d – E, M/d"} - d{"E, M/d – E, M/d"} + M{"E, M/d – E, M/d"} + d{"E, M/d – E, M/d"} } MMM{ M{"MMM–MMM"} } MMMEd{ - M{"E, MMM d – E, MMM d"} - d{"E, MMM d – E, MMM d"} + M{"E, MMM d – E, MMM d"} + d{"E, MMM d – E, MMM d"} } MMMd{ - M{"MMM d – MMM d"} + M{"MMM d – MMM d"} d{"MMM d–d"} } Md{ - M{"M/d – M/d"} - d{"M/d – M/d"} + M{"M/d – M/d"} + d{"M/d – M/d"} } d{ d{"d–d"} } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y G"} } yM{ - M{"M/y – M/y GGGGG"} - y{"M/y – M/y GGGGG"} + M{"M/y – M/y GGGGG"} + y{"M/y – M/y GGGGG"} } yMEd{ - M{"E, M/d/y – E, M/d/y GGGGG"} - d{"E, M/d/y – E, M/d/y GGGGG"} - y{"E, M/d/y – E, M/d/y GGGGG"} + M{"E, M/d/y – E, M/d/y GGGGG"} + d{"E, M/d/y – E, M/d/y GGGGG"} + y{"E, M/d/y – E, M/d/y GGGGG"} } yMMM{ M{"MMM–MMM y G"} - y{"MMM y – MMM y G"} + y{"MMM y – MMM y G"} } yMMMEd{ - M{"E, MMM d – E, MMM d, y G"} - d{"E, MMM d – E, MMM d, y G"} - y{"E, MMM d, y – E, MMM d, y G"} + M{"E, MMM d – E, MMM d, y G"} + d{"E, MMM d – E, MMM d, y G"} + y{"E, MMM d, y – E, MMM d, y G"} } yMMMM{ M{"MMMM–MMMM y G"} - y{"MMMM y – MMMM y G"} + y{"MMMM y – MMMM y G"} } yMMMd{ - M{"MMM d – MMM d, y G"} + M{"MMM d – MMM d, y G"} d{"MMM d–d, y G"} - y{"MMM d, y – MMM d, y G"} + y{"MMM d, y – MMM d, y G"} } yMd{ - M{"M/d/y – M/d/y GGGGG"} - d{"M/d/y – M/d/y GGGGG"} - y{"M/d/y – M/d/y GGGGG"} + M{"M/d/y – M/d/y GGGGG"} + d{"M/d/y – M/d/y GGGGG"} + y{"M/d/y – M/d/y GGGGG"} } } monthNames{ @@ -2160,15 +2202,21 @@ fil{ } islamic{ DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE, MMMM d, y G", "MMMM d, y G", "MMM d, y G", "M/d/y GGGGG", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{1} 'nang' {0}", "{1} 'nang' {0}", "{1}, {0}", @@ -2243,80 +2291,80 @@ fil{ M{"M–M"} } MEd{ - M{"E, M/d – E, M/d"} - d{"E, M/d – E, M/d"} + M{"E, M/d – E, M/d"} + d{"E, M/d – E, M/d"} } MMM{ M{"MMM–MMM"} } MMMEd{ - M{"E, MMM d – E, MMM d"} - d{"E, MMM d – E, MMM d"} + M{"E, MMM d – E, MMM d"} + d{"E, MMM d – E, MMM d"} } MMMd{ - M{"MMM d – MMM d"} + M{"MMM d – MMM d"} d{"MMM d–d"} } Md{ - M{"M/d – M/d"} - d{"M/d – M/d"} + M{"M/d – M/d"} + d{"M/d – M/d"} } d{ d{"d–d"} } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y G"} } yM{ - M{"M/y – M/y GGGGG"} - y{"M/y – M/y GGGGG"} + M{"M/y – M/y GGGGG"} + y{"M/y – M/y GGGGG"} } yMEd{ - M{"E, M/d/y – E, M/d/y GGGGG"} - d{"E, M/d/y – E, M/d/y GGGGG"} - y{"E, M/d/y – E, M/d/y GGGGG"} + M{"E, M/d/y – E, M/d/y GGGGG"} + d{"E, M/d/y – E, M/d/y GGGGG"} + y{"E, M/d/y – E, M/d/y GGGGG"} } yMMM{ M{"MMM–MMM y G"} - y{"MMM y – MMM y G"} + y{"MMM y – MMM y G"} } yMMMEd{ - M{"E, MMM d – E, MMM d, y G"} - d{"E, MMM d – E, MMM d, y G"} - y{"E, MMM d, y – E, MMM d, y G"} + M{"E, MMM d – E, MMM d, y G"} + d{"E, MMM d – E, MMM d, y G"} + y{"E, MMM d, y – E, MMM d, y G"} } yMMMM{ M{"MMMM–MMMM y G"} - y{"MMMM y – MMMM y G"} + y{"MMMM y – MMMM y G"} } yMMMd{ - M{"MMM d – MMM d, y G"} + M{"MMM d – MMM d, y G"} d{"MMM d–d, y G"} - y{"MMM d, y – MMM d, y G"} + y{"MMM d, y – MMM d, y G"} } yMd{ - M{"M/d/y – M/d/y GGGGG"} - d{"M/d/y – M/d/y GGGGG"} - y{"M/d/y – M/d/y GGGGG"} + M{"M/d/y – M/d/y GGGGG"} + d{"M/d/y – M/d/y GGGGG"} + y{"M/d/y – M/d/y GGGGG"} } } monthNames{ @@ -2412,15 +2460,21 @@ fil{ } persian{ DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE, MMMM d, y G", "MMMM d, y G", "MMM d, y G", "M/d/y GGGGG", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{1} 'nang' {0}", "{1} 'nang' {0}", "{1}, {0}", @@ -2495,80 +2549,80 @@ fil{ M{"M–M"} } MEd{ - M{"E, M/d – E, M/d"} - d{"E, M/d – E, M/d"} + M{"E, M/d – E, M/d"} + d{"E, M/d – E, M/d"} } MMM{ M{"MMM–MMM"} } MMMEd{ - M{"E, MMM d – E, MMM d"} - d{"E, MMM d – E, MMM d"} + M{"E, MMM d – E, MMM d"} + d{"E, MMM d – E, MMM d"} } MMMd{ - M{"MMM d – MMM d"} + M{"MMM d – MMM d"} d{"MMM d–d"} } Md{ - M{"M/d – M/d"} - d{"M/d – M/d"} + M{"M/d – M/d"} + d{"M/d – M/d"} } d{ d{"d–d"} } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y G"} } yM{ - M{"M/y – M/y GGGGG"} - y{"M/y – M/y GGGGG"} + M{"M/y – M/y GGGGG"} + y{"M/y – M/y GGGGG"} } yMEd{ - M{"E, M/d/y – E, M/d/y GGGGG"} - d{"E, M/d/y – E, M/d/y GGGGG"} - y{"E, M/d/y – E, M/d/y GGGGG"} + M{"E, M/d/y – E, M/d/y GGGGG"} + d{"E, M/d/y – E, M/d/y GGGGG"} + y{"E, M/d/y – E, M/d/y GGGGG"} } yMMM{ M{"MMM–MMM y G"} - y{"MMM y – MMM y G"} + y{"MMM y – MMM y G"} } yMMMEd{ - M{"E, MMM d – E, MMM d, y G"} - d{"E, MMM d – E, MMM d, y G"} - y{"E, MMM d, y – E, MMM d, y G"} + M{"E, MMM d – E, MMM d, y G"} + d{"E, MMM d – E, MMM d, y G"} + y{"E, MMM d, y – E, MMM d, y G"} } yMMMM{ M{"MMMM–MMMM y G"} - y{"MMMM y – MMMM y G"} + y{"MMMM y – MMMM y G"} } yMMMd{ - M{"MMM d – MMM d, y G"} + M{"MMM d – MMM d, y G"} d{"MMM d–d, y G"} - y{"MMM d, y – MMM d, y G"} + y{"MMM d, y – MMM d, y G"} } yMd{ - M{"M/d/y – M/d/y GGGGG"} - d{"M/d/y – M/d/y GGGGG"} - y{"M/d/y – M/d/y GGGGG"} + M{"M/d/y – M/d/y GGGGG"} + d{"M/d/y – M/d/y GGGGG"} + y{"M/d/y – M/d/y GGGGG"} } } monthNames{ @@ -2664,15 +2718,21 @@ fil{ } roc{ DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE, MMMM d, y G", "MMMM d, y G", "MMM d, y G", "M/d/y GGGGG", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{1} 'nang' {0}", "{1} 'nang' {0}", "{1}, {0}", @@ -2750,80 +2810,80 @@ fil{ M{"M–M"} } MEd{ - M{"E, M/d – E, M/d"} - d{"E, M/d – E, M/d"} + M{"E, M/d – E, M/d"} + d{"E, M/d – E, M/d"} } MMM{ M{"MMM–MMM"} } MMMEd{ - M{"E, MMM d – E, MMM d"} - d{"E, MMM d – E, MMM d"} + M{"E, MMM d – E, MMM d"} + d{"E, MMM d – E, MMM d"} } MMMd{ - M{"MMM d – MMM d"} + M{"MMM d – MMM d"} d{"MMM d–d"} } Md{ - M{"M/d – M/d"} - d{"M/d – M/d"} + M{"M/d – M/d"} + d{"M/d – M/d"} } d{ d{"d–d"} } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y G"} } yM{ - M{"M/y – M/y GGGGG"} - y{"M/y – M/y GGGGG"} + M{"M/y – M/y GGGGG"} + y{"M/y – M/y GGGGG"} } yMEd{ - M{"E, M/d/y – E, M/d/y GGGGG"} - d{"E, M/d/y – E, M/d/y GGGGG"} - y{"E, M/d/y – E, M/d/y GGGGG"} + M{"E, M/d/y – E, M/d/y GGGGG"} + d{"E, M/d/y – E, M/d/y GGGGG"} + y{"E, M/d/y – E, M/d/y GGGGG"} } yMMM{ M{"MMM–MMM y G"} - y{"MMM y – MMM y G"} + y{"MMM y – MMM y G"} } yMMMEd{ - M{"E, MMM d – E, MMM d, y G"} - d{"E, MMM d – E, MMM d, y G"} - y{"E, MMM d, y – E, MMM d, y G"} + M{"E, MMM d – E, MMM d, y G"} + d{"E, MMM d – E, MMM d, y G"} + y{"E, MMM d, y – E, MMM d, y G"} } yMMMM{ M{"MMMM–MMMM y G"} - y{"MMMM y – MMMM y G"} + y{"MMMM y – MMMM y G"} } yMMMd{ - M{"MMM d – MMM d, y G"} + M{"MMM d – MMM d, y G"} d{"MMM d–d, y G"} - y{"MMM d, y – MMM d, y G"} + y{"MMM d, y – MMM d, y G"} } yMd{ - M{"M/d/y – M/d/y GGGGG"} - d{"M/d/y – M/d/y GGGGG"} - y{"M/d/y – M/d/y GGGGG"} + M{"M/d/y – M/d/y GGGGG"} + d{"M/d/y – M/d/y GGGGG"} + y{"M/d/y – M/d/y GGGGG"} } } } diff --git a/icu4c/source/data/locales/fo.txt b/icu4c/source/data/locales/fo.txt index 8112a6b14be2..e879c5228eb2 100644 --- a/icu4c/source/data/locales/fo.txt +++ b/icu4c/source/data/locales/fo.txt @@ -225,6 +225,12 @@ fo{ "d. MMM y G", "dd.MM.y GGGGG", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{1} 'kl'. {0}", "{1} 'kl'. {0}", "{1}, {0}", @@ -250,8 +256,8 @@ fo{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"E d."} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"y G"} GyMMM{"MMM y G"} GyMMMEd{"E d. MMM y G"} @@ -267,9 +273,9 @@ fo{ MMMd{"d. MMM"} Md{"dd.MM"} d{"d."} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"mm:ss"} y{"y G"} yM{"MM.y"} @@ -293,48 +299,48 @@ fo{ } intervalFormats{ Bh{ - B{"h B – h B"} + B{"h B – h B"} h{"h–h B"} } Bhm{ - B{"h:mm B – h:mm B"} + B{"h:mm B – h:mm B"} h{"h:mm–h:mm B"} m{"h:mm–h:mm B"} } Gy{ - G{"y G – y G"} + G{"y G – y G"} y{"y–y G"} } GyM{ - G{"MM.y GGGGG – MM.y GGGGG"} + G{"MM.y GGGGG – MM.y GGGGG"} M{"MM.y–MM.y GGGGG"} y{"MM.y–MM.y GGGGG"} } GyMEd{ - G{"E, dd.MM.y GGGGG – E, dd.MM.y GGGGG"} - M{"E, dd.MM.y – E, dd.MM.y GGGGG"} - d{"E, dd.MM.y – E, dd.MM.y GGGGG"} - y{"E, dd.MM.y – E, dd.MM.y GGGGG"} + G{"E, dd.MM.y GGGGG – E, dd.MM.y GGGGG"} + M{"E, dd.MM.y – E, dd.MM.y GGGGG"} + d{"E, dd.MM.y – E, dd.MM.y GGGGG"} + y{"E, dd.MM.y – E, dd.MM.y GGGGG"} } GyMMM{ - G{"MMM y G – MMM y G"} + G{"MMM y G – MMM y G"} M{"MMM–MMM y G"} - y{"MMM y – MMM y G"} + y{"MMM y – MMM y G"} } GyMMMEd{ - G{"E, d. MMM y G – E, d. MMM y G"} - M{"E, d. MMM – E, d. MMM y G"} - d{"E, d. MMM – E, d. MMM y G"} - y{"E, d. MMM y – E, d. MMM y G"} + G{"E, d. MMM y G – E, d. MMM y G"} + M{"E, d. MMM – E, d. MMM y G"} + d{"E, d. MMM – E, d. MMM y G"} + y{"E, d. MMM y – E, d. MMM y G"} } GyMMMd{ - G{"d. MMM y G – d. MMM y G"} - M{"d. MMM – d. MMM y G"} + G{"d. MMM y G – d. MMM y G"} + M{"d. MMM – d. MMM y G"} d{"d.–d. MMM y G"} - y{"d. MMM y – d. MMM y G"} + y{"d. MMM y – d. MMM y G"} } GyMd{ - G{"dd.MM.y GGGGG – dd.MM.y GGGGG"} + G{"dd.MM.y GGGGG – dd.MM.y GGGGG"} M{"dd.MM.y–dd.MM.y GGGGG"} d{"dd.MM.y–dd.MM.y GGGGG"} y{"dd.MM.y–dd.MM.y GGGGG"} @@ -380,22 +386,22 @@ fo{ } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y G"} @@ -457,6 +463,12 @@ fo{ "dd.MM.y", "dd.MM.yy", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{1} 'kl'. {0}", "{1} 'kl'. {0}", "{1}, {0}", @@ -485,8 +497,8 @@ fo{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"E d."} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"y G"} GyMMM{"MMM y G"} GyMMMEd{"E d. MMM y G"} @@ -508,11 +520,11 @@ fo{ MMMd{"d. MMM"} Md{"dd.MM"} d{"d."} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} - hmsv{"h:mm:ss a v"} - hmv{"h:mm a v"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} + hmsv{"h:mm:ss a v"} + hmv{"h:mm a v"} ms{"mm:ss"} y{"y"} yM{"MM.y"} @@ -651,50 +663,50 @@ fo{ } intervalFormats{ Bh{ - B{"h B – h B"} + B{"h B – h B"} } Bhm{ - B{"h:mm B – h:mm B"} + B{"h:mm B – h:mm B"} h{"h:mm–h:mm B"} m{"h:mm–h:mm B"} } Gy{ - G{"y G – y G"} + G{"y G – y G"} y{"y–y G"} } GyM{ - G{"MM.y GGGGG – MM.y GGGGG"} + G{"MM.y GGGGG – MM.y GGGGG"} M{"MM.y–MM.y GGGGG"} y{"MM.y–MM.y GGGGG"} } GyMEd{ - G{"E, dd.MM.y GGGGG – E, dd.MM.y GGGGG"} - M{"E, dd.MM.y – E, dd.MM.y GGGGG"} - d{"E, dd.MM.y – E, dd.MM.y GGGGG"} - y{"E, dd.MM.y – E, dd.MM.y GGGGG"} + G{"E, dd.MM.y GGGGG – E, dd.MM.y GGGGG"} + M{"E, dd.MM.y – E, dd.MM.y GGGGG"} + d{"E, dd.MM.y – E, dd.MM.y GGGGG"} + y{"E, dd.MM.y – E, dd.MM.y GGGGG"} } GyMMM{ - G{"MMM y G – MMM y G"} + G{"MMM y G – MMM y G"} M{"MMM–MMM y G"} - y{"MMM y – MMM y G"} + y{"MMM y – MMM y G"} } GyMMMEd{ - G{"E, d. MMM y G – E, d. MMM y G"} - M{"E, d. MMM – E, d. MMM y G"} - d{"E, d. MMM – E, d. MMM y G"} - y{"E, d. MMM y – E, d. MMM y G"} + G{"E, d. MMM y G – E, d. MMM y G"} + M{"E, d. MMM – E, d. MMM y G"} + d{"E, d. MMM – E, d. MMM y G"} + y{"E, d. MMM y – E, d. MMM y G"} } GyMMMd{ - G{"d. MMM y G – d. MMM y G"} - M{"d. MMM – d. MMM y G"} + G{"d. MMM y G – d. MMM y G"} + M{"d. MMM – d. MMM y G"} d{"d.–d. MMM y G"} - y{"d. MMM y – d. MMM y G"} + y{"d. MMM y – d. MMM y G"} } GyMd{ - G{"dd.MM.y GGGGG – dd.MM.y GGGGG"} - M{"dd.MM.y – dd.MM.y GGGGG"} + G{"dd.MM.y GGGGG – dd.MM.y GGGGG"} + M{"dd.MM.y – dd.MM.y GGGGG"} d{"dd.MM.y–dd.MM.y GGGGG"} - y{"dd.MM.y – dd.MM.y GGGGG"} + y{"dd.MM.y – dd.MM.y GGGGG"} } H{ H{"HH–HH"} @@ -737,22 +749,22 @@ fo{ } fallback{"{0} – {1}"} h{ - a{"h a–h a"} - h{"h–h a"} + a{"h a–h a"} + h{"h–h a"} } hm{ - a{"h:mm a–h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a–h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a–h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a–h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a–h a v"} - h{"h–h a v"} + a{"h a–h a v"} + h{"h–h a v"} } y{ y{"y–y"} diff --git a/icu4c/source/data/locales/fr.txt b/icu4c/source/data/locales/fr.txt index 7d35e24b492b..c3d555266a6e 100644 --- a/icu4c/source/data/locales/fr.txt +++ b/icu4c/source/data/locales/fr.txt @@ -241,8 +241,8 @@ fr{ "d MMM y G", "dd/MM/y GGGGG", "{1} {0}", - "{1} 'à' {0}", - "{1} 'à' {0}", + "{1} {0}", + "{1} {0}", "{1} {0}", "{1} {0}", } @@ -717,6 +717,12 @@ fr{ "d MMM y G", "dd/MM/y GGGGG", "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + } + DateTimePatterns%atTime{ "{1} 'à' {0}", "{1} 'à' {0}", "{1} {0}", @@ -742,8 +748,8 @@ fr{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"E d"} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"y G"} GyMMM{"MMM y G"} GyMMMEd{"E d MMM y G"} @@ -760,9 +766,9 @@ fr{ MMMd{"d MMM"} Md{"dd/MM"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"mm:ss"} y{"y G"} yyyy{"y G"} @@ -778,13 +784,13 @@ fr{ } intervalFormats{ Bh{ - B{"h B – h B"} - h{"h – h B"} + B{"h B – h B"} + h{"h – h B"} } Bhm{ - B{"h:mm B – h:mm B"} - h{"h:mm – h:mm B"} - m{"h:mm – h:mm B"} + B{"h:mm B – h:mm B"} + h{"h:mm – h:mm B"} + m{"h:mm – h:mm B"} } Gy{ G{"y G 'à' y G"} @@ -825,97 +831,97 @@ fr{ y{"d/M/y 'à' d/M/y G"} } H{ - H{"HH – HH"} + H{"HH – HH"} } Hm{ - H{"HH:mm – HH:mm"} - m{"HH:mm – HH:mm"} + H{"HH:mm – HH:mm"} + m{"HH:mm – HH:mm"} } Hmv{ - H{"HH:mm – HH:mm v"} - m{"HH:mm – HH:mm v"} + H{"HH:mm – HH:mm v"} + m{"HH:mm – HH:mm v"} } Hv{ - H{"HH – HH v"} + H{"HH – HH v"} } M{ - M{"M – M"} + M{"M – M"} } MEd{ - M{"E dd/MM – E dd/MM"} - d{"E dd/MM – E dd/MM"} + M{"E dd/MM – E dd/MM"} + d{"E dd/MM – E dd/MM"} } MMM{ M{"MMM–MMM"} } MMMEd{ - M{"E d MMM – E d MMM"} - d{"E d MMM – E d MMM"} + M{"E d MMM – E d MMM"} + d{"E d MMM – E d MMM"} } MMMd{ - M{"d MMM – d MMM"} + M{"d MMM – d MMM"} d{"d–d MMM"} } Md{ - M{"dd/MM – dd/MM"} - d{"dd/MM – dd/MM"} + M{"dd/MM – dd/MM"} + d{"dd/MM – dd/MM"} } d{ - d{"d – d"} + d{"d – d"} } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h – h a"} + a{"h a – h a"} + h{"h – h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm – h:mm a"} - m{"h:mm – h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm – h:mm a"} + m{"h:mm – h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm – h:mm a v"} - m{"h:mm – h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm – h:mm a v"} + m{"h:mm – h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h – h a v"} + a{"h a – h a v"} + h{"h – h a v"} } y{ - y{"y – y G"} + y{"y – y G"} } yM{ - M{"MM/y – MM/y G"} - y{"M/y – M/y G"} + M{"MM/y – MM/y G"} + y{"M/y – M/y G"} } yMEd{ - M{"E dd/MM/y – E dd/MM/y G"} - d{"E dd/MM/y – E dd/MM/y G"} - y{"E dd/MM/y – E dd/MM/y G"} + M{"E dd/MM/y – E dd/MM/y G"} + d{"E dd/MM/y – E dd/MM/y G"} + y{"E dd/MM/y – E dd/MM/y G"} } yMMM{ M{"MMM–MMM y G"} - y{"MMM y – MMM y G"} + y{"MMM y – MMM y G"} } yMMMEd{ - M{"E d MMM – E d MMM y G"} - d{"E d – E d MMM y G"} - y{"E d MMM y – E d MMM y G"} + M{"E d MMM – E d MMM y G"} + d{"E d – E d MMM y G"} + y{"E d MMM y – E d MMM y G"} } yMMMM{ - M{"MMMM – MMMM y G"} - y{"MMMM y – MMMM y G"} + M{"MMMM – MMMM y G"} + y{"MMMM y – MMMM y G"} } yMMMd{ - M{"d MMM – d MMM y G"} + M{"d MMM – d MMM y G"} d{"d–d MMM y G"} - y{"d MMM y – d MMM y G"} + y{"d MMM y – d MMM y G"} } yMd{ - M{"d/M/y – d/M/y G"} - d{"d/M/y – d/M/y G"} - y{"dd/MM/y – dd/MM/y G"} + M{"d/M/y – d/M/y G"} + d{"d/M/y – d/M/y G"} + y{"dd/MM/y – dd/MM/y G"} } } } @@ -942,6 +948,12 @@ fr{ "d MMM y", "dd/MM/y", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1} {0}", + } + DateTimePatterns%atTime{ "{1} 'à' {0}", "{1} 'à' {0}", "{1}, {0}", @@ -970,8 +982,8 @@ fr{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"E d"} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"y G"} GyMMM{"MMM y G"} GyMMMEd{"E d MMM y G"} @@ -994,11 +1006,11 @@ fr{ MMMd{"d MMM"} Md{"dd/MM"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} - hmsv{"h:mm:ss a v"} - hmv{"h:mm a v"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} + hmsv{"h:mm:ss a v"} + hmv{"h:mm a v"} ms{"mm:ss"} y{"y"} yM{"MM/y"} @@ -1181,13 +1193,13 @@ fr{ } intervalFormats{ Bh{ - B{"h B – h B"} - h{"h – h B"} + B{"h B – h B"} + h{"h – h B"} } Bhm{ - B{"h:mm B – h:mm B"} - h{"h:mm – h:mm B"} - m{"h:mm – h:mm B"} + B{"h:mm B – h:mm B"} + h{"h:mm – h:mm B"} + m{"h:mm – h:mm B"} } Gy{ G{"y G 'à' y G"} @@ -1228,97 +1240,97 @@ fr{ y{"d/M/y 'à' d/M/y G"} } H{ - H{"HH – HH"} + H{"HH – HH"} } Hm{ - H{"HH:mm – HH:mm"} - m{"HH:mm – HH:mm"} + H{"HH:mm – HH:mm"} + m{"HH:mm – HH:mm"} } Hmv{ - H{"HH:mm – HH:mm v"} - m{"HH:mm – HH:mm v"} + H{"HH:mm – HH:mm v"} + m{"HH:mm – HH:mm v"} } Hv{ - H{"HH – HH v"} + H{"HH – HH v"} } M{ M{"M–M"} } MEd{ - M{"E dd/MM – E dd/MM"} - d{"E dd/MM – E dd/MM"} + M{"E dd/MM – E dd/MM"} + d{"E dd/MM – E dd/MM"} } MMM{ M{"MMM–MMM"} } MMMEd{ - M{"E d MMM – E d MMM"} - d{"E d – E d MMM"} + M{"E d MMM – E d MMM"} + d{"E d – E d MMM"} } MMMd{ - M{"d MMM – d MMM"} + M{"d MMM – d MMM"} d{"d–d MMM"} } Md{ - M{"dd/MM – dd/MM"} - d{"dd/MM – dd/MM"} + M{"dd/MM – dd/MM"} + d{"dd/MM – dd/MM"} } d{ d{"d–d"} } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h – h a"} + a{"h a – h a"} + h{"h – h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm – h:mm a"} - m{"h:mm – h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm – h:mm a"} + m{"h:mm – h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm – h:mm a v"} - m{"h:mm – h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm – h:mm a v"} + m{"h:mm – h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h – h a v"} + a{"h a – h a v"} + h{"h – h a v"} } y{ y{"y–y"} } yM{ - M{"MM/y – MM/y"} - y{"MM/y – MM/y"} + M{"MM/y – MM/y"} + y{"MM/y – MM/y"} } yMEd{ - M{"E dd/MM/y – E dd/MM/y"} - d{"E dd/MM/y – E dd/MM/y"} - y{"E dd/MM/y – E dd/MM/y"} + M{"E dd/MM/y – E dd/MM/y"} + d{"E dd/MM/y – E dd/MM/y"} + y{"E dd/MM/y – E dd/MM/y"} } yMMM{ M{"MMM–MMM y"} - y{"MMM y – MMM y"} + y{"MMM y – MMM y"} } yMMMEd{ - M{"E d MMM – E d MMM y"} - d{"E d – E d MMM y"} - y{"E d MMM y – E d MMM y"} + M{"E d MMM – E d MMM y"} + d{"E d – E d MMM y"} + y{"E d MMM y – E d MMM y"} } yMMMM{ - M{"MMMM – MMMM y"} - y{"MMMM y – MMMM y"} + M{"MMMM – MMMM y"} + y{"MMMM y – MMMM y"} } yMMMd{ - M{"d MMM – d MMM y"} + M{"d MMM – d MMM y"} d{"d–d MMM y"} - y{"d MMM y – d MMM y"} + y{"d MMM y – d MMM y"} } yMd{ - M{"dd/MM/y – dd/MM/y"} - d{"dd/MM/y – dd/MM/y"} - y{"dd/MM/y – dd/MM/y"} + M{"dd/MM/y – dd/MM/y"} + d{"dd/MM/y – dd/MM/y"} + y{"dd/MM/y – dd/MM/y"} } } monthNames{ @@ -1465,8 +1477,8 @@ fr{ "d MMM y G", "dd/MM/y GGGGG", "{1} {0}", - "{1} 'à' {0}", - "{1} 'à' {0}", + "{1} {0}", + "{1} {0}", "{1} {0}", "{1} {0}", } @@ -1705,8 +1717,8 @@ fr{ "d MMM y G", "dd/MM/y GGGGG", "{1} {0}", - "{1} 'à' {0}", - "{1} 'à' {0}", + "{1} {0}", + "{1} {0}", "{1} {0}", "{1} {0}", } diff --git a/icu4c/source/data/locales/fr_BE.txt b/icu4c/source/data/locales/fr_BE.txt index 2a2b037b92c9..1c4214f97336 100644 --- a/icu4c/source/data/locales/fr_BE.txt +++ b/icu4c/source/data/locales/fr_BE.txt @@ -14,8 +14,8 @@ fr_BE{ "d MMM y G", "d/MM/yy GGGGG", "{1} {0}", - "{1} 'à' {0}", - "{1} 'à' {0}", + "{1} {0}", + "{1} {0}", "{1} {0}", "{1} {0}", } @@ -41,8 +41,8 @@ fr_BE{ "d MMM y", "d/MM/yy", "{1}, {0}", - "{1} 'à' {0}", - "{1} 'à' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1} {0}", } diff --git a/icu4c/source/data/locales/fr_CA.txt b/icu4c/source/data/locales/fr_CA.txt index c6dda4de8bb1..bcd2038f7730 100644 --- a/icu4c/source/data/locales/fr_CA.txt +++ b/icu4c/source/data/locales/fr_CA.txt @@ -224,8 +224,8 @@ fr_CA{ "d MMM y G", "yy-MM-dd GGGGG", "{1} {0}", - "{1} 'à' {0}", - "{1} 'à' {0}", + "{1} {0}", + "{1} {0}", "{1} {0}", "{1} {0}", } @@ -247,7 +247,7 @@ fr_CA{ EBhms{"E h 'h' mm 'min' ss 's' B"} EHm{"E HH 'h' mm"} EHms{"E HH 'h' mm 'min' ss 's'"} - Ehm{"E h 'h' mm a"} + Ehm{"E h 'h' mm a"} Ehms{"E h 'h' mm 'min' ss 's' a"} GyMd{"y-MM-dd GGGGG"} H{"HH 'h'"} @@ -258,7 +258,7 @@ fr_CA{ MMdd{"MM-dd"} Md{"M-d"} h{"h 'h' a"} - hm{"h 'h' mm a"} + hm{"h 'h' mm a"} hms{"h 'h' mm 'min' ss 's' a"} ms{"mm 'min' ss 's'"} yyyyM{"y-MM G"} @@ -268,74 +268,74 @@ fr_CA{ } intervalFormats{ Bh{ - B{"h 'h' B – h 'h' B"} - h{"h – h 'h' B"} + B{"h 'h' B – h 'h' B"} + h{"h – h 'h' B"} } Bhm{ - B{"h 'h' mm B – h 'h' mm B"} - h{"h 'h' mm – h 'h' mm B"} - m{"h 'h' mm – h 'h' mm B"} + B{"h 'h' mm B – h 'h' mm B"} + h{"h 'h' mm – h 'h' mm B"} + m{"h 'h' mm – h 'h' mm B"} } Gy{ - G{"y G – y G"} + G{"y G – y G"} } GyM{ - G{"y-MM GGGGG – y-MM GGGGG"} - M{"y-MM – y-MM GGGGG"} - y{"y-MM – y-MM GGGGG"} + G{"y-MM GGGGG – y-MM GGGGG"} + M{"y-MM – y-MM GGGGG"} + y{"y-MM – y-MM GGGGG"} } GyMEd{ - G{"E y-MM-dd GGGGG – E y-MM-dd GGGGG"} - M{"E y-MM-dd GGGGG – E y-MM-dd GGGGG"} - d{"E y-MM-dd – E y-MM-dd GGGGG"} - y{"E y-MM-dd – E y-MM-dd GGGGG"} + G{"E y-MM-dd GGGGG – E y-MM-dd GGGGG"} + M{"E y-MM-dd GGGGG – E y-MM-dd GGGGG"} + d{"E y-MM-dd – E y-MM-dd GGGGG"} + y{"E y-MM-dd – E y-MM-dd GGGGG"} } GyMMM{ - G{"MMM y G – MMM y G"} - M{"MMM y – MMM y G"} - y{"MMM y – MMM y G"} + G{"MMM y G – MMM y G"} + M{"MMM y – MMM y G"} + y{"MMM y – MMM y G"} } GyMMMEd{ - G{"E d MMM y G – E d MMM y G"} - M{"E d MMM – E d MMM y G"} - d{"E d MMM – E d MMM y G"} - y{"E d MMM y – E d MMM y G"} + G{"E d MMM y G – E d MMM y G"} + M{"E d MMM – E d MMM y G"} + d{"E d MMM – E d MMM y G"} + y{"E d MMM y – E d MMM y G"} } GyMMMd{ - G{"d MMM y G – d MMM y G"} - M{"d MMM – d MMM y G"} - y{"d MMM y – d MMM y G"} + G{"d MMM y G – d MMM y G"} + M{"d MMM – d MMM y G"} + y{"d MMM y – d MMM y G"} } GyMd{ - G{"y-MM-dd GGGGG – y-MM-dd GGGGG"} - M{"y-MM-dd – y-MM-dd GGGGG"} - d{"y-MM-dd – y-MM-dd GGGGG"} - y{"y-MM-dd – y-MM-dd GGGGG"} + G{"y-MM-dd GGGGG – y-MM-dd GGGGG"} + M{"y-MM-dd – y-MM-dd GGGGG"} + d{"y-MM-dd – y-MM-dd GGGGG"} + y{"y-MM-dd – y-MM-dd GGGGG"} } MEd{ - M{"E MM-dd – E MM-dd"} - d{"E MM-dd – E MM-dd"} + M{"E MM-dd – E MM-dd"} + d{"E MM-dd – E MM-dd"} } MMMEd{ - d{"E d – E d MMM"} + d{"E d – E d MMM"} } Md{ - M{"MM-dd – MM-dd"} - d{"MM-dd – MM-dd"} + M{"MM-dd – MM-dd"} + d{"MM-dd – MM-dd"} } yM{ - M{"y-MM – y-MM G"} - y{"y-MM – y-MM G"} + M{"y-MM – y-MM G"} + y{"y-MM – y-MM G"} } yMEd{ - M{"E y-MM-dd – E y-MM-dd G"} - d{"E y-MM-dd – E y-MM-dd G"} - y{"E y-MM-dd – E y-MM-dd G"} + M{"E y-MM-dd – E y-MM-dd G"} + d{"E y-MM-dd – E y-MM-dd G"} + y{"E y-MM-dd – E y-MM-dd G"} } yMd{ - M{"y-MM-dd – y-MM-dd G"} - d{"y-MM-dd – y-MM-dd G"} - y{"y-MM-dd – y-MM-dd G"} + M{"y-MM-dd – y-MM-dd G"} + d{"y-MM-dd – y-MM-dd G"} + y{"y-MM-dd – y-MM-dd G"} } } } @@ -362,8 +362,8 @@ fr_CA{ "d MMM y", "y-MM-dd", "{1}, {0}", - "{1} 'à' {0}", - "{1} 'à' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1} {0}", } @@ -375,7 +375,7 @@ fr_CA{ EBhms{"E h 'h' mm 'min' ss 's' B"} EHm{"E HH 'h' mm"} EHms{"E HH 'h' mm 'min' ss 's'"} - Ehm{"E h 'h' mm a"} + Ehm{"E h 'h' mm a"} Ehms{"E h 'h' mm 'min' ss 's' a"} GyMd{"y-MM-dd GGGGG"} Hm{"HH 'h' mm"} @@ -387,10 +387,10 @@ fr_CA{ MMdd{"MM-dd"} Md{"M-d"} h{"h 'h' a"} - hm{"h 'h' mm a"} + hm{"h 'h' mm a"} hms{"h 'h' mm 'min' ss 's' a"} hmsv{"h 'h' mm 'min' ss 's' a v"} - hmv{"h 'h' mm a v"} + hmv{"h 'h' mm a v"} ms{"mm 'min' ss 's'"} yM{"y-MM"} yMEd{"E y-MM-dd"} @@ -471,121 +471,121 @@ fr_CA{ } intervalFormats{ Bh{ - B{"h 'h' B – h 'h' B"} - h{"h – h 'h' B"} + B{"h 'h' B – h 'h' B"} + h{"h – h 'h' B"} } Bhm{ - B{"h 'h' mm B – h 'h' mm B"} - h{"h 'h' mm – h 'h' mm B"} - m{"h 'h' mm – h 'h' mm B"} + B{"h 'h' mm B – h 'h' mm B"} + h{"h 'h' mm – h 'h' mm B"} + m{"h 'h' mm – h 'h' mm B"} } Gy{ - G{"y G – y G"} + G{"y G – y G"} } GyM{ - G{"y-MM GGGGG – y-MM GGGGG"} - M{"y-MM – y-MM GGGGG"} - y{"y-MM – y-MM GGGGG"} + G{"y-MM GGGGG – y-MM GGGGG"} + M{"y-MM – y-MM GGGGG"} + y{"y-MM – y-MM GGGGG"} } GyMEd{ - G{"E y-MM-dd GGGGG – E y-MM-dd GGGGG"} - M{"E y-MM-dd – E y-MM-dd GGGGG"} - d{"E y-MM-dd – E y-MM-dd GGGGG"} - y{"E y-MM-dd – E y-MM-dd GGGGG"} + G{"E y-MM-dd GGGGG – E y-MM-dd GGGGG"} + M{"E y-MM-dd – E y-MM-dd GGGGG"} + d{"E y-MM-dd – E y-MM-dd GGGGG"} + y{"E y-MM-dd – E y-MM-dd GGGGG"} } GyMMM{ - G{"MMM y G – MMM y G"} - M{"MMM y – MMM y G"} - y{"MMM y – MMM y G"} + G{"MMM y G – MMM y G"} + M{"MMM y – MMM y G"} + y{"MMM y – MMM y G"} } GyMMMEd{ - G{"E d MMM y G – E d MMM y G"} - M{"E d MMM – E d MMM y G"} - d{"E d MMM – E d MMM y G"} - y{"E d MMM y – E d MMM y G"} + G{"E d MMM y G – E d MMM y G"} + M{"E d MMM – E d MMM y G"} + d{"E d MMM – E d MMM y G"} + y{"E d MMM y – E d MMM y G"} } GyMMMd{ - G{"d MMM y G – d MMM y G"} - M{"d MMM – d MMM y G"} - y{"d MMM y – d MMM y G"} + G{"d MMM y G – d MMM y G"} + M{"d MMM – d MMM y G"} + y{"d MMM y – d MMM y G"} } GyMd{ - G{"y-MM-dd GGGGG – y-MM-dd GGGGG"} - M{"y-MM-dd – y-MM-dd GGGGG"} - d{"y-MM-dd – y-MM-dd GGGGG"} - y{"y-MM-dd – y-MM-dd GGGGG"} + G{"y-MM-dd GGGGG – y-MM-dd GGGGG"} + M{"y-MM-dd – y-MM-dd GGGGG"} + d{"y-MM-dd – y-MM-dd GGGGG"} + y{"y-MM-dd – y-MM-dd GGGGG"} } H{ H{"H 'h' – H 'h'"} } Hm{ - H{"H 'h' mm – H 'h' mm"} - m{"H 'h' mm – H 'h' mm"} + H{"H 'h' mm – H 'h' mm"} + m{"H 'h' mm – H 'h' mm"} } Hmv{ - H{"H 'h' mm – H 'h' mm v"} - m{"H 'h' mm – H 'h' mm v"} + H{"H 'h' mm – H 'h' mm v"} + m{"H 'h' mm – H 'h' mm v"} } Hv{ H{"H 'h' – H 'h' v"} } M{ - M{"M – M"} + M{"M – M"} } MEd{ - M{"E MM-dd – E MM-dd"} - d{"E MM-dd – E MM-dd"} + M{"E MM-dd – E MM-dd"} + d{"E MM-dd – E MM-dd"} } MMM{ - M{"MMM – MMM"} + M{"MMM – MMM"} } MMMd{ - d{"d – d MMM"} + d{"d – d MMM"} } Md{ - M{"MM-dd – MM-dd"} - d{"MM-dd – MM-dd"} + M{"MM-dd – MM-dd"} + d{"MM-dd – MM-dd"} } d{ - d{"d – d"} + d{"d – d"} } h{ - a{"h 'h' a – h 'h' a"} + a{"h 'h' a – h 'h' a"} h{"h 'h' – h 'h' a"} } hm{ - a{"h 'h' mm a – h 'h' mm a"} - h{"h 'h' mm – h 'h' mm a"} - m{"h 'h' mm – h 'h' mm a"} + a{"h 'h' mm a – h 'h' mm a"} + h{"h 'h' mm – h 'h' mm a"} + m{"h 'h' mm – h 'h' mm a"} } hmv{ - a{"h 'h' mm a – h 'h' mm a v"} - h{"h 'h' mm – h 'h' mm a v"} - m{"h 'h' mm – h 'h' mm a v"} + a{"h 'h' mm a – h 'h' mm a v"} + h{"h 'h' mm – h 'h' mm a v"} + m{"h 'h' mm – h 'h' mm a v"} } hv{ - a{"h 'h' a – h 'h' a v"} + a{"h 'h' a – h 'h' a v"} h{"h 'h' – h 'h' a v"} } y{ - y{"y – y"} + y{"y – y"} } yM{ - M{"y-MM – y-MM"} - y{"y-MM – y-MM"} + M{"y-MM – y-MM"} + y{"y-MM – y-MM"} } yMEd{ - M{"E y-MM-dd – E y-MM-dd"} - d{"E y-MM-dd – E y-MM-dd"} - y{"E y-MM-dd – E y-MM-dd"} + M{"E y-MM-dd – E y-MM-dd"} + d{"E y-MM-dd – E y-MM-dd"} + y{"E y-MM-dd – E y-MM-dd"} } yMMM{ - M{"MMM – MMM y"} + M{"MMM – MMM y"} } yMd{ - M{"y-MM-dd – y-MM-dd"} - d{"y-MM-dd – y-MM-dd"} - y{"y-MM-dd – y-MM-dd"} + M{"y-MM-dd – y-MM-dd"} + d{"y-MM-dd – y-MM-dd"} + y{"y-MM-dd – y-MM-dd"} } } monthNames{ @@ -752,8 +752,8 @@ fr_CA{ "d MMM y G", "y-MM-dd GGGGG", "{1} {0}", - "{1} 'à' {0}", - "{1} 'à' {0}", + "{1} {0}", + "{1} {0}", "{1} {0}", "{1} {0}", } diff --git a/icu4c/source/data/locales/fr_CD.txt b/icu4c/source/data/locales/fr_CD.txt index f00521d6d57e..eee59fc7293b 100644 --- a/icu4c/source/data/locales/fr_CD.txt +++ b/icu4c/source/data/locales/fr_CD.txt @@ -30,7 +30,7 @@ fr_CD{ } intervalFormats{ y{ - y{"y – y"} + y{"y – y"} } } } diff --git a/icu4c/source/data/locales/fr_CH.txt b/icu4c/source/data/locales/fr_CH.txt index f12d01545731..0dd2a6cdd376 100644 --- a/icu4c/source/data/locales/fr_CH.txt +++ b/icu4c/source/data/locales/fr_CH.txt @@ -24,8 +24,8 @@ fr_CH{ "d MMM y G", "dd.MM.y GGGGG", "{1} {0}", - "{1} 'à' {0}", - "{1} 'à' {0}", + "{1} {0}", + "{1} {0}", "{1} {0}", "{1} {0}", } @@ -42,8 +42,8 @@ fr_CH{ M{"M–M"} } MEd{ - M{"E, dd.MM – E, dd.MM"} - d{"E, dd.MM – E, dd.MM"} + M{"E, dd.MM – E, dd.MM"} + d{"E, dd.MM – E, dd.MM"} } MMMEd{ M{"E, d MMM 'au' E, d MMM"} @@ -53,18 +53,18 @@ fr_CH{ M{"d MMM 'au' d MMM"} } Md{ - M{"dd.MM – dd.MM"} - d{"dd.MM – dd.MM"} + M{"dd.MM – dd.MM"} + d{"dd.MM – dd.MM"} } fallback{"du {0} au {1}"} yM{ - M{"MM.y – MM.y GGGGG"} - y{"MM.y – MM.y GGGGG"} + M{"MM.y – MM.y GGGGG"} + y{"MM.y – MM.y GGGGG"} } yMEd{ - M{"E, dd.MM.y – E, dd.MM.y GGGGG"} - d{"E, dd.MM.y – E, dd.MM.y GGGGG"} - y{"E, dd.MM.y – E, dd.MM.y GGGGG"} + M{"E, dd.MM.y – E, dd.MM.y GGGGG"} + d{"E, dd.MM.y – E, dd.MM.y GGGGG"} + y{"E, dd.MM.y – E, dd.MM.y GGGGG"} } yMMM{ y{"MMM y 'a'` MMM y G"} @@ -79,9 +79,9 @@ fr_CH{ y{"d MMM y 'au' d MMM y G"} } yMd{ - M{"dd.MM.y – dd.MM.y GGGGG"} - d{"dd.MM.y – dd.MM.y GGGGG"} - y{"dd.MM.y – dd.MM.y GGGGG"} + M{"dd.MM.y – dd.MM.y GGGGG"} + d{"dd.MM.y – dd.MM.y GGGGG"} + y{"dd.MM.y – dd.MM.y GGGGG"} } } } @@ -96,8 +96,8 @@ fr_CH{ "d MMM y", "dd.MM.yy", "{1}, {0}", - "{1} 'à' {0}", - "{1} 'à' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1} {0}", } @@ -149,26 +149,26 @@ fr_CH{ } intervalFormats{ MEd{ - M{"E, dd.MM – E, dd.MM"} - d{"E, dd.MM – E, dd.MM"} + M{"E, dd.MM – E, dd.MM"} + d{"E, dd.MM – E, dd.MM"} } Md{ - M{"dd.MM – dd.MM"} - d{"dd.MM – dd.MM"} + M{"dd.MM – dd.MM"} + d{"dd.MM – dd.MM"} } yM{ - M{"MM.y – MM.y"} - y{"MM.y – MM.y"} + M{"MM.y – MM.y"} + y{"MM.y – MM.y"} } yMEd{ - M{"E, dd.MM.y – E, dd.MM.y"} - d{"E, dd.MM.y – E, dd.MM.y"} - y{"E, dd.MM.y – E, dd.MM.y"} + M{"E, dd.MM.y – E, dd.MM.y"} + d{"E, dd.MM.y – E, dd.MM.y"} + y{"E, dd.MM.y – E, dd.MM.y"} } yMd{ - M{"dd.MM.y – dd.MM.y"} - d{"dd.MM.y – dd.MM.y"} - y{"dd.MM.y – dd.MM.y"} + M{"dd.MM.y – dd.MM.y"} + d{"dd.MM.y – dd.MM.y"} + y{"dd.MM.y – dd.MM.y"} } } } diff --git a/icu4c/source/data/locales/fr_CM.txt b/icu4c/source/data/locales/fr_CM.txt index 960bcbf1136b..9295299df614 100644 --- a/icu4c/source/data/locales/fr_CM.txt +++ b/icu4c/source/data/locales/fr_CM.txt @@ -43,22 +43,22 @@ fr_CM{ } intervalFormats{ h{ - a{"h – h"} - h{"h – h"} + a{"h – h"} + h{"h – h"} } hm{ - a{"h:mm – h:mm"} - h{"h:mm – h:mm"} - m{"h:mm – h:mm"} + a{"h:mm – h:mm"} + h{"h:mm – h:mm"} + m{"h:mm – h:mm"} } hmv{ - a{"h:mm – h:mm v"} - h{"h:mm – h:mm v"} - m{"h:mm – h:mm v"} + a{"h:mm – h:mm v"} + h{"h:mm – h:mm v"} + m{"h:mm – h:mm v"} } hv{ - a{"h – h v"} - h{"h – h v"} + a{"h – h v"} + h{"h – h v"} } } } diff --git a/icu4c/source/data/locales/fr_DJ.txt b/icu4c/source/data/locales/fr_DJ.txt index 106d5f779618..781c5dc986de 100644 --- a/icu4c/source/data/locales/fr_DJ.txt +++ b/icu4c/source/data/locales/fr_DJ.txt @@ -5,17 +5,17 @@ fr_DJ{ calendar{ gregorian{ DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE d MMMM y", "d MMMM y", "d MMM y", "dd/MM/y", "{1}, {0}", - "{1} 'à' {0}", - "{1} 'à' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1} {0}", } diff --git a/icu4c/source/data/locales/fr_DZ.txt b/icu4c/source/data/locales/fr_DZ.txt index 1e7bc26fb34c..5e674c1ccc0a 100644 --- a/icu4c/source/data/locales/fr_DZ.txt +++ b/icu4c/source/data/locales/fr_DZ.txt @@ -5,17 +5,17 @@ fr_DZ{ calendar{ gregorian{ DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE d MMMM y", "d MMMM y", "d MMM y", "dd/MM/y", "{1}, {0}", - "{1} 'à' {0}", - "{1} 'à' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1} {0}", } diff --git a/icu4c/source/data/locales/fr_ML.txt b/icu4c/source/data/locales/fr_ML.txt index 841867e06b39..8855d3b40cd2 100644 --- a/icu4c/source/data/locales/fr_ML.txt +++ b/icu4c/source/data/locales/fr_ML.txt @@ -21,8 +21,8 @@ fr_ML{ "d MMM y", "dd/MM/y", "{1}, {0}", - "{1} 'à' {0}", - "{1} 'à' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } diff --git a/icu4c/source/data/locales/fr_MR.txt b/icu4c/source/data/locales/fr_MR.txt index 7088e5e53152..fb0786b5efea 100644 --- a/icu4c/source/data/locales/fr_MR.txt +++ b/icu4c/source/data/locales/fr_MR.txt @@ -5,17 +5,17 @@ fr_MR{ calendar{ gregorian{ DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE d MMMM y", "d MMMM y", "d MMM y", "dd/MM/y", "{1}, {0}", - "{1} 'à' {0}", - "{1} 'à' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1} {0}", } diff --git a/icu4c/source/data/locales/fr_SY.txt b/icu4c/source/data/locales/fr_SY.txt index e1ca47325c25..389603dedc6d 100644 --- a/icu4c/source/data/locales/fr_SY.txt +++ b/icu4c/source/data/locales/fr_SY.txt @@ -5,17 +5,17 @@ fr_SY{ calendar{ gregorian{ DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE d MMMM y", "d MMMM y", "d MMM y", "dd/MM/y", "{1}, {0}", - "{1} 'à' {0}", - "{1} 'à' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1} {0}", } diff --git a/icu4c/source/data/locales/fr_TD.txt b/icu4c/source/data/locales/fr_TD.txt index b31294cf568b..fddfb64b79ad 100644 --- a/icu4c/source/data/locales/fr_TD.txt +++ b/icu4c/source/data/locales/fr_TD.txt @@ -5,17 +5,17 @@ fr_TD{ calendar{ gregorian{ DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE d MMMM y", "d MMMM y", "d MMM y", "dd/MM/y", "{1}, {0}", - "{1} 'à' {0}", - "{1} 'à' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1} {0}", } diff --git a/icu4c/source/data/locales/fr_TN.txt b/icu4c/source/data/locales/fr_TN.txt index 29548cdc00f6..d7f25d8ab4f2 100644 --- a/icu4c/source/data/locales/fr_TN.txt +++ b/icu4c/source/data/locales/fr_TN.txt @@ -5,17 +5,17 @@ fr_TN{ calendar{ gregorian{ DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE d MMMM y", "d MMMM y", "d MMM y", "dd/MM/y", "{1}, {0}", - "{1} 'à' {0}", - "{1} 'à' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1} {0}", } diff --git a/icu4c/source/data/locales/fr_VU.txt b/icu4c/source/data/locales/fr_VU.txt index d0c3e9441383..649dd5a96b04 100644 --- a/icu4c/source/data/locales/fr_VU.txt +++ b/icu4c/source/data/locales/fr_VU.txt @@ -5,17 +5,17 @@ fr_VU{ calendar{ gregorian{ DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE d MMMM y", "d MMMM y", "d MMM y", "dd/MM/y", "{1}, {0}", - "{1} 'à' {0}", - "{1} 'à' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1} {0}", } diff --git a/icu4c/source/data/locales/fur.txt b/icu4c/source/data/locales/fur.txt index b130eb59bfe7..98a375b4c702 100644 --- a/icu4c/source/data/locales/fur.txt +++ b/icu4c/source/data/locales/fur.txt @@ -97,80 +97,80 @@ fur{ M{"M–M"} } MEd{ - M{"E dd/MM – E dd/MM"} - d{"E dd/MM – E dd/MM"} + M{"E dd/MM – E dd/MM"} + d{"E dd/MM – E dd/MM"} } MMM{ M{"LLL–LLL"} } MMMEd{ - M{"E d 'di' MMM – E d 'di' MMM"} - d{"E d – E d 'di' MMM"} + M{"E d 'di' MMM – E d 'di' MMM"} + d{"E d – E d 'di' MMM"} } MMMd{ - M{"d 'di' MMM – d 'di' MMM"} + M{"d 'di' MMM – d 'di' MMM"} d{"d–d 'di' MMM"} } Md{ - M{"dd/MM – dd/MM"} - d{"dd/MM – dd/MM"} + M{"dd/MM – dd/MM"} + d{"dd/MM – dd/MM"} } d{ d{"d–d"} } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y"} } yM{ - M{"MM/y – MM/y"} - y{"MM/y – MM/y"} + M{"MM/y – MM/y"} + y{"MM/y – MM/y"} } yMEd{ - M{"E dd/MM/y – E dd/MM/y"} - d{"E dd/MM/y – E dd/MM/y"} - y{"E dd/MM/y – E dd/MM/y"} + M{"E dd/MM/y – E dd/MM/y"} + d{"E dd/MM/y – E dd/MM/y"} + y{"E dd/MM/y – E dd/MM/y"} } yMMM{ - M{"MM – MM/y"} - y{"MM/y – MM/y"} + M{"MM – MM/y"} + y{"MM/y – MM/y"} } yMMMEd{ - M{"E dd/MM/y – E dd/MM/y"} - d{"E dd/MM/y – E dd/MM/y"} - y{"E dd/MM/y – E dd/MM/y"} + M{"E dd/MM/y – E dd/MM/y"} + d{"E dd/MM/y – E dd/MM/y"} + y{"E dd/MM/y – E dd/MM/y"} } yMMMM{ - M{"MM – MM/y"} - y{"MM/y – MM/y"} + M{"MM – MM/y"} + y{"MM/y – MM/y"} } yMMMd{ - M{"dd/MM/y – d/MM"} - d{"d – d/MM/y"} - y{"dd/MM/y – dd/MM/y"} + M{"dd/MM/y – d/MM"} + d{"d – d/MM/y"} + y{"dd/MM/y – dd/MM/y"} } yMd{ - M{"dd/MM/y – dd/MM/y"} - d{"dd/MM/y – dd/MM/y"} - y{"dd/MM/y – dd/MM/y"} + M{"dd/MM/y – dd/MM/y"} + d{"dd/MM/y – dd/MM/y"} + y{"dd/MM/y – dd/MM/y"} } } } @@ -316,80 +316,80 @@ fur{ M{"M–M"} } MEd{ - M{"E dd/MM – E dd/MM"} - d{"E dd/MM – E dd/MM"} + M{"E dd/MM – E dd/MM"} + d{"E dd/MM – E dd/MM"} } MMM{ M{"LLL–LLL"} } MMMEd{ - M{"E d 'di' MMM – E d 'di' MMM"} - d{"E d – E d 'di' MMM"} + M{"E d 'di' MMM – E d 'di' MMM"} + d{"E d – E d 'di' MMM"} } MMMd{ - M{"d 'di' MMM – d 'di' MMM"} + M{"d 'di' MMM – d 'di' MMM"} d{"d–d 'di' MMM"} } Md{ - M{"dd/MM – dd/MM"} - d{"dd/MM – dd/MM"} + M{"dd/MM – dd/MM"} + d{"dd/MM – dd/MM"} } d{ d{"d–d"} } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y"} } yM{ - M{"MM/y – MM/y"} - y{"MM/y – MM/y"} + M{"MM/y – MM/y"} + y{"MM/y – MM/y"} } yMEd{ - M{"E dd/MM/y – E dd/MM/y"} - d{"E dd/MM/y – E dd/MM/y"} - y{"E dd/MM/y – E dd/MM/y"} + M{"E dd/MM/y – E dd/MM/y"} + d{"E dd/MM/y – E dd/MM/y"} + y{"E dd/MM/y – E dd/MM/y"} } yMMM{ - M{"MM – MM/y"} - y{"MM/y – MM/y"} + M{"MM – MM/y"} + y{"MM/y – MM/y"} } yMMMEd{ - M{"E dd/MM/y – E dd/MM/y"} - d{"E dd/MM/y – E dd/MM/y"} - y{"E dd/MM/y – E dd/MM/y"} + M{"E dd/MM/y – E dd/MM/y"} + d{"E dd/MM/y – E dd/MM/y"} + y{"E dd/MM/y – E dd/MM/y"} } yMMMM{ - M{"MM – MM/y"} - y{"MM/y – MM/y"} + M{"MM – MM/y"} + y{"MM/y – MM/y"} } yMMMd{ - M{"dd/MM/y – d/MM"} - d{"d – d/MM/y"} - y{"dd/MM/y – dd/MM/y"} + M{"dd/MM/y – d/MM"} + d{"d – d/MM/y"} + y{"dd/MM/y – dd/MM/y"} } yMd{ - M{"dd/MM/y – dd/MM/y"} - d{"dd/MM/y – dd/MM/y"} - y{"dd/MM/y – dd/MM/y"} + M{"dd/MM/y – dd/MM/y"} + d{"dd/MM/y – dd/MM/y"} + y{"dd/MM/y – dd/MM/y"} } } monthNames{ diff --git a/icu4c/source/data/locales/fy.txt b/icu4c/source/data/locales/fy.txt index bc6a7d909037..dd35a40c8a48 100644 --- a/icu4c/source/data/locales/fy.txt +++ b/icu4c/source/data/locales/fy.txt @@ -258,9 +258,9 @@ fy{ MMMd{"d MMM"} Md{"d-M"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"mm:ss"} y{"U"} yyyy{"U"} @@ -817,9 +817,9 @@ fy{ MMMd{"d MMM"} Md{"d-M"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"mm:ss"} y{"y G"} yyyy{"y G"} @@ -852,83 +852,83 @@ fy{ M{"M–M"} } MEd{ - M{"E dd-MM – E dd-MM"} - d{"E dd-MM – E dd-MM"} + M{"E dd-MM – E dd-MM"} + d{"E dd-MM – E dd-MM"} } MMM{ M{"MMM–MMM"} } MMMEd{ - M{"E d MMM – E d MMM"} - d{"E d – E d MMM"} + M{"E d MMM – E d MMM"} + d{"E d – E d MMM"} } MMMM{ M{"MMMM–MMMM"} } MMMd{ - M{"d MMM – d MMM"} + M{"d MMM – d MMM"} d{"d–d MMM"} } Md{ - M{"dd-MM – dd-MM"} - d{"dd-MM – dd-MM"} + M{"dd-MM – dd-MM"} + d{"dd-MM – dd-MM"} } d{ d{"d–d"} } fallback{"{0} - {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y G"} } yM{ - M{"MM-y – MM-y G"} - y{"MM-y – MM-y G"} + M{"MM-y – MM-y G"} + y{"MM-y – MM-y G"} } yMEd{ - M{"E dd-MM-y – E dd-MM-y G"} - d{"E dd-MM-y – E dd-MM-y G"} - y{"E dd-MM-y – E dd-MM-y G"} + M{"E dd-MM-y – E dd-MM-y G"} + d{"E dd-MM-y – E dd-MM-y G"} + y{"E dd-MM-y – E dd-MM-y G"} } yMMM{ M{"MMM–MMM y G"} - y{"MMM y – MMM y G"} + y{"MMM y – MMM y G"} } yMMMEd{ - M{"E d MMM – E d MMM y G"} - d{"E d – E d MMM y G"} - y{"E d MMM y – E d MMM y G"} + M{"E d MMM – E d MMM y G"} + d{"E d – E d MMM y G"} + y{"E d MMM y – E d MMM y G"} } yMMMM{ M{"MMMM–MMMM y G"} - y{"MMMM y – MMMM y G"} + y{"MMMM y – MMMM y G"} } yMMMd{ - M{"d MMM – d MMM y G"} + M{"d MMM – d MMM y G"} d{"d–d MMM y G"} - y{"d MMM y – d MMM y G"} + y{"d MMM y – d MMM y G"} } yMd{ - M{"dd-MM-y – dd-MM-y G"} - d{"dd-MM-y – dd-MM-y G"} - y{"dd-MM-y – dd-MM-y G"} + M{"dd-MM-y – dd-MM-y G"} + d{"dd-MM-y – dd-MM-y G"} + y{"dd-MM-y – dd-MM-y G"} } } } @@ -955,6 +955,12 @@ fy{ "d MMM y", "dd-MM-yy", "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + } + DateTimePatterns%atTime{ "{1} 'om' {0}", "{1} 'om' {0}", "{1} {0}", @@ -978,8 +984,8 @@ fy{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"d, E"} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"G y"} GyMMM{"MMM y G"} GyMMMEd{"E d MMM y G"} @@ -1001,11 +1007,11 @@ fy{ MMMd{"d MMM"} Md{"d-M"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} - hmsv{"h:mm:ss a v"} - hmv{"h:mm a v"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} + hmsv{"h:mm:ss a v"} + hmv{"h:mm a v"} ms{"mm:ss"} y{"y"} yM{"M-y"} @@ -1161,83 +1167,83 @@ fy{ M{"M–M"} } MEd{ - M{"E dd-MM – E dd-MM"} - d{"E dd-MM – E dd-MM"} + M{"E dd-MM – E dd-MM"} + d{"E dd-MM – E dd-MM"} } MMM{ M{"MMM–MMM"} } MMMEd{ - M{"E d MMM – E d MMM"} - d{"E d – E d MMM"} + M{"E d MMM – E d MMM"} + d{"E d – E d MMM"} } MMMM{ M{"MMMM–MMMM"} } MMMd{ - M{"d MMM – d MMM"} + M{"d MMM – d MMM"} d{"d–d MMM"} } Md{ - M{"dd-MM – dd-MM"} - d{"dd-MM – dd-MM"} + M{"dd-MM – dd-MM"} + d{"dd-MM – dd-MM"} } d{ d{"d–d"} } fallback{"{0} - {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y"} } yM{ - M{"MM-y – MM-y"} - y{"MM-y – MM-y"} + M{"MM-y – MM-y"} + y{"MM-y – MM-y"} } yMEd{ - M{"E dd-MM-y – E dd-MM-y"} - d{"E dd-MM-y – E dd-MM-y"} - y{"E dd-MM-y – E dd-MM-y"} + M{"E dd-MM-y – E dd-MM-y"} + d{"E dd-MM-y – E dd-MM-y"} + y{"E dd-MM-y – E dd-MM-y"} } yMMM{ M{"MMM–MMM y"} - y{"MMM y – MMM y"} + y{"MMM y – MMM y"} } yMMMEd{ - M{"E d MMM – E d MMM y"} - d{"E d – E d MMM y"} - y{"E d MMM y – E d MMM y"} + M{"E d MMM – E d MMM y"} + d{"E d – E d MMM y"} + y{"E d MMM y – E d MMM y"} } yMMMM{ M{"MMMM–MMMM y"} - y{"MMMM y – MMMM y"} + y{"MMMM y – MMMM y"} } yMMMd{ - M{"d MMM – d MMM y"} + M{"d MMM – d MMM y"} d{"d–d MMM y"} - y{"d MMM y – d MMM y"} + y{"d MMM y – d MMM y"} } yMd{ - M{"dd-MM-y – dd-MM-y"} - d{"dd-MM-y – dd-MM-y"} - y{"dd-MM-y – dd-MM-y"} + M{"dd-MM-y – dd-MM-y"} + d{"dd-MM-y – dd-MM-y"} + y{"dd-MM-y – dd-MM-y"} } } monthNames{ diff --git a/icu4c/source/data/locales/ga.txt b/icu4c/source/data/locales/ga.txt index 640188c29bc8..18f922d2b69b 100644 --- a/icu4c/source/data/locales/ga.txt +++ b/icu4c/source/data/locales/ga.txt @@ -381,97 +381,97 @@ ga{ } intervalFormats{ H{ - H{"HH – HH"} + H{"HH – HH"} } Hm{ - H{"HH:mm – HH:mm"} - m{"HH:mm – HH:mm"} + H{"HH:mm – HH:mm"} + m{"HH:mm – HH:mm"} } Hmv{ - H{"HH:mm – HH:mm v"} - m{"HH:mm – HH:mm v"} + H{"HH:mm – HH:mm v"} + m{"HH:mm – HH:mm v"} } Hv{ - H{"HH – HH v"} + H{"HH – HH v"} } M{ - M{"MM – MM"} + M{"MM – MM"} } MEd{ - M{"E dd/MM – E dd/MM"} - d{"E dd/MM – E dd/MM"} + M{"E dd/MM – E dd/MM"} + d{"E dd/MM – E dd/MM"} } MMM{ - M{"MMM – MMM"} + M{"MMM – MMM"} } MMMEd{ - M{"E d MMM – E d MMM"} - d{"E d MMM – E d MMM"} + M{"E d MMM – E d MMM"} + d{"E d MMM – E d MMM"} } MMMd{ - M{"d MMM – d MMM"} - d{"d – d MMM"} + M{"d MMM – d MMM"} + d{"d – d MMM"} } Md{ - M{"dd/MM – dd/MM"} - d{"dd/MM – dd/MM"} + M{"dd/MM – dd/MM"} + d{"dd/MM – dd/MM"} } d{ - d{"d – d"} + d{"d – d"} } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h – h a"} + a{"h a – h a"} + h{"h – h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm – h:mm a"} - m{"h:mm – h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm – h:mm a"} + m{"h:mm – h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm – h:mm a v"} - m{"h:mm – h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm – h:mm a v"} + m{"h:mm – h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h – h a v"} + a{"h a – h a v"} + h{"h – h a v"} } y{ - y{"y – y G"} + y{"y – y G"} } yM{ - M{"MM/y – MM/y GGGGG"} - y{"MM/y – MM/y GGGGG"} + M{"MM/y – MM/y GGGGG"} + y{"MM/y – MM/y GGGGG"} } yMEd{ - M{"E dd/MM/y – E dd/MM/y GGGGG"} - d{"E dd/MM/y – E dd/MM/y GGGGG"} - y{"E dd/MM/y – E dd/MM/y GGGGG"} + M{"E dd/MM/y – E dd/MM/y GGGGG"} + d{"E dd/MM/y – E dd/MM/y GGGGG"} + y{"E dd/MM/y – E dd/MM/y GGGGG"} } yMMM{ - M{"MMM – MMM y G"} - y{"MMM y – MMM y G"} + M{"MMM – MMM y G"} + y{"MMM y – MMM y G"} } yMMMEd{ - M{"E d MMM – E d MMM y G"} - d{"E d MMM – E d MMM y G"} - y{"E d MMM y – E d MMM y G"} + M{"E d MMM – E d MMM y G"} + d{"E d MMM – E d MMM y G"} + y{"E d MMM y – E d MMM y G"} } yMMMM{ - M{"MMMM – MMMM y G"} - y{"MMMM y – MMMM y G"} + M{"MMMM – MMMM y G"} + y{"MMMM y – MMMM y G"} } yMMMd{ - M{"d MMM – d MMM y G"} - d{"d – d MMM y G"} - y{"d MMM y – d MMM y G"} + M{"d MMM – d MMM y G"} + d{"d – d MMM y G"} + y{"d MMM y – d MMM y G"} } yMd{ - M{"dd/MM/y – dd/MM/y GGGGG"} - d{"dd/MM/y – dd/MM/y GGGGG"} - y{"dd/MM/y – dd/MM/y GGGGG"} + M{"dd/MM/y – dd/MM/y GGGGG"} + d{"dd/MM/y – dd/MM/y GGGGG"} + y{"dd/MM/y – dd/MM/y GGGGG"} } } } @@ -511,8 +511,8 @@ ga{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"E d"} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"y G"} GyMMM{"MMM y G"} GyMMMEd{"E d MMM y G"} @@ -528,9 +528,9 @@ ga{ MMMd{"d MMM"} Md{"dd/MM"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"mm:ss"} y{"y G"} yyyy{"y G"} @@ -546,118 +546,118 @@ ga{ } intervalFormats{ Bh{ - B{"h B – h B"} - h{"h – h B"} + B{"h B – h B"} + h{"h – h B"} } Bhm{ - B{"h:mm B – h:mm B"} - h{"h:mm – h:mm B"} - m{"h:mm – h:mm B"} + B{"h:mm B – h:mm B"} + h{"h:mm – h:mm B"} + m{"h:mm – h:mm B"} } Gy{ - G{"y G – y G"} - y{"y – y G"} + G{"y G – y G"} + y{"y – y G"} } GyM{ - G{"MM/y GGGGG – MM/y GGGGG"} + G{"MM/y GGGGG – MM/y GGGGG"} } GyMMM{ - G{"MMM y G – MMM y G"} - M{"MMM – MMM y G"} - y{"MMM y – MMM y G"} + G{"MMM y G – MMM y G"} + M{"MMM – MMM y G"} + y{"MMM y – MMM y G"} } H{ - H{"HH – HH"} + H{"HH – HH"} } Hm{ - H{"HH:mm – HH:mm"} - m{"HH:mm – HH:mm"} + H{"HH:mm – HH:mm"} + m{"HH:mm – HH:mm"} } Hmv{ - H{"HH:mm – HH:mm v"} - m{"HH:mm – HH:mm v"} + H{"HH:mm – HH:mm v"} + m{"HH:mm – HH:mm v"} } Hv{ - H{"HH – HH v"} + H{"HH – HH v"} } M{ - M{"MM – MM"} + M{"MM – MM"} } MEd{ - M{"E dd/MM – E dd/MM"} - d{"E dd/MM – E dd/MM"} + M{"E dd/MM – E dd/MM"} + d{"E dd/MM – E dd/MM"} } MMM{ - M{"MMM – MMM"} + M{"MMM – MMM"} } MMMEd{ - M{"E d MMM – E d MMM"} - d{"E d MMM – E d MMM"} + M{"E d MMM – E d MMM"} + d{"E d MMM – E d MMM"} } MMMd{ - M{"d MMM – d MMM"} - d{"d – d MMM"} + M{"d MMM – d MMM"} + d{"d – d MMM"} } Md{ - M{"dd/MM – dd/MM"} - d{"dd/MM – dd/MM"} + M{"dd/MM – dd/MM"} + d{"dd/MM – dd/MM"} } d{ - d{"d – d"} + d{"d – d"} } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm – h:mm a"} - m{"h:mm – h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm – h:mm a"} + m{"h:mm – h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm – h:mm a v"} - m{"h:mm – h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm – h:mm a v"} + m{"h:mm – h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h – h a v"} + a{"h a – h a v"} + h{"h – h a v"} } y{ - y{"y – y G"} + y{"y – y G"} } yM{ - M{"MM/y – MM/y GGGGG"} - y{"MM/y – MM/y GGGGG"} + M{"MM/y – MM/y GGGGG"} + y{"MM/y – MM/y GGGGG"} } yMEd{ - M{"E dd/MM/y – E dd/MM/y GGGGG"} - d{"E dd/MM/y – E dd/MM/y GGGGG"} - y{"E dd/MM/y – E dd/MM/y GGGGG"} + M{"E dd/MM/y – E dd/MM/y GGGGG"} + d{"E dd/MM/y – E dd/MM/y GGGGG"} + y{"E dd/MM/y – E dd/MM/y GGGGG"} } yMMM{ - M{"MMM – MMM y G"} - y{"MMM y – MMM y G"} + M{"MMM – MMM y G"} + y{"MMM y – MMM y G"} } yMMMEd{ - M{"E d MMM – E d MMM y G"} - d{"E d MMM – E d MMM y G"} - y{"E d MMM y – E d MMM y G"} + M{"E d MMM – E d MMM y G"} + d{"E d MMM – E d MMM y G"} + y{"E d MMM y – E d MMM y G"} } yMMMM{ - M{"MMMM – MMMM y G"} - y{"MMMM y – MMMM y G"} + M{"MMMM – MMMM y G"} + y{"MMMM y – MMMM y G"} } yMMMd{ - M{"d MMM – d MMM y G"} - d{"d – d MMM y G"} - y{"d MMM y – d MMM y G"} + M{"d MMM – d MMM y G"} + d{"d – d MMM y G"} + y{"d MMM y – d MMM y G"} } yMd{ - M{"dd/MM/y – dd/MM/y GGGGG"} - d{"dd/MM/y – dd/MM/y GGGGG"} - y{"dd/MM/y – dd/MM/y GGGGG"} + M{"dd/MM/y – dd/MM/y GGGGG"} + d{"dd/MM/y – dd/MM/y GGGGG"} + y{"dd/MM/y – dd/MM/y GGGGG"} } } } @@ -708,8 +708,8 @@ ga{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"E d"} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"y G"} GyMMM{"MMM y G"} GyMMMEd{"E d MMM y G"} @@ -735,11 +735,11 @@ ga{ MMMd{"d MMM"} Md{"dd/MM"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} - hmsv{"h:mm:ss a v"} - hmv{"h:mm a v"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} + hmsv{"h:mm:ss a v"} + hmv{"h:mm a v"} ms{"mm:ss"} y{"y"} yM{"MM/y"} @@ -877,106 +877,106 @@ ga{ } intervalFormats{ Bh{ - B{"h B – h B"} - h{"h – h B"} + B{"h B – h B"} + h{"h – h B"} } Bhm{ - B{"h:mm B – h:mm B"} - h{"h:mm – h:mm B"} - m{"h:mm – h:mm B"} + B{"h:mm B – h:mm B"} + h{"h:mm – h:mm B"} + m{"h:mm – h:mm B"} } H{ - H{"HH – HH"} + H{"HH – HH"} } Hm{ - H{"HH:mm – HH:mm"} - m{"HH:mm – HH:mm"} + H{"HH:mm – HH:mm"} + m{"HH:mm – HH:mm"} } Hmv{ - H{"HH:mm – HH:mm v"} - m{"HH:mm – HH:mm v"} + H{"HH:mm – HH:mm v"} + m{"HH:mm – HH:mm v"} } Hv{ - H{"HH – HH v"} + H{"HH – HH v"} } M{ - M{"MM – MM"} + M{"MM – MM"} } MEd{ - M{"E dd/MM – E dd/MM"} - d{"E dd/MM – E dd/MM"} + M{"E dd/MM – E dd/MM"} + d{"E dd/MM – E dd/MM"} } MMM{ - M{"MMM – MMM"} + M{"MMM – MMM"} } MMMEd{ - M{"E d MMM – E d MMM"} - d{"E d MMM – E d MMM"} + M{"E d MMM – E d MMM"} + d{"E d MMM – E d MMM"} } MMMd{ - M{"d MMM – d MMM"} - d{"d – d MMM"} + M{"d MMM – d MMM"} + d{"d – d MMM"} } Md{ - M{"dd/MM – dd/MM"} - d{"dd/MM – dd/MM"} + M{"dd/MM – dd/MM"} + d{"dd/MM – dd/MM"} } d{ - d{"d – d"} + d{"d – d"} } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h – h a"} + a{"h a – h a"} + h{"h – h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm – h:mm a"} - m{"h:mm – h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm – h:mm a"} + m{"h:mm – h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm – h:mm a v"} - m{"h:mm – h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm – h:mm a v"} + m{"h:mm – h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h – h a v"} + a{"h a – h a v"} + h{"h – h a v"} } y{ - y{"y – y"} + y{"y – y"} } yM{ - M{"MM/y – MM/y"} - y{"MM/y – MM/y"} + M{"MM/y – MM/y"} + y{"MM/y – MM/y"} } yMEd{ - M{"E dd/MM/y – E dd/MM/y"} - d{"E dd/MM/y – E dd/MM/y"} - y{"E dd/MM/y – E dd/MM/y"} + M{"E dd/MM/y – E dd/MM/y"} + d{"E dd/MM/y – E dd/MM/y"} + y{"E dd/MM/y – E dd/MM/y"} } yMMM{ - M{"MMM – MMM y"} - y{"MMM y – MMM y"} + M{"MMM – MMM y"} + y{"MMM y – MMM y"} } yMMMEd{ - M{"E d MMM – E d MMM y"} - d{"E d MMM – E d MMM y"} - y{"E d MMM y – E d MMM y"} + M{"E d MMM – E d MMM y"} + d{"E d MMM – E d MMM y"} + y{"E d MMM y – E d MMM y"} } yMMMM{ - M{"MMMM – MMMM y"} - y{"MMMM y – MMMM y"} + M{"MMMM – MMMM y"} + y{"MMMM y – MMMM y"} } yMMMd{ - M{"d MMM – d MMM y"} - d{"d – d MMM y"} - y{"d MMM y – d MMM y"} + M{"d MMM – d MMM y"} + d{"d – d MMM y"} + y{"d MMM y – d MMM y"} } yMd{ - M{"dd/MM/y – dd/MM/y"} - d{"dd/MM/y – dd/MM/y"} - y{"dd/MM/y – dd/MM/y"} + M{"dd/MM/y – dd/MM/y"} + d{"dd/MM/y – dd/MM/y"} + y{"dd/MM/y – dd/MM/y"} } } monthNames{ diff --git a/icu4c/source/data/locales/gd.txt b/icu4c/source/data/locales/gd.txt index 0a8a1c019f0c..9c328f1b3381 100644 --- a/icu4c/source/data/locales/gd.txt +++ b/icu4c/source/data/locales/gd.txt @@ -1270,21 +1270,21 @@ gd{ } intervalFormats{ H{ - H{"HH – HH"} + H{"HH – HH"} } Hm{ - H{"HH:mm – HH:mm"} - m{"HH:mm – HH:mm"} + H{"HH:mm – HH:mm"} + m{"HH:mm – HH:mm"} } Hmv{ - H{"HH:mm – HH:mm v"} - m{"HH:mm – HH:mm v"} + H{"HH:mm – HH:mm v"} + m{"HH:mm – HH:mm v"} } Hv{ - H{"HH – HH v"} + H{"HH – HH v"} } M{ - M{"L – L"} + M{"L – L"} } fallback{"{0} – {1}"} } @@ -1300,6 +1300,12 @@ gd{ "d MMM r", "d/M/r", "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + } + DateTimePatterns%atTime{ "{1} 'aig' {0}", "{1} 'aig' {0}", "{1} {0}", @@ -1491,97 +1497,97 @@ gd{ } intervalFormats{ H{ - H{"HH – HH"} + H{"HH – HH"} } Hm{ - H{"HH:mm – HH:mm"} - m{"HH:mm – HH:mm"} + H{"HH:mm – HH:mm"} + m{"HH:mm – HH:mm"} } Hmv{ - H{"HH:mm – HH:mm v"} - m{"HH:mm – HH:mm v"} + H{"HH:mm – HH:mm v"} + m{"HH:mm – HH:mm v"} } Hv{ - H{"HH – HH v"} + H{"HH – HH v"} } M{ - M{"L – L"} + M{"L – L"} } MEd{ - M{"E, d/M – E, d/M"} - d{"E, d/M – E, d/M"} + M{"E, d/M – E, d/M"} + d{"E, d/M – E, d/M"} } MMM{ - M{"LLL – LLL"} + M{"LLL – LLL"} } MMMEd{ - M{"E, d MMM – E, d MMM"} - d{"E, d MMM – E, d MMM"} + M{"E, d MMM – E, d MMM"} + d{"E, d MMM – E, d MMM"} } MMMd{ - M{"d MMM – d MMM"} - d{"d MMM – d"} + M{"d MMM – d MMM"} + d{"d MMM – d"} } Md{ - M{"d/M – d/M"} - d{"d/M – d/M"} + M{"d/M – d/M"} + d{"d/M – d/M"} } d{ - d{"d – d"} + d{"d – d"} } fallback{"{0} – {1}"} h{ - a{"ha – ha"} - h{"h – ha"} + a{"ha – ha"} + h{"h – ha"} } hm{ - a{"h:mma – h:mma"} - h{"h:mm – h:mma"} - m{"h:mm – h:mma"} + a{"h:mma – h:mma"} + h{"h:mm – h:mma"} + m{"h:mm – h:mma"} } hmv{ - a{"h:mma – h:mma v"} - h{"h:mm – h:mma v"} - m{"h:mm – h:mma v"} + a{"h:mma – h:mma v"} + h{"h:mm – h:mma v"} + m{"h:mm – h:mma v"} } hv{ - a{"ha – ha v"} - h{"h – ha v"} + a{"ha – ha v"} + h{"h – ha v"} } y{ - y{"U – U"} + y{"U – U"} } yM{ - M{"L/y – L/y"} - y{"L/y – L/y"} + M{"L/y – L/y"} + y{"L/y – L/y"} } yMEd{ - M{"E, d/M/y – E, d/M/y"} - d{"E, d/M/y – E, d/M/y"} - y{"E, d/M/y – E, d/M/y"} + M{"E, d/M/y – E, d/M/y"} + d{"E, d/M/y – E, d/M/y"} + y{"E, d/M/y – E, d/M/y"} } yMMM{ - M{"LLL – LLL U"} - y{"LLL U – LLL U"} + M{"LLL – LLL U"} + y{"LLL U – LLL U"} } yMMMEd{ - M{"E, d MMM – E, d MMM, U"} - d{"E, d MMM – E, d MMM, U"} - y{"E, d MMM, U – E, d MMM, U"} + M{"E, d MMM – E, d MMM, U"} + d{"E, d MMM – E, d MMM, U"} + y{"E, d MMM, U – E, d MMM, U"} } yMMMM{ - M{"LLLL – LLLL U"} - y{"LLLL U – LLLL U"} + M{"LLLL – LLLL U"} + y{"LLLL U – LLLL U"} } yMMMd{ - M{"d MMM – d MMM, U"} - d{"d MMM – d, U"} - y{"d MMM, U – d MMM, U"} + M{"d MMM – d MMM, U"} + d{"d MMM – d, U"} + y{"d MMM, U – d MMM, U"} } yMd{ - M{"d/M/y – d/M/y"} - d{"d/M/y – d/M/y"} - y{"d/M/y – d/M/y"} + M{"d/M/y – d/M/y"} + d{"d/M/y – d/M/y"} + y{"d/M/y – d/M/y"} } } monthNames{ @@ -1709,7 +1715,7 @@ gd{ } intervalFormats{ M{ - M{"L – L"} + M{"L – L"} } } } @@ -1724,6 +1730,12 @@ gd{ "d MMM r", "d/M/r", "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + } + DateTimePatterns%atTime{ "{1} 'aig' {0}", "{1} 'aig' {0}", "{1} {0}", @@ -1903,97 +1915,97 @@ gd{ } intervalFormats{ H{ - H{"HH – HH"} + H{"HH – HH"} } Hm{ - H{"HH:mm – HH:mm"} - m{"HH:mm – HH:mm"} + H{"HH:mm – HH:mm"} + m{"HH:mm – HH:mm"} } Hmv{ - H{"HH:mm – HH:mm v"} - m{"HH:mm – HH:mm v"} + H{"HH:mm – HH:mm v"} + m{"HH:mm – HH:mm v"} } Hv{ - H{"HH – HH v"} + H{"HH – HH v"} } M{ - M{"L – L"} + M{"L – L"} } MEd{ - M{"E, d/M – E, d/M"} - d{"E, d/M – E, d/M"} + M{"E, d/M – E, d/M"} + d{"E, d/M – E, d/M"} } MMM{ - M{"LLL – LLL"} + M{"LLL – LLL"} } MMMEd{ - M{"E, d MMM – E, d MMM"} - d{"E, d MMM – E, d MMM"} + M{"E, d MMM – E, d MMM"} + d{"E, d MMM – E, d MMM"} } MMMd{ - M{"d MMM – d MMM"} - d{"d MMM – d"} + M{"d MMM – d MMM"} + d{"d MMM – d"} } Md{ - M{"d/M – d/M"} - d{"d/M – d/M"} + M{"d/M – d/M"} + d{"d/M – d/M"} } d{ - d{"d – d"} + d{"d – d"} } fallback{"{0} – {1}"} h{ - a{"ha – ha"} - h{"h – ha"} + a{"ha – ha"} + h{"h – ha"} } hm{ - a{"h:mma – h:mma"} - h{"h:mm – h:mma"} - m{"h:mm – h:mma"} + a{"h:mma – h:mma"} + h{"h:mm – h:mma"} + m{"h:mm – h:mma"} } hmv{ - a{"h:mma – h:mma v"} - h{"h:mm – h:mma v"} - m{"h:mm – h:mma v"} + a{"h:mma – h:mma v"} + h{"h:mm – h:mma v"} + m{"h:mm – h:mma v"} } hv{ - a{"ha – ha v"} - h{"h – ha v"} + a{"ha – ha v"} + h{"h – ha v"} } y{ - y{"U – U"} + y{"U – U"} } yM{ - M{"L/y – L/y"} - y{"L/y – L/y"} + M{"L/y – L/y"} + y{"L/y – L/y"} } yMEd{ - M{"E, d/M/y – E, d/M/y"} - d{"E, d/M/y – E, d/M/y"} - y{"E, d/M/y – E, d/M/y"} + M{"E, d/M/y – E, d/M/y"} + d{"E, d/M/y – E, d/M/y"} + y{"E, d/M/y – E, d/M/y"} } yMMM{ - M{"LLL – LLL U"} - y{"LLL U – LLL U"} + M{"LLL – LLL U"} + y{"LLL U – LLL U"} } yMMMEd{ - M{"E, d MMM – E, d MMM, U"} - d{"E, d MMM – E, d MMM, U"} - y{"E, d MMM, U – E, d MMM, U"} + M{"E, d MMM – E, d MMM, U"} + d{"E, d MMM – E, d MMM, U"} + y{"E, d MMM, U – E, d MMM, U"} } yMMMM{ - M{"LLLL – LLLL U"} - y{"LLLL U – LLLL U"} + M{"LLLL – LLLL U"} + y{"LLLL U – LLLL U"} } yMMMd{ - M{"d MMM – d MMM, U"} - d{"d MMM – d, U"} - y{"d MMM, U – d MMM, U"} + M{"d MMM – d MMM, U"} + d{"d MMM – d, U"} + y{"d MMM, U – d MMM, U"} } yMd{ - M{"d/M/y – d/M/y"} - d{"d/M/y – d/M/y"} - y{"d/M/y – d/M/y"} + M{"d/M/y – d/M/y"} + d{"d/M/y – d/M/y"} + y{"d/M/y – d/M/y"} } } monthNames{ @@ -2098,6 +2110,12 @@ gd{ "d MMM y G", "d/M/y GGGGG", "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + } + DateTimePatterns%atTime{ "{1} 'aig' {0}", "{1} 'aig' {0}", "{1} {0}", @@ -2121,7 +2139,7 @@ gd{ } intervalFormats{ M{ - M{"L – L"} + M{"L – L"} } } } @@ -2205,144 +2223,144 @@ gd{ } intervalFormats{ Bh{ - B{"h B – h B"} - h{"h – h B"} + B{"h B – h B"} + h{"h – h B"} } Bhm{ - B{"h:mm B – h:mm B"} - h{"h:mm – h:mm B"} - m{"h:mm – h:mm B"} + B{"h:mm B – h:mm B"} + h{"h:mm – h:mm B"} + m{"h:mm – h:mm B"} } Gy{ - G{"y G – y G"} - y{"y – y G"} + G{"y G – y G"} + y{"y – y G"} } GyM{ - G{"L/y GGGGG – L/y GGGGG"} - M{"L/y – L/y GGGGG"} - y{"L/y – L/y GGGGG"} + G{"L/y GGGGG – L/y GGGGG"} + M{"L/y – L/y GGGGG"} + y{"L/y – L/y GGGGG"} } GyMEd{ - G{"E, d/M/y GGGGG – E, d/M/y GGGGG"} - M{"E, d/M/y – E, d/M/y GGGGG"} - d{"E, d/M/y – E, d/M/y GGGGG"} - y{"E, d/M/y – E, d/M/y GGGGG"} + G{"E, d/M/y GGGGG – E, d/M/y GGGGG"} + M{"E, d/M/y – E, d/M/y GGGGG"} + d{"E, d/M/y – E, d/M/y GGGGG"} + y{"E, d/M/y – E, d/M/y GGGGG"} } GyMMM{ - G{"LLL y G – LLL y G"} - M{"LLL – LLL y G"} - y{"LLL y – LLL y G"} + G{"LLL y G – LLL y G"} + M{"LLL – LLL y G"} + y{"LLL y – LLL y G"} } GyMMMEd{ - G{"E, d MMM y G – E, d MMM y G"} - M{"E, d MMM – E, d MMM y G"} - d{"E, d MMM – E, d MMM y G"} - y{"E, d MMM y – E, d MMM y G"} + G{"E, d MMM y G – E, d MMM y G"} + M{"E, d MMM – E, d MMM y G"} + d{"E, d MMM – E, d MMM y G"} + y{"E, d MMM y – E, d MMM y G"} } GyMMMd{ - G{"d MMM y G – d MMM y G"} - M{"d MMM – d MMM y G"} - d{"d – d MMM y G"} - y{"d MMM y – d MMM y G"} + G{"d MMM y G – d MMM y G"} + M{"d MMM – d MMM y G"} + d{"d – d MMM y G"} + y{"d MMM y – d MMM y G"} } GyMd{ - G{"d/M/y GGGGG – d/M/y GGGGG"} - M{"d/M/y – d/M/y GGGGG"} - d{"d/M/y – d/M/y GGGGG"} - y{"d/M/y – d/M/y GGGGG"} + G{"d/M/y GGGGG – d/M/y GGGGG"} + M{"d/M/y – d/M/y GGGGG"} + d{"d/M/y – d/M/y GGGGG"} + y{"d/M/y – d/M/y GGGGG"} } H{ - H{"HH – HH"} + H{"HH – HH"} } Hm{ - H{"HH:mm – HH:mm"} - m{"HH:mm – HH:mm"} + H{"HH:mm – HH:mm"} + m{"HH:mm – HH:mm"} } Hmv{ - H{"HH:mm – HH:mm v"} - m{"HH:mm – HH:mm v"} + H{"HH:mm – HH:mm v"} + m{"HH:mm – HH:mm v"} } Hv{ - H{"HH – HH v"} + H{"HH – HH v"} } M{ - M{"L – L"} + M{"L – L"} } MEd{ - M{"E, d/M – E, d/M"} - d{"E, d/M – E, d/M"} + M{"E, d/M – E, d/M"} + d{"E, d/M – E, d/M"} } MMM{ - M{"LLL – LLL"} + M{"LLL – LLL"} } MMMEd{ - M{"E, d MMM – E, d MMM"} - d{"E, d MMM – E, d MMM"} + M{"E, d MMM – E, d MMM"} + d{"E, d MMM – E, d MMM"} } MMMd{ - M{"d MMM – d MMM"} - d{"d – d MMM"} + M{"d MMM – d MMM"} + d{"d – d MMM"} } Md{ - M{"d/M – d/M"} - d{"d/M – d/M"} + M{"d/M – d/M"} + d{"d/M – d/M"} } d{ - d{"d – d"} + d{"d – d"} } fallback{"{0} – {1}"} h{ - a{"ha – ha"} - h{"h – ha"} + a{"ha – ha"} + h{"h – ha"} } hm{ - a{"h:mma – h:mma"} - h{"h:mm – h:mma"} - m{"h:mm – h:mma"} + a{"h:mma – h:mma"} + h{"h:mm – h:mma"} + m{"h:mm – h:mma"} } hmv{ - a{"h:mma – h:mma v"} - h{"h:mm – h:mma v"} - m{"h:mm – h:mma v"} + a{"h:mma – h:mma v"} + h{"h:mm – h:mma v"} + m{"h:mm – h:mma v"} } hv{ - a{"ha – ha v"} - h{"h – ha v"} + a{"ha – ha v"} + h{"h – ha v"} } y{ - y{"y – y G"} + y{"y – y G"} } yM{ - M{"L/y – L/y GGGGG"} - y{"L/y – L/y GGGGG"} + M{"L/y – L/y GGGGG"} + y{"L/y – L/y GGGGG"} } yMEd{ - M{"E, d/M/y – E, d/M/y GGGGG"} - d{"E, d/M/y – E, d/M/y GGGGG"} - y{"E, d/M/y – E, d/M/y GGGGG"} + M{"E, d/M/y – E, d/M/y GGGGG"} + d{"E, d/M/y – E, d/M/y GGGGG"} + y{"E, d/M/y – E, d/M/y GGGGG"} } yMMM{ - M{"LLL – LLL y G"} - y{"LLL y – LLL y G"} + M{"LLL – LLL y G"} + y{"LLL y – LLL y G"} } yMMMEd{ - M{"E, d MMM – E, d MMM y G"} - d{"E, d MMM – E, d MMM y G"} - y{"E, d MMM y – E, d MMM y G"} + M{"E, d MMM – E, d MMM y G"} + d{"E, d MMM – E, d MMM y G"} + y{"E, d MMM y – E, d MMM y G"} } yMMMM{ - M{"LLLL – LLLL y G"} - y{"LLLL y – LLLL y G"} + M{"LLLL – LLLL y G"} + y{"LLLL y – LLLL y G"} } yMMMd{ - M{"d MMM – d MMM y G"} - d{"d – d MMM y G"} - y{"d MMM y – d MMM y G"} + M{"d MMM – d MMM y G"} + d{"d – d MMM y G"} + y{"d MMM y – d MMM y G"} } yMd{ - M{"d/M/y – d/M/y GGGGG"} - d{"d/M/y – d/M/y GGGGG"} - y{"d/M/y – d/M/y GGGGG"} + M{"d/M/y – d/M/y GGGGG"} + d{"d/M/y – d/M/y GGGGG"} + y{"d/M/y – d/M/y GGGGG"} } } } @@ -2398,7 +2416,7 @@ gd{ EHms{"E HH:mm:ss"} Ed{"E, d"} Ehm{"E h:mma"} - Ehms{"E h:mm:ss a"} + Ehms{"E h:mm:ss a"} Gy{"y G"} GyMMM{"LLL y G"} GyMMMEd{"E, d MMM y G"} @@ -2426,8 +2444,8 @@ gd{ d{"d"} h{"ha"} hm{"h:mma"} - hms{"h:mm:ss a"} - hmsv{"h:mm:ss a v"} + hms{"h:mm:ss a"} + hmsv{"h:mm:ss a v"} hmv{"h:mma v"} ms{"mm:ss"} y{"y"} @@ -2558,144 +2576,144 @@ gd{ } intervalFormats{ Bh{ - B{"h B – h B"} - h{"h – h B"} + B{"h B – h B"} + h{"h – h B"} } Bhm{ - B{"h:mm B – h:mm B"} - h{"h:mm – h:mm B"} - m{"h:mm – h:mm B"} + B{"h:mm B – h:mm B"} + h{"h:mm – h:mm B"} + m{"h:mm – h:mm B"} } Gy{ - G{"y G – y G"} - y{"y – y G"} + G{"y G – y G"} + y{"y – y G"} } GyM{ - G{"L/y GGGGG – L/y GGGGG"} - M{"L/y – L/y GGGGG"} - y{"L/y – L/y GGGGG"} + G{"L/y GGGGG – L/y GGGGG"} + M{"L/y – L/y GGGGG"} + y{"L/y – L/y GGGGG"} } GyMEd{ - G{"E, d/M/y GGGGG – E, d/M/y GGGGG"} - M{"E, d/M/y – E, d/M/y GGGGG"} - d{"E, d/M/y – E, d/M/y GGGGG"} - y{"E, d/M/y – E, d/M/y GGGGG"} + G{"E, d/M/y GGGGG – E, d/M/y GGGGG"} + M{"E, d/M/y – E, d/M/y GGGGG"} + d{"E, d/M/y – E, d/M/y GGGGG"} + y{"E, d/M/y – E, d/M/y GGGGG"} } GyMMM{ - G{"LLL y G – LLL y G"} - M{"LLL – LLL y G"} - y{"LLL y – LLL y G"} + G{"LLL y G – LLL y G"} + M{"LLL – LLL y G"} + y{"LLL y – LLL y G"} } GyMMMEd{ - G{"E, d MMM y G – E, d MMM y G"} - M{"E, d MMM – E, d MMM y G"} - d{"E, d MMM – E, d MMM y G"} - y{"E, d MMM y – E, d MMM y G"} + G{"E, d MMM y G – E, d MMM y G"} + M{"E, d MMM – E, d MMM y G"} + d{"E, d MMM – E, d MMM y G"} + y{"E, d MMM y – E, d MMM y G"} } GyMMMd{ - G{"d MMM y G – d MMM y G"} - M{"d MMM – d MMM y G"} - d{"d – d MMM y G"} - y{"d MMM y – d MMM y G"} + G{"d MMM y G – d MMM y G"} + M{"d MMM – d MMM y G"} + d{"d – d MMM y G"} + y{"d MMM y – d MMM y G"} } GyMd{ - G{"d/M/y GGGGG – d/M/y GGGGG"} - M{"d/M/y – d/M/y GGGGG"} - d{"d/M/y – d/M/y GGGGG"} - y{"d/M/y – d/M/y GGGGG"} + G{"d/M/y GGGGG – d/M/y GGGGG"} + M{"d/M/y – d/M/y GGGGG"} + d{"d/M/y – d/M/y GGGGG"} + y{"d/M/y – d/M/y GGGGG"} } H{ - H{"HH – HH"} + H{"HH – HH"} } Hm{ - H{"HH:mm – HH:mm"} - m{"HH:mm – HH:mm"} + H{"HH:mm – HH:mm"} + m{"HH:mm – HH:mm"} } Hmv{ - H{"HH:mm – HH:mm v"} - m{"HH:mm – HH:mm v"} + H{"HH:mm – HH:mm v"} + m{"HH:mm – HH:mm v"} } Hv{ - H{"HH – HH v"} + H{"HH – HH v"} } M{ - M{"L – L"} + M{"L – L"} } MEd{ - M{"E, d/M – E, d/M"} - d{"E, d/M – E, d/M"} + M{"E, d/M – E, d/M"} + d{"E, d/M – E, d/M"} } MMM{ - M{"LLL – LLL"} + M{"LLL – LLL"} } MMMEd{ - M{"E, d MMM – E, d MMM"} - d{"E, d – E, d MMM"} + M{"E, d MMM – E, d MMM"} + d{"E, d – E, d MMM"} } MMMd{ - M{"d MMM – d MMM"} - d{"d – d MMM"} + M{"d MMM – d MMM"} + d{"d – d MMM"} } Md{ - M{"d/M – d/M"} - d{"d/M – d/M"} + M{"d/M – d/M"} + d{"d/M – d/M"} } d{ - d{"d – d"} + d{"d – d"} } fallback{"{0} – {1}"} h{ - a{"ha – ha"} - h{"h – ha"} + a{"ha – ha"} + h{"h – ha"} } hm{ - a{"h:mma – h:mma"} - h{"h:mm – h:mma"} - m{"h:mm – h:mma"} + a{"h:mma – h:mma"} + h{"h:mm – h:mma"} + m{"h:mm – h:mma"} } hmv{ - a{"h:mma – h:mma v"} - h{"h:mm – h:mma v"} - m{"h:mm – h:mma v"} + a{"h:mma – h:mma v"} + h{"h:mm – h:mma v"} + m{"h:mm – h:mma v"} } hv{ - a{"ha – ha v"} - h{"h – ha v"} + a{"ha – ha v"} + h{"h – ha v"} } y{ - y{"y – y"} + y{"y – y"} } yM{ - M{"L/y – L/y"} - y{"L/y – L/y"} + M{"L/y – L/y"} + y{"L/y – L/y"} } yMEd{ - M{"E, d/M/y – E, d/M/y"} - d{"E, d/M/y – E, d/M/y"} - y{"E, d/M/y – E, d/M/y"} + M{"E, d/M/y – E, d/M/y"} + d{"E, d/M/y – E, d/M/y"} + y{"E, d/M/y – E, d/M/y"} } yMMM{ - M{"LLL – LLL y"} - y{"LLL y – LLL y"} + M{"LLL – LLL y"} + y{"LLL y – LLL y"} } yMMMEd{ - M{"E, d MMM – E, d MMM y"} - d{"E, d – E, d MMM y"} - y{"E, d MMM y – E, d MMM y"} + M{"E, d MMM – E, d MMM y"} + d{"E, d – E, d MMM y"} + y{"E, d MMM y – E, d MMM y"} } yMMMM{ - M{"LLLL – LLLL y"} - y{"LLLL y – LLLL y"} + M{"LLLL – LLLL y"} + y{"LLLL y – LLLL y"} } yMMMd{ - M{"d MMM – d MMM y"} - d{"d – d MMM y"} - y{"d MMM y – d MMM y"} + M{"d MMM – d MMM y"} + d{"d – d MMM y"} + y{"d MMM y – d MMM y"} } yMd{ - M{"d/M/y – d/M/y"} - d{"d/M/y – d/M/y"} - y{"d/M/y – d/M/y"} + M{"d/M/y – d/M/y"} + d{"d/M/y – d/M/y"} + y{"d/M/y – d/M/y"} } } monthNames{ @@ -2842,6 +2860,12 @@ gd{ "d MMM y G", "d/M/y GGGGG", "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + } + DateTimePatterns%atTime{ "{1} 'aig' {0}", "{1} 'aig' {0}", "{1} {0}", @@ -2865,7 +2889,7 @@ gd{ } intervalFormats{ M{ - M{"L – L"} + M{"L – L"} } } } @@ -2903,7 +2927,7 @@ gd{ } intervalFormats{ M{ - M{"L – L"} + M{"L – L"} } } } @@ -2918,6 +2942,12 @@ gd{ "d MMM y G", "d/M/y GGGGG", "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + } + DateTimePatterns%atTime{ "{1} 'aig' {0}", "{1} 'aig' {0}", "{1} {0}", @@ -2941,7 +2971,7 @@ gd{ } intervalFormats{ M{ - M{"L – L"} + M{"L – L"} } } } @@ -2956,6 +2986,12 @@ gd{ "d MMM y G", "d/M/y GGGGG", "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + } + DateTimePatterns%atTime{ "{1} 'aig' {0}", "{1} 'aig' {0}", "{1} {0}", @@ -2979,7 +3015,7 @@ gd{ } intervalFormats{ M{ - M{"L – L"} + M{"L – L"} } } } @@ -2994,6 +3030,12 @@ gd{ "d MMM y G", "d/M/y GGGGG", "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + } + DateTimePatterns%atTime{ "{1} 'aig' {0}", "{1} 'aig' {0}", "{1} {0}", @@ -3017,7 +3059,7 @@ gd{ } intervalFormats{ M{ - M{"L – L"} + M{"L – L"} } } } @@ -3032,6 +3074,12 @@ gd{ "d MMM y G", "d/M/y GGGGG", "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + } + DateTimePatterns%atTime{ "{1} 'aig' {0}", "{1} 'aig' {0}", "{1} {0}", @@ -3071,7 +3119,7 @@ gd{ } intervalFormats{ M{ - M{"L – L"} + M{"L – L"} } } } diff --git a/icu4c/source/data/locales/gl.txt b/icu4c/source/data/locales/gl.txt index 235910323705..b29a329d20aa 100644 --- a/icu4c/source/data/locales/gl.txt +++ b/icu4c/source/data/locales/gl.txt @@ -229,6 +229,12 @@ gl{ "d 'de' MMM 'de' y G", "dd/MM/y GGGGG", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{1} 'ás' {0}", "{1} 'ás' {0}", "{1}, {0}", @@ -254,8 +260,8 @@ gl{ EHm{"E, HH:mm"} EHms{"E, HH:mm:ss"} Ed{"E d"} - Ehm{"E, h:mm a"} - Ehms{"E, h:mm:ss a"} + Ehm{"E, h:mm a"} + Ehms{"E, h:mm:ss a"} Gy{"y G"} GyMMM{"MMM 'de' y G"} GyMMMEd{"E, d 'de' MMM 'de' y G"} @@ -274,9 +280,9 @@ gl{ MMdd{"dd/MM"} Md{"dd/MM"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"mm:ss"} y{"y G"} yM{"M-y"} @@ -302,51 +308,51 @@ gl{ } intervalFormats{ Bh{ - B{"h B – h B"} + B{"h B – h B"} h{"h–h B"} } Bhm{ - B{"h:mm B – h:mm B"} + B{"h:mm B – h:mm B"} h{"h:mm–h:mm B"} m{"h:mm–h:mm B"} } Gy{ - G{"y G – y G"} + G{"y G – y G"} y{"y–y G"} } GyM{ - G{"MM/y GGGGG – MM/y GGGGG"} - M{"MM/y – MM/y GGGGG"} - y{"MM/y – MM/y GGGGG"} + G{"MM/y GGGGG – MM/y GGGGG"} + M{"MM/y – MM/y GGGGG"} + y{"MM/y – MM/y GGGGG"} } GyMEd{ - G{"E, dd/MM/y GGGGG – E, dd/MM/y GGGGG"} - M{"E, dd/MM/y – E, dd/MM/y GGGGG"} - d{"E, dd/MM/y – E, dd/MM/y GGGGG"} - y{"E, dd/MM/y – E, dd/MM/y GGGGG"} + G{"E, dd/MM/y GGGGG – E, dd/MM/y GGGGG"} + M{"E, dd/MM/y – E, dd/MM/y GGGGG"} + d{"E, dd/MM/y – E, dd/MM/y GGGGG"} + y{"E, dd/MM/y – E, dd/MM/y GGGGG"} } GyMMM{ - G{"MMM 'de' y G – MMM 'de' y G"} + G{"MMM 'de' y G – MMM 'de' y G"} M{"MMM–MMM 'de' y G"} - y{"MMM 'de' y – MMM 'de' y G"} + y{"MMM 'de' y – MMM 'de' y G"} } GyMMMEd{ - G{"E, d 'de' MMM 'de' y G – E, d 'de' MMM 'de' y G"} - M{"E, d 'de' MMM – E, d 'de' MMM 'de' y G"} - d{"E, d 'de' MMM – E, d 'de' MMM 'de' y G"} - y{"E, d 'de' MMM 'de' y – E, d 'de' MMM 'de' y G"} + G{"E, d 'de' MMM 'de' y G – E, d 'de' MMM 'de' y G"} + M{"E, d 'de' MMM – E, d 'de' MMM 'de' y G"} + d{"E, d 'de' MMM – E, d 'de' MMM 'de' y G"} + y{"E, d 'de' MMM 'de' y – E, d 'de' MMM 'de' y G"} } GyMMMd{ - G{"d 'de' MMM 'de' y G – d 'de' MMM 'de' y G"} - M{"d 'de' MMM – d 'de' MMM 'de' y G"} + G{"d 'de' MMM 'de' y G – d 'de' MMM 'de' y G"} + M{"d 'de' MMM – d 'de' MMM 'de' y G"} d{"d–d 'de' MMM 'de' y G"} - y{"d 'de' MMM 'de' y – d 'de' MMM 'de' y G"} + y{"d 'de' MMM 'de' y – d 'de' MMM 'de' y G"} } GyMd{ - G{"dd/MM/y GGGGG – dd/MM/y GGGGG"} - M{"dd/MM/y – dd/MM/y GGGGG"} - d{"dd/MM/y – dd/MM/y GGGGG"} - y{"dd/MM/y – dd/MM/y GGGGG"} + G{"dd/MM/y GGGGG – dd/MM/y GGGGG"} + M{"dd/MM/y – dd/MM/y GGGGG"} + d{"dd/MM/y – dd/MM/y GGGGG"} + y{"dd/MM/y – dd/MM/y GGGGG"} } H{ H{"HH–HH"} @@ -366,80 +372,80 @@ gl{ M{"M–M"} } MEd{ - M{"E, d/M – E, d/M"} - d{"E, d/M – E, d/M"} + M{"E, d/M – E, d/M"} + d{"E, d/M – E, d/M"} } MMM{ M{"MMM–MMM"} } MMMEd{ - M{"E, d 'de' MMM – E, d 'de' MMM"} - d{"E, d 'de' MMM – E, d 'de' MMM"} + M{"E, d 'de' MMM – E, d 'de' MMM"} + d{"E, d 'de' MMM – E, d 'de' MMM"} } MMMd{ - M{"d 'de' MMM – d 'de' MMM"} + M{"d 'de' MMM – d 'de' MMM"} d{"d–d 'de' MMM"} } Md{ - M{"d/M – d/M"} - d{"d/M – d/M"} + M{"d/M – d/M"} + d{"d/M – d/M"} } d{ d{"d–d"} } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y G"} } yM{ - M{"M/y – M/y GGGGG"} - y{"MM/y – MM/y GGGGG"} + M{"M/y – M/y GGGGG"} + y{"MM/y – MM/y GGGGG"} } yMEd{ - M{"E, dd/MM/y – E, dd/MM/y GGGGG"} - d{"E, d/M/y – E, d/M/y GGGGG"} - y{"E, dd/MM/y – E, dd/MM/y GGGGG"} + M{"E, dd/MM/y – E, dd/MM/y GGGGG"} + d{"E, d/M/y – E, d/M/y GGGGG"} + y{"E, dd/MM/y – E, dd/MM/y GGGGG"} } yMMM{ M{"MMM–MMM 'de' y G"} - y{"MMM 'de' y – MMM 'de' y G"} + y{"MMM 'de' y – MMM 'de' y G"} } yMMMEd{ - M{"E, d 'de' MMM – E, d 'de' MMM 'de' y G"} - d{"E, d 'de' MMM – E, d 'de' MMM 'de' y G"} - y{"E, d 'de' MMM 'de' y – E, d 'de' MMM 'de' y G"} + M{"E, d 'de' MMM – E, d 'de' MMM 'de' y G"} + d{"E, d 'de' MMM – E, d 'de' MMM 'de' y G"} + y{"E, d 'de' MMM 'de' y – E, d 'de' MMM 'de' y G"} } yMMMM{ M{"MMMM–MMMM 'de' y G"} - y{"MMMM 'de' y – MMMM 'de' y G"} + y{"MMMM 'de' y – MMMM 'de' y G"} } yMMMd{ - M{"d 'de' MMM – d 'de' MMM 'de' y G"} + M{"d 'de' MMM – d 'de' MMM 'de' y G"} d{"d–d 'de' MMM 'de' y G"} - y{"d 'de' MMM 'de' y – d 'de' MMM 'de' y G"} + y{"d 'de' MMM 'de' y – d 'de' MMM 'de' y G"} } yMd{ - M{"dd/MM/y – dd/MM/y GGGGG"} - d{"d/M/y – d/M/y GGGGG"} - y{"dd/MM/y – dd/MM/y GGGGG"} + M{"dd/MM/y – dd/MM/y GGGGG"} + d{"d/M/y – d/M/y GGGGG"} + y{"dd/MM/y – dd/MM/y GGGGG"} } } } @@ -466,6 +472,12 @@ gl{ "d 'de' MMM 'de' y", "dd/MM/yy", "{0}, {1}", + "{0}, {1}", + "{0}, {1}", + "{0}, {1}", + "{0}, {1}", + } + DateTimePatterns%atTime{ "{0} 'do' {1}", "{0} 'do' {1}", "{0}, {1}", @@ -494,8 +506,8 @@ gl{ EHm{"E, HH:mm"} EHms{"E, HH:mm:ss"} Ed{"E d"} - Ehm{"E, h:mm a"} - Ehms{"E, h:mm:ss a"} + Ehm{"E, h:mm a"} + Ehms{"E, h:mm:ss a"} Gy{"y G"} GyMMM{"MMM 'de' y G"} GyMMMEd{"E, d 'de' MMM 'de' y G"} @@ -520,11 +532,11 @@ gl{ MMdd{"dd/MM"} Md{"d/M"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} - hmsv{"h:mm:ss a v"} - hmv{"h:mm a v"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} + hmsv{"h:mm:ss a v"} + hmv{"h:mm a v"} ms{"mm:ss"} y{"y"} yM{"M/y"} @@ -700,51 +712,51 @@ gl{ } intervalFormats{ Bh{ - B{"h B – h B"} + B{"h B – h B"} h{"h–h B"} } Bhm{ - B{"h:mm B – h:mm B"} + B{"h:mm B – h:mm B"} h{"h:mm–h:mm B"} m{"h:mm–h:mm B"} } Gy{ - G{"y G – y G"} + G{"y G – y G"} y{"y–y G"} } GyM{ - G{"MM/y GGGGG – MM/y GGGGG"} - M{"MM/y – MM/y GGGGG"} - y{"MM/y – MM/y GGGGG"} + G{"MM/y GGGGG – MM/y GGGGG"} + M{"MM/y – MM/y GGGGG"} + y{"MM/y – MM/y GGGGG"} } GyMEd{ - G{"E, dd/MM/y GGGGG – E, dd/MM/y GGGGG"} - M{"E, dd/MM/y – E, dd/MM/y GGGGG"} - d{"E, dd/MM/y – E, dd/MM/y GGGGG"} - y{"E, dd/MM/y – E, dd/MM/y GGGGG"} + G{"E, dd/MM/y GGGGG – E, dd/MM/y GGGGG"} + M{"E, dd/MM/y – E, dd/MM/y GGGGG"} + d{"E, dd/MM/y – E, dd/MM/y GGGGG"} + y{"E, dd/MM/y – E, dd/MM/y GGGGG"} } GyMMM{ - G{"MMM 'de' y G – MMM 'de' y G"} + G{"MMM 'de' y G – MMM 'de' y G"} M{"MMM–MMM 'de' y G"} - y{"MMM 'de' y – MMM 'de' y G"} + y{"MMM 'de' y – MMM 'de' y G"} } GyMMMEd{ - G{"E, d 'de' MMM 'de' y G – E, d 'de' MMM 'de' y G"} - M{"E, d 'de' MMM – E, d 'de' MMM 'de' y G"} - d{"E, d 'de' MMM – E, d 'de' MMM 'de' y G"} - y{"E, d 'de' MMM 'de' y – E, d 'de' MMM 'de' y G"} + G{"E, d 'de' MMM 'de' y G – E, d 'de' MMM 'de' y G"} + M{"E, d 'de' MMM – E, d 'de' MMM 'de' y G"} + d{"E, d 'de' MMM – E, d 'de' MMM 'de' y G"} + y{"E, d 'de' MMM 'de' y – E, d 'de' MMM 'de' y G"} } GyMMMd{ - G{"d 'de' MMM 'de' y G – d 'de' MMM 'de' y G"} - M{"d 'de' MMM – d 'de' MMM 'de' y G"} + G{"d 'de' MMM 'de' y G – d 'de' MMM 'de' y G"} + M{"d 'de' MMM – d 'de' MMM 'de' y G"} d{"d–d 'de' MMM 'de' y G"} - y{"d 'de' MMM 'de' y – d 'de' MMM 'de' y G"} + y{"d 'de' MMM 'de' y – d 'de' MMM 'de' y G"} } GyMd{ - G{"dd/MM/y GGGGG – dd/MM/y GGGGG"} - M{"dd/MM/y – dd/MM/y GGGGG"} - d{"dd/MM/y – dd/MM/y GGGGG"} - y{"dd/MM/y – dd/MM/y GGGGG"} + G{"dd/MM/y GGGGG – dd/MM/y GGGGG"} + M{"dd/MM/y – dd/MM/y GGGGG"} + d{"dd/MM/y – dd/MM/y GGGGG"} + y{"dd/MM/y – dd/MM/y GGGGG"} } H{ H{"HH–HH"} @@ -764,80 +776,80 @@ gl{ M{"M–M"} } MEd{ - M{"E, d/M – E, d/M"} - d{"E, d/M – E, d/M"} + M{"E, d/M – E, d/M"} + d{"E, d/M – E, d/M"} } MMM{ M{"MMM–MMM"} } MMMEd{ - M{"E, d 'de' MMM – E, d 'de' MMM"} - d{"E, d 'de' MMM – E, d 'de' MMM"} + M{"E, d 'de' MMM – E, d 'de' MMM"} + d{"E, d 'de' MMM – E, d 'de' MMM"} } MMMd{ - M{"d 'de' MMM – d 'de' MMM"} + M{"d 'de' MMM – d 'de' MMM"} d{"d–d 'de' MMM"} } Md{ - M{"d/M – d/M"} - d{"d/M – d/M"} + M{"d/M – d/M"} + d{"d/M – d/M"} } d{ d{"d–d"} } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y"} } yM{ - M{"M/y – M/y"} - y{"M/y – M/y"} + M{"M/y – M/y"} + y{"M/y – M/y"} } yMEd{ - M{"E, dd/MM/y – E, dd/MM/y"} - d{"E, d/M/y – E, d/M/y"} - y{"E, d/M/y – E, d/M/y"} + M{"E, dd/MM/y – E, dd/MM/y"} + d{"E, d/M/y – E, d/M/y"} + y{"E, d/M/y – E, d/M/y"} } yMMM{ M{"MMM–MMM 'de' y"} - y{"MMM 'de' y – MMM 'de' y"} + y{"MMM 'de' y – MMM 'de' y"} } yMMMEd{ - M{"E, d 'de' MMM – E, d 'de' MMM 'de' y"} - d{"E, d MMM – E, d MMM y"} - y{"E, d 'de' MMM 'de' y – E, d 'de' MMM 'de' y"} + M{"E, d 'de' MMM – E, d 'de' MMM 'de' y"} + d{"E, d MMM – E, d MMM y"} + y{"E, d 'de' MMM 'de' y – E, d 'de' MMM 'de' y"} } yMMMM{ M{"MMMM–MMMM 'de' y"} - y{"MMMM 'de' y – MMMM 'de' y"} + y{"MMMM 'de' y – MMMM 'de' y"} } yMMMd{ - M{"d 'de' MMM – d 'de' MMM 'de' y"} + M{"d 'de' MMM – d 'de' MMM 'de' y"} d{"d–d 'de' MMMM 'de' y"} - y{"d 'de' MMM 'de' y – d 'de' MMM 'de' y"} + y{"d 'de' MMM 'de' y – d 'de' MMM 'de' y"} } yMd{ - M{"d/M/y – d/M/y"} - d{"d/M/y – d/M/y"} - y{"dd/MM/y – dd/MM/y"} + M{"d/M/y – d/M/y"} + d{"d/M/y – d/M/y"} + y{"dd/MM/y – dd/MM/y"} } } monthNames{ diff --git a/icu4c/source/data/locales/gsw.txt b/icu4c/source/data/locales/gsw.txt index 0b99693c23bd..af69b3fcb5cd 100644 --- a/icu4c/source/data/locales/gsw.txt +++ b/icu4c/source/data/locales/gsw.txt @@ -290,14 +290,14 @@ gsw{ M{"MMM–MMM"} } MMMEd{ - M{"E, d. MMM – E, d. MMM"} + M{"E, d. MMM – E, d. MMM"} d{"E, d. – E, d. MMM"} } MMMM{ M{"LLLL–LLLL"} } MMMd{ - M{"d. MMM – d. MMM"} + M{"d. MMM – d. MMM"} d{"d.–d. MMM"} } Md{ @@ -309,57 +309,57 @@ gsw{ } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y"} } yM{ - M{"MM.y – MM.y"} - y{"MM.y – MM.y"} + M{"MM.y – MM.y"} + y{"MM.y – MM.y"} } yMEd{ - M{"E, dd.MM.y – E, dd.MM.y"} - d{"E, dd.MM.y – E, dd.MM.y"} - y{"E, dd.MM.y – E, dd.MM.y"} + M{"E, dd.MM.y – E, dd.MM.y"} + d{"E, dd.MM.y – E, dd.MM.y"} + y{"E, dd.MM.y – E, dd.MM.y"} } yMMM{ M{"MMM–MMM y"} - y{"MMM y – MMM y"} + y{"MMM y – MMM y"} } yMMMEd{ - M{"E, d. MMM – E, d. MMM y"} + M{"E, d. MMM – E, d. MMM y"} d{"E, d. – E, d. MMM y"} - y{"E, d. MMM y – E, d. MMM y"} + y{"E, d. MMM y – E, d. MMM y"} } yMMMM{ - M{"MM – MM.y"} - y{"MM.y – MM.y"} + M{"MM – MM.y"} + y{"MM.y – MM.y"} } yMMMd{ - M{"d. MMM – d. MMM y"} + M{"d. MMM – d. MMM y"} d{"d.–d. MMM y"} - y{"d. MMM y – d. MMM y"} + y{"d. MMM y – d. MMM y"} } yMd{ - M{"dd.MM.y – dd.MM.y"} - d{"dd.MM.y – dd.MM.y"} - y{"dd.MM.y – dd.MM.y"} + M{"dd.MM.y – dd.MM.y"} + d{"dd.MM.y – dd.MM.y"} + y{"dd.MM.y – dd.MM.y"} } } } @@ -531,14 +531,14 @@ gsw{ M{"MMM–MMM"} } MMMEd{ - M{"E, d. MMM – E, d. MMM"} + M{"E, d. MMM – E, d. MMM"} d{"E, d. – E, d. MMM"} } MMMM{ M{"LLLL–LLLL"} } MMMd{ - M{"d. MMM – d. MMM"} + M{"d. MMM – d. MMM"} d{"d.–d. MMM"} } Md{ @@ -550,57 +550,57 @@ gsw{ } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y"} } yM{ - M{"MM.y – MM.y"} - y{"MM.y – MM.y"} + M{"MM.y – MM.y"} + y{"MM.y – MM.y"} } yMEd{ - M{"E, dd.MM.y – E, dd.MM.y"} - d{"E, dd.MM.y – E, dd.MM.y"} - y{"E, dd.MM.y – E, dd.MM.y"} + M{"E, dd.MM.y – E, dd.MM.y"} + d{"E, dd.MM.y – E, dd.MM.y"} + y{"E, dd.MM.y – E, dd.MM.y"} } yMMM{ M{"MMM–MMM y"} - y{"MMM y – MMM y"} + y{"MMM y – MMM y"} } yMMMEd{ - M{"E, d. MMM – E, d. MMM y"} + M{"E, d. MMM – E, d. MMM y"} d{"E, d. – E, d. MMM y"} - y{"E, d. MMM y – E, d. MMM y"} + y{"E, d. MMM y – E, d. MMM y"} } yMMMM{ - M{"MM – MM.y"} - y{"MM.y – MM.y"} + M{"MM – MM.y"} + y{"MM.y – MM.y"} } yMMMd{ - M{"d. MMM – d. MMM y"} + M{"d. MMM – d. MMM y"} d{"d.–d. MMM y"} - y{"d. MMM y – d. MMM y"} + y{"d. MMM y – d. MMM y"} } yMd{ - M{"dd.MM.y – dd.MM.y"} - d{"dd.MM.y – dd.MM.y"} - y{"dd.MM.y – dd.MM.y"} + M{"dd.MM.y – dd.MM.y"} + d{"dd.MM.y – dd.MM.y"} + y{"dd.MM.y – dd.MM.y"} } } monthNames{ diff --git a/icu4c/source/data/locales/gu.txt b/icu4c/source/data/locales/gu.txt index a1de0df183d4..87826f233007 100644 --- a/icu4c/source/data/locales/gu.txt +++ b/icu4c/source/data/locales/gu.txt @@ -722,6 +722,12 @@ gu{ "d MMM, y", "d/M/yy", "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + } + DateTimePatterns%atTime{ "{1} એ {0} વાગ્યે", "{1} એ {0} વાગ્યે", "{1} {0}", diff --git a/icu4c/source/data/locales/guz.txt b/icu4c/source/data/locales/guz.txt index 2f58177559f4..e35789111970 100644 --- a/icu4c/source/data/locales/guz.txt +++ b/icu4c/source/data/locales/guz.txt @@ -52,7 +52,7 @@ guz{ MMMd{"MMM d"} Md{"M/d"} d{"d"} - hm{"h:mm a"} + hm{"h:mm a"} ms{"mm:ss"} y{"y"} yM{"M/y"} @@ -110,7 +110,7 @@ guz{ MMMd{"MMM d"} Md{"M/d"} d{"d"} - hm{"h:mm a"} + hm{"h:mm a"} ms{"mm:ss"} y{"y"} yM{"M/y"} diff --git a/icu4c/source/data/locales/ha.txt b/icu4c/source/data/locales/ha.txt index b1e589681963..e2126c21f8d2 100644 --- a/icu4c/source/data/locales/ha.txt +++ b/icu4c/source/data/locales/ha.txt @@ -185,6 +185,12 @@ ha{ "d MMM, y G", "d/M/yy GGGGG", "{0}, {1}", + "{0}, {1}", + "{0}, {1}", + "{0}, {1}", + "{0}, {1}", + } + DateTimePatterns%atTime{ "{0} 'da' {1}", "{0} 'da' {1}", "{0}, {1}", @@ -234,6 +240,12 @@ ha{ "d MMM, y", "d/M/yy", "{1}, {0}", + "{1} {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{1} {0}", "{1} 'da' {0}", "{1}, {0}", @@ -266,8 +278,8 @@ ha{ MMMd{"MMM d"} Md{"M/d"} d{"d"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"mm:ss"} y{"y"} yM{"M/y"} @@ -405,37 +417,37 @@ ha{ m{"HH:mm–HH:mm"} } MEd{ - d{"E, dd/M – E, dd/M"} + d{"E, dd/M – E, dd/M"} } h{ - a{"h a – h a"} + a{"h a – h a"} } hm{ - a{"h:mm a – h:mm a"} + a{"h:mm a – h:mm a"} } yM{ - M{"MM/y – MM/y"} - y{"MM/y – MM/y"} + M{"MM/y – MM/y"} + y{"MM/y – MM/y"} } yMEd{ - M{"y-MM-dd, E – y-MM-dd, E"} - y{"y-MM-dd, E – y-MM-dd, E"} + M{"y-MM-dd, E – y-MM-dd, E"} + y{"y-MM-dd, E – y-MM-dd, E"} } yMMM{ - y{"y MMM – y MMM"} + y{"y MMM – y MMM"} } yMMMEd{ - y{"y MMM d, E – y MMM d, E"} + y{"y MMM d, E – y MMM d, E"} } yMMMM{ - y{"y MMMM – y MMMM"} + y{"y MMMM – y MMMM"} } yMMMd{ - y{"y MMM d – y MMM d"} + y{"y MMM d – y MMM d"} } yMd{ - M{"dd/MM/y – dd/MM/y"} - d{"dd/MM/y – dd/MM/y"} + M{"dd/MM/y – dd/MM/y"} + d{"dd/MM/y – dd/MM/y"} } } monthNames{ diff --git a/icu4c/source/data/locales/ha_GH.txt b/icu4c/source/data/locales/ha_GH.txt index 46cb0039df4e..eff217c9a105 100644 --- a/icu4c/source/data/locales/ha_GH.txt +++ b/icu4c/source/data/locales/ha_GH.txt @@ -5,17 +5,17 @@ ha_GH{ calendar{ gregorian{ DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE d MMMM, y", "d MMMM, y", "d MMM, y", "d/M/yy", "{1}, {0}", "{1} {0}", - "{1} 'da' {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } diff --git a/icu4c/source/data/locales/haw.txt b/icu4c/source/data/locales/haw.txt index 598f50b042da..c9e8d66b5e21 100644 --- a/icu4c/source/data/locales/haw.txt +++ b/icu4c/source/data/locales/haw.txt @@ -36,10 +36,10 @@ haw{ calendar{ generic{ DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE, d MMMM y G", "d MMMM y G", "d MMM y G", @@ -81,10 +81,10 @@ haw{ "PM", } DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE, d MMMM y", "d MMMM y", "d MMM y", @@ -119,8 +119,8 @@ haw{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"E d"} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"y G"} GyMMM{"MMM y G"} GyMMMEd{"E, d MMM y G"} @@ -138,11 +138,11 @@ haw{ MMMd{"d MMM"} Md{"d/M"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} - hmsv{"h:mm:ss a v"} - hmv{"h:mm a v"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} + hmsv{"h:mm:ss a v"} + hmv{"h:mm a v"} ms{"mm:ss"} y{"y"} yM{"M/y"} @@ -278,80 +278,80 @@ haw{ M{"MM–MM"} } MEd{ - M{"MM-dd, E – MM-dd, E"} - d{"MM-dd, E – MM-dd, E"} + M{"MM-dd, E – MM-dd, E"} + d{"MM-dd, E – MM-dd, E"} } MMM{ M{"LLL–LLL"} } MMMEd{ - M{"MMM d, E – MMM d, E"} - d{"MMM d, E – MMM d, E"} + M{"MMM d, E – MMM d, E"} + d{"MMM d, E – MMM d, E"} } MMMd{ - M{"MMM d – MMM d"} + M{"MMM d – MMM d"} d{"MMM d–d"} } Md{ - M{"MM-dd – MM-dd"} - d{"MM-dd – MM-dd"} + M{"MM-dd – MM-dd"} + d{"MM-dd – MM-dd"} } d{ d{"d–d"} } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y"} } yM{ - M{"y-MM – y-MM"} - y{"y-MM – y-MM"} + M{"y-MM – y-MM"} + y{"y-MM – y-MM"} } yMEd{ - M{"y-MM-dd, E – y-MM-dd, E"} - d{"y-MM-dd, E – y-MM-dd, E"} - y{"y-MM-dd, E – y-MM-dd, E"} + M{"y-MM-dd, E – y-MM-dd, E"} + d{"y-MM-dd, E – y-MM-dd, E"} + y{"y-MM-dd, E – y-MM-dd, E"} } yMMM{ M{"y MMM–MMM"} - y{"y MMM – y MMM"} + y{"y MMM – y MMM"} } yMMMEd{ - M{"y MMM d, E – MMM d, E"} - d{"y MMM d, E – MMM d, E"} - y{"y MMM d, E – y MMM d, E"} + M{"y MMM d, E – MMM d, E"} + d{"y MMM d, E – MMM d, E"} + y{"y MMM d, E – y MMM d, E"} } yMMMM{ M{"y MMMM–MMMM"} - y{"y MMMM – y MMMM"} + y{"y MMMM – y MMMM"} } yMMMd{ - M{"y MMM d – MMM d"} + M{"y MMM d – MMM d"} d{"y MMM d–d"} - y{"y MMM d – y MMM d"} + y{"y MMM d – y MMM d"} } yMd{ - M{"y-MM-dd – y-MM-dd"} - d{"y-MM-dd – y-MM-dd"} - y{"y-MM-dd – y-MM-dd"} + M{"y-MM-dd – y-MM-dd"} + d{"y-MM-dd – y-MM-dd"} + y{"y-MM-dd – y-MM-dd"} } } monthNames{ diff --git a/icu4c/source/data/locales/he.txt b/icu4c/source/data/locales/he.txt index be5f1e65f351..3405c29154fb 100644 --- a/icu4c/source/data/locales/he.txt +++ b/icu4c/source/data/locales/he.txt @@ -566,6 +566,12 @@ he{ "d בMMM y G", "d.M.y GGGGG", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{1} בשעה {0}", "{1} בשעה {0}", "{1}, {0}", @@ -778,6 +784,12 @@ he{ "d בMMM y", "d.M.y", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{1} בשעה {0}", "{1} בשעה {0}", "{1}, {0}", @@ -1323,8 +1335,8 @@ he{ "hebr", } "{1}, {0}", - "{1} בשעה {0}", - "{1} בשעה {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } @@ -1684,8 +1696,8 @@ he{ "d בMMM y G", "dd/MM/yy GGGGG", "{1}, {0}", - "{1} בשעה {0}", - "{1} בשעה {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } diff --git a/icu4c/source/data/locales/hi.txt b/icu4c/source/data/locales/hi.txt index 9a3eec781dbc..384b27dd852b 100644 --- a/icu4c/source/data/locales/hi.txt +++ b/icu4c/source/data/locales/hi.txt @@ -347,6 +347,12 @@ hi{ "G d MMM y", "G d/M/y", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{1} को {0}", "{1} को {0}", "{1}, {0}", @@ -536,6 +542,12 @@ hi{ "d MMM y", "d/M/yy", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{1} को {0}", "{1} को {0}", "{1}, {0}", @@ -1011,8 +1023,8 @@ hi{ "d MMM y G", "d/M/y GGGGG", "{1}, {0}", - "{1} को {0}", - "{1} को {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } diff --git a/icu4c/source/data/locales/hi_Latn.txt b/icu4c/source/data/locales/hi_Latn.txt index f85bcbb7b367..e0de858c4611 100644 --- a/icu4c/source/data/locales/hi_Latn.txt +++ b/icu4c/source/data/locales/hi_Latn.txt @@ -183,17 +183,17 @@ hi_Latn{ } generic{ DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE, d MMMM, y G", "d MMMM, y G", "d MMM, y G", "d/M/y GGGGG", "{1}, {0}", - "{1} 'at' {0}", - "{1} 'at' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } @@ -203,27 +203,27 @@ hi_Latn{ } intervalFormats{ MEd{ - M{"E, d/M – E, d/M"} - d{"E, d/M – E, d/M"} + M{"E, d/M – E, d/M"} + d{"E, d/M – E, d/M"} } yM{ - M{"M/y – M/y GGGGG"} - y{"M/y – M/y GGGGG"} + M{"M/y – M/y GGGGG"} + y{"M/y – M/y GGGGG"} } yMEd{ - M{"E, d/M/y – E, d/M/y GGGGG"} - d{"E, d/M/y – E, d/M/y GGGGG"} - y{"E, d/M/y – E, d/M/y GGGGG"} + M{"E, d/M/y – E, d/M/y GGGGG"} + d{"E, d/M/y – E, d/M/y GGGGG"} + y{"E, d/M/y – E, d/M/y GGGGG"} } yMMMEd{ - M{"E, d MMM – E, d MMM y G"} - d{"E, d – E, d MMM y G"} - y{"E, d MMM y – E, d MMM y G"} + M{"E, d MMM – E, d MMM y G"} + d{"E, d – E, d MMM y G"} + y{"E, d MMM y – E, d MMM y G"} } yMd{ - M{"d/M/y – d/M/y GGGGG"} - d{"d/M/y – d/M/y GGGGG"} - y{"d/M/y – d/M/y GGGGG"} + M{"d/M/y – d/M/y GGGGG"} + d{"d/M/y – d/M/y GGGGG"} + y{"d/M/y – d/M/y GGGGG"} } } } @@ -237,10 +237,10 @@ hi_Latn{ "PM", } DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE, d MMMM, y", "d MMMM y", "dd-MMM-y", @@ -316,6 +316,25 @@ hi_Latn{ } } } + intervalFormats{ + GyM{ + G{"M/y GGGGG – M/y GGGGG"} + M{"M/y – M/y GGGGG"} + y{"M/y – M/y GGGGG"} + } + GyMEd{ + G{"E, dd/MM/y GGGGG – E, dd/MM/y GGGGG"} + M{"E, dd/MM/y – E, dd/MM/y GGGGG"} + d{"E, dd/MM/y – E, dd/MM/y GGGGG"} + y{"E, dd/MM/y – E, dd/MM/y GGGGG"} + } + GyMd{ + G{"dd/MM/y GGGGG – dd/MM/y GGGGG"} + M{"dd/MM/y – dd/MM/y GGGGG"} + d{"dd/MM/y – dd/MM/y GGGGG"} + y{"dd/MM/y – dd/MM/y GGGGG"} + } + } monthNames{ format{ abbreviated{ diff --git a/icu4c/source/data/locales/hr.txt b/icu4c/source/data/locales/hr.txt index 13e333d6223e..e9af81f3cf44 100644 --- a/icu4c/source/data/locales/hr.txt +++ b/icu4c/source/data/locales/hr.txt @@ -444,6 +444,12 @@ hr{ "d. MMM y. G", "dd. MM. y. GGGGG", "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + } + DateTimePatterns%atTime{ "{1} 'u' {0}", "{1} 'u' {0}", "{1} {0}", @@ -469,8 +475,8 @@ hr{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"E, d."} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"y. G"} GyMMM{"LLL y. G"} GyMMMEd{"E, d. MMM y. G"} @@ -488,9 +494,9 @@ hr{ MMMd{"d. MMM"} Md{"dd. MM."} d{"d."} - h{"hh a"} - hm{"hh:mm a"} - hms{"hh:mm:ss a"} + h{"hh a"} + hm{"hh:mm a"} + hms{"hh:mm:ss a"} ms{"mm:ss"} y{"y. G"} yyyy{"y. G"} @@ -506,43 +512,43 @@ hr{ } intervalFormats{ Bh{ - B{"h B – h B"} - h{"h – h B"} + B{"h B – h B"} + h{"h – h B"} } Bhm{ - B{"h:mm B – h:mm B"} - h{"h:mm – h:mm B"} - m{"h:mm – h:mm B"} + B{"h:mm B – h:mm B"} + h{"h:mm – h:mm B"} + m{"h:mm – h:mm B"} } Gy{ - G{"y. G – y. G"} + G{"y. G – y. G"} y{"y. – y. G"} } GyM{ - G{"M. y. GGGGG – M. y. GGGGG"} + G{"M. y. GGGGG – M. y. GGGGG"} M{"M. y. – M. y. GGGGG"} y{"M. y. – M. y. GGGGG"} } GyMEd{ - G{"E, d. M. y. GGGGG – E, d. M. y. GGGGG"} + G{"E, d. M. y. GGGGG – E, d. M. y. GGGGG"} M{"E, d. M. y. – E, d. M. y. GGGGG"} d{"E, d. M. y. – E, d. M. y. GGGGG"} y{"E, d. M. y. – E, d. M. y. GGGGG"} } GyMMM{ - G{"MMM y. G – MMM y. G"} - M{"MMM y. G – MMM y. G"} + G{"MMM y. G – MMM y. G"} + M{"MMM y. G – MMM y. G"} y{"MMM y. – MMM y. G"} } GyMMMEd{ - G{"E, d. MMM y. G – E, d. MMM y. G"} - M{"E, d. MMM – E, d. MMM y. G"} - d{"E, d. MMM – E, d. MMM y. G"} + G{"E, d. MMM y. G – E, d. MMM y. G"} + M{"E, d. MMM – E, d. MMM y. G"} + d{"E, d. MMM – E, d. MMM y. G"} y{"E, d. MMM y. – E, d. MMM y. G"} } GyMMMd{ - G{"d. MMM y. G – d. MMM y. G"} - M{"d. MMM – d. MMM y. G"} + G{"d. MMM y. G – d. MMM y. G"} + M{"d. MMM – d. MMM y. G"} d{"d. – d. MMM y. G"} y{"d. MMM y. – d. MMM y. G"} } @@ -553,7 +559,7 @@ hr{ y{"d. M. y. – d. M. y. GGGGG"} } H{ - H{"HH – HH'h'"} + H{"HH – HH'h'"} } Hm{ H{"HH:mm–HH:mm"} @@ -564,7 +570,7 @@ hr{ m{"HH:mm–HH:mm v"} } Hv{ - H{"HH – HH 'h' v"} + H{"HH – HH 'h' v"} } M{ M{"MM. – MM."} @@ -574,14 +580,14 @@ hr{ d{"E, dd. MM. – E, dd. MM."} } MMM{ - M{"LLL – LLL"} + M{"LLL – LLL"} } MMMEd{ - M{"E, dd. MMM – E, dd. MMM"} + M{"E, dd. MMM – E, dd. MMM"} d{"E, dd. – E, dd. MMM"} } MMMd{ - M{"dd. MMM – dd. MMM"} + M{"dd. MMM – dd. MMM"} d{"d. – d. MMM"} } Md{ @@ -593,22 +599,22 @@ hr{ } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h – h'h' a"} + a{"h a – h a"} + h{"h – h'h' a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h – h 'h' a v"} + a{"h a – h a v"} + h{"h – h 'h' a v"} } y{ y{"y. – y. G"} @@ -623,20 +629,20 @@ hr{ y{"E, dd. MM. y. – E, dd. MM. y. G"} } yMMM{ - M{"LLL – LLL y. G"} + M{"LLL – LLL y. G"} y{"LLL y. – LLL y. G"} } yMMMEd{ - M{"E, dd. MMM – E, dd. MMM y. G"} + M{"E, dd. MMM – E, dd. MMM y. G"} d{"E, dd. – E, dd. MMM y. G"} y{"E, dd. MMM y. – E, dd. MMM y. G"} } yMMMM{ - M{"LLLL – LLLL y. G"} + M{"LLLL – LLLL y. G"} y{"LLLL y. – LLLL y. G"} } yMMMd{ - M{"dd. MMM – dd. MMM y. G"} + M{"dd. MMM – dd. MMM y. G"} d{"dd. – dd. MMM y. G"} y{"dd. MMM y. – dd. MMM y. G"} } @@ -670,6 +676,12 @@ hr{ "d. MMM y.", "dd. MM. y.", "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + } + DateTimePatterns%atTime{ "{1} 'u' {0}", "{1} 'u' {0}", "{1} {0}", @@ -698,8 +710,8 @@ hr{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"E, d."} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"y. G"} GyMMM{"LLL y. G"} GyMMMEd{"E, d. MMM y. G"} @@ -725,11 +737,11 @@ hr{ MMdd{"dd. MM."} Md{"dd. MM."} d{"d."} - h{"h a"} - hm{"hh:mm a"} - hms{"hh:mm:ss a"} - hmsv{"h:mm:ss a v"} - hmv{"h:mm a v"} + h{"h a"} + hm{"hh:mm a"} + hms{"hh:mm:ss a"} + hmsv{"h:mm:ss a v"} + hmv{"h:mm a v"} ms{"mm:ss"} y{"y."} yM{"MM. y."} @@ -910,65 +922,65 @@ hr{ } intervalFormats{ Bh{ - B{"h B – h B"} - h{"h – h B"} + B{"h B – h B"} + h{"h – h B"} } Bhm{ - B{"h:mm B – h:mm B"} - h{"h:mm – h:mm B"} - m{"h:mm – h:mm B"} + B{"h:mm B – h:mm B"} + h{"h:mm – h:mm B"} + m{"h:mm – h:mm B"} } Gy{ - G{"y. G – y. G"} + G{"y. G – y. G"} y{"y. – y. G"} } GyM{ - G{"MM. y. GGGGG – MM. y. GGGGG"} + G{"MM. y. GGGGG – MM. y. GGGGG"} M{"MM. y. – MM. y. GGGGG"} y{"MM. y. – MM. y. GGGGG"} } GyMEd{ - G{"E, dd. MM. y. GGGGG – E, dd. MM. y. GGGGG"} + G{"E, dd. MM. y. GGGGG – E, dd. MM. y. GGGGG"} M{"E, dd. MM. y. – E, dd. MM. y. GGGGG"} d{"E, dd. MM. y. – E, dd. MM. y. GGGGG"} y{"E, dd. MM. y. – E, dd. MM. y. GGGGG"} } GyMMM{ - G{"MMM y. G – MMM y. G"} - M{"MMM – MMM y. G"} - y{"MMM y – MMM y. G"} + G{"MMM y. G – MMM y. G"} + M{"MMM – MMM y. G"} + y{"MMM y – MMM y. G"} } GyMMMEd{ - G{"E, dd. MMM y. G – E, dd. MMM y. G"} - M{"E, dd. MMM – E, dd. MMM y. G"} - d{"E, dd. MMM – E, dd. MMM y. G"} + G{"E, dd. MMM y. G – E, dd. MMM y. G"} + M{"E, dd. MMM – E, dd. MMM y. G"} + d{"E, dd. MMM – E, dd. MMM y. G"} y{"E, dd. MMM y. – E, dd. MMM y. G"} } GyMMMd{ - G{"dd. MMM y. G – dd. MMM y. G"} - M{"dd. MMM – dd. MMM y. G"} + G{"dd. MMM y. G – dd. MMM y. G"} + M{"dd. MMM – dd. MMM y. G"} d{"dd. – dd. MMM y. G"} y{"dd. MMM y. – dd. MMM y. G"} } GyMd{ - G{"dd. MM. y. GGGGG – dd. MM. y. GGGGG"} + G{"dd. MM. y. GGGGG – dd. MM. y. GGGGG"} M{"dd. MM. y. – dd. MM. y. GGGGG"} d{"dd. MM. y. – dd. MM. y. GGGGG"} y{"dd. MM. y. – dd. MM. y. GGGGG"} } H{ - H{"HH – HH 'h'"} + H{"HH – HH 'h'"} } Hm{ - H{"HH:mm – HH:mm"} - m{"HH:mm – HH:mm"} + H{"HH:mm – HH:mm"} + m{"HH:mm – HH:mm"} } Hmv{ - H{"HH:mm – HH:mm v"} - m{"HH:mm – HH:mm v"} + H{"HH:mm – HH:mm v"} + m{"HH:mm – HH:mm v"} } Hv{ - H{"HH – HH 'h' v"} + H{"HH – HH 'h' v"} } M{ M{"MM. – MM."} @@ -978,14 +990,14 @@ hr{ d{"E, dd. MM. – E, dd. MM."} } MMM{ - M{"LLL – LLL"} + M{"LLL – LLL"} } MMMEd{ - M{"E, dd. MMM – E, dd. MMM"} + M{"E, dd. MMM – E, dd. MMM"} d{"E, dd. – E, dd. MMM"} } MMMd{ - M{"dd. MMM – dd. MMM"} + M{"dd. MMM – dd. MMM"} d{"dd. – dd. MMM"} } Md{ @@ -997,22 +1009,22 @@ hr{ } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h – h 'h' a"} + a{"h a – h a"} + h{"h – h 'h' a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm – h:mm a"} - m{"h:mm – h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm – h:mm a"} + m{"h:mm – h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm – h:mm a v"} - m{"h:mm – h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm – h:mm a v"} + m{"h:mm – h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h – h 'h' a v"} + a{"h a – h a v"} + h{"h – h 'h' a v"} } y{ y{"y. – y."} @@ -1027,20 +1039,20 @@ hr{ y{"E, dd. MM. y. – E, dd. MM. y."} } yMMM{ - M{"LLL – LLL y."} + M{"LLL – LLL y."} y{"LLL y. – LLL y."} } yMMMEd{ - M{"E, dd. MMM – E, dd. MMM y."} + M{"E, dd. MMM – E, dd. MMM y."} d{"E, dd. – E, dd. MMM y."} y{"E, dd. MMM y. – E, dd. MMM y."} } yMMMM{ - M{"LLLL – LLLL y."} + M{"LLLL – LLLL y."} y{"LLLL y. – LLLL y."} } yMMMd{ - M{"dd. MMM – dd. MMM y."} + M{"dd. MMM – dd. MMM y."} d{"dd. – dd. MMM y."} y{"dd. MMM y. – dd. MMM y."} } @@ -1284,8 +1296,8 @@ hr{ "d. M. y. G", "d. M. y. GGGGG", "{1} {0}", - "{1} 'u' {0}", - "{1} 'u' {0}", + "{1} {0}", + "{1} {0}", "{1} {0}", "{1} {0}", } diff --git a/icu4c/source/data/locales/hr_BA.txt b/icu4c/source/data/locales/hr_BA.txt index a8693f8eed36..840cc7ebc547 100644 --- a/icu4c/source/data/locales/hr_BA.txt +++ b/icu4c/source/data/locales/hr_BA.txt @@ -14,8 +14,8 @@ hr_BA{ "d. MMM y.", "d. M. yy.", "{1} {0}", - "{1} 'u' {0}", - "{1} 'u' {0}", + "{1} {0}", + "{1} {0}", "{1} {0}", "{1} {0}", } diff --git a/icu4c/source/data/locales/hsb.txt b/icu4c/source/data/locales/hsb.txt index f823130728c4..f10a193d6f72 100644 --- a/icu4c/source/data/locales/hsb.txt +++ b/icu4c/source/data/locales/hsb.txt @@ -320,8 +320,8 @@ hsb{ EHm{"E, HH:mm"} EHms{"E, HH:mm:ss"} Ed{"E, d."} - Ehm{"E h:mm a"} - Ehms{"E, h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E, h:mm:ss a"} Gy{"y G"} GyMMM{"MMM y G"} GyMMMEd{"E, d. MMM y G"} @@ -339,8 +339,8 @@ hsb{ Md{"d.M."} d{"d"} h{"h 'hodź'. a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"mm:ss"} y{"y G"} yyyy{"y G"} @@ -356,51 +356,51 @@ hsb{ } intervalFormats{ Bh{ - B{"h 'hodź'. B – h 'hodź'. B"} + B{"h 'hodź'. B – h 'hodź'. B"} h{"h–h B"} } Bhm{ - B{"h:mm 'hodź'. B – h:mm 'hodź'. B"} + B{"h:mm 'hodź'. B – h:mm 'hodź'. B"} h{"h:mm–h:mm B"} m{"h:mm–h:mm B"} } Gy{ - G{"G y – G y"} + G{"G y – G y"} y{"G y–y"} } GyM{ - G{"GGGGG y-MM – GGGGG y-MM"} - M{"GGGGG y-MM – y-MM"} - y{"GGGGG y-MM – y-MM"} + G{"GGGGG y-MM – GGGGG y-MM"} + M{"GGGGG y-MM – y-MM"} + y{"GGGGG y-MM – y-MM"} } GyMEd{ - G{"GGGGG y-MM-dd, E – GGGGG y-MM-dd, E"} - M{"GGGGG y-MM-dd, E – y-MM-dd, E"} - d{"GGGGG y-MM-dd, E – y-MM-dd, E"} - y{"GGGGG y-MM-dd, E – y-MM-dd, E"} + G{"GGGGG y-MM-dd, E – GGGGG y-MM-dd, E"} + M{"GGGGG y-MM-dd, E – y-MM-dd, E"} + d{"GGGGG y-MM-dd, E – y-MM-dd, E"} + y{"GGGGG y-MM-dd, E – y-MM-dd, E"} } GyMMM{ - G{"G y MMM – G y MMM"} + G{"G y MMM – G y MMM"} M{"G y MMM–MMM"} - y{"G y MMM – y MMM"} + y{"G y MMM – y MMM"} } GyMMMEd{ - G{"G y MMM d, E – G y MMM d, E"} - M{"G y MMM d, E – MMM d, E"} - d{"G y MMM d, E – MMM d, E"} - y{"G y MMM d, E – y MMM d, E"} + G{"G y MMM d, E – G y MMM d, E"} + M{"G y MMM d, E – MMM d, E"} + d{"G y MMM d, E – MMM d, E"} + y{"G y MMM d, E – y MMM d, E"} } GyMMMd{ - G{"G y MMM d – G y MMM d"} - M{"G y MMM d – MMM d"} + G{"G y MMM d – G y MMM d"} + M{"G y MMM d – MMM d"} d{"G y MMM d–d"} - y{"G y MMM d – y MMM d"} + y{"G y MMM d – y MMM d"} } GyMd{ - G{"GGGGG y-MM-dd – GGGGG y-MM-dd"} - M{"GGGGG y-MM-dd – y-MM-dd"} - d{"GGGGG y-MM-dd – y-MM-dd"} - y{"GGGGG y-MM-dd – y-MM-dd"} + G{"GGGGG y-MM-dd – GGGGG y-MM-dd"} + M{"GGGGG y-MM-dd – y-MM-dd"} + d{"GGGGG y-MM-dd – y-MM-dd"} + y{"GGGGG y-MM-dd – y-MM-dd"} } M{ M{"M. – M."} @@ -410,14 +410,14 @@ hsb{ d{"E, d.M. – E, d.M."} } MMM{ - M{"LLL – LLL"} + M{"LLL – LLL"} } MMMEd{ - M{"E, d. MMM – E, d. MMM"} + M{"E, d. MMM – E, d. MMM"} d{"E, d. – E, d. MMM"} } MMMd{ - M{"d. MMM – d. MMM"} + M{"d. MMM – d. MMM"} d{"d. – d. MMM"} } Md{ @@ -432,36 +432,36 @@ hsb{ y{"y–y G"} } yM{ - M{"M.y – M.y G"} - y{"M.y – M.y G"} + M{"M.y – M.y G"} + y{"M.y – M.y G"} } yMEd{ - M{"E, d.M.y – E, d.M.y G"} - d{"E, d.M.y – E, d.M.y G"} - y{"E, d.M.y – E, d.M.y G"} + M{"E, d.M.y – E, d.M.y G"} + d{"E, d.M.y – E, d.M.y G"} + y{"E, d.M.y – E, d.M.y G"} } yMMM{ - M{"LLL – LLL y G"} - y{"LLL y – LLL y G"} + M{"LLL – LLL y G"} + y{"LLL y – LLL y G"} } yMMMEd{ - M{"E, d. MMM – E, d. MMM y G"} + M{"E, d. MMM – E, d. MMM y G"} d{"E, d. – E, d. MMM y G"} - y{"E, d. MMM y – E, d. MMM y G"} + y{"E, d. MMM y – E, d. MMM y G"} } yMMMM{ - M{"LLLL – LLLL y G"} - y{"LLLL y – LLLL y G"} + M{"LLLL – LLLL y G"} + y{"LLLL y – LLLL y G"} } yMMMd{ - M{"d. MMM – d. MMM y G"} + M{"d. MMM – d. MMM y G"} d{"d. – d. MMM y G"} - y{"d. MMM y – d. MMM y G"} + y{"d. MMM y – d. MMM y G"} } yMd{ - M{"d.M.y – d.M.y G"} - d{"d.M.y – d.M.y G"} - y{"d.M.y – d.M.y G"} + M{"d.M.y – d.M.y G"} + d{"d.M.y – d.M.y G"} + y{"d.M.y – d.M.y G"} } } } @@ -511,8 +511,8 @@ hsb{ EHm{"E, H:mm 'hodź'."} EHms{"E, HH:mm:ss"} Ed{"E, d."} - Ehm{"E, h:mm a"} - Ehms{"E, h:mm:ss a"} + Ehm{"E, h:mm a"} + Ehms{"E, h:mm:ss a"} Gy{"y G"} GyMMM{"MMM y G"} GyMMMEd{"E, d. MMM y G"} @@ -537,9 +537,9 @@ hsb{ MMMd{"d. MMM"} Md{"d.M."} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"mm:ss"} y{"y"} yM{"M.y"} @@ -668,62 +668,62 @@ hsb{ } intervalFormats{ Bh{ - B{"h 'hodź'. B – h 'hodź'. B"} + B{"h 'hodź'. B – h 'hodź'. B"} h{"h–h B"} } Bhm{ - B{"h:mm 'hodź'. B – h:mm 'hodź'. B"} + B{"h:mm 'hodź'. B – h:mm 'hodź'. B"} h{"h:mm–h:mm B"} m{"h:mm–h:mm B"} } Gy{ - G{"G y – G y"} + G{"G y – G y"} y{"G y–y"} } GyM{ - G{"GGGGG y-MM – GGGGG y-MM"} - M{"GGGGG y-MM – y-MM"} - y{"GGGGG y-MM – y-MM"} + G{"GGGGG y-MM – GGGGG y-MM"} + M{"GGGGG y-MM – y-MM"} + y{"GGGGG y-MM – y-MM"} } GyMEd{ - G{"GGGGG y-MM-dd, E – GGGGG y-MM-dd, E"} - M{"GGGGG y-MM-dd, E – y-MM-dd, E"} - d{"GGGGG y-MM-dd, E – y-MM-dd, E"} - y{"GGGGG y-MM-dd, E – y-MM-dd, E"} + G{"GGGGG y-MM-dd, E – GGGGG y-MM-dd, E"} + M{"GGGGG y-MM-dd, E – y-MM-dd, E"} + d{"GGGGG y-MM-dd, E – y-MM-dd, E"} + y{"GGGGG y-MM-dd, E – y-MM-dd, E"} } GyMMM{ - G{"G y MMM – G y MMM"} + G{"G y MMM – G y MMM"} M{"G y MMM–MMM"} - y{"G y MMM – y MMM"} + y{"G y MMM – y MMM"} } GyMMMEd{ - G{"G y MMM d, E – G y MMM d, E"} - M{"G y MMM d, E – MMM d, E"} - d{"G y MMM d, E – MMM d, E"} - y{"G y MMM d, E – y MMM d, E"} + G{"G y MMM d, E – G y MMM d, E"} + M{"G y MMM d, E – MMM d, E"} + d{"G y MMM d, E – MMM d, E"} + y{"G y MMM d, E – y MMM d, E"} } GyMMMd{ - G{"G y MMM d – G y MMM d"} - M{"G y MMM d – MMM d"} + G{"G y MMM d – G y MMM d"} + M{"G y MMM d – MMM d"} d{"G y MMM d–d"} - y{"G y MMM d – y MMM d"} + y{"G y MMM d – y MMM d"} } GyMd{ - G{"GGGGG y-MM-dd – GGGGG y-MM-dd"} - M{"GGGGG y-MM-dd – y-MM-dd"} - d{"GGGGG y-MM-dd – y-MM-dd"} - y{"GGGGG y-MM-dd – y-MM-dd"} + G{"GGGGG y-MM-dd – GGGGG y-MM-dd"} + M{"GGGGG y-MM-dd – y-MM-dd"} + d{"GGGGG y-MM-dd – y-MM-dd"} + y{"GGGGG y-MM-dd – y-MM-dd"} } H{ H{"H–H 'hodź'."} } Hm{ - H{"H:mm – H:mm 'hodź'."} - m{"H:mm – H:mm 'hodź'."} + H{"H:mm – H:mm 'hodź'."} + m{"H:mm – H:mm 'hodź'."} } Hmv{ - H{"H:mm – H:mm 'hodź'. v"} - m{"H:mm – H:mm 'hodź'. v"} + H{"H:mm – H:mm 'hodź'. v"} + m{"H:mm – H:mm 'hodź'. v"} } Hv{ H{"H–H v"} @@ -736,14 +736,14 @@ hsb{ d{"E, d.M. – E, d.M."} } MMM{ - M{"LLL – LLL"} + M{"LLL – LLL"} } MMMEd{ - M{"E, d. MMM – E, d. MMM"} + M{"E, d. MMM – E, d. MMM"} d{"E, d. – E, d. MMM"} } MMMd{ - M{"d. MMM – d. MMM"} + M{"d. MMM – d. MMM"} d{"d. – d. MMM"} } Md{ @@ -755,57 +755,57 @@ hsb{ } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm – h:mm a"} - m{"h:mm – h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm – h:mm a"} + m{"h:mm – h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm – h:mm a v"} - m{"h:mm – h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm – h:mm a v"} + m{"h:mm – h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y"} } yM{ - M{"M.y – M.y"} - y{"M.y – M.y"} + M{"M.y – M.y"} + y{"M.y – M.y"} } yMEd{ - M{"E, d.M.y – E, d.M.y"} - d{"E, d.M.y – E, d.M.y"} - y{"E, d.M.y – E, d.M.y"} + M{"E, d.M.y – E, d.M.y"} + d{"E, d.M.y – E, d.M.y"} + y{"E, d.M.y – E, d.M.y"} } yMMM{ - M{"LLL – LLL y"} - y{"LLL y – LLL y"} + M{"LLL – LLL y"} + y{"LLL y – LLL y"} } yMMMEd{ - M{"E, d. MMM – E, d. MMM y"} + M{"E, d. MMM – E, d. MMM y"} d{"E, d. – E, d. MMM y"} - y{"E, d. MMM y – E, d. MMM y"} + y{"E, d. MMM y – E, d. MMM y"} } yMMMM{ - M{"LLLL – LLLL y"} - y{"LLLL y – LLLL y"} + M{"LLLL – LLLL y"} + y{"LLLL y – LLLL y"} } yMMMd{ - M{"d. MMM – d. MMM y"} + M{"d. MMM – d. MMM y"} d{"d. – d. MMM y"} - y{"d. MMM y – d. MMM y"} + y{"d. MMM y – d. MMM y"} } yMd{ - M{"d.M.y – d.M.y"} - d{"d.M.y – d.M.y"} - y{"d.M.y – d.M.y"} + M{"d.M.y – d.M.y"} + d{"d.M.y – d.M.y"} + y{"d.M.y – d.M.y"} } } monthNames{ diff --git a/icu4c/source/data/locales/hu.txt b/icu4c/source/data/locales/hu.txt index 72e4ac1a2cd9..dfe8fa1fe87f 100644 --- a/icu4c/source/data/locales/hu.txt +++ b/icu4c/source/data/locales/hu.txt @@ -574,9 +574,9 @@ hu{ MMMd{"MMM d."} Md{"M. d."} d{"d"} - h{"a h"} - hm{"a h:mm"} - hms{"a h:mm:ss"} + h{"a h"} + hm{"a h:mm"} + hms{"a h:mm:ss"} ms{"mm:ss"} y{"G y."} yyyy{"G y."} @@ -592,7 +592,7 @@ hu{ } intervalFormats{ Bhm{ - m{"h:mm – h:mm B"} + m{"h:mm – h:mm B"} } H{ H{"H–H"} @@ -612,15 +612,15 @@ hu{ M{"M–M."} } MEd{ - M{"MM. dd., E – MM. dd., E"} - d{"MM. dd., E – MM. dd., E"} + M{"MM. dd., E – MM. dd., E"} + d{"MM. dd., E – MM. dd., E"} } MMM{ M{"MMM–MMM"} } MMMEd{ - M{"MMM d., E – MMM d., E"} - d{"MMM d., E – d., E"} + M{"MMM d., E – MMM d., E"} + d{"MMM d., E – d., E"} } MMMd{ M{"MMM d. – MMM d."} @@ -635,22 +635,22 @@ hu{ } fallback{"{0} – {1}"} h{ - a{"a h – a h"} - h{"a h–h"} + a{"a h – a h"} + h{"a h–h"} } hm{ - a{"a h:mm – a h:mm"} - h{"a h:mm–h:mm"} - m{"a h:mm–h:mm"} + a{"a h:mm – a h:mm"} + h{"a h:mm–h:mm"} + m{"a h:mm–h:mm"} } hmv{ - a{"a h:mm – a h:mm v"} - h{"a h:mm–h:mm v"} - m{"a h:mm–h:mm v"} + a{"a h:mm – a h:mm v"} + h{"a h:mm–h:mm v"} + m{"a h:mm–h:mm v"} } hv{ - a{"a h – a h v"} - h{"a h–h v"} + a{"a h – a h v"} + h{"a h–h v"} } y{ y{"G y–y."} @@ -660,22 +660,22 @@ hu{ y{"G y. MM. – y. MM."} } yMEd{ - M{"G y. MM. dd., E – MM. dd., E"} - d{"G y. MM. dd., E – dd., E"} - y{"G y. MM. dd., E – y. MM. dd., E"} + M{"G y. MM. dd., E – MM. dd., E"} + d{"G y. MM. dd., E – dd., E"} + y{"G y. MM. dd., E – y. MM. dd., E"} } yMMM{ M{"G y. MMM–MMM"} - y{"G y. MMM – y. MMM"} + y{"G y. MMM – y. MMM"} } yMMMEd{ - M{"G y. MMM d., E – MMM d., E"} - d{"G y. MMM d., E – MMM d., E"} - y{"G y. MMM d., E – y. MMM d., E"} + M{"G y. MMM d., E – MMM d., E"} + d{"G y. MMM d., E – MMM d., E"} + y{"G y. MMM d., E – y. MMM d., E"} } yMMMM{ M{"G y. MMMM–MMMM"} - y{"G y. MMMM – y. MMMM"} + y{"G y. MMMM – y. MMMM"} } yMMMd{ M{"G y. MMM d. – MMM d."} @@ -740,8 +740,8 @@ hu{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"d., E"} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"G y."} GyMMM{"G y. MMM"} GyMMMEd{"G y. MMM d., E"} @@ -764,11 +764,11 @@ hu{ MMMd{"MMM d."} Md{"M. d."} d{"d"} - h{"a h"} - hm{"a h:mm"} - hms{"a h:mm:ss"} - hmsv{"a h:mm:ss v"} - hmv{"a h:mm v"} + h{"a h"} + hm{"a h:mm"} + hms{"a h:mm:ss"} + hmsv{"a h:mm:ss v"} + hmv{"a h:mm v"} mmss{"mm:ss"} ms{"mm:ss"} y{"y."} @@ -977,15 +977,15 @@ hu{ M{"M–M."} } MEd{ - M{"M. d., E – M. d., E"} - d{"M. dd., E – M. d., E"} + M{"M. d., E – M. d., E"} + d{"M. dd., E – M. d., E"} } MMM{ M{"MMM–MMM"} } MMMEd{ - M{"MMM d., E – MMM d., E"} - d{"MMM d., E – d., E"} + M{"MMM d., E – MMM d., E"} + d{"MMM d., E – d., E"} } MMMd{ M{"MMM d. – MMM d."} @@ -1000,22 +1000,22 @@ hu{ } fallback{"{0} – {1}"} h{ - a{"a h – a h"} - h{"a h–h"} + a{"a h – a h"} + h{"a h–h"} } hm{ - a{"a h:mm – a h:mm"} - h{"a h:mm–h:mm"} - m{"a h:mm–h:mm"} + a{"a h:mm – a h:mm"} + h{"a h:mm–h:mm"} + m{"a h:mm–h:mm"} } hmv{ - a{"a h:mm – a h:mm v"} - h{"a h:mm–h:mm v"} - m{"a h:mm–h:mm v"} + a{"a h:mm – a h:mm v"} + h{"a h:mm–h:mm v"} + m{"a h:mm–h:mm v"} } hv{ - a{"a h – a h v"} - h{"a h–h v"} + a{"a h – a h v"} + h{"a h–h v"} } y{ y{"y–y"} @@ -1025,22 +1025,22 @@ hu{ y{"y. MM. – y. MM."} } yMEd{ - M{"y. MM. dd., E – MM. dd., E"} - d{"y. MM. dd., E – dd., E"} - y{"y. MM. dd., E – y. MM. dd., E"} + M{"y. MM. dd., E – MM. dd., E"} + d{"y. MM. dd., E – dd., E"} + y{"y. MM. dd., E – y. MM. dd., E"} } yMMM{ M{"y. MMM–MMM"} - y{"y. MMM – y. MMM"} + y{"y. MMM – y. MMM"} } yMMMEd{ - M{"y. MMM d., E – MMM d., E"} - d{"y. MMM d., E – d., E"} - y{"y. MMM d., E – y. MMM d., E"} + M{"y. MMM d., E – MMM d., E"} + d{"y. MMM d., E – d., E"} + y{"y. MMM d., E – y. MMM d., E"} } yMMMM{ M{"y. MMMM–MMMM"} - y{"y. MMMM – y. MMMM"} + y{"y. MMMM – y. MMMM"} } yMMMd{ M{"y. MMM d. – MMM d."} diff --git a/icu4c/source/data/locales/ia.txt b/icu4c/source/data/locales/ia.txt index e0eabdd3255e..6afad606bcbe 100644 --- a/icu4c/source/data/locales/ia.txt +++ b/icu4c/source/data/locales/ia.txt @@ -215,6 +215,12 @@ ia{ "d MMM y G", "dd-MM-y GGGGG", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{1} 'a' {0}", "{1} 'a' {0}", "{1}, {0}", @@ -240,8 +246,8 @@ ia{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"E d"} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"y G"} GyMMM{"MMM y G"} GyMMMEd{"E d MMM y G"} @@ -257,9 +263,9 @@ ia{ MMMd{"d MMM"} Md{"dd-MM"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"mm:ss"} y{"y G"} yyyy{"y G"} @@ -275,65 +281,65 @@ ia{ } intervalFormats{ M{ - M{"MM – MM"} + M{"MM – MM"} } MEd{ - M{"E dd-MM – E dd-MM"} - d{"E dd-MM – E dd-MM"} + M{"E dd-MM – E dd-MM"} + d{"E dd-MM – E dd-MM"} } MMM{ - M{"MMM – MMM"} + M{"MMM – MMM"} } MMMEd{ - M{"E d MMM – E d MMM"} - d{"E d MMM – E d MMM"} + M{"E d MMM – E d MMM"} + d{"E d MMM – E d MMM"} } MMMd{ - M{"d MMM – d MMM"} - d{"d – d MMM"} + M{"d MMM – d MMM"} + d{"d – d MMM"} } Md{ - M{"dd-MM – dd-MM"} - d{"dd-MM – dd-MM"} + M{"dd-MM – dd-MM"} + d{"dd-MM – dd-MM"} } d{ - d{"d – d"} + d{"d – d"} } fallback{"{0} – {1}"} y{ - y{"y – y G"} + y{"y – y G"} } yM{ - M{"MM-y – MM-y GGGGG"} - y{"MM-y – MM-y GGGGG"} + M{"MM-y – MM-y GGGGG"} + y{"MM-y – MM-y GGGGG"} } yMEd{ - M{"E dd-MM-y – E dd-MM-y GGGGG"} - d{"E dd-MM-y – E dd-MM-y GGGGG"} - y{"E dd-MM-y – E dd-MM-y GGGGG"} + M{"E dd-MM-y – E dd-MM-y GGGGG"} + d{"E dd-MM-y – E dd-MM-y GGGGG"} + y{"E dd-MM-y – E dd-MM-y GGGGG"} } yMMM{ - M{"MMM – MMM y G"} - y{"MMM y – MMM y G"} + M{"MMM – MMM y G"} + y{"MMM y – MMM y G"} } yMMMEd{ - M{"E d MMM – E d MMM y G"} - d{"E d MMM – E d MMM y G"} - y{"E d MMM y – E d MMM y G"} + M{"E d MMM – E d MMM y G"} + d{"E d MMM – E d MMM y G"} + y{"E d MMM y – E d MMM y G"} } yMMMM{ - M{"MMMM – MMMM y G"} - y{"MMMM y – MMMM y G"} + M{"MMMM – MMMM y G"} + y{"MMMM y – MMMM y G"} } yMMMd{ - M{"d MMM – d MMM y G"} - d{"d – d MMM y G"} - y{"d MMM y – d MMM y G"} + M{"d MMM – d MMM y G"} + d{"d – d MMM y G"} + y{"d MMM y – d MMM y G"} } yMd{ - M{"dd-MM-y – dd-MM-y GGGGG"} - d{"dd-MM-y – dd-MM-y GGGGG"} - y{"dd-MM-y – dd-MM-y GGGGG"} + M{"dd-MM-y – dd-MM-y GGGGG"} + d{"dd-MM-y – dd-MM-y GGGGG"} + y{"dd-MM-y – dd-MM-y GGGGG"} } } } @@ -360,6 +366,12 @@ ia{ "d MMM y", "dd-MM-y", "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + } + DateTimePatterns%atTime{ "{1} 'a' {0}", "{1} 'a' {0}", "{1} {0}", @@ -388,8 +400,8 @@ ia{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"E d"} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"y G"} GyMMM{"MMM y G"} GyMMMEd{"E d MMM y G"} @@ -411,11 +423,11 @@ ia{ MMMd{"d MMM"} Md{"dd-MM"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} - hmsv{"h:mm:ss a v"} - hmv{"h:mm a v"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} + hmsv{"h:mm:ss a v"} + hmv{"h:mm a v"} ms{"mm:ss"} y{"y"} yM{"MM-y"} @@ -546,97 +558,97 @@ ia{ } intervalFormats{ H{ - H{"HH – HH"} + H{"HH – HH"} } Hm{ - H{"HH:mm – HH:mm"} - m{"HH:mm – HH:mm"} + H{"HH:mm – HH:mm"} + m{"HH:mm – HH:mm"} } Hmv{ - H{"HH:mm – HH:mm v"} - m{"HH:mm – HH:mm v"} + H{"HH:mm – HH:mm v"} + m{"HH:mm – HH:mm v"} } Hv{ - H{"HH – HH v"} + H{"HH – HH v"} } M{ - M{"MM – MM"} + M{"MM – MM"} } MEd{ - M{"E MM-dd – E MM-dd"} - d{"E MM-dd – E MM-dd"} + M{"E MM-dd – E MM-dd"} + d{"E MM-dd – E MM-dd"} } MMM{ - M{"MMM – MMM"} + M{"MMM – MMM"} } MMMEd{ - M{"E d MMM – E d MMM"} - d{"E d MMM – E d MMM"} + M{"E d MMM – E d MMM"} + d{"E d MMM – E d MMM"} } MMMd{ - M{"d MMM – d MMM"} - d{"d – d MMM"} + M{"d MMM – d MMM"} + d{"d – d MMM"} } Md{ - M{"MM-dd – MM-dd"} - d{"MM-dd – MM-dd"} + M{"MM-dd – MM-dd"} + d{"MM-dd – MM-dd"} } d{ - d{"d – d"} + d{"d – d"} } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h – h a"} + a{"h a – h a"} + h{"h – h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm – h:mm a"} - m{"h:mm – h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm – h:mm a"} + m{"h:mm – h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm – h:mm a v"} - m{"h:mm – h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm – h:mm a v"} + m{"h:mm – h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h – h a v"} + a{"h a – h a v"} + h{"h – h a v"} } y{ - y{"y – y"} + y{"y – y"} } yM{ - M{"MM-y – MM-y"} - y{"MM-y – MM-y"} + M{"MM-y – MM-y"} + y{"MM-y – MM-y"} } yMEd{ - M{"E dd-MM-y – E dd-MM-y"} - d{"E dd-MM-y – E dd-MM-y"} - y{"E dd-MM-y – E dd-MM-y"} + M{"E dd-MM-y – E dd-MM-y"} + d{"E dd-MM-y – E dd-MM-y"} + y{"E dd-MM-y – E dd-MM-y"} } yMMM{ - M{"MMM – MMM y"} - y{"MMM y – MMM y"} + M{"MMM – MMM y"} + y{"MMM y – MMM y"} } yMMMEd{ - M{"E d MMM – E d MMM y"} - d{"E d MMM – E d MMM y"} - y{"E d MMM y – E d MMM y"} + M{"E d MMM – E d MMM y"} + d{"E d MMM – E d MMM y"} + y{"E d MMM y – E d MMM y"} } yMMMM{ - M{"MMMM – MMMM y"} - y{"MMMM y – MMMM y"} + M{"MMMM – MMMM y"} + y{"MMMM y – MMMM y"} } yMMMd{ - M{"d MMM – d MMM y"} - d{"d – d MMM y"} - y{"d MMM y – d MMM y"} + M{"d MMM – d MMM y"} + d{"d – d MMM y"} + y{"d MMM y – d MMM y"} } yMd{ - M{"dd-MM-y – dd-MM-y"} - d{"dd-MM-y – dd-MM-y"} - y{"dd-MM-y – dd-MM-y"} + M{"dd-MM-y – dd-MM-y"} + d{"dd-MM-y – dd-MM-y"} + y{"dd-MM-y – dd-MM-y"} } } monthNames{ diff --git a/icu4c/source/data/locales/id.txt b/icu4c/source/data/locales/id.txt index d2f5fbe483c5..1a1ef7b028e9 100644 --- a/icu4c/source/data/locales/id.txt +++ b/icu4c/source/data/locales/id.txt @@ -195,6 +195,12 @@ id{ "d MMM y G", "d/M/y GGGGG", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{1} 'pukul' {0}", "{1} 'pukul' {0}", "{1}, {0}", @@ -246,94 +252,94 @@ id{ } intervalFormats{ H{ - H{"HH – HH"} + H{"HH – HH"} } Hm{ - H{"HH.mm – HH.mm"} - m{"HH.mm – HH.mm"} + H{"HH.mm – HH.mm"} + m{"HH.mm – HH.mm"} } Hmv{ - H{"HH.mm – HH.mm v"} - m{"HH.mm – HH.mm v"} + H{"HH.mm – HH.mm v"} + m{"HH.mm – HH.mm v"} } Hv{ - H{"HH – HH v"} + H{"HH – HH v"} } M{ - M{"M – M"} + M{"M – M"} } MEd{ - M{"E, d/M – E, d/M"} - d{"E, d/M – E, d/M"} + M{"E, d/M – E, d/M"} + d{"E, d/M – E, d/M"} } MMM{ - M{"MMM – MMM"} + M{"MMM – MMM"} } MMMEd{ - M{"E, d MMM – E, d MMM"} - d{"E, d MMM – E, d MMM"} + M{"E, d MMM – E, d MMM"} + d{"E, d MMM – E, d MMM"} } MMMd{ - M{"d MMM – d MMM"} - d{"d – d MMM"} + M{"d MMM – d MMM"} + d{"d – d MMM"} } Md{ - M{"d/M – d/M"} - d{"d/M – d/M"} + M{"d/M – d/M"} + d{"d/M – d/M"} } d{ - d{"d – d"} + d{"d – d"} } h{ - h{"h – h a"} + h{"h – h a"} } hm{ - a{"h.mm a – h.mm a"} - h{"h.mm – h.mm a"} - m{"h.mm – h.mm a"} + a{"h.mm a – h.mm a"} + h{"h.mm – h.mm a"} + m{"h.mm – h.mm a"} } hmv{ - a{"h.mm a – h.mm a v"} - h{"h.mm – h.mm a v"} - m{"h.mm – h.mm a v"} + a{"h.mm a – h.mm a v"} + h{"h.mm – h.mm a v"} + m{"h.mm – h.mm a v"} } hv{ - h{"h – h a v"} + h{"h – h a v"} } y{ - y{"y – y G"} + y{"y – y G"} } yM{ - M{"M/y – M/y GGGGG"} - y{"M/y – M/y GGGGG"} + M{"M/y – M/y GGGGG"} + y{"M/y – M/y GGGGG"} } yMEd{ - M{"E, d/M/y – E, d/M/y GGGGG"} - d{"E, d/M/y – E, d/M/y GGGGG"} - y{"E, d/M/y – E, d/M/y GGGGG"} + M{"E, d/M/y – E, d/M/y GGGGG"} + d{"E, d/M/y – E, d/M/y GGGGG"} + y{"E, d/M/y – E, d/M/y GGGGG"} } yMMM{ - M{"MMM – MMM y G"} - y{"MMM y – MMM y G"} + M{"MMM – MMM y G"} + y{"MMM y – MMM y G"} } yMMMEd{ - M{"E, d MMM – E, d MMM y G"} - d{"E, d MMM – E, d MMM y G"} - y{"E, d MMM y – E, d MMM y G"} + M{"E, d MMM – E, d MMM y G"} + d{"E, d MMM – E, d MMM y G"} + y{"E, d MMM y – E, d MMM y G"} } yMMMM{ - M{"MMMM – MMMM y G"} - y{"MMMM y – MMMM y G"} + M{"MMMM – MMMM y G"} + y{"MMMM y – MMMM y G"} } yMMMd{ - M{"d MMM – d MMM y G"} - d{"d – d MMM y G"} - y{"d MMM y – d MMM y G"} + M{"d MMM – d MMM y G"} + d{"d – d MMM y G"} + y{"d MMM y – d MMM y G"} } yMd{ - M{"d/M/y – d/M/y GGGGG"} - d{"d/M/y – d/M/y GGGGG"} - y{"d/M/y – d/M/y GGGGG"} + M{"d/M/y – d/M/y GGGGG"} + d{"d/M/y – d/M/y GGGGG"} + y{"d/M/y – d/M/y GGGGG"} } } } @@ -529,6 +535,12 @@ id{ "d MMM y G", "dd/MM/yy GGGGG", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{1} 'pukul' {0}", "{1} 'pukul' {0}", "{1}, {0}", @@ -554,8 +566,8 @@ id{ EHm{"E HH.mm"} EHms{"E HH.mm.ss"} Ed{"E, d"} - Ehm{"E h.mm a"} - Ehms{"E h.mm.ss a"} + Ehm{"E h.mm a"} + Ehms{"E h.mm.ss a"} Gy{"y G"} GyMMM{"MMM y G"} GyMMMEd{"E, d MMM y G"} @@ -573,9 +585,9 @@ id{ MMMd{"d MMM"} Md{"d/M"} d{"d"} - h{"h a"} - hm{"h.mm a"} - hms{"h.mm.ss a"} + h{"h a"} + hm{"h.mm a"} + hms{"h.mm.ss a"} ms{"mm.ss"} y{"y G"} yyyy{"y G"} @@ -591,53 +603,53 @@ id{ } intervalFormats{ Bh{ - h{"h – h B"} + h{"h – h B"} } Bhm{ - B{"h.mm B – h.mm B"} - h{"h.mm – h.mm B"} - m{"h.mm – h.mm B"} + B{"h.mm B – h.mm B"} + h{"h.mm – h.mm B"} + m{"h.mm – h.mm B"} } Gy{ - G{"y G – y G"} - y{"y – y G"} + G{"y G – y G"} + y{"y – y G"} } GyM{ - G{"M/y GGGGG – M/y GGGGG"} - M{"M/y – M/y GGGGG"} - y{"M/y – M/y GGGGG"} + G{"M/y GGGGG – M/y GGGGG"} + M{"M/y – M/y GGGGG"} + y{"M/y – M/y GGGGG"} } GyMEd{ - G{"E, d/M/y GGGGG – E, d/M/y GGGGG"} - M{"E, d/M/y – E, d/M/y GGGGG"} - d{"E, d/M/y – E, d/M/y GGGGG"} - y{"E, d/M/y – E, d/M/y GGGGG"} + G{"E, d/M/y GGGGG – E, d/M/y GGGGG"} + M{"E, d/M/y – E, d/M/y GGGGG"} + d{"E, d/M/y – E, d/M/y GGGGG"} + y{"E, d/M/y – E, d/M/y GGGGG"} } GyMMM{ - G{"MMM y G – MMM y G"} - M{"MMM – MMM y G"} - y{"MMM y – MMM y G"} + G{"MMM y G – MMM y G"} + M{"MMM – MMM y G"} + y{"MMM y – MMM y G"} } GyMMMEd{ - G{"E, d MMM y G – E, d MMM y G"} - M{"E, d MMM – E, d MMM y G"} - d{"E, d MMM – E, d MMM y G"} - y{"E, d MMM y – E, d MMM y G"} + G{"E, d MMM y G – E, d MMM y G"} + M{"E, d MMM – E, d MMM y G"} + d{"E, d MMM – E, d MMM y G"} + y{"E, d MMM y – E, d MMM y G"} } GyMMMd{ - G{"d MMM y G – d MMM y G"} - M{"d MMM – d MMM y G"} - d{"d – d MMM y G"} - y{"d MMM y – d MMM y G"} + G{"d MMM y G – d MMM y G"} + M{"d MMM – d MMM y G"} + d{"d – d MMM y G"} + y{"d MMM y – d MMM y G"} } GyMd{ - G{"d/M/y GGGGG – d/M/y GGGGG"} - M{"d/M/y – d/M/y GGGGG"} - d{"d/M/y – d/M/y GGGGG"} - y{"d/M/y – d/M/y GGGGG"} + G{"d/M/y GGGGG – d/M/y GGGGG"} + M{"d/M/y – d/M/y GGGGG"} + d{"d/M/y – d/M/y GGGGG"} + y{"d/M/y – d/M/y GGGGG"} } H{ - H{"HH – HH"} + H{"HH – HH"} } Hm{ H{"HH.mm–HH.mm"} @@ -648,84 +660,84 @@ id{ m{"HH.mm–HH.mm v"} } Hv{ - H{"HH – HH v"} + H{"HH – HH v"} } M{ M{"M–M"} } MEd{ - M{"E, d/M – E, d/M"} - d{"E, d/M – E, d/M"} + M{"E, d/M – E, d/M"} + d{"E, d/M – E, d/M"} } MMM{ M{"MMM–MMM"} } MMMEd{ - M{"E, d MMM – E, d MMM"} - d{"E, d MMM – E, d MMM"} + M{"E, d MMM – E, d MMM"} + d{"E, d MMM – E, d MMM"} } MMMd{ - M{"d MMM – d MMM"} + M{"d MMM – d MMM"} d{"d–d MMM"} } Md{ - M{"d/M – d/M"} - d{"d/M – d/M"} + M{"d/M – d/M"} + d{"d/M – d/M"} } d{ d{"d–d"} } fallback{"{0} – {1}"} h{ - h{"h – h a"} + h{"h – h a"} } hm{ - a{"h.mm a – h.mm a"} - h{"h.mm–h.mm a"} - m{"h.mm–h.mm a"} + a{"h.mm a – h.mm a"} + h{"h.mm–h.mm a"} + m{"h.mm–h.mm a"} } hmv{ - a{"h.mm a – h.mm a v"} - h{"h.mm–h.mm a v"} - m{"h.mm–h.mm a v"} + a{"h.mm a – h.mm a v"} + h{"h.mm–h.mm a v"} + m{"h.mm–h.mm a v"} } hv{ - h{"h – h a v"} + h{"h – h a v"} } y{ y{"y–y G"} } yM{ - M{"M/y – M/y GGGGG"} - y{"M/y – M/y GGGGG"} + M{"M/y – M/y GGGGG"} + y{"M/y – M/y GGGGG"} } yMEd{ - M{"E, d/M/y – E, d/M/y GGGGG"} - d{"E, d/M/y – E, d/M/y GGGGG"} - y{"E, d/M/y – E, d/M/y GGGGG"} + M{"E, d/M/y – E, d/M/y GGGGG"} + d{"E, d/M/y – E, d/M/y GGGGG"} + y{"E, d/M/y – E, d/M/y GGGGG"} } yMMM{ M{"MMM–MMM y G"} - y{"MMM y – MMM y G"} + y{"MMM y – MMM y G"} } yMMMEd{ - M{"E, d MMM – E, d MMM y G"} - d{"E, d MMM – E, d MMM y G"} - y{"E, d MMM y – E, d MMM y G"} + M{"E, d MMM – E, d MMM y G"} + d{"E, d MMM – E, d MMM y G"} + y{"E, d MMM y – E, d MMM y G"} } yMMMM{ - M{"MMMM – MMMM y G"} - y{"MMMM y – MMMM y G"} + M{"MMMM – MMMM y G"} + y{"MMMM y – MMMM y G"} } yMMMd{ - M{"d MMM – d MMM y G"} + M{"d MMM – d MMM y G"} d{"d–d MMM y G"} - y{"d MMM y – d MMM y G"} + y{"d MMM y – d MMM y G"} } yMd{ - M{"d/M/y – d/M/y GGGGG"} - d{"d/M/y – d/M/y GGGGG"} - y{"d/M/y – d/M/y GGGGG"} + M{"d/M/y – d/M/y GGGGG"} + d{"d/M/y – d/M/y GGGGG"} + y{"d/M/y – d/M/y GGGGG"} } } } @@ -780,8 +792,8 @@ id{ EHm{"E HH.mm"} EHms{"E HH.mm.ss"} Ed{"E, d"} - Ehm{"E h.mm a"} - Ehms{"E h.mm.ss a"} + Ehm{"E h.mm a"} + Ehms{"E h.mm.ss a"} Gy{"y G"} GyMMM{"MMM y G"} GyMMMEd{"E, d MMM y G"} @@ -804,11 +816,11 @@ id{ MMMd{"d MMM"} Md{"d/M"} d{"d"} - h{"h a"} - hm{"h.mm a"} - hms{"h.mm.ss a"} + h{"h a"} + hm{"h.mm a"} + hms{"h.mm.ss a"} hmsv{"h.mm.ss. a v"} - hmv{"h.mm a v"} + hmv{"h.mm a v"} ms{"mm.ss"} y{"y"} yM{"M/y"} @@ -986,50 +998,50 @@ id{ } intervalFormats{ Bh{ - h{"h – h B"} + h{"h – h B"} } Bhm{ - B{"h.mm B – h.mm B"} - h{"h.mm – h.mm B"} - m{"h.mm – h.mm B"} + B{"h.mm B – h.mm B"} + h{"h.mm – h.mm B"} + m{"h.mm – h.mm B"} } Gy{ - G{"y G – y G"} - y{"y – y G"} + G{"y G – y G"} + y{"y – y G"} } GyM{ - G{"M/y GGGGG – M/y GGGGG"} - M{"M/y – M/y GGGGG"} - y{"M/y – M/y GGGGG"} + G{"M/y GGGGG – M/y GGGGG"} + M{"M/y – M/y GGGGG"} + y{"M/y – M/y GGGGG"} } GyMEd{ - G{"E, d/M/y GGGGG – E, d/M/y GGGGG"} - M{"E, d/M/y – E, d/M/y GGGGG"} - d{"E, d/M/y – E, d/M/y GGGGG"} - y{"E, d/M/y – E, d/M/y GGGGG"} + G{"E, d/M/y GGGGG – E, d/M/y GGGGG"} + M{"E, d/M/y – E, d/M/y GGGGG"} + d{"E, d/M/y – E, d/M/y GGGGG"} + y{"E, d/M/y – E, d/M/y GGGGG"} } GyMMM{ - G{"MMM y G – MMM y G"} - M{"MMM – MMM y G"} - y{"MMM y – MMM y G"} + G{"MMM y G – MMM y G"} + M{"MMM – MMM y G"} + y{"MMM y – MMM y G"} } GyMMMEd{ - G{"E, d MMM y G – E, d MMM y G"} - M{"E, d MMM – E, d MMM y G"} - d{"E, d MMM – E, d MMM y G"} - y{"E, d MMM y – E, d MMM y G"} + G{"E, d MMM y G – E, d MMM y G"} + M{"E, d MMM – E, d MMM y G"} + d{"E, d MMM – E, d MMM y G"} + y{"E, d MMM y – E, d MMM y G"} } GyMMMd{ - G{"d MMM y G – d MMM y G"} - M{"d MMM – d MMM y G"} - d{"d – d MMM y G"} - y{"d MMM y – d MMM y G"} + G{"d MMM y G – d MMM y G"} + M{"d MMM – d MMM y G"} + d{"d – d MMM y G"} + y{"d MMM y – d MMM y G"} } GyMd{ - G{"d/M/y GGGGG – d/M/y GGGGG"} - M{"d/M/y – d/M/y GGGGG"} - d{"d/M/y – d/M/y GGGGG"} - y{"d/M/y – d/M/y GGGGG"} + G{"d/M/y GGGGG – d/M/y GGGGG"} + M{"d/M/y – d/M/y GGGGG"} + d{"d/M/y – d/M/y GGGGG"} + y{"d/M/y – d/M/y GGGGG"} } H{ H{"HH–HH"} @@ -1049,80 +1061,80 @@ id{ M{"M–M"} } MEd{ - M{"E, d/M – E, d/M"} - d{"E, d/M – E, d/M"} + M{"E, d/M – E, d/M"} + d{"E, d/M – E, d/M"} } MMM{ M{"MMM–MMM"} } MMMEd{ - M{"E, d MMM – E, d MMM"} - d{"E, d MMM – E, d MMM"} + M{"E, d MMM – E, d MMM"} + d{"E, d MMM – E, d MMM"} } MMMd{ - M{"d MMM – d MMM"} + M{"d MMM – d MMM"} d{"d–d MMM"} } Md{ - M{"d/M – d/M"} - d{"d/M – d/M"} + M{"d/M – d/M"} + d{"d/M – d/M"} } d{ d{"d–d"} } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h.mm a – h.mm a"} - h{"h.mm–h.mm a"} - m{"h.mm–h.mm a"} + a{"h.mm a – h.mm a"} + h{"h.mm–h.mm a"} + m{"h.mm–h.mm a"} } hmv{ - a{"h.mm a – h.mm a v"} - h{"h.mm–h.mm a v"} - m{"h.mm–h.mm a v"} + a{"h.mm a – h.mm a v"} + h{"h.mm–h.mm a v"} + m{"h.mm–h.mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ - y{"y – y"} + y{"y – y"} } yM{ - M{"M/y – M/y"} - y{"M/y – M/y"} + M{"M/y – M/y"} + y{"M/y – M/y"} } yMEd{ - M{"E, d/M/y – E, d/M/y"} - d{"E, d/M/y – E, d/M/y"} - y{"E, d/M/y – E, d/M/y"} + M{"E, d/M/y – E, d/M/y"} + d{"E, d/M/y – E, d/M/y"} + y{"E, d/M/y – E, d/M/y"} } yMMM{ M{"MMM–MMM y"} - y{"MMM y – MMM y"} + y{"MMM y – MMM y"} } yMMMEd{ - M{"E, d MMM – E, d MMM y"} - d{"E, d MMM – E, d MMM y"} - y{"E, d MMM y – E, d MMM y"} + M{"E, d MMM – E, d MMM y"} + d{"E, d MMM – E, d MMM y"} + y{"E, d MMM y – E, d MMM y"} } yMMMM{ M{"MMMM–MMMM y"} - y{"MMMM y – MMMM y"} + y{"MMMM y – MMMM y"} } yMMMd{ - M{"d MMM – d MMM y"} + M{"d MMM – d MMM y"} d{"d–d MMM y"} - y{"d MMM y – d MMM y"} + y{"d MMM y – d MMM y"} } yMd{ - M{"d/M/y – d/M/y"} - d{"d/M/y – d/M/y"} - y{"d/M/y – d/M/y"} + M{"d/M/y – d/M/y"} + d{"d/M/y – d/M/y"} + y{"d/M/y – d/M/y"} } } monthNames{ @@ -1282,6 +1294,12 @@ id{ "d MMM y G", "d/M/y GGGGG", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{1} 'pukul' {0}", "{1} 'pukul' {0}", "{1}, {0}", @@ -1347,94 +1365,94 @@ id{ } intervalFormats{ H{ - H{"HH – HH"} + H{"HH – HH"} } Hm{ - H{"HH.mm – HH.mm"} - m{"HH.mm – HH.mm"} + H{"HH.mm – HH.mm"} + m{"HH.mm – HH.mm"} } Hmv{ - H{"HH.mm – HH.mm v"} - m{"HH.mm – HH.mm v"} + H{"HH.mm – HH.mm v"} + m{"HH.mm – HH.mm v"} } Hv{ - H{"HH – HH v"} + H{"HH – HH v"} } M{ - M{"M – M"} + M{"M – M"} } MEd{ - M{"E, d/M – E, d/M"} - d{"E, d/M – E, d/M"} + M{"E, d/M – E, d/M"} + d{"E, d/M – E, d/M"} } MMM{ - M{"MMM – MMM"} + M{"MMM – MMM"} } MMMEd{ - M{"E, d MMM – E, d MMM"} - d{"E, d MMM – E, d MMM"} + M{"E, d MMM – E, d MMM"} + d{"E, d MMM – E, d MMM"} } MMMd{ - M{"d MMM – d MMM"} - d{"d – d MMM"} + M{"d MMM – d MMM"} + d{"d – d MMM"} } Md{ - M{"d/M – d/M"} - d{"d/M – d/M"} + M{"d/M – d/M"} + d{"d/M – d/M"} } d{ - d{"d – d"} + d{"d – d"} } h{ - h{"h – h a"} + h{"h – h a"} } hm{ - a{"h.mm a – h.mm a"} - h{"h.mm – h.mm a"} - m{"h.mm – h.mm a"} + a{"h.mm a – h.mm a"} + h{"h.mm – h.mm a"} + m{"h.mm – h.mm a"} } hmv{ - a{"h.mm a – h.mm a v"} - h{"h.mm – h.mm a v"} - m{"h.mm – h.mm a v"} + a{"h.mm a – h.mm a v"} + h{"h.mm – h.mm a v"} + m{"h.mm – h.mm a v"} } hv{ - h{"h – h a v"} + h{"h – h a v"} } y{ - y{"y – y G"} + y{"y – y G"} } yM{ - M{"M/y – M/y GGGGG"} - y{"M/y – M/y GGGGG"} + M{"M/y – M/y GGGGG"} + y{"M/y – M/y GGGGG"} } yMEd{ - M{"E, d/M/y – E, d/M/y GGGGG"} - d{"E, d/M/y – E, d/M/y GGGGG"} - y{"E, d/M/y – E, d/M/y GGGGG"} + M{"E, d/M/y – E, d/M/y GGGGG"} + d{"E, d/M/y – E, d/M/y GGGGG"} + y{"E, d/M/y – E, d/M/y GGGGG"} } yMMM{ - M{"MMM – MMM y G"} - y{"MMM y – MMM y G"} + M{"MMM – MMM y G"} + y{"MMM y – MMM y G"} } yMMMEd{ - M{"E, d MMM – E, d MMM y G"} - d{"E, d MMM – E, d MMM y G"} - y{"E, d MMM y – E, d MMM y G"} + M{"E, d MMM – E, d MMM y G"} + d{"E, d MMM – E, d MMM y G"} + y{"E, d MMM y – E, d MMM y G"} } yMMMM{ - M{"MMMM – MMMM y G"} - y{"MMMM y – MMMM y G"} + M{"MMMM – MMMM y G"} + y{"MMMM y – MMMM y G"} } yMMMd{ - M{"d MMM – d MMM y G"} - d{"d – d MMM y G"} - y{"d MMM y – d MMM y G"} + M{"d MMM – d MMM y G"} + d{"d – d MMM y G"} + y{"d MMM y – d MMM y G"} } yMd{ - M{"d/M/y – d/M/y GGGGG"} - d{"d/M/y – d/M/y GGGGG"} - y{"d/M/y – d/M/y GGGGG"} + M{"d/M/y – d/M/y GGGGG"} + d{"d/M/y – d/M/y GGGGG"} + y{"d/M/y – d/M/y GGGGG"} } } monthNames{ @@ -1511,8 +1529,8 @@ id{ "d MMM y G", "d/M/y GGGGG", "{1}, {0}", - "{1} 'pukul' {0}", - "{1} 'pukul' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } @@ -1787,8 +1805,8 @@ id{ "d MMM y G", "d/M/y GGGGG", "{1}, {0}", - "{1} 'pukul' {0}", - "{1} 'pukul' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } diff --git a/icu4c/source/data/locales/ig.txt b/icu4c/source/data/locales/ig.txt index c587f4b70661..b2fde686f1a4 100644 --- a/icu4c/source/data/locales/ig.txt +++ b/icu4c/source/data/locales/ig.txt @@ -154,6 +154,12 @@ ig{ "d MMM y G", "dd/MM/y GGGGG", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{1} 'na' {0}", "{1} 'na' {0}", "{1}, {0}", @@ -181,7 +187,7 @@ ig{ MMMd{"MMM d"} Md{"M/d"} d{"d"} - hm{"h:mm a"} + hm{"h:mm a"} ms{"mm:ss"} y{"y"} yM{"M/y"} @@ -216,6 +222,12 @@ ig{ "d MMM y", "d/M/yy", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{1} 'na' {0}", "{1} 'na' {0}", "{1}, {0}", @@ -381,79 +393,79 @@ ig{ M{"MM–MM"} } MEd{ - M{"MM-dd, E – MM-dd, E"} - d{"E, MM/dd – E, MM/dd"} + M{"MM-dd, E – MM-dd, E"} + d{"E, MM/dd – E, MM/dd"} } MMM{ M{"LLL–LLL"} } MMMEd{ - M{"MMM d, E – MMM d, E"} - d{"MMM d, E – MMM d, E"} + M{"MMM d, E – MMM d, E"} + d{"MMM d, E – MMM d, E"} } MMMd{ - M{"MMM d – MMM d"} + M{"MMM d – MMM d"} d{"MMM d–d"} } Md{ - M{"MM/dd – MM/dd"} - d{"MM/dd – MM/dd"} + M{"MM/dd – MM/dd"} + d{"MM/dd – MM/dd"} } d{ d{"d–d"} } h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y"} } yM{ - M{"MM/y – MM/y"} - y{"y-MM – y-MM"} + M{"MM/y – MM/y"} + y{"y-MM – y-MM"} } yMEd{ - M{"y-MM-dd, E – y-MM-dd, E"} - d{"y-MM-dd, E – y-MM-dd, E"} - y{"y-MM-dd, E – y-MM-dd, E"} + M{"y-MM-dd, E – y-MM-dd, E"} + d{"y-MM-dd, E – y-MM-dd, E"} + y{"y-MM-dd, E – y-MM-dd, E"} } yMMM{ M{"y MMM–MMM"} - y{"y MMM – y MMM"} + y{"y MMM – y MMM"} } yMMMEd{ - M{"y MMM d, E – MMM d, E"} - d{"y MMM d, E – MMM d, E"} - y{"y MMM d, E – y MMM d, E"} + M{"y MMM d, E – MMM d, E"} + d{"y MMM d, E – MMM d, E"} + y{"y MMM d, E – y MMM d, E"} } yMMMM{ M{"y MMMM–MMMM"} - y{"y MMMM – y MMMM"} + y{"y MMMM – y MMMM"} } yMMMd{ - M{"y MMM d – MMM d"} + M{"y MMM d – MMM d"} d{"y MMM d–d"} - y{"y MMM d – y MMM d"} + y{"y MMM d – y MMM d"} } yMd{ - M{"y-MM-dd – y-MM-dd"} - d{"y-MM-dd – y-MM-dd"} - y{"y-MM-dd – y-MM-dd"} + M{"y-MM-dd – y-MM-dd"} + d{"y-MM-dd – y-MM-dd"} + y{"y-MM-dd – y-MM-dd"} } } monthNames{ diff --git a/icu4c/source/data/locales/is.txt b/icu4c/source/data/locales/is.txt index cf14c11e52ab..ac0c18417dad 100644 --- a/icu4c/source/data/locales/is.txt +++ b/icu4c/source/data/locales/is.txt @@ -245,6 +245,12 @@ is{ "d.M.y G", "d.M.y GGGGG", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{1} 'kl'. {0}", "{1} 'kl'. {0}", "{1}, {0}", @@ -325,14 +331,14 @@ is{ M{"MMM–MMM"} } MMMEd{ - M{"E, d. MMM – E, d. MMM"} + M{"E, d. MMM – E, d. MMM"} d{"E, d. – E, d. MMM"} } MMMM{ M{"MMMM–MMMM"} } MMMd{ - M{"d. MMM – d. MMM"} + M{"d. MMM – d. MMM"} d{"d.–d. MMM"} } Md{ @@ -344,22 +350,22 @@ is{ } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y G"} @@ -371,25 +377,25 @@ is{ yMEd{ M{"E, d.M. – E, d.M.y G"} d{"E, d. – E, d.M.y G"} - y{"E, d.M.y – E, d.M.y G"} + y{"E, d.M.y – E, d.M.y G"} } yMMM{ M{"MMM–MMM y G"} - y{"MMM y – MMM y G"} + y{"MMM y – MMM y G"} } yMMMEd{ - M{"E, d. MMM – E, d. MMM y G"} + M{"E, d. MMM – E, d. MMM y G"} d{"E, d. – E, d. MMM y G"} - y{"E, d. MMM y – E, d. MMM y G"} + y{"E, d. MMM y – E, d. MMM y G"} } yMMMM{ M{"MMMM–MMMM y G"} - y{"MMMM y – MMMM y G"} + y{"MMMM y – MMMM y G"} } yMMMd{ - M{"d. MMM – d. MMM y G"} + M{"d. MMM – d. MMM y G"} d{"d.–d. MMM y G"} - y{"d. MMM y – d. MMM y G"} + y{"d. MMM y – d. MMM y G"} } yMd{ M{"d.M.–d.M.y G"} @@ -409,6 +415,12 @@ is{ "d.M.y G", "d.M.y GGGGG", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{1} 'kl'. {0}", "{1} 'kl'. {0}", "{1}, {0}", @@ -492,14 +504,14 @@ is{ M{"MMM–MMM"} } MMMEd{ - M{"E, d. MMM – E, d. MMM"} + M{"E, d. MMM – E, d. MMM"} d{"E, d. – E, d. MMM"} } MMMM{ M{"MMMM–MMMM"} } MMMd{ - M{"d. MMM – d. MMM"} + M{"d. MMM – d. MMM"} d{"d.–d. MMM"} } Md{ @@ -511,22 +523,22 @@ is{ } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y G"} @@ -538,25 +550,25 @@ is{ yMEd{ M{"E, d.M. – E, d.M.y G"} d{"E, d. – E, d.M.y G"} - y{"E, d.M.y – E, d.M.y G"} + y{"E, d.M.y – E, d.M.y G"} } yMMM{ M{"MMM–MMM y G"} - y{"MMM y – MMM y G"} + y{"MMM y – MMM y G"} } yMMMEd{ - M{"E, d. MMM – E, d. MMM y G"} + M{"E, d. MMM – E, d. MMM y G"} d{"E, d. – E, d. MMM y G"} - y{"E, d. MMM y – E, d. MMM y G"} + y{"E, d. MMM y – E, d. MMM y G"} } yMMMM{ M{"MMMM–MMMM y G"} - y{"MMMM y – MMMM y G"} + y{"MMMM y – MMMM y G"} } yMMMd{ - M{"d. MMM – d. MMM y G"} + M{"d. MMM – d. MMM y G"} d{"d.–d. MMM y G"} - y{"d. MMM y – d. MMM y G"} + y{"d. MMM y – d. MMM y G"} } yMd{ M{"d.M.–d.M.y G"} @@ -672,6 +684,12 @@ is{ "d.M.y G", "d.M.y GGGGG", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{1} 'kl'. {0}", "{1} 'kl'. {0}", "{1}, {0}", @@ -755,14 +773,14 @@ is{ M{"MMM–MMM"} } MMMEd{ - M{"E, d. MMM – E, d. MMM"} + M{"E, d. MMM – E, d. MMM"} d{"E, d. – E, d. MMM"} } MMMM{ M{"MMMM–MMMM"} } MMMd{ - M{"d. MMM – d. MMM"} + M{"d. MMM – d. MMM"} d{"d.–d. MMM"} } Md{ @@ -774,22 +792,22 @@ is{ } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y G"} @@ -801,25 +819,25 @@ is{ yMEd{ M{"E, d.M. – E, d.M.y G"} d{"E, d. – E, d.M.y G"} - y{"E, d.M.y – E, d.M.y G"} + y{"E, d.M.y – E, d.M.y G"} } yMMM{ M{"MMM–MMM y G"} - y{"MMM y – MMM y G"} + y{"MMM y – MMM y G"} } yMMMEd{ - M{"E, d. MMM – E, d. MMM y G"} + M{"E, d. MMM – E, d. MMM y G"} d{"E, d. – E, d. MMM y G"} - y{"E, d. MMM y – E, d. MMM y G"} + y{"E, d. MMM y – E, d. MMM y G"} } yMMMM{ M{"MMMM–MMMM y G"} - y{"MMMM y – MMMM y G"} + y{"MMMM y – MMMM y G"} } yMMMd{ - M{"d. MMM – d. MMM y G"} + M{"d. MMM – d. MMM y G"} d{"d.–d. MMM y G"} - y{"d. MMM y – d. MMM y G"} + y{"d. MMM y – d. MMM y G"} } yMd{ M{"d.M.–d.M.y G"} @@ -948,6 +966,12 @@ is{ "d.M.y G", "d.M.y GGGGG", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{1} 'kl'. {0}", "{1} 'kl'. {0}", "{1}, {0}", @@ -973,8 +997,8 @@ is{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"E d."} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"y G"} GyMMM{"MMM y G"} GyMMMEd{"E, d. MMM y G"} @@ -992,9 +1016,9 @@ is{ MMMd{"d. MMM"} Md{"d.M."} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"mm:ss"} y{"y G"} yyyy{"y G"} @@ -1010,42 +1034,42 @@ is{ } intervalFormats{ Gy{ - G{"y G – y G"} + G{"y G – y G"} y{"y–y G"} } GyM{ - G{"MM.y GGGGG – MM.y GGGGG"} + G{"MM.y GGGGG – MM.y GGGGG"} M{"MM.y – MM.y GGGGG"} - y{"MM.y – MM.y GGGGG"} + y{"MM.y – MM.y GGGGG"} } GyMEd{ - G{"E, dd.MM.y GGGGG – E, dd.MM.y GGGGG"} - M{"E, dd.MM.y – E, dd.MM.y GGGGG"} - d{"E, dd.MM.y – E, dd.MM.y GGGGG"} - y{"E, dd.MM.y – E, dd.MM.y GGGGG"} + G{"E, dd.MM.y GGGGG – E, dd.MM.y GGGGG"} + M{"E, dd.MM.y – E, dd.MM.y GGGGG"} + d{"E, dd.MM.y – E, dd.MM.y GGGGG"} + y{"E, dd.MM.y – E, dd.MM.y GGGGG"} } GyMMM{ - G{"MMM y G – MMM y G"} + G{"MMM y G – MMM y G"} M{"MMM–MMM y G"} - y{"MMM y – MMM y G"} + y{"MMM y – MMM y G"} } GyMMMEd{ - G{"E, d. MMM y G – E, d. MMM y G"} - M{"E, d. MMM – E, d. MMM y G"} - d{"E, d. MMM – E, d. MMM y G"} - y{"E, d. MMM y – E, d. MMM y G"} + G{"E, d. MMM y G – E, d. MMM y G"} + M{"E, d. MMM – E, d. MMM y G"} + d{"E, d. MMM – E, d. MMM y G"} + y{"E, d. MMM y – E, d. MMM y G"} } GyMMMd{ - G{"d. MMM y G – d. MMM y G"} - M{"d. MMM – d MMM y G"} + G{"d. MMM y G – d. MMM y G"} + M{"d. MMM – d MMM y G"} d{"d.–d. MMM y G"} - y{"d. MMM y – d. MMM y G"} + y{"d. MMM y – d. MMM y G"} } GyMd{ - G{"dd.MM.y GGGGG – dd.MM.y GGGGG"} - M{"dd.MM.y – dd.MM.y GGGGG"} - d{"dd.MM.y – dd.MM.y GGGGG"} - y{"dd.MM.y – dd.MM.y GGGGG"} + G{"dd.MM.y GGGGG – dd.MM.y GGGGG"} + M{"dd.MM.y – dd.MM.y GGGGG"} + d{"dd.MM.y – dd.MM.y GGGGG"} + y{"dd.MM.y – dd.MM.y GGGGG"} } H{ H{"HH–HH"} @@ -1072,14 +1096,14 @@ is{ M{"MMM–MMM"} } MMMEd{ - M{"E, d. MMM – E, d. MMM"} + M{"E, d. MMM – E, d. MMM"} d{"E, d. – E, d. MMM"} } MMMM{ M{"MMMM–MMMM"} } MMMd{ - M{"d. MMM – d. MMM"} + M{"d. MMM – d. MMM"} d{"d.–d. MMM"} } Md{ @@ -1091,22 +1115,22 @@ is{ } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y G"} @@ -1118,25 +1142,25 @@ is{ yMEd{ M{"E, d.M. – E, d.M.y G"} d{"E, d. – E, d.M.y G"} - y{"E, d.M.y – E, d.M.y G"} + y{"E, d.M.y – E, d.M.y G"} } yMMM{ M{"MMM–MMM y G"} - y{"MMM y – MMM y G"} + y{"MMM y – MMM y G"} } yMMMEd{ - M{"E, d. MMM – E, d. MMM y G"} + M{"E, d. MMM – E, d. MMM y G"} d{"E, d. – E, d. MMM y G"} - y{"E, d. MMM y – E, d. MMM y G"} + y{"E, d. MMM y – E, d. MMM y G"} } yMMMM{ M{"MMMM–MMMM y G"} - y{"MMMM y – MMMM y G"} + y{"MMMM y – MMMM y G"} } yMMMd{ - M{"d. MMM – d. MMM y G"} + M{"d. MMM – d. MMM y G"} d{"d.–d. MMM y G"} - y{"d. MMM y – d. MMM y G"} + y{"d. MMM y – d. MMM y G"} } yMd{ M{"d.M.–d.M.y G"} @@ -1168,6 +1192,12 @@ is{ "d. MMM y", "d.M.y", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{1} 'kl'. {0}", "{1} 'kl'. {0}", "{1}, {0}", @@ -1196,8 +1226,8 @@ is{ EHm{"E, HH:mm"} EHms{"E, HH:mm:ss"} Ed{"E d."} - Ehm{"E, h:mm a"} - Ehms{"E, h:mm:ss a"} + Ehm{"E, h:mm a"} + Ehms{"E, h:mm:ss a"} Gy{"y G"} GyMMM{"MMM y G"} GyMMMEd{"E, d. MMM y G"} @@ -1221,11 +1251,11 @@ is{ MMMd{"d. MMM"} Md{"d.M."} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} - hmsv{"h:mm:ss a v"} - hmv{"h:mm a v"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} + hmsv{"h:mm:ss a v"} + hmv{"h:mm a v"} ms{"mm:ss"} y{"y"} yM{"M. y"} @@ -1408,42 +1438,42 @@ is{ } intervalFormats{ Gy{ - G{"y G – y G"} + G{"y G – y G"} y{"y–y G"} } GyM{ - G{"MM.y GGGGG – MM.y GGGGG"} - M{"MM.y – MM.y GGGGG"} - y{"MM.y – MM.y GGGGG"} + G{"MM.y GGGGG – MM.y GGGGG"} + M{"MM.y – MM.y GGGGG"} + y{"MM.y – MM.y GGGGG"} } GyMEd{ - G{"E, dd.MM.y GGGGG – E, dd.MM.y GGGGG"} - M{"E, dd.MM.y – E, dd.MM.y GGGGG"} - d{"E, dd.MM.y – E, dd.MM.y GGGGG"} - y{"E, dd.MM.y – E, dd.MM.y GGGGG"} + G{"E, dd.MM.y GGGGG – E, dd.MM.y GGGGG"} + M{"E, dd.MM.y – E, dd.MM.y GGGGG"} + d{"E, dd.MM.y – E, dd.MM.y GGGGG"} + y{"E, dd.MM.y – E, dd.MM.y GGGGG"} } GyMMM{ - G{"MMM y G – MMM y G"} + G{"MMM y G – MMM y G"} M{"MMM–MMM y G"} - y{"MMM y – MMM y G"} + y{"MMM y – MMM y G"} } GyMMMEd{ - G{"E, d. MMM y G – E, d. MMM y G"} - M{"E, d. MMM – E, d. MMM y G"} - d{"E, d. MMM – E, d. MMM y G"} - y{"E, d. MMM y – E, d. MMM y G"} + G{"E, d. MMM y G – E, d. MMM y G"} + M{"E, d. MMM – E, d. MMM y G"} + d{"E, d. MMM – E, d. MMM y G"} + y{"E, d. MMM y – E, d. MMM y G"} } GyMMMd{ - G{"d. MMM y G – d. MMM y G"} - M{"d. MMM – d. MMM y G"} + G{"d. MMM y G – d. MMM y G"} + M{"d. MMM – d. MMM y G"} d{"d.–d. MMM y G"} - y{"d. MMM y – d. MMM y G"} + y{"d. MMM y – d. MMM y G"} } GyMd{ - G{"dd.MM.y GGGGG – dd.MM.y GGGGG"} - M{"dd.MM.y – dd.MM.y GGGGG"} - d{"dd.MM.y – dd.MM.y GGGGG"} - y{"dd.MM.y – dd.MM.y GGGGG"} + G{"dd.MM.y GGGGG – dd.MM.y GGGGG"} + M{"dd.MM.y – dd.MM.y GGGGG"} + d{"dd.MM.y – dd.MM.y GGGGG"} + y{"dd.MM.y – dd.MM.y GGGGG"} } H{ H{"HH–HH"} @@ -1470,14 +1500,14 @@ is{ M{"MMM–MMM"} } MMMEd{ - M{"E, d. MMM – E, d. MMM"} + M{"E, d. MMM – E, d. MMM"} d{"E, d. – E, d. MMM"} } MMMM{ M{"LLLL–LLLL"} } MMMd{ - M{"d. MMM – d. MMM"} + M{"d. MMM – d. MMM"} d{"d.–d. MMM"} } Md{ @@ -1489,57 +1519,57 @@ is{ } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y"} } yM{ - M{"M.y – M.y"} - y{"M.y – M.y"} + M{"M.y – M.y"} + y{"M.y – M.y"} } yMEd{ - M{"E, d.M.y – E, d.M.y"} - d{"E, d.M.y – E, d.M.y"} - y{"E, d.M.y – E, d.M.y"} + M{"E, d.M.y – E, d.M.y"} + d{"E, d.M.y – E, d.M.y"} + y{"E, d.M.y – E, d.M.y"} } yMMM{ M{"MMM–MMM y"} - y{"MMM y – MMM y"} + y{"MMM y – MMM y"} } yMMMEd{ - M{"E, d. MMM – E, d. MMM y"} + M{"E, d. MMM – E, d. MMM y"} d{"E, d. – E, d. MMM y"} - y{"E, d. MMM y – E, d. MMM y"} + y{"E, d. MMM y – E, d. MMM y"} } yMMMM{ M{"MMMM–MMMM y"} - y{"MMMM y – MMMM y"} + y{"MMMM y – MMMM y"} } yMMMd{ - M{"d. MMM – d. MMM y"} + M{"d. MMM – d. MMM y"} d{"d.–d. MMM y"} - y{"d. MMM y – d. MMM y"} + y{"d. MMM y – d. MMM y"} } yMd{ - M{"d.M.y – d.M.y"} - d{"d.M.y – d.M.y"} - y{"d.M.y – d.M.y"} + M{"d.M.y – d.M.y"} + d{"d.M.y – d.M.y"} + y{"d.M.y – d.M.y"} } } monthNames{ @@ -1686,6 +1716,12 @@ is{ "d.M.y G", "d.M.y GGGGG", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{1} 'kl'. {0}", "{1} 'kl'. {0}", "{1}, {0}", @@ -1766,14 +1802,14 @@ is{ M{"MMM–MMM"} } MMMEd{ - M{"E, d. MMM – E, d. MMM"} + M{"E, d. MMM – E, d. MMM"} d{"E, d. – E, d. MMM"} } MMMM{ M{"MMMM–MMMM"} } MMMd{ - M{"d. MMM – d. MMM"} + M{"d. MMM – d. MMM"} d{"d.–d. MMM"} } Md{ @@ -1785,22 +1821,22 @@ is{ } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y G"} @@ -1812,25 +1848,25 @@ is{ yMEd{ M{"E, d.M. – E, d.M.y G"} d{"E, d. – E, d.M.y G"} - y{"E, d.M.y – E, d.M.y G"} + y{"E, d.M.y – E, d.M.y G"} } yMMM{ M{"MMM–MMM y G"} - y{"MMM y – MMM y G"} + y{"MMM y – MMM y G"} } yMMMEd{ - M{"E, d. MMM – E, d. MMM y G"} + M{"E, d. MMM – E, d. MMM y G"} d{"E, d. – E, d. MMM y G"} - y{"E, d. MMM y – E, d. MMM y G"} + y{"E, d. MMM y – E, d. MMM y G"} } yMMMM{ M{"MMMM–MMMM y G"} - y{"MMMM y – MMMM y G"} + y{"MMMM y – MMMM y G"} } yMMMd{ - M{"d. MMM – d. MMM y G"} + M{"d. MMM – d. MMM y G"} d{"d.–d. MMM y G"} - y{"d. MMM y – d. MMM y G"} + y{"d. MMM y – d. MMM y G"} } yMd{ M{"d.M.–d.M.y G"} @@ -1952,6 +1988,12 @@ is{ "d.M.y G", "d.M.y GGGGG", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{1} 'kl'. {0}", "{1} 'kl'. {0}", "{1}, {0}", @@ -2032,14 +2074,14 @@ is{ M{"MMM–MMM"} } MMMEd{ - M{"E, d. MMM – E, d. MMM"} + M{"E, d. MMM – E, d. MMM"} d{"E, d. – E, d. MMM"} } MMMM{ M{"MMMM–MMMM"} } MMMd{ - M{"d. MMM – d. MMM"} + M{"d. MMM – d. MMM"} d{"d.–d. MMM"} } Md{ @@ -2051,22 +2093,22 @@ is{ } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y G"} @@ -2078,25 +2120,25 @@ is{ yMEd{ M{"E, d.M. – E, d.M.y G"} d{"E, d. – E, d.M.y G"} - y{"E, d.M.y – E, d.M.y G"} + y{"E, d.M.y – E, d.M.y G"} } yMMM{ M{"MMM–MMM y G"} - y{"MMM y – MMM y G"} + y{"MMM y – MMM y G"} } yMMMEd{ - M{"E, d. MMM – E, d. MMM y G"} + M{"E, d. MMM – E, d. MMM y G"} d{"E, d. – E, d. MMM y G"} - y{"E, d. MMM y – E, d. MMM y G"} + y{"E, d. MMM y – E, d. MMM y G"} } yMMMM{ M{"MMMM–MMMM y G"} - y{"MMMM y – MMMM y G"} + y{"MMMM y – MMMM y G"} } yMMMd{ - M{"d. MMM – d. MMM y G"} + M{"d. MMM – d. MMM y G"} d{"d.–d. MMM y G"} - y{"d. MMM y – d. MMM y G"} + y{"d. MMM y – d. MMM y G"} } yMd{ M{"d.M.–d.M.y G"} @@ -2206,6 +2248,12 @@ is{ "d.M.y G", "d.M.y GGGGG", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{1} 'kl'. {0}", "{1} 'kl'. {0}", "{1}, {0}", @@ -2286,14 +2334,14 @@ is{ M{"MMM–MMM"} } MMMEd{ - M{"E, d. MMM – E, d. MMM"} + M{"E, d. MMM – E, d. MMM"} d{"E, d. – E, d. MMM"} } MMMM{ M{"MMMM–MMMM"} } MMMd{ - M{"d. MMM – d. MMM"} + M{"d. MMM – d. MMM"} d{"d.–d. MMM"} } Md{ @@ -2305,22 +2353,22 @@ is{ } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y G"} @@ -2332,25 +2380,25 @@ is{ yMEd{ M{"E, d.M. – E, d.M.y G"} d{"E, d. – E, d.M.y G"} - y{"E, d.M.y – E, d.M.y G"} + y{"E, d.M.y – E, d.M.y G"} } yMMM{ M{"MMM–MMM y G"} - y{"MMM y – MMM y G"} + y{"MMM y – MMM y G"} } yMMMEd{ - M{"E, d. MMM – E, d. MMM y G"} + M{"E, d. MMM – E, d. MMM y G"} d{"E, d. – E, d. MMM y G"} - y{"E, d. MMM y – E, d. MMM y G"} + y{"E, d. MMM y – E, d. MMM y G"} } yMMMM{ M{"MMMM–MMMM y G"} - y{"MMMM y – MMMM y G"} + y{"MMMM y – MMMM y G"} } yMMMd{ - M{"d. MMM – d. MMM y G"} + M{"d. MMM – d. MMM y G"} d{"d.–d. MMM y G"} - y{"d. MMM y – d. MMM y G"} + y{"d. MMM y – d. MMM y G"} } yMd{ M{"d.M.–d.M.y G"} @@ -2460,6 +2508,12 @@ is{ "d.M.y G", "d.M.y GGGGG", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{1} 'kl'. {0}", "{1} 'kl'. {0}", "{1}, {0}", @@ -2529,14 +2583,14 @@ is{ M{"MMM–MMM"} } MMMEd{ - M{"E, d. MMM – E, d. MMM"} + M{"E, d. MMM – E, d. MMM"} d{"E, d. – E, d. MMM"} } MMMM{ M{"MMMM–MMMM"} } MMMd{ - M{"d. MMM – d. MMM"} + M{"d. MMM – d. MMM"} d{"d.–d. MMM"} } Md{ @@ -2548,22 +2602,22 @@ is{ } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y G"} @@ -2575,25 +2629,25 @@ is{ yMEd{ M{"E, d.M. – E, d.M.y G"} d{"E, d. – E, d.M.y G"} - y{"E, d.M.y – E, d.M.y G"} + y{"E, d.M.y – E, d.M.y G"} } yMMM{ M{"MMM–MMM y G"} - y{"MMM y – MMM y G"} + y{"MMM y – MMM y G"} } yMMMEd{ - M{"E, d. MMM – E, d. MMM y G"} + M{"E, d. MMM – E, d. MMM y G"} d{"E, d. – E, d. MMM y G"} - y{"E, d. MMM y – E, d. MMM y G"} + y{"E, d. MMM y – E, d. MMM y G"} } yMMMM{ M{"MMMM–MMMM y G"} - y{"MMMM y – MMMM y G"} + y{"MMMM y – MMMM y G"} } yMMMd{ - M{"d. MMM – d. MMM y G"} + M{"d. MMM – d. MMM y G"} d{"d.–d. MMM y G"} - y{"d. MMM y – d. MMM y G"} + y{"d. MMM y – d. MMM y G"} } yMd{ M{"d.M.–d.M.y G"} @@ -2613,6 +2667,12 @@ is{ "d.M.y G", "d.M.y GGGGG", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{1} 'kl'. {0}", "{1} 'kl'. {0}", "{1}, {0}", @@ -2693,14 +2753,14 @@ is{ M{"MMM–MMM"} } MMMEd{ - M{"E, d. MMM – E, d. MMM"} + M{"E, d. MMM – E, d. MMM"} d{"E, d. – E, d. MMM"} } MMMM{ M{"MMMM–MMMM"} } MMMd{ - M{"d. MMM – d. MMM"} + M{"d. MMM – d. MMM"} d{"d.–d. MMM"} } Md{ @@ -2712,22 +2772,22 @@ is{ } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y G"} @@ -2739,25 +2799,25 @@ is{ yMEd{ M{"E, d.M. – E, d.M.y G"} d{"E, d. – E, d.M.y G"} - y{"E, d.M.y – E, d.M.y G"} + y{"E, d.M.y – E, d.M.y G"} } yMMM{ M{"MMM–MMM y G"} - y{"MMM y – MMM y G"} + y{"MMM y – MMM y G"} } yMMMEd{ - M{"E, d. MMM – E, d. MMM y G"} + M{"E, d. MMM – E, d. MMM y G"} d{"E, d. – E, d. MMM y G"} - y{"E, d. MMM y – E, d. MMM y G"} + y{"E, d. MMM y – E, d. MMM y G"} } yMMMM{ M{"MMMM–MMMM y G"} - y{"MMMM y – MMMM y G"} + y{"MMMM y – MMMM y G"} } yMMMd{ - M{"d. MMM – d. MMM y G"} + M{"d. MMM – d. MMM y G"} d{"d.–d. MMM y G"} - y{"d. MMM y – d. MMM y G"} + y{"d. MMM y – d. MMM y G"} } yMd{ M{"d.M.–d.M.y G"} @@ -2867,6 +2927,12 @@ is{ "d.M.y G", "d.M.y GGGGG", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{1} 'kl'. {0}", "{1} 'kl'. {0}", "{1}, {0}", @@ -2950,14 +3016,14 @@ is{ M{"MMM–MMM"} } MMMEd{ - M{"E, d. MMM – E, d. MMM"} + M{"E, d. MMM – E, d. MMM"} d{"E, d. – E, d. MMM"} } MMMM{ M{"MMMM–MMMM"} } MMMd{ - M{"d. MMM – d. MMM"} + M{"d. MMM – d. MMM"} d{"d.–d. MMM"} } Md{ @@ -2969,22 +3035,22 @@ is{ } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y G"} @@ -2996,25 +3062,25 @@ is{ yMEd{ M{"E, d.M. – E, d.M.y G"} d{"E, d. – E, d.M.y G"} - y{"E, d.M.y – E, d.M.y G"} + y{"E, d.M.y – E, d.M.y G"} } yMMM{ M{"MMM–MMM y G"} - y{"MMM y – MMM y G"} + y{"MMM y – MMM y G"} } yMMMEd{ - M{"E, d. MMM – E, d. MMM y G"} + M{"E, d. MMM – E, d. MMM y G"} d{"E, d. – E, d. MMM y G"} - y{"E, d. MMM y – E, d. MMM y G"} + y{"E, d. MMM y – E, d. MMM y G"} } yMMMM{ M{"MMMM–MMMM y G"} - y{"MMMM y – MMMM y G"} + y{"MMMM y – MMMM y G"} } yMMMd{ - M{"d. MMM – d. MMM y G"} + M{"d. MMM – d. MMM y G"} d{"d.–d. MMM y G"} - y{"d. MMM y – d. MMM y G"} + y{"d. MMM y – d. MMM y G"} } yMd{ M{"d.M.–d.M.y G"} diff --git a/icu4c/source/data/locales/it.txt b/icu4c/source/data/locales/it.txt index 69d243108b01..824be538c9be 100644 --- a/icu4c/source/data/locales/it.txt +++ b/icu4c/source/data/locales/it.txt @@ -264,6 +264,12 @@ it{ "dd MMM y G", "dd/MM/yy GGGGG", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{1} 'alle' {0}", "{1} 'alle' {0}", "{1}, {0}", @@ -289,8 +295,8 @@ it{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"E d"} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"y G"} GyMMM{"MMM y G"} GyMMMEd{"E d MMM y G"} @@ -307,9 +313,9 @@ it{ MMMd{"d MMM"} Md{"d/M"} d{"d"} - h{"hh a"} - hm{"hh:mm a"} - hms{"hh:mm:ss a"} + h{"hh a"} + hm{"hh:mm a"} + hms{"hh:mm:ss a"} ms{"mm:ss"} y{"y G"} yyyy{"y G"} @@ -325,51 +331,51 @@ it{ } intervalFormats{ Bh{ - B{"h B – h B"} - h{"h – h B"} + B{"h B – h B"} + h{"h – h B"} } Bhm{ - B{"h:mm B – h:mm B"} - h{"h:mm – h:mm B"} - m{"h:mm – h:mm B"} + B{"h:mm B – h:mm B"} + h{"h:mm – h:mm B"} + m{"h:mm – h:mm B"} } Gy{ - G{"G y – G y"} + G{"G y – G y"} y{"G y–y"} } GyM{ - G{"GGGGG y-MM – GGGGG y-MM"} - M{"M/y – M/y GGGGG"} - y{"M/y – M/y GGGGG"} + G{"GGGGG y-MM – GGGGG y-MM"} + M{"M/y – M/y GGGGG"} + y{"M/y – M/y GGGGG"} } GyMEd{ - G{"E, d/M/y – E, d/M/y GGGGG"} - M{"E, d/M/y – E, d/M/y GGGGG"} - d{"E, d/M/y – E, d/M/y GGGGG"} - y{"E d/M/y – E d/M/y GGGGG"} + G{"E, d/M/y – E, d/M/y GGGGG"} + M{"E, d/M/y – E, d/M/y GGGGG"} + d{"E, d/M/y – E, d/M/y GGGGG"} + y{"E d/M/y – E d/M/y GGGGG"} } GyMMM{ - G{"MMM y G – MMM y G"} - M{"MMM – MMM y G"} - y{"MMM y – MMM y G"} + G{"MMM y G – MMM y G"} + M{"MMM – MMM y G"} + y{"MMM y – MMM y G"} } GyMMMEd{ - G{"E d MMM y G – E d MMM y G"} - M{"E d MMM – E d MMM y G"} - d{"E d MMM – E d MMM y G"} - y{"E d MMM y – E d MMM y G"} + G{"E d MMM y G – E d MMM y G"} + M{"E d MMM – E d MMM y G"} + d{"E d MMM – E d MMM y G"} + y{"E d MMM y – E d MMM y G"} } GyMMMd{ - G{"d MMM y G – d MMM y G"} - M{"d MMM – d MMM y G"} - d{"d – d MMM y G"} - y{"d MMM y – d MMM y G"} + G{"d MMM y G – d MMM y G"} + M{"d MMM – d MMM y G"} + d{"d – d MMM y G"} + y{"d MMM y – d MMM y G"} } GyMd{ - G{"d/M/y GGGGG – d/M/y GGGGG"} - M{"d/M/y – d/M/y GGGGG"} - d{"d/M/y – d/M/y GGGGG"} - y{"d/M/y – d/M/y GGGGG"} + G{"d/M/y GGGGG – d/M/y GGGGG"} + M{"d/M/y – d/M/y GGGGG"} + d{"d/M/y – d/M/y GGGGG"} + y{"d/M/y – d/M/y GGGGG"} } H{ H{"HH–HH"} @@ -389,80 +395,80 @@ it{ M{"M–M"} } MEd{ - M{"E dd/MM – E dd/MM"} - d{"E dd/MM – E dd/MM"} + M{"E dd/MM – E dd/MM"} + d{"E dd/MM – E dd/MM"} } MMM{ M{"MMM–MMM"} } MMMEd{ - M{"E dd MMM – E dd MMM"} - d{"E dd – E dd MMM"} + M{"E dd MMM – E dd MMM"} + d{"E dd – E dd MMM"} } MMMd{ - M{"dd MMM – dd MMM"} + M{"dd MMM – dd MMM"} d{"dd–dd MMM"} } Md{ - M{"dd/MM – dd/MM"} - d{"dd/MM – dd/MM"} + M{"dd/MM – dd/MM"} + d{"dd/MM – dd/MM"} } d{ d{"d–d"} } fallback{"{0} - {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y G"} } yM{ - M{"MM/y – MM/y G"} - y{"MM/y – MM/y G"} + M{"MM/y – MM/y G"} + y{"MM/y – MM/y G"} } yMEd{ - M{"E dd/MM/y – E dd/MM/y G"} - d{"E dd/MM/y – E dd/MM/y G"} - y{"E dd/MM/y – E dd/MM/y G"} + M{"E dd/MM/y – E dd/MM/y G"} + d{"E dd/MM/y – E dd/MM/y G"} + y{"E dd/MM/y – E dd/MM/y G"} } yMMM{ M{"MMM–MMM y G"} - y{"MMM y – MMM y G"} + y{"MMM y – MMM y G"} } yMMMEd{ - M{"E d MMM – E d MMM y G"} - d{"E d – E d MMM y G"} - y{"E d MMM y – E d MMM y G"} + M{"E d MMM – E d MMM y G"} + d{"E d – E d MMM y G"} + y{"E d MMM y – E d MMM y G"} } yMMMM{ M{"MMMM–MMMM y G"} - y{"MMMM y – MMMM y G"} + y{"MMMM y – MMMM y G"} } yMMMd{ - M{"dd MMM – dd MMM y G"} + M{"dd MMM – dd MMM y G"} d{"dd–dd MMM y G"} - y{"dd MMM y – dd MMM y G"} + y{"dd MMM y – dd MMM y G"} } yMd{ - M{"dd/MM/y – dd/MM/y G"} - d{"dd/MM/y – dd/MM/y G"} - y{"dd/MM/y – dd/MM/y G"} + M{"dd/MM/y – dd/MM/y G"} + d{"dd/MM/y – dd/MM/y G"} + y{"dd/MM/y – dd/MM/y G"} } } } @@ -517,8 +523,8 @@ it{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"E d"} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"y G"} GyMMM{"MMM y G"} GyMMMEd{"E d MMM y G"} @@ -541,11 +547,11 @@ it{ MMMd{"d MMM"} Md{"d/M"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} - hmsv{"h:mm:ss a v"} - hmv{"h:mm a v"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} + hmsv{"h:mm:ss a v"} + hmv{"h:mm a v"} ms{"mm:ss"} y{"y"} yM{"M/y"} @@ -724,51 +730,51 @@ it{ } intervalFormats{ Bh{ - B{"h B – h B"} - h{"h – h B"} + B{"h B – h B"} + h{"h – h B"} } Bhm{ - B{"h:mm B – h:mm B"} - h{"h:mm – h:mm B"} - m{"h:mm – h:mm B"} + B{"h:mm B – h:mm B"} + h{"h:mm – h:mm B"} + m{"h:mm – h:mm B"} } Gy{ - G{"y G – y G"} - y{"y – y G"} + G{"y G – y G"} + y{"y – y G"} } GyM{ - G{"M/y GGGGG – M/y GGGGG"} - M{"M/y – M/y GGGGG"} - y{"M/y – M/y GGGGG"} + G{"M/y GGGGG – M/y GGGGG"} + M{"M/y – M/y GGGGG"} + y{"M/y – M/y GGGGG"} } GyMEd{ - G{"E d/M/y – E d/M/y GGGGG"} - M{"E d/M/y – E d/M/y GGGGG"} - d{"E d/M/y – E d/M/y GGGGG"} - y{"E d/M/y – E d/M/y GGGGG"} + G{"E d/M/y – E d/M/y GGGGG"} + M{"E d/M/y – E d/M/y GGGGG"} + d{"E d/M/y – E d/M/y GGGGG"} + y{"E d/M/y – E d/M/y GGGGG"} } GyMMM{ - G{"MMM y G – MMM y G"} - M{"MMM – MMM y G"} - y{"MMM y – MMM y G"} + G{"MMM y G – MMM y G"} + M{"MMM – MMM y G"} + y{"MMM y – MMM y G"} } GyMMMEd{ - G{"E d MMM y G – E d MMM y G"} - M{"E d MMM – E d MMM y G"} - d{"E d MMM – E d MMM y G"} - y{"E d MMM y – E d MMM y G"} + G{"E d MMM y G – E d MMM y G"} + M{"E d MMM – E d MMM y G"} + d{"E d MMM – E d MMM y G"} + y{"E d MMM y – E d MMM y G"} } GyMMMd{ - G{"d MMM y G – d MMM y G"} - M{"d MMM – d MMM y G"} - d{"d – d MMM y G"} - y{"d MMM y – d MMM y G"} + G{"d MMM y G – d MMM y G"} + M{"d MMM – d MMM y G"} + d{"d – d MMM y G"} + y{"d MMM y – d MMM y G"} } GyMd{ - G{"d/M/y GGGGG – d/M/y GGGGG"} - M{"d/M/y – d/M/y GGGGG"} - d{"d/M/y – d/M/y GGGGG"} - y{"d/M/y – d/M/y GGGGG"} + G{"d/M/y GGGGG – d/M/y GGGGG"} + M{"d/M/y – d/M/y GGGGG"} + d{"d/M/y – d/M/y GGGGG"} + y{"d/M/y – d/M/y GGGGG"} } H{ H{"HH–HH"} @@ -788,80 +794,80 @@ it{ M{"M–M"} } MEd{ - M{"E dd/MM – E dd/MM"} - d{"E dd/MM – E dd/MM"} + M{"E dd/MM – E dd/MM"} + d{"E dd/MM – E dd/MM"} } MMM{ M{"MMM–MMM"} } MMMEd{ - M{"E dd MMM – E dd MMM"} - d{"E dd – E dd MMM"} + M{"E dd MMM – E dd MMM"} + d{"E dd – E dd MMM"} } MMMd{ - M{"dd MMM – dd MMM"} + M{"dd MMM – dd MMM"} d{"dd–dd MMM"} } Md{ - M{"dd/MM – dd/MM"} - d{"dd/MM – dd/MM"} + M{"dd/MM – dd/MM"} + d{"dd/MM – dd/MM"} } d{ d{"d–d"} } fallback{"{0} - {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y"} } yM{ - M{"MM/y – MM/y"} - y{"MM/y – MM/y"} + M{"MM/y – MM/y"} + y{"MM/y – MM/y"} } yMEd{ - M{"E dd/MM/y – E dd/MM/y"} - d{"E dd/MM/y – E dd/MM/y"} - y{"E dd/MM/y – E dd/MM/y"} + M{"E dd/MM/y – E dd/MM/y"} + d{"E dd/MM/y – E dd/MM/y"} + y{"E dd/MM/y – E dd/MM/y"} } yMMM{ M{"MMM–MMM y"} - y{"MMM y – MMM y"} + y{"MMM y – MMM y"} } yMMMEd{ - M{"E d MMM – E d MMM y"} - d{"E d – E d MMM y"} - y{"E d MMM y – E d MMM y"} + M{"E d MMM – E d MMM y"} + d{"E d – E d MMM y"} + y{"E d MMM y – E d MMM y"} } yMMMM{ M{"MMMM–MMMM y"} - y{"MMMM y – MMMM y"} + y{"MMMM y – MMMM y"} } yMMMd{ - M{"dd MMM – dd MMM y"} + M{"dd MMM – dd MMM y"} d{"dd–dd MMM y"} - y{"dd MMM y – dd MMM y"} + y{"dd MMM y – dd MMM y"} } yMd{ - M{"dd/MM/y – dd/MM/y"} - d{"dd/MM/y – dd/MM/y"} - y{"dd/MM/y – dd/MM/y"} + M{"dd/MM/y – dd/MM/y"} + d{"dd/MM/y – dd/MM/y"} + y{"dd/MM/y – dd/MM/y"} } } monthNames{ @@ -1022,8 +1028,8 @@ it{ "dd MMM y G", "dd/MM/yy GGGGG", "{1}, {0}", - "{1} 'alle' {0}", - "{1} 'alle' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } diff --git a/icu4c/source/data/locales/it_CH.txt b/icu4c/source/data/locales/it_CH.txt index 6ae26dcd2dea..5dc7e13a276e 100644 --- a/icu4c/source/data/locales/it_CH.txt +++ b/icu4c/source/data/locales/it_CH.txt @@ -26,8 +26,8 @@ it_CH{ "d MMM y G", "dd.MM.yy GGGGG", "{1}, {0}", - "{1} 'alle' {0}", - "{1} 'alle' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } diff --git a/icu4c/source/data/locales/jmc.txt b/icu4c/source/data/locales/jmc.txt index 2be24ffcf128..6234ae6a2173 100644 --- a/icu4c/source/data/locales/jmc.txt +++ b/icu4c/source/data/locales/jmc.txt @@ -51,7 +51,7 @@ jmc{ MMMd{"MMM d"} Md{"M/d"} d{"d"} - hm{"h:mm a"} + hm{"h:mm a"} ms{"mm:ss"} y{"y"} yM{"M/y"} @@ -109,7 +109,7 @@ jmc{ MMMd{"MMM d"} Md{"M/d"} d{"d"} - hm{"h:mm a"} + hm{"h:mm a"} ms{"mm:ss"} y{"y"} yM{"M/y"} diff --git a/icu4c/source/data/locales/jv.txt b/icu4c/source/data/locales/jv.txt index f6d0d8024a8c..07ddb3726637 100644 --- a/icu4c/source/data/locales/jv.txt +++ b/icu4c/source/data/locales/jv.txt @@ -189,8 +189,8 @@ jv{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"E, d"} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"y G"} GyMMM{"MMM y G"} GyMMMEd{"E, d MMM y G"} @@ -207,9 +207,9 @@ jv{ MMMd{"d MMM"} Md{"dd/MM"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"mm:ss"} y{"y G"} yyyy{"y G"} @@ -225,103 +225,103 @@ jv{ } intervalFormats{ Gy{ - G{"y G – y G"} - y{"y – y G"} + G{"y G – y G"} + y{"y – y G"} } GyM{ - G{"M/y GGGGG – M/y GGGGG"} - M{"M/y – M/y GGGGG"} - y{"M/y – M/y GGGGG"} + G{"M/y GGGGG – M/y GGGGG"} + M{"M/y – M/y GGGGG"} + y{"M/y – M/y GGGGG"} } GyMEd{ - G{"E, d/M/y GGGGG – E, d/M/y GGGGG"} - M{"E, d/M/y – E, d/M/y GGGGG"} - d{"E, d/M/y – E, d/M/y GGGGG"} - y{"E, d/M/y – E, d/M/y GGGGG"} + G{"E, d/M/y GGGGG – E, d/M/y GGGGG"} + M{"E, d/M/y – E, d/M/y GGGGG"} + d{"E, d/M/y – E, d/M/y GGGGG"} + y{"E, d/M/y – E, d/M/y GGGGG"} } GyMMM{ - G{"MMM y G – MMM y G"} - M{"MMM – MMM y G"} - y{"MMM y – MMM y G"} + G{"MMM y G – MMM y G"} + M{"MMM – MMM y G"} + y{"MMM y – MMM y G"} } GyMMMEd{ - G{"E, d MMM, y G – E, d MMM, y G"} - M{"E, d MMM – E, d MMM, y G"} - d{"E, d MMM – E, d MMM, y G"} - y{"E, d MMM, y – E, d MMM, y G"} + G{"E, d MMM, y G – E, d MMM, y G"} + M{"E, d MMM – E, d MMM, y G"} + d{"E, d MMM – E, d MMM, y G"} + y{"E, d MMM, y – E, d MMM, y G"} } GyMMMd{ - G{"d MMM, y G – d MMM, y G"} - M{"d MMM – d MMM, y G"} - d{"d – d MMM, y G"} - y{"d MMM, y – d MMM, y G"} + G{"d MMM, y G – d MMM, y G"} + M{"d MMM – d MMM, y G"} + d{"d – d MMM, y G"} + y{"d MMM, y – d MMM, y G"} } GyMd{ - G{"d/M/y GGGGG – d/M/y GGGGG"} - M{"d/M/y – d/M/y GGGGG"} - d{"d/M/y – d/M/y GGGGG"} - y{"d/M/y – d/M/y GGGGG"} + G{"d/M/y GGGGG – d/M/y GGGGG"} + M{"d/M/y – d/M/y GGGGG"} + d{"d/M/y – d/M/y GGGGG"} + y{"d/M/y – d/M/y GGGGG"} } M{ - M{"MM – MM"} + M{"MM – MM"} } MEd{ - M{"E, dd/MM – E, dd/MM"} - d{"E, dd/MM – E, dd/MM"} + M{"E, dd/MM – E, dd/MM"} + d{"E, dd/MM – E, dd/MM"} } MMM{ - M{"LLL – LLL"} + M{"LLL – LLL"} } MMMEd{ - M{"E, d MMM – E, d MMM"} - d{"E, d MMM – E, d MMM"} + M{"E, d MMM – E, d MMM"} + d{"E, d MMM – E, d MMM"} } MMMd{ - M{"d MMM – d MMM"} - d{"d – d MMM"} + M{"d MMM – d MMM"} + d{"d – d MMM"} } Md{ - M{"dd/MM – dd/MM"} - d{"dd/MM – dd/MM"} + M{"dd/MM – dd/MM"} + d{"dd/MM – dd/MM"} } d{ - d{"d – d"} + d{"d – d"} } fallback{"{0} – {1}"} y{ - y{"y – y G"} + y{"y – y G"} } yM{ - M{"MM-y – MM-y GGGGG"} - y{"MM-y – MM-y GGGGG"} + M{"MM-y – MM-y GGGGG"} + y{"MM-y – MM-y GGGGG"} } yMEd{ - M{"E, dd-MM-y – E, dd-MM-y GGGGG"} - d{"E, dd-MM-y – E, dd-MM-y GGGGG"} - y{"E, dd-MM-y – E, dd-MM-y GGGGG"} + M{"E, dd-MM-y – E, dd-MM-y GGGGG"} + d{"E, dd-MM-y – E, dd-MM-y GGGGG"} + y{"E, dd-MM-y – E, dd-MM-y GGGGG"} } yMMM{ - M{"MMM – MMM y G"} - y{"MMM y – MMM y G"} + M{"MMM – MMM y G"} + y{"MMM y – MMM y G"} } yMMMEd{ - M{"E, d MMM – E, d MMM y G"} - d{"E, d MMM – E, d MMM y G"} - y{"E, d MMM y – E, d MMM y G"} + M{"E, d MMM – E, d MMM y G"} + d{"E, d MMM – E, d MMM y G"} + y{"E, d MMM y – E, d MMM y G"} } yMMMM{ - M{"MMMM – MMMM y G"} - y{"MMMM y – MMMM y G"} + M{"MMMM – MMMM y G"} + y{"MMMM y – MMMM y G"} } yMMMd{ - M{"d MMM – d MMM y G"} - d{"d – d MMM y G"} - y{"d MMM y – d MMM y G"} + M{"d MMM – d MMM y G"} + d{"d – d MMM y G"} + y{"d MMM y – d MMM y G"} } yMd{ - M{"dd-MM-y – dd-MM-y GGGGG"} - d{"dd-MM-y – dd-MM-y GGGGG"} - y{"dd-MM-y – dd-MM-y GGGGG"} + M{"dd-MM-y – dd-MM-y GGGGG"} + d{"dd-MM-y – dd-MM-y GGGGG"} + y{"dd-MM-y – dd-MM-y GGGGG"} } } } @@ -371,8 +371,8 @@ jv{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"E, d"} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"y G"} GyMMM{"MMM y G"} GyMMMEd{"E, d MMM y G"} @@ -394,11 +394,11 @@ jv{ MMMd{"d MMM"} Md{"dd/MM"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} - hmsv{"h:mm:ss a v"} - hmv{"h:mm a v"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} + hmsv{"h:mm:ss a v"} + hmv{"h:mm a v"} ms{"mm:ss"} y{"y"} yM{"MM-y"} @@ -528,135 +528,135 @@ jv{ } intervalFormats{ Gy{ - G{"y G – y G"} - y{"y – y G"} + G{"y G – y G"} + y{"y – y G"} } GyM{ - G{"M/y GGGGG – M/y GGGGG"} - M{"M/y – M/y GGGGG"} - y{"M/y – M/y GGGGG"} + G{"M/y GGGGG – M/y GGGGG"} + M{"M/y – M/y GGGGG"} + y{"M/y – M/y GGGGG"} } GyMEd{ - G{"E, d/M/y GGGGG – E, d/M/y GGGGG"} - M{"E, d/M/y – E, d/M/y GGGGG"} - d{"E, d/M/y – E, d/M/y GGGGG"} - y{"E, d/M/y – E, d/M/y GGGGG"} + G{"E, d/M/y GGGGG – E, d/M/y GGGGG"} + M{"E, d/M/y – E, d/M/y GGGGG"} + d{"E, d/M/y – E, d/M/y GGGGG"} + y{"E, d/M/y – E, d/M/y GGGGG"} } GyMMM{ - G{"MMM y G – MMM y G"} - M{"MMM – MMM y G"} - y{"MMM y – MMM y G"} + G{"MMM y G – MMM y G"} + M{"MMM – MMM y G"} + y{"MMM y – MMM y G"} } GyMMMEd{ - G{"E, d MMM y G – E, d MMM y G"} - M{"E, d MMM – E, d MMM y G"} - d{"E, d MMM – E, d MMM y G"} - y{"E, d MMM y – E, d MMM y G"} + G{"E, d MMM y G – E, d MMM y G"} + M{"E, d MMM – E, d MMM y G"} + d{"E, d MMM – E, d MMM y G"} + y{"E, d MMM y – E, d MMM y G"} } GyMMMd{ - G{"d MMM y G – d MMM y G"} - M{"d MMM – d MMM y G"} - d{"d – d MMM y G"} - y{"d MMM y – d MMM y G"} + G{"d MMM y G – d MMM y G"} + M{"d MMM – d MMM y G"} + d{"d – d MMM y G"} + y{"d MMM y – d MMM y G"} } GyMd{ - G{"d/M/y GGGGG – d/M/y GGGGG"} - M{"d/M/y – d/M/y GGGGG"} - d{"d/M/y – d/M/y GGGGG"} - y{"d/M/y – d/M/y GGGGG"} + G{"d/M/y GGGGG – d/M/y GGGGG"} + M{"d/M/y – d/M/y GGGGG"} + d{"d/M/y – d/M/y GGGGG"} + y{"d/M/y – d/M/y GGGGG"} } H{ - H{"HH – HH"} + H{"HH – HH"} } Hm{ - H{"HH:mm – HH:mm"} - m{"HH:mm – HH:mm"} + H{"HH:mm – HH:mm"} + m{"HH:mm – HH:mm"} } Hmv{ - H{"HH:mm – HH:mm v"} - m{"HH:mm – HH:mm v"} + H{"HH:mm – HH:mm v"} + m{"HH:mm – HH:mm v"} } Hv{ - H{"HH – HH v"} + H{"HH – HH v"} } M{ - M{"MM – MM"} + M{"MM – MM"} } MEd{ - M{"E, dd/MM – E, dd/MM"} - d{"E, dd/MM – E, dd/MM"} + M{"E, dd/MM – E, dd/MM"} + d{"E, dd/MM – E, dd/MM"} } MMM{ M{"LLL–LLL"} } MMMEd{ - M{"E, d MMM – E, d MMM"} - d{"E, d MMM – E, d MMM"} + M{"E, d MMM – E, d MMM"} + d{"E, d MMM – E, d MMM"} } MMMd{ - M{"d MMM – d MMM"} + M{"d MMM – d MMM"} d{"MMM d–d"} } Md{ - M{"dd/MM – dd/MM"} - d{"dd/MM – dd/MM"} + M{"dd/MM – dd/MM"} + d{"dd/MM – dd/MM"} } d{ - d{"d – d"} + d{"d – d"} } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h – h a"} + a{"h a – h a"} + h{"h – h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm – h:mm a"} - m{"h:mm – h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm – h:mm a"} + m{"h:mm – h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm – h:mm a v"} - m{"h:mm – h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm – h:mm a v"} + m{"h:mm – h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h – h a v"} + a{"h a – h a v"} + h{"h – h a v"} } y{ - y{"y – y"} + y{"y – y"} } yM{ - M{"MM-y – MM-y"} - y{"MM-y – MM-y"} + M{"MM-y – MM-y"} + y{"MM-y – MM-y"} } yMEd{ - M{"E, dd-MM-y – E, dd-MM-y"} - d{"E, dd-MM-y – E, dd-MM-y"} - y{"E, dd-MM-y – E, dd-MM-y"} + M{"E, dd-MM-y – E, dd-MM-y"} + d{"E, dd-MM-y – E, dd-MM-y"} + y{"E, dd-MM-y – E, dd-MM-y"} } yMMM{ - M{"MMM – MMM y"} - y{"MMM y – MMM y"} + M{"MMM – MMM y"} + y{"MMM y – MMM y"} } yMMMEd{ - M{"E, d MMM – E, d MMM y"} - d{"E, d MMM – E, d MMM y"} - y{"E, d MMM y – E, d MMM y"} + M{"E, d MMM – E, d MMM y"} + d{"E, d MMM – E, d MMM y"} + y{"E, d MMM y – E, d MMM y"} } yMMMM{ - M{"MMMM – MMMM y"} - y{"MMMM y – MMMM y"} + M{"MMMM – MMMM y"} + y{"MMMM y – MMMM y"} } yMMMd{ - M{"d MMM – d MMM y"} - d{"d – d MMM y"} - y{"d MMM y – d MMM y"} + M{"d MMM – d MMM y"} + d{"d – d MMM y"} + y{"d MMM y – d MMM y"} } yMd{ - M{"dd-MM-y – dd-MM-y"} - d{"dd-MM-y – dd-MM-y"} - y{"dd-MM-y – dd-MM-y"} + M{"dd-MM-y – dd-MM-y"} + d{"dd-MM-y – dd-MM-y"} + y{"dd-MM-y – dd-MM-y"} } } monthNames{ diff --git a/icu4c/source/data/locales/kab.txt b/icu4c/source/data/locales/kab.txt index b0bf86631b0f..4c7fd3142539 100644 --- a/icu4c/source/data/locales/kab.txt +++ b/icu4c/source/data/locales/kab.txt @@ -20,10 +20,10 @@ kab{ calendar{ generic{ DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE d MMMM y G", "d MMMM y G", "d MMM, y G", @@ -77,10 +77,10 @@ kab{ "n tmeddit", } DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE d MMMM y", "d MMMM y", "d MMM, y", diff --git a/icu4c/source/data/locales/kam.txt b/icu4c/source/data/locales/kam.txt index 86d65d880832..41e591555485 100644 --- a/icu4c/source/data/locales/kam.txt +++ b/icu4c/source/data/locales/kam.txt @@ -51,7 +51,7 @@ kam{ MMMd{"MMM d"} Md{"M/d"} d{"d"} - hm{"h:mm a"} + hm{"h:mm a"} ms{"mm:ss"} y{"y"} yM{"M/y"} @@ -109,7 +109,7 @@ kam{ MMMd{"MMM d"} Md{"M/d"} d{"d"} - hm{"h:mm a"} + hm{"h:mm a"} ms{"mm:ss"} y{"y"} yM{"M/y"} diff --git a/icu4c/source/data/locales/kde.txt b/icu4c/source/data/locales/kde.txt index e71103a26af4..7dd8ec8d67a2 100644 --- a/icu4c/source/data/locales/kde.txt +++ b/icu4c/source/data/locales/kde.txt @@ -51,7 +51,7 @@ kde{ MMMd{"MMM d"} Md{"M/d"} d{"d"} - hm{"h:mm a"} + hm{"h:mm a"} ms{"mm:ss"} y{"y"} yM{"M/y"} @@ -109,7 +109,7 @@ kde{ MMMd{"MMM d"} Md{"M/d"} d{"d"} - hm{"h:mm a"} + hm{"h:mm a"} ms{"mm:ss"} y{"y"} yM{"M/y"} diff --git a/icu4c/source/data/locales/kea.txt b/icu4c/source/data/locales/kea.txt index cfa8b144fc5b..d66f9120e847 100644 --- a/icu4c/source/data/locales/kea.txt +++ b/icu4c/source/data/locales/kea.txt @@ -174,8 +174,8 @@ kea{ EHm{"E, HH:mm"} EHms{"E, HH:mm:ss"} Ed{"E, d"} - Ehm{"E, h:mm a"} - Ehms{"E, h:mm:ss a"} + Ehm{"E, h:mm a"} + Ehms{"E, h:mm:ss a"} Gy{"y G"} GyMMM{"LLL y G"} GyMMMEd{"E, d MMM y G"} @@ -194,9 +194,9 @@ kea{ MMdd{"dd/MM"} Md{"dd/MM"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} mmss{"mm:ss"} ms{"mm:ss"} y{"y"} @@ -223,42 +223,42 @@ kea{ } intervalFormats{ Gy{ - G{"y G – y G"} - y{"y – y G"} + G{"y G – y G"} + y{"y – y G"} } GyM{ - G{"LL/y GGGGG – LL/y GGGGG"} - M{"LL/y – LL/y GGGGG"} - y{"LL/y – LL/y GGGGG"} + G{"LL/y GGGGG – LL/y GGGGG"} + M{"LL/y – LL/y GGGGG"} + y{"LL/y – LL/y GGGGG"} } GyMEd{ - G{"E, dd/MM/y GGGGG – E, dd/MM/y GGGGG"} - M{"E, dd/MM/y – E, dd/MM/y GGGGG"} - d{"E, dd/MM/y – E, dd/MM/y GGGGG"} - y{"E, dd/MM/y – E, dd/MM/y GGGGG"} + G{"E, dd/MM/y GGGGG – E, dd/MM/y GGGGG"} + M{"E, dd/MM/y – E, dd/MM/y GGGGG"} + d{"E, dd/MM/y – E, dd/MM/y GGGGG"} + y{"E, dd/MM/y – E, dd/MM/y GGGGG"} } GyMMM{ - G{"LLL y G – LLL y G"} - M{"LLL – LLL y G"} - y{"LLL y – LLL y G"} + G{"LLL y G – LLL y G"} + M{"LLL – LLL y G"} + y{"LLL y – LLL y G"} } GyMMMEd{ - G{"E, d MMM y G – E, d MMM y G"} - M{"E, d MMM – E, d MMM y G"} - d{"E, d MMM – E, d MMM y G"} - y{"E, d MMM y – E, d MMM y G"} + G{"E, d MMM y G – E, d MMM y G"} + M{"E, d MMM – E, d MMM y G"} + d{"E, d MMM – E, d MMM y G"} + y{"E, d MMM y – E, d MMM y G"} } GyMMMd{ - G{"d MMM y G – d MMM y G"} - M{"d MMM – d MMM y G"} - d{"d – d MMM y G"} - y{"d MMM y – d MMM y G"} + G{"d MMM y G – d MMM y G"} + M{"d MMM – d MMM y G"} + d{"d – d MMM y G"} + y{"d MMM y – d MMM y G"} } GyMd{ - G{"dd/MM/y GGGGG – dd/MM/y GGGGG"} - M{"dd/MM/y – dd/MM/y GGGGG"} - d{"dd/MM/y – dd/MM/y GGGGG"} - y{"dd/MM/y – dd/MM/y GGGGG"} + G{"dd/MM/y GGGGG – dd/MM/y GGGGG"} + M{"dd/MM/y – dd/MM/y GGGGG"} + d{"dd/MM/y – dd/MM/y GGGGG"} + y{"dd/MM/y – dd/MM/y GGGGG"} } H{ H{"HH–HH"} @@ -275,83 +275,83 @@ kea{ H{"HH–HH v"} } M{ - M{"L – L"} + M{"L – L"} } MEd{ - M{"E, dd/MM – E, dd/MM"} - d{"E, dd/MM – E, dd/MM"} + M{"E, dd/MM – E, dd/MM"} + d{"E, dd/MM – E, dd/MM"} } MMM{ - M{"LLL – LLL"} + M{"LLL – LLL"} } MMMEd{ - M{"E, d MMM – E, d MMM"} - d{"E, d MMM – E, d MMM"} + M{"E, d MMM – E, d MMM"} + d{"E, d MMM – E, d MMM"} } MMMd{ - M{"d MMM – d MMM"} - d{"d – d MMM"} + M{"d MMM – d MMM"} + d{"d – d MMM"} } Md{ - M{"dd/MM – dd/MM"} - d{"dd/MM – dd/MM"} + M{"dd/MM – dd/MM"} + d{"dd/MM – dd/MM"} } d{ - d{"d – d"} + d{"d – d"} } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ - y{"y – y"} + y{"y – y"} } yM{ - M{"MM/y – MM/y"} - y{"LL/y – LL/y"} + M{"MM/y – MM/y"} + y{"LL/y – LL/y"} } yMEd{ - M{"E, dd/MM/y – E, dd/MM/y"} - d{"E, dd/MM/y – E, dd/MM/y"} - y{"E, dd/MM/y – E, dd/MM/y"} + M{"E, dd/MM/y – E, dd/MM/y"} + d{"E, dd/MM/y – E, dd/MM/y"} + y{"E, dd/MM/y – E, dd/MM/y"} } yMMM{ - M{"LLL – LLL y"} - y{"LLL y – LLL y"} + M{"LLL – LLL y"} + y{"LLL y – LLL y"} } yMMMEd{ - M{"E, d MMM – E, d MMM y"} - d{"E, d MMM – E, d MMM y"} - y{"E, d MMM y – E, d MMM y"} + M{"E, d MMM – E, d MMM y"} + d{"E, d MMM – E, d MMM y"} + y{"E, d MMM y – E, d MMM y"} } yMMMM{ - M{"LLLL – LLLL 'di' y G"} - y{"LLLL 'di' y – LLLL 'di' y G"} + M{"LLLL – LLLL 'di' y G"} + y{"LLLL 'di' y – LLLL 'di' y G"} } yMMMd{ - M{"d MMM – d MMM y"} - d{"d – d MMM y"} - y{"d MMM y – d MMM y"} + M{"d MMM – d MMM y"} + d{"d – d MMM y"} + y{"d MMM y – d MMM y"} } yMd{ - M{"dd/MM/y – dd/MM/y"} - d{"dd/MM/y – dd/MM/y"} - y{"dd/MM/y – dd/MM/y"} + M{"dd/MM/y – dd/MM/y"} + d{"dd/MM/y – dd/MM/y"} + y{"dd/MM/y – dd/MM/y"} } } } @@ -399,8 +399,8 @@ kea{ EHm{"E, HH:mm"} EHms{"E, HH:mm:ss"} Ed{"E, d"} - Ehm{"E, h:mm a"} - Ehms{"E, h:mm:ss a"} + Ehm{"E, h:mm a"} + Ehms{"E, h:mm:ss a"} Gy{"y G"} GyMMM{"LLL y G"} GyMMMEd{"E, d MMM y G"} @@ -423,11 +423,11 @@ kea{ MMdd{"dd/MM"} Md{"dd/MM"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} - hmsv{"h:mm:ss a (v)"} - hmv{"h:mm a (v)"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} + hmsv{"h:mm:ss a (v)"} + hmv{"h:mm a (v)"} mmss{"mm:ss"} ms{"mm:ss"} y{"y"} @@ -543,142 +543,142 @@ kea{ } intervalFormats{ Bh{ - h{"h – h B"} + h{"h – h B"} } Bhm{ - h{"h:mm – h:mm B"} - m{"h:mm – h:mm B"} + h{"h:mm – h:mm B"} + m{"h:mm – h:mm B"} } Gy{ - G{"y G – y G"} - y{"y – y G"} + G{"y G – y G"} + y{"y – y G"} } GyM{ - G{"LL/y GGGGG – LL/y GGGGG"} - M{"LL/y – LL/y GGGGG"} - y{"LL/y – LL/y GGGGG"} + G{"LL/y GGGGG – LL/y GGGGG"} + M{"LL/y – LL/y GGGGG"} + y{"LL/y – LL/y GGGGG"} } GyMEd{ - G{"E, dd/MM/y GGGGG – E, dd/MM/y GGGGG"} - M{"E, dd/MM/y – E, dd/MM/y GGGGG"} - d{"E, dd/MM/y – E, dd/MM/y GGGGG"} - y{"E, dd/MM/y – E, dd/MM/y GGGGG"} + G{"E, dd/MM/y GGGGG – E, dd/MM/y GGGGG"} + M{"E, dd/MM/y – E, dd/MM/y GGGGG"} + d{"E, dd/MM/y – E, dd/MM/y GGGGG"} + y{"E, dd/MM/y – E, dd/MM/y GGGGG"} } GyMMM{ - G{"LLL y G – LLL y G"} - M{"LLL – LLL y G"} - y{"LLL y – LLL y G"} + G{"LLL y G – LLL y G"} + M{"LLL – LLL y G"} + y{"LLL y – LLL y G"} } GyMMMEd{ - G{"E, d MMM y G – E, d MMM y G"} - M{"E, d MMM – E, d MMM y G"} - d{"E, d MMM – E, d MMM y G"} - y{"E, d MMM y – E, d MMM y G"} + G{"E, d MMM y G – E, d MMM y G"} + M{"E, d MMM – E, d MMM y G"} + d{"E, d MMM – E, d MMM y G"} + y{"E, d MMM y – E, d MMM y G"} } GyMMMd{ - G{"d MMM y G – d MMM y G"} - M{"d MMM – d MMM y G"} - d{"d – d MMM y G"} - y{"d MMM y – d MMM y G"} + G{"d MMM y G – d MMM y G"} + M{"d MMM – d MMM y G"} + d{"d – d MMM y G"} + y{"d MMM y – d MMM y G"} } GyMd{ - G{"dd/MM/y GGGGG – dd/MM/y GGGGG"} - M{"dd/MM/y – dd/MM/y GGGGG"} - d{"dd/MM/y – dd/MM/y GGGGG"} - y{"dd/MM/y – dd/MM/y GGGGG"} + G{"dd/MM/y GGGGG – dd/MM/y GGGGG"} + M{"dd/MM/y – dd/MM/y GGGGG"} + d{"dd/MM/y – dd/MM/y GGGGG"} + y{"dd/MM/y – dd/MM/y GGGGG"} } H{ - H{"HH – HH"} + H{"HH – HH"} } Hm{ - H{"HH:mm – HH:mm"} - m{"HH:mm – HH:mm"} + H{"HH:mm – HH:mm"} + m{"HH:mm – HH:mm"} } Hmv{ - H{"HH:mm – HH:mm v"} - m{"HH:mm – HH:mm v"} + H{"HH:mm – HH:mm v"} + m{"HH:mm – HH:mm v"} } Hv{ - H{"HH – HH v"} + H{"HH – HH v"} } M{ - M{"L – L"} + M{"L – L"} } MEd{ - M{"E, dd/MM – E, dd/MM"} - d{"E, dd/MM – E, dd/MM"} + M{"E, dd/MM – E, dd/MM"} + d{"E, dd/MM – E, dd/MM"} } MMM{ - M{"LLL – LLL"} + M{"LLL – LLL"} } MMMEd{ - M{"E, dd/MM – E, dd/MM"} - d{"E, dd/MM – E, dd/MM"} + M{"E, dd/MM – E, dd/MM"} + d{"E, dd/MM – E, dd/MM"} } MMMd{ - M{"dd/MM – dd/MM"} - d{"d – d MMM"} + M{"dd/MM – dd/MM"} + d{"d – d MMM"} } Md{ - M{"dd/MM – dd/MM"} - d{"dd/MM – dd/MM"} + M{"dd/MM – dd/MM"} + d{"dd/MM – dd/MM"} } d{ - d{"d – d"} + d{"d – d"} } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h – h a"} + a{"h a – h a"} + h{"h – h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm – h:mm a"} - m{"h:mm – h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm – h:mm a"} + m{"h:mm – h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm – h:mm a v"} - m{"h:mm – h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm – h:mm a v"} + m{"h:mm – h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h – h a v"} + a{"h a – h a v"} + h{"h – h a v"} } y{ - y{"y – y"} + y{"y – y"} } yM{ - M{"LL/y – LL/y"} - y{"LL/y – LL/y"} + M{"LL/y – LL/y"} + y{"LL/y – LL/y"} } yMEd{ - M{"E, dd/MM/y – E, dd/MM/y"} - d{"E, dd/MM/y – E, dd/MM/y"} - y{"E, dd/MM/y – E, dd/MM/y"} + M{"E, dd/MM/y – E, dd/MM/y"} + d{"E, dd/MM/y – E, dd/MM/y"} + y{"E, dd/MM/y – E, dd/MM/y"} } yMMM{ - M{"LLL – LLL y"} - y{"LLL y – LLL y"} + M{"LLL – LLL y"} + y{"LLL y – LLL y"} } yMMMEd{ - M{"E, d MMM – E, d MMM y"} - d{"E, d MMM – E, d MMM y"} - y{"E, d MMM y – E, d MMM y"} + M{"E, d MMM – E, d MMM y"} + d{"E, d MMM – E, d MMM y"} + y{"E, d MMM y – E, d MMM y"} } yMMMM{ - M{"LLLL – LLLL 'di' y"} - y{"LLLL y – LLLL y"} + M{"LLLL – LLLL 'di' y"} + y{"LLLL y – LLLL y"} } yMMMd{ - M{"d MMM – d MMM y"} - d{"d – d MMM y"} - y{"d MMM y – d MMM y"} + M{"d MMM – d MMM y"} + d{"d – d MMM y"} + y{"d MMM y – d MMM y"} } yMd{ - M{"dd/MM/y – dd/MM/y"} - d{"dd/MM/y – dd/MM/y"} - y{"dd/MM/y – dd/MM/y"} + M{"dd/MM/y – dd/MM/y"} + d{"dd/MM/y – dd/MM/y"} + y{"dd/MM/y – dd/MM/y"} } } monthNames{ diff --git a/icu4c/source/data/locales/kgp.txt b/icu4c/source/data/locales/kgp.txt index e2c15e9823a7..79e65bcc0670 100644 --- a/icu4c/source/data/locales/kgp.txt +++ b/icu4c/source/data/locales/kgp.txt @@ -359,8 +359,8 @@ kgp{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"E, d"} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"y G"} GyMMM{"MMM, y G"} GyMMMEd{"E, d 'ne' MMM, y G"} @@ -377,9 +377,9 @@ kgp{ MMMd{"d 'ne' MMM"} Md{"d/M"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"mm:ss"} y{"y G"} yyyy{"y G"} @@ -397,51 +397,51 @@ kgp{ } intervalFormats{ Bh{ - B{"h B – h B"} - h{"h – h B"} + B{"h B – h B"} + h{"h – h B"} } Bhm{ - B{"h:mm B – h:mm B"} - h{"h:mm – h:mm B"} - m{"h:mm – h:mm B"} + B{"h:mm B – h:mm B"} + h{"h:mm – h:mm B"} + m{"h:mm – h:mm B"} } Gy{ - G{"G, y – G, y"} - y{"G, y – y"} + G{"G, y – G, y"} + y{"G, y – y"} } GyM{ - G{"GGGGG MM/y – GGGGG MM/y"} - M{"GGGGG MM/y – MM/y"} - y{"GGGGG MM/y – MM/y"} + G{"GGGGG MM/y – GGGGG MM/y"} + M{"GGGGG MM/y – MM/y"} + y{"GGGGG MM/y – MM/y"} } GyMEd{ - G{"GGGGG E dd/MM/y – GGGGG E dd/MM/y"} - M{"GGGGG E dd/MM/y – E dd/MM/y"} - d{"GGGGG E dd/MM/y – dd/MM/y"} - y{"GGGGG E dd/MM/y – E dd/MM/y"} + G{"GGGGG E dd/MM/y – GGGGG E dd/MM/y"} + M{"GGGGG E dd/MM/y – E dd/MM/y"} + d{"GGGGG E dd/MM/y – dd/MM/y"} + y{"GGGGG E dd/MM/y – E dd/MM/y"} } GyMMM{ - G{"G MMM y – G MMM y"} - M{"G MMM y – MMM"} - y{"G MMM y – MMM y"} + G{"G MMM y – G MMM y"} + M{"G MMM y – MMM"} + y{"G MMM y – MMM y"} } GyMMMEd{ - G{"G E, d 'ne' MMM, y – G E, d 'ne' MMM, y"} - M{"G E, d 'ne' MMM, y – E, d 'ne' MMM"} - d{"G E, d 'ne' MMM, y – E, d 'ne' MMM"} - y{"G E, d 'ne' MMM, y – E, d 'ne' MMM, y"} + G{"G E, d 'ne' MMM, y – G E, d 'ne' MMM, y"} + M{"G E, d 'ne' MMM, y – E, d 'ne' MMM"} + d{"G E, d 'ne' MMM, y – E, d 'ne' MMM"} + y{"G E, d 'ne' MMM, y – E, d 'ne' MMM, y"} } GyMMMd{ - G{"G d 'ne' MMM, y – G d 'ne' MMM, y"} - M{"G d 'ne' MMM, y – d 'ne' MMM"} - d{"G d – d 'ne' MMM, y"} - y{"G d 'ne' MMM, y – d 'ne' MMM, y"} + G{"G d 'ne' MMM, y – G d 'ne' MMM, y"} + M{"G d 'ne' MMM, y – d 'ne' MMM"} + d{"G d – d 'ne' MMM, y"} + y{"G d 'ne' MMM, y – d 'ne' MMM, y"} } GyMd{ - G{"GGGGG dd/MM/y – GGGGG dd/MM/y"} - M{"GGGGG dd/MM/y – dd/MM/y"} - d{"GGGGG dd/MM/y – dd/MM/y"} - y{"GGGGG dd/MM/y – dd/MM/y"} + G{"GGGGG dd/MM/y – GGGGG dd/MM/y"} + M{"GGGGG dd/MM/y – dd/MM/y"} + d{"GGGGG dd/MM/y – dd/MM/y"} + y{"GGGGG dd/MM/y – dd/MM/y"} } H{ H{"HH'h' - HH'h'"} @@ -455,86 +455,86 @@ kgp{ m{"HH:mm–HH:mm v"} } Hv{ - H{"HH – HH v"} + H{"HH – HH v"} } M{ M{"M–M"} } MEd{ - M{"E, dd/MM – E, dd/MM"} - d{"E, dd/MM – E, dd/MM"} + M{"E, dd/MM – E, dd/MM"} + d{"E, dd/MM – E, dd/MM"} } MMM{ - M{"MMM – MMM"} + M{"MMM – MMM"} } MMMEd{ - M{"E, d 'ne' MMM – E, d 'ne' MMM"} - d{"E, d 'ne' MMM – E, d 'ne' MMM"} + M{"E, d 'ne' MMM – E, d 'ne' MMM"} + d{"E, d 'ne' MMM – E, d 'ne' MMM"} } MMMd{ - M{"d 'ne' MMM – d 'ne' MMM"} + M{"d 'ne' MMM – d 'ne' MMM"} d{"d–d 'ne' MMM"} } Md{ - M{"dd/MM – dd/MM"} - d{"dd/MM – dd/MM"} + M{"dd/MM – dd/MM"} + d{"dd/MM – dd/MM"} } d{ d{"d–d"} } fallback{"{0} - {1}"} h{ - a{"h'h' a – h'h' a"} + a{"h'h' a – h'h' a"} h{"h'h' - h'h' a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h – h a v"} + a{"h a – h a v"} + h{"h – h a v"} } y{ - y{"y – y G"} + y{"y – y G"} } yM{ - M{"MM/y – MM/y G"} - y{"MM/y – MM/y G"} + M{"MM/y – MM/y G"} + y{"MM/y – MM/y G"} } yMEd{ - M{"E, dd/MM/y – E, dd/MM/y G"} - d{"E, dd/MM/y – E, dd/MM/y G"} - y{"E, dd/MM/y – E, dd/MM/y G"} + M{"E, dd/MM/y – E, dd/MM/y G"} + d{"E, dd/MM/y – E, dd/MM/y G"} + y{"E, dd/MM/y – E, dd/MM/y G"} } yMMM{ M{"MMM–MMM, y G"} - y{"MMM, y – MMM, y G"} + y{"MMM, y – MMM, y G"} } yMMMEd{ - M{"E, d 'ne' MMM – E, d 'ne' MMM, y G"} - d{"E, d 'ne' MMM – E, d 'ne' MMM, y G"} - y{"E, d 'ne' MMM, y – E, d 'ne' MMM, y G"} + M{"E, d 'ne' MMM – E, d 'ne' MMM, y G"} + d{"E, d 'ne' MMM – E, d 'ne' MMM, y G"} + y{"E, d 'ne' MMM, y – E, d 'ne' MMM, y G"} } yMMMM{ M{"MMMM–MMMM, y G"} - y{"MMMM, y – MMMM, y G"} + y{"MMMM, y – MMMM, y G"} } yMMMd{ - M{"d 'ne' MMM – d 'ne' MMM, y G"} + M{"d 'ne' MMM – d 'ne' MMM, y G"} d{"d–d 'ne' MMM, y"} - y{"d 'ne' MMM, y – d 'ne' MMM, y G"} + y{"d 'ne' MMM, y – d 'ne' MMM, y G"} } yMd{ - M{"dd/MM/y – dd/MM/y G"} - d{"dd/MM/y – dd/MM/y G"} - y{"dd/MM/y – dd/MM/y G"} + M{"dd/MM/y – dd/MM/y G"} + d{"dd/MM/y – dd/MM/y G"} + y{"dd/MM/y – dd/MM/y G"} } } } @@ -579,8 +579,8 @@ kgp{ EHm{"E, HH:mm"} EHms{"E, HH:mm:ss"} Ed{"E, d"} - Ehm{"E, h:mm a"} - Ehms{"E, h:mm:ss a"} + Ehm{"E, h:mm a"} + Ehms{"E, h:mm:ss a"} Gy{"y G"} GyMMM{"MMM, y G"} GyMMMEd{"E, d 'ne' MMM, y G"} @@ -604,11 +604,11 @@ kgp{ MMdd{"dd/MM"} Md{"d/M"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} - hmsv{"h:mm:ss a v"} - hmv{"h:mm a v"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} + hmsv{"h:mm:ss a v"} + hmv{"h:mm a v"} ms{"mm:ss"} y{"y"} yM{"MM/y"} @@ -786,144 +786,144 @@ kgp{ } intervalFormats{ Bh{ - B{"h B – h B"} - h{"h – h B"} + B{"h B – h B"} + h{"h – h B"} } Bhm{ - B{"h:mm B – h:mm B"} - h{"h:mm – h:mm B"} - m{"h:mm – h:mm B"} + B{"h:mm B – h:mm B"} + h{"h:mm – h:mm B"} + m{"h:mm – h:mm B"} } Gy{ - G{"G, y – G, y"} - y{"G, y – y"} + G{"G, y – G, y"} + y{"G, y – y"} } GyM{ - G{"GGGGG MM/y – GGGGG MM/y"} - M{"GGGGG MM/y – MM/y"} - y{"GGGGG MM/y – MM/y"} + G{"GGGGG MM/y – GGGGG MM/y"} + M{"GGGGG MM/y – MM/y"} + y{"GGGGG MM/y – MM/y"} } GyMEd{ - G{"GGGGG E dd/MM/y – GGGGG E dd/MM/y"} - M{"GGGGG E dd/MM/y – E dd/MM/y"} - d{"GGGGG E dd/MM/y – dd/MM/y"} - y{"GGGGG E dd/MM/y – E dd/MM/y"} + G{"GGGGG E dd/MM/y – GGGGG E dd/MM/y"} + M{"GGGGG E dd/MM/y – E dd/MM/y"} + d{"GGGGG E dd/MM/y – dd/MM/y"} + y{"GGGGG E dd/MM/y – E dd/MM/y"} } GyMMM{ - G{"G MMM y – G MMM y"} - M{"G MMM y – MMM"} - y{"G MMM y – MMM y"} + G{"G MMM y – G MMM y"} + M{"G MMM y – MMM"} + y{"G MMM y – MMM y"} } GyMMMEd{ - G{"G E, d 'ne' MMM, y – G E, d 'ne' MMM, y"} - M{"G E, d 'ne' MMM, y – E, d 'ne' MMM"} - d{"G E, d 'ne' MMM, y – E, d 'ne' MMM"} - y{"G E, d 'ne' MMM, y – E, d 'ne' MMM, y"} + G{"G E, d 'ne' MMM, y – G E, d 'ne' MMM, y"} + M{"G E, d 'ne' MMM, y – E, d 'ne' MMM"} + d{"G E, d 'ne' MMM, y – E, d 'ne' MMM"} + y{"G E, d 'ne' MMM, y – E, d 'ne' MMM, y"} } GyMMMd{ - G{"G d 'ne' MMM, y – G d 'ne' MMM, y"} - M{"G d 'ne' MMM, y – d 'ne' MMM"} - d{"G d – d 'ne' MMM, y"} - y{"G d 'ne' MMM, y – d 'ne' MMM, y"} + G{"G d 'ne' MMM, y – G d 'ne' MMM, y"} + M{"G d 'ne' MMM, y – d 'ne' MMM"} + d{"G d – d 'ne' MMM, y"} + y{"G d 'ne' MMM, y – d 'ne' MMM, y"} } GyMd{ - G{"GGGGG dd/MM/y – GGGGG dd/MM/y"} - M{"GGGGG dd/MM/y – dd/MM/y"} - d{"GGGGG dd/MM/y – dd/MM/y"} - y{"GGGGG dd/MM/y – dd/MM/y"} + G{"GGGGG dd/MM/y – GGGGG dd/MM/y"} + M{"GGGGG dd/MM/y – dd/MM/y"} + d{"GGGGG dd/MM/y – dd/MM/y"} + y{"GGGGG dd/MM/y – dd/MM/y"} } H{ H{"HH'h' - HH'h'"} } Hm{ - H{"HH:mm – HH:mm"} - m{"HH:mm – HH:mm"} + H{"HH:mm – HH:mm"} + m{"HH:mm – HH:mm"} } Hmv{ - H{"HH:mm – HH:mm v"} - m{"HH:mm – HH:mm v"} + H{"HH:mm – HH:mm v"} + m{"HH:mm – HH:mm v"} } Hv{ - H{"HH – HH v"} + H{"HH – HH v"} } M{ - M{"M – M"} + M{"M – M"} } MEd{ - M{"E, dd/MM – E, dd/MM"} - d{"E, dd/MM – E, dd/MM"} + M{"E, dd/MM – E, dd/MM"} + d{"E, dd/MM – E, dd/MM"} } MMM{ - M{"MMM – MMM"} + M{"MMM – MMM"} } MMMEd{ - M{"E, d 'ne' MMM – E, d 'ne' MMM"} - d{"E, d – E, d 'ne' MMM"} + M{"E, d 'ne' MMM – E, d 'ne' MMM"} + d{"E, d – E, d 'ne' MMM"} } MMMd{ - M{"d 'ne' MMM – d 'ne' MMM"} - d{"d – d 'ne' MMM"} + M{"d 'ne' MMM – d 'ne' MMM"} + d{"d – d 'ne' MMM"} } Md{ - M{"dd/MM – dd/MM"} - d{"dd/MM – dd/MM"} + M{"dd/MM – dd/MM"} + d{"dd/MM – dd/MM"} } d{ - d{"d – d"} + d{"d – d"} } fallback{"{0} - {1}"} h{ - a{"h a – h a"} - h{"h – h a"} + a{"h a – h a"} + h{"h – h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm – h:mm a"} - m{"h:mm – h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm – h:mm a"} + m{"h:mm – h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm – h:mm a v"} - m{"h:mm – h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm – h:mm a v"} + m{"h:mm – h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h – h a v"} + a{"h a – h a v"} + h{"h – h a v"} } y{ - y{"y – y"} + y{"y – y"} } yM{ - M{"MM/y – MM/y"} - y{"MM/y – MM/y"} + M{"MM/y – MM/y"} + y{"MM/y – MM/y"} } yMEd{ - M{"E, dd/MM/y – E, dd/MM/y"} - d{"E, dd/MM/y – E, dd/MM/y"} - y{"E, dd/MM/y – E, dd/MM/y"} + M{"E, dd/MM/y – E, dd/MM/y"} + d{"E, dd/MM/y – E, dd/MM/y"} + y{"E, dd/MM/y – E, dd/MM/y"} } yMMM{ - M{"MMM – MMM, y"} - y{"MMM, y – MMM, y"} + M{"MMM – MMM, y"} + y{"MMM, y – MMM, y"} } yMMMEd{ - M{"E, d 'ne' MMM – E, d 'ne' MMM, y"} - d{"E, d – E, d 'ne' MMM, y"} - y{"E, d 'ne' MMM, y – E, d 'ne' MMM, y"} + M{"E, d 'ne' MMM – E, d 'ne' MMM, y"} + d{"E, d – E, d 'ne' MMM, y"} + y{"E, d 'ne' MMM, y – E, d 'ne' MMM, y"} } yMMMM{ - M{"MMMM – MMMM, y"} - y{"MMMM, y – MMMM, y"} + M{"MMMM – MMMM, y"} + y{"MMMM, y – MMMM, y"} } yMMMd{ - M{"d 'ne' MMM – d 'ne' MMM, y"} - d{"d – d 'ne' MMM, y"} - y{"d 'ne' MMM, y – d 'ne' MMM, y"} + M{"d 'ne' MMM – d 'ne' MMM, y"} + d{"d – d 'ne' MMM, y"} + y{"d 'ne' MMM, y – d 'ne' MMM, y"} } yMd{ - M{"dd/MM/y – dd/MM/y"} - d{"dd/MM/y – dd/MM/y"} - y{"dd/MM/y – dd/MM/y"} + M{"dd/MM/y – dd/MM/y"} + d{"dd/MM/y – dd/MM/y"} + y{"dd/MM/y – dd/MM/y"} } } monthNames{ diff --git a/icu4c/source/data/locales/ki.txt b/icu4c/source/data/locales/ki.txt index dd49f448ed39..489431542d2d 100644 --- a/icu4c/source/data/locales/ki.txt +++ b/icu4c/source/data/locales/ki.txt @@ -52,7 +52,7 @@ ki{ MMMd{"MMM d"} Md{"M/d"} d{"d"} - hm{"h:mm a"} + hm{"h:mm a"} ms{"mm:ss"} y{"y"} yM{"M/y"} @@ -110,7 +110,7 @@ ki{ MMMd{"MMM d"} Md{"M/d"} d{"d"} - hm{"h:mm a"} + hm{"h:mm a"} ms{"mm:ss"} y{"y"} yM{"M/y"} diff --git a/icu4c/source/data/locales/kk.txt b/icu4c/source/data/locales/kk.txt index c4253d0127c1..10f27014c0b8 100644 --- a/icu4c/source/data/locales/kk.txt +++ b/icu4c/source/data/locales/kk.txt @@ -229,8 +229,8 @@ kk{ "HH:mm:ss z", "HH:mm:ss", "HH:mm", - "G y 'ж'. d MMMM, EEEE", - "G y 'ж'. d MMMM", + "G y 'ж'. d MMMM, EEEE", + "G y 'ж'. d MMMM", "G dd.MM.y", "GGGGG dd.MM.y", "{1} {0}", @@ -259,12 +259,12 @@ kk{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"d, E"} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} - Gy{"G y 'ж'."} - GyMMM{"G y 'ж'. MMM"} - GyMMMEd{"G y 'ж'. d MMM, E"} - GyMMMd{"G y 'ж'. d MMM"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} + Gy{"G y 'ж'."} + GyMMM{"G y 'ж'. MMM"} + GyMMMEd{"G y 'ж'. d MMM, E"} + GyMMMd{"G y 'ж'. d MMM"} GyMd{"d/M/y GGGGG"} H{"HH"} Hm{"HH:mm"} @@ -277,21 +277,21 @@ kk{ MMMd{"d MMM"} Md{"dd.MM"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"mm:ss"} - y{"G y 'ж'."} - yyyy{"G y 'ж'."} + y{"G y 'ж'."} + yyyy{"G y 'ж'."} yyyyM{"GGGGG MM.y"} yyyyMEd{"GGGGG dd.MM.y, E"} - yyyyMMM{"G y 'ж'. MMM"} - yyyyMMMEd{"G y 'ж'. d MMM, E"} - yyyyMMMM{"G y 'ж'. MMMM"} - yyyyMMMd{"G y 'ж'. d MMM"} + yyyyMMM{"G y 'ж'. MMM"} + yyyyMMMEd{"G y 'ж'. d MMM, E"} + yyyyMMMM{"G y 'ж'. MMMM"} + yyyyMMMd{"G y 'ж'. d MMM"} yyyyMd{"GGGGG dd.MM.y"} - yyyyQQQ{"G y 'ж'. QQQ"} - yyyyQQQQ{"G y 'ж'. QQQQ"} + yyyyQQQ{"G y 'ж'. QQQ"} + yyyyQQQQ{"G y 'ж'. QQQQ"} } intervalFormats{ Bh{ @@ -304,16 +304,16 @@ kk{ m{"h:mm – h:mm B"} } GyMMMEd{ - G{"G y 'ж'. d MMM, E – G y 'ж'. d MMM, E"} - M{"G y 'ж'. d MMM, E – d MMM, E"} - d{"G y 'ж'. d MMM, E – d MMM, E"} - y{"G y 'ж'. d MMM, E – y 'ж'. d MMM, E"} + G{"G y 'ж'. d MMM, E – G y 'ж'. d MMM, E"} + M{"G y 'ж'. d MMM, E – d MMM, E"} + d{"G y 'ж'. d MMM, E – d MMM, E"} + y{"G y 'ж'. d MMM, E – y 'ж'. d MMM, E"} } GyMMMd{ - G{"G y 'ж'. d MMM – G y 'ж'. d MMM"} - M{"G y 'ж'. d MMM – d MMM"} - d{"G y 'ж'. d–d MMM"} - y{"G y 'ж'. d MMM – y 'ж'. d MMM"} + G{"G y 'ж'. d MMM – G y 'ж'. d MMM"} + M{"G y 'ж'. d MMM – d MMM"} + d{"G y 'ж'. d–d MMM"} + y{"G y 'ж'. d MMM – y 'ж'. d MMM"} } H{ H{"HH–HH"} @@ -356,21 +356,21 @@ kk{ } fallback{"{0} - {1}"} h{ - h{"h–h a"} + h{"h–h a"} } hm{ - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - h{"h–h a v"} + h{"h–h a v"} } y{ - y{"G y–y 'жж'."} + y{"G y–y 'жж'."} } yM{ M{"GGGGG MM.y – MM.y"} @@ -382,22 +382,22 @@ kk{ y{"GGGGG dd.MM.y, E – dd.MM.y, E"} } yMMM{ - M{"G y 'ж'. MMM–MMM"} - y{"G y 'ж'. MMM – y 'ж'. MMM"} + M{"G y 'ж'. MMM–MMM"} + y{"G y 'ж'. MMM – y 'ж'. MMM"} } yMMMEd{ - M{"G y 'ж'. d MMM, E – d MMM, E"} - d{"G y 'ж'. d MMM, E – d MMM, E"} - y{"G y 'ж'. d MMM, E – y 'ж'. d MMM, E"} + M{"G y 'ж'. d MMM, E – d MMM, E"} + d{"G y 'ж'. d MMM, E – d MMM, E"} + y{"G y 'ж'. d MMM, E – y 'ж'. d MMM, E"} } yMMMM{ - M{"G y 'ж'. MMMM – MMMM"} - y{"G y 'ж'. MMMM – y 'ж'. MMMM"} + M{"G y 'ж'. MMMM – MMMM"} + y{"G y 'ж'. MMMM – y 'ж'. MMMM"} } yMMMd{ - M{"G y 'ж'. d MMM – d MMM"} - d{"G y 'ж'. d–d MMM"} - y{"G y 'ж'. d MMM – y 'ж'. d MMM"} + M{"G y 'ж'. d MMM – d MMM"} + d{"G y 'ж'. d–d MMM"} + y{"G y 'ж'. d MMM – y 'ж'. d MMM"} } yMd{ M{"GGGGG dd.MM.y – dd.MM.y"} @@ -424,9 +424,9 @@ kk{ "HH:mm:ss z", "HH:mm:ss", "HH:mm", - "y 'ж'. d MMMM, EEEE", - "y 'ж'. d MMMM", - "y 'ж'. dd MMM", + "y 'ж'. d MMMM, EEEE", + "y 'ж'. d MMMM", + "y 'ж'. dd MMM", "dd.MM.yy", "{1}, {0}", "{1}, {0}", @@ -457,12 +457,12 @@ kk{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"d, E"} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} - Gy{"G y 'ж'."} - GyMMM{"G y 'ж'. MMM"} - GyMMMEd{"G y 'ж'. d MMM, E"} - GyMMMd{"G y 'ж'. d MMM"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} + Gy{"G y 'ж'."} + GyMMM{"G y 'ж'. MMM"} + GyMMMEd{"G y 'ж'. d MMM, E"} + GyMMMd{"G y 'ж'. d MMM"} GyMd{"dd-MM-GGGGG y"} H{"HH"} Hm{"HH:mm"} @@ -481,22 +481,22 @@ kk{ MMMd{"d MMM"} Md{"dd.MM"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} - hmsv{"h:mm:ss a v"} - hmv{"h:mm a v"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} + hmsv{"h:mm:ss a v"} + hmv{"h:mm a v"} ms{"mm:ss"} y{"y"} yM{"MM.y"} yMEd{"dd.MM.y, E"} - yMMM{"y 'ж'. MMM"} - yMMMEd{"y 'ж'. d MMM, E"} - yMMMM{"y 'ж'. MMMM"} - yMMMd{"y 'ж'. d MMM"} + yMMM{"y 'ж'. MMM"} + yMMMEd{"y 'ж'. d MMM, E"} + yMMMM{"y 'ж'. MMMM"} + yMMMd{"y 'ж'. d MMM"} yMd{"dd.MM.y"} - yQQQ{"y 'ж'. QQQ"} - yQQQQ{"y 'ж'. QQQQ"} + yQQQ{"y 'ж'. QQQ"} + yQQQQ{"y 'ж'. QQQQ"} yw{ one{"Y 'жылдың' w-'аптасы'"} other{"Y 'жылдың' w-'аптасы'"} @@ -669,16 +669,16 @@ kk{ m{"h:mm – h:mm B"} } GyMMMEd{ - G{"G y 'ж'. d MMM, E – G y 'ж'. d MMM, E"} - M{"G y 'ж'. d MMM, E – d MMM, E"} - d{"G y 'ж'. d MMM, E – d MMM, E"} - y{"G y 'ж'. d MMM, E – y 'ж'. d MMM, E"} + G{"G y 'ж'. d MMM, E – G y 'ж'. d MMM, E"} + M{"G y 'ж'. d MMM, E – d MMM, E"} + d{"G y 'ж'. d MMM, E – d MMM, E"} + y{"G y 'ж'. d MMM, E – y 'ж'. d MMM, E"} } GyMMMd{ - G{"G y 'ж'. d MMM – G y 'ж'. d MMM"} - M{"G y 'ж'. d MMM – d MMM"} - d{"G y 'ж'. d–d MMM"} - y{"G y 'ж'. d MMM – y 'ж'. d MMM"} + G{"G y 'ж'. d MMM – G y 'ж'. d MMM"} + M{"G y 'ж'. d MMM – d MMM"} + d{"G y 'ж'. d–d MMM"} + y{"G y 'ж'. d MMM – y 'ж'. d MMM"} } H{ H{"HH–HH"} @@ -721,22 +721,22 @@ kk{ } fallback{"{0} - {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y"} @@ -751,22 +751,22 @@ kk{ y{"dd.MM.y, E – dd.MM.y, E"} } yMMM{ - M{"y 'ж'. MMM–MMM"} - y{"y 'ж'. MMM – y 'ж'. MMM"} + M{"y 'ж'. MMM–MMM"} + y{"y 'ж'. MMM – y 'ж'. MMM"} } yMMMEd{ - M{"y 'ж'. d MMM, E – d MMM, E"} - d{"y 'ж'. d MMM, E – y 'ж'. d MMM, E"} - y{"y 'ж'. d MMM, E – y 'ж'. d MMM, E"} + M{"y 'ж'. d MMM, E – d MMM, E"} + d{"y 'ж'. d MMM, E – y 'ж'. d MMM, E"} + y{"y 'ж'. d MMM, E – y 'ж'. d MMM, E"} } yMMMM{ - M{"y 'ж'. MMMM – MMMM"} - y{"y 'ж'. MMMM – y 'ж'. MMMM"} + M{"y 'ж'. MMMM – MMMM"} + y{"y 'ж'. MMMM – y 'ж'. MMMM"} } yMMMd{ - M{"y 'ж'. d MMM – d MMM"} - d{"y 'ж'. d–d MMM"} - y{"y 'ж'. d MMM – y 'ж'. d MMM"} + M{"y 'ж'. d MMM – d MMM"} + d{"y 'ж'. d–d MMM"} + y{"y 'ж'. d MMM – y 'ж'. d MMM"} } yMd{ M{"dd.MM.y – dd.MM.y"} diff --git a/icu4c/source/data/locales/kln.txt b/icu4c/source/data/locales/kln.txt index aa2bc5e0b0a3..709d135117d3 100644 --- a/icu4c/source/data/locales/kln.txt +++ b/icu4c/source/data/locales/kln.txt @@ -52,7 +52,7 @@ kln{ MMMd{"MMM d"} Md{"M/d"} d{"d"} - hm{"h:mm a"} + hm{"h:mm a"} ms{"mm:ss"} y{"y"} yM{"M/y"} @@ -110,7 +110,7 @@ kln{ MMMd{"MMM d"} Md{"M/d"} d{"d"} - hm{"h:mm a"} + hm{"h:mm a"} ms{"mm:ss"} y{"y"} yM{"M/y"} diff --git a/icu4c/source/data/locales/km.txt b/icu4c/source/data/locales/km.txt index d85cdf4bd3a9..8d8e2fab7f2f 100644 --- a/icu4c/source/data/locales/km.txt +++ b/icu4c/source/data/locales/km.txt @@ -195,6 +195,12 @@ km{ "d MMM y G", "d/M/y GGGGG", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{1} នៅ​ម៉ោង {0}", "{1} នៅ​ម៉ោង {0}", "{1}, {0}", @@ -417,6 +423,12 @@ km{ "d MMM y", "d/M/yy", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{1} នៅ​ម៉ោង {0}", "{1} នៅ​ម៉ោង {0}", "{1}, {0}", diff --git a/icu4c/source/data/locales/kn.txt b/icu4c/source/data/locales/kn.txt index 3893305803be..dc429f3ed9e0 100644 --- a/icu4c/source/data/locales/kn.txt +++ b/icu4c/source/data/locales/kn.txt @@ -502,6 +502,12 @@ kn{ "G y MMM d", "GGGGG y-MM-dd", "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + } + DateTimePatterns%atTime{ "{1} {0}ದಲ್ಲಿ", "{1} {0}ದಲ್ಲಿ", "{1} {0}", diff --git a/icu4c/source/data/locales/ks.txt b/icu4c/source/data/locales/ks.txt index e03c60a8c51a..f235e94fea58 100644 --- a/icu4c/source/data/locales/ks.txt +++ b/icu4c/source/data/locales/ks.txt @@ -61,6 +61,12 @@ ks{ "MMM d, y G", "M/d/y GGGGG", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{0} پٮ۪ٹھۍ {1}", "{0} پٮ۪ٹھۍ {1}", "{1}, {0}", @@ -117,6 +123,12 @@ ks{ "MMM d, y", "M/d/yy", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{0} پٮ۪ٹھۍ {1}", "{0} پٮ۪ٹھۍ {1}", "{1}, {0}", diff --git a/icu4c/source/data/locales/ks_Deva.txt b/icu4c/source/data/locales/ks_Deva.txt index e028020aa12d..9d472b1a79eb 100644 --- a/icu4c/source/data/locales/ks_Deva.txt +++ b/icu4c/source/data/locales/ks_Deva.txt @@ -5,7 +5,7 @@ ks_Deva{ %%Parent{"root"} AuxExemplarCharacters{"[\u200C\u200D]"} ExemplarCharacters{ - "[\u093C \u0902 \u0901 अ आ इ ई उ ऊ ए ऑ ओ क ख ग च {च\u093C} छ {छ\u093C} ज ट ठ " + "[\u093C \u0901 \u0902 अ आ इ ई उ ऊ ए ऑ ओ क ख ग च {च\u093C} छ {छ\u093C} ज ट ठ " "ड त थ द न प फ ब म य र ल व श स ह ा ि ी \u0941 \u0942 \u0943 \u0944 \u0945 " "\u0947 \u0948 ॉ ो ौ \u094D]" } @@ -27,6 +27,12 @@ ks_Deva{ "G y MMM d", "GGGGG y-MM-dd", "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + } + DateTimePatterns%atTime{ "{0} पेठ {1}", "{0} पेठ {1}", "{1} {0}", @@ -44,6 +50,12 @@ ks_Deva{ "d MMM y", "d/M/yy", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{0} पेठ {1}", "{0} पेठ {1}", "{1}, {0}", diff --git a/icu4c/source/data/locales/ksb.txt b/icu4c/source/data/locales/ksb.txt index 717acd31f269..7c2828beeb49 100644 --- a/icu4c/source/data/locales/ksb.txt +++ b/icu4c/source/data/locales/ksb.txt @@ -51,7 +51,7 @@ ksb{ MMMd{"MMM d"} Md{"M/d"} d{"d"} - hm{"h:mm a"} + hm{"h:mm a"} ms{"mm:ss"} y{"y"} yM{"M/y"} @@ -109,7 +109,7 @@ ksb{ MMMd{"MMM d"} Md{"M/d"} d{"d"} - hm{"h:mm a"} + hm{"h:mm a"} ms{"mm:ss"} y{"y"} yM{"M/y"} diff --git a/icu4c/source/data/locales/ksf.txt b/icu4c/source/data/locales/ksf.txt index a0eda659de5a..e37a39ceea1c 100644 --- a/icu4c/source/data/locales/ksf.txt +++ b/icu4c/source/data/locales/ksf.txt @@ -59,8 +59,8 @@ ksf{ MMMd{"d MMM"} Md{"d/M"} d{"d"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"m:ss"} y{"y"} yM{"M/y"} @@ -118,8 +118,8 @@ ksf{ MMMd{"d MMM"} Md{"d/M"} d{"d"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"m:ss"} y{"y"} yM{"M/y"} diff --git a/icu4c/source/data/locales/ksh.txt b/icu4c/source/data/locales/ksh.txt index ddc0668c2602..79e705ec19f0 100644 --- a/icu4c/source/data/locales/ksh.txt +++ b/icu4c/source/data/locales/ksh.txt @@ -227,8 +227,8 @@ ksh{ MMMMd{"d. MMMM"} MMMd{"d. MMM"} d{"d"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"mm:ss"} y{"y"} yM{"Y-MM"} @@ -255,30 +255,30 @@ ksh{ d{"d–d"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } y{ y{"y–y"} } yMEd{ - M{"E y-MM-dd – E y-MM-dd"} - d{"E y-MM-dd – E y-MM-dd"} - y{"E y-MM-dd – E y-MM-dd"} + M{"E y-MM-dd – E y-MM-dd"} + d{"E y-MM-dd – E y-MM-dd"} + y{"E y-MM-dd – E y-MM-dd"} } yMMM{ M{"MMM–MMM y"} - y{"MMM. y – MMM. y"} + y{"MMM. y – MMM. y"} } yMMMEd{ - M{"E y-MM-dd – E y-MM-dd"} - d{"E y-MM-dd – E y-MM-dd"} - y{"E y-MM-dd – E y-MM-dd"} + M{"E y-MM-dd – E y-MM-dd"} + d{"E y-MM-dd – E y-MM-dd"} + y{"E y-MM-dd – E y-MM-dd"} } yMMMM{ M{"MMMM–MMMM y"} - y{"MMMM y – MMMM y"} + y{"MMMM y – MMMM y"} } } } @@ -327,8 +327,8 @@ ksh{ MMMMd{"d. MMMM"} MMMd{"d. MMM"} d{"d"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"mm:ss"} y{"y"} yM{"Y-MM"} @@ -440,33 +440,33 @@ ksh{ d{"d–d"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } y{ y{"y–y"} } yMEd{ - M{"E y-MM-dd – E y-MM-dd"} - d{"E y-MM-dd – E y-MM-dd"} - y{"E y-MM-dd – E y-MM-dd"} + M{"E y-MM-dd – E y-MM-dd"} + d{"E y-MM-dd – E y-MM-dd"} + y{"E y-MM-dd – E y-MM-dd"} } yMMM{ M{"MMM–MMM y"} - y{"MMM. y – MMM. y"} + y{"MMM. y – MMM. y"} } yMMMEd{ - M{"E y-MM-dd – E y-MM-dd"} - d{"E y-MM-dd – E y-MM-dd"} - y{"E y-MM-dd – E y-MM-dd"} + M{"E y-MM-dd – E y-MM-dd"} + d{"E y-MM-dd – E y-MM-dd"} + y{"E y-MM-dd – E y-MM-dd"} } yMMMM{ M{"MMMM–MMMM y"} - y{"MMMM y – MMMM y"} + y{"MMMM y – MMMM y"} } yMMMd{ - M{"y MMM d – MMM d"} + M{"y MMM d – MMM d"} d{"d.–d. MMMM y"} } } diff --git a/icu4c/source/data/locales/ky.txt b/icu4c/source/data/locales/ky.txt index 4e864a985226..699f7b54e552 100644 --- a/icu4c/source/data/locales/ky.txt +++ b/icu4c/source/data/locales/ky.txt @@ -252,8 +252,8 @@ ky{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"d, E"} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"G y"} GyMMM{"G y MMM"} GyMMMEd{"G y-'ж'. d-MMM, E"} @@ -269,9 +269,9 @@ ky{ MMMd{"d-MMM"} Md{"dd/MM"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"mm:ss"} y{"y-G"} yyyy{"y-G"} @@ -336,7 +336,7 @@ ky{ } fallback{"{0} - {1}"} hmv{ - m{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } y{ y{"y-'ж'.–y-'ж'. G"} @@ -426,8 +426,8 @@ ky{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"d, E"} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"G y-'ж'."} GyMMM{"G y-'ж'. MMM"} GyMMMEd{"G y-'ж'. d-MMM, E"} @@ -449,11 +449,11 @@ ky{ MMMd{"d-MMM"} Md{"dd-MM"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} - hmsv{"h:mm:ss a v"} - hmv{"h:mm a v"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} + hmsv{"h:mm:ss a v"} + hmv{"h:mm a v"} ms{"mm:ss"} y{"y"} yM{"y-MM"} @@ -673,22 +673,22 @@ ky{ } fallback{"{0} - {1}"} h{ - a{"a h – a h"} - h{"a h–h"} + a{"a h – a h"} + h{"a h–h"} } hm{ - a{"a h:mm – a h:mm"} - h{"a h:mm–h:mm"} - m{"a h:mm–h:mm"} + a{"a h:mm – a h:mm"} + h{"a h:mm–h:mm"} + m{"a h:mm–h:mm"} } hmv{ - a{"a h:mm – a h:mm v"} - h{"a h:mm–h:mm v"} - m{"a h:mm–h:mm v"} + a{"a h:mm – a h:mm v"} + h{"a h:mm–h:mm v"} + m{"a h:mm–h:mm v"} } hv{ - a{"a h – a h v"} - h{"a h–h v"} + a{"a h – a h v"} + h{"a h–h v"} } y{ y{"y–y"} diff --git a/icu4c/source/data/locales/lag.txt b/icu4c/source/data/locales/lag.txt index 9a34ab7a5c8c..faa46b454479 100644 --- a/icu4c/source/data/locales/lag.txt +++ b/icu4c/source/data/locales/lag.txt @@ -43,7 +43,7 @@ lag{ MMMd{"MMM d"} Md{"M/d"} d{"d"} - hm{"h:mm a"} + hm{"h:mm a"} ms{"mm:ss"} y{"y"} yM{"M/y"} @@ -101,7 +101,7 @@ lag{ MMMd{"MMM d"} Md{"M/d"} d{"d"} - hm{"h:mm a"} + hm{"h:mm a"} ms{"mm:ss"} y{"y"} yM{"M/y"} diff --git a/icu4c/source/data/locales/lb.txt b/icu4c/source/data/locales/lb.txt index b9a47e74075a..53074e686d9b 100644 --- a/icu4c/source/data/locales/lb.txt +++ b/icu4c/source/data/locales/lb.txt @@ -298,11 +298,11 @@ lb{ M{"MMM–MMM"} } MMMEd{ - M{"E, d. MMM – E, d. MMM"} + M{"E, d. MMM – E, d. MMM"} d{"E, d. – E, d. MMM"} } MMMd{ - M{"d. MMM – d. MMM"} + M{"d. MMM – d. MMM"} d{"d.–d. MMM"} } Md{ @@ -317,36 +317,36 @@ lb{ y{"y–y G"} } yM{ - M{"MM.y – MM.y G"} - y{"MM.y – MM.y G"} + M{"MM.y – MM.y G"} + y{"MM.y – MM.y G"} } yMEd{ - M{"E, dd.MM.y – E, dd.MM.y G"} - d{"E, dd.MM.y – E, dd.MM.y G"} - y{"E, dd.MM.y – E, dd.MM.y G"} + M{"E, dd.MM.y – E, dd.MM.y G"} + d{"E, dd.MM.y – E, dd.MM.y G"} + y{"E, dd.MM.y – E, dd.MM.y G"} } yMMM{ M{"MMM–MMM y G"} - y{"MMM y – MMM y G"} + y{"MMM y – MMM y G"} } yMMMEd{ - M{"E, d. MMM – E, d. MMM y G"} + M{"E, d. MMM – E, d. MMM y G"} d{"E, d. – E, d. MMM y G"} - y{"E, d. MMM y – E, d. MMM y G"} + y{"E, d. MMM y – E, d. MMM y G"} } yMMMM{ M{"MMMM–MMMM y G"} - y{"MMMM y – MMMM y G"} + y{"MMMM y – MMMM y G"} } yMMMd{ - M{"d. MMM – d. MMM y G"} + M{"d. MMM – d. MMM y G"} d{"d.–d. MMM y G"} - y{"d. MMM y – d. MMM y G"} + y{"d. MMM y – d. MMM y G"} } yMd{ - M{"dd.MM.y – dd.MM.y G"} - d{"dd.MM.y – dd.MM.y G"} - y{"dd.MM.y – dd.MM.y G"} + M{"dd.MM.y – dd.MM.y G"} + d{"dd.MM.y – dd.MM.y G"} + y{"dd.MM.y – dd.MM.y G"} } } } @@ -396,8 +396,8 @@ lb{ EHm{"E, HH:mm"} EHms{"E, HH:mm:ss"} Ed{"E, d."} - Ehm{"E, h:mm a"} - Ehms{"E, h:mm:ss a"} + Ehm{"E, h:mm a"} + Ehms{"E, h:mm:ss a"} Gy{"y G"} GyMMM{"MMM y G"} GyMMMEd{"E, d. MMM y G"} @@ -413,9 +413,9 @@ lb{ MMMd{"d. MMM"} Md{"d.M."} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"mm:ss"} y{"y"} yM{"M.y"} @@ -546,11 +546,11 @@ lb{ M{"MMM–MMM"} } MMMEd{ - M{"E, d. MMM – E, d. MMM"} + M{"E, d. MMM – E, d. MMM"} d{"E, d. – E, d. MMM"} } MMMd{ - M{"d. MMM – d. MMM"} + M{"d. MMM – d. MMM"} d{"d.–d. MMM"} } Md{ @@ -562,57 +562,57 @@ lb{ } fallback{"{0} - {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y"} } yM{ - M{"MM.y – MM.y"} - y{"MM.y – MM.y"} + M{"MM.y – MM.y"} + y{"MM.y – MM.y"} } yMEd{ - M{"E, dd.MM.y – E, dd.MM.y"} - d{"E, dd.MM.y – E, dd.MM.y"} - y{"E, dd.MM.y – E, dd.MM.y"} + M{"E, dd.MM.y – E, dd.MM.y"} + d{"E, dd.MM.y – E, dd.MM.y"} + y{"E, dd.MM.y – E, dd.MM.y"} } yMMM{ M{"MMM–MMM y"} - y{"MMM y – MMM y"} + y{"MMM y – MMM y"} } yMMMEd{ - M{"E, d. MMM – E, d. MMM y"} + M{"E, d. MMM – E, d. MMM y"} d{"E, d. – E, d. MMM y"} - y{"E, d. MMM y – E, d. MMM y"} + y{"E, d. MMM y – E, d. MMM y"} } yMMMM{ M{"MMMM–MMMM y"} - y{"MMMM y – MMMM y"} + y{"MMMM y – MMMM y"} } yMMMd{ - M{"d. MMM – d. MMM y"} + M{"d. MMM – d. MMM y"} d{"d.–d. MMM y"} - y{"d. MMM y – d. MMM y"} + y{"d. MMM y – d. MMM y"} } yMd{ - M{"dd.MM.y – dd.MM.y"} - d{"dd.MM.y – dd.MM.y"} - y{"dd.MM.y – dd.MM.y"} + M{"dd.MM.y – dd.MM.y"} + d{"dd.MM.y – dd.MM.y"} + y{"dd.MM.y – dd.MM.y"} } } monthNames{ diff --git a/icu4c/source/data/locales/lg.txt b/icu4c/source/data/locales/lg.txt index 176b49e43660..b1298477b4f5 100644 --- a/icu4c/source/data/locales/lg.txt +++ b/icu4c/source/data/locales/lg.txt @@ -51,7 +51,7 @@ lg{ MMMd{"MMM d"} Md{"M/d"} d{"d"} - hm{"h:mm a"} + hm{"h:mm a"} ms{"mm:ss"} y{"y"} yM{"M/y"} @@ -101,7 +101,7 @@ lg{ MMMd{"MMM d"} Md{"M/d"} d{"d"} - hm{"h:mm a"} + hm{"h:mm a"} ms{"mm:ss"} y{"y"} yM{"M/y"} diff --git a/icu4c/source/data/locales/lkt.txt b/icu4c/source/data/locales/lkt.txt index ec9ad0ff6e58..d4e7f9d018a1 100644 --- a/icu4c/source/data/locales/lkt.txt +++ b/icu4c/source/data/locales/lkt.txt @@ -13,10 +13,10 @@ lkt{ calendar{ gregorian{ DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE, MMMM d, y", "MMMM d, y", "MMM d, y", diff --git a/icu4c/source/data/locales/ln.txt b/icu4c/source/data/locales/ln.txt index 48439dbb2ccf..205b2d1d54ee 100644 --- a/icu4c/source/data/locales/ln.txt +++ b/icu4c/source/data/locales/ln.txt @@ -63,8 +63,8 @@ ln{ MMMd{"d MMM"} Md{"d/M"} d{"d"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"m:ss"} y{"y"} yM{"M/y"} @@ -122,8 +122,8 @@ ln{ MMMd{"d MMM"} Md{"d/M"} d{"d"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"m:ss"} y{"y"} yM{"M/y"} diff --git a/icu4c/source/data/locales/lt.txt b/icu4c/source/data/locales/lt.txt index ba0469eca62e..aae9b0449a1b 100644 --- a/icu4c/source/data/locales/lt.txt +++ b/icu4c/source/data/locales/lt.txt @@ -1300,8 +1300,8 @@ lt{ EHm{"HH:mm, E"} EHms{"HH:mm:ss, E"} Ed{"d, E"} - Ehm{"h:mm a, E"} - Ehms{"h:mm:ss a, E"} + Ehm{"h:mm a, E"} + Ehms{"h:mm:ss a, E"} Gy{"y G"} GyMMM{"y MMM G"} GyMMMEd{"y MMM d G, E"} @@ -1318,9 +1318,9 @@ lt{ MMdd{"MM.dd"} Md{"MM-dd"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"mm:ss"} y{"y G"} yyyy{"y G"} @@ -1353,15 +1353,15 @@ lt{ M{"M–M"} } MEd{ - M{"MM-dd, E – MM-dd, E"} - d{"MM-dd, E – MM-dd, E"} + M{"MM-dd, E – MM-dd, E"} + d{"MM-dd, E – MM-dd, E"} } MMM{ M{"MMM–MMM"} } MMMEd{ - M{"MMM d, E – MMM d, E"} - d{"MMM d, E – MMM d, E"} + M{"MMM d, E – MMM d, E"} + d{"MMM d, E – MMM d, E"} } MMMd{ M{"MMM d–MMM d"} @@ -1376,57 +1376,57 @@ lt{ } fallback{"{0} – {1}"} h{ - a{"h a–h a"} - h{"h–h a"} + a{"h a–h a"} + h{"h–h a"} } hm{ - a{"hh:mm a–hh:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"hh:mm a–hh:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"hh:mm a–hh:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"hh:mm a–hh:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a–h a v"} - h{"h–h a v"} + a{"h a–h a v"} + h{"h–h a v"} } y{ y{"y–y G"} } yM{ - M{"y-MM – y-MM G"} - y{"y-MM – y-MM G"} + M{"y-MM – y-MM G"} + y{"y-MM – y-MM G"} } yMEd{ - M{"y-MM-dd G, E – y-MM-dd G, E"} - d{"y-MM-dd G, E – y-MM-dd G, E"} - y{"y-MM-dd G, E – y-MM-dd G, E"} + M{"y-MM-dd G, E – y-MM-dd G, E"} + d{"y-MM-dd G, E – y-MM-dd G, E"} + y{"y-MM-dd G, E – y-MM-dd G, E"} } yMMM{ M{"y MMM–MMM G"} - y{"y-MM – y-MM G"} + y{"y-MM – y-MM G"} } yMMMEd{ - M{"y-MM-dd G, E – y-MM-dd G, E"} - d{"y-MM-dd G, E – y-MM-dd G, E"} - y{"y-MM-dd G, E – y-MM-dd G, E"} + M{"y-MM-dd G, E – y-MM-dd G, E"} + d{"y-MM-dd G, E – y-MM-dd G, E"} + y{"y-MM-dd G, E – y-MM-dd G, E"} } yMMMM{ - M{"y LLLL – y LLLL G"} - y{"y LLLL – y LLLL G"} + M{"y LLLL – y LLLL G"} + y{"y LLLL – y LLLL G"} } yMMMd{ - M{"y-MM-dd – MM-d G"} + M{"y-MM-dd – MM-d G"} d{"y 'm'. MMM d 'd'.–d 'd'. G"} - y{"y-MM-dd – y-MM-dd G"} + y{"y-MM-dd – y-MM-dd G"} } yMd{ M{"y-MM-dd– y-MM-dd G"} d{"y-MM-dd–y-MM-dd G"} - y{"y-MM-dd – y-MM-dd G"} + y{"y-MM-dd – y-MM-dd G"} } } } @@ -1481,8 +1481,8 @@ lt{ EHm{"HH:mm, E"} EHms{"HH:mm:ss, E"} Ed{"d, E"} - Ehm{"hh:mm a, E"} - Ehms{"hh:mm:ss a, E"} + Ehm{"hh:mm a, E"} + Ehms{"hh:mm:ss a, E"} Gy{"y 'm'. G"} GyMMM{"y-MM G"} GyMMMEd{"y-MM-dd G, E"} @@ -1512,11 +1512,11 @@ lt{ MMdd{"MM-dd"} Md{"MM-d"} d{"dd"} - h{"hh a"} - hm{"hh:mm a"} - hms{"hh:mm:ss a"} - hmsv{"hh:mm:ss a; v"} - hmv{"hh:mm a; v"} + h{"hh a"} + hm{"hh:mm a"} + hms{"hh:mm:ss a"} + hmsv{"hh:mm:ss a; v"} + hmv{"hh:mm a; v"} ms{"mm:ss"} y{"y"} yM{"y-MM"} @@ -1699,7 +1699,7 @@ lt{ } intervalFormats{ Bh{ - B{"h B – h B"} + B{"h B – h B"} h{"hh–hh B"} } Bhm{ @@ -1708,42 +1708,42 @@ lt{ m{"hh:mm–hh:mm B"} } Gy{ - G{"G y – G y"} + G{"G y – G y"} y{"G y–y"} } GyM{ - G{"GGGGG y-MM – GGGGG y-MM"} - M{"GGGGG y-MM – y-MM"} - y{"GGGGG y-MM – y-MM"} + G{"GGGGG y-MM – GGGGG y-MM"} + M{"GGGGG y-MM – y-MM"} + y{"GGGGG y-MM – y-MM"} } GyMEd{ - G{"GGGGG y-MM-dd, E – GGGGG y-MM-dd, E"} - M{"GGGGG y-MM-dd, E – y-MM-dd, E"} - d{"GGGGG y-MM-dd, E – y-MM-dd, E"} - y{"GGGGG y-MM-dd, E – y-MM-dd, E"} + G{"GGGGG y-MM-dd, E – GGGGG y-MM-dd, E"} + M{"GGGGG y-MM-dd, E – y-MM-dd, E"} + d{"GGGGG y-MM-dd, E – y-MM-dd, E"} + y{"GGGGG y-MM-dd, E – y-MM-dd, E"} } GyMMM{ - G{"G y MMM – G y MMM"} + G{"G y MMM – G y MMM"} M{"G y MMM–MMM"} - y{"G y MMM – y MMM"} + y{"G y MMM – y MMM"} } GyMMMEd{ - G{"G y MMM d, E – G y MMM d, E"} - M{"G y MMM d, E – MMM d, E"} - d{"G y MMM d, E – MMM d, E"} - y{"G y MMM d, E – y MMM d, E"} + G{"G y MMM d, E – G y MMM d, E"} + M{"G y MMM d, E – MMM d, E"} + d{"G y MMM d, E – MMM d, E"} + y{"G y MMM d, E – y MMM d, E"} } GyMMMd{ - G{"G y MMM d – G y MMM d"} - M{"G y MMM d – MMM d"} + G{"G y MMM d – G y MMM d"} + M{"G y MMM d – MMM d"} d{"G y MMM d–d"} - y{"G y MMM d – y MMM d"} + y{"G y MMM d – y MMM d"} } GyMd{ - G{"GGGGG y-MM-dd – GGGGG y-MM-dd"} - M{"GGGGG y-MM-dd – y-MM-dd"} - d{"GGGGG y-MM-dd – y-MM-dd"} - y{"GGGGG y-MM-dd – y-MM-dd"} + G{"GGGGG y-MM-dd – GGGGG y-MM-dd"} + M{"GGGGG y-MM-dd – y-MM-dd"} + d{"GGGGG y-MM-dd – y-MM-dd"} + y{"GGGGG y-MM-dd – y-MM-dd"} } H{ H{"HH–HH"} @@ -1763,101 +1763,101 @@ lt{ M{"MM–MM"} } MEd{ - M{"MM-dd, E – MM-dd, E"} - d{"MM-dd, E – MM-dd, E"} + M{"MM-dd, E – MM-dd, E"} + d{"MM-dd, E – MM-dd, E"} } MMM{ M{"LLL–LLL"} } MMMEd{ - M{"MMM d, E – MMM d, E"} - d{"MMM d, E – MMM d, E"} + M{"MMM d, E – MMM d, E"} + d{"MMM d, E – MMM d, E"} } MMMM{ M{"LLLL–LLLL"} } MMMMEd{ - M{"MMMM d, E – MMMM d, E"} - d{"MMMM d, E – MMMM d, E"} + M{"MMMM d, E – MMMM d, E"} + d{"MMMM d, E – MMMM d, E"} } MMMMd{ - M{"MMMM d – MMMM d"} + M{"MMMM d – MMMM d"} d{"MMMM d–d"} } MMMd{ - M{"MMM d – MMM d"} + M{"MMM d – MMM d"} d{"MMM d–d"} } Md{ - M{"MM-dd – MM-dd"} - d{"MM-dd – MM-dd"} + M{"MM-dd – MM-dd"} + d{"MM-dd – MM-dd"} } d{ d{"dd–dd"} } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"hh–hh a"} + a{"h a – h a"} + h{"hh–hh a"} } hm{ - a{"hh:mm a–hh:mm a"} - h{"hh:mm–hh:mm a"} - m{"hh:mm–hh:mm a"} + a{"hh:mm a–hh:mm a"} + h{"hh:mm–hh:mm a"} + m{"hh:mm–hh:mm a"} } hmv{ - a{"hh:mm a–hh:mm a v"} - h{"hh:mm–hh:mm a v"} - m{"h:mm–h:mm a v"} + a{"hh:mm a–hh:mm a v"} + h{"hh:mm–hh:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"hh–hh a v"} + a{"h a – h a v"} + h{"hh–hh a v"} } y{ y{"y–y"} } yM{ - M{"y-MM – y-MM"} - y{"y-MM – y-MM"} + M{"y-MM – y-MM"} + y{"y-MM – y-MM"} } yMEd{ - M{"y-MM-dd, E – y-MM-dd, E"} - d{"y-MM-dd, E – y-MM-dd, E"} - y{"y-MM-dd, E – y-MM-dd, E"} + M{"y-MM-dd, E – y-MM-dd, E"} + d{"y-MM-dd, E – y-MM-dd, E"} + y{"y-MM-dd, E – y-MM-dd, E"} } yMMM{ M{"y MMM–MMM"} - y{"y MMM – y MMM"} + y{"y MMM – y MMM"} } yMMMEd{ - M{"y MMM d, E – MMM d, E"} - d{"y MMM d, E – MMM d, E"} - y{"y MMM d, E – y MMM d, E"} + M{"y MMM d, E – MMM d, E"} + d{"y MMM d, E – MMM d, E"} + y{"y MMM d, E – y MMM d, E"} } yMMMM{ M{"y LLLL–LLLL"} - y{"y LLLL – y LLLL"} + y{"y LLLL – y LLLL"} } yMMMMEd{ M{"y MMMM d, E. – MMMM d, E."} - d{"y MMMM d, E – MMMM d, E"} + d{"y MMMM d, E – MMMM d, E"} y{"y MMMM d, E. – y MMMM d, E."} } yMMMMd{ - M{"y MMMM d – MMMM d"} + M{"y MMMM d – MMMM d"} d{"y MMMM d–d"} - y{"y MMMM d – y MMMM d"} + y{"y MMMM d – y MMMM d"} } yMMMd{ - M{"y MMM d – MMM d"} + M{"y MMM d – MMM d"} d{"y MMM d–d"} - y{"y MMM d – y MMM d"} + y{"y MMM d – y MMM d"} } yMd{ - M{"y-MM-dd – y-MM-dd"} - d{"y-MM-dd – y-MM-dd"} - y{"y-MM-dd – y-MM-dd"} + M{"y-MM-dd – y-MM-dd"} + d{"y-MM-dd – y-MM-dd"} + y{"y-MM-dd – y-MM-dd"} } } monthNames{ diff --git a/icu4c/source/data/locales/lu.txt b/icu4c/source/data/locales/lu.txt index 10538da27316..df9eee72a619 100644 --- a/icu4c/source/data/locales/lu.txt +++ b/icu4c/source/data/locales/lu.txt @@ -59,8 +59,8 @@ lu{ MMMd{"d MMM"} Md{"d/M"} d{"d"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"m:ss"} y{"y"} yM{"M/y"} @@ -118,8 +118,8 @@ lu{ MMMd{"d MMM"} Md{"d/M"} d{"d"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"m:ss"} y{"y"} yM{"M/y"} diff --git a/icu4c/source/data/locales/luo.txt b/icu4c/source/data/locales/luo.txt index 5fb7eebed525..bca2f00f6243 100644 --- a/icu4c/source/data/locales/luo.txt +++ b/icu4c/source/data/locales/luo.txt @@ -51,7 +51,7 @@ luo{ MMMd{"MMM d"} Md{"M/d"} d{"d"} - hm{"h:mm a"} + hm{"h:mm a"} ms{"mm:ss"} y{"y"} yM{"M/y"} @@ -109,7 +109,7 @@ luo{ MMMd{"MMM d"} Md{"M/d"} d{"d"} - hm{"h:mm a"} + hm{"h:mm a"} ms{"mm:ss"} y{"y"} yM{"M/y"} diff --git a/icu4c/source/data/locales/luy.txt b/icu4c/source/data/locales/luy.txt index 244b3a06f6d0..cdf5196787f1 100644 --- a/icu4c/source/data/locales/luy.txt +++ b/icu4c/source/data/locales/luy.txt @@ -50,7 +50,7 @@ luy{ MMMd{"MMM d"} Md{"M/d"} d{"d"} - hm{"h:mm a"} + hm{"h:mm a"} ms{"mm:ss"} y{"y"} yM{"M/y"} @@ -108,7 +108,7 @@ luy{ MMMd{"MMM d"} Md{"M/d"} d{"d"} - hm{"h:mm a"} + hm{"h:mm a"} ms{"mm:ss"} y{"y"} yM{"M/y"} diff --git a/icu4c/source/data/locales/lv.txt b/icu4c/source/data/locales/lv.txt index 51f98b19b74d..9fc03eacb415 100644 --- a/icu4c/source/data/locales/lv.txt +++ b/icu4c/source/data/locales/lv.txt @@ -452,6 +452,12 @@ lv{ "y. 'gada' d. MMM G", "dd.MM.y. GGGGG", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{1} 'plkst'. {0}", "{1} 'plkst'. {0}", "{1}, {0}", @@ -477,8 +483,8 @@ lv{ EHm{"E, HH:mm"} EHms{"E, HH:mm:ss"} Ed{"E, d."} - Ehm{"E, h:mm a"} - Ehms{"E, h:mm:ss a"} + Ehm{"E, h:mm a"} + Ehms{"E, h:mm:ss a"} Gy{"y. 'g'. G"} GyMMM{"y. 'g'. MMM G"} GyMMMEd{"E, y. 'g'. d. MMM G"} @@ -496,9 +502,9 @@ lv{ MMMd{"d. MMM"} Md{"dd.MM."} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"mm:ss"} y{"y. 'g'. G"} yyyy{"y. 'g'. G"} @@ -514,21 +520,21 @@ lv{ } intervalFormats{ GyMMM{ - G{"G y. 'gada' MMM – G y 'gada' MMM"} + G{"G y. 'gada' MMM – G y 'gada' MMM"} M{"G y. 'gada' MMM–MMM"} - y{"G y. 'gada' MMM – y. 'gada' MMM"} + y{"G y. 'gada' MMM – y. 'gada' MMM"} } GyMMMEd{ - G{"G y. 'gada' d. MMM, E – G y. 'gada' d. MMM, E"} - M{"G y. 'gada' d. MMM, E – d. MMM, E"} - d{"G y. 'gada' d. MMM, E – d. MMM, E"} - y{"G y. 'gada' d. MMM, E – y. 'gada' d. MMM, E"} + G{"G y. 'gada' d. MMM, E – G y. 'gada' d. MMM, E"} + M{"G y. 'gada' d. MMM, E – d. MMM, E"} + d{"G y. 'gada' d. MMM, E – d. MMM, E"} + y{"G y. 'gada' d. MMM, E – y. 'gada' d. MMM, E"} } GyMMMd{ - G{"G y. 'gada' d. MMM – G y. 'gada' d. MMM"} - M{"G y. 'gada' d. MMM – d. MMM"} + G{"G y. 'gada' d. MMM – G y. 'gada' d. MMM"} + M{"G y. 'gada' d. MMM – d. MMM"} d{"G y. 'gada' d.–d. MMM"} - y{"G y. 'gada' d. MMM – y. 'gada' d. MMM"} + y{"G y. 'gada' d. MMM – y. 'gada' d. MMM"} } M{ M{"MM–MM"} @@ -644,8 +650,8 @@ lv{ EHm{"E, HH:mm"} EHms{"E, HH:mm:ss"} Ed{"E, d."} - Ehm{"E, h:mm a"} - Ehms{"E, h:mm:ss a"} + Ehm{"E, h:mm a"} + Ehms{"E, h:mm:ss a"} Gy{"G y. 'g'."} GyMMM{"G y. 'g'. MMM"} GyMMMEd{"E, G y. 'g'. d. MMM"} @@ -670,11 +676,11 @@ lv{ MMMd{"d. MMM"} Md{"dd.MM."} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} - hmsv{"h:mm:ss a v"} - hmv{"h:mm a v"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} + hmsv{"h:mm:ss a v"} + hmv{"h:mm a v"} mmss{"mm:ss"} ms{"mm:ss"} y{"y. 'g'."} @@ -860,27 +866,27 @@ lv{ y{"GGGGG MM-y. – MM-y."} } GyMEd{ - G{"GGGGG dd-MM-y., E – GGGGG dd-MM-y., E"} - M{"GGGGG dd-MM-y., E – dd-MM-y., E"} - d{"GGGGG dd-MM-y., E – dd-MM-y., E"} - y{"GGGGG dd-MM-y., E – dd-MM-y., E"} + G{"GGGGG dd-MM-y., E – GGGGG dd-MM-y., E"} + M{"GGGGG dd-MM-y., E – dd-MM-y., E"} + d{"GGGGG dd-MM-y., E – dd-MM-y., E"} + y{"GGGGG dd-MM-y., E – dd-MM-y., E"} } GyMMM{ - G{"G y. 'gada' MMM – G y. 'gada' MMM"} + G{"G y. 'gada' MMM – G y. 'gada' MMM"} M{"G y. 'gada' MMM–MMM"} - y{"G y. 'gada' MMM – y. 'gada' MMM"} + y{"G y. 'gada' MMM – y. 'gada' MMM"} } GyMMMEd{ - G{"G y. 'gada' d. MMM, E – G y. 'gada' d. MMM, E"} - M{"G y. 'gada' d. MMM, E – d. MMM, E"} - d{"G y. 'gada' d. MMM, E – d. MMM, E"} - y{"G y. 'gada' d. MMM, E – y. 'gada' d. MMM, E"} + G{"G y. 'gada' d. MMM, E – G y. 'gada' d. MMM, E"} + M{"G y. 'gada' d. MMM, E – d. MMM, E"} + d{"G y. 'gada' d. MMM, E – d. MMM, E"} + y{"G y. 'gada' d. MMM, E – y. 'gada' d. MMM, E"} } GyMMMd{ - G{"G y. 'gada' d. MMM – G y. 'gada' d. MMM"} - M{"G y. 'gada' d. MMM – d. MMM"} + G{"G y. 'gada' d. MMM – G y. 'gada' d. MMM"} + M{"G y. 'gada' d. MMM – d. MMM"} d{"G y. 'gada' d.–d. MMM"} - y{"G y. 'gada' d. MMM – y. 'gada' d. MMM"} + y{"G y. 'gada' d. MMM – y. 'gada' d. MMM"} } GyMd{ G{"GGGGG dd-MM-y. – GGGGG dd-MM-y."} @@ -913,11 +919,11 @@ lv{ M{"LLL–LLL"} } MMMEd{ - M{"E, d. MMM – E, d. MMM"} - d{"E, d. MMM – E, d. MMM"} + M{"E, d. MMM – E, d. MMM"} + d{"E, d. MMM – E, d. MMM"} } MMMd{ - M{"d. MMM – d. MMM"} + M{"d. MMM – d. MMM"} d{"d.–d. MMM"} } Md{ @@ -929,22 +935,22 @@ lv{ } fallback{"{0} - {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a, v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a, v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y.–y."} @@ -963,18 +969,18 @@ lv{ y{"y. 'gada' MMM – y. 'gada' MMM"} } yMMMEd{ - M{"E, y. 'gada' d. MMM – E, y. 'gada' d. MMM"} - d{"E, y. 'gada' d. MMM – E, y. 'gada' d. MMM"} + M{"E, y. 'gada' d. MMM – E, y. 'gada' d. MMM"} + d{"E, y. 'gada' d. MMM – E, y. 'gada' d. MMM"} y{"E, y. 'gada' d. MMM – E, y. 'gada' d. MMM"} } yMMMM{ - M{"y. 'gada' MMMM – MMMM"} + M{"y. 'gada' MMMM – MMMM"} y{"y. 'gada' MMMM – y. 'gada' MMMM"} } yMMMd{ - M{"y. 'gada' d. MMM – d. MMM"} + M{"y. 'gada' d. MMM – d. MMM"} d{"y. 'gada' d.–d. MMM"} - y{"y. 'gada' d. MMM – y. 'gada' d. MMM"} + y{"y. 'gada' d. MMM – y. 'gada' d. MMM"} } yMd{ M{"dd.MM.y.–dd.MM.y."} diff --git a/icu4c/source/data/locales/mai.txt b/icu4c/source/data/locales/mai.txt index a8a683e061f5..620ed334f584 100644 --- a/icu4c/source/data/locales/mai.txt +++ b/icu4c/source/data/locales/mai.txt @@ -37,6 +37,12 @@ mai{ "G d MMM y", "G d/M/y", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{1} के {0}", "{1} के {0}", "{1}, {0}", @@ -68,6 +74,12 @@ mai{ "d MMM y", "d/M/yy", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{1} के {0}", "{1} के {0}", "{1}, {0}", diff --git a/icu4c/source/data/locales/mas.txt b/icu4c/source/data/locales/mas.txt index 59be2c881c04..59e757d4c3fc 100644 --- a/icu4c/source/data/locales/mas.txt +++ b/icu4c/source/data/locales/mas.txt @@ -55,7 +55,7 @@ mas{ MMMd{"MMM d"} Md{"M/d"} d{"d"} - hm{"h:mm a"} + hm{"h:mm a"} ms{"mm:ss"} y{"y"} yM{"M/y"} @@ -113,7 +113,7 @@ mas{ MMMd{"MMM d"} Md{"M/d"} d{"d"} - hm{"h:mm a"} + hm{"h:mm a"} ms{"mm:ss"} y{"y"} yM{"M/y"} diff --git a/icu4c/source/data/locales/mer.txt b/icu4c/source/data/locales/mer.txt index a232041cac17..bf4477df4f20 100644 --- a/icu4c/source/data/locales/mer.txt +++ b/icu4c/source/data/locales/mer.txt @@ -51,7 +51,7 @@ mer{ MMMd{"MMM d"} Md{"M/d"} d{"d"} - hm{"h:mm a"} + hm{"h:mm a"} ms{"mm:ss"} y{"y"} yM{"M/y"} @@ -109,7 +109,7 @@ mer{ MMMd{"MMM d"} Md{"M/d"} d{"d"} - hm{"h:mm a"} + hm{"h:mm a"} ms{"mm:ss"} y{"y"} yM{"M/y"} diff --git a/icu4c/source/data/locales/mg.txt b/icu4c/source/data/locales/mg.txt index c6c73f619c1b..208027c696bd 100644 --- a/icu4c/source/data/locales/mg.txt +++ b/icu4c/source/data/locales/mg.txt @@ -137,8 +137,8 @@ mg{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"d, E"} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"G y"} GyMMM{"G y MMM"} GyMMMEd{"G y MMM d, E"} @@ -159,11 +159,11 @@ mg{ MMdd{"dd/MM"} Md{"d/M"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} - hmsv{"h:mm:ss a v"} - hmv{"h:mm a v"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} + hmsv{"h:mm:ss a v"} + hmv{"h:mm a v"} ms{"m:ss"} y{"y"} yM{"M/y"} @@ -308,80 +308,80 @@ mg{ M{"MM–MM"} } MEd{ - M{"MM-dd, E – MM-dd, E"} - d{"MM-dd, E – MM-dd, E"} + M{"MM-dd, E – MM-dd, E"} + d{"MM-dd, E – MM-dd, E"} } MMM{ M{"LLL–LLL"} } MMMEd{ - M{"MMM d, E – MMM d, E"} - d{"MMM d, E – MMM d, E"} + M{"MMM d, E – MMM d, E"} + d{"MMM d, E – MMM d, E"} } MMMd{ - M{"MMM d – MMM d"} + M{"MMM d – MMM d"} d{"MMM d–d"} } Md{ - M{"MM-dd – MM-dd"} - d{"MM-dd – MM-dd"} + M{"MM-dd – MM-dd"} + d{"MM-dd – MM-dd"} } d{ d{"d–d"} } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y"} } yM{ - M{"y-MM – y-MM"} - y{"y-MM – y-MM"} + M{"y-MM – y-MM"} + y{"y-MM – y-MM"} } yMEd{ - M{"y-MM-dd, E – y-MM-dd, E"} - d{"y-MM-dd, E – y-MM-dd, E"} - y{"y-MM-dd, E – y-MM-dd, E"} + M{"y-MM-dd, E – y-MM-dd, E"} + d{"y-MM-dd, E – y-MM-dd, E"} + y{"y-MM-dd, E – y-MM-dd, E"} } yMMM{ M{"y MMM–MMM"} - y{"y MMM – y MMM"} + y{"y MMM – y MMM"} } yMMMEd{ - M{"y MMM d, E – MMM d, E"} - d{"y MMM d, E – MMM d, E"} - y{"y MMM d, E – y MMM d, E"} + M{"y MMM d, E – MMM d, E"} + d{"y MMM d, E – MMM d, E"} + y{"y MMM d, E – y MMM d, E"} } yMMMM{ M{"y MMMM–MMMM"} - y{"y MMMM – y MMMM"} + y{"y MMMM – y MMMM"} } yMMMd{ - M{"y MMM d – MMM d"} + M{"y MMM d – MMM d"} d{"y MMM d–d"} - y{"y MMM d – y MMM d"} + y{"y MMM d – y MMM d"} } yMd{ - M{"y-MM-dd – y-MM-dd"} - d{"y-MM-dd – y-MM-dd"} - y{"y-MM-dd – y-MM-dd"} + M{"y-MM-dd – y-MM-dd"} + d{"y-MM-dd – y-MM-dd"} + y{"y-MM-dd – y-MM-dd"} } } monthNames{ diff --git a/icu4c/source/data/locales/mgh.txt b/icu4c/source/data/locales/mgh.txt index 5c1f8829723e..e97d8aa2d0dd 100644 --- a/icu4c/source/data/locales/mgh.txt +++ b/icu4c/source/data/locales/mgh.txt @@ -52,8 +52,8 @@ mgh{ MMMd{"MMM d"} Md{"d/M"} d{"d"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"m:ss"} y{"y"} yM{"M/y"} @@ -111,8 +111,8 @@ mgh{ MMMd{"MMM d"} Md{"d/M"} d{"d"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"m:ss"} y{"y"} yM{"M/y"} diff --git a/icu4c/source/data/locales/mi.txt b/icu4c/source/data/locales/mi.txt index 6c3b0ec60df3..a08bbafbc9f1 100644 --- a/icu4c/source/data/locales/mi.txt +++ b/icu4c/source/data/locales/mi.txt @@ -153,10 +153,10 @@ mi{ calendar{ generic{ DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE, d MMMM y G", "d MMMM y G", "d MMM y G", @@ -182,23 +182,23 @@ mi{ M{"MM–MM"} } MEd{ - M{"MM-dd, E – MM-dd, E"} - d{"MM-dd, E – MM-dd, E"} + M{"MM-dd, E – MM-dd, E"} + d{"MM-dd, E – MM-dd, E"} } MMM{ M{"LLL–LLL"} } MMMEd{ - M{"MMM d, E – MMM d, E"} - d{"MMM d, E – MMM d, E"} + M{"MMM d, E – MMM d, E"} + d{"MMM d, E – MMM d, E"} } MMMd{ - M{"MMM d – MMM d"} + M{"MMM d – MMM d"} d{"MMM d–d"} } Md{ - M{"MM-dd – MM-dd"} - d{"MM-dd – MM-dd"} + M{"MM-dd – MM-dd"} + d{"MM-dd – MM-dd"} } d{ d{"d–d"} @@ -208,36 +208,36 @@ mi{ y{"G y–y"} } yM{ - M{"GGGGG y-MM – y-MM"} - y{"GGGGG y-MM – y-MM"} + M{"GGGGG y-MM – y-MM"} + y{"GGGGG y-MM – y-MM"} } yMEd{ - M{"GGGGG y-MM-dd, E – y-MM-dd, E"} - d{"GGGGG y-MM-dd, E – y-MM-dd, E"} - y{"GGGGG y-MM-dd, E – y-MM-dd, E"} + M{"GGGGG y-MM-dd, E – y-MM-dd, E"} + d{"GGGGG y-MM-dd, E – y-MM-dd, E"} + y{"GGGGG y-MM-dd, E – y-MM-dd, E"} } yMMM{ M{"G y MMM–MMM"} - y{"G y MMM – y MMM"} + y{"G y MMM – y MMM"} } yMMMEd{ - M{"G y MMM d, E – MMM d, E"} - d{"G y MMM d, E – MMM d, E"} - y{"G y MMM d, E – y MMM d, E"} + M{"G y MMM d, E – MMM d, E"} + d{"G y MMM d, E – MMM d, E"} + y{"G y MMM d, E – y MMM d, E"} } yMMMM{ M{"G y MMMM–MMMM"} - y{"G y MMMM – y MMMM"} + y{"G y MMMM – y MMMM"} } yMMMd{ - M{"G y MMM d – MMM d"} + M{"G y MMM d – MMM d"} d{"G y MMM d–d"} - y{"G y MMM d – y MMM d"} + y{"G y MMM d – y MMM d"} } yMd{ - M{"GGGGG y-MM-dd – y-MM-dd"} - d{"GGGGG y-MM-dd – y-MM-dd"} - y{"GGGGG y-MM-dd – y-MM-dd"} + M{"GGGGG y-MM-dd – y-MM-dd"} + d{"GGGGG y-MM-dd – y-MM-dd"} + y{"GGGGG y-MM-dd – y-MM-dd"} } } } @@ -255,10 +255,10 @@ mi{ "PM", } DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE, d MMMM y", "d MMMM y", "d MMM y", @@ -289,8 +289,8 @@ mi{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"E, d"} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"y G"} GyMMM{"MMM y G"} GyMMMEd{"E, d MMM y G"} @@ -311,11 +311,11 @@ mi{ MMMd{"d MMM"} Md{"dd-MM"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} - hmsv{"h:mm:ss a v"} - hmv{"h:mm a v"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} + hmsv{"h:mm:ss a v"} + hmv{"h:mm a v"} ms{"mm:ss"} y{"y"} yM{"MM-y"} diff --git a/icu4c/source/data/locales/mk.txt b/icu4c/source/data/locales/mk.txt index 5192a32035ba..a42ad4e3f8c4 100644 --- a/icu4c/source/data/locales/mk.txt +++ b/icu4c/source/data/locales/mk.txt @@ -223,8 +223,8 @@ mk{ "HH:mm:ss z", "HH:mm:ss", "HH:mm", - "EEEE, dd MMMM y 'г'. G", - "dd MMMM y 'г'. G", + "EEEE, dd MMMM y 'г'. G", + "dd MMMM y 'г'. G", "dd.M.y G", "dd.M.y GGGGG", "{1} {0}", @@ -246,24 +246,24 @@ mk{ availableFormats{ E{"E"} Ed{"d E"} - Gy{"y 'г'. G"} - GyMMM{"MMM y 'г'. G"} - GyMMMEd{"E, dd MMM y 'г'. G"} - GyMMMd{"dd MMM y 'г'. G"} + Gy{"y 'г'. G"} + GyMMM{"MMM y 'г'. G"} + GyMMMEd{"E, dd MMM y 'г'. G"} + GyMMMd{"dd MMM y 'г'. G"} MEd{"E, dd.M"} MMMEd{"E, dd MMM"} MMMMEd{"E, dd MMMM"} MMMMd{"dd MMMM"} MMMd{"dd MMM"} Md{"dd.M"} - y{"y 'г'. G"} - yyyy{"y 'г'. G"} + y{"y 'г'. G"} + yyyy{"y 'г'. G"} yyyyM{"M.y G"} yyyyMEd{"E, dd.M.y G"} - yyyyMMM{"MMM y 'г'. G"} - yyyyMMMEd{"E, dd MMM y 'г'. G"} - yyyyMMMM{"MMMM y 'г'. G"} - yyyyMMMd{"dd MMM y 'г'. G"} + yyyyMMM{"MMM y 'г'. G"} + yyyyMMMEd{"E, dd MMM y 'г'. G"} + yyyyMMMM{"MMMM y 'г'. G"} + yyyyMMMd{"dd MMM y 'г'. G"} yyyyMd{"dd.M.y G"} yyyyQQQ{"QQQ y G"} yyyyQQQQ{"QQQ y G"} @@ -338,8 +338,8 @@ mk{ "HH:mm:ss z", "HH:mm:ss", "HH:mm", - "EEEE, dd MMMM y 'г'. G", - "dd MMMM y 'г'. G", + "EEEE, dd MMMM y 'г'. G", + "dd MMMM y 'г'. G", "dd.M.y G", "dd.M.y GGGGG", "{1} {0}", @@ -527,8 +527,8 @@ mk{ "HH:mm:ss z", "HH:mm:ss", "HH:mm", - "EEEE, dd MMMM y 'г'. G", - "dd MMMM y 'г'. G", + "EEEE, dd MMMM y 'г'. G", + "dd MMMM y 'г'. G", "dd.M.y G", "dd.M.y GGGGG", "{1} {0}", @@ -557,12 +557,12 @@ mk{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"d E"} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} - Gy{"y 'г'. G"} - GyMMM{"MMM y 'г'. G"} - GyMMMEd{"E, dd MMM y 'г'. G"} - GyMMMd{"dd MMM y 'г'. G"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} + Gy{"y 'г'. G"} + GyMMM{"MMM y 'г'. G"} + GyMMMEd{"E, dd MMM y 'г'. G"} + GyMMMd{"dd MMM y 'г'. G"} GyMd{"d.M.y GGGGG"} H{"HH"} Hm{"HH:mm"} @@ -576,18 +576,18 @@ mk{ MMMd{"dd MMM"} Md{"dd.M"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"mm:ss"} - y{"y 'г'. G"} - yyyy{"y 'г'. G"} + y{"y 'г'. G"} + yyyy{"y 'г'. G"} yyyyM{"M.y G"} yyyyMEd{"E, dd.M.y G"} - yyyyMMM{"MMM y 'г'. G"} - yyyyMMMEd{"E, dd MMM y 'г'. G"} - yyyyMMMM{"MMMM y 'г'. G"} - yyyyMMMd{"dd MMM y 'г'. G"} + yyyyMMM{"MMM y 'г'. G"} + yyyyMMMEd{"E, dd MMM y 'г'. G"} + yyyyMMMM{"MMMM y 'г'. G"} + yyyyMMMd{"dd MMM y 'г'. G"} yyyyMd{"dd.M.y G"} yyyyQQQ{"QQQ y G"} yyyyQQQQ{"QQQ y G"} @@ -684,22 +684,22 @@ mk{ } fallback{"{0} - {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y G"} @@ -760,7 +760,13 @@ mk{ "d MMMM y", "d.M.y", "d.M.yy", - "{1}, 'во' {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{1}, 'во' {0}", "{1}, 'во' {0}", "{1}, 'во' {0}", @@ -789,8 +795,8 @@ mk{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"d E"} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"y G"} GyMMM{"MMM y G"} GyMMMEd{"E, d MMM y G"} @@ -815,22 +821,22 @@ mk{ Md{"d.M"} Mdd{"d.M"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} - hmsv{"h:mm:ss a v"} - hmv{"h:mm a v"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} + hmsv{"h:mm:ss a v"} + hmv{"h:mm a v"} ms{"mm:ss"} y{"y"} yM{"M.y"} yMEd{"E, d.M.y"} - yMMM{"MMM y 'г'."} - yMMMEd{"E, d MMM y 'г'."} - yMMMM{"MMMM y 'г'."} - yMMMd{"d MMM y 'г'."} + yMMM{"MMM y 'г'."} + yMMMEd{"E, d MMM y 'г'."} + yMMMM{"MMMM y 'г'."} + yMMMd{"d MMM y 'г'."} yMd{"d.M.y"} - yQQQ{"QQQ y 'г'."} - yQQQQ{"QQQQ y 'г'."} + yQQQ{"QQQ y 'г'."} + yQQQQ{"QQQQ y 'г'."} yw{ one{"w. 'седмица' 'од' Y"} other{"w. 'седмица' 'од' Y"} @@ -1089,22 +1095,22 @@ mk{ } fallback{"{0} - {1}"} h{ - a{"h a – h a"} - h{"h – h a"} + a{"h a – h a"} + h{"h – h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm – h:mm a"} - m{"h:mm – h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm – h:mm a"} + m{"h:mm – h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm – h:mm a v"} - m{"h:mm – h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm – h:mm a v"} + m{"h:mm – h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h – h a v"} + a{"h a – h a v"} + h{"h – h a v"} } y{ y{"y – y"} @@ -1281,8 +1287,8 @@ mk{ "HH:mm:ss z", "HH:mm:ss", "HH:mm", - "EEEE, dd MMMM y 'г'. G", - "dd MMMM y 'г'. G", + "EEEE, dd MMMM y 'г'. G", + "dd MMMM y 'г'. G", "dd.M.y G", "dd.M.y GGGGG", "{1} {0}", @@ -1304,24 +1310,24 @@ mk{ availableFormats{ E{"E"} Ed{"d E"} - Gy{"y 'г'. G"} - GyMMM{"MMM y 'г'. G"} - GyMMMEd{"E, dd MMM y 'г'. G"} - GyMMMd{"dd MMM y 'г'. G"} + Gy{"y 'г'. G"} + GyMMM{"MMM y 'г'. G"} + GyMMMEd{"E, dd MMM y 'г'. G"} + GyMMMd{"dd MMM y 'г'. G"} MEd{"E, dd.M"} MMMEd{"E, dd MMM"} MMMMEd{"E, dd MMMM"} MMMMd{"dd MMMM"} MMMd{"dd MMM"} Md{"dd.M"} - y{"y 'г'. G"} - yyyy{"y 'г'. G"} + y{"y 'г'. G"} + yyyy{"y 'г'. G"} yyyyM{"M.y G"} yyyyMEd{"E, dd.M.y G"} - yyyyMMM{"MMM y 'г'. G"} - yyyyMMMEd{"E, dd MMM y 'г'. G"} - yyyyMMMM{"MMMM y 'г'. G"} - yyyyMMMd{"dd MMM y 'г'. G"} + yyyyMMM{"MMM y 'г'. G"} + yyyyMMMEd{"E, dd MMM y 'г'. G"} + yyyyMMMM{"MMMM y 'г'. G"} + yyyyMMMd{"dd MMM y 'г'. G"} yyyyMd{"dd.M.y G"} yyyyQQQ{"QQQ y G"} yyyyQQQQ{"QQQ y G"} @@ -1541,8 +1547,8 @@ mk{ "HH:mm:ss z", "HH:mm:ss", "HH:mm", - "EEEE, dd MMMM y 'г'. G", - "dd MMMM y 'г'. G", + "EEEE, dd MMMM y 'г'. G", + "dd MMMM y 'г'. G", "dd.M.y G", "dd.M.y GGGGG", "{1} {0}", @@ -1564,24 +1570,24 @@ mk{ availableFormats{ E{"E"} Ed{"d E"} - Gy{"y 'г'. G"} - GyMMM{"MMM y 'г'. G"} - GyMMMEd{"E, dd MMM y 'г'. G"} - GyMMMd{"dd MMM y 'г'. G"} + Gy{"y 'г'. G"} + GyMMM{"MMM y 'г'. G"} + GyMMMEd{"E, dd MMM y 'г'. G"} + GyMMMd{"dd MMM y 'г'. G"} MEd{"E, dd.M"} MMMEd{"E, dd MMM"} MMMMEd{"E, dd MMMM"} MMMMd{"dd MMMM"} MMMd{"dd MMM"} Md{"dd.M"} - y{"y 'г'. G"} - yyyy{"y 'г'. G"} + y{"y 'г'. G"} + yyyy{"y 'г'. G"} yyyyM{"M.y G"} yyyyMEd{"E, dd.M.y G"} - yyyyMMM{"MMM y 'г'. G"} - yyyyMMMEd{"E, dd MMM y 'г'. G"} - yyyyMMMM{"MMMM y 'г'. G"} - yyyyMMMd{"dd MMM y 'г'. G"} + yyyyMMM{"MMM y 'г'. G"} + yyyyMMMEd{"E, dd MMM y 'г'. G"} + yyyyMMMM{"MMMM y 'г'. G"} + yyyyMMMd{"dd MMM y 'г'. G"} yyyyMd{"dd.M.y G"} yyyyQQQ{"QQQ y G"} yyyyQQQQ{"QQQ y G"} diff --git a/icu4c/source/data/locales/mn.txt b/icu4c/source/data/locales/mn.txt index 4d237ad71934..be0cf4049ab6 100644 --- a/icu4c/source/data/locales/mn.txt +++ b/icu4c/source/data/locales/mn.txt @@ -223,9 +223,9 @@ mn{ "HH:mm:ss (z)", "HH:mm:ss", "HH:mm", - "G y 'оны' MMMM'ын' d. cccc 'гараг'", - "G y 'оны' MM 'сарын' dd", - "G y 'оны' MMM'ын' d", + "G y 'оны' MMMM'ын' d. cccc 'гараг'", + "G y 'оны' MM 'сарын' dd", + "G y 'оны' MMM'ын' d", "GGGGG y.MM.dd", "{1} {0}", "{1} {0}", @@ -253,12 +253,12 @@ mn{ EHm{"E. HH:mm"} EHms{"E. HH:mm:ss"} Ed{"dd. E"} - Ehm{"E. h:mm a"} - Ehms{"E. h:mm:ss a"} + Ehm{"E. h:mm a"} + Ehms{"E. h:mm:ss a"} Gy{"G y"} - GyMMM{"G y 'оны' MMM"} - GyMMMEd{"G y 'оны' MMM'ын' d. E"} - GyMMMd{"G y 'оны' MMM'ын' d"} + GyMMM{"G y 'оны' MMM"} + GyMMMEd{"G y 'оны' MMM'ын' d. E"} + GyMMMd{"G y 'оны' MMM'ын' d"} GyMd{"GGGGG y.MM.dd"} H{"HH 'ц'"} Hm{"HH:mm"} @@ -272,20 +272,20 @@ mn{ Md{"MMMMM/dd"} d{"d"} h{"h 'ц' a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"mm:ss"} y{"G y"} yyyy{"G y"} yyyyM{"GGGGG y MMMMM"} yyyyMEd{"GGGGG y.MM.dd. E"} - yyyyMMM{"G y 'оны' MMM"} - yyyyMMMEd{"G y 'оны' MMM'ын' d. E"} - yyyyMMMM{"G y 'оны' MMMM"} - yyyyMMMd{"G y 'оны' MMM'ын' d"} + yyyyMMM{"G y 'оны' MMM"} + yyyyMMMEd{"G y 'оны' MMM'ын' d. E"} + yyyyMMMM{"G y 'оны' MMMM"} + yyyyMMMd{"G y 'оны' MMM'ын' d"} yyyyMd{"GGGGG y.MM.dd"} - yyyyQQQ{"G y 'оны' QQQ"} - yyyyQQQQ{"G y 'оны' QQQQ"} + yyyyQQQ{"G y 'оны' QQQ"} + yyyyQQQQ{"G y 'оны' QQQQ"} } intervalFormats{ H{ @@ -329,57 +329,57 @@ mn{ } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"G y–y"} } yM{ - M{"GGGGG y 'оны' MMMMM–MMMMM 'сар'"} - y{"GGGGG y 'оны' MMMMM 'сар' – y 'оны' MMMMM 'сар'"} + M{"GGGGG y 'оны' MMMMM–MMMMM 'сар'"} + y{"GGGGG y 'оны' MMMMM 'сар' – y 'оны' MMMMM 'сар'"} } yMEd{ - M{"GGGGG y 'оны' MMMMM/dd E – MMMMM/dd E"} - d{"GGGGG y 'оны' MMMMM/dd E – MMMMM/dd E"} - y{"GGGGG y 'оны' MMMMM/dd E – y 'оны' MMMMM/dd E"} + M{"GGGGG y 'оны' MMMMM/dd E – MMMMM/dd E"} + d{"GGGGG y 'оны' MMMMM/dd E – MMMMM/dd E"} + y{"GGGGG y 'оны' MMMMM/dd E – y 'оны' MMMMM/dd E"} } yMMM{ - M{"G y 'оны' MMMMM – MMMMM 'сар'"} - y{"G y 'оны' MMMMM 'сар' – y 'оны' MMMMM 'сар'"} + M{"G y 'оны' MMMMM – MMMMM 'сар'"} + y{"G y 'оны' MMMMM 'сар' – y 'оны' MMMMM 'сар'"} } yMMMEd{ - M{"G y 'оны' MMMMM/dd E – MMMMM/dd E"} - d{"G y 'оны' MMMMM/dd E – MMMMM/dd E"} - y{"G y 'оны' MMMMM/dd E – y 'оны' MMMMM/dd E"} + M{"G y 'оны' MMMMM/dd E – MMMMM/dd E"} + d{"G y 'оны' MMMMM/dd E – MMMMM/dd E"} + y{"G y 'оны' MMMMM/dd E – y 'оны' MMMMM/dd E"} } yMMMM{ - M{"G y 'оны' MMMMM – MMMMM 'сар'"} - y{"G y 'оны' MMMMM 'сар' – y 'оны' MMMMM 'сар'"} + M{"G y 'оны' MMMMM – MMMMM 'сар'"} + y{"G y 'оны' MMMMM 'сар' – y 'оны' MMMMM 'сар'"} } yMMMd{ - M{"G y 'оны' MMMMM/dd – MMMMM/dd"} - d{"G y 'оны' MMMMM/dd – dd"} - y{"G y 'оны' MMMMM/dd – y 'оны' MMMMM/dd"} + M{"G y 'оны' MMMMM/dd – MMMMM/dd"} + d{"G y 'оны' MMMMM/dd – dd"} + y{"G y 'оны' MMMMM/dd – y 'оны' MMMMM/dd"} } yMd{ - M{"GGGGG y 'оны' MMMMM/dd – MMMMM/dd"} - d{"GGGGG y 'оны' MMMMM/dd – MMMMM/dd"} - y{"GGGGG y 'оны' MMMMM/dd – y 'оны' MMMMM/dd"} + M{"GGGGG y 'оны' MMMMM/dd – MMMMM/dd"} + d{"GGGGG y 'оны' MMMMM/dd – MMMMM/dd"} + y{"GGGGG y 'оны' MMMMM/dd – y 'оны' MMMMM/dd"} } } } @@ -401,9 +401,9 @@ mn{ "HH:mm:ss (z)", "HH:mm:ss", "HH:mm", - "y 'оны' MMMM'ын' d, EEEE 'гараг'", - "y 'оны' MMMM'ын' d", - "y 'оны' MMM'ын' d", + "y 'оны' MMMM'ын' d, EEEE 'гараг'", + "y 'оны' MMMM'ын' d", + "y 'оны' MMM'ын' d", "y.MM.dd", "{1} {0}", "{1} {0}", @@ -434,12 +434,12 @@ mn{ EHm{"E. HH:mm"} EHms{"E. HH:mm:ss"} Ed{"dd. E"} - Ehm{"E. h:mm a"} - Ehms{"E. h:mm:ss a"} + Ehm{"E. h:mm a"} + Ehms{"E. h:mm:ss a"} Gy{"G y"} - GyMMM{"G y 'оны' MMM"} - GyMMMEd{"G y 'оны' MMM'ын' d. E"} - GyMMMd{"G y 'оны' MMM'ын' d"} + GyMMM{"G y 'оны' MMM"} + GyMMMEd{"G y 'оны' MMM'ын' d. E"} + GyMMMd{"G y 'оны' MMM'ын' d"} H{"HH 'ц'"} Hm{"HH:mm"} Hms{"HH:mm:ss"} @@ -458,21 +458,21 @@ mn{ Md{"MMMMM/dd"} d{"d"} h{"h 'ц' a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} - hmsv{"h:mm:ss a (v)"} - hmv{"h:mm a (v)"} + hm{"h:mm a"} + hms{"h:mm:ss a"} + hmsv{"h:mm:ss a (v)"} + hmv{"h:mm a (v)"} ms{"mm:ss"} y{"y"} yM{"y MMMMM"} yMEd{"y.MM.dd. E"} - yMMM{"y 'оны' MMM"} - yMMMEd{"y 'оны' MMM'ын' d. E"} - yMMMM{"y 'оны' MMMM"} - yMMMd{"y 'оны' MMM'ын' d"} + yMMM{"y 'оны' MMM"} + yMMMEd{"y 'оны' MMM'ын' d. E"} + yMMMM{"y 'оны' MMMM"} + yMMMd{"y 'оны' MMM'ын' d"} yMd{"y.MM.dd"} - yQQQ{"y 'оны' QQQ"} - yQQQQ{"y 'оны' QQQQ"} + yQQQ{"y 'оны' QQQ"} + yQQQQ{"y 'оны' QQQQ"} yw{ one{"Y 'оны' w-'р' 'долоо' 'хоног'"} other{"Y 'оны' w-'р' 'долоо' 'хоног'"} @@ -683,57 +683,57 @@ mn{ } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h – h a"} + a{"h a – h a"} + h{"h – h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm – h:mm a"} - m{"h:mm – h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm – h:mm a"} + m{"h:mm – h:mm a"} } hmv{ - a{"h:mm a – h:mm a (v)"} - h{"h:mm – h:mm a (v)"} - m{"h:mm – h:mm a (v)"} + a{"h:mm a – h:mm a (v)"} + h{"h:mm – h:mm a (v)"} + m{"h:mm – h:mm a (v)"} } hv{ - a{"h a – h a (v)"} - h{"h – h a (v)"} + a{"h a – h a (v)"} + h{"h – h a (v)"} } y{ y{"y – y"} } yM{ - M{"y 'оны' MMMMM–MMMMM 'сар'"} - y{"y 'оны' MMMMM 'сар' – y 'оны' MMMMM 'сар'"} + M{"y 'оны' MMMMM–MMMMM 'сар'"} + y{"y 'оны' MMMMM 'сар' – y 'оны' MMMMM 'сар'"} } yMEd{ - M{"y 'оны' MMMMM/dd E – MMMMM/dd E"} - d{"y 'оны' MMMMM/dd E – MMMMM/dd E"} - y{"y 'оны' MMMMM/dd E – y 'оны' MMMMM/dd E"} + M{"y 'оны' MMMMM/dd E – MMMMM/dd E"} + d{"y 'оны' MMMMM/dd E – MMMMM/dd E"} + y{"y 'оны' MMMMM/dd E – y 'оны' MMMMM/dd E"} } yMMM{ - M{"y 'оны' MMMMM – MMMMM 'сар'"} - y{"y 'оны' MMMMM 'сар' – y 'оны' MMMMM 'сар'"} + M{"y 'оны' MMMMM – MMMMM 'сар'"} + y{"y 'оны' MMMMM 'сар' – y 'оны' MMMMM 'сар'"} } yMMMEd{ - M{"y 'оны' MMMMM/dd E – MMMMM/dd E"} - d{"y 'оны' MMMMM/dd E – MMMMM/dd E"} - y{"y 'оны' MMMMM/dd E – y 'оны' MMMMM/dd E"} + M{"y 'оны' MMMMM/dd E – MMMMM/dd E"} + d{"y 'оны' MMMMM/dd E – MMMMM/dd E"} + y{"y 'оны' MMMMM/dd E – y 'оны' MMMMM/dd E"} } yMMMM{ - M{"y 'оны' MMMMM – MMMMM 'сар'"} - y{"y 'оны' MMMMM 'сар' – y 'оны' MMMMM 'сар'"} + M{"y 'оны' MMMMM – MMMMM 'сар'"} + y{"y 'оны' MMMMM 'сар' – y 'оны' MMMMM 'сар'"} } yMMMd{ - M{"y 'оны' MMMMM/dd – MMMMM/dd"} - d{"y 'оны' MMMMM/dd – dd"} - y{"y 'оны' MMMMM/dd – y 'оны' MMMMM/dd"} + M{"y 'оны' MMMMM/dd – MMMMM/dd"} + d{"y 'оны' MMMMM/dd – dd"} + y{"y 'оны' MMMMM/dd – y 'оны' MMMMM/dd"} } yMd{ - M{"y 'оны' MMMMM/dd – MMMMM/dd"} - d{"y 'оны' MMMMM/dd – MMMMM/dd"} - y{"y 'оны' MMMMM/dd – y 'оны' MMMMM/dd"} + M{"y 'оны' MMMMM/dd – MMMMM/dd"} + d{"y 'оны' MMMMM/dd – MMMMM/dd"} + y{"y 'оны' MMMMM/dd – y 'оны' MMMMM/dd"} } } monthNames{ diff --git a/icu4c/source/data/locales/mni.txt b/icu4c/source/data/locales/mni.txt index 986c5971651b..ef8703c5a383 100644 --- a/icu4c/source/data/locales/mni.txt +++ b/icu4c/source/data/locales/mni.txt @@ -37,6 +37,12 @@ mni{ "MMM d, y G", "M/d/y GGGGG", "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{1} গী {0} দা", "{1} গী {0} দা", "{1} {0}", @@ -75,6 +81,12 @@ mni{ "MMM d, y", "d/M/yy", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{1} গী {0} দা", "{1} গী {0} দা", "{1}, {0}", diff --git a/icu4c/source/data/locales/mr.txt b/icu4c/source/data/locales/mr.txt index 40aea5a9aa13..d5d8cff2c445 100644 --- a/icu4c/source/data/locales/mr.txt +++ b/icu4c/source/data/locales/mr.txt @@ -507,6 +507,12 @@ mr{ "d MMM, y G", "d/M/y GGGGG", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{1} {0} वाजता", "{1} {0} वाजता", "{1}, {0}", @@ -683,6 +689,12 @@ mr{ "d MMM, y", "d/M/yy", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{1} रोजी {0}", "{1} रोजी {0}", "{1}, {0}", diff --git a/icu4c/source/data/locales/ms.txt b/icu4c/source/data/locales/ms.txt index 387bc1d69117..364eea096776 100644 --- a/icu4c/source/data/locales/ms.txt +++ b/icu4c/source/data/locales/ms.txt @@ -200,10 +200,10 @@ ms{ } chinese{ DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE, d MMMM r(U)", "d MMMM r(U)", "d MMM r", @@ -554,10 +554,10 @@ ms{ } generic{ DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE, d MMMM y G", "d MMMM y G", "dd/MM/y G", @@ -588,8 +588,8 @@ ms{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"E, d"} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"y G"} GyMMM{"MMM y G"} GyMMMEd{"E, d MMM y G"} @@ -606,9 +606,9 @@ ms{ MMMd{"d MMM"} Md{"d/M"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"mm:ss"} y{"y G"} yyyy{"y G"} @@ -624,42 +624,42 @@ ms{ } intervalFormats{ Gy{ - G{"y G – y G"} + G{"y G – y G"} y{"y–y G"} } GyM{ - G{"M/y GGGGG – M/y GGGGG"} - M{"M/y – M/y GGGGG"} - y{"M/y – M/y GGGGG"} + G{"M/y GGGGG – M/y GGGGG"} + M{"M/y – M/y GGGGG"} + y{"M/y – M/y GGGGG"} } GyMEd{ - G{"E, d/M/y GGGGG – E, d/M/y GGGGG"} - M{"E, d/M/y – E, d/M/y GGGGG"} - d{"E, d/M/y – E, d/M/y GGGGG"} - y{"E, d/M/y – E, d/M/y GGGGG"} + G{"E, d/M/y GGGGG – E, d/M/y GGGGG"} + M{"E, d/M/y – E, d/M/y GGGGG"} + d{"E, d/M/y – E, d/M/y GGGGG"} + y{"E, d/M/y – E, d/M/y GGGGG"} } GyMMM{ - G{"MMM y G – MMM y G"} - M{"MMM – MMM y G"} - y{"MMM y – MMM y G"} + G{"MMM y G – MMM y G"} + M{"MMM – MMM y G"} + y{"MMM y – MMM y G"} } GyMMMEd{ - G{"E, d MMM, y G – E, d MMM, y G"} - M{"E, d MMM – E, d MMM, y G"} - d{"E, d MMM – E, d MMM, y G"} - y{"E, d MMM, y – E, d MMM, y G"} + G{"E, d MMM, y G – E, d MMM, y G"} + M{"E, d MMM – E, d MMM, y G"} + d{"E, d MMM – E, d MMM, y G"} + y{"E, d MMM, y – E, d MMM, y G"} } GyMMMd{ - G{"d MMM, y G – d MMM, y G"} - M{"d MMM – d MMM, y G"} + G{"d MMM, y G – d MMM, y G"} + M{"d MMM – d MMM, y G"} d{"d–d MMM, y G"} - y{"d MMM, y – d MMM, y G"} + y{"d MMM, y – d MMM, y G"} } GyMd{ - G{"d/M/y GGGGG – d/M/y GGGG"} - M{"d/M/y – d/M/y GGGGG"} - d{"d/M/y – d/M/y GGGGG"} - y{"d/M/y – d/M/y GGGGG"} + G{"d/M/y GGGGG – d/M/y GGGG"} + M{"d/M/y – d/M/y GGGGG"} + d{"d/M/y – d/M/y GGGGG"} + y{"d/M/y – d/M/y GGGGG"} } H{ H{"HH–HH"} @@ -679,80 +679,80 @@ ms{ M{"M–M"} } MEd{ - M{"E, d/M – E, d/M"} - d{"E, d/M – E, d/M"} + M{"E, d/M – E, d/M"} + d{"E, d/M – E, d/M"} } MMM{ M{"MMM–MMM"} } MMMEd{ - M{"E, d MMM – E, d MMM"} - d{"E, d MMM – E, d MMM"} + M{"E, d MMM – E, d MMM"} + d{"E, d MMM – E, d MMM"} } MMMd{ - M{"d MMM – d MMM"} + M{"d MMM – d MMM"} d{"d–d MMM"} } Md{ - M{"d/M – d/M"} - d{"d/M – d/M"} + M{"d/M – d/M"} + d{"d/M – d/M"} } d{ d{"d–d"} } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y G"} } yM{ - M{"M/y – M/y G"} - y{"M/y – M/y G"} + M{"M/y – M/y G"} + y{"M/y – M/y G"} } yMEd{ - M{"E, d/M/y – E, d/M/y G"} - d{"E, d/M/y – E, d/M/y G"} - y{"E, d/M/y – E, d/M/y G"} + M{"E, d/M/y – E, d/M/y G"} + d{"E, d/M/y – E, d/M/y G"} + y{"E, d/M/y – E, d/M/y G"} } yMMM{ M{"MMM–MMM y G"} - y{"MMM y – MMM y G"} + y{"MMM y – MMM y G"} } yMMMEd{ - M{"E, d MMM – E, d MMM, y G"} - d{"E, d MMM – E, d MMM, y G"} - y{"E, d MMM y – E, d MMM y G"} + M{"E, d MMM – E, d MMM, y G"} + d{"E, d MMM – E, d MMM, y G"} + y{"E, d MMM y – E, d MMM y G"} } yMMMM{ M{"MMMM–MMMM y G"} - y{"MMMM y – MMMM y G"} + y{"MMMM y – MMMM y G"} } yMMMd{ - M{"d MMM – d MMM, y G"} + M{"d MMM – d MMM, y G"} d{"d–d MMM y G"} - y{"d MMM y – d MMM y G"} + y{"d MMM y – d MMM y G"} } yMd{ - M{"d/M/y – d/M/y G"} - d{"d/M/y – d/M/y G"} - y{"d/M/y – d/M/y G"} + M{"d/M/y – d/M/y G"} + d{"d/M/y – d/M/y G"} + y{"d/M/y – d/M/y G"} } } } @@ -770,10 +770,10 @@ ms{ "p", } DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE, d MMMM y", "d MMMM y", "d MMM y", @@ -807,8 +807,8 @@ ms{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"d E"} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"y G"} GyMMM{"MMM y G"} GyMMMEd{"E, d MMM y G"} @@ -827,11 +827,11 @@ ms{ MMdd{"dd/MM"} Md{"d-M"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} - hmsv{"h:mm:ss a v"} - hmv{"h:mm a v"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} + hmsv{"h:mm:ss a v"} + hmv{"h:mm a v"} ms{"mm:ss"} y{"y"} yM{"M-y"} @@ -995,42 +995,42 @@ ms{ } intervalFormats{ Gy{ - G{"y G – y G"} + G{"y G – y G"} y{"y–y G"} } GyM{ - G{"M/y GGGGG – M/y GGGGG"} - M{"M/y – M/y GGGGG"} - y{"M/y – M/y GGGGG"} + G{"M/y GGGGG – M/y GGGGG"} + M{"M/y – M/y GGGGG"} + y{"M/y – M/y GGGGG"} } GyMEd{ - G{"E, dd-MM-y GGGG – E, dd-MM-y GGGG"} - M{"E, d/M/y – E, d/M/y GGGGG"} - d{"E, d/M/y – E, d/M/y GGGGG"} - y{"E, d/M/y – E, d/M/y GGGGG"} + G{"E, dd-MM-y GGGG – E, dd-MM-y GGGG"} + M{"E, d/M/y – E, d/M/y GGGGG"} + d{"E, d/M/y – E, d/M/y GGGGG"} + y{"E, d/M/y – E, d/M/y GGGGG"} } GyMMM{ - G{"MMM y G – MMM y G"} - M{"MMM – MMM y G"} - y{"MMM y – MMM y G"} + G{"MMM y G – MMM y G"} + M{"MMM – MMM y G"} + y{"MMM y – MMM y G"} } GyMMMEd{ - G{"E, d MMM y G – E, d MMM y G"} - M{"E,d MMM – E, d MMM y G"} - d{"E, d MMM – E, d MMM y G"} - y{"E, d MMM y – E, d MMM y G"} + G{"E, d MMM y G – E, d MMM y G"} + M{"E,d MMM – E, d MMM y G"} + d{"E, d MMM – E, d MMM y G"} + y{"E, d MMM y – E, d MMM y G"} } GyMMMd{ - G{"d MMM y G – d MMM y G"} - M{"d MMM – d MMM y G"} + G{"d MMM y G – d MMM y G"} + M{"d MMM – d MMM y G"} d{"d–d MMM y G"} - y{"d MMM y – d MMM y G"} + y{"d MMM y – d MMM y G"} } GyMd{ - G{"d/M/y GGGGG – d/M/y GGGGG"} - M{"d/M/y – d/M/y GGGGG"} - d{"d/M/y – d/M/y GGGGG"} - y{"d/M/y – d/M/y GGGGG"} + G{"d/M/y GGGGG – d/M/y GGGGG"} + M{"d/M/y – d/M/y GGGGG"} + d{"d/M/y – d/M/y GGGGG"} + y{"d/M/y – d/M/y GGGGG"} } H{ H{"HH–HH"} @@ -1050,80 +1050,80 @@ ms{ M{"M–M"} } MEd{ - M{"E, d/M – E, d/M"} - d{"E, d/M – E, d/M"} + M{"E, d/M – E, d/M"} + d{"E, d/M – E, d/M"} } MMM{ M{"MMM–MMM"} } MMMEd{ - M{"E, d MMM – E, d MMM"} - d{"E, d MMM – E, d MMM"} + M{"E, d MMM – E, d MMM"} + d{"E, d MMM – E, d MMM"} } MMMd{ - M{"d MMM – d MMM"} + M{"d MMM – d MMM"} d{"d–d MMM"} } Md{ - M{"d/M – d/M"} - d{"d/M – d/M"} + M{"d/M – d/M"} + d{"d/M – d/M"} } d{ d{"d–d"} } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y"} } yM{ - M{"M/y – M/y"} - y{"M/y – M/y"} + M{"M/y – M/y"} + y{"M/y – M/y"} } yMEd{ - M{"E, d/M/y – E, d/M/y"} - d{"E, d/M/y – E, d/M/y"} - y{"E, d/M/y – E, d/M/y"} + M{"E, d/M/y – E, d/M/y"} + d{"E, d/M/y – E, d/M/y"} + y{"E, d/M/y – E, d/M/y"} } yMMM{ M{"MMM–MMM y"} - y{"MMM y – MMM y"} + y{"MMM y – MMM y"} } yMMMEd{ - M{"E, d MMM – E, d MMM y"} - d{"E, d MMM – E, d MMM y"} - y{"E, d MMM y – E, d MMM y"} + M{"E, d MMM – E, d MMM y"} + d{"E, d MMM – E, d MMM y"} + y{"E, d MMM y – E, d MMM y"} } yMMMM{ M{"MMMM–MMMM y"} - y{"MMMM y – MMMM y"} + y{"MMMM y – MMMM y"} } yMMMd{ - M{"d MMM – d MMM, y"} + M{"d MMM – d MMM, y"} d{"d–d MMM y"} - y{"d MMM y – d MMM y"} + y{"d MMM y – d MMM y"} } yMd{ - M{"d/M/y – d/M/y"} - d{"d/M/y – d/M/y"} - y{"d/M/y – d/M/y"} + M{"d/M/y – d/M/y"} + d{"d/M/y – d/M/y"} + y{"d/M/y – d/M/y"} } } monthNames{ @@ -1261,10 +1261,10 @@ ms{ } hebrew{ DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE, d MMMM y G", "d MMMM y G", "dd/MM/y G", @@ -1342,80 +1342,80 @@ ms{ M{"M–M"} } MEd{ - M{"E, d/M – E, d/M"} - d{"E, d/M – E, d/M"} + M{"E, d/M – E, d/M"} + d{"E, d/M – E, d/M"} } MMM{ M{"MMM–MMM"} } MMMEd{ - M{"E, d MMM – E, d MMM"} - d{"E, d MMM – E, d MMM"} + M{"E, d MMM – E, d MMM"} + d{"E, d MMM – E, d MMM"} } MMMd{ - M{"d MMM – d MMM"} + M{"d MMM – d MMM"} d{"d–d MMM"} } Md{ - M{"d/M – d/M"} - d{"d/M – d/M"} + M{"d/M – d/M"} + d{"d/M – d/M"} } d{ d{"d–d"} } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y G"} } yM{ - M{"M/y – M/y G"} - y{"M/y – M/y G"} + M{"M/y – M/y G"} + y{"M/y – M/y G"} } yMEd{ - M{"E, d/M/y – E, d/M/y G"} - d{"E, d/M/y – E, d/M/y G"} - y{"E, d/M/y – E, d/M/y G"} + M{"E, d/M/y – E, d/M/y G"} + d{"E, d/M/y – E, d/M/y G"} + y{"E, d/M/y – E, d/M/y G"} } yMMM{ M{"MMM–MMM y G"} - y{"MMM y – MMM y G"} + y{"MMM y – MMM y G"} } yMMMEd{ - M{"E, d MMM – E, d MMM, y G"} - d{"E, d MMM – E, d MMM, y G"} - y{"E, d MMM y – E, d MMM y G"} + M{"E, d MMM – E, d MMM, y G"} + d{"E, d MMM – E, d MMM, y G"} + y{"E, d MMM y – E, d MMM y G"} } yMMMM{ M{"MMMM–MMMM y G"} - y{"MMMM y – MMMM y G"} + y{"MMMM y – MMMM y G"} } yMMMd{ - M{"d MMM – d MMM, y G"} + M{"d MMM – d MMM, y G"} d{"d–d MMM y G"} - y{"d MMM y – d MMM y G"} + y{"d MMM y – d MMM y G"} } yMd{ - M{"d/M/y – d/M/y G"} - d{"d/M/y – d/M/y G"} - y{"d/M/y – d/M/y G"} + M{"d/M/y – d/M/y G"} + d{"d/M/y – d/M/y G"} + y{"d/M/y – d/M/y G"} } } monthNames{ @@ -1715,10 +1715,10 @@ ms{ } japanese{ DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE, d MMMM y G", "d MMMM y G", "dd/MM/y G", diff --git a/icu4c/source/data/locales/ms_BN.txt b/icu4c/source/data/locales/ms_BN.txt index 9ef185f8f422..7f17c50835fc 100644 --- a/icu4c/source/data/locales/ms_BN.txt +++ b/icu4c/source/data/locales/ms_BN.txt @@ -16,10 +16,10 @@ ms_BN{ calendar{ generic{ DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "dd MMMM y G", "d MMMM y G", "dd/MM/y G", @@ -43,10 +43,10 @@ ms_BN{ } gregorian{ DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "dd MMMM y", "d MMMM y", "d MMM y", diff --git a/icu4c/source/data/locales/ms_ID.txt b/icu4c/source/data/locales/ms_ID.txt index be9093071ed0..a475d7231170 100644 --- a/icu4c/source/data/locales/ms_ID.txt +++ b/icu4c/source/data/locales/ms_ID.txt @@ -75,22 +75,22 @@ ms_ID{ EBhms{"E h.mm.ss B"} EHm{"E HH.mm"} EHms{"E HH.mm.ss"} - Ehm{"E h.mm a"} - Ehms{"E h.mm.ss a"} + Ehm{"E h.mm a"} + Ehms{"E h.mm.ss a"} Hm{"HH.mm"} Hms{"HH.mm.ss"} Hmsv{"HH.mm.ss v"} Hmv{"HH.mm v"} - hm{"h.mm a"} - hms{"h.mm.ss a"} + hm{"h.mm a"} + hms{"h.mm.ss a"} hmsv{"h.mm.ss. a v"} - hmv{"h.mm a v"} + hmv{"h.mm a v"} } intervalFormats{ Bhm{ - B{"h.mm B – h.mm B"} - h{"h.mm – h.mm B"} - m{"h.mm – h.mm B"} + B{"h.mm B – h.mm B"} + h{"h.mm – h.mm B"} + m{"h.mm – h.mm B"} } Hm{ H{"HH.mm–HH.mm"} @@ -101,14 +101,14 @@ ms_ID{ m{"HH.mm–HH.mm v"} } hm{ - a{"h.mm a – h.mm a"} - h{"h.mm–h.mm a"} - m{"h.mm–h.mm a"} + a{"h.mm a – h.mm a"} + h{"h.mm–h.mm a"} + m{"h.mm–h.mm a"} } hmv{ - a{"h.mm a – h.mm a v"} - h{"h.mm–h.mm a v"} - m{"h.mm–h.mm a v"} + a{"h.mm a – h.mm a v"} + h{"h.mm–h.mm a v"} + m{"h.mm–h.mm a v"} } } } diff --git a/icu4c/source/data/locales/mt.txt b/icu4c/source/data/locales/mt.txt index 74d362d65933..92af75fdd2cd 100644 --- a/icu4c/source/data/locales/mt.txt +++ b/icu4c/source/data/locales/mt.txt @@ -46,6 +46,15 @@ mt{ timeSeparator{":"} } } + minimalPairs{ + plural{ + few{"{0} ijiem"} + many{"{0}-il jum"} + one{"jum"} + other{"{0} jum"} + two{"jumejn"} + } + } minimumGroupingDigits{"1"} native{"latn"} } @@ -106,23 +115,23 @@ mt{ M{"M–M"} } MEd{ - M{"E, dd/MM – E, dd/MM"} - d{"E, dd/MM – E, dd/MM"} + M{"E, dd/MM – E, dd/MM"} + d{"E, dd/MM – E, dd/MM"} } MMM{ M{"MMM–MMM"} } MMMEd{ - M{"E, d MMM – E, d MMM"} - d{"E, d MMM – E, d MMM"} + M{"E, d MMM – E, d MMM"} + d{"E, d MMM – E, d MMM"} } MMMd{ - M{"d MMM – d MMM"} - d{"d – d MMM"} + M{"d MMM – d MMM"} + d{"d – d MMM"} } Md{ - M{"dd/MM – dd/MM"} - d{"dd/MM – dd/MM"} + M{"dd/MM – dd/MM"} + d{"dd/MM – dd/MM"} } d{ d{"d–d"} @@ -131,36 +140,36 @@ mt{ y{"y–y G"} } yM{ - M{"MM/y – MM/y G"} - y{"MM/y – MM/y G"} + M{"MM/y – MM/y G"} + y{"MM/y – MM/y G"} } yMEd{ - M{"E, dd/MM/y – E, dd/MM/y G"} - d{"E, dd/MM/y – E, dd/MM/y G"} - y{"E, dd/MM/y – E, dd/MM/y G"} + M{"E, dd/MM/y – E, dd/MM/y G"} + d{"E, dd/MM/y – E, dd/MM/y G"} + y{"E, dd/MM/y – E, dd/MM/y G"} } yMMM{ M{"MMM–MMM y G"} - y{"MMM y – MMM y G"} + y{"MMM y – MMM y G"} } yMMMEd{ - M{"E, d MMM – E, d MMM, y G"} - d{"E, d MMM – E, d MMM, y G"} - y{"E, d MMM, y – E, d MMM, y G"} + M{"E, d MMM – E, d MMM, y G"} + d{"E, d MMM – E, d MMM, y G"} + y{"E, d MMM, y – E, d MMM, y G"} } yMMMM{ - M{"MMMM – MMMM y G"} - y{"MMMM y – MMMM y G"} + M{"MMMM – MMMM y G"} + y{"MMMM y – MMMM y G"} } yMMMd{ - M{"d MMM – d MMM, y G"} - d{"d – d MMM, y G"} - y{"d MMM, y – d MMM, y G"} + M{"d MMM – d MMM, y G"} + d{"d – d MMM, y G"} + y{"d MMM, y – d MMM, y G"} } yMd{ - M{"dd/MM/y – dd/MM/y G"} - d{"dd/MM/y – dd/MM/y G"} - y{"dd/MM/y – dd/MM/y G"} + M{"dd/MM/y – dd/MM/y G"} + d{"dd/MM/y – dd/MM/y G"} + y{"dd/MM/y – dd/MM/y G"} } } } @@ -215,8 +224,8 @@ mt{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"d, E"} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"G y"} GyMMM{"MMM y G"} GyMMMEd{"E, d 'ta'’ MMM, y G"} @@ -231,20 +240,21 @@ mt{ MMM{"LLL"} MMMEd{"E, d 'ta'’ MMM"} MMMMW{ - few{"W 'ġimgħa' 'ta''' MMMM"} - many{"W 'ġimgħa' 'ta''' MMMM"} + few{"W 'ġimgħat' 'ta''' MMMM"} + many{"W'-il ġimgħa' 'ta''' MMMM"} one{"W 'ġimgħa' 'ta''' MMMM"} other{"W 'ġimgħa' 'ta''' MMMM"} + two{"W 'ġimgħatejn' 'ta''' MMMM"} } MMMMd{"d 'ta'’ MMMM"} MMMd{"MMM d"} Md{"MM-dd"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} - hmsv{"h:mm:ss a v"} - hmv{"h:mm a v"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} + hmsv{"h:mm:ss a v"} + hmv{"h:mm a v"} ms{"mm:ss"} y{"y"} yM{"y-MM"} @@ -257,10 +267,11 @@ mt{ yQQQ{"QQQ - y"} yQQQQ{"QQQQ - y"} yw{ - few{"w 'ġimgħa' 'ta''' Y"} - many{"w 'ġimgħa' 'ta''' Y"} + few{"w 'ġimgħat' 'ta''' Y"} + many{"w'-il ġimgħa' 'ta''' Y"} one{"w 'ġimgħa' 'ta''' Y"} other{"w 'ġimgħa' 'ta''' Y"} + two{"w 'ġimgħatejn' 'ta''' Y"} } } dayNames{ @@ -394,79 +405,79 @@ mt{ M{"MM–MM"} } MEd{ - M{"E, dd/MM – E, dd/MM"} - d{"E, dd/MM – E, dd/MM"} + M{"E, dd/MM – E, dd/MM"} + d{"E, dd/MM – E, dd/MM"} } MMM{ - M{"MMM – MMM"} + M{"MMM – MMM"} } MMMEd{ - M{"E, d 'ta'’ MMM – E, d 'ta'’ MMM"} - d{"E, d – E d MMM"} + M{"E, d 'ta'’ MMM – E, d 'ta'’ MMM"} + d{"E, d – E d MMM"} } MMMd{ - M{"d 'ta'’ MMM – d 'ta'’ MMM"} - d{"d – d MMM"} + M{"d 'ta'’ MMM – d 'ta'’ MMM"} + d{"d – d MMM"} } Md{ - M{"dd/MM – dd/MM"} - d{"dd/MM – dd/MM"} + M{"dd/MM – dd/MM"} + d{"dd/MM – dd/MM"} } d{ d{"d–d"} } h{ - a{"h a – h a"} - h{"h – h a"} + a{"h a – h a"} + h{"h – h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ - y{"y – y"} + y{"y – y"} } yM{ - M{"MM/y – MM/y"} - y{"MM/y – MM/y"} + M{"MM/y – MM/y"} + y{"MM/y – MM/y"} } yMEd{ - M{"E, dd/MM/y – E, dd/MM/y"} - d{"E, dd/MM/y – E, dd/MM/y"} - y{"E, dd/MM/y – E, dd/MM/y"} + M{"E, dd/MM/y – E, dd/MM/y"} + d{"E, dd/MM/y – E, dd/MM/y"} + y{"E, dd/MM/y – E, dd/MM/y"} } yMMM{ M{"MMM–MMM y"} - y{"MMM y – MMM y"} + y{"MMM y – MMM y"} } yMMMEd{ - M{"E, d 'ta'’ MMM – E, d 'ta'’ MMM y"} - d{"E, d MMM – E, d MMM, y"} - y{"E, d 'ta'’ MMM y – E, d 'ta'’ MMM y"} + M{"E, d 'ta'’ MMM – E, d 'ta'’ MMM y"} + d{"E, d MMM – E, d MMM, y"} + y{"E, d 'ta'’ MMM y – E, d 'ta'’ MMM y"} } yMMMM{ - M{"MMMM – MMMM y"} - y{"MMMM y – MMMM y"} + M{"MMMM – MMMM y"} + y{"MMMM y – MMMM y"} } yMMMd{ - M{"y MMM d – MMM d"} - d{"d – d MMM y"} - y{"d MMM, y – d MMM, y"} + M{"y MMM d – MMM d"} + d{"d – d MMM y"} + y{"d MMM, y – d MMM, y"} } yMd{ - M{"dd/MM/y – dd/MM/y"} - d{"dd/MM/y – dd/MM/y"} - y{"dd/MM/y – dd/MM/y"} + M{"dd/MM/y – dd/MM/y"} + d{"dd/MM/y – dd/MM/y"} + y{"dd/MM/y – dd/MM/y"} } } monthNames{ @@ -619,16 +630,18 @@ mt{ } relativeTime{ future{ - few{"fi żmien {0} ġurnata oħra"} - many{"fi żmien {0} ġurnata oħra"} + few{"fi żmien {0} ġranet oħra"} + many{"fi żmien {0}-il ġurnata oħra"} one{"fi żmien ġurnata"} other{"fi żmien {0} ġurnata oħra"} + two{"fi żmien jumejn oħra"} } past{ few{"{0} ġranet ilu"} many{"{0}-il ġurnata ilu"} one{"ġurnata ilu"} - other{"{0}-il ġurnata ilu"} + other{"{0} ġurnata ilu"} + two{"jumejn ilu"} } } } @@ -637,15 +650,17 @@ mt{ relativeTime{ future{ few{"fi żmien {0} ġurnata oħra"} - many{"fi żmien {0} ġurnata oħra"} + many{"fi żmien {0}-il ġurnata oħra"} one{"fi żmien ġurnata"} other{"fi żmien {0} ġurnata oħra"} + two{"fi żmien jumejn oħra"} } past{ few{"{0} ġranet ilu"} many{"{0}-il ġurnata ilu"} one{"ġurnata ilu"} - other{"{0}-il ġurnata ilu"} + other{"{0} ġurnata ilu"} + two{"jumejn ilu"} } } } @@ -653,16 +668,18 @@ mt{ dn{"Jum"} relativeTime{ future{ - few{"fi żmien {0} ġurnata oħra"} - many{"fi żmien {0} ġurnata oħra"} + few{"fi żmien {0} ġranet oħra"} + many{"fi żmien {0}-il ġurnata oħra"} one{"fi żmien ġurnata"} other{"fi żmien {0} ġurnata oħra"} + two{"fi żmien jumejn oħra"} } past{ few{"{0} ġranet ilu"} many{"{0}-il ġurnata ilu"} one{"ġurnata ilu"} - other{"{0}-il ġurnata ilu"} + other{"{0} ġurnata ilu"} + two{"jumejn ilu"} } } } @@ -705,15 +722,17 @@ mt{ relativeTime{ future{ few{"fi żmien {0} sigħat"} - many{"fi żmien{0} sigħat"} + many{"fi żmien {0}-il siegħa"} one{"fi żmien siegħa oħra"} - other{"fi żmien {0} sigħat"} + other{"fi żmien {0} siegħa"} + two{"fi żmien sagħtejn"} } past{ few{"{0} sigħat ilu"} - many{"{0} sigħat ilu"} + many{"{0}-il siegħa ilu"} one{"siegħa ilu"} - other{"{0} sigħat ilu"} + other{"{0} siegħa ilu"} + two{"sagħtejn ilu"} } } } @@ -722,15 +741,17 @@ mt{ relativeTime{ future{ few{"fi żmien {0} sigħat"} - many{"fi żmien {0} sigħat"} + many{"fi żmien {0}-il siegħa"} one{"fi żmien siegħa oħra"} - other{"fi żmien {0} sigħat"} + other{"fi żmien {0} siegħa"} + two{"fi żmien sagħtejn"} } past{ few{"{0} sigħat ilu"} - many{"{0} sigħat ilu"} + many{"{0}-il siegħa ilu"} one{"siegħa ilu"} - other{"{0} sigħat ilu"} + other{"{0} siegħa ilu"} + two{"sagħtejn ilu"} } } } @@ -739,15 +760,17 @@ mt{ relativeTime{ future{ few{"fi żmien {0} sigħat"} - many{"+{0} h"} + many{"fi żmien {0}-il siegħa"} one{"fi żmien siegħa oħra"} - other{"fi żmien {0} sigħat"} + other{"fi żmien {0} siegħa"} + two{"fi żmien sagħtejn"} } past{ few{"{0} sigħat ilu"} - many{"{0} sigħat ilu"} + many{"{0}-il siegħa ilu"} one{"siegħa ilu"} - other{"{0} sigħat ilu"} + other{"{0} siegħa ilu"} + two{"sagħtejn ilu"} } } } @@ -759,15 +782,17 @@ mt{ relativeTime{ future{ few{"sa {0} minuti oħra"} - many{"sa {0} minuti oħra"} + many{"sa {0}-il minuta oħra"} one{"sa minuta oħra"} - other{"sa {0} minuti oħra"} + other{"sa {0} minuta oħra"} + two{"sa {0} minuti oħra"} } past{ few{"{0} minuti ilu"} - many{"{0} minuti ilu"} + many{"{0}-il minuta ilu"} one{"minuta ilu"} - other{"{0} minuti ilu"} + other{"{0} minuta ilu"} + two{"{0} minuti ilu"} } } } @@ -776,15 +801,17 @@ mt{ relativeTime{ future{ few{"sa {0} min. oħra"} - many{"+{0} min"} + many{"sa {0}-il min"} one{"sa min. oħra"} other{"sa {0} min. oħra"} + two{"sa {0} min. oħra"} } past{ few{"{0} min. ilu"} - many{"{0} min. ilu"} + many{"{0}-il min. ilu"} one{"min. ilu"} other{"{0} min. ilu"} + two{"{0} min. ilu"} } } } @@ -793,15 +820,17 @@ mt{ relativeTime{ future{ few{"sa {0} min. oħra"} - many{"sa {0} min. oħra"} + many{"sa {0}-il min. oħra"} one{"sa min. oħra"} other{"sa {0} min. oħra"} + two{"sa {0} min. oħra"} } past{ few{"{0} min. ilu"} - many{"{0} minuti ilu"} + many{"{0}-il min. ilu"} one{"min. ilu"} other{"{0} min. ilu"} + two{"{0} min. ilu"} } } } @@ -836,15 +865,17 @@ mt{ relativeTime{ future{ few{"fi {0} xhur oħra"} - many{"fi {0} xhur oħra"} + many{"fi {0}-xahar oħra"} one{"sa xahar ieħor"} - other{"fi {0} xhur oħra"} + other{"fi {0} xahar oħra"} + two{"fi xahrejn oħra"} } past{ few{"{0} xhur ilu"} - many{"{0} xhur ilu"} + many{"{0}-il xahar ilu"} one{"xahar ilu"} - other{"{0} xhur ilu"} + other{"{0} xahar ilu"} + two{"xahrejn ilu"} } } } @@ -853,15 +884,17 @@ mt{ relativeTime{ future{ few{"sa {0} xhur oħra"} - many{"sa {0} xhur oħra"} + many{"sa {0}-il xahar oħra"} one{"sa xahar ieħor"} - other{"sa {0} xhur oħra"} + other{"sa {0} xahar oħra"} + two{"sa xahrejn oħra"} } past{ few{"{0} xhur ilu"} - many{"{0} xhur ilu"} + many{"{0}-il xahar ilu"} one{"xahar ilu"} - other{"{0} xhur ilu"} + other{"{0} xahar ilu"} + two{"xahrejn ilu"} } } } @@ -870,15 +903,17 @@ mt{ relativeTime{ future{ few{"sa {0} xhur oħra"} - many{"sa {0} xhur oħra"} + many{"sa {0}-il xahar oħra"} one{"sa xahar ieħor"} - other{"sa {0} xhur oħra"} + other{"sa {0} xahar oħra"} + two{"sa xahrejn oħra"} } past{ few{"{0} xhur ilu"} - many{"{0} xhur ilu"} + many{"{0}-il xahar ilu"} one{"{0} xahar ilu"} - other{"{0} xhur ilu"} + other{"{0} xahar ilu"} + two{"xahrejn ilu"} } } } @@ -891,15 +926,17 @@ mt{ relativeTime{ future{ few{"f’{0} kwarti ta’ sena oħrajn"} - many{"f’{0} kwarti ta’ sena oħrajn"} - one{"f’{0} kwarti ta’ sena oħrajn"} - other{"f’{0} kwarti ta’ sena oħrajn"} + many{"f’{0}-il kwart ta’ sena oħrajn"} + one{"f’{0} kwart ta’ sena oħrajn"} + other{"f’{0} kwart ta’ sena oħrajn"} + two{"f’{0} kwarti ta’ sena oħrajn"} } past{ few{"{0} kwarti ta’ sena li għaddew"} - many{"{0} kwarti ta’ sena li għaddew"} + many{"{0}-il kwart ta’ sena li għaddew"} one{"il-kwart ta’ sena li għadda"} - other{"{0} kwarti ta’ sena li għaddew"} + other{"{0} kwart ta’ sena li għaddew"} + two{"{0} kwarti ta’ sena li għaddew"} } } } @@ -916,15 +953,17 @@ mt{ relativeTime{ future{ few{"f’{0} kwarti ta’ sena oħrajn"} - many{"f’{0} kwarti ta’ sena oħrajn"} + many{"f’{0}-il kwart ta’ sena oħrajn"} one{"fi kwart ta’ sena ieħor"} - other{"f’{0} kwarti ta’ sena oħrajn"} + other{"f’{0} kwart ta’ sena oħrajn"} + two{"f’{0} kwarti ta’ sena oħrajn"} } past{ few{"{0} kwarti ta’ sena ilu"} - many{"{0} kwarti ta’ sena ilu"} + many{"{0}-il kwart ta’ sena ilu"} one{"fil-kwart tas-sena li għadda"} - other{"{0} kwarti ta’ sena ilu"} + other{"{0} kwart ta’ sena ilu"} + two{"{0} kwarti ta’ sena ilu"} } } } @@ -937,15 +976,17 @@ mt{ relativeTime{ future{ few{"f’{0} kwarti ta’ sena oħrajn"} - many{"f’{0} kwarti ta’ sena oħrajn"} + many{"f’{0}-il kwart ta’ sena oħrajn"} one{"fil-kwart tas-sena li ġej"} - other{"f’{0} kwarti ta’ sena oħrajn"} + other{"f’{0} kwart ta’ sena oħrajn"} + two{"f’{0} kwarti ta’ sena oħrajn"} } past{ few{"{0} kwarti ta’ sena ilu"} - many{"{0} kwarti ta’ sena ilu"} + many{"{0}-il kwart ta’ sena ilu"} one{"fil-kwart tas-sena li għadda"} - other{"{0} kwarti ta’ sena ilu"} + other{"{0} kwart ta’ sena ilu"} + two{"{0} kwarti ta’ sena ilu"} } } } @@ -957,15 +998,17 @@ mt{ relativeTime{ future{ few{"sa {0} sekondi oħra"} - many{"sa {0} sekondi oħra"} - one{"sa {0} sekondi oħra"} - other{"sa {0} sekondi oħra"} + many{"sa {0}-il sekonda oħra"} + one{"sa sekonda oħra"} + other{"sa {0} sekonda oħra"} + two{"sa {0} sekondi oħra"} } past{ few{"{0} sekondi ilu"} - many{"{0} sekondi ilu"} + many{"{0}-il sekonda ilu"} one{"sekonda ilu"} - other{"{0} sekondi ilu"} + other{"{0} sekonda ilu"} + two{"{0} sekondi ilu"} } } } @@ -974,15 +1017,17 @@ mt{ relativeTime{ future{ few{"sa {0} sek. oħra"} - many{"sa {0} sek. oħra"} + many{"sa {0}-il sek. oħra"} one{"sa sek. oħra"} other{"sa {0} sek. oħra"} + two{"sa {0} sek. oħra"} } past{ few{"{0} sek. ilu"} - many{"{0} sek. ilu"} + many{"{0}-il sek. ilu"} one{"sek. ilu"} other{"{0} sek. ilu"} + two{"{0} sek. ilu"} } } } @@ -991,15 +1036,17 @@ mt{ relativeTime{ future{ few{"sa {0} sek. oħra"} - many{"sa {0} sek. oħra"} - one{"sa {0} sekondi oħra"} - other{"sa {0} sekondi oħra"} + many{"sa {0}-il sek. oħra"} + one{"sa sek. oħra"} + other{"sa {0} sek. oħra"} + two{"sa {0} sek. oħra"} } past{ few{"{0} sek. ilu"} - many{"{0} sek. ilu"} + many{"{0}-il sek. ilu"} one{"sek. ilu"} other{"{0} sek. ilu"} + two{"{0} sek. ilu"} } } } @@ -1012,15 +1059,17 @@ mt{ relativeTime{ future{ few{"sa {0} Ħdud oħra"} - many{"sa {0} Ħdud oħra"} + many{"sa {0}-il Ħadd oħra"} one{"sa Ħadd ieħor"} - other{"sa {0} Ħdud oħra"} + other{"sa {0} Ħadd oħra"} + two{"sa {0} Ħdud oħra"} } past{ few{"{0} Ħdud ilu"} - many{"{0} Ħdud ilu"} + many{"{0}-il Ħadd ilu"} one{"il-Ħadd li għadda"} - other{"{0} Ħdud ilu"} + other{"{0} Ħadd ilu"} + two{"{0} Ħdud ilu"} } } } @@ -1033,15 +1082,17 @@ mt{ relativeTime{ future{ few{"sa {0} Ħd. oħra"} - many{"sa {0} Ħd. oħra"} + many{"sa {0}-il Ħd. oħra"} one{"sa Ħd. ieħor"} other{"sa {0} Ħd. oħra"} + two{"sa {0} Ħd. oħra"} } past{ few{"{0} Ħd. ilu"} - many{"{0} Ħd. ilu"} + many{"{0}-il Ħd. ilu"} one{"{0} Ħd. ilu"} other{"{0} Ħd. ilu"} + two{"{0} Ħd. ilu"} } } } @@ -1054,15 +1105,17 @@ mt{ relativeTime{ future{ few{"sa {0} Ħd. oħra"} - many{"sa {0} Ħd. oħra"} + many{"sa {0}-il Ħd. oħra"} one{"sa Ħd. ieħor"} other{"sa {0} Ħd. oħra"} + two{"sa {0} Ħd. oħra"} } past{ few{"{0} Ħd. ilu"} - many{"{0} Ħd. ilu"} + many{"{0}-il Ħd. ilu"} one{"il-Ħd. li għadda"} other{"{0} Ħd. ilu"} + two{"{0} Ħd. ilu"} } } } @@ -1084,15 +1137,17 @@ mt{ relativeTime{ future{ few{"sa {0} ġimgħat oħra"} - many{"sa {0} ġimgħat oħra"} + many{"sa {0}-il ġimgħa oħra"} one{"sa ġimgħa oħra"} - other{"sa {0} ġimgħat oħra"} + other{"sa {0} ġimgħa oħra"} + two{"sa ġimgħatejn oħra"} } past{ few{"{0} ġimgħat ilu"} - many{"{0} ġimgħat ilu"} + many{"{0}-il ġimgħa ilu"} one{"ġimgħa ilu"} - other{"{0} ġimgħat ilu"} + other{"{0} ġimgħa ilu"} + two{"ġimgħatejn ilu"} } } } @@ -1101,15 +1156,17 @@ mt{ relativeTime{ future{ few{"sa {0} ġimgħat oħra"} - many{"sa {0} ġimgħat oħra"} + many{"sa {0}-il ġimgħa oħra"} one{"sa ġimgħa oħra"} - other{"sa {0} ġimgħat oħra"} + other{"sa {0} ġimgħa oħra"} + two{"sa ġimgħatejn oħra"} } past{ few{"{0} ġimgħat ilu"} - many{"{0} ġimgħat ilu"} + many{"{0}-il ġimgħa ilu"} one{"ġimgħa ilu"} - other{"{0} ġimgħat ilu"} + other{"{0} ġimgħa ilu"} + two{"ġimgħatejn ilu"} } } } @@ -1118,15 +1175,17 @@ mt{ relativeTime{ future{ few{"sa {0} ġimgħat oħra"} - many{"sa {0} ġimgħat oħra"} + many{"sa {0}-il ġimgħa oħra"} one{"sa ġimgħa oħra"} - other{"+{0} w"} + other{"sa {0} ġimgħa oħra"} + two{"sa ġimgħatejn oħra"} } past{ few{"{0} ġimgħat ilu"} - many{"{0} ġimgħat ilu"} + many{"{0}-il ġimgħa ilu"} one{"ġimgħa ilu"} - other{"{0} ġimgħat ilu"} + other{"{0} ġimgħa ilu"} + two{"ġimgħatejn ilu"} } } } @@ -1167,15 +1226,17 @@ mt{ relativeTime{ future{ few{"fi żmien {0} snin oħra"} - many{"fi żmien {0} snin oħra"} + many{"fi żmien {0}-il sena oħra"} one{"fi żmien sena"} - other{"fi żmien {0} snin oħra"} + other{"fi żmien {0} sena oħra"} + two{"fi żmien sentejn oħra"} } past{ few{"{0} snin ilu"} - many{"{0} snin ilu"} + many{"{0}-il sena ilu"} one{"sena ilu"} - other{"{0} snin ilu"} + other{"{0} sena ilu"} + two{"sentejn ilu"} } } } @@ -1184,15 +1245,17 @@ mt{ relativeTime{ future{ few{"fi żmien {0} snin oħra"} - many{"fi żmien {0} snin oħra"} + many{"fi żmien {0}-il sena oħra"} one{"fi żmien sena"} - other{"fi żmien {0} snin oħra"} + other{"fi żmien {0} sena oħra"} + two{"fi żmien sentejn oħra"} } past{ few{"{0} snin ilu"} - many{"{0} snin ilu"} + many{"{0}-il sena ilu"} one{"sena ilu"} - other{"{0} snin ilu"} + other{"{0} sena ilu"} + two{"sentejn ilu"} } } } @@ -1201,15 +1264,17 @@ mt{ relativeTime{ future{ few{"fi żmien {0} snin oħra"} - many{"fi żmien {0} snin oħra"} + many{"fi żmien {0}-il sena oħra"} one{"fi żmien sena"} - other{"fi żmien {0} snin oħra"} + other{"fi żmien {0} sena oħra"} + two{"fi żmien sentejn oħra"} } past{ few{"{0} snin ilu"} - many{"{0} snin ilu"} + many{"{0}-il sena ilu"} one{"sa sena ilu"} - other{"{0} snin ilu"} + other{"{0} sena ilu"} + two{"sentejn ilu"} } } } diff --git a/icu4c/source/data/locales/mua.txt b/icu4c/source/data/locales/mua.txt index b6198a9b55e4..10a0a619e7de 100644 --- a/icu4c/source/data/locales/mua.txt +++ b/icu4c/source/data/locales/mua.txt @@ -58,8 +58,8 @@ mua{ MMMd{"d MMM"} Md{"d/M"} d{"d"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"m:ss"} y{"y"} yM{"M/y"} @@ -117,8 +117,8 @@ mua{ MMMd{"d MMM"} Md{"d/M"} d{"d"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"m:ss"} y{"y"} yM{"M/y"} diff --git a/icu4c/source/data/locales/naq.txt b/icu4c/source/data/locales/naq.txt index 683bb6e585a8..735fbe70618a 100644 --- a/icu4c/source/data/locales/naq.txt +++ b/icu4c/source/data/locales/naq.txt @@ -15,10 +15,10 @@ naq{ calendar{ generic{ DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE, d MMMM y G", "d MMMM y G", "d MMM y G", @@ -51,7 +51,7 @@ naq{ MMMd{"MMM d"} Md{"M/d"} d{"d"} - hm{"h:mm a"} + hm{"h:mm a"} ms{"mm:ss"} y{"y"} yM{"M/y"} @@ -73,10 +73,10 @@ naq{ "ǃuias", } DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE, d MMMM y", "d MMMM y", "d MMM y", @@ -109,7 +109,7 @@ naq{ MMMd{"MMM d"} Md{"M/d"} d{"d"} - hm{"h:mm a"} + hm{"h:mm a"} ms{"mm:ss"} y{"y"} yM{"M/y"} diff --git a/icu4c/source/data/locales/nd.txt b/icu4c/source/data/locales/nd.txt index 6e00ae21aac5..166fe5ec84c1 100644 --- a/icu4c/source/data/locales/nd.txt +++ b/icu4c/source/data/locales/nd.txt @@ -52,7 +52,7 @@ nd{ MMMd{"MMM d"} Md{"M/d"} d{"d"} - hm{"h:mm a"} + hm{"h:mm a"} ms{"mm:ss"} y{"y"} yM{"M/y"} @@ -102,7 +102,7 @@ nd{ MMMd{"MMM d"} Md{"M/d"} d{"d"} - hm{"h:mm a"} + hm{"h:mm a"} ms{"mm:ss"} y{"y"} yM{"M/y"} diff --git a/icu4c/source/data/locales/ne.txt b/icu4c/source/data/locales/ne.txt index d8746c01c173..fc9bc5a50b80 100644 --- a/icu4c/source/data/locales/ne.txt +++ b/icu4c/source/data/locales/ne.txt @@ -255,6 +255,12 @@ ne{ "G y MMM d", "GGGGG y-MM-dd", "{1},{0}", + "{1},{0}", + "{1},{0}", + "{1},{0}", + "{1},{0}", + } + DateTimePatterns%atTime{ "{1}{0}मा", "{1}{0}मा", "{1},{0}", diff --git a/icu4c/source/data/locales/nl.txt b/icu4c/source/data/locales/nl.txt index 1286dad31c04..46081b88b4ff 100644 --- a/icu4c/source/data/locales/nl.txt +++ b/icu4c/source/data/locales/nl.txt @@ -1502,6 +1502,12 @@ nl{ "d MMM y G", "dd-MM-yy GGGGG", "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + } + DateTimePatterns%atTime{ "{1} 'om' {0}", "{1} 'om' {0}", "{1} {0}", @@ -1574,83 +1580,83 @@ nl{ M{"M–M"} } MEd{ - M{"E dd-MM – E dd-MM"} - d{"E dd-MM – E dd-MM"} + M{"E dd-MM – E dd-MM"} + d{"E dd-MM – E dd-MM"} } MMM{ M{"MMM–MMM"} } MMMEd{ - M{"E d MMM – E d MMM"} - d{"E d – E d MMM"} + M{"E d MMM – E d MMM"} + d{"E d – E d MMM"} } MMMM{ M{"MMMM–MMMM"} } MMMd{ - M{"d MMM – d MMM"} + M{"d MMM – d MMM"} d{"d–d MMM"} } Md{ - M{"dd-MM – dd-MM"} - d{"dd-MM – dd-MM"} + M{"dd-MM – dd-MM"} + d{"dd-MM – dd-MM"} } d{ d{"d–d"} } fallback{"{0} - {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y G"} } yM{ - M{"MM-y – MM-y G"} - y{"MM-y – MM-y G"} + M{"MM-y – MM-y G"} + y{"MM-y – MM-y G"} } yMEd{ - M{"E dd-MM-y – E dd-MM-y G"} - d{"E dd-MM-y – E dd-MM-y G"} - y{"E dd-MM-y – E dd-MM-y G"} + M{"E dd-MM-y – E dd-MM-y G"} + d{"E dd-MM-y – E dd-MM-y G"} + y{"E dd-MM-y – E dd-MM-y G"} } yMMM{ M{"MMM–MMM y G"} - y{"MMM y – MMM y G"} + y{"MMM y – MMM y G"} } yMMMEd{ - M{"E d MMM – E d MMM y G"} - d{"E d – E d MMM y G"} - y{"E d MMM y – E d MMM y G"} + M{"E d MMM – E d MMM y G"} + d{"E d – E d MMM y G"} + y{"E d MMM y – E d MMM y G"} } yMMMM{ M{"MMMM–MMMM y G"} - y{"MMMM y – MMMM y G"} + y{"MMMM y – MMMM y G"} } yMMMd{ - M{"d MMM – d MMM y G"} + M{"d MMM – d MMM y G"} d{"d–d MMM y G"} - y{"d MMM y – d MMM y G"} + y{"d MMM y – d MMM y G"} } yMd{ - M{"dd-MM-y – dd-MM-y G"} - d{"dd-MM-y – dd-MM-y G"} - y{"dd-MM-y – dd-MM-y G"} + M{"dd-MM-y – dd-MM-y G"} + d{"dd-MM-y – dd-MM-y G"} + y{"dd-MM-y – dd-MM-y G"} } } } @@ -1710,9 +1716,9 @@ nl{ UMMMd{"U MMM d"} UMd{"U MM-d"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"mm:ss"} y{"U"} yMd{"y-MM-dd"} @@ -2494,80 +2500,80 @@ nl{ M{"MM–MM"} } MEd{ - M{"MM-dd, E – MM-dd, E"} - d{"MM-dd, E – MM-dd, E"} + M{"MM-dd, E – MM-dd, E"} + d{"MM-dd, E – MM-dd, E"} } MMM{ M{"LLL–LLL"} } MMMEd{ - M{"MMM d, E – MMM d, E"} - d{"MMM d, E – MMM d, E"} + M{"MMM d, E – MMM d, E"} + d{"MMM d, E – MMM d, E"} } MMMd{ - M{"MMM d – MMM d"} + M{"MMM d – MMM d"} d{"MMM d–d"} } Md{ - M{"MM-dd – MM-dd"} - d{"MM-dd – MM-dd"} + M{"MM-dd – MM-dd"} + d{"MM-dd – MM-dd"} } d{ d{"d–d"} } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"U–U"} } yM{ - M{"y-MM – y-MM"} - y{"y-MM – y-MM"} + M{"y-MM – y-MM"} + y{"y-MM – y-MM"} } yMEd{ - M{"y-MM-dd, E – y-MM-dd, E"} - d{"y-MM-dd, E – y-MM-dd, E"} - y{"y-MM-dd, E – y-MM-dd, E"} + M{"y-MM-dd, E – y-MM-dd, E"} + d{"y-MM-dd, E – y-MM-dd, E"} + y{"y-MM-dd, E – y-MM-dd, E"} } yMMM{ M{"U MMM–MMM"} - y{"U MMM – U MMM"} + y{"U MMM – U MMM"} } yMMMEd{ - M{"U MMM d, E – MMM d, E"} - d{"U MMM d, E – MMM d, E"} - y{"U MMM d, E – U MMM d, E"} + M{"U MMM d, E – MMM d, E"} + d{"U MMM d, E – MMM d, E"} + y{"U MMM d, E – U MMM d, E"} } yMMMM{ M{"U MMMM–MMMM"} - y{"U MMMM – U MMMM"} + y{"U MMMM – U MMMM"} } yMMMd{ - M{"U MMM d – MMM d"} + M{"U MMM d – MMM d"} d{"U MMM d–d"} - y{"U MMM d – U MMM d"} + y{"U MMM d – U MMM d"} } yMd{ - M{"y-MM-dd – y-MM-dd"} - d{"y-MM-dd – y-MM-dd"} - y{"y-MM-dd – y-MM-dd"} + M{"y-MM-dd – y-MM-dd"} + d{"y-MM-dd – y-MM-dd"} + y{"y-MM-dd – y-MM-dd"} } } monthNames{ @@ -2701,6 +2707,12 @@ nl{ "d MMM y G", "dd-MM-yy GGGGG", "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + } + DateTimePatterns%atTime{ "{1} 'om' {0}", "{1} 'om' {0}", "{1} {0}", @@ -2776,83 +2788,83 @@ nl{ M{"M–M"} } MEd{ - M{"E dd-MM – E dd-MM"} - d{"E dd-MM – E dd-MM"} + M{"E dd-MM – E dd-MM"} + d{"E dd-MM – E dd-MM"} } MMM{ M{"MMM–MMM"} } MMMEd{ - M{"E d MMM – E d MMM"} - d{"E d – E d MMM"} + M{"E d MMM – E d MMM"} + d{"E d – E d MMM"} } MMMM{ M{"MMMM–MMMM"} } MMMd{ - M{"d MMM – d MMM"} + M{"d MMM – d MMM"} d{"d–d MMM"} } Md{ - M{"dd-MM – dd-MM"} - d{"dd-MM – dd-MM"} + M{"dd-MM – dd-MM"} + d{"dd-MM – dd-MM"} } d{ d{"d–d"} } fallback{"{0} - {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y G"} } yM{ - M{"MM-y – MM-y G"} - y{"MM-y – MM-y G"} + M{"MM-y – MM-y G"} + y{"MM-y – MM-y G"} } yMEd{ - M{"E dd-MM-y – E dd-MM-y G"} - d{"E dd-MM-y – E dd-MM-y G"} - y{"E dd-MM-y – E dd-MM-y G"} + M{"E dd-MM-y – E dd-MM-y G"} + d{"E dd-MM-y – E dd-MM-y G"} + y{"E dd-MM-y – E dd-MM-y G"} } yMMM{ M{"MMM–MMM y G"} - y{"MMM y – MMM y G"} + y{"MMM y – MMM y G"} } yMMMEd{ - M{"E d MMM – E d MMM y G"} - d{"E d – E d MMM y G"} - y{"E d MMM y – E d MMM y G"} + M{"E d MMM – E d MMM y G"} + d{"E d – E d MMM y G"} + y{"E d MMM y – E d MMM y G"} } yMMMM{ M{"MMMM–MMMM y G"} - y{"MMMM y – MMMM y G"} + y{"MMMM y – MMMM y G"} } yMMMd{ - M{"d MMM – d MMM y G"} + M{"d MMM – d MMM y G"} d{"d–d MMM y G"} - y{"d MMM y – d MMM y G"} + y{"d MMM y – d MMM y G"} } yMd{ - M{"dd-MM-y – dd-MM-y G"} - d{"dd-MM-y – dd-MM-y G"} - y{"dd-MM-y – dd-MM-y G"} + M{"dd-MM-y – dd-MM-y G"} + d{"dd-MM-y – dd-MM-y G"} + y{"dd-MM-y – dd-MM-y G"} } } monthNames{ @@ -2963,6 +2975,12 @@ nl{ "d MMM r", "dd-MM-r", "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + } + DateTimePatterns%atTime{ "{1} 'om' {0}", "{1} 'om' {0}", "{1} {0}", @@ -3775,80 +3793,80 @@ nl{ M{"MM–MM"} } MEd{ - M{"MM-dd, E – MM-dd, E"} - d{"MM-dd, E – MM-dd, E"} + M{"MM-dd, E – MM-dd, E"} + d{"MM-dd, E – MM-dd, E"} } MMM{ M{"LLL–LLL"} } MMMEd{ - M{"MMM d, E – MMM d, E"} - d{"MMM d, E – MMM d, E"} + M{"MMM d, E – MMM d, E"} + d{"MMM d, E – MMM d, E"} } MMMd{ - M{"MMM d – MMM d"} + M{"MMM d – MMM d"} d{"MMM d–d"} } Md{ - M{"MM-dd – MM-dd"} - d{"MM-dd – MM-dd"} + M{"MM-dd – MM-dd"} + d{"MM-dd – MM-dd"} } d{ d{"d–d"} } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"U–U"} } yM{ - M{"y-MM – y-MM"} - y{"y-MM – y-MM"} + M{"y-MM – y-MM"} + y{"y-MM – y-MM"} } yMEd{ - M{"y-MM-dd, E – y-MM-dd, E"} - d{"y-MM-dd, E – y-MM-dd, E"} - y{"y-MM-dd, E – y-MM-dd, E"} + M{"y-MM-dd, E – y-MM-dd, E"} + d{"y-MM-dd, E – y-MM-dd, E"} + y{"y-MM-dd, E – y-MM-dd, E"} } yMMM{ M{"U MMM–MMM"} - y{"U MMM – U MMM"} + y{"U MMM – U MMM"} } yMMMEd{ - M{"U MMM d, E – MMM d, E"} - d{"U MMM d, E – MMM d, E"} - y{"U MMM d, E – U MMM d, E"} + M{"U MMM d, E – MMM d, E"} + d{"U MMM d, E – MMM d, E"} + y{"U MMM d, E – U MMM d, E"} } yMMMM{ M{"U MMMM–MMMM"} - y{"U MMMM – U MMMM"} + y{"U MMMM – U MMMM"} } yMMMd{ - M{"U MMM d – MMM d"} + M{"U MMM d – MMM d"} d{"U MMM d–d"} - y{"U MMM d – U MMM d"} + y{"U MMM d – U MMM d"} } yMd{ - M{"y-MM-dd – y-MM-dd"} - d{"y-MM-dd – y-MM-dd"} - y{"y-MM-dd – y-MM-dd"} + M{"y-MM-dd – y-MM-dd"} + d{"y-MM-dd – y-MM-dd"} + y{"y-MM-dd – y-MM-dd"} } } monthNames{ @@ -3982,6 +4000,12 @@ nl{ "d MMM y G", "dd-MM-yy GGGGG", "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + } + DateTimePatterns%atTime{ "{1} 'om' {0}", "{1} 'om' {0}", "{1} {0}", @@ -4057,83 +4081,83 @@ nl{ M{"M–M"} } MEd{ - M{"E dd-MM – E dd-MM"} - d{"E dd-MM – E dd-MM"} + M{"E dd-MM – E dd-MM"} + d{"E dd-MM – E dd-MM"} } MMM{ M{"MMM–MMM"} } MMMEd{ - M{"E d MMM – E d MMM"} - d{"E d – E d MMM"} + M{"E d MMM – E d MMM"} + d{"E d – E d MMM"} } MMMM{ M{"MMMM–MMMM"} } MMMd{ - M{"d MMM – d MMM"} + M{"d MMM – d MMM"} d{"d–d MMM"} } Md{ - M{"dd-MM – dd-MM"} - d{"dd-MM – dd-MM"} + M{"dd-MM – dd-MM"} + d{"dd-MM – dd-MM"} } d{ d{"d–d"} } fallback{"{0} - {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y G"} } yM{ - M{"MM-y – MM-y G"} - y{"MM-y – MM-y G"} + M{"MM-y – MM-y G"} + y{"MM-y – MM-y G"} } yMEd{ - M{"E dd-MM-y – E dd-MM-y G"} - d{"E dd-MM-y – E dd-MM-y G"} - y{"E dd-MM-y – E dd-MM-y G"} + M{"E dd-MM-y – E dd-MM-y G"} + d{"E dd-MM-y – E dd-MM-y G"} + y{"E dd-MM-y – E dd-MM-y G"} } yMMM{ M{"MMM–MMM y G"} - y{"MMM y – MMM y G"} + y{"MMM y – MMM y G"} } yMMMEd{ - M{"E d MMM – E d MMM y G"} - d{"E d – E d MMM y G"} - y{"E d MMM y – E d MMM y G"} + M{"E d MMM – E d MMM y G"} + d{"E d – E d MMM y G"} + y{"E d MMM y – E d MMM y G"} } yMMMM{ M{"MMMM–MMMM y G"} - y{"MMMM y – MMMM y G"} + y{"MMMM y – MMMM y G"} } yMMMd{ - M{"d MMM – d MMM y G"} + M{"d MMM – d MMM y G"} d{"d–d MMM y G"} - y{"d MMM y – d MMM y G"} + y{"d MMM y – d MMM y G"} } yMd{ - M{"dd-MM-y – dd-MM-y G"} - d{"dd-MM-y – dd-MM-y G"} - y{"dd-MM-y – dd-MM-y G"} + M{"dd-MM-y – dd-MM-y G"} + d{"dd-MM-y – dd-MM-y G"} + y{"dd-MM-y – dd-MM-y G"} } } monthNames{ @@ -4257,6 +4281,12 @@ nl{ "d MMM y G", "dd-MM-yy GGGGG", "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + } + DateTimePatterns%atTime{ "{1} 'om' {0}", "{1} 'om' {0}", "{1} {0}", @@ -4282,8 +4312,8 @@ nl{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"E d"} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"y G"} GyMMM{"MMM y G"} GyMMMEd{"E d MMM y G"} @@ -4300,9 +4330,9 @@ nl{ MMMd{"d MMM"} Md{"d-M"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"mm:ss"} y{"y G"} yyyy{"y G"} @@ -4318,42 +4348,42 @@ nl{ } intervalFormats{ Gy{ - G{"y G – y G"} - y{"y – y G"} + G{"y G – y G"} + y{"y – y G"} } GyM{ - G{"M-y GGGGG – M-y GGGGG"} - M{"M-y – M-y GGGGG"} - y{"M-y – M-y GGGGG"} + G{"M-y GGGGG – M-y GGGGG"} + M{"M-y – M-y GGGGG"} + y{"M-y – M-y GGGGG"} } GyMEd{ - G{"E d-M-y GGGGG – E d-M-y GGGGG"} - M{"E d-M-y – E d-M-y GGGGG"} - d{"E d-M-y – E d-M-y GGGGG"} - y{"E d-M-y – E d-M-y GGGGG"} + G{"E d-M-y GGGGG – E d-M-y GGGGG"} + M{"E d-M-y – E d-M-y GGGGG"} + d{"E d-M-y – E d-M-y GGGGG"} + y{"E d-M-y – E d-M-y GGGGG"} } GyMMM{ - G{"MMM y G – MMM y G"} - M{"MMM – MMM y G"} - y{"MMM y – MMM y G"} + G{"MMM y G – MMM y G"} + M{"MMM – MMM y G"} + y{"MMM y – MMM y G"} } GyMMMEd{ - G{"E d MMM y G – E d MMM y G"} - M{"E d MMM – E d MMM y G"} - d{"E d MMM – E d MMM y G"} - y{"E d MMM y – E d MMM y G"} + G{"E d MMM y G – E d MMM y G"} + M{"E d MMM – E d MMM y G"} + d{"E d MMM – E d MMM y G"} + y{"E d MMM y – E d MMM y G"} } GyMMMd{ - G{"d MMM y G – d MMM y G"} - M{"d MMM – d MMM y G"} + G{"d MMM y G – d MMM y G"} + M{"d MMM – d MMM y G"} d{"d–d MMM y G"} - y{"d MMM y – d MMM y G"} + y{"d MMM y – d MMM y G"} } GyMd{ - G{"d-M-y GGGGG – d-M-y GGGGG"} - M{"d-M-y – d-M-y GGGGG"} - d{"d-M-y – d-M-y GGGGG"} - y{"d-M-y – d-M-y GGGGG"} + G{"d-M-y GGGGG – d-M-y GGGGG"} + M{"d-M-y – d-M-y GGGGG"} + d{"d-M-y – d-M-y GGGGG"} + y{"d-M-y – d-M-y GGGGG"} } H{ H{"HH–HH"} @@ -4373,83 +4403,83 @@ nl{ M{"M–M"} } MEd{ - M{"E dd-MM – E dd-MM"} - d{"E dd-MM – E dd-MM"} + M{"E dd-MM – E dd-MM"} + d{"E dd-MM – E dd-MM"} } MMM{ M{"MMM–MMM"} } MMMEd{ - M{"E d MMM – E d MMM"} - d{"E d – E d MMM"} + M{"E d MMM – E d MMM"} + d{"E d – E d MMM"} } MMMM{ M{"MMMM–MMMM"} } MMMd{ - M{"d MMM – d MMM"} + M{"d MMM – d MMM"} d{"d–d MMM"} } Md{ - M{"dd-MM – dd-MM"} - d{"dd-MM – dd-MM"} + M{"dd-MM – dd-MM"} + d{"dd-MM – dd-MM"} } d{ d{"d–d"} } fallback{"{0} - {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y G"} } yM{ - M{"MM-y – MM-y G"} - y{"MM-y – MM-y G"} + M{"MM-y – MM-y G"} + y{"MM-y – MM-y G"} } yMEd{ - M{"E dd-MM-y – E dd-MM-y G"} - d{"E dd-MM-y – E dd-MM-y G"} - y{"E dd-MM-y – E dd-MM-y G"} + M{"E dd-MM-y – E dd-MM-y G"} + d{"E dd-MM-y – E dd-MM-y G"} + y{"E dd-MM-y – E dd-MM-y G"} } yMMM{ M{"MMM–MMM y G"} - y{"MMM y – MMM y G"} + y{"MMM y – MMM y G"} } yMMMEd{ - M{"E d MMM – E d MMM y G"} - d{"E d – E d MMM y G"} - y{"E d MMM y – E d MMM y G"} + M{"E d MMM – E d MMM y G"} + d{"E d – E d MMM y G"} + y{"E d MMM y – E d MMM y G"} } yMMMM{ M{"MMMM–MMMM y G"} - y{"MMMM y – MMMM y G"} + y{"MMMM y – MMMM y G"} } yMMMd{ - M{"d MMM – d MMM y G"} + M{"d MMM – d MMM y G"} d{"d–d MMM y G"} - y{"d MMM y – d MMM y G"} + y{"d MMM y – d MMM y G"} } yMd{ - M{"dd-MM-y – dd-MM-y G"} - d{"dd-MM-y – dd-MM-y G"} - y{"dd-MM-y – dd-MM-y G"} + M{"dd-MM-y – dd-MM-y G"} + d{"dd-MM-y – dd-MM-y G"} + y{"dd-MM-y – dd-MM-y G"} } } } @@ -4476,6 +4506,12 @@ nl{ "d MMM y", "dd-MM-y", "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + } + DateTimePatterns%atTime{ "{1} 'om' {0}", "{1} 'om' {0}", "{1} {0}", @@ -4504,8 +4540,8 @@ nl{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"E d"} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"y G"} GyMMM{"MMM y G"} GyMMMEd{"E d MMM y G"} @@ -4528,11 +4564,11 @@ nl{ MMMd{"d MMM"} Md{"d-M"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} - hmsv{"h:mm:ss a v"} - hmv{"h:mm a v"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} + hmsv{"h:mm:ss a v"} + hmv{"h:mm a v"} ms{"mm:ss"} y{"y"} yM{"M-y"} @@ -4709,42 +4745,42 @@ nl{ } intervalFormats{ Gy{ - G{"y G – y G"} - y{"y – y G"} + G{"y G – y G"} + y{"y – y G"} } GyM{ - G{"M-y GGGGG – M-y GGGGG"} - M{"M-y – M-y GGGGG"} - y{"M-y – M-y GGGGG"} + G{"M-y GGGGG – M-y GGGGG"} + M{"M-y – M-y GGGGG"} + y{"M-y – M-y GGGGG"} } GyMEd{ - G{"E d-M-y GGGGG – E d-M-y GGGGG"} - M{"E d-M-y – E d-M-y GGGGG"} - d{"E d-M-y – E d-M-y GGGGG"} - y{"E d-M-y – E d-M-y GGGGG"} + G{"E d-M-y GGGGG – E d-M-y GGGGG"} + M{"E d-M-y – E d-M-y GGGGG"} + d{"E d-M-y – E d-M-y GGGGG"} + y{"E d-M-y – E d-M-y GGGGG"} } GyMMM{ - G{"MMM y G – MMM y G"} - M{"MMM – MMM y G"} - y{"MMM y – MMM y G"} + G{"MMM y G – MMM y G"} + M{"MMM – MMM y G"} + y{"MMM y – MMM y G"} } GyMMMEd{ - G{"E d MMM y G – E d MMM y G"} - M{"E d MMM – E d MMM y G"} - d{"E d MMM – E d MMM y G"} - y{"E d MMM y – E d MMM y G"} + G{"E d MMM y G – E d MMM y G"} + M{"E d MMM – E d MMM y G"} + d{"E d MMM – E d MMM y G"} + y{"E d MMM y – E d MMM y G"} } GyMMMd{ - G{"d MMM y G – d MMM y G"} - M{"d MMM – d MMM y G"} + G{"d MMM y G – d MMM y G"} + M{"d MMM – d MMM y G"} d{"d–d MMM y G"} - y{"d MMM y – d MMM y G"} + y{"d MMM y – d MMM y G"} } GyMd{ - G{"d-M-y GGGGG – d-M-y GGGGG"} - M{"d-M-y – d-M-y GGGGG"} - d{"d-M-y – d-M-y GGGGG"} - y{"d-M-y – d-M-y GGGGG"} + G{"d-M-y GGGGG – d-M-y GGGGG"} + M{"d-M-y – d-M-y GGGGG"} + d{"d-M-y – d-M-y GGGGG"} + y{"d-M-y – d-M-y GGGGG"} } H{ H{"HH–HH"} @@ -4764,83 +4800,83 @@ nl{ M{"M–M"} } MEd{ - M{"E dd-MM – E dd-MM"} - d{"E dd-MM – E dd-MM"} + M{"E dd-MM – E dd-MM"} + d{"E dd-MM – E dd-MM"} } MMM{ M{"MMM–MMM"} } MMMEd{ - M{"E d MMM – E d MMM"} - d{"E d – E d MMM"} + M{"E d MMM – E d MMM"} + d{"E d – E d MMM"} } MMMM{ M{"MMMM–MMMM"} } MMMd{ - M{"d MMM – d MMM"} + M{"d MMM – d MMM"} d{"d–d MMM"} } Md{ - M{"dd-MM – dd-MM"} - d{"dd-MM – dd-MM"} + M{"dd-MM – dd-MM"} + d{"dd-MM – dd-MM"} } d{ d{"d–d"} } fallback{"{0} - {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y"} } yM{ - M{"MM-y – MM-y"} - y{"MM-y – MM-y"} + M{"MM-y – MM-y"} + y{"MM-y – MM-y"} } yMEd{ - M{"E dd-MM-y – E dd-MM-y"} - d{"E dd-MM-y – E dd-MM-y"} - y{"E dd-MM-y – E dd-MM-y"} + M{"E dd-MM-y – E dd-MM-y"} + d{"E dd-MM-y – E dd-MM-y"} + y{"E dd-MM-y – E dd-MM-y"} } yMMM{ M{"MMM–MMM y"} - y{"MMM y – MMM y"} + y{"MMM y – MMM y"} } yMMMEd{ - M{"E d MMM – E d MMM y"} - d{"E d – E d MMM y"} - y{"E d MMM y – E d MMM y"} + M{"E d MMM – E d MMM y"} + d{"E d – E d MMM y"} + y{"E d MMM y – E d MMM y"} } yMMMM{ M{"MMMM–MMMM y"} - y{"MMMM y – MMMM y"} + y{"MMMM y – MMMM y"} } yMMMd{ - M{"d MMM – d MMM y"} + M{"d MMM – d MMM y"} d{"d–d MMM y"} - y{"d MMM y – d MMM y"} + y{"d MMM y – d MMM y"} } yMd{ - M{"dd-MM-y – dd-MM-y"} - d{"dd-MM-y – dd-MM-y"} - y{"dd-MM-y – dd-MM-y"} + M{"dd-MM-y – dd-MM-y"} + d{"dd-MM-y – dd-MM-y"} + y{"dd-MM-y – dd-MM-y"} } } monthNames{ @@ -4987,6 +5023,12 @@ nl{ "d MMM y G", "dd-MM-yy GGGGG", "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + } + DateTimePatterns%atTime{ "{1} 'om' {0}", "{1} 'om' {0}", "{1} {0}", @@ -5059,83 +5101,83 @@ nl{ M{"M–M"} } MEd{ - M{"E dd-MM – E dd-MM"} - d{"E dd-MM – E dd-MM"} + M{"E dd-MM – E dd-MM"} + d{"E dd-MM – E dd-MM"} } MMM{ M{"MMM–MMM"} } MMMEd{ - M{"E d MMM – E d MMM"} - d{"E d – E d MMM"} + M{"E d MMM – E d MMM"} + d{"E d – E d MMM"} } MMMM{ M{"MMMM–MMMM"} } MMMd{ - M{"d MMM – d MMM"} + M{"d MMM – d MMM"} d{"d–d MMM"} } Md{ - M{"dd-MM – dd-MM"} - d{"dd-MM – dd-MM"} + M{"dd-MM – dd-MM"} + d{"dd-MM – dd-MM"} } d{ d{"d–d"} } fallback{"{0} - {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y G"} } yM{ - M{"MM-y – MM-y G"} - y{"MM-y – MM-y G"} + M{"MM-y – MM-y G"} + y{"MM-y – MM-y G"} } yMEd{ - M{"E dd-MM-y – E dd-MM-y G"} - d{"E dd-MM-y – E dd-MM-y G"} - y{"E dd-MM-y – E dd-MM-y G"} + M{"E dd-MM-y – E dd-MM-y G"} + d{"E dd-MM-y – E dd-MM-y G"} + y{"E dd-MM-y – E dd-MM-y G"} } yMMM{ M{"MMM–MMM y G"} - y{"MMM y – MMM y G"} + y{"MMM y – MMM y G"} } yMMMEd{ - M{"E d MMM – E d MMM y G"} - d{"E d – E d MMM y G"} - y{"E d MMM y – E d MMM y G"} + M{"E d MMM – E d MMM y G"} + d{"E d – E d MMM y G"} + y{"E d MMM y – E d MMM y G"} } yMMMM{ M{"MMMM–MMMM y G"} - y{"MMMM y – MMMM y G"} + y{"MMMM y – MMMM y G"} } yMMMd{ - M{"d MMM – d MMM y G"} + M{"d MMM – d MMM y G"} d{"d–d MMM y G"} - y{"d MMM y – d MMM y G"} + y{"d MMM y – d MMM y G"} } yMd{ - M{"dd-MM-y – dd-MM-y G"} - d{"dd-MM-y – dd-MM-y G"} - y{"dd-MM-y – dd-MM-y G"} + M{"dd-MM-y – dd-MM-y G"} + d{"dd-MM-y – dd-MM-y G"} + y{"dd-MM-y – dd-MM-y G"} } } monthNames{ @@ -5252,6 +5294,12 @@ nl{ "d MMM y G", "dd-MM-yy GGGGG", "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + } + DateTimePatterns%atTime{ "{1} 'om' {0}", "{1} 'om' {0}", "{1} {0}", @@ -5324,83 +5372,83 @@ nl{ M{"M–M"} } MEd{ - M{"E dd-MM – E dd-MM"} - d{"E dd-MM – E dd-MM"} + M{"E dd-MM – E dd-MM"} + d{"E dd-MM – E dd-MM"} } MMM{ M{"MMM–MMM"} } MMMEd{ - M{"E d MMM – E d MMM"} - d{"E d – E d MMM"} + M{"E d MMM – E d MMM"} + d{"E d – E d MMM"} } MMMM{ M{"MMMM–MMMM"} } MMMd{ - M{"d MMM – d MMM"} + M{"d MMM – d MMM"} d{"d–d MMM"} } Md{ - M{"dd-MM – dd-MM"} - d{"dd-MM – dd-MM"} + M{"dd-MM – dd-MM"} + d{"dd-MM – dd-MM"} } d{ d{"d–d"} } fallback{"{0} - {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y G"} } yM{ - M{"MM-y – MM-y G"} - y{"MM-y – MM-y G"} + M{"MM-y – MM-y G"} + y{"MM-y – MM-y G"} } yMEd{ - M{"E dd-MM-y – E dd-MM-y G"} - d{"E dd-MM-y – E dd-MM-y G"} - y{"E dd-MM-y – E dd-MM-y G"} + M{"E dd-MM-y – E dd-MM-y G"} + d{"E dd-MM-y – E dd-MM-y G"} + y{"E dd-MM-y – E dd-MM-y G"} } yMMM{ M{"MMM–MMM y G"} - y{"MMM y – MMM y G"} + y{"MMM y – MMM y G"} } yMMMEd{ - M{"E d MMM – E d MMM y G"} - d{"E d – E d MMM y G"} - y{"E d MMM y – E d MMM y G"} + M{"E d MMM – E d MMM y G"} + d{"E d – E d MMM y G"} + y{"E d MMM y – E d MMM y G"} } yMMMM{ M{"MMMM–MMMM y G"} - y{"MMMM y – MMMM y G"} + y{"MMMM y – MMMM y G"} } yMMMd{ - M{"d MMM – d MMM y G"} + M{"d MMM – d MMM y G"} d{"d–d MMM y G"} - y{"d MMM y – d MMM y G"} + y{"d MMM y – d MMM y G"} } yMd{ - M{"dd-MM-y – dd-MM-y G"} - d{"dd-MM-y – dd-MM-y G"} - y{"dd-MM-y – dd-MM-y G"} + M{"dd-MM-y – dd-MM-y G"} + d{"dd-MM-y – dd-MM-y G"} + y{"dd-MM-y – dd-MM-y G"} } } monthNames{ @@ -5505,6 +5553,12 @@ nl{ "d MMM y G", "dd-MM-yy GGGGG", "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + } + DateTimePatterns%atTime{ "{1} 'om' {0}", "{1} 'om' {0}", "{1} {0}", @@ -5577,83 +5631,83 @@ nl{ M{"M–M"} } MEd{ - M{"E dd-MM – E dd-MM"} - d{"E dd-MM – E dd-MM"} + M{"E dd-MM – E dd-MM"} + d{"E dd-MM – E dd-MM"} } MMM{ M{"MMM–MMM"} } MMMEd{ - M{"E d MMM – E d MMM"} - d{"E d – E d MMM"} + M{"E d MMM – E d MMM"} + d{"E d – E d MMM"} } MMMM{ M{"MMMM–MMMM"} } MMMd{ - M{"d MMM – d MMM"} + M{"d MMM – d MMM"} d{"d–d MMM"} } Md{ - M{"dd-MM – dd-MM"} - d{"dd-MM – dd-MM"} + M{"dd-MM – dd-MM"} + d{"dd-MM – dd-MM"} } d{ d{"d–d"} } fallback{"{0} - {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y G"} } yM{ - M{"MM-y – MM-y G"} - y{"MM-y – MM-y G"} + M{"MM-y – MM-y G"} + y{"MM-y – MM-y G"} } yMEd{ - M{"E dd-MM-y – E dd-MM-y G"} - d{"E dd-MM-y – E dd-MM-y G"} - y{"E dd-MM-y – E dd-MM-y G"} + M{"E dd-MM-y – E dd-MM-y G"} + d{"E dd-MM-y – E dd-MM-y G"} + y{"E dd-MM-y – E dd-MM-y G"} } yMMM{ M{"MMM–MMM y G"} - y{"MMM y – MMM y G"} + y{"MMM y – MMM y G"} } yMMMEd{ - M{"E d MMM – E d MMM y G"} - d{"E d – E d MMM y G"} - y{"E d MMM y – E d MMM y G"} + M{"E d MMM – E d MMM y G"} + d{"E d – E d MMM y G"} + y{"E d MMM y – E d MMM y G"} } yMMMM{ M{"MMMM–MMMM y G"} - y{"MMMM y – MMMM y G"} + y{"MMMM y – MMMM y G"} } yMMMd{ - M{"d MMM – d MMM y G"} + M{"d MMM – d MMM y G"} d{"d–d MMM y G"} - y{"d MMM y – d MMM y G"} + y{"d MMM y – d MMM y G"} } yMd{ - M{"dd-MM-y – dd-MM-y G"} - d{"dd-MM-y – dd-MM-y G"} - y{"dd-MM-y – dd-MM-y G"} + M{"dd-MM-y – dd-MM-y G"} + d{"dd-MM-y – dd-MM-y G"} + y{"dd-MM-y – dd-MM-y G"} } } monthNames{ @@ -5758,6 +5812,12 @@ nl{ "d MMM y G", "dd-MM-yy GGGGG", "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + } + DateTimePatterns%atTime{ "{1} 'om' {0}", "{1} 'om' {0}", "{1} {0}", @@ -6538,83 +6598,83 @@ nl{ M{"M–M"} } MEd{ - M{"E dd-MM – E dd-MM"} - d{"E dd-MM – E dd-MM"} + M{"E dd-MM – E dd-MM"} + d{"E dd-MM – E dd-MM"} } MMM{ M{"MMM–MMM"} } MMMEd{ - M{"E d MMM – E d MMM"} - d{"E d – E d MMM"} + M{"E d MMM – E d MMM"} + d{"E d – E d MMM"} } MMMM{ M{"MMMM–MMMM"} } MMMd{ - M{"d MMM – d MMM"} + M{"d MMM – d MMM"} d{"d–d MMM"} } Md{ - M{"dd-MM – dd-MM"} - d{"dd-MM – dd-MM"} + M{"dd-MM – dd-MM"} + d{"dd-MM – dd-MM"} } d{ d{"d–d"} } fallback{"{0} - {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y G"} } yM{ - M{"MM-y – MM-y G"} - y{"MM-y – MM-y G"} + M{"MM-y – MM-y G"} + y{"MM-y – MM-y G"} } yMEd{ - M{"E dd-MM-y – E dd-MM-y G"} - d{"E dd-MM-y – E dd-MM-y G"} - y{"E dd-MM-y – E dd-MM-y G"} + M{"E dd-MM-y – E dd-MM-y G"} + d{"E dd-MM-y – E dd-MM-y G"} + y{"E dd-MM-y – E dd-MM-y G"} } yMMM{ M{"MMM–MMM y G"} - y{"MMM y – MMM y G"} + y{"MMM y – MMM y G"} } yMMMEd{ - M{"E d MMM – E d MMM y G"} - d{"E d – E d MMM y G"} - y{"E d MMM y – E d MMM y G"} + M{"E d MMM – E d MMM y G"} + d{"E d – E d MMM y G"} + y{"E d MMM y – E d MMM y G"} } yMMMM{ M{"MMMM–MMMM y G"} - y{"MMMM y – MMMM y G"} + y{"MMMM y – MMMM y G"} } yMMMd{ - M{"d MMM – d MMM y G"} + M{"d MMM – d MMM y G"} d{"d–d MMM y G"} - y{"d MMM y – d MMM y G"} + y{"d MMM y – d MMM y G"} } yMd{ - M{"dd-MM-y – dd-MM-y G"} - d{"dd-MM-y – dd-MM-y G"} - y{"dd-MM-y – dd-MM-y G"} + M{"dd-MM-y – dd-MM-y G"} + d{"dd-MM-y – dd-MM-y G"} + y{"dd-MM-y – dd-MM-y G"} } } } @@ -6629,6 +6689,12 @@ nl{ "d MMM y G", "dd-MM-yy GGGGG", "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + } + DateTimePatterns%atTime{ "{1} 'om' {0}", "{1} 'om' {0}", "{1} {0}", @@ -6701,83 +6767,83 @@ nl{ M{"M–M"} } MEd{ - M{"E dd-MM – E dd-MM"} - d{"E dd-MM – E dd-MM"} + M{"E dd-MM – E dd-MM"} + d{"E dd-MM – E dd-MM"} } MMM{ M{"MMM–MMM"} } MMMEd{ - M{"E d MMM – E d MMM"} - d{"E d – E d MMM"} + M{"E d MMM – E d MMM"} + d{"E d – E d MMM"} } MMMM{ M{"MMMM–MMMM"} } MMMd{ - M{"d MMM – d MMM"} + M{"d MMM – d MMM"} d{"d–d MMM"} } Md{ - M{"dd-MM – dd-MM"} - d{"dd-MM – dd-MM"} + M{"dd-MM – dd-MM"} + d{"dd-MM – dd-MM"} } d{ d{"d–d"} } fallback{"{0} - {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y G"} } yM{ - M{"MM-y – MM-y G"} - y{"MM-y – MM-y G"} + M{"MM-y – MM-y G"} + y{"MM-y – MM-y G"} } yMEd{ - M{"E dd-MM-y – E dd-MM-y G"} - d{"E dd-MM-y – E dd-MM-y G"} - y{"E dd-MM-y – E dd-MM-y G"} + M{"E dd-MM-y – E dd-MM-y G"} + d{"E dd-MM-y – E dd-MM-y G"} + y{"E dd-MM-y – E dd-MM-y G"} } yMMM{ M{"MMM–MMM y G"} - y{"MMM y – MMM y G"} + y{"MMM y – MMM y G"} } yMMMEd{ - M{"E d MMM – E d MMM y G"} - d{"E d – E d MMM y G"} - y{"E d MMM y – E d MMM y G"} + M{"E d MMM – E d MMM y G"} + d{"E d – E d MMM y G"} + y{"E d MMM y – E d MMM y G"} } yMMMM{ M{"MMMM–MMMM y G"} - y{"MMMM y – MMMM y G"} + y{"MMMM y – MMMM y G"} } yMMMd{ - M{"d MMM – d MMM y G"} + M{"d MMM – d MMM y G"} d{"d–d MMM y G"} - y{"d MMM y – d MMM y G"} + y{"d MMM y – d MMM y G"} } yMd{ - M{"dd-MM-y – dd-MM-y G"} - d{"dd-MM-y – dd-MM-y G"} - y{"dd-MM-y – dd-MM-y G"} + M{"dd-MM-y – dd-MM-y G"} + d{"dd-MM-y – dd-MM-y G"} + y{"dd-MM-y – dd-MM-y G"} } } monthNames{ @@ -6882,6 +6948,12 @@ nl{ "d MMM y G", "dd-MM-yy GGGGG", "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + } + DateTimePatterns%atTime{ "{1} 'om' {0}", "{1} 'om' {0}", "{1} {0}", @@ -6957,83 +7029,83 @@ nl{ M{"M–M"} } MEd{ - M{"E dd-MM – E dd-MM"} - d{"E dd-MM – E dd-MM"} + M{"E dd-MM – E dd-MM"} + d{"E dd-MM – E dd-MM"} } MMM{ M{"MMM–MMM"} } MMMEd{ - M{"E d MMM – E d MMM"} - d{"E d – E d MMM"} + M{"E d MMM – E d MMM"} + d{"E d – E d MMM"} } MMMM{ M{"MMMM–MMMM"} } MMMd{ - M{"d MMM – d MMM"} + M{"d MMM – d MMM"} d{"d–d MMM"} } Md{ - M{"dd-MM – dd-MM"} - d{"dd-MM – dd-MM"} + M{"dd-MM – dd-MM"} + d{"dd-MM – dd-MM"} } d{ d{"d–d"} } fallback{"{0} - {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y G"} } yM{ - M{"MM-y – MM-y G"} - y{"MM-y – MM-y G"} + M{"MM-y – MM-y G"} + y{"MM-y – MM-y G"} } yMEd{ - M{"E dd-MM-y – E dd-MM-y G"} - d{"E dd-MM-y – E dd-MM-y G"} - y{"E dd-MM-y – E dd-MM-y G"} + M{"E dd-MM-y – E dd-MM-y G"} + d{"E dd-MM-y – E dd-MM-y G"} + y{"E dd-MM-y – E dd-MM-y G"} } yMMM{ M{"MMM–MMM y G"} - y{"MMM y – MMM y G"} + y{"MMM y – MMM y G"} } yMMMEd{ - M{"E d MMM – E d MMM y G"} - d{"E d – E d MMM y G"} - y{"E d MMM y – E d MMM y G"} + M{"E d MMM – E d MMM y G"} + d{"E d – E d MMM y G"} + y{"E d MMM y – E d MMM y G"} } yMMMM{ M{"MMMM–MMMM y G"} - y{"MMMM y – MMMM y G"} + y{"MMMM y – MMMM y G"} } yMMMd{ - M{"d MMM – d MMM y G"} + M{"d MMM – d MMM y G"} d{"d–d MMM y G"} - y{"d MMM y – d MMM y G"} + y{"d MMM y – d MMM y G"} } yMd{ - M{"dd-MM-y – dd-MM-y G"} - d{"dd-MM-y – dd-MM-y G"} - y{"dd-MM-y – dd-MM-y G"} + M{"dd-MM-y – dd-MM-y G"} + d{"dd-MM-y – dd-MM-y G"} + y{"dd-MM-y – dd-MM-y G"} } } } diff --git a/icu4c/source/data/locales/nl_BE.txt b/icu4c/source/data/locales/nl_BE.txt index 0113b39f08d8..d2877792190c 100644 --- a/icu4c/source/data/locales/nl_BE.txt +++ b/icu4c/source/data/locales/nl_BE.txt @@ -14,8 +14,8 @@ nl_BE{ "d MMM y G", "d/MM/yy GGGGG", "{1} {0}", - "{1} 'om' {0}", - "{1} 'om' {0}", + "{1} {0}", + "{1} {0}", "{1} {0}", "{1} {0}", } @@ -38,26 +38,26 @@ nl_BE{ } intervalFormats{ MEd{ - M{"E d/MM – E d/MM"} - d{"E d/MM – E d/MM"} + M{"E d/MM – E d/MM"} + d{"E d/MM – E d/MM"} } Md{ - M{"d/MM – d/MM"} - d{"d/MM – d/MM"} + M{"d/MM – d/MM"} + d{"d/MM – d/MM"} } yM{ - M{"MM/y – MM/y G"} - y{"MM/y – MM/y G"} + M{"MM/y – MM/y G"} + y{"MM/y – MM/y G"} } yMEd{ - M{"E d/MM/y – E d/MM/y G"} - d{"E d/MM/y – E d/MM/y G"} - y{"E d/MM/y – E d/MM/y G"} + M{"E d/MM/y – E d/MM/y G"} + d{"E d/MM/y – E d/MM/y G"} + y{"E d/MM/y – E d/MM/y G"} } yMd{ - M{"d/MM/y – d/MM/y G"} - d{"d/MM/y – d/MM/y G"} - y{"d/MM/y – d/MM/y G"} + M{"d/MM/y – d/MM/y G"} + d{"d/MM/y – d/MM/y G"} + y{"d/MM/y – d/MM/y G"} } } } @@ -72,8 +72,8 @@ nl_BE{ "d MMM y", "d/MM/y", "{1} {0}", - "{1} 'om' {0}", - "{1} 'om' {0}", + "{1} {0}", + "{1} {0}", "{1} {0}", "{1} {0}", } @@ -96,26 +96,26 @@ nl_BE{ } intervalFormats{ MEd{ - M{"E d/MM – E d/MM"} - d{"E d/MM – E d/MM"} + M{"E d/MM – E d/MM"} + d{"E d/MM – E d/MM"} } Md{ - M{"d/MM – d/MM"} - d{"d/MM – d/MM"} + M{"d/MM – d/MM"} + d{"d/MM – d/MM"} } yM{ - M{"MM/y – MM/y"} - y{"MM/y – MM/y"} + M{"MM/y – MM/y"} + y{"MM/y – MM/y"} } yMEd{ - M{"E d/MM/y – E d/MM/y"} - d{"E d/MM/y – E d/MM/y"} - y{"E d/MM/y – E d/MM/y"} + M{"E d/MM/y – E d/MM/y"} + d{"E d/MM/y – E d/MM/y"} + y{"E d/MM/y – E d/MM/y"} } yMd{ - M{"d/MM/y – d/MM/y"} - d{"d/MM/y – d/MM/y"} - y{"d/MM/y – d/MM/y"} + M{"d/MM/y – d/MM/y"} + d{"d/MM/y – d/MM/y"} + y{"d/MM/y – d/MM/y"} } } } diff --git a/icu4c/source/data/locales/nmg.txt b/icu4c/source/data/locales/nmg.txt index 1a3d8759d51e..e2b733c0787c 100644 --- a/icu4c/source/data/locales/nmg.txt +++ b/icu4c/source/data/locales/nmg.txt @@ -61,8 +61,8 @@ nmg{ MMMd{"d MMM"} Md{"d/M"} d{"d"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"m:ss"} y{"y"} yM{"M/y"} @@ -120,8 +120,8 @@ nmg{ MMMd{"d MMM"} Md{"d/M"} d{"d"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"m:ss"} y{"y"} yM{"M/y"} diff --git a/icu4c/source/data/locales/nn.txt b/icu4c/source/data/locales/nn.txt index 248615cd278c..30873c3e245e 100644 --- a/icu4c/source/data/locales/nn.txt +++ b/icu4c/source/data/locales/nn.txt @@ -75,21 +75,6 @@ nn{ } calendar{ generic{ - DateTimePatterns{ - "'kl'. HH:mm:ss zzzz", - "HH:mm:ss z", - "HH:mm:ss", - "HH:mm", - "EEEE d. MMMM y G", - "d. MMMM y G", - "d. MMM y G", - "d.M.y G", - "{1} {0}", - "{1} {0}", - "{1} {0}", - "{1} {0}", - "{1} {0}", - } intervalFormats{ MEd{ M{"E dd.MM.–E dd.MM."} diff --git a/icu4c/source/data/locales/no.txt b/icu4c/source/data/locales/no.txt index ed558ccec911..7e5c0f7d3ba5 100644 --- a/icu4c/source/data/locales/no.txt +++ b/icu4c/source/data/locales/no.txt @@ -1392,12 +1392,12 @@ no{ } fallback{"{0}–{1}"} h{ - a{"h a–h a"} - h{"h–h a"} + a{"h a–h a"} + h{"h–h a"} } hv{ - a{"h a–h a v"} - h{"h–h a v"} + a{"h a–h a v"} + h{"h–h a v"} } y{ y{"y–y G"} @@ -1482,7 +1482,7 @@ no{ UMMMd{"d. MMM U"} UMd{"d.MM. U"} d{"d."} - h{"h a"} + h{"h a"} y{"r(U)"} yMd{"dd.MM.r"} yyyy{"r(U)"} @@ -2284,22 +2284,22 @@ no{ } fallback{"{0}–{1}"} h{ - a{"h a–h a"} - h{"h–h a"} + a{"h a–h a"} + h{"h–h a"} } hm{ - a{"h:mm a–h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a–h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a–h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a–h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a–h a v"} - h{"h–h a v"} + a{"h a–h a v"} + h{"h–h a v"} } y{ y{"U–U"} @@ -2560,12 +2560,12 @@ no{ } fallback{"{0}–{1}"} h{ - a{"h a–h a"} - h{"h–h a"} + a{"h a–h a"} + h{"h–h a"} } hv{ - a{"h a–h a v"} - h{"h–h a v"} + a{"h a–h a v"} + h{"h–h a v"} } y{ y{"y–y G"} @@ -3538,12 +3538,12 @@ no{ } fallback{"{0}–{1}"} h{ - a{"h a–h a"} - h{"h–h a"} + a{"h a–h a"} + h{"h–h a"} } hv{ - a{"h a–h a v"} - h{"h–h a v"} + a{"h a–h a v"} + h{"h–h a v"} } y{ y{"U–U"} @@ -3804,12 +3804,12 @@ no{ } fallback{"{0}–{1}"} h{ - a{"h a–h a"} - h{"h–h a"} + a{"h a–h a"} + h{"h–h a"} } hv{ - a{"h a–h a v"} - h{"h–h a v"} + a{"h a–h a v"} + h{"h–h a v"} } y{ y{"y–y G"} @@ -3968,6 +3968,12 @@ no{ "d. MMM y G", "d.M.y G", "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + } + DateTimePatterns%atTime{ "{1} 'kl'. {0}", "{1} 'kl'. {0}", "{1} {0}", @@ -3993,8 +3999,8 @@ no{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"E d."} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"y G"} GyMMM{"MMM y G"} GyMMMEd{"E d. MMM y G"} @@ -4012,9 +4018,9 @@ no{ MMdd{"d.M."} Md{"d.M."} d{"d."} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"mm:ss"} y{"y G"} yyyy{"y G"} @@ -4118,22 +4124,22 @@ no{ } fallback{"{0}–{1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y G"} @@ -4195,6 +4201,12 @@ no{ "d. MMM y", "dd.MM.y", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{1} 'kl'. {0}", "{1} 'kl'. {0}", "{1}, {0}", @@ -4223,8 +4235,8 @@ no{ EHm{"E 'kl'. HH:mm"} EHms{"E 'kl'. HH:mm:ss"} Ed{"E d."} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"y G"} GyMMM{"MMM y G"} GyMMMEd{"E d. MMM y G"} @@ -4248,11 +4260,11 @@ no{ MMdd{"d.M."} Md{"d.M."} d{"d."} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} - hmsv{"h:mm:ss a v"} - hmv{"h:mm a v"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} + hmsv{"h:mm:ss a v"} + hmv{"h:mm a v"} ms{"mm:ss"} y{"y"} yM{"M.y"} @@ -4523,22 +4535,22 @@ no{ } fallback{"{0}–{1}"} h{ - a{"h a–h a"} - h{"h–h a"} + a{"h a–h a"} + h{"h–h a"} } hm{ - a{"h:mm a–h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a–h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a–h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a–h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a–h a v"} - h{"h–h a v"} + a{"h a–h a v"} + h{"h–h a v"} } y{ y{"y–y"} @@ -4809,12 +4821,12 @@ no{ } fallback{"{0}–{1}"} h{ - a{"h a–h a"} - h{"h–h a"} + a{"h a–h a"} + h{"h–h a"} } hv{ - a{"h a–h a v"} - h{"h–h a v"} + a{"h a–h a v"} + h{"h–h a v"} } y{ y{"y–y G"} @@ -5055,12 +5067,12 @@ no{ } fallback{"{0}–{1}"} h{ - a{"h a–h a"} - h{"h–h a"} + a{"h a–h a"} + h{"h–h a"} } hv{ - a{"h a–h a v"} - h{"h–h a v"} + a{"h a–h a v"} + h{"h–h a v"} } y{ y{"y–y G"} @@ -5289,12 +5301,12 @@ no{ } fallback{"{0}–{1}"} h{ - a{"h a–h a"} - h{"h–h a"} + a{"h a–h a"} + h{"h–h a"} } hv{ - a{"h a–h a v"} - h{"h–h a v"} + a{"h a–h a v"} + h{"h–h a v"} } y{ y{"y–y G"} @@ -6231,12 +6243,12 @@ no{ } fallback{"{0}–{1}"} h{ - a{"h a–h a"} - h{"h–h a"} + a{"h a–h a"} + h{"h–h a"} } hv{ - a{"h a–h a v"} - h{"h–h a v"} + a{"h a–h a v"} + h{"h–h a v"} } y{ y{"y–y G"} @@ -6375,12 +6387,12 @@ no{ } fallback{"{0}–{1}"} h{ - a{"h a–h a"} - h{"h–h a"} + a{"h a–h a"} + h{"h–h a"} } hv{ - a{"h a–h a v"} - h{"h–h a v"} + a{"h a–h a v"} + h{"h–h a v"} } y{ y{"y–y G"} @@ -6612,12 +6624,12 @@ no{ } fallback{"{0}–{1}"} h{ - a{"h a–h a"} - h{"h–h a"} + a{"h a–h a"} + h{"h–h a"} } hv{ - a{"h a–h a v"} - h{"h–h a v"} + a{"h a–h a v"} + h{"h–h a v"} } y{ y{"y–y G"} diff --git a/icu4c/source/data/locales/nus.txt b/icu4c/source/data/locales/nus.txt index dc2f1ecdeeb3..d848761d6776 100644 --- a/icu4c/source/data/locales/nus.txt +++ b/icu4c/source/data/locales/nus.txt @@ -26,10 +26,10 @@ nus{ calendar{ generic{ DateTimePatterns{ - "zzzz h:mm:ss a", - "z h:mm:ss a", - "h:mm:ss a", - "h:mm a", + "zzzz h:mm:ss a", + "z h:mm:ss a", + "h:mm:ss a", + "h:mm a", "EEEE d MMMM y G", "d MMMM y G", "d MMM y G", @@ -61,8 +61,8 @@ nus{ MMMd{"d MMM"} Md{"d/M"} d{"d"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"m:ss"} y{"y"} yM{"M/y"} @@ -85,10 +85,10 @@ nus{ "TŊ", } DateTimePatterns{ - "zzzz h:mm:ss a", - "z h:mm:ss a", - "h:mm:ss a", - "h:mm a", + "zzzz h:mm:ss a", + "z h:mm:ss a", + "h:mm:ss a", + "h:mm a", "EEEE d MMMM y", "d MMMM y", "d MMM y", @@ -120,8 +120,8 @@ nus{ MMMd{"d MMM"} Md{"d/M"} d{"d"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"m:ss"} y{"y"} yM{"M/y"} diff --git a/icu4c/source/data/locales/nyn.txt b/icu4c/source/data/locales/nyn.txt index 5e2e0846021d..51618f124842 100644 --- a/icu4c/source/data/locales/nyn.txt +++ b/icu4c/source/data/locales/nyn.txt @@ -50,7 +50,7 @@ nyn{ MMMd{"MMM d"} Md{"M/d"} d{"d"} - hm{"h:mm a"} + hm{"h:mm a"} ms{"mm:ss"} y{"y"} yM{"M/y"} @@ -100,7 +100,7 @@ nyn{ MMMd{"MMM d"} Md{"M/d"} d{"d"} - hm{"h:mm a"} + hm{"h:mm a"} ms{"mm:ss"} y{"y"} yM{"M/y"} diff --git a/icu4c/source/data/locales/om.txt b/icu4c/source/data/locales/om.txt index f4f8d911a989..28358827b394 100644 --- a/icu4c/source/data/locales/om.txt +++ b/icu4c/source/data/locales/om.txt @@ -39,10 +39,10 @@ om{ calendar{ generic{ DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE, MMMM d, y G", "dd MMMM y G", "dd-MMM-y G", @@ -81,10 +81,10 @@ om{ "WB", } DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE, MMMM d, y", "dd MMMM y", "dd-MMM-y", @@ -113,8 +113,8 @@ om{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"d, E"} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"G y"} GyMMM{"G y MMM"} GyMMMEd{"G y MMM d, E"} @@ -138,11 +138,11 @@ om{ MMdd{"dd/MM"} Md{"MM-dd"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} - hmsv{"h:mm:ss a v"} - hmv{"h:mm a v"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} + hmsv{"h:mm:ss a v"} + hmv{"h:mm a v"} ms{"mm:ss"} y{"y"} yM{"y-MM"} @@ -278,80 +278,80 @@ om{ M{"MM–MM"} } MEd{ - M{"MM-dd, E – MM-dd, E"} - d{"MM-dd, E – MM-dd, E"} + M{"MM-dd, E – MM-dd, E"} + d{"MM-dd, E – MM-dd, E"} } MMM{ M{"LLL–LLL"} } MMMEd{ - M{"MMM d, E – MMM d, E"} - d{"MMM d, E – MMM d, E"} + M{"MMM d, E – MMM d, E"} + d{"MMM d, E – MMM d, E"} } MMMd{ - M{"MMM d – MMM d"} + M{"MMM d – MMM d"} d{"MMM d–d"} } Md{ - M{"MM-dd – MM-dd"} - d{"MM-dd – MM-dd"} + M{"MM-dd – MM-dd"} + d{"MM-dd – MM-dd"} } d{ d{"d–d"} } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y"} } yM{ - M{"y-MM – y-MM"} - y{"y-MM – y-MM"} + M{"y-MM – y-MM"} + y{"y-MM – y-MM"} } yMEd{ - M{"y-MM-dd, E – y-MM-dd, E"} - d{"y-MM-dd, E – y-MM-dd, E"} - y{"y-MM-dd, E – y-MM-dd, E"} + M{"y-MM-dd, E – y-MM-dd, E"} + d{"y-MM-dd, E – y-MM-dd, E"} + y{"y-MM-dd, E – y-MM-dd, E"} } yMMM{ M{"y MMM–MMM"} - y{"y MMM – y MMM"} + y{"y MMM – y MMM"} } yMMMEd{ - M{"y MMM d, E – MMM d, E"} - d{"y MMM d, E – MMM d, E"} - y{"y MMM d, E – y MMM d, E"} + M{"y MMM d, E – MMM d, E"} + d{"y MMM d, E – MMM d, E"} + y{"y MMM d, E – y MMM d, E"} } yMMMM{ M{"y MMMM–MMMM"} - y{"y MMMM – y MMMM"} + y{"y MMMM – y MMMM"} } yMMMd{ - M{"y MMM d – MMM d"} + M{"y MMM d – MMM d"} d{"y MMM d–d"} - y{"y MMM d – y MMM d"} + y{"y MMM d – y MMM d"} } yMd{ - M{"y-MM-dd – y-MM-dd"} - d{"y-MM-dd – y-MM-dd"} - y{"y-MM-dd – y-MM-dd"} + M{"y-MM-dd – y-MM-dd"} + d{"y-MM-dd – y-MM-dd"} + y{"y-MM-dd – y-MM-dd"} } } monthNames{ diff --git a/icu4c/source/data/locales/or.txt b/icu4c/source/data/locales/or.txt index d1227c89706d..6d52d8824332 100644 --- a/icu4c/source/data/locales/or.txt +++ b/icu4c/source/data/locales/or.txt @@ -253,6 +253,12 @@ or{ "MMM d, y G", "M/d/y GGGGG", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{1} ରେ {0}", "{1} ରେ {0}", "{1}, {0}", @@ -405,6 +411,12 @@ or{ "MMM d, y", "M/d/yy", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{0} ଠାରେ {1}", "{0} ଠାରେ {1}", "{1}, {0}", diff --git a/icu4c/source/data/locales/os.txt b/icu4c/source/data/locales/os.txt index 5a993d5b1a2f..8fa636c80cdd 100644 --- a/icu4c/source/data/locales/os.txt +++ b/icu4c/source/data/locales/os.txt @@ -52,9 +52,9 @@ os{ "HH:mm:ss z", "HH:mm:ss", "HH:mm", - "EEEE, d MMMM, y 'аз' G", - "d MMMM, y 'аз' G", - "dd MMM y 'аз' G", + "EEEE, d MMMM, y 'аз' G", + "d MMMM, y 'аз' G", + "dd MMM y 'аз' G", "dd.MM.yy GGGGG", "{1}, {0}", "{1}, {0}", @@ -83,9 +83,9 @@ os{ MMMd{"d MMM"} Md{"dd.MM"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"mm:ss"} y{"y"} yM{"MM.y"} @@ -122,22 +122,22 @@ os{ } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } } } @@ -155,9 +155,9 @@ os{ "HH:mm:ss z", "HH:mm:ss", "HH:mm", - "EEEE, d MMMM, y 'аз'", - "d MMMM, y 'аз'", - "dd MMM y 'аз'", + "EEEE, d MMMM, y 'аз'", + "d MMMM, y 'аз'", + "dd MMM y 'аз'", "dd.MM.yy", "{1}, {0}", "{1}, {0}", @@ -186,9 +186,9 @@ os{ MMMd{"d MMM"} Md{"dd.MM"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"mm:ss"} y{"y"} yM{"MM.y"} @@ -291,22 +291,22 @@ os{ } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } } monthNames{ diff --git a/icu4c/source/data/locales/pa.txt b/icu4c/source/data/locales/pa.txt index 4af40da650a3..e691174e0eef 100644 --- a/icu4c/source/data/locales/pa.txt +++ b/icu4c/source/data/locales/pa.txt @@ -278,6 +278,12 @@ pa{ "d MMM y G", "dd/MM/y GGGGG", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{0} ਵਿਖੇ {1}", "{0} ਵਿਖੇ {1}", "{1}, {0}", diff --git a/icu4c/source/data/locales/pcm.txt b/icu4c/source/data/locales/pcm.txt index 2cbc07ec105c..7fd8c56fe611 100644 --- a/icu4c/source/data/locales/pcm.txt +++ b/icu4c/source/data/locales/pcm.txt @@ -227,6 +227,12 @@ pcm{ "d MMM y G", "dd/MM/y GGGGG", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{1} 'fọ' {0}", "{1} 'fọ' {0}", "{1}, {0}", @@ -252,8 +258,8 @@ pcm{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"d, E"} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"G y"} GyMMM{"G y MMM"} GyMMMEd{"G y MMM d, E"} @@ -269,9 +275,9 @@ pcm{ MMMd{"MMM d"} Md{"M/d"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"mm:ss"} y{"y G"} yyyy{"y G"} @@ -287,73 +293,73 @@ pcm{ } intervalFormats{ Bh{ - B{"h B – h B"} + B{"h B – h B"} h{"h–h B"} } Bhm{ - B{"h:mm B – h:mm B"} + B{"h:mm B – h:mm B"} h{"h:mm–h:mm B"} m{"h:mm–h:mm B"} } Gy{ - G{"G y – G y"} + G{"G y – G y"} y{"G y–y"} } GyM{ - G{"GGGGG y-MM – GGGGG y-MM"} - M{"GGGGG y-MM – y-MM"} - y{"GGGGG y-MM – y-MM"} + G{"GGGGG y-MM – GGGGG y-MM"} + M{"GGGGG y-MM – y-MM"} + y{"GGGGG y-MM – y-MM"} } GyMEd{ - G{"GGGGG y-MM-dd, E – GGGGG y-MM-dd, E"} - M{"GGGGG y-MM-dd, E – y-MM-dd, E"} - d{"GGGGG y-MM-dd, E – y-MM-dd, E"} - y{"GGGGG y-MM-dd, E – y-MM-dd, E"} + G{"GGGGG y-MM-dd, E – GGGGG y-MM-dd, E"} + M{"GGGGG y-MM-dd, E – y-MM-dd, E"} + d{"GGGGG y-MM-dd, E – y-MM-dd, E"} + y{"GGGGG y-MM-dd, E – y-MM-dd, E"} } GyMMM{ - G{"G y MMM – G y MMM"} + G{"G y MMM – G y MMM"} M{"G y MMM–MMM"} - y{"G y MMM – y MMM"} + y{"G y MMM – y MMM"} } GyMMMEd{ - G{"G y MMM d, E – G y MMM d, E"} - M{"G y MMM d, E – MMM d, E"} - d{"G y MMM d, E – MMM d, E"} - y{"G y MMM d, E – y MMM d, E"} + G{"G y MMM d, E – G y MMM d, E"} + M{"G y MMM d, E – MMM d, E"} + d{"G y MMM d, E – MMM d, E"} + y{"G y MMM d, E – y MMM d, E"} } GyMMMd{ - G{"G y MMM d – G y MMM d"} - M{"G y MMM d – MMM d"} + G{"G y MMM d – G y MMM d"} + M{"G y MMM d – MMM d"} d{"G y MMM d–d"} - y{"G y MMM d – y MMM d"} + y{"G y MMM d – y MMM d"} } GyMd{ - G{"GGGGG y-MM-dd – GGGGG y-MM-dd"} - M{"GGGGG y-MM-dd – y-MM-dd"} - d{"GGGGG y-MM-dd – y-MM-dd"} - y{"GGGGG y-MM-dd – y-MM-dd"} + G{"GGGGG y-MM-dd – GGGGG y-MM-dd"} + M{"GGGGG y-MM-dd – y-MM-dd"} + d{"GGGGG y-MM-dd – y-MM-dd"} + y{"GGGGG y-MM-dd – y-MM-dd"} } M{ M{"MM–MM"} } MEd{ - M{"MM-dd, E – MM-dd, E"} - d{"MM-dd, E – MM-dd, E"} + M{"MM-dd, E – MM-dd, E"} + d{"MM-dd, E – MM-dd, E"} } MMM{ M{"LLL–LLL"} } MMMEd{ - M{"MMM d, E – MMM d, E"} - d{"MMM d, E – MMM d, E"} + M{"MMM d, E – MMM d, E"} + d{"MMM d, E – MMM d, E"} } MMMd{ - M{"MMM d – MMM d"} + M{"MMM d – MMM d"} d{"MMM d–d"} } Md{ - M{"MM-dd – MM-dd"} - d{"MM-dd – MM-dd"} + M{"MM-dd – MM-dd"} + d{"MM-dd – MM-dd"} } d{ d{"d–d"} @@ -363,36 +369,36 @@ pcm{ y{"G y–y"} } yM{ - M{"GGGGG y-MM – y-MM"} - y{"GGGGG y-MM – y-MM"} + M{"GGGGG y-MM – y-MM"} + y{"GGGGG y-MM – y-MM"} } yMEd{ - M{"GGGGG y-MM-dd, E – y-MM-dd, E"} - d{"GGGGG y-MM-dd, E – y-MM-dd, E"} - y{"GGGGG y-MM-dd, E – y-MM-dd, E"} + M{"GGGGG y-MM-dd, E – y-MM-dd, E"} + d{"GGGGG y-MM-dd, E – y-MM-dd, E"} + y{"GGGGG y-MM-dd, E – y-MM-dd, E"} } yMMM{ M{"G y MMM–MMM"} - y{"G y MMM – y MMM"} + y{"G y MMM – y MMM"} } yMMMEd{ - M{"G y MMM d, E – MMM d, E"} - d{"G y MMM d, E – MMM d, E"} - y{"G y MMM d, E – y MMM d, E"} + M{"G y MMM d, E – MMM d, E"} + d{"G y MMM d, E – MMM d, E"} + y{"G y MMM d, E – y MMM d, E"} } yMMMM{ M{"G y MMMM–MMMM"} - y{"G y MMMM – y MMMM"} + y{"G y MMMM – y MMMM"} } yMMMd{ - M{"G y MMM d – MMM d"} + M{"G y MMM d – MMM d"} d{"G y MMM d–d"} - y{"G y MMM d – y MMM d"} + y{"G y MMM d – y MMM d"} } yMd{ - M{"GGGGG y-MM-dd – y-MM-dd"} - d{"GGGGG y-MM-dd – y-MM-dd"} - y{"GGGGG y-MM-dd – y-MM-dd"} + M{"GGGGG y-MM-dd – y-MM-dd"} + d{"GGGGG y-MM-dd – y-MM-dd"} + y{"GGGGG y-MM-dd – y-MM-dd"} } } } @@ -419,6 +425,12 @@ pcm{ "d MMM y", "dd/MM/y", "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + } + DateTimePatterns%atTime{ "{1} 'fọ' {0}", "{1} 'fọ' {0}", "{1} {0}", @@ -447,8 +459,8 @@ pcm{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"d E"} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"G y"} GyMMM{"G y MMM"} GyMMMEd{"G y MMM d, E"} @@ -470,11 +482,11 @@ pcm{ MMMd{"d MMM"} Md{"d /M"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} - hmsv{"h:mm:ss a v"} - hmv{"h:mm a v"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} + hmsv{"h:mm:ss a v"} + hmv{"h:mm a v"} ms{"mm:ss"} y{"y"} yM{"M/y"} @@ -605,51 +617,51 @@ pcm{ } intervalFormats{ Bh{ - B{"h B – h B"} + B{"h B – h B"} h{"h–h B"} } Bhm{ - B{"h:mm B – h:mm B"} + B{"h:mm B – h:mm B"} h{"h:mm–h:mm B"} m{"h:mm–h:mm B"} } Gy{ - G{"Gy – Gy"} + G{"Gy – Gy"} y{"G y–y"} } GyM{ - G{"GGGGG y-MM – GGGGG y-MM"} - M{"GGGGG y-MM – y-MM"} - y{"GGGGG y-MM – y-MM"} + G{"GGGGG y-MM – GGGGG y-MM"} + M{"GGGGG y-MM – y-MM"} + y{"GGGGG y-MM – y-MM"} } GyMEd{ - G{"GGGGG y-MM-dd, E – y-MM-dd, E"} - M{"GGGGG y-MM-dd, E – y-MM-dd, E"} - d{"GGGGG y-MM-dd, E – y-MM-dd, E"} - y{"GGGGG y-MM-dd, E – y-MM-dd, E"} + G{"GGGGG y-MM-dd, E – y-MM-dd, E"} + M{"GGGGG y-MM-dd, E – y-MM-dd, E"} + d{"GGGGG y-MM-dd, E – y-MM-dd, E"} + y{"GGGGG y-MM-dd, E – y-MM-dd, E"} } GyMMM{ - G{"G y MMM – G y MMM"} + G{"G y MMM – G y MMM"} M{"G y MMM–MMM"} - y{"G y MMM – y MMM"} + y{"G y MMM – y MMM"} } GyMMMEd{ - G{"G y MMM d, E – G y MMM"} - M{"G y MMM d, E – MMM d, E"} - d{"G y MMM d, E – MMM d, E"} - y{"G y MMM d, E – y MMM d, E"} + G{"G y MMM d, E – G y MMM"} + M{"G y MMM d, E – MMM d, E"} + d{"G y MMM d, E – MMM d, E"} + y{"G y MMM d, E – y MMM d, E"} } GyMMMd{ - G{"G y MMM d – G y MMM d"} - M{"G y MMM d – MMM d"} + G{"G y MMM d – G y MMM d"} + M{"G y MMM d – MMM d"} d{"G y MMM d–d"} - y{"G y MMM d – y MMM d"} + y{"G y MMM d – y MMM d"} } GyMd{ - G{"GGGGG y-MM-dd – GGGGG y-MM-dd"} - M{"GGGGG y-MM-dd – y-MM-dd"} - d{"GGGGG y-MM-dd – y-MM-dd"} - y{"GGGGG y-MM-dd – y-MM-dd"} + G{"GGGGG y-MM-dd – GGGGG y-MM-dd"} + M{"GGGGG y-MM-dd – y-MM-dd"} + d{"GGGGG y-MM-dd – y-MM-dd"} + y{"GGGGG y-MM-dd – y-MM-dd"} } H{ H{"HH–HH"} @@ -669,80 +681,80 @@ pcm{ M{"MM–MM"} } MEd{ - M{"E, dd-MM – E, dd/MM"} - d{"E, dd/MM – E, dd/MM"} + M{"E, dd-MM – E, dd/MM"} + d{"E, dd/MM – E, dd/MM"} } MMM{ M{"LLL–LLL"} } MMMEd{ - M{"E, d MMM – E, d MMM"} - d{"E, d MMM – E, d MMM"} + M{"E, d MMM – E, d MMM"} + d{"E, d MMM – E, d MMM"} } MMMd{ - M{"d MMM – d MMM"} + M{"d MMM – d MMM"} d{"d–d MMM"} } Md{ - M{"dd/MM – dd/MM"} - d{"dd/MM – dd/MM"} + M{"dd/MM – dd/MM"} + d{"dd/MM – dd/MM"} } d{ d{"d–d"} } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y"} } yM{ - M{"MM/y – MM/y"} - y{"M/y – M/y"} + M{"MM/y – MM/y"} + y{"M/y – M/y"} } yMEd{ - M{"E, dd/MM/y – E, dd/MM/y"} - d{"E, dd/MM/y – E, dd/MM/y"} - y{"E, dd/MM/y – E, dd/MM/y"} + M{"E, dd/MM/y – E, dd/MM/y"} + d{"E, dd/MM/y – E, dd/MM/y"} + y{"E, dd/MM/y – E, dd/MM/y"} } yMMM{ M{"MMM–MMM y"} - y{"MMM y – MMM y"} + y{"MMM y – MMM y"} } yMMMEd{ - M{"E, d MMM y – E, d MMM y"} - d{"E, d MMM y – E, d MMM y"} - y{"E, d MMM y – E, d MMM y"} + M{"E, d MMM y – E, d MMM y"} + d{"E, d MMM y – E, d MMM y"} + y{"E, d MMM y – E, d MMM y"} } yMMMM{ - M{"MMMM – MMMM y"} - y{"MMMM y – MMMM y"} + M{"MMMM – MMMM y"} + y{"MMMM y – MMMM y"} } yMMMd{ - M{"d MMM – d MMM y"} - d{"d – d MMM y"} - y{"d MMM y – d MMM y"} + M{"d MMM – d MMM y"} + d{"d – d MMM y"} + y{"d MMM y – d MMM y"} } yMd{ - M{"dd/MM/y – dd/MM/y"} - d{"dd/MM/y – dd/MM/y"} - y{"dd/MM/y – dd/MM/y"} + M{"dd/MM/y – dd/MM/y"} + d{"dd/MM/y – dd/MM/y"} + y{"dd/MM/y – dd/MM/y"} } } monthNames{ diff --git a/icu4c/source/data/locales/pl.txt b/icu4c/source/data/locales/pl.txt index 0dd476f4e8e2..fff54fdb9ebd 100644 --- a/icu4c/source/data/locales/pl.txt +++ b/icu4c/source/data/locales/pl.txt @@ -481,9 +481,9 @@ pl{ MMMd{"d MMM"} MMdd{"d.MM"} Md{"d.MM"} - h{"hh a"} - hm{"hh:mm a"} - hms{"hh:mm:ss a"} + h{"hh a"} + hm{"hh:mm a"} + hms{"hh:mm:ss a"} y{"y G"} yyyy{"y G"} yyyyM{"MM.y G"} @@ -499,51 +499,51 @@ pl{ } intervalFormats{ Bh{ - B{"h B – h B"} + B{"h B – h B"} h{"h–h B"} } Bhm{ - B{"h:mm B – h:mm B"} + B{"h:mm B – h:mm B"} h{"h:mm–h:mm B"} m{"h:mm–h:mm B"} } Gy{ - G{"y G – y G"} + G{"y G – y G"} y{"y–y G"} } GyM{ - G{"MM.y GGGGG – MM.y GGGGG"} - M{"MM.y – MM.y GGGGG"} - y{"MM.y – MM.y GGGGG"} + G{"MM.y GGGGG – MM.y GGGGG"} + M{"MM.y – MM.y GGGGG"} + y{"MM.y – MM.y GGGGG"} } GyMEd{ - G{"E, dd.MM.y GGGGG – E, dd.MM.y GGGGG"} - M{"E, dd.MM.y – E, dd.MM.y GGGGG"} - d{"E, dd.MM.y – E, dd.MM.y GGGGG"} - y{"E, dd.MM.y – E, dd.MM.y GGGGG"} + G{"E, dd.MM.y GGGGG – E, dd.MM.y GGGGG"} + M{"E, dd.MM.y – E, dd.MM.y GGGGG"} + d{"E, dd.MM.y – E, dd.MM.y GGGGG"} + y{"E, dd.MM.y – E, dd.MM.y GGGGG"} } GyMMM{ - G{"MMM y G – MMM y G"} - M{"MMM – MMM y G"} - y{"MMM y – MMM y G"} + G{"MMM y G – MMM y G"} + M{"MMM – MMM y G"} + y{"MMM y – MMM y G"} } GyMMMEd{ - G{"E, d MMM y G – E, d MMM y G"} - M{"E, d MMM – E, d MMM y G"} - d{"E, d MMM – E, d MMM y G"} - y{"E, d MMM y – E, d MMM y G"} + G{"E, d MMM y G – E, d MMM y G"} + M{"E, d MMM – E, d MMM y G"} + d{"E, d MMM – E, d MMM y G"} + y{"E, d MMM y – E, d MMM y G"} } GyMMMd{ - G{"d MMM y G – d MMM y G"} - M{"d MMM – d MMM y G"} + G{"d MMM y G – d MMM y G"} + M{"d MMM – d MMM y G"} d{"d–d MMM y G"} - y{"d MMM y – d MMM y G"} + y{"d MMM y – d MMM y G"} } GyMd{ - G{"dd.MM.y GGGGG – dd.MM.y GGGGG"} - M{"dd.MM.y – dd.MM.y GGGGG"} - d{"dd.MM.y – dd.MM.y GGGGG"} - y{"dd.MM.y – dd.MM.y GGGGG"} + G{"dd.MM.y GGGGG – dd.MM.y GGGGG"} + M{"dd.MM.y – dd.MM.y GGGGG"} + d{"dd.MM.y – dd.MM.y GGGGG"} + y{"dd.MM.y – dd.MM.y GGGGG"} } H{ H{"HH–HH"} @@ -560,15 +560,15 @@ pl{ H{"HH–HH v"} } MEd{ - M{"E, dd.MM – E, dd.MM"} - d{"E, dd.MM – E, dd.MM"} + M{"E, dd.MM – E, dd.MM"} + d{"E, dd.MM – E, dd.MM"} } MMMEd{ - M{"E, d MMM – E, d MMM"} - d{"E, d MMM – E, d MMM"} + M{"E, d MMM – E, d MMM"} + d{"E, d MMM – E, d MMM"} } MMMd{ - M{"d MMM – d MMM"} + M{"d MMM – d MMM"} d{"d–d MMM"} } Md{ @@ -576,52 +576,52 @@ pl{ d{"dd.MM–dd.MM"} } h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y G"} } yM{ - M{"MM.y – MM.y GGGGG"} - y{"MM.y – MM.y GGGGG"} + M{"MM.y – MM.y GGGGG"} + y{"MM.y – MM.y GGGGG"} } yMEd{ - M{"E, dd.MM.y – E, dd.MM.y G"} - d{"E, dd.MM.y – E, dd.MM.y G"} - y{"E, dd.MM.y – E, dd.MM.y GGGGG"} + M{"E, dd.MM.y – E, dd.MM.y G"} + d{"E, dd.MM.y – E, dd.MM.y G"} + y{"E, dd.MM.y – E, dd.MM.y GGGGG"} } yMMM{ M{"LLL–LLL y G"} - y{"LLL y – LLL y G"} + y{"LLL y – LLL y G"} } yMMMEd{ - M{"E, d MMM – E, d MMM y G"} - d{"E, d – E, d MMM y G"} - y{"E, d MMM y – E, d MMM y G"} + M{"E, d MMM – E, d MMM y G"} + d{"E, d – E, d MMM y G"} + y{"E, d MMM y – E, d MMM y G"} } yMMMM{ M{"LLLL–LLLL y G"} - y{"LLLL y – LLLL y G"} + y{"LLLL y – LLLL y G"} } yMMMd{ - M{"d MMM – d MMM y G"} + M{"d MMM – d MMM y G"} d{"d–d MMM y G"} - y{"d MMM y – d MMM y G"} + y{"d MMM y – d MMM y G"} } yMd{ M{"dd.MM–dd.MM.y GGGGG"} @@ -681,8 +681,8 @@ pl{ EHm{"E, HH:mm"} EHms{"E, HH:mm:ss"} Ed{"E, d"} - Ehm{"E, h:mm a"} - Ehms{"E, h:mm:ss a"} + Ehm{"E, h:mm a"} + Ehms{"E, h:mm:ss a"} Gy{"y G"} GyMMM{"MMM y G"} GyMMMEd{"E, d MMM y G"} @@ -711,11 +711,11 @@ pl{ MMMd{"d MMM"} Md{"d.MM"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} - hmsv{"h:mm:ss a v"} - hmv{"h:mm a v"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} + hmsv{"h:mm:ss a v"} + hmv{"h:mm a v"} ms{"mm:ss"} y{"y"} yM{"MM.y"} @@ -900,51 +900,51 @@ pl{ } intervalFormats{ Bh{ - B{"h B – h B"} + B{"h B – h B"} h{"h–h B"} } Bhm{ - B{"h:mm B – h:mm B"} + B{"h:mm B – h:mm B"} h{"h:mm–h:mm B"} m{"h:mm–h:mm B"} } Gy{ - G{"y G – y G"} + G{"y G – y G"} y{"y–y G"} } GyM{ - G{"M.y GGGGG – M.y GGGGG"} - M{"M.y – M.y GGGGG"} - y{"M.y – M.y GGGGG"} + G{"M.y GGGGG – M.y GGGGG"} + M{"M.y – M.y GGGGG"} + y{"M.y – M.y GGGGG"} } GyMEd{ - G{"E, d.M.y GGGGG – E, d.M.y GGGGG"} - M{"E, d.M.y – E, d.M.y GGGGG"} - d{"E, d.M.y – E, d.M.y GGGGG"} - y{"E, d.M.y – E, d.M.y GGGGG"} + G{"E, d.M.y GGGGG – E, d.M.y GGGGG"} + M{"E, d.M.y – E, d.M.y GGGGG"} + d{"E, d.M.y – E, d.M.y GGGGG"} + y{"E, d.M.y – E, d.M.y GGGGG"} } GyMMM{ - G{"MMM y G – MMM y G"} - M{"MMM – MMM y G"} - y{"MMM y – MMM y G"} + G{"MMM y G – MMM y G"} + M{"MMM – MMM y G"} + y{"MMM y – MMM y G"} } GyMMMEd{ - G{"E, d MMM y G – E, d MMM y G"} - M{"E, d MMM – E, d MMM y G"} - d{"E, d MMM – E, d MMM y G"} - y{"E, d MMM y – E, d MMM y G"} + G{"E, d MMM y G – E, d MMM y G"} + M{"E, d MMM – E, d MMM y G"} + d{"E, d MMM – E, d MMM y G"} + y{"E, d MMM y – E, d MMM y G"} } GyMMMd{ - G{"d MMM y G – d MMM y G"} - M{"d MMM – d MMM y G"} + G{"d MMM y G – d MMM y G"} + M{"d MMM – d MMM y G"} d{"d–d MMM y G"} - y{"d MMM y – d MMM y G"} + y{"d MMM y – d MMM y G"} } GyMd{ - G{"d.M.y GGGGG – d.M.y GGGGG"} - M{"d.M.y – d.M.y GGGGG"} - d{"d.M.y – d.M.y GGGGG"} - y{"d.M.y – d.M.y GGGGG"} + G{"d.M.y GGGGG – d.M.y GGGGG"} + M{"d.M.y – d.M.y GGGGG"} + d{"d.M.y – d.M.y GGGGG"} + y{"d.M.y – d.M.y GGGGG"} } H{ H{"HH–HH"} @@ -975,11 +975,11 @@ pl{ d{"E, d MMM–E, d MMM"} } MMMMEd{ - M{"E, d MMMM – E, d MMMM"} - d{"E, d MMMM – E, d MMMM"} + M{"E, d MMMM – E, d MMMM"} + d{"E, d MMMM – E, d MMMM"} } MMMMd{ - M{"d MMMM – d MMMM"} + M{"d MMMM – d MMMM"} d{"d–d MMMM"} } MMMd{ @@ -994,22 +994,22 @@ pl{ d{"d–d"} } h{ - a{"h a–h a"} - h{"h–h a"} + a{"h a–h a"} + h{"h–h a"} } hm{ - a{"h:mm a–h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a–h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a–h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a–h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y"} @@ -1037,14 +1037,14 @@ pl{ y{"LLLL y–LLLL y"} } yMMMMEd{ - M{"E, d MMMM – E, d MMMM y"} - d{"E, d MMMM – E, d MMMM y"} - y{"E, d MMMM y – E, d MMMM y"} + M{"E, d MMMM – E, d MMMM y"} + d{"E, d MMMM – E, d MMMM y"} + y{"E, d MMMM y – E, d MMMM y"} } yMMMMd{ - M{"d MMMM – d MMMM y"} + M{"d MMMM – d MMMM y"} d{"d–d MMMM y"} - y{"d MMMM y – d MMMM y"} + y{"d MMMM y – d MMMM y"} } yMMMd{ M{"d MMM–d MMM y"} diff --git a/icu4c/source/data/locales/ps_PK.txt b/icu4c/source/data/locales/ps_PK.txt index 00e7350afb1f..6a4db0a7d3b1 100644 --- a/icu4c/source/data/locales/ps_PK.txt +++ b/icu4c/source/data/locales/ps_PK.txt @@ -9,6 +9,7 @@ ps_PK{ " ه ة و ؤ ی ے ي ې ۍ ئ]" } calendar{ + default{"gregorian"} gregorian{ DateTimePatterns{ "h:mm:ss a zzzz", diff --git a/icu4c/source/data/locales/pt.txt b/icu4c/source/data/locales/pt.txt index 2350be188800..216d3fda320e 100644 --- a/icu4c/source/data/locales/pt.txt +++ b/icu4c/source/data/locales/pt.txt @@ -267,8 +267,8 @@ pt{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"E, d"} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"r(U)"} GyMMM{"MMM 'de' U"} GyMMMEd{"E, d 'de' MMM 'de' U"} @@ -286,9 +286,9 @@ pt{ MMMd{"d 'de' MMM"} Md{"d/M"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"mm:ss"} y{"r(U)"} yyyy{"r(U)"} @@ -431,8 +431,8 @@ pt{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"E, d"} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"y G"} GyMMM{"MMM 'de' y G"} GyMMMEd{"E, d 'de' MMM 'de' y G"} @@ -450,9 +450,9 @@ pt{ MMMd{"d 'de' MMM"} Md{"d/M"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"mm:ss"} y{"y G"} yyyy{"y G"} @@ -470,7 +470,7 @@ pt{ } intervalFormats{ Bhm{ - h{"h:mm – h:mm B"} + h{"h:mm – h:mm B"} } H{ H{"HH'h' - HH'h'"} @@ -484,86 +484,86 @@ pt{ m{"HH:mm–HH:mm v"} } Hv{ - H{"HH – HH v"} + H{"HH – HH v"} } M{ M{"M–M"} } MEd{ - M{"E, dd/MM – E, dd/MM"} - d{"E, dd/MM – E, dd/MM"} + M{"E, dd/MM – E, dd/MM"} + d{"E, dd/MM – E, dd/MM"} } MMM{ - M{"MMM – MMM"} + M{"MMM – MMM"} } MMMEd{ - M{"E, d 'de' MMM – E, d 'de' MMM"} - d{"E, d 'de' MMM – E, d 'de' MMM"} + M{"E, d 'de' MMM – E, d 'de' MMM"} + d{"E, d 'de' MMM – E, d 'de' MMM"} } MMMd{ - M{"d 'de' MMM – d 'de' MMM"} + M{"d 'de' MMM – d 'de' MMM"} d{"d–d 'de' MMM"} } Md{ - M{"dd/MM – dd/MM"} - d{"dd/MM – dd/MM"} + M{"dd/MM – dd/MM"} + d{"dd/MM – dd/MM"} } d{ d{"d–d"} } fallback{"{0} - {1}"} h{ - a{"h'h' a – h'h' a"} + a{"h'h' a – h'h' a"} h{"h'h' - h'h' a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h – h a v"} + a{"h a – h a v"} + h{"h – h a v"} } y{ - y{"y – y G"} + y{"y – y G"} } yM{ - M{"MM/y – MM/y G"} - y{"MM/y – MM/y G"} + M{"MM/y – MM/y G"} + y{"MM/y – MM/y G"} } yMEd{ - M{"E, dd/MM/y – E, dd/MM/y G"} - d{"E, dd/MM/y – E, dd/MM/y G"} - y{"E, dd/MM/y – E, dd/MM/y G"} + M{"E, dd/MM/y – E, dd/MM/y G"} + d{"E, dd/MM/y – E, dd/MM/y G"} + y{"E, dd/MM/y – E, dd/MM/y G"} } yMMM{ M{"MMM–MMM 'de' y G"} - y{"MMM 'de' y – MMM 'de' y G"} + y{"MMM 'de' y – MMM 'de' y G"} } yMMMEd{ - M{"E, d 'de' MMM – E, d 'de' MMM 'de' y G"} - d{"E, d 'de' MMM – E, d 'de' MMM 'de' y G"} - y{"E, d 'de' MMM 'de' y – E, d 'de' MMM 'de' y G"} + M{"E, d 'de' MMM – E, d 'de' MMM 'de' y G"} + d{"E, d 'de' MMM – E, d 'de' MMM 'de' y G"} + y{"E, d 'de' MMM 'de' y – E, d 'de' MMM 'de' y G"} } yMMMM{ M{"MMMM–MMMM 'de' y G"} - y{"MMMM 'de' y – MMMM 'de' y G"} + y{"MMMM 'de' y – MMMM 'de' y G"} } yMMMd{ - M{"d 'de' MMM – d 'de' MMM 'de' y G"} + M{"d 'de' MMM – d 'de' MMM 'de' y G"} d{"d–d 'de' MMM 'de' y"} - y{"d 'de' MMM 'de' y – d 'de' MMM 'de' y G"} + y{"d 'de' MMM 'de' y – d 'de' MMM 'de' y G"} } yMd{ - M{"dd/MM/y – dd/MM/y G"} - d{"dd/MM/y – dd/MM/y G"} - y{"dd/MM/y – dd/MM/y G"} + M{"dd/MM/y – dd/MM/y G"} + d{"dd/MM/y – dd/MM/y G"} + y{"dd/MM/y – dd/MM/y G"} } } } @@ -618,8 +618,8 @@ pt{ EHm{"E, HH:mm"} EHms{"E, HH:mm:ss"} Ed{"E, d"} - Ehm{"E, h:mm a"} - Ehms{"E, h:mm:ss a"} + Ehm{"E, h:mm a"} + Ehms{"E, h:mm:ss a"} Gy{"y G"} GyMMM{"MMM 'de' y G"} GyMMMEd{"E, d 'de' MMM 'de' y G"} @@ -644,11 +644,11 @@ pt{ MMdd{"dd/MM"} Md{"d/M"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} - hmsv{"h:mm:ss a v"} - hmv{"h:mm a v"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} + hmsv{"h:mm:ss a v"} + hmv{"h:mm a v"} ms{"mm:ss"} y{"y"} yM{"MM/y"} @@ -799,144 +799,144 @@ pt{ } intervalFormats{ Bh{ - B{"h B – h B"} - h{"h – h B"} + B{"h B – h B"} + h{"h – h B"} } Bhm{ - B{"h:mm B – h:mm B"} - h{"h:mm – h:mm B"} - m{"h:mm – h:mm B"} + B{"h:mm B – h:mm B"} + h{"h:mm – h:mm B"} + m{"h:mm – h:mm B"} } Gy{ - G{"y G – y G"} - y{"y – y G"} + G{"y G – y G"} + y{"y – y G"} } GyM{ - G{"M/y GGGGG – M/y GGGGG"} - M{"M/y – M/y GGGGG"} - y{"M/y – M/y GGGGG"} + G{"M/y GGGGG – M/y GGGGG"} + M{"M/y – M/y GGGGG"} + y{"M/y – M/y GGGGG"} } GyMEd{ - G{"E, M/d/y GGGGG – E, M/d/y GGGGG"} - M{"E, M/d/y – E, M/d/y GGGGG"} - d{"E, M/d/y – E, M/d/y GGGGG"} - y{"E, M/d/y – E, M/d/y GGGGG"} + G{"E, M/d/y GGGGG – E, M/d/y GGGGG"} + M{"E, M/d/y – E, M/d/y GGGGG"} + d{"E, M/d/y – E, M/d/y GGGGG"} + y{"E, M/d/y – E, M/d/y GGGGG"} } GyMMM{ - G{"MMM y G – MMM y G"} - M{"MMM – MMM y G"} - y{"MMM y – MMM y G"} + G{"MMM y G – MMM y G"} + M{"MMM – MMM y G"} + y{"MMM y – MMM y G"} } GyMMMEd{ - G{"E, MMM d, y G – E, MMM d, y G"} - M{"E, MMM d – E, MMM d, y G"} - d{"E, MMM d – E, MMM d, y G"} - y{"E, MMM d, y – E, MMM d, y G"} + G{"E, MMM d, y G – E, MMM d, y G"} + M{"E, MMM d – E, MMM d, y G"} + d{"E, MMM d – E, MMM d, y G"} + y{"E, MMM d, y – E, MMM d, y G"} } GyMMMd{ - G{"MMM d, y G – MMM d, y G"} - M{"MMM d – MMM d, y G"} - d{"MMM d – d, y G"} - y{"MMM d, y – MMM d, y G"} + G{"MMM d, y G – MMM d, y G"} + M{"MMM d – MMM d, y G"} + d{"MMM d – d, y G"} + y{"MMM d, y – MMM d, y G"} } GyMd{ - G{"M/d/y GGGGG – M/d/y GGGGG"} - M{"M/d/y – M/d/y GGGGG"} - d{"M/d/y – M/d/y GGGGG"} - y{"M/d/y – M/d/y GGGGG"} + G{"M/d/y GGGGG – M/d/y GGGGG"} + M{"M/d/y – M/d/y GGGGG"} + d{"M/d/y – M/d/y GGGGG"} + y{"M/d/y – M/d/y GGGGG"} } H{ H{"HH'h' - HH'h'"} } Hm{ - H{"HH:mm – HH:mm"} - m{"HH:mm – HH:mm"} + H{"HH:mm – HH:mm"} + m{"HH:mm – HH:mm"} } Hmv{ - H{"HH:mm – HH:mm v"} - m{"HH:mm – HH:mm v"} + H{"HH:mm – HH:mm v"} + m{"HH:mm – HH:mm v"} } Hv{ - H{"HH – HH v"} + H{"HH – HH v"} } M{ - M{"M – M"} + M{"M – M"} } MEd{ - M{"E, dd/MM – E, dd/MM"} - d{"E, dd/MM – E, dd/MM"} + M{"E, dd/MM – E, dd/MM"} + d{"E, dd/MM – E, dd/MM"} } MMM{ - M{"MMM – MMM"} + M{"MMM – MMM"} } MMMEd{ - M{"E, d 'de' MMM – E, d 'de' MMM"} - d{"E, d – E, d 'de' MMM"} + M{"E, d 'de' MMM – E, d 'de' MMM"} + d{"E, d – E, d 'de' MMM"} } MMMd{ - M{"d 'de' MMM – d 'de' MMM"} - d{"d – d 'de' MMM"} + M{"d 'de' MMM – d 'de' MMM"} + d{"d – d 'de' MMM"} } Md{ - M{"dd/MM – dd/MM"} - d{"dd/MM – dd/MM"} + M{"dd/MM – dd/MM"} + d{"dd/MM – dd/MM"} } d{ - d{"d – d"} + d{"d – d"} } fallback{"{0} - {1}"} h{ - a{"h a – h a"} - h{"h – h a"} + a{"h a – h a"} + h{"h – h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm – h:mm a"} - m{"h:mm – h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm – h:mm a"} + m{"h:mm – h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm – h:mm a v"} - m{"h:mm – h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm – h:mm a v"} + m{"h:mm – h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h – h a v"} + a{"h a – h a v"} + h{"h – h a v"} } y{ - y{"y – y"} + y{"y – y"} } yM{ - M{"MM/y – MM/y"} - y{"MM/y – MM/y"} + M{"MM/y – MM/y"} + y{"MM/y – MM/y"} } yMEd{ - M{"E, dd/MM/y – E, dd/MM/y"} - d{"E, dd/MM/y – E, dd/MM/y"} - y{"E, dd/MM/y – E, dd/MM/y"} + M{"E, dd/MM/y – E, dd/MM/y"} + d{"E, dd/MM/y – E, dd/MM/y"} + y{"E, dd/MM/y – E, dd/MM/y"} } yMMM{ - M{"MMM – MMM 'de' y"} - y{"MMM 'de' y – MMM 'de' y"} + M{"MMM – MMM 'de' y"} + y{"MMM 'de' y – MMM 'de' y"} } yMMMEd{ - M{"E, d 'de' MMM – E, d 'de' MMM 'de' y"} - d{"E, d – E, d 'de' MMM 'de' y"} - y{"E, d 'de' MMM 'de' y – E, d 'de' MMM 'de' y"} + M{"E, d 'de' MMM – E, d 'de' MMM 'de' y"} + d{"E, d – E, d 'de' MMM 'de' y"} + y{"E, d 'de' MMM 'de' y – E, d 'de' MMM 'de' y"} } yMMMM{ - M{"MMMM – MMMM 'de' y"} - y{"MMMM 'de' y – MMMM 'de' y"} + M{"MMMM – MMMM 'de' y"} + y{"MMMM 'de' y – MMMM 'de' y"} } yMMMd{ - M{"d 'de' MMM – d 'de' MMM 'de' y"} - d{"d – d 'de' MMM 'de' y"} - y{"d 'de' MMM 'de' y – d 'de' MMM 'de' y"} + M{"d 'de' MMM – d 'de' MMM 'de' y"} + d{"d – d 'de' MMM 'de' y"} + y{"d 'de' MMM 'de' y – d 'de' MMM 'de' y"} } yMd{ - M{"dd/MM/y – dd/MM/y"} - d{"dd/MM/y – dd/MM/y"} - y{"dd/MM/y – dd/MM/y"} + M{"dd/MM/y – dd/MM/y"} + d{"dd/MM/y – dd/MM/y"} + y{"dd/MM/y – dd/MM/y"} } } monthNames{ diff --git a/icu4c/source/data/locales/pt_MO.txt b/icu4c/source/data/locales/pt_MO.txt index 714569c2d51d..2900b74fc465 100644 --- a/icu4c/source/data/locales/pt_MO.txt +++ b/icu4c/source/data/locales/pt_MO.txt @@ -6,17 +6,17 @@ pt_MO{ calendar{ gregorian{ DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE, d 'de' MMMM 'de' y", "d 'de' MMMM 'de' y", "dd/MM/y", "dd/MM/yy", "{1}, {0}", - "{1} 'às' {0}", - "{1} 'às' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } diff --git a/icu4c/source/data/locales/pt_PT.txt b/icu4c/source/data/locales/pt_PT.txt index 1eba0ed270c6..7098f80baac2 100644 --- a/icu4c/source/data/locales/pt_PT.txt +++ b/icu4c/source/data/locales/pt_PT.txt @@ -189,8 +189,8 @@ pt_PT{ "d 'de' MMM 'de' y G", "d/M/y G", "{1}, {0}", - "{1} 'às' {0}", - "{1} 'às' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } @@ -285,6 +285,12 @@ pt_PT{ "d 'de' MMM 'de' y G", "d/M/y G", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{1} 'às' {0}", "{1} 'às' {0}", "{1}, {0}", @@ -310,42 +316,42 @@ pt_PT{ } intervalFormats{ Gy{ - G{"y G – y G"} - y{"y – y G"} + G{"y G – y G"} + y{"y – y G"} } GyM{ - G{"MM/y GGGGG – MM/y GGGGG"} - M{"MM/y – MM/y GGGGG"} - y{"MM/y – MM/y GGGGG"} + G{"MM/y GGGGG – MM/y GGGGG"} + M{"MM/y – MM/y GGGGG"} + y{"MM/y – MM/y GGGGG"} } GyMEd{ - G{"E, d/MM/y GGGGG – E, d/MM/y GGGGG"} - M{"E, d/MM/y – E, d/MM/y GGGGG"} - d{"E, d/MM/y – E, d/MM/y GGGGG"} - y{"E, d/MM/y – E, d/MM/y GGGGG"} + G{"E, d/MM/y GGGGG – E, d/MM/y GGGGG"} + M{"E, d/MM/y – E, d/MM/y GGGGG"} + d{"E, d/MM/y – E, d/MM/y GGGGG"} + y{"E, d/MM/y – E, d/MM/y GGGGG"} } GyMMM{ - G{"MMM y G – MMM y G"} - M{"MMM – MMM y G"} - y{"MMM y – MMM y G"} + G{"MMM y G – MMM y G"} + M{"MMM – MMM y G"} + y{"MMM y – MMM y G"} } GyMMMEd{ - G{"E, d 'de' MMMM, y G – E, d 'de' MMMM, y G"} - M{"E, d 'de' MMMM – E, d 'de' MMMM, y G"} - d{"E, d 'de' MMMM – E, d 'de' MMMM, y G"} - y{"E, d 'de' MMMM, y – E, d 'de' MMMM, y G"} + G{"E, d 'de' MMMM, y G – E, d 'de' MMMM, y G"} + M{"E, d 'de' MMMM – E, d 'de' MMMM, y G"} + d{"E, d 'de' MMMM – E, d 'de' MMMM, y G"} + y{"E, d 'de' MMMM, y – E, d 'de' MMMM, y G"} } GyMMMd{ - G{"d 'de' MMMM, y G – d 'de' MMMM, y G"} - M{"d 'de' MMMM – d 'de' MMMM, y G"} - d{"d – d 'de' MMMM, y G"} - y{"d 'de' MMMM, y – d 'de' MMMM, y G"} + G{"d 'de' MMMM, y G – d 'de' MMMM, y G"} + M{"d 'de' MMMM – d 'de' MMMM, y G"} + d{"d – d 'de' MMMM, y G"} + y{"d 'de' MMMM, y – d 'de' MMMM, y G"} } GyMd{ - G{"d/MM/y GGGGG – d/MM/y GGGGG"} - M{"d/MM/y – d/MM/y GGGGG"} - d{"d/MM/y – d/MM/y GGGGG"} - y{"d/MM/y – d/MM/y GGGGG"} + G{"d/MM/y GGGGG – d/MM/y GGGGG"} + M{"d/MM/y – d/MM/y GGGGG"} + d{"d/MM/y – d/MM/y GGGGG"} + y{"d/MM/y – d/MM/y GGGGG"} } M{ M{"MM–MM"} @@ -354,33 +360,33 @@ pt_PT{ M{"MMM–MMM"} } MMMEd{ - d{"ccc, dd/MM – ccc, dd/MM"} + d{"ccc, dd/MM – ccc, dd/MM"} } MMMMEd{ - M{"ccc, d 'de' MMMM – ccc, d 'de' MMMM"} - d{"ccc, d 'de' MMMM – ccc, d 'de' MMMM"} + M{"ccc, d 'de' MMMM – ccc, d 'de' MMMM"} + d{"ccc, d 'de' MMMM – ccc, d 'de' MMMM"} } h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - h{"h:mm – h:mm a"} + h{"h:mm – h:mm a"} } y{ y{"y–y G"} } yMMMEd{ - d{"E, dd/MM – E, dd/MM/y G"} - y{"E, dd/MM/y – E, dd/MM/y G"} + d{"E, dd/MM – E, dd/MM/y G"} + y{"E, dd/MM/y – E, dd/MM/y G"} } yMMMM{ - M{"MMMM – MMMM 'de' y G"} + M{"MMMM – MMMM 'de' y G"} } yMMMMEd{ - M{"E, d 'de' MMMM – E, d 'de' MMMM 'de' y G"} - d{"E, d 'de' MMMM – E, d 'de' MMMM 'de' y G"} - y{"E, d 'de' MMMM 'de' y – E, d 'de' MMMM 'de' y G"} + M{"E, d 'de' MMMM – E, d 'de' MMMM 'de' y G"} + d{"E, d 'de' MMMM – E, d 'de' MMMM 'de' y G"} + y{"E, d 'de' MMMM 'de' y – E, d 'de' MMMM 'de' y G"} } } } @@ -407,6 +413,12 @@ pt_PT{ "dd/MM/y", "dd/MM/yy", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{1} 'às' {0}", "{1} 'às' {0}", "{1}, {0}", @@ -527,28 +539,28 @@ pt_PT{ } intervalFormats{ GyMEd{ - G{"E, d/M/y GGGGG – E, d/M/y GGGGG"} - M{"E, d/M/y – E, d/M/y GGGGG"} - d{"E, d/M/y – E, d/M/y GGGGG"} - y{"E, d/M/y – E, d/M/y GGGGG"} + G{"E, d/M/y GGGGG – E, d/M/y GGGGG"} + M{"E, d/M/y – E, d/M/y GGGGG"} + d{"E, d/M/y – E, d/M/y GGGGG"} + y{"E, d/M/y – E, d/M/y GGGGG"} } GyMMMEd{ - G{"E, d MMM y G – E, d MMM y G"} - M{"E, d MMM – E, d MMM y G"} - d{"E, d MMM – E, d MMM y G"} - y{"E, d MMM y – E, d MMM y G"} + G{"E, d MMM y G – E, d MMM y G"} + M{"E, d MMM – E, d MMM y G"} + d{"E, d MMM – E, d MMM y G"} + y{"E, d MMM y – E, d MMM y G"} } GyMMMd{ - G{"d MMM y G – d MMM y G"} - M{"d MMM – d MMM y G"} - d{"d – d MMM y G"} - y{"d MMM y – d MMM y G"} + G{"d MMM y G – d MMM y G"} + M{"d MMM – d MMM y G"} + d{"d – d MMM y G"} + y{"d MMM y – d MMM y G"} } GyMd{ - G{"d/M/y GGGGG – d/M/y GGGGG"} - M{"d/M/y – d/M/y GGGGG"} - d{"d/M/y – d/M/y GGGGG"} - y{"d/M/y – d/M/y GGGGG"} + G{"d/M/y GGGGG – d/M/y GGGGG"} + M{"d/M/y – d/M/y GGGGG"} + d{"d/M/y – d/M/y GGGGG"} + y{"d/M/y – d/M/y GGGGG"} } H{ H{"HH–HH"} @@ -557,19 +569,19 @@ pt_PT{ M{"M–M"} } MEd{ - M{"ccc, dd/MM – ccc, dd/MM"} - d{"ccc, dd/MM – ccc, dd/MM"} + M{"ccc, dd/MM – ccc, dd/MM"} + d{"ccc, dd/MM – ccc, dd/MM"} } MMM{ M{"MMM–MMM"} } MMMEd{ - M{"ccc, dd/MM – ccc, dd/MM"} - d{"ccc, dd/MM – ccc, dd/MM"} + M{"ccc, dd/MM – ccc, dd/MM"} + d{"ccc, dd/MM – ccc, dd/MM"} } MMMMEd{ - M{"ccc, d 'de' MMMM – ccc, d 'de' MMMM"} - d{"ccc, d 'de' MMMM – ccc, d 'de' MMMM"} + M{"ccc, d 'de' MMMM – ccc, d 'de' MMMM"} + d{"ccc, d 'de' MMMM – ccc, d 'de' MMMM"} } MMMd{ d{"d–d 'de' MMM"} @@ -578,29 +590,29 @@ pt_PT{ d{"d–d"} } h{ - h{"h–h a"} + h{"h–h a"} } hv{ - h{"h–h a v"} + h{"h–h a v"} } y{ y{"y–y"} } yMEd{ - M{"ccc, dd/MM/y – ccc, dd/MM/y"} - d{"ccc, dd/MM/y – ccc, dd/MM/y"} - y{"ccc, dd/MM/y – ccc, dd/MM/y"} + M{"ccc, dd/MM/y – ccc, dd/MM/y"} + d{"ccc, dd/MM/y – ccc, dd/MM/y"} + y{"ccc, dd/MM/y – ccc, dd/MM/y"} } yMMM{ M{"MMM–MMM 'de' y"} } yMMMEd{ - d{"E, dd/MM – E, dd/MM/y"} + d{"E, dd/MM – E, dd/MM/y"} } yMMMMEd{ - M{"E, d 'de' MMMM – E, d 'de' MMMM 'de' y"} - d{"E, d 'de' MMMM – E, d 'de' MMMM 'de' y"} - y{"E, d 'de' MMMM 'de' y – E, d 'de' MMMM 'de' y"} + M{"E, d 'de' MMMM – E, d 'de' MMMM 'de' y"} + d{"E, d 'de' MMMM – E, d 'de' MMMM 'de' y"} + y{"E, d 'de' MMMM 'de' y – E, d 'de' MMMM 'de' y"} } yMMMd{ d{"d–d 'de' MMM 'de' y"} @@ -636,8 +648,8 @@ pt_PT{ "d 'de' MMM 'de' y G", "d/M/y G", "{1}, {0}", - "{1} 'às' {0}", - "{1} 'às' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } @@ -663,8 +675,8 @@ pt_PT{ "d 'de' MMM 'de' y G", "d/M/y G", "{1}, {0}", - "{1} 'às' {0}", - "{1} 'às' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } @@ -690,8 +702,8 @@ pt_PT{ "dd/MM/y G", "d/M/y G", "{1}, {0}", - "{1} 'às' {0}", - "{1} 'às' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } @@ -717,8 +729,8 @@ pt_PT{ "d 'de' MMM 'de' y G", "d/M/y G", "{1}, {0}", - "{1} 'às' {0}", - "{1} 'às' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } diff --git a/icu4c/source/data/locales/qu.txt b/icu4c/source/data/locales/qu.txt index 7256f4f61c58..d14694b5712b 100644 --- a/icu4c/source/data/locales/qu.txt +++ b/icu4c/source/data/locales/qu.txt @@ -198,8 +198,8 @@ qu{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"E, d"} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"y G"} GyMMM{"MMM y G"} GyMMMEd{"E, d MMMM y G"} @@ -216,9 +216,9 @@ qu{ MMMd{"d MMM"} Md{"dd-MM"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"mm:ss"} y{"y G"} yyyy{"y G"} @@ -234,64 +234,64 @@ qu{ } intervalFormats{ Gy{ - G{"y G – y G"} - y{"y – y G"} + G{"y G – y G"} + y{"y – y G"} } GyM{ - G{"MM-y GGGGG – MM-y GGGGG"} - M{"MM-y GGGGG – MM-y GGGGG"} - y{"MM-y – MM-y GGGGG"} + G{"MM-y GGGGG – MM-y GGGGG"} + M{"MM-y GGGGG – MM-y GGGGG"} + y{"MM-y – MM-y GGGGG"} } GyMEd{ - G{"E, d-MM-y GGGG – E, d-MM-y GGGGG"} - M{"E, d-MM-y – E, d-MM-y GGGGG"} - d{"E, d-MM-y – E, d-MM-y GGGGG"} - y{"E, d-MM-y – E, d-MM-y GGGGG"} + G{"E, d-MM-y GGGG – E, d-MM-y GGGGG"} + M{"E, d-MM-y – E, d-MM-y GGGGG"} + d{"E, d-MM-y – E, d-MM-y GGGGG"} + y{"E, d-MM-y – E, d-MM-y GGGGG"} } GyMMM{ - G{"MMM y G – MMM y G"} - M{"MMM – MMM y G"} - y{"MMM y – MMM y G"} + G{"MMM y G – MMM y G"} + M{"MMM – MMM y G"} + y{"MMM y – MMM y G"} } GyMMMEd{ - G{"E, d MMM y G – E, d MMM y G"} - M{"E, d MMM – E, d MMM y G"} - d{"E, d MMM – E, d MMM y G"} - y{"E, d MMM y – E, d MMM y G"} + G{"E, d MMM y G – E, d MMM y G"} + M{"E, d MMM – E, d MMM y G"} + d{"E, d MMM – E, d MMM y G"} + y{"E, d MMM y – E, d MMM y G"} } GyMMMd{ - G{"d MMM y G – d MMM y G"} - M{"d MMM – d MMM y G"} - d{"d – d MMM y G"} - y{"d MMM y – d MMM y G"} + G{"d MMM y G – d MMM y G"} + M{"d MMM – d MMM y G"} + d{"d – d MMM y G"} + y{"d MMM y – d MMM y G"} } GyMd{ - G{"d-MM-y GGGG – d-MM-y GGGGG"} - M{"d-MM-y – d-MM-y GGGGG"} - d{"d-MM-y – d–MM-y GGGGG"} - y{"d-MM-y – d-MM-y GGGGG"} + G{"d-MM-y GGGG – d-MM-y GGGGG"} + M{"d-MM-y – d-MM-y GGGGG"} + d{"d-MM-y – d–MM-y GGGGG"} + y{"d-MM-y – d-MM-y GGGGG"} } M{ M{"MM–MM"} } MEd{ - M{"E, dd-MM – E, dd-MM"} - d{"E, dd-MM – E, dd-MM"} + M{"E, dd-MM – E, dd-MM"} + d{"E, dd-MM – E, dd-MM"} } MMM{ M{"LLL–LLL"} } MMMEd{ - M{"E, d MMM – E, d MMM"} - d{"E, d MMM – E, d MMM"} + M{"E, d MMM – E, d MMM"} + d{"E, d MMM – E, d MMM"} } MMMd{ - M{"d MMM – d MMM"} + M{"d MMM – d MMM"} d{"d–d MMM"} } Md{ - M{"dd-MM – dd-MM"} - d{"dd-MM – dd-MM"} + M{"dd-MM – dd-MM"} + d{"dd-MM – dd-MM"} } d{ d{"d–d"} @@ -301,36 +301,36 @@ qu{ y{"y–y G"} } yM{ - M{"MM-y – MM-y GGGGG"} - y{"MM-y – MM-y GGGGG"} + M{"MM-y – MM-y GGGGG"} + y{"MM-y – MM-y GGGGG"} } yMEd{ - M{"E, dd-MM-y – E, dd-MM-y GGGGG"} - d{"E, dd-MM-y – E, dd-MM-y GGGGG"} - y{"E, dd-MM-y – E, dd-MM-y GGGGG"} + M{"E, dd-MM-y – E, dd-MM-y GGGGG"} + d{"E, dd-MM-y – E, dd-MM-y GGGGG"} + y{"E, dd-MM-y – E, dd-MM-y GGGGG"} } yMMM{ M{"MMM–MMM y G"} - y{"MMM y – MMM y G"} + y{"MMM y – MMM y G"} } yMMMEd{ - M{"E, d MMM – E, d MMM y G"} - d{"E, d MMM y – E, d MMM y G"} - y{"E, d MMM y – E, d MMM y G"} + M{"E, d MMM – E, d MMM y G"} + d{"E, d MMM y – E, d MMM y G"} + y{"E, d MMM y – E, d MMM y G"} } yMMMM{ M{"MMMM–MMMM y G"} - y{"MMMM y – MMMM y G"} + y{"MMMM y – MMMM y G"} } yMMMd{ - M{"d MMM – d MMM y G"} + M{"d MMM – d MMM y G"} d{"d–d MMM y G"} - y{"d MMM y – d MMM y G"} + y{"d MMM y – d MMM y G"} } yMd{ - M{"dd-MM-y – dd-MM-y GGGGG"} - d{"dd-MM-y – dd-MM-y GGGGG"} - y{"dd-MM-y – dd-MM-y GGGGG"} + M{"dd-MM-y – dd-MM-y GGGGG"} + d{"dd-MM-y – dd-MM-y GGGGG"} + y{"dd-MM-y – dd-MM-y GGGGG"} } } } @@ -385,8 +385,8 @@ qu{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"d, E"} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"G y"} GyMMM{"MMM y G"} GyMMMEd{"E, d MMM, y G"} @@ -408,11 +408,11 @@ qu{ MMMd{"d MMM"} Md{"MM-dd"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} - hmsv{"h:mm:ss a v"} - hmv{"h:mm a v"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} + hmsv{"h:mm:ss a v"} + hmv{"h:mm a v"} ms{"mm:ss"} y{"y"} yM{"y-MM"} @@ -549,22 +549,22 @@ qu{ y{"y–y G"} } GyM{ - G{"MM-y GGGGG – MM-y GGGGG"} + G{"MM-y GGGGG – MM-y GGGGG"} } GyMMM{ - y{"MMM y – MMM y G"} + y{"MMM y – MMM y G"} } GyMMMEd{ - G{"E, d MMM y G – E, d MMM y G"} + G{"E, d MMM y G – E, d MMM y G"} M{"E, d MMM d – E, d MMM y G"} - d{"E, d MMM – E, d MMM y G"} - y{"E, d MMM y – E, d MMM y G"} + d{"E, d MMM – E, d MMM y G"} + y{"E, d MMM y – E, d MMM y G"} } GyMMMd{ - G{"d, MMM y G – d, MMM y G"} - M{"d, MMM – d, MMM y G"} - d{"d – d, MMM y G"} - y{"d, MMM y – d, MMM y G"} + G{"d, MMM y G – d, MMM y G"} + M{"d, MMM – d, MMM y G"} + d{"d – d, MMM y G"} + y{"d, MMM y – d, MMM y G"} } H{ H{"HH–HH"} @@ -584,80 +584,80 @@ qu{ M{"MM–MM"} } MEd{ - M{"E, d/M – E, d/M"} - d{"E, d/M – E, d/M"} + M{"E, d/M – E, d/M"} + d{"E, d/M – E, d/M"} } MMM{ M{"LLL–LLL"} } MMMEd{ - M{"E, d MMM – E, d MMM"} - d{"E, d MMM – E, d MMM"} + M{"E, d MMM – E, d MMM"} + d{"E, d MMM – E, d MMM"} } MMMd{ - M{"d MMM – d MMM"} - d{"d – d MMM"} + M{"d MMM – d MMM"} + d{"d – d MMM"} } Md{ - M{"d/M – d/M"} - d{"d/M – d/M"} + M{"d/M – d/M"} + d{"d/M – d/M"} } d{ d{"d–d"} } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y"} } yM{ - M{"M/y – M/y"} - y{"M/y – M/y"} + M{"M/y – M/y"} + y{"M/y – M/y"} } yMEd{ - M{"E, d/M/y – E, d/M/y"} - d{"E, d/M/y – E, d/M/y"} - y{"E, d/M/y – E, d/M/y"} + M{"E, d/M/y – E, d/M/y"} + d{"E, d/M/y – E, d/M/y"} + y{"E, d/M/y – E, d/M/y"} } yMMM{ - M{"MMM – MMM y"} - y{"MMM y – MMM y"} + M{"MMM – MMM y"} + y{"MMM y – MMM y"} } yMMMEd{ - M{"E, d MMM – E, d MMM, y"} - d{"E, d MMM – E, d MMM, y"} - y{"E, d MMM, y – E, d MMM, y"} + M{"E, d MMM – E, d MMM, y"} + d{"E, d MMM – E, d MMM, y"} + y{"E, d MMM, y – E, d MMM, y"} } yMMMM{ - M{"MMMM – MMMM y"} - y{"MMMM y – MMMM y"} + M{"MMMM – MMMM y"} + y{"MMMM y – MMMM y"} } yMMMd{ - M{"d MMM – d MMM, y"} - d{"d – d MMM, y"} - y{"d MMM, y – d MMM, y"} + M{"d MMM – d MMM, y"} + d{"d – d MMM, y"} + y{"d MMM, y – d MMM, y"} } yMd{ - M{"d/M/y – d/M/y"} - d{"d/M/y – d/M/y"} - y{"d/M/y – d/M/y"} + M{"d/M/y – d/M/y"} + d{"d/M/y – d/M/y"} + y{"d/M/y – d/M/y"} } } monthNames{ diff --git a/icu4c/source/data/locales/rm.txt b/icu4c/source/data/locales/rm.txt index 071712eb992f..79e554e27fde 100644 --- a/icu4c/source/data/locales/rm.txt +++ b/icu4c/source/data/locales/rm.txt @@ -61,6 +61,12 @@ rm{ "dd-MM-y G", "dd-MM-y GGGGG", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{1} 'a' 'las' {0}", "{1} 'a' 'las' {0}", "{1}, {0}", @@ -81,8 +87,8 @@ rm{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"E d."} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"y G"} GyMMM{"LLL y G"} GyMMMEd{"E, dd-MM-y GGGGG"} @@ -103,11 +109,11 @@ rm{ MMMd{"dd-MM"} Md{"dd-MM"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} - hmsv{"h:mm:ss a v"} - hmv{"h:mm a v"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} + hmsv{"h:mm:ss a v"} + hmv{"h:mm a v"} ms{"mm:ss"} y{"y G"} yM{"MM-y GGGGG"} @@ -140,98 +146,98 @@ rm{ M{"LL–LL"} } MEd{ - M{"E, dd-MM – E, dd-MM"} - d{"E, dd-MM – E, dd-MM"} + M{"E, dd-MM – E, dd-MM"} + d{"E, dd-MM – E, dd-MM"} } MMM{ M{"LLL–LLL"} } MMMEd{ - M{"E, dd-MM – E, dd-MM"} - d{"E, dd-MM – E, dd-MM"} + M{"E, dd-MM – E, dd-MM"} + d{"E, dd-MM – E, dd-MM"} } MMMMEd{ - M{"E, d MMMM – E, d MMMM"} + M{"E, d MMMM – E, d MMMM"} d{"E, d. – E, d MMMM"} } MMMMd{ - M{"d MMMM – d MMMM"} + M{"d MMMM – d MMMM"} d{"d.–d MMMM"} } MMMd{ - M{"dd-MM – dd-MM"} - d{"dd-MM – dd-MM"} + M{"dd-MM – dd-MM"} + d{"dd-MM – dd-MM"} } Md{ - M{"dd-MM – dd-MM"} - d{"dd-MM – dd-MM"} + M{"dd-MM – dd-MM"} + d{"dd-MM – dd-MM"} } d{ d{"d.–d."} } fallback{"{0} - {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y G"} } yM{ - M{"LL-y – LL-y GGGGG"} - y{"LL-y – LL-y GGGGG"} + M{"LL-y – LL-y GGGGG"} + y{"LL-y – LL-y GGGGG"} } yMEd{ - M{"E, dd-MM-y – E, dd-MM-y GGGGG"} - d{"E, dd-MM-y – E, dd-MM-y GGGGG"} - y{"E, dd-MM-y – E, dd-MM-y GGGGG"} + M{"E, dd-MM-y – E, dd-MM-y GGGGG"} + d{"E, dd-MM-y – E, dd-MM-y GGGGG"} + y{"E, dd-MM-y – E, dd-MM-y GGGGG"} } yMMM{ M{"LLL–LLL y G"} - y{"LLL y – LLL y G"} + y{"LLL y – LLL y G"} } yMMMEd{ - M{"E, dd-MM-y – E, dd-MM-y GGGGG"} - d{"E, dd-MM-y – E, dd-MM-y GGGGG"} - y{"E, dd-MM-y – E, dd-MM-y GGGGG"} + M{"E, dd-MM-y – E, dd-MM-y GGGGG"} + d{"E, dd-MM-y – E, dd-MM-y GGGGG"} + y{"E, dd-MM-y – E, dd-MM-y GGGGG"} } yMMMM{ M{"LLLL–LLLL y G"} - y{"LLLL y – LLLL y G"} + y{"LLLL y – LLLL y G"} } yMMMMEd{ - M{"E, d MMMM – E, d MMMM y G"} + M{"E, d MMMM – E, d MMMM y G"} d{"E, d. – E, d MMMM y G"} - y{"E, d MMMM y – E, d MMMM y G"} + y{"E, d MMMM y – E, d MMMM y G"} } yMMMMd{ - M{"d MMMM – d MMMM y G"} + M{"d MMMM – d MMMM y G"} d{"d.–d MMMM y G"} - y{"d MMMM y – d MMMM y G"} + y{"d MMMM y – d MMMM y G"} } yMMMd{ - M{"dd-MM-y – dd-MM-y GGGGG"} - d{"dd-MM-y – dd-MM-y GGGGG"} - y{"dd-MM-y – dd-MM-y GGGGG"} + M{"dd-MM-y – dd-MM-y GGGGG"} + d{"dd-MM-y – dd-MM-y GGGGG"} + y{"dd-MM-y – dd-MM-y GGGGG"} } yMd{ - M{"dd-MM-y – dd-MM-y GGGGG"} - d{"dd-MM-y – dd-MM-y GGGGG"} - y{"dd-MM-y – dd-MM-y GGGGG"} + M{"dd-MM-y – dd-MM-y GGGGG"} + d{"dd-MM-y – dd-MM-y GGGGG"} + y{"dd-MM-y – dd-MM-y GGGGG"} } } } @@ -281,8 +287,8 @@ rm{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"E d."} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"y G"} GyMMM{"LLL y G"} GyMMMEd{"E, dd-MM-y GGGGG"} @@ -308,11 +314,11 @@ rm{ MMMd{"dd-MM"} Md{"dd-MM"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} - hmsv{"h:mm:ss a v"} - hmv{"h:mm a v"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} + hmsv{"h:mm:ss a v"} + hmv{"h:mm a v"} ms{"mm:ss"} y{"y"} yM{"LL-y"} @@ -462,98 +468,98 @@ rm{ M{"LL–LL"} } MEd{ - M{"E, dd-MM – E, dd-MM"} - d{"E, dd-MM – E, dd-MM"} + M{"E, dd-MM – E, dd-MM"} + d{"E, dd-MM – E, dd-MM"} } MMM{ M{"LLL–LLL"} } MMMEd{ - M{"E, dd-MM – E, dd-MM"} - d{"E, dd-MM – E, dd-MM"} + M{"E, dd-MM – E, dd-MM"} + d{"E, dd-MM – E, dd-MM"} } MMMMEd{ - M{"E, d MMMM – E, d MMMM"} + M{"E, d MMMM – E, d MMMM"} d{"E, d. – E, d MMMM"} } MMMMd{ - M{"d MMMM – d MMMM"} + M{"d MMMM – d MMMM"} d{"d.–d MMMM"} } MMMd{ - M{"dd-MM – dd-MM"} - d{"dd-MM – dd-MM"} + M{"dd-MM – dd-MM"} + d{"dd-MM – dd-MM"} } Md{ - M{"dd-MM – dd-MM"} - d{"dd-MM – dd-MM"} + M{"dd-MM – dd-MM"} + d{"dd-MM – dd-MM"} } d{ d{"d–d"} } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y"} } yM{ - M{"LL-y – LL-y"} - y{"LL-y – LL-y"} + M{"LL-y – LL-y"} + y{"LL-y – LL-y"} } yMEd{ - M{"E, dd-MM-y – E, dd-MM-y"} - d{"E, dd-MM-y – E, dd-MM-y"} - y{"E, dd-MM-y – E, dd-MM-y"} + M{"E, dd-MM-y – E, dd-MM-y"} + d{"E, dd-MM-y – E, dd-MM-y"} + y{"E, dd-MM-y – E, dd-MM-y"} } yMMM{ M{"LLL–LLL y"} - y{"LLL y – LLL y"} + y{"LLL y – LLL y"} } yMMMEd{ - M{"E, dd-MM-y – E, dd-MM-y"} - d{"E, dd-MM-y – E, dd-MM-y"} - y{"E, dd-MM-y – E, dd-MM-y"} + M{"E, dd-MM-y – E, dd-MM-y"} + d{"E, dd-MM-y – E, dd-MM-y"} + y{"E, dd-MM-y – E, dd-MM-y"} } yMMMM{ M{"LLLL–LLLL y"} - y{"LLLL y – LLLL y"} + y{"LLLL y – LLLL y"} } yMMMMEd{ - M{"E, d MMMM – E, d MMMM y"} + M{"E, d MMMM – E, d MMMM y"} d{"E, d. – E, d MMMM y"} - y{"E, d MMMM y – E, d MMMM y"} + y{"E, d MMMM y – E, d MMMM y"} } yMMMMd{ - M{"d MMMM – d MMMM y"} + M{"d MMMM – d MMMM y"} d{"d.–d MMMM y"} - y{"d MMMM y – d MMMM y"} + y{"d MMMM y – d MMMM y"} } yMMMd{ - M{"dd-MM-y – dd-MM-y"} - d{"dd-MM-y – dd-MM-y"} - y{"dd-MM-y – dd-MM-y"} + M{"dd-MM-y – dd-MM-y"} + d{"dd-MM-y – dd-MM-y"} + y{"dd-MM-y – dd-MM-y"} } yMd{ - M{"dd-MM-y – dd-MM-y"} - d{"dd-MM-y – dd-MM-y"} - y{"dd-MM-y – dd-MM-y"} + M{"dd-MM-y – dd-MM-y"} + d{"dd-MM-y – dd-MM-y"} + y{"dd-MM-y – dd-MM-y"} } } monthNames{ diff --git a/icu4c/source/data/locales/rn.txt b/icu4c/source/data/locales/rn.txt index 206bb43e43dc..a917ff2c3e71 100644 --- a/icu4c/source/data/locales/rn.txt +++ b/icu4c/source/data/locales/rn.txt @@ -56,8 +56,8 @@ rn{ MMMd{"d MMM"} Md{"d/M"} d{"d"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"m:ss"} y{"y"} yM{"M/y"} @@ -115,8 +115,8 @@ rn{ MMMd{"d MMM"} Md{"d/M"} d{"d"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"m:ss"} y{"y"} yM{"M/y"} diff --git a/icu4c/source/data/locales/ro.txt b/icu4c/source/data/locales/ro.txt index 76dc5944f91a..dd1f2575016e 100644 --- a/icu4c/source/data/locales/ro.txt +++ b/icu4c/source/data/locales/ro.txt @@ -272,6 +272,12 @@ ro{ "dd.MM.y G", "dd.MM.y GGGGG", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{1} 'la' {0}", "{1} 'la' {0}", "{1}, {0}", @@ -345,80 +351,80 @@ ro{ M{"M–M"} } MEd{ - M{"E, dd.MM – E, dd.MM"} - d{"E, dd.MM – E, dd.MM"} + M{"E, dd.MM – E, dd.MM"} + d{"E, dd.MM – E, dd.MM"} } MMM{ M{"MMM–MMM"} } MMMEd{ - M{"E, d MMM – E, d MMM"} - d{"E, d MMM – E, d MMM"} + M{"E, d MMM – E, d MMM"} + d{"E, d MMM – E, d MMM"} } MMMd{ - M{"d MMM – d MMM"} + M{"d MMM – d MMM"} d{"d–d MMM"} } Md{ - M{"dd.MM – dd.MM"} - d{"dd.MM – dd.MM"} + M{"dd.MM – dd.MM"} + d{"dd.MM – dd.MM"} } d{ d{"d–d"} } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y G"} } yM{ - M{"MM.y – MM.y G"} - y{"MM.y – MM.y G"} + M{"MM.y – MM.y G"} + y{"MM.y – MM.y G"} } yMEd{ - M{"E, dd.MM.y – E, dd.MM.y G"} - d{"E, dd.MM.y – E, dd.MM.y G"} - y{"E, dd.MM.y – E, dd.MM.y G"} + M{"E, dd.MM.y – E, dd.MM.y G"} + d{"E, dd.MM.y – E, dd.MM.y G"} + y{"E, dd.MM.y – E, dd.MM.y G"} } yMMM{ M{"MMM–MMM y G"} - y{"MMM y – MMM y G"} + y{"MMM y – MMM y G"} } yMMMEd{ - M{"E, d MMM – E, d MMM y G"} - d{"E, d MMM – E, d MMM y G"} - y{"E, d MMM y – E, d MMM y G"} + M{"E, d MMM – E, d MMM y G"} + d{"E, d MMM – E, d MMM y G"} + y{"E, d MMM y – E, d MMM y G"} } yMMMM{ M{"MMMM–MMMM y G"} - y{"MMMM y – MMMM y G"} + y{"MMMM y – MMMM y G"} } yMMMd{ - M{"d MMM – d MMM y G"} + M{"d MMM – d MMM y G"} d{"d–d MMM y G"} - y{"d MMM y – d MMM y G"} + y{"d MMM y – d MMM y G"} } yMd{ - M{"dd.MM.y – dd.MM.y G"} - d{"dd.MM.y – dd.MM.y G"} - y{"dd.MM.y – dd.MM.y G"} + M{"dd.MM.y – dd.MM.y G"} + d{"dd.MM.y – dd.MM.y G"} + y{"dd.MM.y – dd.MM.y G"} } } } @@ -721,6 +727,12 @@ ro{ "dd.MM.y G", "dd.MM.y GGGGG", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{1} 'la' {0}", "{1} 'la' {0}", "{1}, {0}", @@ -746,8 +758,8 @@ ro{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"E d"} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"y G"} GyMMM{"MMM y G"} GyMMMEd{"E, d MMM y G"} @@ -765,9 +777,9 @@ ro{ MMMd{"d MMM"} Md{"dd.MM"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"mm:ss"} y{"y"} yyyy{"y G"} @@ -783,42 +795,42 @@ ro{ } intervalFormats{ Gy{ - G{"y G – y G"} - y{"y – y G"} + G{"y G – y G"} + y{"y – y G"} } GyM{ - G{"MM.y GGGGG – MM.y GGGGG"} - M{"MM.y – MM.y GGGGG"} - y{"MM.y – MM.y GGGGG"} + G{"MM.y GGGGG – MM.y GGGGG"} + M{"MM.y – MM.y GGGGG"} + y{"MM.y – MM.y GGGGG"} } GyMEd{ - G{"E, dd.MM.y GGGGG – E, dd.MM.y GGGGG"} - M{"E, dd.MM.y – E, dd.MM.y GGGGG"} - d{"E, dd.MM.y – E, dd.MM.y GGGGG"} - y{"E, dd.MM.y – E, dd.MM.y GGGGG"} + G{"E, dd.MM.y GGGGG – E, dd.MM.y GGGGG"} + M{"E, dd.MM.y – E, dd.MM.y GGGGG"} + d{"E, dd.MM.y – E, dd.MM.y GGGGG"} + y{"E, dd.MM.y – E, dd.MM.y GGGGG"} } GyMMM{ - G{"MMM y G – MMM y G"} - M{"MMM – MMM y G"} - y{"MMM y – MMM y G"} + G{"MMM y G – MMM y G"} + M{"MMM – MMM y G"} + y{"MMM y – MMM y G"} } GyMMMEd{ - G{"E, d MMM y G – E, d MMM y G"} - M{"E, d MMM – E, d MMM y G"} - d{"E, d MMM – E, d MMM y G"} - y{"E, d MMM y – E, d MMM y G"} + G{"E, d MMM y G – E, d MMM y G"} + M{"E, d MMM – E, d MMM y G"} + d{"E, d MMM – E, d MMM y G"} + y{"E, d MMM y – E, d MMM y G"} } GyMMMd{ - G{"d MMM y G – d MMM y G"} - M{"d MMM – d MMM y G"} - d{"d – d MMM y G"} - y{"d MMM y – d MMM y G"} + G{"d MMM y G – d MMM y G"} + M{"d MMM – d MMM y G"} + d{"d – d MMM y G"} + y{"d MMM y – d MMM y G"} } GyMd{ - G{"dd.MM.y GGGGG – dd.MM.y GGGGG"} - M{"dd.MM.y – dd.MM.y GGGGG"} - d{"dd.MM.y – dd.MM.y GGGGG"} - y{"dd.MM.y – dd.MM.y GGGGG"} + G{"dd.MM.y GGGGG – dd.MM.y GGGGG"} + M{"dd.MM.y – dd.MM.y GGGGG"} + d{"dd.MM.y – dd.MM.y GGGGG"} + y{"dd.MM.y – dd.MM.y GGGGG"} } H{ H{"HH–HH"} @@ -838,80 +850,80 @@ ro{ M{"M–M"} } MEd{ - M{"E, dd.MM – E, dd.MM"} - d{"E, dd.MM – E, dd.MM"} + M{"E, dd.MM – E, dd.MM"} + d{"E, dd.MM – E, dd.MM"} } MMM{ M{"MMM–MMM"} } MMMEd{ - M{"E, d MMM – E, d MMM"} - d{"E, d MMM – E, d MMM"} + M{"E, d MMM – E, d MMM"} + d{"E, d MMM – E, d MMM"} } MMMd{ - M{"d MMM – d MMM"} + M{"d MMM – d MMM"} d{"d–d MMM"} } Md{ - M{"dd.MM – dd.MM"} - d{"dd.MM – dd.MM"} + M{"dd.MM – dd.MM"} + d{"dd.MM – dd.MM"} } d{ d{"d–d"} } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y G"} } yM{ - M{"MM.y – MM.y G"} - y{"MM.y – MM.y G"} + M{"MM.y – MM.y G"} + y{"MM.y – MM.y G"} } yMEd{ - M{"E, dd.MM.y – E, dd.MM.y G"} - d{"E, dd.MM.y – E, dd.MM.y G"} - y{"E, dd.MM.y – E, dd.MM.y G"} + M{"E, dd.MM.y – E, dd.MM.y G"} + d{"E, dd.MM.y – E, dd.MM.y G"} + y{"E, dd.MM.y – E, dd.MM.y G"} } yMMM{ M{"MMM–MMM y G"} - y{"MMM y – MMM y G"} + y{"MMM y – MMM y G"} } yMMMEd{ - M{"E, d MMM – E, d MMM y G"} - d{"E, d MMM – E, d MMM y G"} - y{"E, d MMM y – E, d MMM y G"} + M{"E, d MMM – E, d MMM y G"} + d{"E, d MMM – E, d MMM y G"} + y{"E, d MMM y – E, d MMM y G"} } yMMMM{ M{"MMMM–MMMM y G"} - y{"MMMM y – MMMM y G"} + y{"MMMM y – MMMM y G"} } yMMMd{ - M{"d MMM – d MMM y G"} + M{"d MMM – d MMM y G"} d{"d–d MMM y G"} - y{"d MMM y – d MMM y G"} + y{"d MMM y – d MMM y G"} } yMd{ - M{"dd.MM.y – dd.MM.y G"} - d{"dd.MM.y – dd.MM.y G"} - y{"dd.MM.y – dd.MM.y G"} + M{"dd.MM.y – dd.MM.y G"} + d{"dd.MM.y – dd.MM.y G"} + y{"dd.MM.y – dd.MM.y G"} } } } @@ -966,8 +978,8 @@ ro{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"E d"} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"y G"} GyMMM{"MMM y G"} GyMMMEd{"E, d MMM y G"} @@ -993,11 +1005,11 @@ ro{ MMdd{"dd.MM"} Md{"dd.MM"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} - hmsv{"h:mm:ss a v"} - hmv{"h:mm a v"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} + hmsv{"h:mm:ss a v"} + hmv{"h:mm a v"} ms{"mm:ss"} y{"y"} yM{"MM.y"} @@ -1182,42 +1194,42 @@ ro{ } intervalFormats{ Gy{ - G{"y G – y G"} - y{"y – y G"} + G{"y G – y G"} + y{"y – y G"} } GyM{ - G{"MM.y GGGGG – MM.y GGGGG"} - M{"MM.y – MM.y GGGGG"} - y{"MM.y – MM.y GGGGG"} + G{"MM.y GGGGG – MM.y GGGGG"} + M{"MM.y – MM.y GGGGG"} + y{"MM.y – MM.y GGGGG"} } GyMEd{ - G{"E, dd.MM.y GGGGG – E, dd.MM.y GGGGG"} - M{"E, dd.MM.y – E, dd.MM.y GGGGG"} - d{"E, dd.MM.y – E, dd.MM.y GGGGG"} - y{"E, dd.MM.y – E, dd.MM.y GGGGG"} + G{"E, dd.MM.y GGGGG – E, dd.MM.y GGGGG"} + M{"E, dd.MM.y – E, dd.MM.y GGGGG"} + d{"E, dd.MM.y – E, dd.MM.y GGGGG"} + y{"E, dd.MM.y – E, dd.MM.y GGGGG"} } GyMMM{ - G{"MMM y G – MMM y G"} - M{"MMM – MMM y G"} - y{"MMM y – MMM y G"} + G{"MMM y G – MMM y G"} + M{"MMM – MMM y G"} + y{"MMM y – MMM y G"} } GyMMMEd{ - G{"E, d MMM y G – E, d MMM y G"} - M{"E, d MMM – E, d MMM y G"} - d{"E, d MMM – E, d MMM y G"} - y{"E, d MMM y – E, d MMM y G"} + G{"E, d MMM y G – E, d MMM y G"} + M{"E, d MMM – E, d MMM y G"} + d{"E, d MMM – E, d MMM y G"} + y{"E, d MMM y – E, d MMM y G"} } GyMMMd{ - G{"d MMM y G – d MMM y G"} - M{"d MMM – d MMM y G"} - d{"d – d MMM y G"} - y{"d MMM y – d MMM y G"} + G{"d MMM y G – d MMM y G"} + M{"d MMM – d MMM y G"} + d{"d – d MMM y G"} + y{"d MMM y – d MMM y G"} } GyMd{ - G{"dd.MM.y GGGGG – dd.MM.y GGGGG"} - M{"dd.MM.y – dd.MM.y GGGGG"} - d{"dd.MM.y – dd.MM.y GGGGG"} - y{"dd.MM.y – dd.MM.y GGGGG"} + G{"dd.MM.y GGGGG – dd.MM.y GGGGG"} + M{"dd.MM.y – dd.MM.y GGGGG"} + d{"dd.MM.y – dd.MM.y GGGGG"} + y{"dd.MM.y – dd.MM.y GGGGG"} } H{ H{"HH–HH"} @@ -1237,80 +1249,80 @@ ro{ M{"M–M"} } MEd{ - M{"E, dd.MM – E, dd.MM"} - d{"E, dd.MM – E, dd.MM"} + M{"E, dd.MM – E, dd.MM"} + d{"E, dd.MM – E, dd.MM"} } MMM{ M{"MMM–MMM"} } MMMEd{ - M{"E, d MMM – E, d MMM"} - d{"E, d MMM – E, d MMM"} + M{"E, d MMM – E, d MMM"} + d{"E, d MMM – E, d MMM"} } MMMd{ - M{"d MMM – d MMM"} + M{"d MMM – d MMM"} d{"d–d MMM"} } Md{ - M{"dd.MM – dd.MM"} - d{"dd.MM – dd.MM"} + M{"dd.MM – dd.MM"} + d{"dd.MM – dd.MM"} } d{ d{"d–d"} } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y"} } yM{ - M{"MM.y – MM.y"} - y{"MM.y – MM.y"} + M{"MM.y – MM.y"} + y{"MM.y – MM.y"} } yMEd{ - M{"E, dd.MM.y – E, dd.MM.y"} - d{"E, dd.MM.y – E, dd.MM.y"} - y{"E, dd.MM.y – E, dd.MM.y"} + M{"E, dd.MM.y – E, dd.MM.y"} + d{"E, dd.MM.y – E, dd.MM.y"} + y{"E, dd.MM.y – E, dd.MM.y"} } yMMM{ M{"MMM–MMM y"} - y{"MMM y – MMM y"} + y{"MMM y – MMM y"} } yMMMEd{ - M{"E, d MMM – E, d MMM y"} - d{"E, d MMM – E, d MMM y"} - y{"E, d MMM y – E, d MMM y"} + M{"E, d MMM – E, d MMM y"} + d{"E, d MMM – E, d MMM y"} + y{"E, d MMM y – E, d MMM y"} } yMMMM{ - M{"MMMM – MMMM y"} - y{"MMMM y – MMMM y"} + M{"MMMM – MMMM y"} + y{"MMMM y – MMMM y"} } yMMMd{ - M{"d MMM – d MMM y"} + M{"d MMM – d MMM y"} d{"d–d MMM y"} - y{"d MMM y – d MMM y"} + y{"d MMM y – d MMM y"} } yMd{ - M{"dd.MM.y – dd.MM.y"} - d{"dd.MM.y – dd.MM.y"} - y{"dd.MM.y – dd.MM.y"} + M{"dd.MM.y – dd.MM.y"} + d{"dd.MM.y – dd.MM.y"} + y{"dd.MM.y – dd.MM.y"} } } monthNames{ diff --git a/icu4c/source/data/locales/rof.txt b/icu4c/source/data/locales/rof.txt index a20635e801ad..978b1f688dd4 100644 --- a/icu4c/source/data/locales/rof.txt +++ b/icu4c/source/data/locales/rof.txt @@ -51,7 +51,7 @@ rof{ MMMd{"MMM d"} Md{"M/d"} d{"d"} - hm{"h:mm a"} + hm{"h:mm a"} ms{"mm:ss"} y{"y"} yM{"M/y"} @@ -109,7 +109,7 @@ rof{ MMMd{"MMM d"} Md{"M/d"} d{"d"} - hm{"h:mm a"} + hm{"h:mm a"} ms{"mm:ss"} y{"y"} yM{"M/y"} diff --git a/icu4c/source/data/locales/root.txt b/icu4c/source/data/locales/root.txt index 314a5e6e0159..34d69089e659 100644 --- a/icu4c/source/data/locales/root.txt +++ b/icu4c/source/data/locales/root.txt @@ -35,6 +35,7 @@ root{ patterns{ accountingFormat:alias{"/LOCALE/NumberElements/arab/patterns/currencyFormat"} currencyFormat{"#,##0.00 ¤"} + currencyFormat%noCurrency{"#,##0.00"} decimalFormat:alias{"/LOCALE/NumberElements/latn/patterns/decimalFormat"} percentFormat{"#,##0%"} scientificFormat:alias{"/LOCALE/NumberElements/latn/patterns/scientificFormat"} @@ -366,6 +367,8 @@ root{ patterns{ accountingFormat:alias{"/LOCALE/NumberElements/latn/patterns/currencyFormat"} currencyFormat{"¤ #,##0.00"} + currencyFormat%noCurrency{"#,##0.00"} + currencyPatternAppendISO{"{0} ¤¤"} decimalFormat{"#,##0.###"} percentFormat{"#,##0%"} scientificFormat{"#E0"} @@ -797,7 +800,7 @@ root{ symbols:alias{"/LOCALE/NumberElements/latn/symbols"} } } - Version{"41"} + Version{"42"} calendar{ buddhist{ AmPmMarkers:alias{"/LOCALE/calendar/gregorian/AmPmMarkers"} diff --git a/icu4c/source/data/locales/ru.txt b/icu4c/source/data/locales/ru.txt index 3b358bc59a6a..60bc0533f8f9 100644 --- a/icu4c/source/data/locales/ru.txt +++ b/icu4c/source/data/locales/ru.txt @@ -366,9 +366,9 @@ ru{ MMMd{"d MMM"} Md{"dd.MM"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"mm:ss"} y{"U"} yyyy{"U"} @@ -675,9 +675,9 @@ ru{ "HH:mm:ss z", "HH:mm:ss", "HH:mm", - "EEEE, d MMMM y 'г'. G", - "d MMMM y 'г'. G", - "d MMM y 'г'. G", + "EEEE, d MMMM y 'г'. G", + "d MMMM y 'г'. G", + "d MMM y 'г'. G", "dd.MM.y G", "{1}, {0}", "{1}, {0}", @@ -705,12 +705,12 @@ ru{ EHm{"ccc HH:mm"} EHms{"ccc HH:mm:ss"} Ed{"E, d"} - Ehm{"ccc, h:mm a"} - Ehms{"ccc, h:mm:ss a"} - Gy{"y 'г'. G"} - GyMMM{"LLL y 'г'. G"} - GyMMMEd{"E, d MMM y 'г'. G"} - GyMMMd{"d MMM y 'г'. G"} + Ehm{"ccc, h:mm a"} + Ehms{"ccc, h:mm:ss a"} + Gy{"y 'г'. G"} + GyMMM{"LLL y 'г'. G"} + GyMMMEd{"E, d MMM y 'г'. G"} + GyMMMd{"d MMM y 'г'. G"} GyMd{"dd.MM.y G"} H{"HH"} Hm{"HH:mm"} @@ -723,21 +723,21 @@ ru{ MMMd{"d MMM"} Md{"dd.MM"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"mm:ss"} - y{"y 'г'. G"} - yyyy{"y 'г'. G"} + y{"y 'г'. G"} + yyyy{"y 'г'. G"} yyyyM{"MM.y G"} yyyyMEd{"E, dd.MM.y G"} - yyyyMMM{"LLL y 'г'. G"} - yyyyMMMEd{"E, d MMM y 'г'. G"} - yyyyMMMM{"LLLL y 'г'. G"} - yyyyMMMd{"d MMM y 'г'. G"} + yyyyMMM{"LLL y 'г'. G"} + yyyyMMMEd{"E, d MMM y 'г'. G"} + yyyyMMMM{"LLLL y 'г'. G"} + yyyyMMMd{"d MMM y 'г'. G"} yyyyMd{"dd.MM.y G"} - yyyyQQQ{"QQQ y 'г'. G"} - yyyyQQQQ{"QQQQ y 'г'. G"} + yyyyQQQ{"QQQ y 'г'. G"} + yyyyQQQQ{"QQQQ y 'г'. G"} } intervalFormats{ Bhm{ @@ -745,8 +745,8 @@ ru{ m{"h:mm – h:mm B"} } Gy{ - G{"y 'г'. G – y 'г'. G"} - y{"y–y 'гг'. G"} + G{"y 'г'. G – y 'г'. G"} + y{"y–y 'гг'. G"} } GyM{ G{"MM.y G – MM.y G"} @@ -760,21 +760,21 @@ ru{ y{"ccc, dd.MM.y – ccc, dd.MM.y G"} } GyMMM{ - G{"LLL y 'г'. G – LLL y 'г'. G"} - M{"LLL – LLL y 'г'. G"} - y{"LLL y – LLL y 'гг'. G"} + G{"LLL y 'г'. G – LLL y 'г'. G"} + M{"LLL – LLL y 'г'. G"} + y{"LLL y – LLL y 'гг'. G"} } GyMMMEd{ - G{"ccc, d MMM y 'г'. G – ccc, d MMM y 'г'. G"} - M{"ccc, d MMM – ccc, d MMM y 'г'. G"} - d{"ccc, d MMM – ccc, d MMM y 'г'. G"} - y{"ccc, d MMM y – ccc, d MMM y 'гг'. G"} + G{"ccc, d MMM y 'г'. G – ccc, d MMM y 'г'. G"} + M{"ccc, d MMM – ccc, d MMM y 'г'. G"} + d{"ccc, d MMM – ccc, d MMM y 'г'. G"} + y{"ccc, d MMM y – ccc, d MMM y 'гг'. G"} } GyMMMd{ - G{"d MMM y 'г'. G – d MMM y 'г'. G"} - M{"d MMM – d MMM y 'г'. G"} - d{"d–d MMM y 'г'. G"} - y{"d MMM y – d MMM y 'гг'. G"} + G{"d MMM y 'г'. G – d MMM y 'г'. G"} + M{"d MMM – d MMM y 'г'. G"} + d{"d–d MMM y 'г'. G"} + y{"d MMM y – d MMM y 'гг'. G"} } GyMd{ G{"dd.MM.y G – dd.MM.y G"} @@ -826,25 +826,25 @@ ru{ } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ - y{"y–y 'гг'. G"} + y{"y–y 'гг'. G"} } yM{ M{"MM.y – MM.y G"} @@ -856,22 +856,22 @@ ru{ y{"ccc, dd.MM.y – ccc, dd.MM.y G"} } yMMM{ - M{"LLL – LLL y 'г'. G"} - y{"LLL y 'г'. – LLL y 'г'. G"} + M{"LLL – LLL y 'г'. G"} + y{"LLL y 'г'. – LLL y 'г'. G"} } yMMMEd{ - M{"ccc, d MMM – ccc, d MMM y 'г'. G"} - d{"ccc, d MMM – ccc, d MMM y 'г'. G"} - y{"ccc, d MMM y 'г'. – ccc, d MMM y 'г'. G"} + M{"ccc, d MMM – ccc, d MMM y 'г'. G"} + d{"ccc, d MMM – ccc, d MMM y 'г'. G"} + y{"ccc, d MMM y 'г'. – ccc, d MMM y 'г'. G"} } yMMMM{ - M{"LLLL – LLLL y 'г'. G"} - y{"LLLL y 'г'. – LLLL y 'г'. G"} + M{"LLLL – LLLL y 'г'. G"} + y{"LLLL y 'г'. – LLLL y 'г'. G"} } yMMMd{ - M{"d MMM – d MMM y 'г'. G"} - d{"d–d MMM y 'г'. G"} - y{"d MMM y 'г'. – d MMM y 'г'. G"} + M{"d MMM – d MMM y 'г'. G"} + d{"d–d MMM y 'г'. G"} + y{"d MMM y 'г'. – d MMM y 'г'. G"} } yMd{ M{"dd.MM.y – dd.MM.y G"} @@ -898,9 +898,9 @@ ru{ "HH:mm:ss z", "HH:mm:ss", "HH:mm", - "EEEE, d MMMM y 'г'.", - "d MMMM y 'г'.", - "d MMM y 'г'.", + "EEEE, d MMMM y 'г'.", + "d MMMM y 'г'.", + "d MMM y 'г'.", "dd.MM.y", "{1}, {0}", "{1}, {0}", @@ -931,12 +931,12 @@ ru{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"ccc, d"} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} - Gy{"y 'г'. G"} - GyMMM{"LLL y 'г'. G"} - GyMMMEd{"E, d MMM y 'г'. G"} - GyMMMd{"d MMM y 'г'. G"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} + Gy{"y 'г'. G"} + GyMMM{"LLL y 'г'. G"} + GyMMMEd{"E, d MMM y 'г'. G"} + GyMMMd{"d MMM y 'г'. G"} GyMd{"dd.MM.y GGGGG"} H{"HH"} Hm{"HH:mm"} @@ -958,23 +958,23 @@ ru{ MMdd{"dd.MM"} Md{"dd.MM"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} - hmsv{"h:mm:ss a v"} - hmv{"h:mm a v"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} + hmsv{"h:mm:ss a v"} + hmv{"h:mm a v"} ms{"mm:ss"} y{"y"} yM{"MM.y"} - yMEd{"ccc, dd.MM.y 'г'."} + yMEd{"ccc, dd.MM.y 'г'."} yMM{"MM.y"} - yMMM{"LLL y 'г'."} - yMMMEd{"E, d MMM y 'г'."} - yMMMM{"LLLL y 'г'."} - yMMMd{"d MMM y 'г'."} + yMMM{"LLL y 'г'."} + yMMMEd{"E, d MMM y 'г'."} + yMMMM{"LLLL y 'г'."} + yMMMd{"d MMM y 'г'."} yMd{"dd.MM.y"} - yQQQ{"QQQ y 'г'."} - yQQQQ{"QQQQ y 'г'."} + yQQQ{"QQQ y 'г'."} + yQQQQ{"QQQQ y 'г'."} yw{ few{"w-'я' 'неделя' Y 'г'."} many{"w-'я' 'неделя' Y 'г'."} @@ -1143,8 +1143,8 @@ ru{ m{"h:mm – h:mm B"} } Gy{ - G{"y 'г'. G – y 'г'. G"} - y{"y–y 'гг'. G"} + G{"y 'г'. G – y 'г'. G"} + y{"y–y 'гг'. G"} } GyM{ G{"MM.y G – MM.y G"} @@ -1158,21 +1158,21 @@ ru{ y{"ccc, dd.MM.y – ccc, dd.MM.y G"} } GyMMM{ - G{"LLL y 'г'. G – LLL y 'г'. G"} - M{"LLL – LLL y 'г'. G"} - y{"LLL y – LLL y 'гг'. G"} + G{"LLL y 'г'. G – LLL y 'г'. G"} + M{"LLL – LLL y 'г'. G"} + y{"LLL y – LLL y 'гг'. G"} } GyMMMEd{ - G{"ccc, d MMM y 'г'. G – ccc, d MMM y 'г'. G"} - M{"ccc, d MMM – ccc, d MMM y 'г'. G"} - d{"ccc, d MMM – ccc, d MMM y 'г'. G"} - y{"ccc, d MMM y – ccc, d MMM y 'гг'. G"} + G{"ccc, d MMM y 'г'. G – ccc, d MMM y 'г'. G"} + M{"ccc, d MMM – ccc, d MMM y 'г'. G"} + d{"ccc, d MMM – ccc, d MMM y 'г'. G"} + y{"ccc, d MMM y – ccc, d MMM y 'гг'. G"} } GyMMMd{ - G{"d MMM y 'г'. G – d MMM y 'г'. G"} - M{"d MMM – d MMM y 'г'. G"} - d{"d–d MMM y 'г'. G"} - y{"d MMM y – d MMM y 'гг'. G"} + G{"d MMM y 'г'. G – d MMM y 'г'. G"} + M{"d MMM – d MMM y 'г'. G"} + d{"d–d MMM y 'г'. G"} + y{"d MMM y – d MMM y 'гг'. G"} } GyMd{ G{"dd.MM.y G – dd.MM.y G"} @@ -1224,22 +1224,22 @@ ru{ } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y"} @@ -1254,22 +1254,22 @@ ru{ y{"ccc, dd.MM.y – ccc, dd.MM.y"} } yMMM{ - M{"LLL – LLL y 'г'."} - y{"LLL y 'г'. – LLL y 'г'."} + M{"LLL – LLL y 'г'."} + y{"LLL y 'г'. – LLL y 'г'."} } yMMMEd{ - M{"ccc, d MMM – ccc, d MMM y 'г'."} - d{"ccc, d – ccc, d MMM y 'г'."} - y{"ccc, d MMM y 'г'. – ccc, d MMM y 'г'."} + M{"ccc, d MMM – ccc, d MMM y 'г'."} + d{"ccc, d – ccc, d MMM y 'г'."} + y{"ccc, d MMM y 'г'. – ccc, d MMM y 'г'."} } yMMMM{ - M{"LLLL – LLLL y 'г'."} - y{"LLLL y 'г'. – LLLL y 'г'."} + M{"LLLL – LLLL y 'г'."} + y{"LLLL y 'г'. – LLLL y 'г'."} } yMMMd{ - M{"d MMM – d MMM y 'г'."} - d{"d–d MMM y 'г'."} - y{"d MMM y 'г'. – d MMM y 'г'."} + M{"d MMM – d MMM y 'г'."} + d{"d–d MMM y 'г'."} + y{"d MMM y 'г'. – d MMM y 'г'."} } yMd{ M{"dd.MM.y – dd.MM.y"} diff --git a/icu4c/source/data/locales/rw.txt b/icu4c/source/data/locales/rw.txt index bb14997bafc3..c87e07dec1a4 100644 --- a/icu4c/source/data/locales/rw.txt +++ b/icu4c/source/data/locales/rw.txt @@ -107,8 +107,8 @@ rw{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"d, E"} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"G y"} GyMMM{"G y MMM"} GyMMMEd{"G y MMM d, E"} @@ -129,11 +129,11 @@ rw{ MMMd{"MMM d"} Md{"MM-dd"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} - hmsv{"h:mm:ss a v"} - hmv{"h:mm a v"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} + hmsv{"h:mm:ss a v"} + hmv{"h:mm a v"} ms{"mm:ss"} y{"y"} yM{"y-MM"} @@ -272,80 +272,80 @@ rw{ M{"MM–MM"} } MEd{ - M{"MM-dd, E – MM-dd, E"} - d{"MM-dd, E – MM-dd, E"} + M{"MM-dd, E – MM-dd, E"} + d{"MM-dd, E – MM-dd, E"} } MMM{ M{"LLL–LLL"} } MMMEd{ - M{"MMM d, E – MMM d, E"} - d{"MMM d, E – MMM d, E"} + M{"MMM d, E – MMM d, E"} + d{"MMM d, E – MMM d, E"} } MMMd{ - M{"MMM d – MMM d"} + M{"MMM d – MMM d"} d{"MMM d–d"} } Md{ - M{"MM-dd – MM-dd"} - d{"MM-dd – MM-dd"} + M{"MM-dd – MM-dd"} + d{"MM-dd – MM-dd"} } d{ d{"d–d"} } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y"} } yM{ - M{"y-MM – y-MM"} - y{"y-MM – y-MM"} + M{"y-MM – y-MM"} + y{"y-MM – y-MM"} } yMEd{ - M{"y-MM-dd, E – y-MM-dd, E"} - d{"y-MM-dd, E – y-MM-dd, E"} - y{"y-MM-dd, E – y-MM-dd, E"} + M{"y-MM-dd, E – y-MM-dd, E"} + d{"y-MM-dd, E – y-MM-dd, E"} + y{"y-MM-dd, E – y-MM-dd, E"} } yMMM{ M{"y MMM–MMM"} - y{"y MMM – y MMM"} + y{"y MMM – y MMM"} } yMMMEd{ - M{"y MMM d, E – MMM d, E"} - d{"y MMM d, E – MMM d, E"} - y{"y MMM d, E – y MMM d, E"} + M{"y MMM d, E – MMM d, E"} + d{"y MMM d, E – MMM d, E"} + y{"y MMM d, E – y MMM d, E"} } yMMMM{ M{"y MMMM–MMMM"} - y{"y MMMM – y MMMM"} + y{"y MMMM – y MMMM"} } yMMMd{ - M{"y MMM d – MMM d"} + M{"y MMM d – MMM d"} d{"y MMM d–d"} - y{"y MMM d – y MMM d"} + y{"y MMM d – y MMM d"} } yMd{ - M{"y-MM-dd – y-MM-dd"} - d{"y-MM-dd – y-MM-dd"} - y{"y-MM-dd – y-MM-dd"} + M{"y-MM-dd – y-MM-dd"} + d{"y-MM-dd – y-MM-dd"} + y{"y-MM-dd – y-MM-dd"} } } monthNames{ diff --git a/icu4c/source/data/locales/rwk.txt b/icu4c/source/data/locales/rwk.txt index 173f581d6d80..a7df07b5d7b7 100644 --- a/icu4c/source/data/locales/rwk.txt +++ b/icu4c/source/data/locales/rwk.txt @@ -51,7 +51,7 @@ rwk{ MMMd{"MMM d"} Md{"M/d"} d{"d"} - hm{"h:mm a"} + hm{"h:mm a"} ms{"mm:ss"} y{"y"} yM{"M/y"} @@ -109,7 +109,7 @@ rwk{ MMMd{"MMM d"} Md{"M/d"} d{"d"} - hm{"h:mm a"} + hm{"h:mm a"} ms{"mm:ss"} y{"y"} yM{"M/y"} diff --git a/icu4c/source/data/locales/sa.txt b/icu4c/source/data/locales/sa.txt index 36263aa1f64f..08d74101ae25 100644 --- a/icu4c/source/data/locales/sa.txt +++ b/icu4c/source/data/locales/sa.txt @@ -59,6 +59,12 @@ sa{ "G d MMM y", "G d/M/y", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{1} तेन {0}", "{1} तेन {0}", "{1}, {0}", @@ -101,6 +107,12 @@ sa{ "d MMM y", "d/M/yy", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{1} तदा {0}", "{1} तदा {0}", "{1}, {0}", diff --git a/icu4c/source/data/locales/sah.txt b/icu4c/source/data/locales/sah.txt index 929ced50888f..124d48ad32a8 100644 --- a/icu4c/source/data/locales/sah.txt +++ b/icu4c/source/data/locales/sah.txt @@ -172,7 +172,7 @@ sah{ "HH:mm:ss z", "HH:mm:ss", "HH:mm", - "G y 'сыл' MMMM d 'күнэ', EEEE", + "G y 'сыл' MMMM d 'күнэ', EEEE", "G y, MMMM d", "G y, MMM d", "GGGGG yy/M/d", @@ -211,7 +211,7 @@ sah{ "HH:mm:ss z", "HH:mm:ss", "HH:mm", - "y 'сыл' MMMM d 'күнэ', EEEE", + "y 'сыл' MMMM d 'күнэ', EEEE", "y, MMMM d", "y, MMM d", "yy/M/d", @@ -239,9 +239,9 @@ sah{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"d, E"} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} - Gy{"y 'с'. G"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} + Gy{"y 'с'. G"} GyMMM{"G y MMM"} GyMMMEd{"G y MMM d, E"} GyMMMd{"G y MMM d"} @@ -261,11 +261,11 @@ sah{ MMMd{"MMM d"} Md{"MM-dd"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} - hmsv{"h:mm:ss a v"} - hmv{"h:mm a v"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} + hmsv{"h:mm:ss a v"} + hmv{"h:mm a v"} ms{"mm:ss"} y{"y"} yM{"y-MM"} @@ -435,22 +435,22 @@ sah{ } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y"} diff --git a/icu4c/source/data/locales/saq.txt b/icu4c/source/data/locales/saq.txt index 18fd0d4d4ec3..269d39a1f71e 100644 --- a/icu4c/source/data/locales/saq.txt +++ b/icu4c/source/data/locales/saq.txt @@ -52,7 +52,7 @@ saq{ MMMd{"MMM d"} Md{"M/d"} d{"d"} - hm{"h:mm a"} + hm{"h:mm a"} ms{"mm:ss"} y{"y"} yM{"M/y"} @@ -110,7 +110,7 @@ saq{ MMMd{"MMM d"} Md{"M/d"} d{"d"} - hm{"h:mm a"} + hm{"h:mm a"} ms{"mm:ss"} y{"y"} yM{"M/y"} diff --git a/icu4c/source/data/locales/sbp.txt b/icu4c/source/data/locales/sbp.txt index 2f1313d01da5..bfea4665981f 100644 --- a/icu4c/source/data/locales/sbp.txt +++ b/icu4c/source/data/locales/sbp.txt @@ -57,8 +57,8 @@ sbp{ MMMd{"MMM d"} Md{"M/d"} d{"d"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"m:ss"} y{"y"} yM{"M/y"} @@ -116,8 +116,8 @@ sbp{ MMMd{"MMM d"} Md{"M/d"} d{"d"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"m:ss"} y{"y"} yM{"M/y"} diff --git a/icu4c/source/data/locales/sc.txt b/icu4c/source/data/locales/sc.txt index efeef79c4af8..8d5db69f1de8 100644 --- a/icu4c/source/data/locales/sc.txt +++ b/icu4c/source/data/locales/sc.txt @@ -212,6 +212,12 @@ sc{ "dd MMM r", "dd-MM-r", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{1} 'a' 'sas' {0}", "{1} 'a' 'sas' {0}", "{1}, {0}", @@ -382,55 +388,55 @@ sc{ } intervalFormats{ MEd{ - M{"E dd/MM – E dd/MM"} - d{"E dd/MM – E dd/MM"} + M{"E dd/MM – E dd/MM"} + d{"E dd/MM – E dd/MM"} } MMM{ - M{"MMM – MMM"} + M{"MMM – MMM"} } MMMEd{ - M{"E dd MMM – E dd MMM"} - d{"E dd – E dd MMM"} + M{"E dd MMM – E dd MMM"} + d{"E dd – E dd MMM"} } MMMd{ - M{"dd MMM – dd MMM"} + M{"dd MMM – dd MMM"} d{"dd–dd MMM"} } Md{ - M{"dd/MM – dd/MM"} - d{"dd/MM – dd/MM"} + M{"dd/MM – dd/MM"} + d{"dd/MM – dd/MM"} } yM{ - M{"MM/y – MM/y"} - y{"MM/y – MM/y"} + M{"MM/y – MM/y"} + y{"MM/y – MM/y"} } yMEd{ - M{"E dd/MM/y – E dd/MM/y"} - d{"E dd/MM/y – E dd/MM/y"} - y{"E dd/MM/y – E dd/MM/y"} + M{"E dd/MM/y – E dd/MM/y"} + d{"E dd/MM/y – E dd/MM/y"} + y{"E dd/MM/y – E dd/MM/y"} } yMMM{ M{"MMM–MMM U"} - y{"MMM U – MMM U"} + y{"MMM U – MMM U"} } yMMMEd{ - M{"E d MMM – E d MMM U"} - d{"E d MMM – E d MMM U"} - y{"E d MMM U – E d MMM U"} + M{"E d MMM – E d MMM U"} + d{"E d MMM – E d MMM U"} + y{"E d MMM U – E d MMM U"} } yMMMM{ M{"MMMM–MMMM 'de' 'su' U"} - y{"MMMM 'de' 'su' U – MMMM 'de' 'su' U"} + y{"MMMM 'de' 'su' U – MMMM 'de' 'su' U"} } yMMMd{ - M{"dd MMM – dd MMM U"} + M{"dd MMM – dd MMM U"} d{"dd–dd MMM U"} - y{"dd MMM U – dd MMM U"} + y{"dd MMM U – dd MMM U"} } yMd{ - M{"dd/MM/y – dd/MM/y"} - d{"dd/MM/y – dd/MM/y"} - y{"dd/MM/y – dd/MM/y"} + M{"dd/MM/y – dd/MM/y"} + d{"dd/MM/y – dd/MM/y"} + y{"dd/MM/y – dd/MM/y"} } } monthNames{ @@ -774,6 +780,12 @@ sc{ "dd MMM y G", "dd/MM/y GGGGG", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{1} 'a' 'sas' {0}", "{1} 'a' 'sas' {0}", "{1}, {0}", @@ -791,9 +803,9 @@ sc{ MMMMd{"d MMMM"} MMMd{"d MMM"} Md{"d/M"} - h{"hh a"} - hm{"hh:mm a"} - hms{"hh:mm:ss a"} + h{"hh a"} + hm{"hh:mm a"} + hms{"hh:mm:ss a"} y{"y G"} yyyy{"y G"} yyyyM{"M/y GGGGG"} @@ -808,95 +820,95 @@ sc{ } intervalFormats{ GyM{ - G{"M/y GGGGG – M/y GGGGG"} - M{"M/y – M/y GGGGG"} - y{"M/y – M/y GGGGG"} + G{"M/y GGGGG – M/y GGGGG"} + M{"M/y – M/y GGGGG"} + y{"M/y – M/y GGGGG"} } GyMEd{ - G{"E d/M/y GGGGG – E d/M/y GGGGG"} - M{"E d/M/y – E d/M/y GGGGG"} - d{"E d/M/y – E d/M/y GGGGG"} - y{"E d/M/y – E d/M/y GGGGG"} + G{"E d/M/y GGGGG – E d/M/y GGGGG"} + M{"E d/M/y – E d/M/y GGGGG"} + d{"E d/M/y – E d/M/y GGGGG"} + y{"E d/M/y – E d/M/y GGGGG"} } GyMMM{ - G{"MMM y G – MMM y G"} - M{"MMM – MMM y G"} - y{"MMM y – MMM y G"} + G{"MMM y G – MMM y G"} + M{"MMM – MMM y G"} + y{"MMM y – MMM y G"} } GyMMMEd{ - G{"E d MMM y G – E d MMM y G"} - M{"E d MMM – E d MMM y G"} - d{"E d MMM – E d MMM y G"} - y{"E d MMM y – E d MMM y G"} + G{"E d MMM y G – E d MMM y G"} + M{"E d MMM – E d MMM y G"} + d{"E d MMM – E d MMM y G"} + y{"E d MMM y – E d MMM y G"} } GyMMMd{ - G{"d MMM y G – d MMM y G"} - M{"d MMM – d MMM y G"} + G{"d MMM y G – d MMM y G"} + M{"d MMM – d MMM y G"} d{"d–d MMM y G"} - y{"d MMM y – d MMM y G"} + y{"d MMM y – d MMM y G"} } GyMd{ - G{"d/M/y GGGGG – d/M/y GGGGG"} - M{"d/M/y – d/M/y GGGGG"} - d{"d/M/y – d/M/y GGGGG"} - y{"d/M/y – d/M/y GGGGG"} + G{"d/M/y GGGGG – d/M/y GGGGG"} + M{"d/M/y – d/M/y GGGGG"} + d{"d/M/y – d/M/y GGGGG"} + y{"d/M/y – d/M/y GGGGG"} } M{ M{"M–M"} } MEd{ - M{"E dd/MM – E dd/MM"} - d{"E dd/MM – E dd/MM"} + M{"E dd/MM – E dd/MM"} + d{"E dd/MM – E dd/MM"} } MMM{ M{"MMM–MMM"} } MMMEd{ - M{"E dd MMM – E dd MMM"} - d{"E dd – E dd MMM"} + M{"E dd MMM – E dd MMM"} + d{"E dd – E dd MMM"} } MMMd{ - M{"dd MMM – dd MMM"} + M{"dd MMM – dd MMM"} d{"dd–dd MMM"} } Md{ - M{"dd/MM – dd/MM"} - d{"dd/MM – dd/MM"} + M{"dd/MM – dd/MM"} + d{"dd/MM – dd/MM"} } y{ y{"y–y G"} } yM{ - M{"MM/y – MM/y GGGGG"} - y{"MM/y – MM/y GGGGG"} + M{"MM/y – MM/y GGGGG"} + y{"MM/y – MM/y GGGGG"} } yMEd{ - M{"E dd/MM/y – E dd/MM/y GGGGG"} - d{"E dd/MM/y – E dd/MM/y GGGGG"} - y{"E dd/MM/y – E dd/MM/y GGGGG"} + M{"E dd/MM/y – E dd/MM/y GGGGG"} + d{"E dd/MM/y – E dd/MM/y GGGGG"} + y{"E dd/MM/y – E dd/MM/y GGGGG"} } yMMM{ M{"MMM–MMM y G"} - y{"MMM y – MMM y G"} + y{"MMM y – MMM y G"} } yMMMEd{ - M{"E d MMM – E d MMM y G"} - d{"E d – E d MMM y G"} - y{"E d MMM y – E d MMM y G"} + M{"E d MMM – E d MMM y G"} + d{"E d – E d MMM y G"} + y{"E d MMM y – E d MMM y G"} } yMMMM{ M{"MMMM–MMMM y G"} - y{"MMMM y – MMMM y G"} + y{"MMMM y – MMMM y G"} } yMMMd{ - M{"dd MMM – dd MMM y G"} + M{"dd MMM – dd MMM y G"} d{"dd–dd MMM y G"} - y{"dd MMM y – dd MMM y G"} + y{"dd MMM y – dd MMM y G"} } yMd{ - M{"dd/MM/y – dd/MM/y GGGGG"} - d{"dd/MM/y – dd/MM/y GGGGG"} - y{"dd/MM/y – dd/MM/y GGGGG"} + M{"dd/MM/y – dd/MM/y GGGGG"} + d{"dd/MM/y – dd/MM/y GGGGG"} + y{"dd/MM/y – dd/MM/y GGGGG"} } } } @@ -923,6 +935,12 @@ sc{ "d 'de' MMM y", "dd/MM/y", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{1} 'a' 'sas' {0}", "{1} 'a' 'sas' {0}", "{1}, {0}", @@ -1072,96 +1090,96 @@ sc{ } intervalFormats{ Gy{ - G{"y G – y G"} - y{"y – y G"} + G{"y G – y G"} + y{"y – y G"} } GyM{ - G{"M/y GGGGG – M/y GGGGG"} - M{"M/y – M/y GGGGG"} - y{"M/y – M/y GGGGG"} + G{"M/y GGGGG – M/y GGGGG"} + M{"M/y – M/y GGGGG"} + y{"M/y – M/y GGGGG"} } GyMEd{ - G{"E d/M/y GGGGG – E d/M/y GGGGG"} - M{"E d/M/y – E d/M/y GGGGG"} - d{"E d/M/y – E d/M/y GGGGG"} - y{"E d/M/y – E d/M/y GGGGG"} + G{"E d/M/y GGGGG – E d/M/y GGGGG"} + M{"E d/M/y – E d/M/y GGGGG"} + d{"E d/M/y – E d/M/y GGGGG"} + y{"E d/M/y – E d/M/y GGGGG"} } GyMMM{ - G{"MMM y G – MMM y G"} - M{"MMM – MMM y G"} - y{"MMM y – MMM y G"} + G{"MMM y G – MMM y G"} + M{"MMM – MMM y G"} + y{"MMM y – MMM y G"} } GyMMMEd{ - G{"E d MMM y G – E d MMM y G"} - M{"E d MMM – E d MMM y G"} - d{"E d MMM – E d MMM y G"} - y{"E d MMM y – E d MMM y G"} + G{"E d MMM y G – E d MMM y G"} + M{"E d MMM – E d MMM y G"} + d{"E d MMM – E d MMM y G"} + y{"E d MMM y – E d MMM y G"} } GyMMMd{ - G{"d MMM y G – d MMM y G"} - M{"d MMM – d MMM y G"} - d{"d – d MMM y G"} - y{"d MMM y – d MMM y G"} + G{"d MMM y G – d MMM y G"} + M{"d MMM – d MMM y G"} + d{"d – d MMM y G"} + y{"d MMM y – d MMM y G"} } GyMd{ - G{"d/M/y GGGGG – d/M/y GGGGG"} - M{"d/M/y – d/M/y GGGGG"} - d{"d/M/y – d/M/y GGGGG"} - y{"d/M/y – d/M/y GGGGG"} + G{"d/M/y GGGGG – d/M/y GGGGG"} + M{"d/M/y – d/M/y GGGGG"} + d{"d/M/y – d/M/y GGGGG"} + y{"d/M/y – d/M/y GGGGG"} } M{ M{"M–M"} } MEd{ - M{"E dd/MM – E dd/MM"} - d{"E dd/MM – E dd/MM"} + M{"E dd/MM – E dd/MM"} + d{"E dd/MM – E dd/MM"} } MMM{ M{"MMM–MMM"} } MMMEd{ - M{"E dd MMM – E dd MMM"} - d{"E dd – E dd MMM"} + M{"E dd MMM – E dd MMM"} + d{"E dd – E dd MMM"} } MMMd{ - M{"dd MMM – dd MMM"} + M{"dd MMM – dd MMM"} d{"dd–dd MMM"} } Md{ - M{"dd/MM – dd/MM"} - d{"dd/MM – dd/MM"} + M{"dd/MM – dd/MM"} + d{"dd/MM – dd/MM"} } yM{ - M{"MM/y – MM/y"} - y{"MM/y – MM/y"} + M{"MM/y – MM/y"} + y{"MM/y – MM/y"} } yMEd{ - M{"E dd/MM/y – E dd/MM/y"} - d{"E dd/MM/y – E dd/MM/y"} - y{"E dd/MM/y – E dd/MM/y"} + M{"E dd/MM/y – E dd/MM/y"} + d{"E dd/MM/y – E dd/MM/y"} + y{"E dd/MM/y – E dd/MM/y"} } yMMM{ M{"MMM–MMM y"} - y{"MMM y – MMM y"} + y{"MMM y – MMM y"} } yMMMEd{ - M{"E d MMM – E d MMM y"} - d{"E d MMM – E d MMM y"} - y{"E d MMM y – E d MMM y"} + M{"E d MMM – E d MMM y"} + d{"E d MMM – E d MMM y"} + y{"E d MMM y – E d MMM y"} } yMMMM{ M{"MMMM–MMMM 'de' 'su' y"} - y{"MMMM 'de' 'su' y – MMMM 'de' 'su' y"} + y{"MMMM 'de' 'su' y – MMMM 'de' 'su' y"} } yMMMd{ - M{"dd MMM – dd MMM y"} + M{"dd MMM – dd MMM y"} d{"dd–dd MMM y"} - y{"dd MMM y – dd MMM y"} + y{"dd MMM y – dd MMM y"} } yMd{ - M{"dd/MM/y – dd/MM/y"} - d{"dd/MM/y – dd/MM/y"} - y{"dd/MM/y – dd/MM/y"} + M{"dd/MM/y – dd/MM/y"} + d{"dd/MM/y – dd/MM/y"} + y{"dd/MM/y – dd/MM/y"} } } monthNames{ diff --git a/icu4c/source/data/locales/sd_Deva.txt b/icu4c/source/data/locales/sd_Deva.txt index 2b6550af33a5..7516a5e8f02b 100644 --- a/icu4c/source/data/locales/sd_Deva.txt +++ b/icu4c/source/data/locales/sd_Deva.txt @@ -30,6 +30,12 @@ sd_Deva{ "MMM d, y G", "M/d/y GGGGG", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{1} ते {0}", "{1} ते {0}", "{1}, {0}", @@ -64,6 +70,12 @@ sd_Deva{ "MMM d, y", "M/d/yy", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{1} ते {0}", "{1} ते {0}", "{1}, {0}", diff --git a/icu4c/source/data/locales/se.txt b/icu4c/source/data/locales/se.txt index 4d565e9d77e3..0c2c87486fcb 100644 --- a/icu4c/source/data/locales/se.txt +++ b/icu4c/source/data/locales/se.txt @@ -214,8 +214,8 @@ se{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"d, E"} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"G y"} GyMMM{"G y MMM"} GyMMMEd{"G y MMM d, E"} @@ -233,11 +233,11 @@ se{ MMMd{"MMM d"} Md{"MM-dd"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} - hmsv{"h:mm:ss a v"} - hmv{"h:mm a v"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} + hmsv{"h:mm:ss a v"} + hmv{"h:mm a v"} ms{"mm:ss"} y{"y"} yM{"y-MM"} @@ -381,80 +381,80 @@ se{ M{"MM–MM"} } MEd{ - M{"MM-dd, E – MM-dd, E"} - d{"MM-dd, E – MM-dd, E"} + M{"MM-dd, E – MM-dd, E"} + d{"MM-dd, E – MM-dd, E"} } MMM{ M{"LLL–LLL"} } MMMEd{ - M{"MMM d, E – MMM d, E"} - d{"MMM d, E – MMM d, E"} + M{"MMM d, E – MMM d, E"} + d{"MMM d, E – MMM d, E"} } MMMd{ - M{"MMM d – MMM d"} + M{"MMM d – MMM d"} d{"MMM d–d"} } Md{ - M{"MM-dd – MM-dd"} - d{"MM-dd – MM-dd"} + M{"MM-dd – MM-dd"} + d{"MM-dd – MM-dd"} } d{ d{"d–d"} } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y"} } yM{ - M{"y-MM – y-MM"} - y{"y-MM – y-MM"} + M{"y-MM – y-MM"} + y{"y-MM – y-MM"} } yMEd{ - M{"y-MM-dd, E – y-MM-dd, E"} - d{"y-MM-dd, E – y-MM-dd, E"} - y{"y-MM-dd, E – y-MM-dd, E"} + M{"y-MM-dd, E – y-MM-dd, E"} + d{"y-MM-dd, E – y-MM-dd, E"} + y{"y-MM-dd, E – y-MM-dd, E"} } yMMM{ M{"y MMM–MMM"} - y{"y MMM – y MMM"} + y{"y MMM – y MMM"} } yMMMEd{ - M{"y MMM d, E – MMM d, E"} - d{"y MMM d, E – MMM d, E"} - y{"y MMM d, E – y MMM d, E"} + M{"y MMM d, E – MMM d, E"} + d{"y MMM d, E – MMM d, E"} + y{"y MMM d, E – y MMM d, E"} } yMMMM{ M{"y MMMM–MMMM"} - y{"y MMMM – y MMMM"} + y{"y MMMM – y MMMM"} } yMMMd{ - M{"y MMM d – MMM d"} + M{"y MMM d – MMM d"} d{"y MMM d–d"} - y{"y MMM d – y MMM d"} + y{"y MMM d – y MMM d"} } yMd{ - M{"y-MM-dd – y-MM-dd"} - d{"y-MM-dd – y-MM-dd"} - y{"y-MM-dd – y-MM-dd"} + M{"y-MM-dd – y-MM-dd"} + d{"y-MM-dd – y-MM-dd"} + y{"y-MM-dd – y-MM-dd"} } } monthNames{ diff --git a/icu4c/source/data/locales/se_FI.txt b/icu4c/source/data/locales/se_FI.txt index 3e4ae270a6ba..9fd43333de09 100644 --- a/icu4c/source/data/locales/se_FI.txt +++ b/icu4c/source/data/locales/se_FI.txt @@ -115,57 +115,57 @@ se_FI{ } intervalFormats{ M{ - M{"M – M"} + M{"M – M"} } MEd{ - M{"E d.M – E d.M"} - d{"E d.M – E d.M"} + M{"E d.M – E d.M"} + d{"E d.M – E d.M"} } MMM{ - M{"MMM – MMM"} + M{"MMM – MMM"} } MMMEd{ - M{"E d MMM – E d MMM"} - d{"E d MMM – E d MMM"} + M{"E d MMM – E d MMM"} + d{"E d MMM – E d MMM"} } MMMd{ - M{"d MMM – d MMM"} + M{"d MMM – d MMM"} d{"d–d MMM"} } Md{ - M{"d.M – d.M"} + M{"d.M – d.M"} d{"d.M –d.M"} } y{ y{"y–y G"} } yM{ - M{"M.y – M.y GGGG"} - y{"M.y – M.y GGGG"} + M{"M.y – M.y GGGG"} + y{"M.y – M.y GGGG"} } yMEd{ - M{"E d.M.y – E.d.M.y GGGG"} - d{"E d.M.y – E d.M.y GGGG"} - y{"E d.M.y – E d.M.y GGGG"} + M{"E d.M.y – E.d.M.y GGGG"} + d{"E d.M.y – E d.M.y GGGG"} + y{"E d.M.y – E d.M.y GGGG"} } yMMMEd{ - M{"E d MMM y – E d MMM y G"} - d{"E d MMM y – E d MMM y G"} - y{"E d MMM y – E d MMM y G"} + M{"E d MMM y – E d MMM y G"} + d{"E d MMM y – E d MMM y G"} + y{"E d MMM y – E d MMM y G"} } yMMMM{ - M{"MMMM – MMMM y G"} - y{"MMMM y – MMMM y G"} + M{"MMMM – MMMM y G"} + y{"MMMM y – MMMM y G"} } yMMMd{ - M{"d.MMM – d.MMM y G"} + M{"d.MMM – d.MMM y G"} d{"d–d.MMM y G"} - y{"d MMM y – d MMM y G"} + y{"d MMM y – d MMM y G"} } yMd{ - M{"d.M.y – d.M.y GGGG"} - d{"d.M.y – d.M.y GGGG"} - y{"d.M.y – d.M.y GGGG"} + M{"d.M.y – d.M.y GGGG"} + d{"d.M.y – d.M.y GGGG"} + y{"d.M.y – d.M.y GGGG"} } } } @@ -360,35 +360,35 @@ se_FI{ } yM{ M{"M.y–M.y"} - y{"M.y – M.y"} + y{"M.y – M.y"} } yMEd{ - M{"E d.M.y – E d.M.y"} - d{"E d.M.y – E d.M.y"} - y{"E d.M.y – E d.M.y"} + M{"E d.M.y – E d.M.y"} + d{"E d.M.y – E d.M.y"} + y{"E d.M.y – E d.M.y"} } yMMM{ - M{"MMM – MMM y"} - y{"MMM y – MMM y"} + M{"MMM – MMM y"} + y{"MMM y – MMM y"} } yMMMEd{ - M{"E d MMM – E d MMM y"} - d{"E d MMM – E d MMM y"} - y{"E d MMM y – E d MMM y"} + M{"E d MMM – E d MMM y"} + d{"E d MMM – E d MMM y"} + y{"E d MMM y – E d MMM y"} } yMMMM{ - M{"MMMM – MMMM y"} - y{"MMMM y – MMMM y"} + M{"MMMM – MMMM y"} + y{"MMMM y – MMMM y"} } yMMMd{ - M{"d MMM – d MMM y"} + M{"d MMM – d MMM y"} d{"d–d MMM y"} - y{"d MMM y – d MMM y"} + y{"d MMM y – d MMM y"} } yMd{ - M{"d.M.y – d.M.y"} - d{"d.M.y – d.M.y"} - y{"d.M.y – d.M.y"} + M{"d.M.y – d.M.y"} + d{"d.M.y – d.M.y"} + y{"d.M.y – d.M.y"} } } monthNames{ diff --git a/icu4c/source/data/locales/sk.txt b/icu4c/source/data/locales/sk.txt index f5b71bce0047..dc0c18015eb4 100644 --- a/icu4c/source/data/locales/sk.txt +++ b/icu4c/source/data/locales/sk.txt @@ -518,8 +518,8 @@ sk{ EHm{"E H:mm"} EHms{"E H:mm:ss"} Ed{"E d."} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"y G"} GyMMM{"LLL y G"} GyMMMEd{"E d. M. y G"} @@ -537,9 +537,9 @@ sk{ MMMd{"d. M."} Md{"d. M."} d{"d."} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} mmss{"mm:ss"} ms{"mm:ss"} y{"y G"} @@ -557,63 +557,63 @@ sk{ } intervalFormats{ Bh{ - h{"h – h B"} + h{"h – h B"} } Bhm{ - h{"h:mm – h:mm B"} - m{"h:mm – h:mm B"} + h{"h:mm – h:mm B"} + m{"h:mm – h:mm B"} } Gy{ - G{"y G – y G"} - y{"y – y G"} + G{"y G – y G"} + y{"y – y G"} } GyM{ - G{"M/y GGGGG – M/y GGGGG"} - M{"M/y – M/y GGGGG"} - y{"M/y – M/y GGGGG"} + G{"M/y GGGGG – M/y GGGGG"} + M{"M/y – M/y GGGGG"} + y{"M/y – M/y GGGGG"} } GyMEd{ - G{"E d. M. y GGGGG – E d. M. y GGGGG"} - M{"E d. M. y – E d. M. y GGGGG"} - d{"E d. M. y – E d. M. y GGGGG"} - y{"E d. M. y – E d. M. y GGGGG"} + G{"E d. M. y GGGGG – E d. M. y GGGGG"} + M{"E d. M. y – E d. M. y GGGGG"} + d{"E d. M. y – E d. M. y GGGGG"} + y{"E d. M. y – E d. M. y GGGGG"} } GyMMM{ - G{"LLL y G – LLL y G"} - M{"LLL – LLL y G"} - y{"LLL y – LLL y G"} + G{"LLL y G – LLL y G"} + M{"LLL – LLL y G"} + y{"LLL y – LLL y G"} } GyMMMEd{ - G{"E d. M. y G – E d. M. y G"} + G{"E d. M. y G – E d. M. y G"} M{"E d. M. – E d. M. y G"} d{"E d. M. – E d. M. y G"} - y{"E d. M. y – E d. M. y G"} + y{"E d. M. y – E d. M. y G"} } GyMMMd{ - G{"d. M. y G – d. M. y G"} + G{"d. M. y G – d. M. y G"} M{"d. M. – d. M. y G"} d{"d. – d. M. y G"} - y{"d. M. y – d. M. y G"} + y{"d. M. y – d. M. y G"} } GyMd{ - G{"d. M. y GGGGG – d. M. y GGGGG"} - M{"d. M. y – d. M. y GGGGG"} - d{"d. M. y – d. M. y GGGGG"} - y{"d. M. y – d. M. y GGGGG"} + G{"d. M. y GGGGG – d. M. y GGGGG"} + M{"d. M. y – d. M. y GGGGG"} + d{"d. M. y – d. M. y GGGGG"} + y{"d. M. y – d. M. y GGGGG"} } H{ - H{"HH – HH"} + H{"HH – HH"} } Hm{ - H{"H:mm – H:mm"} - m{"H:mm – H:mm"} + H{"H:mm – H:mm"} + m{"H:mm – H:mm"} } Hmv{ - H{"H:mm – H:mm v"} - m{"H:mm – H:mm v"} + H{"H:mm – H:mm v"} + m{"H:mm – H:mm v"} } Hv{ - H{"HH – HH v"} + H{"HH – HH v"} } M{ M{"M. – M."} @@ -623,14 +623,14 @@ sk{ d{"E d. M. – E d. M."} } MMM{ - M{"LLL – LLL"} + M{"LLL – LLL"} } MMMEd{ M{"E d. M. – E d. M."} d{"E d. – E d. M."} } MMMM{ - M{"LLLL – LLLL"} + M{"LLLL – LLLL"} } MMMd{ M{"d. M. – d. M."} @@ -645,57 +645,57 @@ sk{ } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h – h a"} + a{"h a – h a"} + h{"h – h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm – h:mm a"} - m{"h:mm – h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm – h:mm a"} + m{"h:mm – h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm – h:mm a v"} - m{"h:mm – h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm – h:mm a v"} + m{"h:mm – h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h – h a v"} + a{"h a – h a v"} + h{"h – h a v"} } y{ - y{"y – y G"} + y{"y – y G"} } yM{ - M{"M/y – M/y GGGGG"} - y{"M/y – M/y GGGGG"} + M{"M/y – M/y GGGGG"} + y{"M/y – M/y GGGGG"} } yMEd{ - M{"E d. M. y – E d. M. y G"} - d{"E d. M. y – E d. M. y G"} - y{"E d. M. y – E d. M. y G"} + M{"E d. M. y – E d. M. y G"} + d{"E d. M. y – E d. M. y G"} + y{"E d. M. y – E d. M. y G"} } yMMM{ - M{"LLL – LLL y G"} - y{"LLL y – LLL y G"} + M{"LLL – LLL y G"} + y{"LLL y – LLL y G"} } yMMMEd{ M{"E d. M. – E d. M. y G"} d{"E d. – E d. M. y G"} - y{"E d. M. y – E d. M. y G"} + y{"E d. M. y – E d. M. y G"} } yMMMM{ - M{"LLLL – LLLL y G"} - y{"LLLL y – LLLL y G"} + M{"LLLL – LLLL y G"} + y{"LLLL y – LLLL y G"} } yMMMd{ M{"d. M. – d. M. y G"} d{"d. – d. M. y G"} - y{"d. M. y – d. M. y G"} + y{"d. M. y – d. M. y G"} } yMd{ - M{"d. M. y – d. M. y G"} - d{"d. M. y – d. M. y G"} - y{"d. M. y – d. M. y G"} + M{"d. M. y – d. M. y G"} + d{"d. M. y – d. M. y G"} + y{"d. M. y – d. M. y G"} } } } @@ -750,8 +750,8 @@ sk{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"E d."} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"y G"} GyMMM{"LLLL y G"} GyMMMEd{"E d. M. y G"} @@ -778,11 +778,11 @@ sk{ MMMd{"d. M."} Md{"d. M."} d{"d."} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} - hmsv{"h:mm:ss a v"} - hmv{"h:mm a v"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} + hmsv{"h:mm:ss a v"} + hmv{"h:mm a v"} mmss{"mm:ss"} ms{"mm:ss"} y{"y"} @@ -967,63 +967,63 @@ sk{ } intervalFormats{ Bh{ - h{"h – h B"} + h{"h – h B"} } Bhm{ - h{"h:mm – h:mm B"} - m{"h:mm – h:mm B"} + h{"h:mm – h:mm B"} + m{"h:mm – h:mm B"} } Gy{ - G{"y G – y G"} - y{"y – y G"} + G{"y G – y G"} + y{"y – y G"} } GyM{ - G{"M/y GGGGG – M/y GGGGG"} - M{"M/y – M/y GGGGG"} - y{"M/y – M/y GGGGG"} + G{"M/y GGGGG – M/y GGGGG"} + M{"M/y – M/y GGGGG"} + y{"M/y – M/y GGGGG"} } GyMEd{ - G{"E d. M. y GGGGG – E d. M. y GGGGG"} - M{"E d. M. y – E d. M. y GGGGG"} - d{"E d. M. y – E d. M. y GGGGG"} - y{"E d. M. y – E d. M. y GGGGG"} + G{"E d. M. y GGGGG – E d. M. y GGGGG"} + M{"E d. M. y – E d. M. y GGGGG"} + d{"E d. M. y – E d. M. y GGGGG"} + y{"E d. M. y – E d. M. y GGGGG"} } GyMMM{ - G{"LLLL y G – LLLL y G"} - M{"LLLL – LLLL y G"} - y{"LLLL y – LLLL y G"} + G{"LLLL y G – LLLL y G"} + M{"LLLL – LLLL y G"} + y{"LLLL y – LLLL y G"} } GyMMMEd{ - G{"E d. M. y G – E d. M. y G"} + G{"E d. M. y G – E d. M. y G"} M{"E d. M. – E d. M. y G"} d{"E d. M. – E d. M. y G"} - y{"E d. M. y – E d. M. y G"} + y{"E d. M. y – E d. M. y G"} } GyMMMd{ - G{"d. M. y G – d. M. y G"} + G{"d. M. y G – d. M. y G"} M{"d. M. – d. M. y G"} d{"d. – d. M. y G"} - y{"d. M. y – d. M. y G"} + y{"d. M. y – d. M. y G"} } GyMd{ - G{"d. M. y GGGGG – d. M. y GGGGG"} - M{"d. M. y – d. M. y GGGGG"} - d{"d. M. y – d. M. y GGGGG"} - y{"d. M. y – d. M. y GGGGG"} + G{"d. M. y GGGGG – d. M. y GGGGG"} + M{"d. M. y – d. M. y GGGGG"} + d{"d. M. y – d. M. y GGGGG"} + y{"d. M. y – d. M. y GGGGG"} } H{ - H{"HH – HH"} + H{"HH – HH"} } Hm{ - H{"H:mm – H:mm"} - m{"H:mm – H:mm"} + H{"H:mm – H:mm"} + m{"H:mm – H:mm"} } Hmv{ - H{"H:mm – H:mm v"} - m{"H:mm – H:mm v"} + H{"H:mm – H:mm v"} + m{"H:mm – H:mm v"} } Hv{ - H{"HH – HH v"} + H{"HH – HH v"} } M{ M{"M. – M."} @@ -1033,14 +1033,14 @@ sk{ d{"E d. M. – E d. M."} } MMM{ - M{"LLL – LLL"} + M{"LLL – LLL"} } MMMEd{ M{"E d. M. – E d. M."} d{"E d. – E d. M."} } MMMM{ - M{"LLLL – LLLL"} + M{"LLLL – LLLL"} } MMMd{ M{"d. M. – d. M."} @@ -1055,57 +1055,57 @@ sk{ } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h – h a"} + a{"h a – h a"} + h{"h – h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm – h:mm a"} - m{"h:mm – h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm – h:mm a"} + m{"h:mm – h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm – h:mm a v"} - m{"h:mm – h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm – h:mm a v"} + m{"h:mm – h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h – h a v"} + a{"h a – h a v"} + h{"h – h a v"} } y{ - y{"y – y"} + y{"y – y"} } yM{ - M{"M/y – M/y"} - y{"M/y – M/y"} + M{"M/y – M/y"} + y{"M/y – M/y"} } yMEd{ - M{"E d. M. y – E d. M. y"} - d{"E d. M. y – E d. M. y"} - y{"E d. M. y – E d. M. y"} + M{"E d. M. y – E d. M. y"} + d{"E d. M. y – E d. M. y"} + y{"E d. M. y – E d. M. y"} } yMMM{ - M{"M – M/y"} - y{"M/y – M/y"} + M{"M – M/y"} + y{"M/y – M/y"} } yMMMEd{ M{"E d. M. – E d. M. y"} d{"E d. – E d. M. y"} - y{"E d. M. y – E d. M. y"} + y{"E d. M. y – E d. M. y"} } yMMMM{ - M{"LLLL – LLLL y"} - y{"LLLL y – LLLL y"} + M{"LLLL – LLLL y"} + y{"LLLL y – LLLL y"} } yMMMd{ M{"d. M. – d. M. y"} d{"d. – d. M. y"} - y{"d. M. y – d. M. y"} + y{"d. M. y – d. M. y"} } yMd{ - M{"d. M. y – d. M. y"} - d{"d. M. y – d. M. y"} - y{"d. M. y – d. M. y"} + M{"d. M. y – d. M. y"} + d{"d. M. y – d. M. y"} + y{"d. M. y – d. M. y"} } } monthNames{ diff --git a/icu4c/source/data/locales/sl.txt b/icu4c/source/data/locales/sl.txt index 531b8ff29569..8555d8d2d87e 100644 --- a/icu4c/source/data/locales/sl.txt +++ b/icu4c/source/data/locales/sl.txt @@ -352,8 +352,8 @@ sl{ EHm{"E, HH:mm"} EHms{"E, HH:mm:ss"} Ed{"E, d."} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"y G"} GyM{"M/y G"} GyMMM{"MMM y G"} @@ -371,9 +371,9 @@ sl{ MMMd{"d. MMM"} Md{"d. M."} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"mm:ss"} y{"y"} yyyy{"y G"} @@ -473,22 +473,22 @@ sl{ } fallback{"{0}–{1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y"} @@ -578,8 +578,8 @@ sl{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"E, d."} - Ehm{"E, h:mm a"} - Ehms{"E, h:mm:ss a"} + Ehm{"E, h:mm a"} + Ehms{"E, h:mm:ss a"} Gy{"y G"} GyM{"MMM y G"} GyMMM{"MMM y G"} @@ -605,11 +605,11 @@ sl{ MMMd{"d. MMM"} Md{"d. M."} d{"d."} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} - hmsv{"h:mm:ss a v"} - hmv{"h:mm a v"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} + hmsv{"h:mm:ss a v"} + hmv{"h:mm a v"} ms{"mm:ss"} y{"y"} yM{"M/y"} @@ -879,22 +879,22 @@ sl{ } fallback{"{0}–{1}"} h{ - a{"h a–h a"} - h{"h–h a"} + a{"h a–h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y"} diff --git a/icu4c/source/data/locales/smn.txt b/icu4c/source/data/locales/smn.txt index 53f83430192d..304bea9d451f 100644 --- a/icu4c/source/data/locales/smn.txt +++ b/icu4c/source/data/locales/smn.txt @@ -110,7 +110,13 @@ smn{ "MMMM d. y G", "d.M.y G", "d.M.y GGGGG", - "{1} 'tme' {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + } + DateTimePatterns%atTime{ "{1} 'tme' {0}", "{1} 'tme' {0}", "{1} 'tme' {0}", @@ -185,30 +191,30 @@ smn{ } yM{ M{"LLL–LLLL y G"} - y{"LLLL y – LLLL y G"} + y{"LLLL y – LLLL y G"} } yMEd{ - M{"E d.M.y – E d.M.y G"} - d{"E d.M.y – E d.M.y G"} - y{"E d.M.y – E d.M.y G"} + M{"E d.M.y – E d.M.y G"} + d{"E d.M.y – E d.M.y G"} + y{"E d.M.y – E d.M.y G"} } yMMM{ M{"LLL–LLLL y G"} - y{"LLLL y – LLLL y G"} + y{"LLLL y – LLLL y G"} } yMMMEd{ M{"MMMM E d. – MMMM E d. y G"} d{"MMMM E d. – E d. y G"} - y{"MMMM E d. y – MMMM E d. y G"} + y{"MMMM E d. y – MMMM E d. y G"} } yMMMM{ M{"LLL–LLLL y G"} - y{"LLLL y – LLLL y G"} + y{"LLLL y – LLLL y G"} } yMMMd{ M{"MMMM d. – MMMM d. y G"} d{"MMMM d.–d. y G"} - y{"MMMM d. y – MMMM d. y G"} + y{"MMMM d. y – MMMM d. y G"} } yMd{ M{"d.M.–d.M.y G"} @@ -239,7 +245,13 @@ smn{ "MMMM d. y", "MMM d. y", "d.M.y", - "{1} 'tme' {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + } + DateTimePatterns%atTime{ "{1} 'tme' {0}", "{1} 'tme' {0}", "{1} 'tme' {0}", @@ -263,8 +275,8 @@ smn{ EHm{"E H.mm"} EHms{"E H.mm.ss"} Ed{"E d."} - Ehm{"E h.mm a"} - Ehms{"E h.mm.ss a"} + Ehm{"E h.mm a"} + Ehms{"E h.mm.ss a"} Gy{"y G"} GyMMM{"LLL y G"} GyMMMEd{"E, MMM d. y G"} @@ -287,11 +299,11 @@ smn{ MMMd{"MMM d."} Md{"d.M."} d{"d"} - h{"h a"} - hm{"h.mm a"} - hms{"h.mm.ss a"} - hmsv{"h.mm.ss a v"} - hmv{"h.mm a v"} + h{"h a"} + hm{"h.mm a"} + hms{"h.mm.ss a"} + hmsv{"h.mm.ss a v"} + hmv{"h.mm a v"} ms{"m.ss."} y{"y"} yM{"L.y"} @@ -463,52 +475,52 @@ smn{ } fallback{"{0}–{1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h.mm a – h.mm a"} - h{"h.mm–h.mm a"} - m{"h.mm–h.mm a"} + a{"h.mm a – h.mm a"} + h{"h.mm–h.mm a"} + m{"h.mm–h.mm a"} } hmv{ - a{"h.mm a – h.mm a v"} - h{"h.mm–h.mm a v"} - m{"h.mm–h.mm a v"} + a{"h.mm a – h.mm a v"} + h{"h.mm–h.mm a v"} + m{"h.mm–h.mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y"} } yM{ M{"LLL–LLLL y"} - y{"LLLL y – LLLL y"} + y{"LLLL y – LLLL y"} } yMEd{ - M{"E d.M.y – E d.M.y"} - d{"E d.M.y – E d.M.y"} - y{"E d.M.y – E d.M.y"} + M{"E d.M.y – E d.M.y"} + d{"E d.M.y – E d.M.y"} + y{"E d.M.y – E d.M.y"} } yMMM{ M{"LLL–LLLL y"} - y{"LLLL y – LLLL y"} + y{"LLLL y – LLLL y"} } yMMMEd{ M{"MMMM E d. – MMMM E d. y"} d{"MMMM E d. – E d. y"} - y{"MMMM E d. y – MMMM E d. y"} + y{"MMMM E d. y – MMMM E d. y"} } yMMMM{ M{"LLL–LLLL y"} - y{"LLLL y – LLLL y"} + y{"LLLL y – LLLL y"} } yMMMd{ M{"MMMM d. – MMMM d. y"} d{"MMMM d.–d. y"} - y{"MMMM d. y – MMMM d. y"} + y{"MMMM d. y – MMMM d. y"} } yMd{ M{"d.M.–d.M.y"} diff --git a/icu4c/source/data/locales/sn.txt b/icu4c/source/data/locales/sn.txt index f2109f4edb1e..677ee3e44a6e 100644 --- a/icu4c/source/data/locales/sn.txt +++ b/icu4c/source/data/locales/sn.txt @@ -76,7 +76,7 @@ sn{ MMMd{"MMM d"} Md{"M/d"} d{"d"} - hm{"h:mm a"} + hm{"h:mm a"} ms{"mm:ss"} y{"y"} yM{"M/y"} @@ -134,8 +134,8 @@ sn{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"d, E"} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"G y"} GyMMM{"G y MMM"} GyMMMEd{"G y MMM d, E"} @@ -154,11 +154,11 @@ sn{ MMMd{"MMM d"} Md{"MM-dd"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} - hmsv{"h:mm:ss a v"} - hmv{"h:mm a v"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} + hmsv{"h:mm:ss a v"} + hmv{"h:mm a v"} ms{"mm:ss"} y{"y"} yM{"y-MM"} @@ -298,80 +298,80 @@ sn{ M{"MM–MM"} } MEd{ - M{"MM-dd, E – MM-dd, E"} - d{"MM-dd, E – MM-dd, E"} + M{"MM-dd, E – MM-dd, E"} + d{"MM-dd, E – MM-dd, E"} } MMM{ M{"LLL–LLL"} } MMMEd{ - M{"MMM d, E – MMM d, E"} - d{"MMM d, E – MMM d, E"} + M{"MMM d, E – MMM d, E"} + d{"MMM d, E – MMM d, E"} } MMMd{ - M{"MMM d – MMM d"} + M{"MMM d – MMM d"} d{"MMM d–d"} } Md{ - M{"MM-dd – MM-dd"} - d{"MM-dd – MM-dd"} + M{"MM-dd – MM-dd"} + d{"MM-dd – MM-dd"} } d{ d{"d–d"} } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y"} } yM{ - M{"y-MM – y-MM"} - y{"y-MM – y-MM"} + M{"y-MM – y-MM"} + y{"y-MM – y-MM"} } yMEd{ - M{"y-MM-dd, E – y-MM-dd, E"} - d{"y-MM-dd, E – y-MM-dd, E"} - y{"y-MM-dd, E – y-MM-dd, E"} + M{"y-MM-dd, E – y-MM-dd, E"} + d{"y-MM-dd, E – y-MM-dd, E"} + y{"y-MM-dd, E – y-MM-dd, E"} } yMMM{ M{"y MMM–MMM"} - y{"y MMM – y MMM"} + y{"y MMM – y MMM"} } yMMMEd{ - M{"y MMM d, E – MMM d, E"} - d{"y MMM d, E – MMM d, E"} - y{"y MMM d, E – y MMM d, E"} + M{"y MMM d, E – MMM d, E"} + d{"y MMM d, E – MMM d, E"} + y{"y MMM d, E – y MMM d, E"} } yMMMM{ M{"y MMMM–MMMM"} - y{"y MMMM – y MMMM"} + y{"y MMMM – y MMMM"} } yMMMd{ - M{"y MMM d – MMM d"} + M{"y MMM d – MMM d"} d{"y MMM d–d"} - y{"y MMM d – y MMM d"} + y{"y MMM d – y MMM d"} } yMd{ - M{"y-MM-dd – y-MM-dd"} - d{"y-MM-dd – y-MM-dd"} - y{"y-MM-dd – y-MM-dd"} + M{"y-MM-dd – y-MM-dd"} + d{"y-MM-dd – y-MM-dd"} + y{"y-MM-dd – y-MM-dd"} } } monthNames{ diff --git a/icu4c/source/data/locales/so.txt b/icu4c/source/data/locales/so.txt index 33a14ee8cb6f..721e69ac9c65 100644 --- a/icu4c/source/data/locales/so.txt +++ b/icu4c/source/data/locales/so.txt @@ -523,10 +523,10 @@ so{ } generic{ DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE, MMMM d, y G", "MMMM d, y G", "MMM d, y G", @@ -579,113 +579,113 @@ so{ } intervalFormats{ Gy{ - G{"y G – y G"} - y{"y – y G"} + G{"y G – y G"} + y{"y – y G"} } GyM{ - G{"M/y GGGGG – M/y GGGGG"} - M{"M/y – M/y GGGGG"} - y{"M/y – M/y GGGGG"} + G{"M/y GGGGG – M/y GGGGG"} + M{"M/y – M/y GGGGG"} + y{"M/y – M/y GGGGG"} } GyMEd{ - G{"E, M/d/y GGGGG – E, M/d/y GGGGG"} - M{"E, M/d/y – E, M/d/y GGGGG"} - d{"E, M/d/y – E, M/d/y GGGGG"} - y{"E, M/d/y – E, M/d/y GGGGG"} + G{"E, M/d/y GGGGG – E, M/d/y GGGGG"} + M{"E, M/d/y – E, M/d/y GGGGG"} + d{"E, M/d/y – E, M/d/y GGGGG"} + y{"E, M/d/y – E, M/d/y GGGGG"} } GyMMM{ - G{"MMM y G – MMM y G"} - M{"MMM – MMM y G"} - y{"MMM y – MMM y G"} + G{"MMM y G – MMM y G"} + M{"MMM – MMM y G"} + y{"MMM y – MMM y G"} } GyMMMEd{ - G{"E, MMM d, y G – E, MMM d, y G"} - M{"E, MMM d – E, MMM d, y G"} - d{"E, MMM d – E, MMM d, y G"} - y{"E, MMM d, y – E, MMM d, y G"} + G{"E, MMM d, y G – E, MMM d, y G"} + M{"E, MMM d – E, MMM d, y G"} + d{"E, MMM d – E, MMM d, y G"} + y{"E, MMM d, y – E, MMM d, y G"} } GyMMMd{ - G{"MMM d, y G – MMM d, y G"} - M{"MMM d – MMM d, y G"} - d{"MMM d – d, y G"} - y{"MMM d, y – MMM d, y G"} + G{"MMM d, y G – MMM d, y G"} + M{"MMM d – MMM d, y G"} + d{"MMM d – d, y G"} + y{"MMM d, y – MMM d, y G"} } GyMd{ - G{"M/d/y GGGGG – M/d/y GGGGG"} - M{"M/d/y – M/d/y GGGGG"} - d{"M/d/y – M/d/y GGGGG"} - y{"M/d/y – M/d/y GGGGG"} + G{"M/d/y GGGGG – M/d/y GGGGG"} + M{"M/d/y – M/d/y GGGGG"} + d{"M/d/y – M/d/y GGGGG"} + y{"M/d/y – M/d/y GGGGG"} } H{ - H{"HH – HH"} + H{"HH – HH"} } Hm{ - H{"HH:mm – HH:mm"} - m{"HH:mm – HH:mm"} + H{"HH:mm – HH:mm"} + m{"HH:mm – HH:mm"} } Hmv{ - H{"HH:mm – HH:mm v"} - m{"HH:mm – HH:mm v"} + H{"HH:mm – HH:mm v"} + m{"HH:mm – HH:mm v"} } Hv{ - H{"HH – HH v"} + H{"HH – HH v"} } M{ M{"M–M"} } MEd{ - M{"E, M/d – E, M/d"} - d{"E, M/d – E, M/d"} + M{"E, M/d – E, M/d"} + d{"E, M/d – E, M/d"} } MMM{ M{"MMM–MMM"} } MMMEd{ - M{"E, MMM d – E, MMM d"} - d{"E, MMM d – E, MMM d"} + M{"E, MMM d – E, MMM d"} + d{"E, MMM d – E, MMM d"} } MMMd{ - M{"MMM d – MMM d"} - d{"MMM d – d"} + M{"MMM d – MMM d"} + d{"MMM d – d"} } Md{ - M{"M/d – M/d"} - d{"M/d – M/d"} + M{"M/d – M/d"} + d{"M/d – M/d"} } y{ - y{"y – y G"} + y{"y – y G"} } yM{ - M{"M/y – M/y GGGGG"} - y{"M/y – M/y GGGGG"} + M{"M/y – M/y GGGGG"} + y{"M/y – M/y GGGGG"} } yMEd{ - M{"E, M/d/y – E, M/d/y GGGGG"} - d{"E, M/d/y – E, M/d/y GGGGG"} - y{"E, M/d/y – E, M/d/y GGGGG"} + M{"E, M/d/y – E, M/d/y GGGGG"} + d{"E, M/d/y – E, M/d/y GGGGG"} + y{"E, M/d/y – E, M/d/y GGGGG"} } yMMM{ - M{"MMM – MMM y G"} - y{"MMM y – MMM y"} + M{"MMM – MMM y G"} + y{"MMM y – MMM y"} } yMMMEd{ - M{"E, MMM d – E, MMM d, y G"} - d{"E, MMM d – E, MMM d, y G"} - y{"E, MMM d, y – E, MMM d, y G"} + M{"E, MMM d – E, MMM d, y G"} + d{"E, MMM d – E, MMM d, y G"} + y{"E, MMM d, y – E, MMM d, y G"} } yMMMM{ - M{"MMMM – MMMM y G"} - y{"MMMM y – MMMM y G"} + M{"MMMM – MMMM y G"} + y{"MMMM y – MMMM y G"} } yMMMd{ - M{"MMM d – MMM d, y G"} - d{"MMM d – d, y G"} - y{"MMM d, y – MMM d, y G"} + M{"MMM d – MMM d, y G"} + d{"MMM d – d, y G"} + y{"MMM d, y – MMM d, y G"} } yMd{ - M{"M/d/y – M/d/y GGGGG"} - d{"M/d/y – M/d/y GGGGG"} - y{"M/d/y – M/d/y GGGGG"} + M{"M/d/y – M/d/y GGGGG"} + d{"M/d/y – M/d/y GGGGG"} + y{"M/d/y – M/d/y GGGGG"} } } } @@ -703,15 +703,21 @@ so{ "d", } DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE, MMMM d, y", "MMMM d, y", "dd-MMM-y", "dd/MM/yy", - "{1} 'ee' {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + } + DateTimePatterns%atTime{ "{1} 'ee' {0}", "{1} 'ee' {0}", "{1} 'ee' {0}", @@ -742,7 +748,7 @@ so{ other{"'toddobaadka' W 'ee' MMMM"} } Md{"M/d"} - hmsv{"h:mm:ss a v"} + hmsv{"h:mm:ss a v"} yM{"M/y"} yMEd{"E, M/d/y"} yMMM{"MMM y"} @@ -879,97 +885,97 @@ so{ } intervalFormats{ Gy{ - G{"y G – y G"} - y{"y – y G"} + G{"y G – y G"} + y{"y – y G"} } GyM{ - G{"M/y GGGGG – M/y GGGGG"} - M{"M/y – M/y GGGGG"} - y{"M/y – M/y GGGGG"} + G{"M/y GGGGG – M/y GGGGG"} + M{"M/y – M/y GGGGG"} + y{"M/y – M/y GGGGG"} } GyMEd{ - G{"E, M/d/y GGGGG – E, M/d/y GGGGG"} - M{"E, M/d/y – E, M/d/y GGGGG"} - d{"E, M/d/y – E, M/d/y GGGGG"} - y{"E, M/d/y – E, M/d/y GGGGG"} + G{"E, M/d/y GGGGG – E, M/d/y GGGGG"} + M{"E, M/d/y – E, M/d/y GGGGG"} + d{"E, M/d/y – E, M/d/y GGGGG"} + y{"E, M/d/y – E, M/d/y GGGGG"} } GyMMM{ - G{"MMM y G – MMM y G"} - M{"MMM – MMM y G"} - y{"MMM y – MMM y G"} + G{"MMM y G – MMM y G"} + M{"MMM – MMM y G"} + y{"MMM y – MMM y G"} } GyMMMEd{ - G{"E, MMM d, y G – E, MMM d, y G"} - M{"E, MMM d – E, MMM d, y G"} - d{"E, MMM d – E, MMM d, y G"} - y{"E, MMM d, y – E, MMM d, y G"} + G{"E, MMM d, y G – E, MMM d, y G"} + M{"E, MMM d – E, MMM d, y G"} + d{"E, MMM d – E, MMM d, y G"} + y{"E, MMM d, y – E, MMM d, y G"} } GyMMMd{ - G{"MMM d, y G – MMM d, y G"} - M{"MMM d – MMM d, y G"} - d{"MMM d – d, y G"} - y{"MMM d, y – MMM d, y G"} + G{"MMM d, y G – MMM d, y G"} + M{"MMM d – MMM d, y G"} + d{"MMM d – d, y G"} + y{"MMM d, y – MMM d, y G"} } GyMd{ - G{"M/d/y GGGGG – M/d/y GGGGG"} - M{"M/d/y – M/d/y GGGGG"} - d{"M/d/y – M/d/y GGGGG"} - y{"M/d/y – M/d/y GGGGG"} + G{"M/d/y GGGGG – M/d/y GGGGG"} + M{"M/d/y – M/d/y GGGGG"} + d{"M/d/y – M/d/y GGGGG"} + y{"M/d/y – M/d/y GGGGG"} } M{ M{"M–M"} } MEd{ - M{"E, dd/MM – E, dd/MM"} - d{"E, dd/MM – E, dd/MM"} + M{"E, dd/MM – E, dd/MM"} + d{"E, dd/MM – E, dd/MM"} } MMM{ M{"MMM–MMM"} } MMMEd{ - M{"E, dd MMM – E, dd MMM"} - d{"E, MMM d – E, MMM d"} + M{"E, dd MMM – E, dd MMM"} + d{"E, MMM d – E, MMM d"} } MMMd{ - M{"dd MMM – dd MMM"} + M{"dd MMM – dd MMM"} d{"dd–dd MMM"} } Md{ - M{"dd/MM – dd/MM"} - d{"dd/MM – dd/MM"} + M{"dd/MM – dd/MM"} + d{"dd/MM – dd/MM"} } fallback{"{0} - {1}"} yM{ - M{"MM/y – MM/y"} - y{"MM/y – MM/y"} + M{"MM/y – MM/y"} + y{"MM/y – MM/y"} } yMEd{ - M{"E, dd/MM/y – E, dd/MM/y"} - d{"E, dd/MM/y – E, dd/MM/y"} - y{"E, dd/MM/y – E, dd/MM/y"} + M{"E, dd/MM/y – E, dd/MM/y"} + d{"E, dd/MM/y – E, dd/MM/y"} + y{"E, dd/MM/y – E, dd/MM/y"} } yMMM{ M{"MMM–MMM y"} - y{"MMM y – MMM y"} + y{"MMM y – MMM y"} } yMMMEd{ - M{"E, MMM dd – E, MMM dd, y"} - d{"E, MMM dd – E, MMM dd, y"} - y{"E, MMM dd, y – E, MMM dd, y"} + M{"E, MMM dd – E, MMM dd, y"} + d{"E, MMM dd – E, MMM dd, y"} + y{"E, MMM dd, y – E, MMM dd, y"} } yMMMM{ - M{"MMMM – MMMM y"} - y{"MMMM y – MMMM y"} + M{"MMMM – MMMM y"} + y{"MMMM y – MMMM y"} } yMMMd{ - M{"dd MMM – dd MMM y"} + M{"dd MMM – dd MMM y"} d{"dd–dd MMM y"} - y{"dd MMM y – dd MMM y"} + y{"dd MMM y – dd MMM y"} } yMd{ - M{"dd/MM/y – dd/MM/y"} - d{"dd/MM/y – dd/MM/y"} - y{"dd/MM/y – dd/MM/y"} + M{"dd/MM/y – dd/MM/y"} + d{"dd/MM/y – dd/MM/y"} + y{"dd/MM/y – dd/MM/y"} } } monthNames{ @@ -1101,36 +1107,48 @@ so{ } hebrew{ DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE, MMMM d, y G", "MMMM d, y G", "MMM d, y G", "M/d/y GGGGG", "{1}, {0}", - "{1} 'barta' {0}", - "{1} 'barta' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } + DateTimePatterns%atTime{ + "{1} 'barta' {0}", + "{1} 'barta' {0}", + "{1} {0}", + "{1} {0}", + } } indian{ DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE, MMMM d, y G", "MMMM d, y G", "MMM d, y G", "M/d/y GGGGG", "{1}, {0}", - "{1} 'barta' {0}", - "{1} 'barta' {0}", "{1}, {0}", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ + "{1} 'barta' {0}", + "{1} 'barta' {0}", + "{1} {0}", + "{1} {0}", } } islamic{ diff --git a/icu4c/source/data/locales/so_KE.txt b/icu4c/source/data/locales/so_KE.txt index 351f60bedc5d..07fbdedc6287 100644 --- a/icu4c/source/data/locales/so_KE.txt +++ b/icu4c/source/data/locales/so_KE.txt @@ -13,10 +13,10 @@ so_KE{ "MMMM d, y", "dd-MMM-y", "dd/MM/yy", - "{1} 'ee' {0}", - "{1} 'ee' {0}", - "{1} 'ee' {0}", - "{1} 'ee' {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", "{1} {0}", } DateTimeSkeletons{ diff --git a/icu4c/source/data/locales/sq.txt b/icu4c/source/data/locales/sq.txt index 38f2b3e2e73c..752012d31f02 100644 --- a/icu4c/source/data/locales/sq.txt +++ b/icu4c/source/data/locales/sq.txt @@ -227,15 +227,21 @@ sq{ calendar{ generic{ DateTimePatterns{ - "h:mm:ss a, zzzz", - "h:mm:ss a, z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a, zzzz", + "h:mm:ss a, z", + "h:mm:ss a", + "h:mm a", "EEEE, d MMM y G", "d MMM y G", "d MMM y G", "d.M.y GGGGG", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{1} 'në' {0}", "{1} 'në' {0}", "{1}, {0}", @@ -261,8 +267,8 @@ sq{ EHm{"E, HH:mm"} EHms{"E, HH:mm:ss"} Ed{"E, d"} - Ehm{"E, h:mm a"} - Ehms{"E, h:mm:ss a"} + Ehm{"E, h:mm a"} + Ehms{"E, h:mm:ss a"} Gy{"y G"} GyMMM{"MMM y G"} GyMMMEd{"E, d MMM y G"} @@ -281,9 +287,9 @@ sq{ MMdd{"dd.MM"} Md{"d.M"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"mm:ss"} y{"y G"} yyyy{"y G"} @@ -299,51 +305,51 @@ sq{ } intervalFormats{ Bh{ - B{"h B – h B"} - h{"h – h B"} + B{"h B – h B"} + h{"h – h B"} } Bhm{ - B{"h:mm B – h:mm B"} - h{"h:mm – h:mm B"} - m{"h:mm – h:mm B"} + B{"h:mm B – h:mm B"} + h{"h:mm – h:mm B"} + m{"h:mm – h:mm B"} } Gy{ - G{"y G – y G"} - y{"y – y G"} + G{"y G – y G"} + y{"y – y G"} } GyM{ - G{"M.y GGGGG – M.y GGGGG"} - M{"M.y – M.y GGGGG"} - y{"M.y – M.y GGGGG"} + G{"M.y GGGGG – M.y GGGGG"} + M{"M.y – M.y GGGGG"} + y{"M.y – M.y GGGGG"} } GyMEd{ - G{"E, d.M.y GGGGG – E, d.M.y GGGGG"} - M{"E, d.M.y – E, d.M.y GGGGG"} - d{"E, d.M.y – E, d.M.y GGGGG"} - y{"E, d.M.y – E, d.M.y GGGGG"} + G{"E, d.M.y GGGGG – E, d.M.y GGGGG"} + M{"E, d.M.y – E, d.M.y GGGGG"} + d{"E, d.M.y – E, d.M.y GGGGG"} + y{"E, d.M.y – E, d.M.y GGGGG"} } GyMMM{ - G{"MMM y G – MMM y G"} - M{"MMM – MMM y G"} - y{"MMM y – MMM y G"} + G{"MMM y G – MMM y G"} + M{"MMM – MMM y G"} + y{"MMM y – MMM y G"} } GyMMMEd{ - G{"E, d MMM y G – E, d MMM y G"} - M{"E, d MMM – E, d MMM y G"} - d{"E, d MMM – E, d MMM y G"} - y{"E, d MMM y – E, d MMM y G"} + G{"E, d MMM y G – E, d MMM y G"} + M{"E, d MMM – E, d MMM y G"} + d{"E, d MMM – E, d MMM y G"} + y{"E, d MMM y – E, d MMM y G"} } GyMMMd{ - G{"d MMM y G – d MMM y G"} - M{"d MMM – d MMM y G"} - d{"d – d MMM y G"} - y{"d MMM y – d MMM y G"} + G{"d MMM y G – d MMM y G"} + M{"d MMM – d MMM y G"} + d{"d – d MMM y G"} + y{"d MMM y – d MMM y G"} } GyMd{ - G{"d.M.y GGGGG – d.M.y GGGGG"} - M{"d.M.y – d.M.y GGGGG"} - d{"d.M.y – d.M.y GGGGG"} - y{"d.M.y – d.M.y GGGGG"} + G{"d.M.y GGGGG – d.M.y GGGGG"} + M{"d.M.y – d.M.y GGGGG"} + d{"d.M.y – d.M.y GGGGG"} + y{"d.M.y – d.M.y GGGGG"} } H{ H{"HH–HH"} @@ -360,65 +366,65 @@ sq{ H{"HH–HH v"} } M{ - M{"M – M"} + M{"M – M"} } MEd{ - M{"E, d.M – E, d.M"} - d{"E, d.M – E, d.M"} + M{"E, d.M – E, d.M"} + d{"E, d.M – E, d.M"} } MMM{ - M{"MMM – MMM"} + M{"MMM – MMM"} } MMMEd{ - M{"E, d MMM – E, d MMM"} - d{"E, d MMM – E, d MMM"} + M{"E, d MMM – E, d MMM"} + d{"E, d MMM – E, d MMM"} } MMMd{ - M{"d MMM – d MMM"} - d{"d – d MMM"} + M{"d MMM – d MMM"} + d{"d – d MMM"} } Md{ - M{"d.M – d.M"} - d{"d.M – d.M"} + M{"d.M – d.M"} + d{"d.M – d.M"} } d{ - d{"d – d"} + d{"d – d"} } fallback{"{0} - {1}"} y{ - y{"y – y G"} + y{"y – y G"} } yM{ - M{"M.y – M.y GGGGG"} - y{"M.y – M.y GGGGG"} + M{"M.y – M.y GGGGG"} + y{"M.y – M.y GGGGG"} } yMEd{ - M{"E, d.M.y – E, d.M.y GGGGG"} - d{"E, d.M.y – E, d.M.y GGGGG"} - y{"E, d.M.y – E, d.M.y GGGGG"} + M{"E, d.M.y – E, d.M.y GGGGG"} + d{"E, d.M.y – E, d.M.y GGGGG"} + y{"E, d.M.y – E, d.M.y GGGGG"} } yMMM{ - M{"MMM – MMM y G"} - y{"MMM y – MMM y G"} + M{"MMM – MMM y G"} + y{"MMM y – MMM y G"} } yMMMEd{ - M{"E, d MMM – E, d MMM y G"} - d{"E, d MMM – E, d MMM y G"} - y{"E, d MMM y – E, d MMM y G"} + M{"E, d MMM – E, d MMM y G"} + d{"E, d MMM – E, d MMM y G"} + y{"E, d MMM y – E, d MMM y G"} } yMMMM{ - M{"MMMM – MMMM y G"} - y{"MMMM y – MMMM y G"} + M{"MMMM – MMMM y G"} + y{"MMMM y – MMMM y G"} } yMMMd{ - M{"d MMM – d MMM y G"} - d{"d – d MMM y G"} - y{"d MMM y – d MMM y G"} + M{"d MMM – d MMM y G"} + d{"d – d MMM y G"} + y{"d MMM y – d MMM y G"} } yMd{ - M{"d.M.y – d.M.y GGGGG"} - d{"d.M.y – d.M.y GGGGG"} - y{"d.M.y – d.M.y GGGGG"} + M{"d.M.y – d.M.y GGGGG"} + d{"d.M.y – d.M.y GGGGG"} + y{"d.M.y – d.M.y GGGGG"} } } } @@ -436,15 +442,21 @@ sq{ "m.d.", } DateTimePatterns{ - "h:mm:ss a, zzzz", - "h:mm:ss a, z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a, zzzz", + "h:mm:ss a, z", + "h:mm:ss a", + "h:mm a", "EEEE, d MMMM y", "d MMMM y", "d MMM y", "d.M.yy", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{1} 'në' {0}", "{1} 'në' {0}", "{1}, {0}", @@ -473,8 +485,8 @@ sq{ EHm{"E, HH:mm"} EHms{"E, HH:mm:ss"} Ed{"E, d"} - Ehm{"E, h:mm a"} - Ehms{"E, h:mm:ss a"} + Ehm{"E, h:mm a"} + Ehms{"E, h:mm:ss a"} Gy{"y G"} GyMMM{"MMM y G"} GyMMMEd{"E, d MMM y G"} @@ -499,11 +511,11 @@ sq{ MMdd{"d.M"} Md{"d.M"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} - hmsv{"h:mm:ss a, v"} - hmv{"h:mm a, v"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} + hmsv{"h:mm:ss a, v"} + hmv{"h:mm a, v"} ms{"mm:ss"} y{"y"} yM{"M.y"} @@ -692,144 +704,144 @@ sq{ } intervalFormats{ Bh{ - B{"h B – h B"} - h{"h – h B"} + B{"h B – h B"} + h{"h – h B"} } Bhm{ - B{"h:mm B – h:mm B"} - h{"h:mm – h:mm B"} - m{"h:mm – h:mm B"} + B{"h:mm B – h:mm B"} + h{"h:mm – h:mm B"} + m{"h:mm – h:mm B"} } Gy{ - G{"y G – y G"} - y{"y – y G"} + G{"y G – y G"} + y{"y – y G"} } GyM{ - G{"M.y GGGGG – M.y GGGGG"} - M{"M.y – M.y GGGGG"} - y{"M.y – M.y GGGGG"} + G{"M.y GGGGG – M.y GGGGG"} + M{"M.y – M.y GGGGG"} + y{"M.y – M.y GGGGG"} } GyMEd{ - G{"E, d.M.y GGGGG – E, d.M.y GGGGG"} - M{"E, d.M.y – E, d.M.y GGGGG"} - d{"E, d.M.y – E, d.M.y GGGGG"} - y{"E, d.M.y – E, d.M.y GGGGG"} + G{"E, d.M.y GGGGG – E, d.M.y GGGGG"} + M{"E, d.M.y – E, d.M.y GGGGG"} + d{"E, d.M.y – E, d.M.y GGGGG"} + y{"E, d.M.y – E, d.M.y GGGGG"} } GyMMM{ - G{"MMM y G – MMM y G"} - M{"MMM y G – MMM y G"} - y{"MMM y G – MMM y G"} + G{"MMM y G – MMM y G"} + M{"MMM y G – MMM y G"} + y{"MMM y G – MMM y G"} } GyMMMEd{ - G{"E, d MMM y G – E, d MMM y G"} - M{"E, d MMM – E, d MMM y G"} - d{"E, d MMM – E, d MMM y G"} - y{"E, d MMM y – E, d MMM y G"} + G{"E, d MMM y G – E, d MMM y G"} + M{"E, d MMM – E, d MMM y G"} + d{"E, d MMM – E, d MMM y G"} + y{"E, d MMM y – E, d MMM y G"} } GyMMMd{ - G{"d MMM y G – d MMM y G"} - M{"d MMM – d MMM y G"} - d{"d – d MMM y G"} - y{"d MMM y – d MMM y G"} + G{"d MMM y G – d MMM y G"} + M{"d MMM – d MMM y G"} + d{"d – d MMM y G"} + y{"d MMM y – d MMM y G"} } GyMd{ - G{"d.M.y GGGGG – d.M.y GGGGG"} - M{"d.M.y – d.M.y GGGGG"} - d{"d.M.y – d.M.y GGGGG"} - y{"d.M.y – d.M.y GGGGG"} + G{"d.M.y GGGGG – d.M.y GGGGG"} + M{"d.M.y – d.M.y GGGGG"} + d{"d.M.y – d.M.y GGGGG"} + y{"d.M.y – d.M.y GGGGG"} } H{ - H{"HH – HH"} + H{"HH – HH"} } Hm{ - H{"HH:mm – HH:mm"} - m{"HH:mm – HH:mm"} + H{"HH:mm – HH:mm"} + m{"HH:mm – HH:mm"} } Hmv{ - H{"HH:mm – HH:mm, v"} - m{"HH:mm – HH:mm, v"} + H{"HH:mm – HH:mm, v"} + m{"HH:mm – HH:mm, v"} } Hv{ - H{"HH – HH, v"} + H{"HH – HH, v"} } M{ - M{"M – M"} + M{"M – M"} } MEd{ - M{"E, d.M – E, d.M"} - d{"E, d.M – E, d.M"} + M{"E, d.M – E, d.M"} + d{"E, d.M – E, d.M"} } MMM{ - M{"MMM – MMM"} + M{"MMM – MMM"} } MMMEd{ - M{"E, d MMM – E, d MMM"} - d{"E, d MMM – E, d MMM"} + M{"E, d MMM – E, d MMM"} + d{"E, d MMM – E, d MMM"} } MMMd{ - M{"d MMM – d MMM"} - d{"d – d MMM"} + M{"d MMM – d MMM"} + d{"d – d MMM"} } Md{ - M{"d.M – d.M"} - d{"d.M – d.M"} + M{"d.M – d.M"} + d{"d.M – d.M"} } d{ - d{"d – d"} + d{"d – d"} } fallback{"{0} - {1}"} h{ - a{"h a – h a"} - h{"h – h a"} + a{"h a – h a"} + h{"h – h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm – h:mm a"} - m{"h:mm – h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm – h:mm a"} + m{"h:mm – h:mm a"} } hmv{ - a{"h:mm a – h:mm a, v"} - h{"h:mm – h:mm a, v"} - m{"h:mm – h:mm a, v"} + a{"h:mm a – h:mm a, v"} + h{"h:mm – h:mm a, v"} + m{"h:mm – h:mm a, v"} } hv{ - a{"h a – h a, v"} - h{"h – h a, v"} + a{"h a – h a, v"} + h{"h – h a, v"} } y{ - y{"y – y"} + y{"y – y"} } yM{ - M{"M.y – M.y"} - y{"M.y – M.y"} + M{"M.y – M.y"} + y{"M.y – M.y"} } yMEd{ - M{"E, d.M.y – E, d.M.y"} - d{"E, d.M.y – E, d.M.y"} - y{"E, d.M.y – E, d.M.y"} + M{"E, d.M.y – E, d.M.y"} + d{"E, d.M.y – E, d.M.y"} + y{"E, d.M.y – E, d.M.y"} } yMMM{ - M{"MMM – MMM y"} - y{"MMM y – MMM y"} + M{"MMM – MMM y"} + y{"MMM y – MMM y"} } yMMMEd{ - M{"E, d MMM – E, d MMM y"} - d{"E, d – E, d MMM y"} - y{"E, d MMM y – E, d MMM y"} + M{"E, d MMM – E, d MMM y"} + d{"E, d – E, d MMM y"} + y{"E, d MMM y – E, d MMM y"} } yMMMM{ - M{"MMMM – MMMM y"} - y{"MMMM y – MMMM y"} + M{"MMMM – MMMM y"} + y{"MMMM y – MMMM y"} } yMMMd{ - M{"d MMM – d MMM y"} - d{"d – d MMM y"} - y{"d MMM y – d MMM y"} + M{"d MMM – d MMM y"} + d{"d – d MMM y"} + y{"d MMM y – d MMM y"} } yMd{ - M{"d.M.y – d.M.y"} - d{"d.M.y – d.M.y"} - y{"d.M.y – d.M.y"} + M{"d.M.y – d.M.y"} + d{"d.M.y – d.M.y"} + y{"d.M.y – d.M.y"} } } monthNames{ diff --git a/icu4c/source/data/locales/sq_MK.txt b/icu4c/source/data/locales/sq_MK.txt index 5278cb42e225..9b854f082036 100644 --- a/icu4c/source/data/locales/sq_MK.txt +++ b/icu4c/source/data/locales/sq_MK.txt @@ -14,8 +14,8 @@ sq_MK{ "d MMM y", "d.M.yy", "{1}, {0}", - "{1} 'në' {0}", - "{1} 'në' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } diff --git a/icu4c/source/data/locales/sq_XK.txt b/icu4c/source/data/locales/sq_XK.txt index dcc1f3aa440d..109a531b1ee3 100644 --- a/icu4c/source/data/locales/sq_XK.txt +++ b/icu4c/source/data/locales/sq_XK.txt @@ -14,8 +14,8 @@ sq_XK{ "d MMM y", "d.M.yy", "{1}, {0}", - "{1} 'në' {0}", - "{1} 'në' {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } diff --git a/icu4c/source/data/locales/sr.txt b/icu4c/source/data/locales/sr.txt index 87a84a807b2e..8a771aa99fc4 100644 --- a/icu4c/source/data/locales/sr.txt +++ b/icu4c/source/data/locales/sr.txt @@ -347,8 +347,8 @@ sr{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"E d."} - Ehm{"E hh:mm a"} - Ehms{"E hh:mm:ss a"} + Ehm{"E hh:mm a"} + Ehms{"E hh:mm:ss a"} Gy{"y. G"} GyMMM{"MMM y. G"} GyMMMEd{"E, d. MMM y. G"} @@ -368,9 +368,9 @@ sr{ MMdd{"MM-dd"} Md{"d.M."} d{"d"} - h{"h a"} - hm{"hh:mm a"} - hms{"hh:mm:ss a"} + h{"h a"} + hm{"hh:mm a"} + hms{"hh:mm:ss a"} ms{"mm:ss"} y{"y. G"} yyyy{"y. G"} @@ -428,22 +428,22 @@ sr{ } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y – y. G"} @@ -529,8 +529,8 @@ sr{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"E d."} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"y. G"} GyMMM{"MMM y. G"} GyMMMEd{"E, d. MMM y. G"} @@ -557,11 +557,11 @@ sr{ MMdd{"dd.MM."} Md{"d.M."} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} - hmsv{"h:mm:ss a v"} - hmv{"h:mm a v"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} + hmsv{"h:mm:ss a v"} + hmv{"h:mm a v"} ms{"mm:ss"} y{"y."} yM{"M.y."} @@ -779,22 +779,22 @@ sr{ } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y"} diff --git a/icu4c/source/data/locales/sr_Latn.txt b/icu4c/source/data/locales/sr_Latn.txt index f6c8fb790883..e6fe5ca7783e 100644 --- a/icu4c/source/data/locales/sr_Latn.txt +++ b/icu4c/source/data/locales/sr_Latn.txt @@ -348,8 +348,8 @@ sr_Latn{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"E d."} - Ehm{"E hh:mm a"} - Ehms{"E hh:mm:ss a"} + Ehm{"E hh:mm a"} + Ehms{"E hh:mm:ss a"} Gy{"y. G"} GyMMM{"MMM y. G"} GyMMMEd{"E, d. MMM y. G"} @@ -369,9 +369,9 @@ sr_Latn{ MMdd{"MM-dd"} Md{"d.M."} d{"d"} - h{"h a"} - hm{"hh:mm a"} - hms{"hh:mm:ss a"} + h{"h a"} + hm{"hh:mm a"} + hms{"hh:mm:ss a"} ms{"mm:ss"} y{"y. G"} yyyy{"y. G"} @@ -406,80 +406,80 @@ sr_Latn{ M{"M–M"} } MEd{ - M{"E, d.M – E, d.M"} - d{"E, d.M – E, d.M"} + M{"E, d.M – E, d.M"} + d{"E, d.M – E, d.M"} } MMM{ M{"MMM–MMM"} } MMMEd{ - M{"E, dd. MMM – E, dd. MMM"} + M{"E, dd. MMM – E, dd. MMM"} d{"E, dd. – E, dd. MMM"} } MMMd{ - M{"d. MMM – d. MMM"} - d{"d – d. MMM"} + M{"d. MMM – d. MMM"} + d{"d – d. MMM"} } Md{ - M{"d.M – d.M"} - d{"d.M – d.M"} + M{"d.M – d.M"} + d{"d.M – d.M"} } d{ d{"d–d"} } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ - y{"y – y. G"} + y{"y – y. G"} } yM{ - M{"M.y – M.y. GGGGG"} - y{"M.y – M.y. GGGGG"} + M{"M.y – M.y. GGGGG"} + y{"M.y – M.y. GGGGG"} } yMEd{ - M{"E, d.M.y – E, d.M.y. GGGGG"} - d{"E, d.M.y – E, d.M.y. GGGGG"} - y{"E, d.M.y – E, d.M.y. GGGGG"} + M{"E, d.M.y – E, d.M.y. GGGGG"} + d{"E, d.M.y – E, d.M.y. GGGGG"} + y{"E, d.M.y – E, d.M.y. GGGGG"} } yMMM{ - M{"MMM – MMM y. G"} - y{"MMM y – MMM y. G"} + M{"MMM – MMM y. G"} + y{"MMM y – MMM y. G"} } yMMMEd{ - M{"E, d. MMM – E, d. MMM y. G"} - d{"E, d. MMM – E, d. MMM y. G"} - y{"E, d. MMM y – E, d. MMM y. G"} + M{"E, d. MMM – E, d. MMM y. G"} + d{"E, d. MMM – E, d. MMM y. G"} + y{"E, d. MMM y – E, d. MMM y. G"} } yMMMM{ - M{"MMMM – MMMM y. G"} + M{"MMMM – MMMM y. G"} y{"MMMM y. – MMMM y. G"} } yMMMd{ - M{"d. MMM – d. MMM y. G"} + M{"d. MMM – d. MMM y. G"} d{"d–d. MMM y. G"} y{"d. MMM y. – d. MMM y. G"} } yMd{ M{"d.M.y. – d.M.y."} - d{"d.M.y – d.M.y. GGGGG"} - y{"d.M.y – d.M.y. GGGGG"} + d{"d.M.y – d.M.y. GGGGG"} + y{"d.M.y – d.M.y. GGGGG"} } } } @@ -530,8 +530,8 @@ sr_Latn{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"E d."} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"y. G"} GyMMM{"MMM y. G"} GyMMMEd{"E, d. MMM y. G"} @@ -558,11 +558,11 @@ sr_Latn{ MMdd{"dd.MM."} Md{"d.M."} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} - hmsv{"h:mm:ss a v"} - hmv{"h:mm a v"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} + hmsv{"h:mm:ss a v"} + hmv{"h:mm a v"} ms{"mm:ss"} y{"y."} yM{"M.y."} @@ -757,51 +757,51 @@ sr_Latn{ M{"M–M"} } MEd{ - M{"E, d.M – E, d.M"} - d{"E, d.M – E, d.M"} + M{"E, d.M – E, d.M"} + d{"E, d.M – E, d.M"} } MMM{ M{"MMM–MMM"} } MMMEd{ - M{"E, dd. MMM – E, dd. MMM"} + M{"E, dd. MMM – E, dd. MMM"} d{"E, dd. – E, dd. MMM"} } MMMd{ - M{"dd. MMM – dd. MMM"} + M{"dd. MMM – dd. MMM"} d{"dd.–dd. MMM"} } Md{ - M{"d.M – d.M"} - d{"d.M – d.M"} + M{"d.M – d.M"} + d{"d.M – d.M"} } d{ d{"d–d"} } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y"} } yM{ - M{"M – M, y"} + M{"M – M, y"} y{"M.y. – M.y."} } yMEd{ @@ -814,16 +814,16 @@ sr_Latn{ y{"MMM y. – MMM y."} } yMMMEd{ - M{"E, dd. MMM – E, dd. MMM y."} + M{"E, dd. MMM – E, dd. MMM y."} d{"E, dd. – E, dd. MMM y."} y{"E, dd. MMM y. – E, dd. MMM y."} } yMMMM{ - M{"MMMM – MMMM y."} + M{"MMMM – MMMM y."} y{"MMMM y. – MMMM y."} } yMMMd{ - M{"dd. MMM – dd. MMM y."} + M{"dd. MMM – dd. MMM y."} d{"dd.–dd. MMM y."} y{"dd. MMM y. – dd. MMM y."} } diff --git a/icu4c/source/data/locales/sr_Latn_BA.txt b/icu4c/source/data/locales/sr_Latn_BA.txt index 331f1ca7deb8..738ea1f86085 100644 --- a/icu4c/source/data/locales/sr_Latn_BA.txt +++ b/icu4c/source/data/locales/sr_Latn_BA.txt @@ -6,8 +6,8 @@ sr_Latn_BA{ generic{ intervalFormats{ MMMEd{ - M{"E, d. MMM – E, d. MMM"} - d{"E, d. MMM – E, d. MMM"} + M{"E, d. MMM – E, d. MMM"} + d{"E, d. MMM – E, d. MMM"} } yMd{ M{"d.M.y. – d.M.y. GGGGG"} @@ -101,26 +101,26 @@ sr_Latn_BA{ } intervalFormats{ MEd{ - M{"E, MM-dd – E, MM-dd"} - d{"E, MM-dd – E, MM-dd"} + M{"E, MM-dd – E, MM-dd"} + d{"E, MM-dd – E, MM-dd"} } Md{ - M{"MM-dd – MM-dd"} - d{"MM-dd – MM-dd"} + M{"MM-dd – MM-dd"} + d{"MM-dd – MM-dd"} } yM{ - M{"y-MM – y-MM"} - y{"y-MM – y-MM"} + M{"y-MM – y-MM"} + y{"y-MM – y-MM"} } yMEd{ - M{"E, y-MM-dd – E, y-MM-dd"} - d{"E, y-MM-dd – E, y-MM-dd"} - y{"E, y-MM-dd – E, y-MM-dd"} + M{"E, y-MM-dd – E, y-MM-dd"} + d{"E, y-MM-dd – E, y-MM-dd"} + y{"E, y-MM-dd – E, y-MM-dd"} } yMd{ - M{"y-MM-dd – y-MM-dd"} - d{"y-MM-dd – y-MM-dd"} - y{"y-MM-dd – y-MM-dd"} + M{"y-MM-dd – y-MM-dd"} + d{"y-MM-dd – y-MM-dd"} + y{"y-MM-dd – y-MM-dd"} } } } diff --git a/icu4c/source/data/locales/sr_Latn_ME.txt b/icu4c/source/data/locales/sr_Latn_ME.txt index 36853ccf416d..0ac2a637a1cf 100644 --- a/icu4c/source/data/locales/sr_Latn_ME.txt +++ b/icu4c/source/data/locales/sr_Latn_ME.txt @@ -6,8 +6,8 @@ sr_Latn_ME{ generic{ intervalFormats{ MMMEd{ - M{"E, d. MMM – E, d. MMM"} - d{"E, d. MMM – E, d. MMM"} + M{"E, d. MMM – E, d. MMM"} + d{"E, d. MMM – E, d. MMM"} } } } diff --git a/icu4c/source/data/locales/sr_Latn_XK.txt b/icu4c/source/data/locales/sr_Latn_XK.txt index 7006bba02100..2f99e35f7e51 100644 --- a/icu4c/source/data/locales/sr_Latn_XK.txt +++ b/icu4c/source/data/locales/sr_Latn_XK.txt @@ -6,8 +6,8 @@ sr_Latn_XK{ generic{ intervalFormats{ MMMEd{ - M{"E, d. MMM – E, d. MMM"} - d{"E, d – E, d. MMM"} + M{"E, d. MMM – E, d. MMM"} + d{"E, d – E, d. MMM"} } } } diff --git a/icu4c/source/data/locales/su.txt b/icu4c/source/data/locales/su.txt index c1f09f6e1d4d..2de8db25bc44 100644 --- a/icu4c/source/data/locales/su.txt +++ b/icu4c/source/data/locales/su.txt @@ -36,6 +36,12 @@ su{ "d MMM y G", "d/M/y GGGGG", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{1} 'jam' {0}", "{1} 'jam' {0}", "{1}, {0}", @@ -66,6 +72,12 @@ su{ "d MMM y", "d/M/yy", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{1} 'jam' {0}", "{1} 'jam' {0}", "{1}, {0}", @@ -89,8 +101,8 @@ su{ EHm{"E HH.mm"} EHms{"E HH:mm:ss"} Ed{"E d"} - Ehm{"E h.mm a"} - Ehms{"E h.mm.ss a"} + Ehm{"E h.mm a"} + Ehms{"E h.mm.ss a"} Gy{"y G"} GyMMM{"MMM y G"} GyMMMEd{"E, d MMM y G"} @@ -106,11 +118,11 @@ su{ MMMMd{"d MMMM"} MMMd{"d MMM"} Md{"d/M"} - h{"h a"} - hm{"h.mm a"} - hms{"h.mm.ss a"} - hmsv{"h.mm.ss a v"} - hmv{"h.mm a v"} + h{"h a"} + hm{"h.mm a"} + hms{"h.mm.ss a"} + hmsv{"h.mm.ss a v"} + hmv{"h.mm a v"} ms{"mm.ss"} yM{"M/y"} yMEd{"E, d/M/y"} diff --git a/icu4c/source/data/locales/sv.txt b/icu4c/source/data/locales/sv.txt index 5bfae909872d..b0abafef36c6 100644 --- a/icu4c/source/data/locales/sv.txt +++ b/icu4c/source/data/locales/sv.txt @@ -305,33 +305,33 @@ sv{ } intervalFormats{ GyM{ - G{"y-MM GGGGG – y-MM GGGGG"} - M{"y-MM – y-MM GGGGG"} - y{"y-MM – y-MM GGGGG"} + G{"y-MM GGGGG – y-MM GGGGG"} + M{"y-MM – y-MM GGGGG"} + y{"y-MM – y-MM GGGGG"} } GyMEd{ - G{"E y-MM-dd GGGG – E y-MM-dd GGGG"} - M{"E d/M y – E d/M y GGGGG"} - d{"E y-MM-dd – E y-MM-dd GGGGG"} - y{"E y-MM-dd – E y-MM-dd GGGGG"} + G{"E y-MM-dd GGGG – E y-MM-dd GGGG"} + M{"E d/M y – E d/M y GGGGG"} + d{"E y-MM-dd – E y-MM-dd GGGGG"} + y{"E y-MM-dd – E y-MM-dd GGGGG"} } GyMd{ - G{"y-MM-dd GGGGG – y-MM-dd GGGGG"} - M{"y-MM-dd – y-MM-dd GGGGG"} - d{"y-MM-dd – y-MM-dd GGGGG"} - y{"y-MM-dd – y-MM-dd GGGGG"} + G{"y-MM-dd GGGGG – y-MM-dd GGGGG"} + M{"y-MM-dd – y-MM-dd GGGGG"} + d{"y-MM-dd – y-MM-dd GGGGG"} + y{"y-MM-dd – y-MM-dd GGGGG"} } hmv{ - h{"h:mm–h:mm a v"} + h{"h:mm–h:mm a v"} } yM{ - M{"y-MM – MM GGGGG"} - y{"y-MM – y-MM GGGGG"} + M{"y-MM – MM GGGGG"} + y{"y-MM – y-MM GGGGG"} } yMEd{ - M{"E y-MM-dd – E y-MM-dd GGGGG"} - d{"E y-MM-dd – E y-MM-dd GGGGG"} - y{"E y-MM-dd – E y-MM-dd GGGGG"} + M{"E y-MM-dd – E y-MM-dd GGGGG"} + d{"E y-MM-dd – E y-MM-dd GGGGG"} + y{"E y-MM-dd – E y-MM-dd GGGGG"} } yMMMEd{ M{"E d MMM–E d MMM y G"} @@ -339,9 +339,9 @@ sv{ y{"E d MMM y–E d MMM y G"} } yMd{ - M{"y-MM-dd – MM-dd GGGGG"} - d{"y-MM-d – d GGGGG"} - y{"y-MM-dd – y-MM-dd GGGGG"} + M{"y-MM-dd – MM-dd GGGGG"} + d{"y-MM-d – d GGGGG"} + y{"y-MM-dd – y-MM-dd GGGGG"} } } } @@ -396,38 +396,38 @@ sv{ } intervalFormats{ MEd{ - M{"E MM-dd – E MM-dd"} - d{"E MM-dd – E MM-dd"} + M{"E MM-dd – E MM-dd"} + d{"E MM-dd – E MM-dd"} } MMMEd{ - M{"E d MMM – E d MMM"} - d{"E d MMM – E d MMM"} + M{"E d MMM – E d MMM"} + d{"E d MMM – E d MMM"} } MMMd{ - M{"d MMM – d MMM"} + M{"d MMM – d MMM"} d{"d–d MMM"} } yMEd{ - M{"E y-MM-dd – E y-MM-dd"} - d{"E y-MM-dd – E y-MM-dd"} - y{"E y-MM-dd – E y-MM-dd"} + M{"E y-MM-dd – E y-MM-dd"} + d{"E y-MM-dd – E y-MM-dd"} + y{"E y-MM-dd – E y-MM-dd"} } yMMM{ - M{"MMM – MMM U"} - y{"MMM U – MMM U"} + M{"MMM – MMM U"} + y{"MMM U – MMM U"} } yMMMEd{ - M{"E d MMM – E d MMM U"} - d{"E d MMM – E d MMM U"} - y{"E d MMM U – E d MMM U"} + M{"E d MMM – E d MMM U"} + d{"E d MMM – E d MMM U"} + y{"E d MMM U – E d MMM U"} } yMMMM{ M{"MMMM–MMMM U"} } yMMMd{ - M{"d MMM – d MMM U"} + M{"d MMM – d MMM U"} d{"d–d MMM U"} - y{"d MMM U – d MMM U"} + y{"d MMM U – d MMM U"} } } monthNames{ @@ -721,8 +721,8 @@ sv{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"E d"} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"y G"} GyMMM{"MMM y G"} GyMMMEd{"E d MMM y G"} @@ -742,9 +742,9 @@ sv{ MMdd{"dd/MM"} Md{"d/M"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"mm:ss"} y{"y G"} yyyy{"y G"} @@ -761,15 +761,15 @@ sv{ } intervalFormats{ Bh{ - h{"h – h B"} + h{"h – h B"} } Bhm{ - h{"h:mm – h:mm B"} - m{"h:mm – h:mm B"} + h{"h:mm – h:mm B"} + m{"h:mm – h:mm B"} } Gy{ G{"y G–y G"} - y{"y – y G"} + y{"y – y G"} } GyM{ G{"M/y GGGGG–M/y GGGGG"} @@ -777,44 +777,44 @@ sv{ y{"M/y–M/y GGGGG"} } GyMEd{ - G{"E y-MM-dd GGGG – E y-MM-dd GGGG"} - M{"E d/M y – E d/M y GGGGG"} - d{"E y-MM-dd – E y-MM-dd GGGGG"} - y{"E d/M y – E d/M y GGGGG"} + G{"E y-MM-dd GGGG – E y-MM-dd GGGG"} + M{"E d/M y – E d/M y GGGGG"} + d{"E y-MM-dd – E y-MM-dd GGGGG"} + y{"E d/M y – E d/M y GGGGG"} } GyMMM{ - G{"MMM y G – MMM y G"} - M{"MMM – MMM y G"} - y{"MMM y – MMM y G"} + G{"MMM y G – MMM y G"} + M{"MMM – MMM y G"} + y{"MMM y – MMM y G"} } GyMMMEd{ - G{"E d MMM y G – E d MMM y G"} - M{"E d MMM – E d MMM y G"} - d{"E d MMM – E d MMM y G"} - y{"E d MMM y – E d MMM y G"} + G{"E d MMM y G – E d MMM y G"} + M{"E d MMM – E d MMM y G"} + d{"E d MMM – E d MMM y G"} + y{"E d MMM y – E d MMM y G"} } GyMMMd{ - G{"d MMM y G – d MMM y G"} - M{"d MMM – d MMM y G"} + G{"d MMM y G – d MMM y G"} + M{"d MMM – d MMM y G"} d{"d–d MMM y G"} - y{"d MMM y G – d MMM d y"} + y{"d MMM y G – d MMM d y"} } GyMd{ - G{"y-MM-dd GGGGG – y-MM-dd GGGGG"} + G{"y-MM-dd GGGGG – y-MM-dd GGGGG"} M{"d/M/y–d/M/y GGGGG"} d{"d/M/y–d/M/y GGGGG"} - y{"y-MM-dd – y-MM-dd GGGGG"} + y{"y-MM-dd – y-MM-dd GGGGG"} } H{ H{"HH–HH"} } Hm{ - H{"HH:mm – HH:mm"} - m{"HH:mm – HH:mm"} + H{"HH:mm – HH:mm"} + m{"HH:mm – HH:mm"} } Hmv{ - H{"HH:mm – HH:mm v"} - m{"HH:mm – HH:mm v"} + H{"HH:mm – HH:mm v"} + m{"HH:mm – HH:mm v"} } Hv{ H{"HH–HH v"} @@ -823,18 +823,18 @@ sv{ M{"M–M"} } MEd{ - M{"E d/M – E d/M"} - d{"E d/M – E d/M"} + M{"E d/M – E d/M"} + d{"E d/M – E d/M"} } MMM{ M{"MMM–MMM"} } MMMEd{ - M{"E d MMM – E d MMM"} - d{"E d – E d MMM"} + M{"E d MMM – E d MMM"} + d{"E d – E d MMM"} } MMMd{ - M{"d MMM – d MMM"} + M{"d MMM – d MMM"} d{"d–d MMM"} } Md{ @@ -846,47 +846,47 @@ sv{ } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y G"} } yM{ - M{"y-MM – y-MM GGGGG"} - y{"y-MM – y-MM GGGGG"} + M{"y-MM – y-MM GGGGG"} + y{"y-MM – y-MM GGGGG"} } yMEd{ - M{"E y-MM-dd – E y-MM-dd GGGGG"} - d{"E y-MM-dd – E y-MM-dd GGGGG"} - y{"E y-MM-dd – E y-MM-dd GGGGG"} + M{"E y-MM-dd – E y-MM-dd GGGGG"} + d{"E y-MM-dd – E y-MM-dd GGGGG"} + y{"E y-MM-dd – E y-MM-dd GGGGG"} } yMMM{ M{"MMM–MMM y G"} - y{"MMM y – MMM y G"} + y{"MMM y – MMM y G"} } yMMMEd{ M{"E d MMM–E d MMM y G"} - d{"E d MMM – E d MMM y G"} + d{"E d MMM – E d MMM y G"} y{"E d MMM y–E d MMM y G"} } yMMMM{ M{"MMMM–MMMM y G"} - y{"MMMM y – MMMM y G"} + y{"MMMM y – MMMM y G"} } yMMMd{ M{"d MMM–d MMM y G"} @@ -894,9 +894,9 @@ sv{ y{"d MMM y–d MMM y G"} } yMd{ - M{"d/M y – d/M y GGGGG"} - d{"d/M y – d/M y GGGGG"} - y{"d/M y – d/M y GGGGG"} + M{"d/M y – d/M y GGGGG"} + d{"d/M y – d/M y GGGGG"} + y{"d/M y – d/M y GGGGG"} } } } @@ -951,8 +951,8 @@ sv{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"E d"} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"y G"} GyMMM{"MMM y G"} GyMMMEd{"E d MMM y G"} @@ -978,11 +978,11 @@ sv{ MMdd{"dd/MM"} Md{"d/M"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} - hmsv{"h:mm:ss a v"} - hmv{"h:mm a v"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} + hmsv{"h:mm:ss a v"} + hmv{"h:mm a v"} ms{"mm:ss"} y{"y"} yM{"y-MM"} @@ -1170,11 +1170,11 @@ sv{ } Bhm{ B{"h:mm B–h:mm B"} - h{"hh:mm – hh:mm B"} - m{"hh:mm – hh:mm B"} + h{"hh:mm – hh:mm B"} + m{"hh:mm – hh:mm B"} } Gy{ - G{"y G – y G"} + G{"y G – y G"} y{"y–y G"} } GyM{ @@ -1189,21 +1189,21 @@ sv{ y{"E, d/M/y–E, d/M/y GGGGG"} } GyMMM{ - G{"MMM y G – MMM y G"} - M{"MMM – MMM y G"} - y{"MMM y – MMM y G"} + G{"MMM y G – MMM y G"} + M{"MMM – MMM y G"} + y{"MMM y – MMM y G"} } GyMMMEd{ - G{"d MMM y G, E – d MMM y G, E"} - M{"E d MMM y G – E d MMM"} - d{"E d MMM y G – E d MMM"} - y{"E d MMM y G – E d MMM y"} + G{"d MMM y G, E – d MMM y G, E"} + M{"E d MMM y G – E d MMM"} + d{"E d MMM y G – E d MMM"} + y{"E d MMM y G – E d MMM y"} } GyMMMd{ - G{"d MMM y G – d MMM y G"} - M{"d MMM – d MMM y G"} + G{"d MMM y G – d MMM y G"} + M{"d MMM – d MMM y G"} d{"d–d MMM y G"} - y{"d MMM y G – d MMM y"} + y{"d MMM y G – d MMM y"} } GyMd{ G{"d/M/y GGGGG–d/M/y GGGGG"} @@ -1229,18 +1229,18 @@ sv{ M{"M–M"} } MEd{ - M{"E d/M – E d/M"} - d{"E d/M – E d/M"} + M{"E d/M – E d/M"} + d{"E d/M – E d/M"} } MMM{ M{"MMM–MMM"} } MMMEd{ - M{"E d MMM – E d MMM"} - d{"E d – E d MMM"} + M{"E d MMM – E d MMM"} + d{"E d – E d MMM"} } MMMd{ - M{"d MMM – d MMM"} + M{"d MMM – d MMM"} d{"d–d MMM"} } Md{ @@ -1252,38 +1252,38 @@ sv{ } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y"} } yM{ - M{"y-MM – MM"} - y{"y-MM – y-MM"} + M{"y-MM – MM"} + y{"y-MM – y-MM"} } yMEd{ - M{"E, y-MM-dd – E, y-MM-dd"} - d{"E, y-MM-dd – E, y-MM-dd"} - y{"E, y-MM-dd – E, y-MM-dd"} + M{"E, y-MM-dd – E, y-MM-dd"} + d{"E, y-MM-dd – E, y-MM-dd"} + y{"E, y-MM-dd – E, y-MM-dd"} } yMMM{ M{"MMM–MMM y"} - y{"MMM y – MMM y"} + y{"MMM y – MMM y"} } yMMMEd{ M{"E dd MMM–E dd MMM y"} @@ -1292,7 +1292,7 @@ sv{ } yMMMM{ M{"MMMM–MMMM y"} - y{"MMMM y – MMMM y"} + y{"MMMM y – MMMM y"} } yMMMd{ M{"d MMM–d MMM y"} @@ -1300,9 +1300,9 @@ sv{ y{"d MMM y–d MMM y"} } yMd{ - M{"y-MM-dd – MM-dd"} - d{"y-MM-dd – dd"} - y{"y-MM-dd – y-MM-dd"} + M{"y-MM-dd – MM-dd"} + d{"y-MM-dd – dd"} + y{"y-MM-dd – y-MM-dd"} } } monthNames{ @@ -1452,11 +1452,11 @@ sv{ } intervalFormats{ Bh{ - h{"h – h B"} + h{"h – h B"} } Bhm{ - h{"h:mm – h:mm B"} - m{"h:mm – h:mm B"} + h{"h:mm – h:mm B"} + m{"h:mm – h:mm B"} } } monthNames{ diff --git a/icu4c/source/data/locales/sv_FI.txt b/icu4c/source/data/locales/sv_FI.txt index 05a6cc7683cc..4a9a1c68ccc4 100644 --- a/icu4c/source/data/locales/sv_FI.txt +++ b/icu4c/source/data/locales/sv_FI.txt @@ -18,8 +18,8 @@ sv_FI{ EBhms{"E h.mm.ss B"} EHm{"E HH.mm"} EHms{"E HH.mm.ss"} - Ehm{"E h.mm a"} - Ehms{"E h.mm.ss a"} + Ehm{"E h.mm a"} + Ehms{"E h.mm.ss a"} Hm{"HH.mm"} Hms{"HH.mm.ss"} Hmsv{"HH.mm.ss v"} @@ -28,10 +28,10 @@ sv_FI{ MMd{"d.M"} MMdd{"dd.MM"} Md{"d.M"} - hm{"h.mm a"} - hms{"h.mm.ss a"} - hmsv{"h.mm.ss a v"} - hmv{"h.mm a v"} + hm{"h.mm a"} + hms{"h.mm.ss a"} + hmsv{"h.mm.ss a v"} + hmv{"h.mm a v"} ms{"mm.ss"} } quarters{ diff --git a/icu4c/source/data/locales/sw.txt b/icu4c/source/data/locales/sw.txt index 271f89e1b40c..7689c3497031 100644 --- a/icu4c/source/data/locales/sw.txt +++ b/icu4c/source/data/locales/sw.txt @@ -251,8 +251,8 @@ sw{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"E d"} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"y G"} GyMMM{"MMM y G"} GyMMMEd{"E, d MMM y G"} @@ -270,9 +270,9 @@ sw{ MMMd{"d MMM"} Md{"d-M"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"mm:ss"} y{"y G"} yyyy{"y G"} @@ -288,135 +288,135 @@ sw{ } intervalFormats{ Gy{ - G{"y G – y G"} - y{"y – y G"} + G{"y G – y G"} + y{"y – y G"} } GyM{ - G{"M/y GGGGG – M/y GGGGG"} - M{"M/y – M/y GGGGG"} - y{"M/y – M/y GGGGG"} + G{"M/y GGGGG – M/y GGGGG"} + M{"M/y – M/y GGGGG"} + y{"M/y – M/y GGGGG"} } GyMEd{ - G{"E, d/M/y GGGGG – E, d/M/y GGGGG"} - M{"E, d/M/y – E, d/M/y GGGGG"} - d{"E, d/M/y – E, d/M/y GGGGG"} - y{"E, d/M/y – E, d/M/y GGGGG"} + G{"E, d/M/y GGGGG – E, d/M/y GGGGG"} + M{"E, d/M/y – E, d/M/y GGGGG"} + d{"E, d/M/y – E, d/M/y GGGGG"} + y{"E, d/M/y – E, d/M/y GGGGG"} } GyMMM{ - G{"MMM y G – MMM y G"} - M{"MMM – MMM y G"} - y{"MMM y – MMM y G"} + G{"MMM y G – MMM y G"} + M{"MMM – MMM y G"} + y{"MMM y – MMM y G"} } GyMMMEd{ - G{"E, MMM d, y G – E, MMM d, y G"} - M{"E, MMM d – E, MMM d, y G"} - d{"E, MMM d – E, MMM d, y G"} - y{"E, MMM d, y – E, MMM d, y G"} + G{"E, MMM d, y G – E, MMM d, y G"} + M{"E, MMM d – E, MMM d, y G"} + d{"E, MMM d – E, MMM d, y G"} + y{"E, MMM d, y – E, MMM d, y G"} } GyMMMd{ - G{"MMM d, y G – MMM d, y G"} - M{"MMM d – MMM d, y G"} - d{"MMM d – d, y G"} - y{"MMM d, y – MMM d, y G"} + G{"MMM d, y G – MMM d, y G"} + M{"MMM d – MMM d, y G"} + d{"MMM d – d, y G"} + y{"MMM d, y – MMM d, y G"} } GyMd{ - G{"d/M/y GGGGG – d/M/y GGGGG"} - M{"d/M/y – d/M/y GGGGG"} - d{"d/M/y – d/M/y GGGGG"} - y{"d/M/y – d/M/y GGGGG"} + G{"d/M/y GGGGG – d/M/y GGGGG"} + M{"d/M/y – d/M/y GGGGG"} + d{"d/M/y – d/M/y GGGGG"} + y{"d/M/y – d/M/y GGGGG"} } H{ - H{"HH – HH"} + H{"HH – HH"} } Hm{ - H{"HH:mm – HH:mm"} - m{"HH:mm – HH:mm"} + H{"HH:mm – HH:mm"} + m{"HH:mm – HH:mm"} } Hmv{ - H{"HH:mm – HH:mm v"} - m{"HH:mm – HH:mm v"} + H{"HH:mm – HH:mm v"} + m{"HH:mm – HH:mm v"} } Hv{ - H{"HH – HH v"} + H{"HH – HH v"} } M{ - M{"M – M"} + M{"M – M"} } MEd{ - M{"E, d/M – E, d/M"} - d{"E, d/M – E, d/M"} + M{"E, d/M – E, d/M"} + d{"E, d/M – E, d/M"} } MMM{ - M{"MMM – MMM"} + M{"MMM – MMM"} } MMMEd{ - M{"E, d MMM – E, d MMM"} - d{"E, d MMM – E, d MMM"} + M{"E, d MMM – E, d MMM"} + d{"E, d MMM – E, d MMM"} } MMMd{ - M{"d MMM – d MMM"} - d{"d – d MMM"} + M{"d MMM – d MMM"} + d{"d – d MMM"} } Md{ - M{"d/M – d/M"} - d{"d/M – d/M"} + M{"d/M – d/M"} + d{"d/M – d/M"} } d{ - d{"d – d"} + d{"d – d"} } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h – h a"} + a{"h a – h a"} + h{"h – h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm – h:mm a"} - m{"h:mm – h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm – h:mm a"} + m{"h:mm – h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm – h:mm a v"} - m{"h:mm – h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm – h:mm a v"} + m{"h:mm – h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h – h a v"} + a{"h a – h a v"} + h{"h – h a v"} } y{ - y{"y – y G"} + y{"y – y G"} } yM{ - M{"M/y – M/y G"} - y{"M/y – M/y G"} + M{"M/y – M/y G"} + y{"M/y – M/y G"} } yMEd{ - M{"E, d/M/y – E, d/M/y G"} - d{"E, d/M/y – E, d/M/y G"} - y{"E, d/M/y – E, d/M/y G"} + M{"E, d/M/y – E, d/M/y G"} + d{"E, d/M/y – E, d/M/y G"} + y{"E, d/M/y – E, d/M/y G"} } yMMM{ - M{"MMM – MMM y G"} - y{"MMM y – MMM y G"} + M{"MMM – MMM y G"} + y{"MMM y – MMM y G"} } yMMMEd{ - M{"E, d MMM – E, d MMM y"} - d{"E, d MMM – E, d MMM y G"} - y{"E, d MMM y – E, d MMM y"} + M{"E, d MMM – E, d MMM y"} + d{"E, d MMM – E, d MMM y G"} + y{"E, d MMM y – E, d MMM y"} } yMMMM{ M{"MMMM–MMMM y G"} - y{"MMMM y – MMMM y G"} + y{"MMMM y – MMMM y G"} } yMMMd{ - M{"d MMM – d MMM y G"} - d{"d – d MMM y G"} - y{"d MMM y – d MMM y G"} + M{"d MMM – d MMM y G"} + d{"d – d MMM y G"} + y{"d MMM y – d MMM y G"} } yMd{ - M{"d/M/y – d/M/y G"} - d{"d/M/y – d/M/y G"} - y{"d/M/y – d/M/y G"} + M{"d/M/y – d/M/y G"} + d{"d/M/y – d/M/y G"} + y{"d/M/y – d/M/y G"} } } } @@ -471,8 +471,8 @@ sw{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"E d"} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"y G"} GyMMM{"MMM y G"} GyMMMEd{"E, d MMM y G"} @@ -496,11 +496,11 @@ sw{ MMMd{"d MMM"} Md{"d/M"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} - hmsv{"h:mm:ss a v"} - hmv{"h:mm a v"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} + hmsv{"h:mm:ss a v"} + hmv{"h:mm a v"} ms{"mm:ss"} y{"y"} yM{"M/y"} @@ -681,135 +681,135 @@ sw{ } intervalFormats{ Gy{ - G{"y G – y G"} - y{"y – y G"} + G{"y G – y G"} + y{"y – y G"} } GyM{ - G{"M/y GGGGG – M/y GGGGG"} - M{"M/y – M/y GGGGG"} - y{"M/y – M/y GGGGG"} + G{"M/y GGGGG – M/y GGGGG"} + M{"M/y – M/y GGGGG"} + y{"M/y – M/y GGGGG"} } GyMEd{ - G{"E, d/M/y GGGGG – E, d/M/y GGGGG"} - M{"E, d/M/y – E, d/M/y GGGGG"} - d{"E, d/M/y – E, d/M/y GGGGG"} - y{"E, d/M/y – E, d/M/y GGGGG"} + G{"E, d/M/y GGGGG – E, d/M/y GGGGG"} + M{"E, d/M/y – E, d/M/y GGGGG"} + d{"E, d/M/y – E, d/M/y GGGGG"} + y{"E, d/M/y – E, d/M/y GGGGG"} } GyMMM{ - G{"MMM y G – MMM y G"} - M{"MMM – MMM y G"} - y{"MMM y – MMM y G"} + G{"MMM y G – MMM y G"} + M{"MMM – MMM y G"} + y{"MMM y – MMM y G"} } GyMMMEd{ - G{"E, d MMM y G – E, d MMM y G"} - M{"E, d MMM – E, d MMM y G"} - d{"E, d MMM – E, d MMM y G"} - y{"E, d MMM y – E, d MMM y G"} + G{"E, d MMM y G – E, d MMM y G"} + M{"E, d MMM – E, d MMM y G"} + d{"E, d MMM – E, d MMM y G"} + y{"E, d MMM y – E, d MMM y G"} } GyMMMd{ - G{"d MMM y G – d MMM y G"} - M{"d MMM – d MMM y G"} - d{"d – d MMM y G"} - y{"d MMM y – d MMM y G"} + G{"d MMM y G – d MMM y G"} + M{"d MMM – d MMM y G"} + d{"d – d MMM y G"} + y{"d MMM y – d MMM y G"} } GyMd{ - G{"d/M/y GGGGG – d/M/y GGGGG"} - M{"d/M/y – d/M/y GGGGG"} - d{"d/M/y – d/M/y GGGGG"} - y{"d/M/y – d/M/y GGGGG"} + G{"d/M/y GGGGG – d/M/y GGGGG"} + M{"d/M/y – d/M/y GGGGG"} + d{"d/M/y – d/M/y GGGGG"} + y{"d/M/y – d/M/y GGGGG"} } H{ - H{"HH – HH"} + H{"HH – HH"} } Hm{ - H{"HH:mm – HH:mm"} - m{"HH:mm – HH:mm"} + H{"HH:mm – HH:mm"} + m{"HH:mm – HH:mm"} } Hmv{ - H{"HH:mm – HH:mm v"} - m{"HH:mm – HH:mm v"} + H{"HH:mm – HH:mm v"} + m{"HH:mm – HH:mm v"} } Hv{ - H{"HH – HH v"} + H{"HH – HH v"} } M{ - M{"M – M"} + M{"M – M"} } MEd{ - M{"E, d/M – E, d/M"} - d{"E, d/M – E, d/M"} + M{"E, d/M – E, d/M"} + d{"E, d/M – E, d/M"} } MMM{ M{"LLL–LLL"} } MMMEd{ - M{"E, d MMM – E, d MMM"} - d{"E, d MMM – E, d MMM"} + M{"E, d MMM – E, d MMM"} + d{"E, d MMM – E, d MMM"} } MMMd{ - M{"d MMM – d MMM"} - d{"d – d MMM"} + M{"d MMM – d MMM"} + d{"d – d MMM"} } Md{ - M{"d/M – d/M"} - d{"d/M – d/M"} + M{"d/M – d/M"} + d{"d/M – d/M"} } d{ - d{"d – d"} + d{"d – d"} } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h – h a"} + a{"h a – h a"} + h{"h – h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm – h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm – h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm – h:mm a v"} - m{"h:mm – h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm – h:mm a v"} + m{"h:mm – h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h – h a v"} + a{"h a – h a v"} + h{"h – h a v"} } y{ y{"y–y"} } yM{ - M{"M/y – M/y"} - y{"M/y – M/y"} + M{"M/y – M/y"} + y{"M/y – M/y"} } yMEd{ - M{"E, d/M/y – E, d/M/y"} - d{"E, d/M/y – E, d/M/y"} - y{"E, d/M/y – E, d/M/y"} + M{"E, d/M/y – E, d/M/y"} + d{"E, d/M/y – E, d/M/y"} + y{"E, d/M/y – E, d/M/y"} } yMMM{ - M{"MMM – MMM y"} - y{"MMM y – MMM y"} + M{"MMM – MMM y"} + y{"MMM y – MMM y"} } yMMMEd{ - M{"E, d MMM – E, d MMM y"} - d{"E, d MMM – E, d MMM y"} - y{"E, d MMM y – E, d MMM y"} + M{"E, d MMM – E, d MMM y"} + d{"E, d MMM – E, d MMM y"} + y{"E, d MMM y – E, d MMM y"} } yMMMM{ M{"MMMM–MMMM y"} - y{"MMMM y – MMMM y"} + y{"MMMM y – MMMM y"} } yMMMd{ - M{"d – d MMM y"} - d{"d – d MMM y"} - y{"d MMM y – d MMM y"} + M{"d – d MMM y"} + d{"d – d MMM y"} + y{"d MMM y – d MMM y"} } yMd{ - M{"d/M/y – d/M/y"} - d{"d/M/y – d/M/y"} - y{"d/M/y – d/M/y"} + M{"d/M/y – d/M/y"} + d{"d/M/y – d/M/y"} + y{"d/M/y – d/M/y"} } } monthNames{ diff --git a/icu4c/source/data/locales/sw_KE.txt b/icu4c/source/data/locales/sw_KE.txt index a9ef6b1867d6..9e51946797fb 100644 --- a/icu4c/source/data/locales/sw_KE.txt +++ b/icu4c/source/data/locales/sw_KE.txt @@ -161,6 +161,12 @@ sw_KE{ "d MMM y G", "dd/MM/y GGGGG", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{1} 'saa' {0}", "{1} 'saa' {0}", "{1}, {0}", diff --git a/icu4c/source/data/locales/ta.txt b/icu4c/source/data/locales/ta.txt index dd50ef09f4a4..183693ebc545 100644 --- a/icu4c/source/data/locales/ta.txt +++ b/icu4c/source/data/locales/ta.txt @@ -552,6 +552,12 @@ ta{ "d MMM, y G", "d/M/y GGGGG", "{1}, {0}", + "{1} {0}", + "{1} {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{1} அன்று {0}", "{1} {0}", "{1}, {0}", @@ -731,6 +737,12 @@ ta{ "d MMM, y", "d/M/yy", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{1} அன்று {0}", "{1} அன்று {0}", "{1}, {0}", diff --git a/icu4c/source/data/locales/ta_LK.txt b/icu4c/source/data/locales/ta_LK.txt index f7e19c88c3b9..285b3a8aae6b 100644 --- a/icu4c/source/data/locales/ta_LK.txt +++ b/icu4c/source/data/locales/ta_LK.txt @@ -14,8 +14,8 @@ ta_LK{ "d MMM, y", "d/M/yy", "{1}, {0}", - "{1} அன்று {0}", - "{1} அன்று {0}", + "{1}, {0}", + "{1}, {0}", "{1}, {0}", "{1}, {0}", } diff --git a/icu4c/source/data/locales/te.txt b/icu4c/source/data/locales/te.txt index 062fd2c15ec0..296cbfd69724 100644 --- a/icu4c/source/data/locales/te.txt +++ b/icu4c/source/data/locales/te.txt @@ -685,6 +685,12 @@ te{ "d MMM, y", "dd-MM-yy", "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + } + DateTimePatterns%atTime{ "{1} {0}కి", "{1} {0}కి", "{1} {0}", diff --git a/icu4c/source/data/locales/teo.txt b/icu4c/source/data/locales/teo.txt index 8194a132c72b..2774ace3846a 100644 --- a/icu4c/source/data/locales/teo.txt +++ b/icu4c/source/data/locales/teo.txt @@ -52,7 +52,7 @@ teo{ MMMd{"MMM d"} Md{"M/d"} d{"d"} - hm{"h:mm a"} + hm{"h:mm a"} ms{"mm:ss"} y{"y"} yM{"M/y"} @@ -110,7 +110,7 @@ teo{ MMMd{"MMM d"} Md{"M/d"} d{"d"} - hm{"h:mm a"} + hm{"h:mm a"} ms{"mm:ss"} y{"y"} yM{"M/y"} diff --git a/icu4c/source/data/locales/tg.txt b/icu4c/source/data/locales/tg.txt index e082978082b1..b64ab0302a8f 100644 --- a/icu4c/source/data/locales/tg.txt +++ b/icu4c/source/data/locales/tg.txt @@ -195,8 +195,8 @@ tg{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"d, E"} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"y G"} GyMMM{"MMM y G"} GyMMMEd{"E, d MMM y G"} @@ -212,9 +212,9 @@ tg{ MMMd{"d MMM"} Md{"dd-MM"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"mm:ss"} y{"y G"} yyyy{"y G"} @@ -382,8 +382,8 @@ tg{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"d, E"} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"y G"} GyMMM{"MMM y G"} GyMMMEd{"E, d MMM, y G"} @@ -404,11 +404,11 @@ tg{ MMMd{"d MMM"} Md{"dd-MM"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} - hmsv{"h:mm:ss a v"} - hmv{"h:mm a v"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} + hmsv{"h:mm:ss a v"} + hmv{"h:mm a v"} ms{"mm:ss"} y{"y"} yM{"MM-y"} @@ -609,22 +609,22 @@ tg{ } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h – h a"} + a{"h a – h a"} + h{"h – h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm – h:mm a"} - m{"h:mm – h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm – h:mm a"} + m{"h:mm – h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm – h:mm a v"} - m{"h:mm – h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm – h:mm a v"} + m{"h:mm – h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h – h a v"} + a{"h a – h a v"} + h{"h – h a v"} } y{ y{"y – y"} diff --git a/icu4c/source/data/locales/ti.txt b/icu4c/source/data/locales/ti.txt index 034cffc76762..c203685e437d 100644 --- a/icu4c/source/data/locales/ti.txt +++ b/icu4c/source/data/locales/ti.txt @@ -242,6 +242,12 @@ ti{ "d MMM y G", "dd/MM/yy GGGGG", "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + } + DateTimePatterns%atTime{ "{1} ሰዓት {0}", "{1} ሰዓት {0}", "{1} {0}", @@ -354,6 +360,12 @@ ti{ "d MMM y", "dd/MM/yy", "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + } + DateTimePatterns%atTime{ "{1} ሰዓት {0}", "{1} ሰዓት {0}", "{1} {0}", diff --git a/icu4c/source/data/locales/ti_ER.txt b/icu4c/source/data/locales/ti_ER.txt index 0fe6afda1e82..55f2beec72fc 100644 --- a/icu4c/source/data/locales/ti_ER.txt +++ b/icu4c/source/data/locales/ti_ER.txt @@ -14,8 +14,8 @@ ti_ER{ "d MMM y G", "dd/MM/yy GGGGG", "{1} {0}", - "{1} ሰዓት {0}", - "{1} ሰዓት {0}", + "{1} {0}", + "{1} {0}", "{1} {0}", "{1} {0}", } diff --git a/icu4c/source/data/locales/tk.txt b/icu4c/source/data/locales/tk.txt index c1614edfc5c2..b07a0f45e981 100644 --- a/icu4c/source/data/locales/tk.txt +++ b/icu4c/source/data/locales/tk.txt @@ -250,8 +250,8 @@ tk{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"d E"} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"G y"} GyMMM{"G y MMM"} GyMMMEd{"G y MMM d, E"} @@ -269,9 +269,9 @@ tk{ MMMd{"d MMM"} Md{"dd.MM"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"mm:ss"} y{"y"} yM{"MM.y"} @@ -294,35 +294,35 @@ tk{ } intervalFormats{ Bh{ - B{"h B – h B"} + B{"h B – h B"} h{"h–h B"} } Bhm{ - B{"h:mm B – h:mm B"} + B{"h:mm B – h:mm B"} h{"h:mm–h:mm B"} m{"h:mm–h:mm B"} } M{ - M{"MM – MM"} + M{"MM – MM"} } MEd{ - M{"dd.MM E – dd.MM E"} - d{"dd.MM E – dd.MM E"} + M{"dd.MM E – dd.MM E"} + d{"dd.MM E – dd.MM E"} } MMM{ M{"MMM–MMM"} } MMMEd{ - M{"d MMM E – d MMM E"} - d{"d MMM E – d MMM E"} + M{"d MMM E – d MMM E"} + d{"d MMM E – d MMM E"} } MMMd{ - M{"d MMM – d MMM"} - d{"d – d MMM"} + M{"d MMM – d MMM"} + d{"d – d MMM"} } Md{ - M{"dd.MM – dd.MM"} - d{"dd.MM – dd.MM"} + M{"dd.MM – dd.MM"} + d{"dd.MM – dd.MM"} } d{ d{"d–d"} @@ -332,36 +332,36 @@ tk{ y{"y–y"} } yM{ - M{"MM.y – MM.y"} - y{"MM.y – MM.y"} + M{"MM.y – MM.y"} + y{"MM.y – MM.y"} } yMEd{ - M{"dd.MM.y E – dd.MM.y E"} - d{"dd.MM.y E – dd.MM.y E"} - y{"dd.MM.y E – dd.MM.y E"} + M{"dd.MM.y E – dd.MM.y E"} + d{"dd.MM.y E – dd.MM.y E"} + y{"dd.MM.y E – dd.MM.y E"} } yMMM{ M{"MMM–MMM y"} - y{"MMM y – MMM y"} + y{"MMM y – MMM y"} } yMMMEd{ - M{"d MMM y E – d MMM y E"} - d{"d MMM y E – d MMM y E"} - y{"d MMM y E – d MMM y E"} + M{"d MMM y E – d MMM y E"} + d{"d MMM y E – d MMM y E"} + y{"d MMM y E – d MMM y E"} } yMMMM{ M{"MMMM–MMMM y"} - y{"MMMM y – MMMM y"} + y{"MMMM y – MMMM y"} } yMMMd{ - M{"d MMM – d MMM y"} - d{"d – d MMM y"} - y{"d MMM y – d MMM y"} + M{"d MMM – d MMM y"} + d{"d – d MMM y"} + y{"d MMM y – d MMM y"} } yMd{ - M{"dd.MM.y – dd.MM.y"} - d{"dd.MM.y – dd.MM.y"} - y{"dd.MM.y – dd.MM.y"} + M{"dd.MM.y – dd.MM.y"} + d{"dd.MM.y – dd.MM.y"} + y{"dd.MM.y – dd.MM.y"} } } } @@ -416,8 +416,8 @@ tk{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"d E"} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"G y"} GyMMM{"G MMM y"} GyMMMEd{"G d MMM y E"} @@ -441,11 +441,11 @@ tk{ MMMd{"d MMM"} Md{"dd.MM"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} - hmsv{"h:mm:ss a v"} - hmv{"h:mm a v"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} + hmsv{"h:mm:ss a v"} + hmv{"h:mm a v"} mmss{"mm:ss"} ms{"mm:ss"} y{"y"} @@ -577,47 +577,47 @@ tk{ } intervalFormats{ Bh{ - B{"h B – h B"} - h{"h – h B"} + B{"h B – h B"} + h{"h – h B"} } Bhm{ - B{"h:mm B – h:mm B"} - h{"h:mm – h:mm B"} + B{"h:mm B – h:mm B"} + h{"h:mm – h:mm B"} m{"h:mm–h:mm B"} } GyM{ - G{"GGGGG M/y – GGGGG M/y"} - M{"GGGGG M/y – M/y"} - y{"GGGGG M/y – M/y"} + G{"GGGGG M/y – GGGGG M/y"} + M{"GGGGG M/y – M/y"} + y{"GGGGG M/y – M/y"} } GyMEd{ - G{"GGGGG dd.MM.y, E – GGGGG dd.MM.y, E"} - M{"GGGGG dd.MM.y, E – dd.MM.y, E"} - d{"GGGGG dd.MM.y, E – dd.MM.y, E"} - y{"GGGGG dd.MM.y, E – dd.MM.y, E"} + G{"GGGGG dd.MM.y, E – GGGGG dd.MM.y, E"} + M{"GGGGG dd.MM.y, E – dd.MM.y, E"} + d{"GGGGG dd.MM.y, E – dd.MM.y, E"} + y{"GGGGG dd.MM.y, E – dd.MM.y, E"} } GyMMM{ - G{"G MMM y – G MMM y"} + G{"G MMM y – G MMM y"} M{"G MMM–MMM y"} - y{"G MMM y – MMM y"} + y{"G MMM y – MMM y"} } GyMMMEd{ - G{"G d MMM y, E – G d MMM y, E"} - M{"G d MMM, E – d MMM, E y"} - d{"G d MMM y, E – d MMM y, E"} - y{"G d MMM y, E – d MMM y, E"} + G{"G d MMM y, E – G d MMM y, E"} + M{"G d MMM, E – d MMM, E y"} + d{"G d MMM y, E – d MMM y, E"} + y{"G d MMM y, E – d MMM y, E"} } GyMMMd{ - G{"G d MMM y – G d MMM y"} - M{"G d MMM – d MMM y"} + G{"G d MMM y – G d MMM y"} + M{"G d MMM – d MMM y"} d{"G d–d MMM y"} - y{"G d MMM y – d MMM y"} + y{"G d MMM y – d MMM y"} } GyMd{ - G{"GGGGG dd.MM.y – GGGGG dd.MM.y"} - M{"GGGGG dd.MM.y – dd.MM.y"} - d{"GGGGG dd.MM.y – dd.MM.y"} - y{"GGGGG dd.MM.y – dd.MM.y"} + G{"GGGGG dd.MM.y – GGGGG dd.MM.y"} + M{"GGGGG dd.MM.y – dd.MM.y"} + d{"GGGGG dd.MM.y – dd.MM.y"} + y{"GGGGG dd.MM.y – dd.MM.y"} } H{ H{"HH–HH"} @@ -634,83 +634,83 @@ tk{ H{"HH–HH v"} } M{ - M{"MM – MM"} + M{"MM – MM"} } MEd{ - M{"dd.MM E – dd.MM E"} - d{"dd.MM E – dd.MM E"} + M{"dd.MM E – dd.MM E"} + d{"dd.MM E – dd.MM E"} } MMM{ M{"MMM–MMM"} } MMMEd{ - M{"d MMM E – d MMM E"} - d{"d MMM E – d MMM E"} + M{"d MMM E – d MMM E"} + d{"d MMM E – d MMM E"} } MMMd{ - M{"d MMM – d MMM"} - d{"d – d MMM"} + M{"d MMM – d MMM"} + d{"d – d MMM"} } Md{ - M{"dd.MM – dd.MM"} - d{"dd.MM – dd.MM"} + M{"dd.MM – dd.MM"} + d{"dd.MM – dd.MM"} } d{ d{"d–d"} } fallback{"{0} - {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y"} } yM{ - M{"MM.y – MM.y"} - y{"MM.y – MM.y"} + M{"MM.y – MM.y"} + y{"MM.y – MM.y"} } yMEd{ - M{"dd.MM.y E – dd.MM.y E"} - d{"dd.MM.y E – dd.MM.y E"} - y{"dd.MM.y E – dd.MM.y E"} + M{"dd.MM.y E – dd.MM.y E"} + d{"dd.MM.y E – dd.MM.y E"} + y{"dd.MM.y E – dd.MM.y E"} } yMMM{ M{"MMM–MMM y"} - y{"MMM y – MMM y"} + y{"MMM y – MMM y"} } yMMMEd{ - M{"d MMM y E – d MMM y E"} - d{"d MMM y E – d MMM y E"} - y{"d MMM y E – d MMM y E"} + M{"d MMM y E – d MMM y E"} + d{"d MMM y E – d MMM y E"} + y{"d MMM y E – d MMM y E"} } yMMMM{ M{"MMMM–MMMM y"} - y{"MMMM y – MMMM y"} + y{"MMMM y – MMMM y"} } yMMMd{ - M{"d MMM – d MMM y"} - d{"d – d MMM y"} - y{"d MMM y – d MMM y"} + M{"d MMM – d MMM y"} + d{"d – d MMM y"} + y{"d MMM y – d MMM y"} } yMd{ - M{"dd.MM.y – dd.MM.y"} - d{"dd.MM.y – dd.MM.y"} - y{"dd.MM.y – dd.MM.y"} + M{"dd.MM.y – dd.MM.y"} + d{"dd.MM.y – dd.MM.y"} + y{"dd.MM.y – dd.MM.y"} } } monthNames{ diff --git a/icu4c/source/data/locales/to.txt b/icu4c/source/data/locales/to.txt index 54de13801ebb..ffdb28867a22 100644 --- a/icu4c/source/data/locales/to.txt +++ b/icu4c/source/data/locales/to.txt @@ -184,10 +184,10 @@ to{ calendar{ generic{ DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE d MMMM y G", "d MMMM y G", "d MMM y G", @@ -218,8 +218,8 @@ to{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"E d"} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"y G"} GyMMM{"MMM y G"} GyMMMEd{"E d MMM y G"} @@ -237,9 +237,9 @@ to{ MMMd{"d MMM"} Md{"d/M"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"mm:ss"} y{"y G"} yM{"M-y"} @@ -265,121 +265,121 @@ to{ } intervalFormats{ Gy{ - G{"y G – y G"} - y{"y – y G"} + G{"y G – y G"} + y{"y – y G"} } GyM{ - G{"M/y GGGGG – M/y GGGGG"} - M{"M/y – M/y GGGGG"} - y{"M/y – M/y GGGGG"} + G{"M/y GGGGG – M/y GGGGG"} + M{"M/y – M/y GGGGG"} + y{"M/y – M/y GGGGG"} } GyMEd{ - G{"E d/M/y GGGGG – E d/M/y GGGGG"} - M{"E d/M/y – E d/M/y GGGGG"} - d{"E d/M/y – E d/M/y GGGGG"} - y{"E d/M/y – E d/M/y GGGGG"} + G{"E d/M/y GGGGG – E d/M/y GGGGG"} + M{"E d/M/y – E d/M/y GGGGG"} + d{"E d/M/y – E d/M/y GGGGG"} + y{"E d/M/y – E d/M/y GGGGG"} } GyMMM{ - G{"MMM y G – MMM y G"} - M{"MMM – MMM y G"} - y{"MMM y – MMM y G"} + G{"MMM y G – MMM y G"} + M{"MMM – MMM y G"} + y{"MMM y – MMM y G"} } GyMMMEd{ - G{"E d MMM y G – E d MMM y G"} - M{"E d MMM – E d MMM y G"} - d{"E d MMM – E d MMM y G"} - y{"E d MMM y – E d MMM y G"} + G{"E d MMM y G – E d MMM y G"} + M{"E d MMM – E d MMM y G"} + d{"E d MMM – E d MMM y G"} + y{"E d MMM y – E d MMM y G"} } GyMMMd{ - G{"d MMM y G – d MMM y G"} - M{"d MMM – d MMM y G"} - d{"d – d MMM y G"} - y{"d MMM y – d MMM y G"} + G{"d MMM y G – d MMM y G"} + M{"d MMM – d MMM y G"} + d{"d – d MMM y G"} + y{"d MMM y – d MMM y G"} } GyMd{ - G{"d/M/y GGGGG – d/M/y GGGGG"} - M{"d/M/y – d/M/y GGGGG"} - d{"d/M/y – d/M/y GGGGG"} - y{"d/M/y – d/M/y GGGGG"} + G{"d/M/y GGGGG – d/M/y GGGGG"} + M{"d/M/y – d/M/y GGGGG"} + d{"d/M/y – d/M/y GGGGG"} + y{"d/M/y – d/M/y GGGGG"} } M{ - M{"M – M"} + M{"M – M"} } MEd{ - M{"E d/M – E d/M"} - d{"E d/M – E d/M"} + M{"E d/M – E d/M"} + d{"E d/M – E d/M"} } MMM{ - M{"LLL – LLL"} + M{"LLL – LLL"} } MMMEd{ - M{"E d MMM – E d MMM"} - d{"E d MMM – E d MMM"} + M{"E d MMM – E d MMM"} + d{"E d MMM – E d MMM"} } MMMd{ - M{"d MMM – d MMM"} - d{"d – d MMM"} + M{"d MMM – d MMM"} + d{"d – d MMM"} } Md{ - M{"d/M – d/M"} - d{"d/M – d/M"} + M{"d/M – d/M"} + d{"d/M – d/M"} } d{ - d{"d – d"} + d{"d – d"} } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ - y{"y – y G"} + y{"y – y G"} } yM{ - M{"M/y – M/y GGGGG"} - y{"M/y – M/y GGGGG"} + M{"M/y – M/y GGGGG"} + y{"M/y – M/y GGGGG"} } yMEd{ - M{"E d/M/y – E d/M/y GGGGG"} - d{"E d/M/y – E d/M/y GGGGG"} - y{"E d/M/y – E d/M/y GGGGG"} + M{"E d/M/y – E d/M/y GGGGG"} + d{"E d/M/y – E d/M/y GGGGG"} + y{"E d/M/y – E d/M/y GGGGG"} } yMMM{ - M{"MMM – MMM y G"} - y{"MMM y – MMM y G"} + M{"MMM – MMM y G"} + y{"MMM y – MMM y G"} } yMMMEd{ - M{"E d MMM – E d MMM y G"} - d{"E d MMM – E d MMM y G"} - y{"E d MMM y – E d MMM y G"} + M{"E d MMM – E d MMM y G"} + d{"E d MMM – E d MMM y G"} + y{"E d MMM y – E d MMM y G"} } yMMMM{ - M{"MMMM – MMMM y G"} - y{"MMMM y – MMMM y G"} + M{"MMMM – MMMM y G"} + y{"MMMM y – MMMM y G"} } yMMMd{ - M{"d MMM – d MMM y G"} - d{"d – d MMM y G"} - y{"d MMM y – d MMM y G"} + M{"d MMM – d MMM y G"} + d{"d – d MMM y G"} + y{"d MMM y – d MMM y G"} } yMd{ - M{"d/M/y – d/M/y GGGGG"} - d{"d/M/y – d/M/y GGGGG"} - y{"d/M/y – d/M/y GGGGG"} + M{"d/M/y – d/M/y GGGGG"} + d{"d/M/y – d/M/y GGGGG"} + y{"d/M/y – d/M/y GGGGG"} } } } @@ -397,10 +397,10 @@ to{ "PM", } DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE d MMMM y", "d MMMM y", "d MMM y", @@ -434,8 +434,8 @@ to{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"E d"} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"y G"} GyMMM{"MMM y G"} GyMMMEd{"E d MMM y G"} @@ -458,11 +458,11 @@ to{ MMMd{"d MMM"} Md{"d/M"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} - hmsv{"h:mm:ss a v"} - hmv{"h:mm a v"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} + hmsv{"h:mm:ss a v"} + hmv{"h:mm a v"} ms{"mm:ss"} y{"y"} yM{"M/y"} @@ -589,135 +589,135 @@ to{ } intervalFormats{ Gy{ - G{"y G – y G"} - y{"y – y G"} + G{"y G – y G"} + y{"y – y G"} } GyM{ - G{"M/y GGGGG – M/y GGGGG"} - M{"M/y – M/y GGGGG"} - y{"M/y – M/y GGGGG"} + G{"M/y GGGGG – M/y GGGGG"} + M{"M/y – M/y GGGGG"} + y{"M/y – M/y GGGGG"} } GyMEd{ - G{"E d/M/y GGGGG – E d/M/y GGGGG"} - M{"E d/M/y – E d/M/y GGGGG"} - d{"E d/M/y – E d/M/y GGGGG"} + G{"E d/M/y GGGGG – E d/M/y GGGGG"} + M{"E d/M/y – E d/M/y GGGGG"} + d{"E d/M/y – E d/M/y GGGGG"} y{"E d/M/y– E d/M/y GGGGG"} } GyMMM{ - G{"MMM y G – MMM y G"} - M{"MMM – MMM y G"} - y{"MMM y – MMM y G"} + G{"MMM y G – MMM y G"} + M{"MMM – MMM y G"} + y{"MMM y – MMM y G"} } GyMMMEd{ - G{"E d MMM y G – E d MMM y G"} - M{"E d MMM – E d MMM y G"} - d{"E d MMM – E d MMM y G"} - y{"E d MMM y – E d MMM y G"} + G{"E d MMM y G – E d MMM y G"} + M{"E d MMM – E d MMM y G"} + d{"E d MMM – E d MMM y G"} + y{"E d MMM y – E d MMM y G"} } GyMMMd{ - G{"d MMM y G – d MMM y G"} - M{"d MMM – d MMM y G"} - d{"d – d MMM y G"} - y{"d MMM y – d MMM y G"} + G{"d MMM y G – d MMM y G"} + M{"d MMM – d MMM y G"} + d{"d – d MMM y G"} + y{"d MMM y – d MMM y G"} } GyMd{ - G{"d/M/y GGGGG – d/M/y GGGGG"} - M{"d/M/y – d/M/y GGGGG"} - d{"d/M/y – d/M/y GGGGG"} - y{"d/M/y – d/M/y GGGGG"} + G{"d/M/y GGGGG – d/M/y GGGGG"} + M{"d/M/y – d/M/y GGGGG"} + d{"d/M/y – d/M/y GGGGG"} + y{"d/M/y – d/M/y GGGGG"} } H{ - H{"HH – HH"} + H{"HH – HH"} } Hm{ - H{"HH:mm – HH:mm"} - m{"HH:mm – HH:mm"} + H{"HH:mm – HH:mm"} + m{"HH:mm – HH:mm"} } Hmv{ H{"HH:mm–HH:mm v"} m{"HH:mm–HH:mm v"} } Hv{ - H{"HH – HH v"} + H{"HH – HH v"} } M{ - M{"M – M"} + M{"M – M"} } MEd{ - M{"E d/M – E d/M"} - d{"E d/M – E d/M"} + M{"E d/M – E d/M"} + d{"E d/M – E d/M"} } MMM{ - M{"LLL – LLL"} + M{"LLL – LLL"} } MMMEd{ - M{"E d MMM – E d MMM"} - d{"E d MMM – E d MMM"} + M{"E d MMM – E d MMM"} + d{"E d MMM – E d MMM"} } MMMd{ - M{"d MMM – d MMM"} - d{"d – d MMM"} + M{"d MMM – d MMM"} + d{"d – d MMM"} } Md{ - M{"d/M – d/M"} - d{"d/M – d/M"} + M{"d/M – d/M"} + d{"d/M – d/M"} } d{ - d{"d – d"} + d{"d – d"} } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h – h a"} + a{"h a – h a"} + h{"h – h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm – h:mm a"} - m{"h:mm – h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm – h:mm a"} + m{"h:mm – h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm – h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm – h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h – h a v"} + a{"h a – h a v"} + h{"h – h a v"} } y{ - y{"y – y"} + y{"y – y"} } yM{ - M{"M/y – M/y"} - y{"M/y – M/y"} + M{"M/y – M/y"} + y{"M/y – M/y"} } yMEd{ - M{"E d/M/y – E d/M/y"} - d{"E d/M/y – E d/M/y"} - y{"E d/M/y – E d/M/y"} + M{"E d/M/y – E d/M/y"} + d{"E d/M/y – E d/M/y"} + y{"E d/M/y – E d/M/y"} } yMMM{ - M{"MMM – MMM y"} - y{"MMM y – MMM y"} + M{"MMM – MMM y"} + y{"MMM y – MMM y"} } yMMMEd{ - M{"E d MMM – E d MMM y"} - d{"E d MMM – E d MMM y"} - y{"E d MMM y – E d MMM y"} + M{"E d MMM – E d MMM y"} + d{"E d MMM – E d MMM y"} + y{"E d MMM y – E d MMM y"} } yMMMM{ - M{"MMMM – MMMM y"} - y{"MMMM y – MMMM y"} + M{"MMMM – MMMM y"} + y{"MMMM y – MMMM y"} } yMMMd{ - M{"d MMM – d MMM y"} + M{"d MMM – d MMM y"} d{"d–d MMM y"} - y{"d MMM y – d MMM y"} + y{"d MMM y – d MMM y"} } yMd{ - M{"d/M/y – d/M/y"} - d{"d/M/y – d/M/y"} - y{"d/M/y – d/M/y"} + M{"d/M/y – d/M/y"} + d{"d/M/y – d/M/y"} + y{"d/M/y – d/M/y"} } } monthNames{ diff --git a/icu4c/source/data/locales/tr.txt b/icu4c/source/data/locales/tr.txt index bd1681bc2db6..21400ffd9a1d 100644 --- a/icu4c/source/data/locales/tr.txt +++ b/icu4c/source/data/locales/tr.txt @@ -433,8 +433,8 @@ tr{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"d E"} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"G y"} GyMMM{"G MMM y"} GyMMMEd{"G d MMM y E"} @@ -452,9 +452,9 @@ tr{ MMMd{"d MMM"} Md{"dd/MM"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} mmss{"mm:ss"} ms{"mm:ss"} y{"G y"} @@ -472,47 +472,47 @@ tr{ } intervalFormats{ Bh{ - B{"B h – B h"} + B{"B h – B h"} h{"B h–h"} } Bhm{ - B{"B h:mm – B h:mm"} + B{"B h:mm – B h:mm"} h{"B h:mm–h:mm"} m{"B h:mm–h:mm"} } GyM{ - G{"GGGGG MM.y – GGGGG MM.y"} - M{"GGGGG MM.y – MM.y"} - y{"GGGGG MM.y – MM.y"} + G{"GGGGG MM.y – GGGGG MM.y"} + M{"GGGGG MM.y – MM.y"} + y{"GGGGG MM.y – MM.y"} } GyMEd{ - G{"GGGGG dd.MM.y E – GGGGG dd.MM.y E"} - M{"GGGGG dd.MM.y E – dd.MM.y E"} - d{"GGGGG dd.MM.y E – dd.MM.y E"} - y{"GGGGG dd.MM.y E – dd.MM.y E"} + G{"GGGGG dd.MM.y E – GGGGG dd.MM.y E"} + M{"GGGGG dd.MM.y E – dd.MM.y E"} + d{"GGGGG dd.MM.y E – dd.MM.y E"} + y{"GGGGG dd.MM.y E – dd.MM.y E"} } GyMMM{ G{"G MMM y G – G MMM y"} - M{"G MMM – MMM y"} - y{"G MMM y – MMM y"} + M{"G MMM – MMM y"} + y{"G MMM y – MMM y"} } GyMMMEd{ - G{"G d MMM y E – G d MMM y E"} - M{"G d MMM E – d MMM E y"} - d{"G d MMM E – d MMM E y"} - y{"G d MMM y E – d MMM y E"} + G{"G d MMM y E – G d MMM y E"} + M{"G d MMM E – d MMM E y"} + d{"G d MMM E – d MMM E y"} + y{"G d MMM y E – d MMM y E"} } GyMMMd{ - G{"G d MMM y – G d MMM y"} - M{"G d MMM – d MMM y"} + G{"G d MMM y – G d MMM y"} + M{"G d MMM – d MMM y"} d{"G d–d MMM y"} - y{"G d MMM y – d MMM y"} + y{"G d MMM y – d MMM y"} } GyMd{ G{"GGGGG dd.MM.y GGGGG – dd.MM.y"} - M{"GGGGG dd.MM.y – dd.MM.y"} - d{"GGGGG dd.MM.y – dd.MM.y"} - y{"GGGGG dd.MM.y – dd.MM.y"} + M{"GGGGG dd.MM.y – dd.MM.y"} + d{"GGGGG dd.MM.y – dd.MM.y"} + y{"GGGGG dd.MM.y – dd.MM.y"} } H{ H{"HH–HH"} @@ -532,80 +532,80 @@ tr{ M{"MM–MM"} } MEd{ - M{"dd/MM E – dd/MM E"} - d{"dd/MM E – dd/MM E"} + M{"dd/MM E – dd/MM E"} + d{"dd/MM E – dd/MM E"} } MMM{ M{"MMM–MMM"} } MMMEd{ - M{"d MMM E – d MMM E"} - d{"d MMM E – d MMM E"} + M{"d MMM E – d MMM E"} + d{"d MMM E – d MMM E"} } MMMd{ - M{"d MMM – d MMM"} - d{"d – d MMM"} + M{"d MMM – d MMM"} + d{"d – d MMM"} } Md{ - M{"dd/MM – dd/MM"} - d{"dd/MM – dd/MM"} + M{"dd/MM – dd/MM"} + d{"dd/MM – dd/MM"} } d{ d{"d–d"} } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"G y–y"} } yM{ - M{"GGGGG M/y – M/y"} - y{"GGGGG M/y – M/y"} + M{"GGGGG M/y – M/y"} + y{"GGGGG M/y – M/y"} } yMEd{ - M{"GGGGG dd.MM.y E – dd.MM.y E"} - d{"GGGGG dd.MM.y E – dd.MM.y E"} - y{"GGGGG dd.MM.y E – dd.MM.y E"} + M{"GGGGG dd.MM.y E – dd.MM.y E"} + d{"GGGGG dd.MM.y E – dd.MM.y E"} + y{"GGGGG dd.MM.y E – dd.MM.y E"} } yMMM{ M{"G MMM–MMM y"} - y{"G MMM y – MMM y"} + y{"G MMM y – MMM y"} } yMMMEd{ - M{"G d MMM y E – d MMM y E"} - d{"G d MMM y E – d MMM y E"} - y{"G d MMM y E – d MMM y E"} + M{"G d MMM y E – d MMM y E"} + d{"G d MMM y E – d MMM y E"} + y{"G d MMM y E – d MMM y E"} } yMMMM{ - M{"G MMMM – MMMM y"} - y{"G MMMM y – MMMM y"} + M{"G MMMM – MMMM y"} + y{"G MMMM y – MMMM y"} } yMMMd{ - M{"G d MMM – d MMM y"} + M{"G d MMM – d MMM y"} d{"G d–d MMM y"} - y{"G d MMM y – d MMM y"} + y{"G d MMM y – d MMM y"} } yMd{ - M{"GGGGG dd.MM.y – dd.MM.y"} - d{"GGGGG dd.MM.y – dd.MM.y"} - y{"GGGGG dd.MM.y – dd.MM.y"} + M{"GGGGG dd.MM.y – dd.MM.y"} + d{"GGGGG dd.MM.y – dd.MM.y"} + y{"GGGGG dd.MM.y – dd.MM.y"} } } } @@ -660,8 +660,8 @@ tr{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"d E"} - Ehm{"E a h:mm"} - Ehms{"E a h:mm:ss"} + Ehm{"E a h:mm"} + Ehms{"E a h:mm:ss"} Gy{"G y"} GyMMM{"G MMM y"} GyMMMEd{"G d MMM y E"} @@ -685,11 +685,11 @@ tr{ MMMd{"d MMM"} Md{"d/M"} d{"d"} - h{"a h"} - hm{"a h:mm"} - hms{"a h:mm:ss"} - hmsv{"a h:mm:ss v"} - hmv{"a h:mm v"} + h{"a h"} + hm{"a h:mm"} + hms{"a h:mm:ss"} + hmsv{"a h:mm:ss v"} + hmv{"a h:mm v"} mmss{"mm:ss"} ms{"mm:ss"} y{"y"} @@ -878,47 +878,47 @@ tr{ } intervalFormats{ Bh{ - B{"B h – B h"} + B{"B h – B h"} h{"B h–h"} } Bhm{ - B{"B h:mm – B h:mm"} + B{"B h:mm – B h:mm"} h{"B h:mm–h:mm"} m{"B h:mm–h:mm"} } GyM{ - G{"GGGGG MM.y – GGGGG MM.y"} - M{"GGGGG MM.y – MM.y"} - y{"GGGGG MM.y – MM.y"} + G{"GGGGG MM.y – GGGGG MM.y"} + M{"GGGGG MM.y – MM.y"} + y{"GGGGG MM.y – MM.y"} } GyMEd{ - G{"GGGGG dd.MM.y E – GGGGG dd.MM.y E"} - M{"GGGGG dd.MM.y E – dd.MM.y E"} - d{"GGGGG dd.MM.y E – dd.MM.y E"} - y{"GGGGG dd.MM.y E – dd.MM.y E"} + G{"GGGGG dd.MM.y E – GGGGG dd.MM.y E"} + M{"GGGGG dd.MM.y E – dd.MM.y E"} + d{"GGGGG dd.MM.y E – dd.MM.y E"} + y{"GGGGG dd.MM.y E – dd.MM.y E"} } GyMMM{ - G{"G MMM y – G MMM y"} + G{"G MMM y – G MMM y"} M{"G MMM–MMM y"} - y{"G MMM y – MMM y"} + y{"G MMM y – MMM y"} } GyMMMEd{ - G{"G d MMM y E – G d MMM y E"} - M{"G d MMM E – d MMM E y"} - d{"G d MMM E – d MMM E y"} - y{"G d MMM y E – d MMM y E"} + G{"G d MMM y E – G d MMM y E"} + M{"G d MMM E – d MMM E y"} + d{"G d MMM E – d MMM E y"} + y{"G d MMM y E – d MMM y E"} } GyMMMd{ - G{"G d MMM y – G d MMM y"} - M{"G d MMM – d MMM y"} + G{"G d MMM y – G d MMM y"} + M{"G d MMM – d MMM y"} d{"G d–d MMM y"} - y{"G d MMM y – d MMM y"} + y{"G d MMM y – d MMM y"} } GyMd{ - G{"GGGGG dd.MM.y – GGGGG dd.MM.y"} - M{"GGGGG dd.MM.y – dd.MM.y"} - d{"GGGGG dd.MM.y – dd.MM.y"} - y{"GGGGG dd.MM.y – dd.MM.y"} + G{"GGGGG dd.MM.y – GGGGG dd.MM.y"} + M{"GGGGG dd.MM.y – dd.MM.y"} + d{"GGGGG dd.MM.y – dd.MM.y"} + y{"GGGGG dd.MM.y – dd.MM.y"} } H{ H{"HH–HH"} @@ -935,83 +935,83 @@ tr{ H{"HH–HH v"} } M{ - M{"M – M"} + M{"M – M"} } MEd{ - M{"d.M E – d.M E"} - d{"d.M E – d.M E"} + M{"d.M E – d.M E"} + d{"d.M E – d.M E"} } MMM{ M{"MMM–MMM"} } MMMEd{ - M{"d MMM E – d MMM E"} - d{"d MMM E – d MMM E"} + M{"d MMM E – d MMM E"} + d{"d MMM E – d MMM E"} } MMMd{ - M{"d MMM – d MMM"} - d{"d – d MMM"} + M{"d MMM – d MMM"} + d{"d – d MMM"} } Md{ - M{"d.M – d.M"} - d{"d.M – d.M"} + M{"d.M – d.M"} + d{"d.M – d.M"} } d{ d{"d–d"} } fallback{"{0} – {1}"} h{ - a{"a h – a h"} - h{"a h–h"} + a{"a h – a h"} + h{"a h–h"} } hm{ - a{"a h:mm – a h:mm"} - h{"a h:mm–h:mm"} - m{"a h:mm–h:mm"} + a{"a h:mm – a h:mm"} + h{"a h:mm–h:mm"} + m{"a h:mm–h:mm"} } hmv{ - a{"a h:mm – a h:mm v"} - h{"a h:mm–h:mm v"} - m{"a h:mm–h:mm v"} + a{"a h:mm – a h:mm v"} + h{"a h:mm–h:mm v"} + m{"a h:mm–h:mm v"} } hv{ - a{"a h – a h v"} - h{"a h–h v"} + a{"a h – a h v"} + h{"a h–h v"} } y{ y{"y–y"} } yM{ - M{"MM.y – MM.y"} - y{"MM.y – MM.y"} + M{"MM.y – MM.y"} + y{"MM.y – MM.y"} } yMEd{ - M{"dd.MM.y E – dd.MM.y E"} - d{"dd.MM.y E – dd.MM.y E"} - y{"dd.MM.y E – dd.MM.y E"} + M{"dd.MM.y E – dd.MM.y E"} + d{"dd.MM.y E – dd.MM.y E"} + y{"dd.MM.y E – dd.MM.y E"} } yMMM{ M{"MMM–MMM y"} - y{"MMM y – MMM y"} + y{"MMM y – MMM y"} } yMMMEd{ - M{"d MMM y E – d MMM y E"} - d{"d MMM y E – d MMM y E"} - y{"d MMM y E – d MMM y E"} + M{"d MMM y E – d MMM y E"} + d{"d MMM y E – d MMM y E"} + y{"d MMM y E – d MMM y E"} } yMMMM{ - M{"MMMM – MMMM y"} - y{"MMMM y – MMMM y"} + M{"MMMM – MMMM y"} + y{"MMMM y – MMMM y"} } yMMMd{ - M{"d MMM – d MMM y"} + M{"d MMM – d MMM y"} d{"d–d MMM y"} - y{"d MMM y – d MMM y"} + y{"d MMM y – d MMM y"} } yMd{ - M{"dd.MM.y – dd.MM.y"} - d{"dd.MM.y – dd.MM.y"} - y{"dd.MM.y – dd.MM.y"} + M{"dd.MM.y – dd.MM.y"} + d{"dd.MM.y – dd.MM.y"} + y{"dd.MM.y – dd.MM.y"} } } monthNames{ diff --git a/icu4c/source/data/locales/tr_CY.txt b/icu4c/source/data/locales/tr_CY.txt index 3d644120d9bb..8446221b16e8 100644 --- a/icu4c/source/data/locales/tr_CY.txt +++ b/icu4c/source/data/locales/tr_CY.txt @@ -5,10 +5,10 @@ tr_CY{ calendar{ gregorian{ DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "d MMMM y EEEE", "d MMMM y", "d MMM y", diff --git a/icu4c/source/data/locales/tt.txt b/icu4c/source/data/locales/tt.txt index 33ea118cc10a..ec9ca12f9ad4 100644 --- a/icu4c/source/data/locales/tt.txt +++ b/icu4c/source/data/locales/tt.txt @@ -49,8 +49,8 @@ tt{ "H:mm:ss z", "H:mm:ss", "H:mm", - "d MMMM, y 'ел' (G), EEEE", - "d MMMM, y 'ел' (G)", + "d MMMM, y 'ел' (G), EEEE", + "d MMMM, y 'ел' (G)", "dd.MM.y (G)", "dd.MM.y (GGGGG)", "{1}, {0}", @@ -70,36 +70,36 @@ tt{ "GGGGGyMMdd", } availableFormats{ - Gy{"G y 'ел'"} - GyMMM{"G y 'ел', MMM"} - GyMMMEd{"G y 'ел', d MMM, E"} - GyMMMd{"G y 'ел', d MMM"} + Gy{"G y 'ел'"} + GyMMM{"G y 'ел', MMM"} + GyMMMEd{"G y 'ел', d MMM, E"} + GyMMMd{"G y 'ел', d MMM"} MEd{"dd.MM, E"} MMMEd{"d MMM, E"} MMMMd{"d MMMM"} MMMd{"d MMM"} Md{"dd.MM"} - y{"G y 'ел'"} - yyyy{"G y 'ел'"} - yyyyM{"GGGGG y 'ел', MM"} + y{"G y 'ел'"} + yyyy{"G y 'ел'"} + yyyyM{"GGGGG y 'ел', MM"} yyyyMEd{"GGGGG dd.MM.y, E"} - yyyyMMM{"G y 'ел', MMM"} - yyyyMMMEd{"G y 'ел', d MMM, E"} - yyyyMMMM{"G y 'ел', MMMM"} - yyyyMMMd{"G y 'ел', d MMM"} + yyyyMMM{"G y 'ел', MMM"} + yyyyMMMEd{"G y 'ел', d MMM, E"} + yyyyMMMM{"G y 'ел', MMMM"} + yyyyMMMd{"G y 'ел', d MMM"} yyyyMd{"GGGGG dd.MM.y"} - yyyyQQQ{"G y 'ел', QQQ"} - yyyyQQQQ{"G y 'ел', QQQQ"} + yyyyQQQ{"G y 'ел', QQQ"} + yyyyQQQQ{"G y 'ел', QQQQ"} } intervalFormats{ Gy{ - G{"G y 'ел' – G y 'ел'"} - y{"G y–y 'ел'"} + G{"G y 'ел' – G y 'ел'"} + y{"G y–y 'ел'"} } GyM{ - G{"GGGGG y 'ел', MM – GGGGG y 'ел', MM"} - M{"GGGGG y 'ел', MM – y 'ел', MM"} - y{"GGGGG y 'ел', MM – y 'ел', MM"} + G{"GGGGG y 'ел', MM – GGGGG y 'ел', MM"} + M{"GGGGG y 'ел', MM – y 'ел', MM"} + y{"GGGGG y 'ел', MM – y 'ел', MM"} } GyMEd{ G{"GGGGG dd.MM.y, E – GGGGG dd.MM.y, E"} @@ -108,21 +108,21 @@ tt{ y{"GGGGG dd.MM.y, E – dd.MM.y, E"} } GyMMM{ - G{"G y 'ел', MMM – G y 'ел', MMM"} - M{"G y 'ел', MMM–MMM"} - y{"G y 'ел', MMM – y 'ел', MMM"} + G{"G y 'ел', MMM – G y 'ел', MMM"} + M{"G y 'ел', MMM–MMM"} + y{"G y 'ел', MMM – y 'ел', MMM"} } GyMMMEd{ - G{"G y 'ел', d MMM, E – G y 'ел', d MMM, E"} - M{"G y 'ел', d MMM, E – d MMM, E"} - d{"G y 'ел', d MMM, E – d MMM, E"} - y{"G y 'ел', d MMM, E – y 'ел', d MMM, E"} + G{"G y 'ел', d MMM, E – G y 'ел', d MMM, E"} + M{"G y 'ел', d MMM, E – d MMM, E"} + d{"G y 'ел', d MMM, E – d MMM, E"} + y{"G y 'ел', d MMM, E – y 'ел', d MMM, E"} } GyMMMd{ - G{"G y 'ел', d MMM – G y 'ел', d MMM"} - M{"G y 'ел', d MMM – d MMM"} - d{"G y 'ел', d–d MMM"} - y{"G y 'ел', d MMM – y 'ел' d MMM"} + G{"G y 'ел', d MMM – G y 'ел', d MMM"} + M{"G y 'ел', d MMM – d MMM"} + d{"G y 'ел', d–d MMM"} + y{"G y 'ел', d MMM – y 'ел' d MMM"} } GyMd{ G{"GGGGG dd.MM.y – GGGGG dd.MM.y"} @@ -151,11 +151,11 @@ tt{ } fallback{"{0} – {1}"} y{ - y{"G y–y 'ел'"} + y{"G y–y 'ел'"} } yM{ - M{"GGGGG y 'ел', MM – y 'ел', MM"} - y{"GGGGG y 'ел', MM – y 'ел', MM"} + M{"GGGGG y 'ел', MM – y 'ел', MM"} + y{"GGGGG y 'ел', MM – y 'ел', MM"} } yMEd{ M{"GGGGG dd.MM.y, E – dd.MM.y, E"} @@ -163,22 +163,22 @@ tt{ y{"GGGGG dd.MM.y, E – dd.MM.y, E"} } yMMM{ - M{"G y 'ел', MMM–MMM"} - y{"G y 'ел', MMM – y 'ел', MMM"} + M{"G y 'ел', MMM–MMM"} + y{"G y 'ел', MMM – y 'ел', MMM"} } yMMMEd{ - M{"G y 'ел', d MMM, E – d MMM, E"} - d{"G y 'ел' d MMM, E – d MMM, E"} - y{"G y 'ел', d MMM, E – y 'ел', d MMM, E"} + M{"G y 'ел', d MMM, E – d MMM, E"} + d{"G y 'ел' d MMM, E – d MMM, E"} + y{"G y 'ел', d MMM, E – y 'ел', d MMM, E"} } yMMMM{ - M{"G y 'ел', MMMM–MMMM"} - y{"G y 'ел', MMMM – y 'ел', MMMM"} + M{"G y 'ел', MMMM–MMMM"} + y{"G y 'ел', MMMM – y 'ел', MMMM"} } yMMMd{ - M{"G y 'ел', d MMM – d MMM"} - d{"G y 'ел', d–d MMM"} - y{"G y 'ел', d MMM – y 'ел', d MMM"} + M{"G y 'ел', d MMM – d MMM"} + d{"G y 'ел', d–d MMM"} + y{"G y 'ел', d MMM – y 'ел', d MMM"} } yMd{ M{"GGGGG dd.MM.y – dd.MM.y"} @@ -205,9 +205,9 @@ tt{ "H:mm:ss z", "H:mm:ss", "H:mm", - "d MMMM, y 'ел', EEEE", - "d MMMM, y 'ел'", - "d MMM, y 'ел'", + "d MMMM, y 'ел', EEEE", + "d MMMM, y 'ел'", + "d MMM, y 'ел'", "dd.MM.y", "{1}, {0}", "{1}, {0}", @@ -232,10 +232,10 @@ tt{ E{"ccc"} EHm{"E, HH:mm"} EHms{"E, HH:mm:ss"} - Gy{"G y 'ел'"} - GyMMM{"G y 'ел', MMM"} - GyMMMEd{"G y 'ел', d MMM, E"} - GyMMMd{"G y 'ел', d MMM"} + Gy{"G y 'ел'"} + GyMMM{"G y 'ел', MMM"} + GyMMMEd{"G y 'ел', d MMM, E"} + GyMMMd{"G y 'ел', d MMM"} H{"HH"} Hm{"HH:mm"} Hms{"HH:mm:ss"} @@ -252,22 +252,22 @@ tt{ MMMd{"d MMM"} Md{"dd.MM"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} - hmsv{"h:mm:ss a v"} - hmv{"h:mm a v"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} + hmsv{"h:mm:ss a v"} + hmv{"h:mm a v"} ms{"mm:ss"} y{"y"} yM{"MM.y"} yMEd{"dd.MM.y, E"} - yMMM{"y 'ел', MMM"} - yMMMEd{"y 'ел', d MMM, E"} - yMMMM{"y 'ел', MMMM"} - yMMMd{"y 'ел', d MMM"} + yMMM{"y 'ел', MMM"} + yMMMEd{"y 'ел', d MMM, E"} + yMMMM{"y 'ел', MMMM"} + yMMMd{"y 'ел', d MMM"} yMd{"dd.MM.y"} - yQQQ{"y 'ел', QQQ"} - yQQQQ{"y 'ел', QQQQ"} + yQQQ{"y 'ел', QQQ"} + yQQQQ{"y 'ел', QQQQ"} yw{ other{"Y 'елның' w 'атнасы'"} } @@ -386,8 +386,8 @@ tt{ } intervalFormats{ Gy{ - G{"G y 'ел' – G y 'ел'"} - y{"G y–y 'ел'"} + G{"G y 'ел' – G y 'ел'"} + y{"G y–y 'ел'"} } GyM{ G{"GGGGG MM.y – GGGGG MM.y"} @@ -401,21 +401,21 @@ tt{ y{"GGGGG dd.MM.y, E – dd.MM.y, E"} } GyMMM{ - G{"G y 'ел', MMM – G y 'ел', MMM"} - M{"G y 'ел', MMM–MMM"} - y{"G y 'ел', MMM – y 'ел', MMM"} + G{"G y 'ел', MMM – G y 'ел', MMM"} + M{"G y 'ел', MMM–MMM"} + y{"G y 'ел', MMM – y 'ел', MMM"} } GyMMMEd{ - G{"G y 'ел', d MMM, E – G y 'ел', d MMM, E"} - M{"G y 'ел', d MMM, E – d MMM, E"} - d{"G y 'ел', d MMM, E – d MMM, E"} - y{"G y 'ел', d MMM, E – y 'ел', d MMM, E"} + G{"G y 'ел', d MMM, E – G y 'ел', d MMM, E"} + M{"G y 'ел', d MMM, E – d MMM, E"} + d{"G y 'ел', d MMM, E – d MMM, E"} + y{"G y 'ел', d MMM, E – y 'ел', d MMM, E"} } GyMMMd{ - G{"G y 'ел', d MMM – G y 'ел', d MMM"} - M{"G y 'ел', d MMM – d MMM"} - d{"G y 'ел', d–d MMM"} - y{"G y 'ел', d MMM – y 'ел', d MMM"} + G{"G y 'ел', d MMM – G y 'ел', d MMM"} + M{"G y 'ел', d MMM – d MMM"} + d{"G y 'ел', d–d MMM"} + y{"G y 'ел', d MMM – y 'ел', d MMM"} } GyMd{ G{"GGGGG dd.MM.y – GGGGG dd.MM.y"} @@ -464,22 +464,22 @@ tt{ } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y"} @@ -494,22 +494,22 @@ tt{ y{"dd.MM.y, E – dd.MM.y, E"} } yMMM{ - M{"y 'ел', MMM – MMM"} - y{"y 'ел', MMM – y 'ел', MMM"} + M{"y 'ел', MMM – MMM"} + y{"y 'ел', MMM – y 'ел', MMM"} } yMMMEd{ - M{"y 'ел', d MMM, E – d MMM, E"} - d{"y 'ел', d MMM, E – d MMM, E"} - y{"y 'ел', d MMM, E – y 'ел', d MMM, E"} + M{"y 'ел', d MMM, E – d MMM, E"} + d{"y 'ел', d MMM, E – d MMM, E"} + y{"y 'ел', d MMM, E – y 'ел', d MMM, E"} } yMMMM{ - M{"y 'ел', MMMM – MMMM"} - y{"y 'ел', MMMM – y 'ел', MMMM"} + M{"y 'ел', MMMM – MMMM"} + y{"y 'ел', MMMM – y 'ел', MMMM"} } yMMMd{ - M{"y 'ел', d MMM – d MMM"} - d{"y 'ел', d–d MMM"} - y{"y 'ел', d MMM – y 'ел', d MMM"} + M{"y 'ел', d MMM – d MMM"} + d{"y 'ел', d–d MMM"} + y{"y 'ел', d MMM – y 'ел', d MMM"} } yMd{ M{"dd.MM.y – dd.MM.y"} diff --git a/icu4c/source/data/locales/twq.txt b/icu4c/source/data/locales/twq.txt index ecf16ea661dc..c549ed54dafd 100644 --- a/icu4c/source/data/locales/twq.txt +++ b/icu4c/source/data/locales/twq.txt @@ -56,8 +56,8 @@ twq{ MMMd{"d MMM"} Md{"d/M"} d{"d"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"m:ss"} y{"y"} yM{"M/y"} @@ -115,8 +115,8 @@ twq{ MMMd{"d MMM"} Md{"d/M"} d{"d"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"m:ss"} y{"y"} yM{"M/y"} diff --git a/icu4c/source/data/locales/tzm.txt b/icu4c/source/data/locales/tzm.txt index c33842836ce7..91050866461b 100644 --- a/icu4c/source/data/locales/tzm.txt +++ b/icu4c/source/data/locales/tzm.txt @@ -56,7 +56,7 @@ tzm{ MMMd{"MMM d"} Md{"M/d"} d{"d"} - hm{"h:mm a"} + hm{"h:mm a"} ms{"mm:ss"} y{"y"} yM{"M/y"} @@ -114,7 +114,7 @@ tzm{ MMMd{"MMM d"} Md{"M/d"} d{"d"} - hm{"h:mm a"} + hm{"h:mm a"} ms{"mm:ss"} y{"y"} yM{"M/y"} diff --git a/icu4c/source/data/locales/uk.txt b/icu4c/source/data/locales/uk.txt index 88cee313fb93..aa464628ec73 100644 --- a/icu4c/source/data/locales/uk.txt +++ b/icu4c/source/data/locales/uk.txt @@ -521,11 +521,17 @@ uk{ "HH:mm:ss z", "HH:mm:ss", "HH:mm", - "EEEE, d MMMM y 'р'. G", - "d MMMM y 'р'. G", - "d MMM y 'р'. G", + "EEEE, d MMMM y 'р'. G", + "d MMMM y 'р'. G", + "d MMM y 'р'. G", "dd.MM.yy GGGGG", "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + } + DateTimePatterns%atTime{ "{1} 'о' {0}", "{1} 'о' {0}", "{1} {0}", @@ -551,12 +557,12 @@ uk{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"E, d"} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"y G"} - GyMMM{"LLL y 'р'. G"} - GyMMMEd{"E, d MMM y 'р'. G"} - GyMMMd{"d MMM y 'р'. G"} + GyMMM{"LLL y 'р'. G"} + GyMMMEd{"E, d MMM y 'р'. G"} + GyMMMd{"d MMM y 'р'. G"} GyMd{"dd-MM-y GGGGG"} H{"HH"} Hm{"HH:mm"} @@ -570,21 +576,21 @@ uk{ MMMd{"d MMM"} Md{"dd.MM"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"mm:ss"} y{"y G"} yyyy{"y G"} yyyyM{"MM.y G"} yyyyMEd{"E, dd.MM.y G"} - yyyyMMM{"LLL y 'р'. G"} - yyyyMMMEd{"E, d MMM y 'р'. G"} - yyyyMMMM{"LLLL y 'р'. G"} - yyyyMMMd{"d MMM y 'р'. G"} + yyyyMMM{"LLL y 'р'. G"} + yyyyMMMEd{"E, d MMM y 'р'. G"} + yyyyMMMM{"LLLL y 'р'. G"} + yyyyMMMd{"d MMM y 'р'. G"} yyyyMd{"dd.MM.y G"} yyyyQQQ{"QQQ y G"} - yyyyQQQQ{"QQQQ y 'р'. G"} + yyyyQQQQ{"QQQQ y 'р'. G"} } intervalFormats{ Bh{ @@ -597,8 +603,8 @@ uk{ m{"h:mm–h:mm B"} } Gy{ - G{"y 'р'. G – y 'р'. G"} - y{"y–y 'рр'. G"} + G{"y 'р'. G – y 'р'. G"} + y{"y–y 'рр'. G"} } GyM{ G{"MM.y G – MM.y G"} @@ -612,21 +618,21 @@ uk{ y{"ccc, dd.MM.y – ccc, dd.MM.y G"} } GyMMM{ - G{"LLL y 'р'. G – LLL y 'р'. G"} - M{"LLL – LLL y 'р'. G"} - y{"LLL y – LLL y 'рр'. G"} + G{"LLL y 'р'. G – LLL y 'р'. G"} + M{"LLL – LLL y 'р'. G"} + y{"LLL y – LLL y 'рр'. G"} } GyMMMEd{ - G{"ccc, d MMM y 'р'. G – ccc, d MMM y 'р'. G"} - M{"ccc, d MMM – ccc, d MMM y 'р'. G"} - d{"ccc, d MMM – ccc, d MMM y 'р'. G"} - y{"ccc, d MMM y – ccc, d MMM y 'рр'. G"} + G{"ccc, d MMM y 'р'. G – ccc, d MMM y 'р'. G"} + M{"ccc, d MMM – ccc, d MMM y 'р'. G"} + d{"ccc, d MMM – ccc, d MMM y 'р'. G"} + y{"ccc, d MMM y – ccc, d MMM y 'рр'. G"} } GyMMMd{ - G{"d MMM y 'р'. G – d MMM y 'р'. G"} - M{"d MMM – d MMM y 'р'. G"} - d{"d–d MMM y 'р'. G"} - y{"d MMM y – d MMM y 'рр'. G"} + G{"d MMM y 'р'. G – d MMM y 'р'. G"} + M{"d MMM – d MMM y 'р'. G"} + d{"d–d MMM y 'р'. G"} + y{"d MMM y – d MMM y 'рр'. G"} } GyMd{ G{"dd.MM.y G – dd.MM.y G"} @@ -675,22 +681,22 @@ uk{ } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y"} @@ -705,22 +711,22 @@ uk{ y{"E, dd.MM.y – E, dd.MM.y"} } yMMM{ - M{"LLL–LLL y 'р'."} - y{"LLL y – LLL y 'рр'."} + M{"LLL–LLL y 'р'."} + y{"LLL y – LLL y 'рр'."} } yMMMEd{ - M{"E, d MMM – E, d MMM y 'р'."} - d{"E, d – E, d MMM y 'р'."} - y{"E, d MMM y – E, d MMM y 'рр'."} + M{"E, d MMM – E, d MMM y 'р'."} + d{"E, d – E, d MMM y 'р'."} + y{"E, d MMM y – E, d MMM y 'рр'."} } yMMMM{ - M{"LLLL – LLLL y 'р'."} - y{"LLLL y – LLLL y 'рр'."} + M{"LLLL – LLLL y 'р'."} + y{"LLLL y – LLLL y 'рр'."} } yMMMd{ - M{"d MMM – d MMM y 'р'."} - d{"d–d MMM y 'р'."} - y{"d MMM y – d MMM y 'рр'."} + M{"d MMM – d MMM y 'р'."} + d{"d–d MMM y 'р'."} + y{"d MMM y – d MMM y 'рр'."} } yMd{ M{"dd.MM.y – dd.MM.y"} @@ -747,11 +753,17 @@ uk{ "HH:mm:ss z", "HH:mm:ss", "HH:mm", - "EEEE, d MMMM y 'р'.", - "d MMMM y 'р'.", - "d MMM y 'р'.", + "EEEE, d MMMM y 'р'.", + "d MMMM y 'р'.", + "d MMM y 'р'.", "dd.MM.yy", "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + "{1}, {0}", + } + DateTimePatterns%atTime{ "{1} 'о' {0}", "{1} 'о' {0}", "{1}, {0}", @@ -780,12 +792,12 @@ uk{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"E, d"} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"y G"} - GyMMM{"LLL y 'р'. G"} - GyMMMEd{"E, d MMM y 'р'. G"} - GyMMMd{"d MMM y 'р'. G"} + GyMMM{"LLL y 'р'. G"} + GyMMMEd{"E, d MMM y 'р'. G"} + GyMMMd{"d MMM y 'р'. G"} GyMd{"dd-MM-y GGGGG"} H{"HH"} Hm{"HH:mm"} @@ -807,22 +819,22 @@ uk{ MMMd{"d MMM"} Md{"dd.MM"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} - hmsv{"h:mm:ss a v"} - hmv{"h:mm a v"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} + hmsv{"h:mm:ss a v"} + hmv{"h:mm a v"} ms{"mm:ss"} y{"y"} yM{"MM.y"} yMEd{"E, dd.MM.y"} - yMMM{"LLL y 'р'."} - yMMMEd{"E, d MMM y 'р'."} - yMMMM{"LLLL y 'р'."} - yMMMd{"d MMM y 'р'."} + yMMM{"LLL y 'р'."} + yMMMEd{"E, d MMM y 'р'."} + yMMMM{"LLLL y 'р'."} + yMMMd{"d MMM y 'р'."} yMd{"dd.MM.y"} yQQQ{"QQQ y"} - yQQQQ{"QQQQ y 'р'."} + yQQQQ{"QQQQ y 'р'."} yw{ few{"w-'й' 'тиж'. Y 'р'."} many{"w-'й' 'тиж'. Y 'р'."} @@ -996,8 +1008,8 @@ uk{ m{"h:mm–h:mm B"} } Gy{ - G{"y 'р'. G – y 'р'. G"} - y{"y–y 'рр'. G"} + G{"y 'р'. G – y 'р'. G"} + y{"y–y 'рр'. G"} } GyM{ G{"MM.y G – MM.y G"} @@ -1011,21 +1023,21 @@ uk{ y{"ccc, dd.MM.y – ccc, dd.MM.y G"} } GyMMM{ - G{"LLL y 'р'. G – LLL y 'р'. G"} - M{"LLL – LLL y 'р'. G"} - y{"LLL y – LLL y 'рр'. G"} + G{"LLL y 'р'. G – LLL y 'р'. G"} + M{"LLL – LLL y 'р'. G"} + y{"LLL y – LLL y 'рр'. G"} } GyMMMEd{ - G{"ccc, d MMM y 'р'. G – ccc, d MMM y 'р'. G"} - M{"ccc, d MMM – ccc, d MMM y 'р'. G"} - d{"ccc, d MMM – ccc, d MMM y 'р'. G"} - y{"ccc, d MMM y – ccc, d MMM y 'рр'. G"} + G{"ccc, d MMM y 'р'. G – ccc, d MMM y 'р'. G"} + M{"ccc, d MMM – ccc, d MMM y 'р'. G"} + d{"ccc, d MMM – ccc, d MMM y 'р'. G"} + y{"ccc, d MMM y – ccc, d MMM y 'рр'. G"} } GyMMMd{ - G{"d MMM y 'р'. G – d MMM y 'р'. G"} - M{"d MMM – d MMM y 'р'. G"} - d{"d–d MMM y 'р'. G"} - y{"d MMM y – d MMM y 'рр'. G"} + G{"d MMM y 'р'. G – d MMM y 'р'. G"} + M{"d MMM – d MMM y 'р'. G"} + d{"d–d MMM y 'р'. G"} + y{"d MMM y – d MMM y 'рр'. G"} } GyMd{ G{"dd.MM.y G – dd.MM.y G"} @@ -1074,22 +1086,22 @@ uk{ } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y"} @@ -1104,22 +1116,22 @@ uk{ y{"E, dd.MM.y – E, dd.MM.y"} } yMMM{ - M{"LLL–LLL y 'р'."} - y{"LLL y – LLL y 'рр'."} + M{"LLL–LLL y 'р'."} + y{"LLL y – LLL y 'рр'."} } yMMMEd{ - M{"E, d MMM – E, d MMM y 'р'."} - d{"E, d – E, d MMM y 'р'."} - y{"E, d MMM y – E, d MMM y 'рр'."} + M{"E, d MMM – E, d MMM y 'р'."} + d{"E, d – E, d MMM y 'р'."} + y{"E, d MMM y – E, d MMM y 'рр'."} } yMMMM{ - M{"LLLL – LLLL y 'р'."} - y{"LLLL y – LLLL y 'рр'."} + M{"LLLL – LLLL y 'р'."} + y{"LLLL y – LLLL y 'рр'."} } yMMMd{ - M{"d MMM – d MMM y 'р'."} - d{"d–d MMM y 'р'."} - y{"d MMM y – d MMM y 'рр'."} + M{"d MMM – d MMM y 'р'."} + d{"d–d MMM y 'р'."} + y{"d MMM y – d MMM y 'рр'."} } yMd{ M{"dd.MM.y – dd.MM.y"} diff --git a/icu4c/source/data/locales/uz.txt b/icu4c/source/data/locales/uz.txt index ec7aa0694b8e..1f300558c66b 100644 --- a/icu4c/source/data/locales/uz.txt +++ b/icu4c/source/data/locales/uz.txt @@ -312,73 +312,73 @@ uz{ } intervalFormats{ Bh{ - B{"B h – B h"} - h{"B h – h"} + B{"B h – B h"} + h{"B h – h"} } Bhm{ - B{"B h:mm – B h:mm"} + B{"B h:mm – B h:mm"} h{"B h:mm–h:mm"} - m{"B h:mm – h:mm"} + m{"B h:mm – h:mm"} } Gy{ - G{"G y – G y"} + G{"G y – G y"} y{"G y–y"} } GyM{ G{"M/y (GGGGG) – M/y (GGGGG)"} - M{"M/y – M/y (GGGGG)"} - y{"M/y – M/y (GGGGG)"} + M{"M/y – M/y (GGGGG)"} + y{"M/y – M/y (GGGGG)"} } GyMEd{ G{"E, d/M/y (GGGGG) – E, d/M/y (GGGGG)"} - M{"E, d/M/y – E, d/M/y (GGGGG)"} - d{"E, d/M/y – E, d/M/y (GGGGG)"} - y{"E, d/M/y – E, d/M/y (GGGGG)"} + M{"E, d/M/y – E, d/M/y (GGGGG)"} + d{"E, d/M/y – E, d/M/y (GGGGG)"} + y{"E, d/M/y – E, d/M/y (GGGGG)"} } GyMMM{ - G{"MMM G y – MMM G y"} - M{"MMM – MMM, G y"} - y{"MMM y – MMM y (G)"} + G{"MMM G y – MMM G y"} + M{"MMM – MMM, G y"} + y{"MMM y – MMM y (G)"} } GyMMMEd{ - G{"E, d-MMM, G y – E, d-MMM, G y"} - M{"E, d-MMM – E, d-MMM, G y"} - d{"E, d-MMM – E, d-MMM, G y"} - y{"E, d-MMM, y – E, d-MMM, y (G)"} + G{"E, d-MMM, G y – E, d-MMM, G y"} + M{"E, d-MMM – E, d-MMM, G y"} + d{"E, d-MMM – E, d-MMM, G y"} + y{"E, d-MMM, y – E, d-MMM, y (G)"} } GyMMMd{ - G{"d-MMM, G y – d-MMM, G y"} - M{"d-MMM – d-MMM, G y"} - d{"d – d-MMM, G y"} - y{"d-MMM, y – d-MMM, y (G)"} + G{"d-MMM, G y – d-MMM, G y"} + M{"d-MMM – d-MMM, G y"} + d{"d – d-MMM, G y"} + y{"d-MMM, y – d-MMM, y (G)"} } GyMd{ G{"d/M/y (GGGGG) – d/M/y (GGGGG)"} - M{"d/M/y – d/M/y (GGGGG)"} - d{"d/M/y – d/M/y (GGGGG)"} - y{"d/M/y – d/M/y (GGGGG)"} + M{"d/M/y – d/M/y (GGGGG)"} + d{"d/M/y – d/M/y (GGGGG)"} + y{"d/M/y – d/M/y (GGGGG)"} } M{ M{"MM–MM"} } MEd{ - M{"E, dd.MM – E, dd.MM"} - d{"E, dd.MM – E, dd.MM"} + M{"E, dd.MM – E, dd.MM"} + d{"E, dd.MM – E, dd.MM"} } MMM{ - M{"MMM – MMM"} + M{"MMM – MMM"} } MMMEd{ - M{"E, d-MMM – E, d-MMM"} - d{"E, d-MMM – E, d-MMM"} + M{"E, d-MMM – E, d-MMM"} + d{"E, d-MMM – E, d-MMM"} } MMMd{ - M{"d-MMM – d-MMM"} - d{"d – d-MMM"} + M{"d-MMM – d-MMM"} + d{"d – d-MMM"} } Md{ - M{"dd.MM – dd.MM"} - d{"dd.MM – dd.MM"} + M{"dd.MM – dd.MM"} + d{"dd.MM – dd.MM"} } d{ d{"d–d"} @@ -388,36 +388,36 @@ uz{ y{"y–y (G)"} } yM{ - M{"MM.y – MM.y (GGGGG)"} - y{"MM.y – MM.y (GGGGG)"} + M{"MM.y – MM.y (GGGGG)"} + y{"MM.y – MM.y (GGGGG)"} } yMEd{ - M{"E, dd.MM.y – E, dd.MM.y (GGGGG)"} - d{"E, dd.MM.y – E, dd.MM.y (GGGGG)"} - y{"E, dd.MM.y – E, dd.MM.y (GGGGG)"} + M{"E, dd.MM.y – E, dd.MM.y (GGGGG)"} + d{"E, dd.MM.y – E, dd.MM.y (GGGGG)"} + y{"E, dd.MM.y – E, dd.MM.y (GGGGG)"} } yMMM{ - M{"y (G), MMM – MMM"} - y{"y (G), MMM – y, MMM"} + M{"y (G), MMM – MMM"} + y{"y (G), MMM – y, MMM"} } yMMMEd{ - M{"E, d-MMM – E, d-MMM, y (G)"} - d{"E, d-MMM – E, d-MMM, y (G)"} - y{"E, d-MMM, y – E, d-MMM, y (G)"} + M{"E, d-MMM – E, d-MMM, y (G)"} + d{"E, d-MMM – E, d-MMM, y (G)"} + y{"E, d-MMM, y – E, d-MMM, y (G)"} } yMMMM{ - M{"MMMM – MMMM, y (G)"} - y{"MMMM, y – MMMM, y (G)"} + M{"MMMM – MMMM, y (G)"} + y{"MMMM, y – MMMM, y (G)"} } yMMMd{ - M{"d-MMM – d-MMM, y (G)"} - d{"d – d-MMM, y (G)"} - y{"d-MMM, y – d-MMM, y (G)"} + M{"d-MMM – d-MMM, y (G)"} + d{"d – d-MMM, y (G)"} + y{"d-MMM, y – d-MMM, y (G)"} } yMd{ - M{"dd.MM.y – dd.MM.y (GGGGG)"} - d{"dd.MM.y – dd.MM.y (GGGGG)"} - y{"dd.MM.y – dd.MM.y (GGGGG)"} + M{"dd.MM.y – dd.MM.y (GGGGG)"} + d{"dd.MM.y – dd.MM.y (GGGGG)"} + y{"dd.MM.y – dd.MM.y (GGGGG)"} } } } @@ -472,8 +472,8 @@ uz{ EHm{"E, HH:mm"} EHms{"E, HH:mm:ss"} Ed{"d, E"} - Ehm{"E, h:mm a"} - Ehms{"E, h:mm:ss a"} + Ehm{"E, h:mm a"} + Ehms{"E, h:mm:ss a"} Gy{"G y"} GyMMM{"MMM, G y"} GyMMMEd{"E, d-MMM, G y"} @@ -496,11 +496,11 @@ uz{ MMMd{"d-MMM"} Md{"dd/MM"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} - hmsv{"h:mm:ss a (v)"} - hmv{"h:mm a (v)"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} + hmsv{"h:mm:ss a (v)"} + hmv{"h:mm a (v)"} ms{"mm:ss"} y{"y"} yM{"MM.y"} @@ -675,51 +675,51 @@ uz{ } intervalFormats{ Bh{ - B{"B h – B h"} - h{"B h – h"} + B{"B h – B h"} + h{"B h – h"} } Bhm{ - B{"B h:mm – B h:mm"} - h{"B h:mm – h:mm"} - m{"B h:mm – h:mm"} + B{"B h:mm – B h:mm"} + h{"B h:mm – h:mm"} + m{"B h:mm – h:mm"} } Gy{ - G{"G y – G y"} + G{"G y – G y"} y{"G y–y"} } GyM{ G{"M/y (GGGGG) – M/y (GGGGG)"} - M{"M/y – M/y (GGGGG)"} - y{"M/y – M/y (GGGGG)"} + M{"M/y – M/y (GGGGG)"} + y{"M/y – M/y (GGGGG)"} } GyMEd{ G{"E, d/M/y (GGGGG) – E, d/M/y (GGGGG)"} - M{"E, d/M/y – E, d/M/y (GGGGG)"} - d{"E, d/M/y – E, d/M/y (GGGGG)"} - y{"E, d/M/y – E, d/M/y (GGGGG)"} + M{"E, d/M/y – E, d/M/y (GGGGG)"} + d{"E, d/M/y – E, d/M/y (GGGGG)"} + y{"E, d/M/y – E, d/M/y (GGGGG)"} } GyMMM{ - G{"MMM, G y – MMM, G y"} + G{"MMM, G y – MMM, G y"} M{"MMM–MMM, G y"} - y{"MMM, y – MMM, y (G)"} + y{"MMM, y – MMM, y (G)"} } GyMMMEd{ - G{"E, d-MMM, G y – E, d-MMM, G y"} - M{"E, d-MMM – E, d-MMM, G y"} - d{"E, d-MMM – E, d-MMM, G y"} - y{"E, d-MMM, y – E, d-MMM, y (G)"} + G{"E, d-MMM, G y – E, d-MMM, G y"} + M{"E, d-MMM – E, d-MMM, G y"} + d{"E, d-MMM – E, d-MMM, G y"} + y{"E, d-MMM, y – E, d-MMM, y (G)"} } GyMMMd{ - G{"d-MMM, G y – d-MMM, G y"} - M{"d-MMM – d-MMM, G y"} - d{"d – d-MMM, G y"} - y{"d-MMM, y – d-MMM, y (G)"} + G{"d-MMM, G y – d-MMM, G y"} + M{"d-MMM – d-MMM, G y"} + d{"d – d-MMM, G y"} + y{"d-MMM, y – d-MMM, y (G)"} } GyMd{ G{"d/M/y (GGGGG) – d/M/y (GGGGG)"} - M{"d/M/y – d/M/y (GGGGG)"} - d{"d/M/y – d/M/y (GGGGG)"} - y{"d/M/y – d/M/y (GGGGG)"} + M{"d/M/y – d/M/y (GGGGG)"} + d{"d/M/y – d/M/y (GGGGG)"} + y{"d/M/y – d/M/y (GGGGG)"} } H{ H{"HH–HH"} @@ -739,80 +739,80 @@ uz{ M{"M–M"} } MEd{ - M{"E, dd/MM – E, dd/MM"} - d{"E, dd/MM – E, dd/MM"} + M{"E, dd/MM – E, dd/MM"} + d{"E, dd/MM – E, dd/MM"} } MMM{ M{"MMM–MMM"} } MMMEd{ - M{"E, d-MMM – E, d-MMM"} - d{"E, d-MMM – E, d-MMM"} + M{"E, d-MMM – E, d-MMM"} + d{"E, d-MMM – E, d-MMM"} } MMMd{ - M{"d-MMM – d-MMM"} - d{"d – d-MMM"} + M{"d-MMM – d-MMM"} + d{"d – d-MMM"} } Md{ - M{"dd/MM – dd/MM"} - d{"dd/MM – dd/MM"} + M{"dd/MM – dd/MM"} + d{"dd/MM – dd/MM"} } d{ d{"d–d"} } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a (v)"} - h{"h:mm–h:mm a (v)"} - m{"h:mm–h:mm a (v)"} + a{"h:mm a – h:mm a (v)"} + h{"h:mm–h:mm a (v)"} + m{"h:mm–h:mm a (v)"} } hv{ - a{"h a – h a (v)"} - h{"h–h a (v)"} + a{"h a – h a (v)"} + h{"h–h a (v)"} } y{ y{"y–y"} } yM{ - M{"MM/y – MM/y"} - y{"MM/y – MM/y"} + M{"MM/y – MM/y"} + y{"MM/y – MM/y"} } yMEd{ - M{"E, dd/MM/y – E, dd/MM/y"} - d{"E, dd/MM/y – E, dd/MM/y"} - y{"E, dd/MM/y – E, dd/MM/y"} + M{"E, dd/MM/y – E, dd/MM/y"} + d{"E, dd/MM/y – E, dd/MM/y"} + y{"E, dd/MM/y – E, dd/MM/y"} } yMMM{ - M{"MMM – MMM, y"} - y{"MMM, y – MMM, y"} + M{"MMM – MMM, y"} + y{"MMM, y – MMM, y"} } yMMMEd{ - M{"E, d-MMM – E, d-MMM, y"} - d{"E, d-MMM – E, d-MMM, y"} - y{"E, d-MMM, y – E, d-MMM, y"} + M{"E, d-MMM – E, d-MMM, y"} + d{"E, d-MMM – E, d-MMM, y"} + y{"E, d-MMM, y – E, d-MMM, y"} } yMMMM{ - M{"MMMM – MMMM, y"} - y{"MMMM, y – MMMM, y"} + M{"MMMM – MMMM, y"} + y{"MMMM, y – MMMM, y"} } yMMMd{ - M{"d-MMM – d-MMM, y"} - d{"d – d-MMM, y"} - y{"d-MMM, y – d-MMM, y"} + M{"d-MMM – d-MMM, y"} + d{"d – d-MMM, y"} + y{"d-MMM, y – d-MMM, y"} } yMd{ - M{"dd/MM/y – dd/MM/y"} - d{"dd/MM/y – dd/MM/y"} - y{"dd/MM/y – dd/MM/y"} + M{"dd/MM/y – dd/MM/y"} + d{"dd/MM/y – dd/MM/y"} + y{"dd/MM/y – dd/MM/y"} } } monthNames{ diff --git a/icu4c/source/data/locales/uz_Cyrl.txt b/icu4c/source/data/locales/uz_Cyrl.txt index 7a3f61e75ced..f8efcfd0d014 100644 --- a/icu4c/source/data/locales/uz_Cyrl.txt +++ b/icu4c/source/data/locales/uz_Cyrl.txt @@ -331,8 +331,8 @@ uz_Cyrl{ EHm{"E, HH:mm"} EHms{"E, HH:mm:ss"} Ed{"d, E"} - Ehm{"E, h:mm a"} - Ehms{"E, h:mm:ss a"} + Ehm{"E, h:mm a"} + Ehms{"E, h:mm:ss a"} Gy{"G y"} GyMMM{"MMM, G y"} GyMMMEd{"E, d-MMM, G y"} @@ -354,11 +354,11 @@ uz_Cyrl{ MMMd{"d MMM"} Md{"dd/MM"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} - hmsv{"h:mm:ss a (v)"} - hmv{"h:mm a (v)"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} + hmsv{"h:mm:ss a (v)"} + hmv{"h:mm a (v)"} ms{"mm:ss"} y{"y"} yM{"MM/y"} @@ -573,22 +573,22 @@ uz_Cyrl{ } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a (v)"} - h{"h:mm–h:mm a (v)"} - m{"h:mm–h:mm a (v)"} + a{"h:mm a – h:mm a (v)"} + h{"h:mm–h:mm a (v)"} + m{"h:mm–h:mm a (v)"} } hv{ - a{"h a – h a (v)"} - h{"h–h a (v)"} + a{"h a – h a (v)"} + h{"h–h a (v)"} } y{ y{"y–y"} diff --git a/icu4c/source/data/locales/vai_Latn.txt b/icu4c/source/data/locales/vai_Latn.txt index 60df4bf122ae..6baeabd58b8e 100644 --- a/icu4c/source/data/locales/vai_Latn.txt +++ b/icu4c/source/data/locales/vai_Latn.txt @@ -27,10 +27,10 @@ vai_Latn{ calendar{ generic{ DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE, d MMMM y G", "d MMMM y G", "d MMM y G", @@ -62,8 +62,8 @@ vai_Latn{ MMMd{"MMM d"} Md{"M/d"} d{"d"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"m:ss"} y{"y"} yM{"M/y"} @@ -78,10 +78,10 @@ vai_Latn{ } gregorian{ DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE, d MMMM y", "d MMMM y", "d MMM y", @@ -113,8 +113,8 @@ vai_Latn{ MMMd{"MMM d"} Md{"M/d"} d{"d"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"m:ss"} y{"y"} yM{"M/y"} diff --git a/icu4c/source/data/locales/vi.txt b/icu4c/source/data/locales/vi.txt index acfbe47e2c0a..2758c95b43be 100644 --- a/icu4c/source/data/locales/vi.txt +++ b/icu4c/source/data/locales/vi.txt @@ -184,8 +184,8 @@ vi{ "dd-MM-y G", "dd/MM/y GGGGG", "{1} {0}", - "{1} 'lúc' {0}", - "{1} 'lúc' {0}", + "{1} {0}", + "{1} {0}", "{1} {0}", "{1} {0}", } @@ -267,9 +267,9 @@ vi{ UMMMd{"U MMM d"} UMd{"U MM-d"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"mm:ss"} y{"r(U)"} yMd{"r-MM-dd"} @@ -422,45 +422,45 @@ vi{ } intervalFormats{ Bhm{ - h{"h:mm – h:mm B"} - m{"h:mm – h:mm B"} + h{"h:mm – h:mm B"} + m{"h:mm – h:mm B"} } H{ - H{"HH – HH"} + H{"HH – HH"} } Hm{ - H{"HH:mm – HH:mm"} - m{"HH:mm – HH:mm"} + H{"HH:mm – HH:mm"} + m{"HH:mm – HH:mm"} } Hmv{ - H{"HH:mm – HH:mm v"} - m{"HH:mm – HH:mm v"} + H{"HH:mm – HH:mm v"} + m{"HH:mm – HH:mm v"} } Hv{ - H{"HH – HH v"} + H{"HH – HH v"} } M{ - M{"M – M"} + M{"M – M"} } MMM{ - M{"MMM – MMM"} + M{"MMM – MMM"} } d{ - d{"d – d"} + d{"d – d"} } h{ - h{"h – h a"} + h{"h – h a"} } hm{ - h{"h:mm – h:mm a"} - m{"h:mm – h:mm a"} + h{"h:mm – h:mm a"} + m{"h:mm – h:mm a"} } hmv{ - h{"h:mm – h:mm a v"} - m{"h:mm – h:mm a v"} + h{"h:mm – h:mm a v"} + m{"h:mm – h:mm a v"} } y{ - y{"U – U"} + y{"U – U"} } } monthNames{ @@ -614,7 +614,7 @@ vi{ dangi{ intervalFormats{ Bh{ - h{"h – h B"} + h{"h – h B"} } } } @@ -697,6 +697,12 @@ vi{ "dd-MM-y G", "dd/MM/y GGGGG", "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + } + DateTimePatterns%atTime{ "{1} 'lúc' {0}", "{1} 'lúc' {0}", "{1} {0}", @@ -722,8 +728,8 @@ vi{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"E, dd"} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"y G"} GyMMM{"MMM y G"} GyMMMEd{"E, d MMM, y G"} @@ -742,9 +748,9 @@ vi{ MMdd{"dd-MM"} Md{"dd/M"} d{"'Ngày' dd"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"mm:ss"} y{"y G"} yyyy{"y G"} @@ -761,51 +767,51 @@ vi{ } intervalFormats{ Bh{ - B{"h B – h B"} - h{"h – h B"} + B{"h B – h B"} + h{"h – h B"} } Bhm{ - B{"h:mm B – h:mm B"} - h{"h:mm – h:mm B"} - m{"h:mm – h:mm B"} + B{"h:mm B – h:mm B"} + h{"h:mm – h:mm B"} + m{"h:mm – h:mm B"} } Gy{ - G{"y G – y G"} - y{"y – y G"} + G{"y G – y G"} + y{"y – y G"} } GyM{ - G{"M/y GGGGG – M/y GGGGG"} - M{"M/y – M/y GGGGG"} - y{"M/y – M/y GGGGG"} + G{"M/y GGGGG – M/y GGGGG"} + M{"M/y – M/y GGGGG"} + y{"M/y – M/y GGGGG"} } GyMEd{ - G{"E, dd-MM-y GGGGG – E, dd-MM-y GGGGG"} - M{"E, dd-MM-y – E, dd-MM-y GGGGG"} - d{"E, dd-MM-y – E, dd-MM-y GGGGG"} - y{"E, dd-MM-y – E, dd-MM-y GGGGG"} + G{"E, dd-MM-y GGGGG – E, dd-MM-y GGGGG"} + M{"E, dd-MM-y – E, dd-MM-y GGGGG"} + d{"E, dd-MM-y – E, dd-MM-y GGGGG"} + y{"E, dd-MM-y – E, dd-MM-y GGGGG"} } GyMMM{ - G{"MMM y G – MMM y G"} - M{"MMM – MMM y G"} - y{"MMM y – MMM y G"} + G{"MMM y G – MMM y G"} + M{"MMM – MMM y G"} + y{"MMM y – MMM y G"} } GyMMMEd{ - G{"E, d MMM y G – E, d MMM y G"} - M{"E, d MMM – E, d MMM y G"} - d{"E, d MMM – E, d MMM y G"} - y{"E, d MMM y – E, d MMM y G"} + G{"E, d MMM y G – E, d MMM y G"} + M{"E, d MMM – E, d MMM y G"} + d{"E, d MMM – E, d MMM y G"} + y{"E, d MMM y – E, d MMM y G"} } GyMMMd{ - G{"d MMM y G – d MMM y G"} - M{"d MMM – d MMM y G"} - d{"d – d MMM y G"} - y{"d MMM y – d MMM y G"} + G{"d MMM y G – d MMM y G"} + M{"d MMM – d MMM y G"} + d{"d – d MMM y G"} + y{"d MMM y – d MMM y G"} } GyMd{ - G{"dd-MM-y GGGGG – dd-MM-y GGGGG"} - M{"dd-MM-y – dd-MM-y GGGGG"} - d{"dd-MM-y – dd-MM-y GGGGG"} - y{"dd-MM-y – dd-MM-y GGGGG"} + G{"dd-MM-y GGGGG – dd-MM-y GGGGG"} + M{"dd-MM-y – dd-MM-y GGGGG"} + d{"dd-MM-y – dd-MM-y GGGGG"} + y{"dd-MM-y – dd-MM-y GGGGG"} } H{ H{"HH'h' - HH'h'"} @@ -825,70 +831,70 @@ vi{ M{"'Tháng' M - 'Tháng' M"} } MEd{ - M{"EEEE, dd/MM – EEEE, dd/MM"} - d{"EEEE, dd/MM – EEEE, dd/MM"} + M{"EEEE, dd/MM – EEEE, dd/MM"} + d{"EEEE, dd/MM – EEEE, dd/MM"} } MMM{ M{"MMM–MMM"} } MMMEd{ - M{"EEEE, 'ngày' dd 'tháng' M – EEEE, 'ngày' dd 'tháng' M"} - d{"EEEE, 'ngày' dd – EEEE, 'ngày' dd 'tháng' M"} + M{"EEEE, 'ngày' dd 'tháng' M – EEEE, 'ngày' dd 'tháng' M"} + d{"EEEE, 'ngày' dd – EEEE, 'ngày' dd 'tháng' M"} } MMMd{ M{"'Ngày' dd 'tháng' M - 'Ngày' dd 'tháng' M"} d{"'Ngày' dd 'tháng' M - 'Ngày' dd 'tháng' M"} } Md{ - M{"dd/MM – dd/MM"} - d{"dd/MM – dd/MM"} + M{"dd/MM – dd/MM"} + d{"dd/MM – dd/MM"} } d{ d{"'Ngày' dd–dd"} } fallback{"{0} - {1}"} h{ - a{"h'h' a – h'h' a"} + a{"h'h' a – h'h' a"} h{"h'h' - h'h' a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h'h' a – h'h' a v"} + a{"h'h' a – h'h' a v"} h{"h'h'-h'h' a v"} } y{ y{"y–y G"} } yM{ - M{"MM/y – MM/y G"} - y{"MM/y – MM/y G"} + M{"MM/y – MM/y G"} + y{"MM/y – MM/y G"} } yMEd{ - M{"EEEE, dd/MM/y – EEEE, dd/MM/y G"} - d{"EEEE, dd/MM/y – EEEE, dd/MM/y G"} - y{"EEEE, dd/MM/y – EEEE, dd/MM/y G"} + M{"EEEE, dd/MM/y – EEEE, dd/MM/y G"} + d{"EEEE, dd/MM/y – EEEE, dd/MM/y G"} + y{"EEEE, dd/MM/y – EEEE, dd/MM/y G"} } yMMM{ M{"'Tháng' M - 'Tháng' M 'năm' y G"} y{"'Tháng' M 'năm' y - 'Tháng' M 'năm' y G"} } yMMMEd{ - M{"E, dd 'tháng' M – E, dd 'tháng' M, y G"} - d{"EEEE, 'ngày' dd MMM – EEEE, 'ngày' dd MMM 'năm' y G"} - y{"E, dd 'tháng' M, y – E, dd 'tháng' M, y G"} + M{"E, dd 'tháng' M – E, dd 'tháng' M, y G"} + d{"EEEE, 'ngày' dd MMM – EEEE, 'ngày' dd MMM 'năm' y G"} + y{"E, dd 'tháng' M, y – E, dd 'tháng' M, y G"} } yMMMM{ M{"MMMM–MMMM y G"} - y{"MMMM y – MMMM y G"} + y{"MMMM y – MMMM y G"} } yMMMd{ M{"'Ngày' dd 'tháng' M - 'Ngày' dd 'tháng' M 'năm' y G"} @@ -896,9 +902,9 @@ vi{ y{"'Ngày' dd 'tháng' M 'năm' y - 'Ngày' dd 'tháng' M 'năm' y G"} } yMd{ - M{"dd/MM/y – dd/MM/y G"} - d{"dd/MM/y – dd/MM/y G"} - y{"dd/MM/y – dd/MM/y G"} + M{"dd/MM/y – dd/MM/y G"} + d{"dd/MM/y – dd/MM/y G"} + y{"dd/MM/y – dd/MM/y G"} } } } @@ -953,8 +959,8 @@ vi{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"E, 'ngày' d"} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"y G"} GyMMM{"MMM y G"} GyMMMEd{"E, dd/MM/y G"} @@ -978,11 +984,11 @@ vi{ MMdd{"dd-MM"} Md{"dd/M"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} - hmsv{"h:mm:ss a v"} - hmv{"h:mm a v"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} + hmsv{"h:mm:ss a v"} + hmv{"h:mm a v"} mmss{"mm:ss"} ms{"mm:ss"} y{"y"} @@ -1162,49 +1168,49 @@ vi{ } intervalFormats{ Bh{ - h{"h – h B"} + h{"h – h B"} } Bhm{ - h{"h:mm – h:mm B"} - m{"h:mm – h:mm B"} + h{"h:mm – h:mm B"} + m{"h:mm – h:mm B"} } Gy{ - G{"y G – y G"} - y{"y – y G"} + G{"y G – y G"} + y{"y – y G"} } GyM{ - G{"M/y GGGGG – M/y GGGGG"} - M{"M/y – M/y GGGGG"} - y{"M/y – M/y GGGGG"} + G{"M/y GGGGG – M/y GGGGG"} + M{"M/y – M/y GGGGG"} + y{"M/y – M/y GGGGG"} } GyMEd{ - G{"E, dd-MM-y GGGGG – E, dd-MM-y GGGGG"} - M{"E, dd-MM-y – E, dd-MM-y GGGGG"} - d{"E, dd-MM-y – E, dd-MM-y GGGGG"} - y{"E, dd-MM-y – E, dd-MM-y GGGGG"} + G{"E, dd-MM-y GGGGG – E, dd-MM-y GGGGG"} + M{"E, dd-MM-y – E, dd-MM-y GGGGG"} + d{"E, dd-MM-y – E, dd-MM-y GGGGG"} + y{"E, dd-MM-y – E, dd-MM-y GGGGG"} } GyMMM{ - G{"MM y G – MM y G"} - M{"MMM – MMM y G"} - y{"MMM y – MMM y G"} + G{"MM y G – MM y G"} + M{"MMM – MMM y G"} + y{"MMM y – MMM y G"} } GyMMMEd{ - G{"E, d MMM y G – E, d MMM y G"} - M{"E, d MMM – E, d MMM y G"} - d{"E, d MMM – E, d MMM y G"} - y{"E, d MMM y – E, d MMM y G"} + G{"E, d MMM y G – E, d MMM y G"} + M{"E, d MMM – E, d MMM y G"} + d{"E, d MMM – E, d MMM y G"} + y{"E, d MMM y – E, d MMM y G"} } GyMMMd{ - G{"d MMM y G – d MMM y G"} - M{"d MMM – d MMM y G"} - d{"d – d MMM y G"} - y{"d MMM y – d MMM y G"} + G{"d MMM y G – d MMM y G"} + M{"d MMM – d MMM y G"} + d{"d – d MMM y G"} + y{"d MMM y – d MMM y G"} } GyMd{ - G{"dd-MM-y GGGGG – dd-MM-y GGGGG"} - M{"dd-MM-y – dd-MM-y GGGGG"} - d{"dd-MM-y – dd-MM-y GGGGG"} - y{"dd-MM-y – dd-MM-y GGGGG"} + G{"dd-MM-y GGGGG – dd-MM-y GGGGG"} + M{"dd-MM-y – dd-MM-y GGGGG"} + d{"dd-MM-y – dd-MM-y GGGGG"} + y{"dd-MM-y – dd-MM-y GGGGG"} } H{ H{"HH–HH"} @@ -1221,83 +1227,83 @@ vi{ H{"HH–HH v"} } M{ - M{"'Tháng' M – M"} + M{"'Tháng' M – M"} } MEd{ - M{"EEEE, dd/MM – EEEE, dd/MM"} - d{"EEEE, dd/MM – EEEE, dd/MM"} + M{"EEEE, dd/MM – EEEE, dd/MM"} + d{"EEEE, dd/MM – EEEE, dd/MM"} } MMM{ M{"MMM–MMM"} } MMMEd{ - M{"E, d MMM – E, d MMM"} - d{"E, d MMM – E, d MMM"} + M{"E, d MMM – E, d MMM"} + d{"E, d MMM – E, d MMM"} } MMMd{ M{"'Ngày' dd 'tháng' M - 'Ngày' dd 'tháng' M"} d{"'Ngày' dd - 'Ngày' dd 'tháng' M"} } Md{ - M{"dd/MM – dd/MM"} - d{"dd/MM – dd/MM"} + M{"dd/MM – dd/MM"} + d{"dd/MM – dd/MM"} } d{ d{"'Ngày' dd–dd"} } fallback{"{0} - {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y"} } yM{ - M{"MM/y – MM/y"} - y{"MM/y – MM/y"} + M{"MM/y – MM/y"} + y{"MM/y – MM/y"} } yMEd{ - M{"EEEE, dd/MM/y – EEEE, dd/MM/y"} - d{"EEEE, dd/MM/y – EEEE, dd/MM/y"} - y{"EEEE, dd/MM/y – EEEE, dd/MM/y"} + M{"EEEE, dd/MM/y – EEEE, dd/MM/y"} + d{"EEEE, dd/MM/y – EEEE, dd/MM/y"} + y{"EEEE, dd/MM/y – EEEE, dd/MM/y"} } yMMM{ M{"'Tháng' M - 'Tháng' M 'năm' y"} y{"'Tháng' M 'năm' y - 'Tháng' M 'năm' y"} } yMMMEd{ - M{"E, dd 'tháng' M – E, dd 'tháng' M, y"} - d{"EEEE, 'ngày' dd MMM – EEEE, 'ngày' dd MMM 'năm' y"} - y{"E, dd 'tháng' M, y – E, dd 'tháng' M, y"} + M{"E, dd 'tháng' M – E, dd 'tháng' M, y"} + d{"EEEE, 'ngày' dd MMM – EEEE, 'ngày' dd MMM 'năm' y"} + y{"E, dd 'tháng' M, y – E, dd 'tháng' M, y"} } yMMMM{ M{"MMMM–MMMM 'năm' y"} - y{"MMMM, y – MMMM, y"} + y{"MMMM, y – MMMM, y"} } yMMMd{ - M{"d MMM – d MMM, y"} - d{"d – d MMM, y"} + M{"d MMM – d MMM, y"} + d{"d – d MMM, y"} y{"'Ngày' dd 'tháng' M 'năm' y - 'Ngày' dd 'tháng' M 'năm' y"} } yMd{ - M{"dd/MM/y – dd/MM/y"} - d{"dd/MM/y – dd/MM/y"} - y{"dd/MM/y – dd/MM/y"} + M{"dd/MM/y – dd/MM/y"} + d{"dd/MM/y – dd/MM/y"} + y{"dd/MM/y – dd/MM/y"} } } monthNames{ @@ -1571,8 +1577,8 @@ vi{ "dd-MM-y G", "dd/MM/y G", "{1} {0}", - "{1} 'lúc' {0}", - "{1} 'lúc' {0}", + "{1} {0}", + "{1} {0}", "{1} {0}", "{1} {0}", } @@ -1662,8 +1668,8 @@ vi{ "dd-MM-y G", "dd/MM/y GGGGG", "{1} {0}", - "{1} 'lúc' {0}", - "{1} 'lúc' {0}", + "{1} {0}", + "{1} {0}", "{1} {0}", "{1} {0}", } diff --git a/icu4c/source/data/locales/vun.txt b/icu4c/source/data/locales/vun.txt index 1288f3204241..df1590c40e62 100644 --- a/icu4c/source/data/locales/vun.txt +++ b/icu4c/source/data/locales/vun.txt @@ -51,7 +51,7 @@ vun{ MMMd{"MMM d"} Md{"M/d"} d{"d"} - hm{"h:mm a"} + hm{"h:mm a"} ms{"mm:ss"} y{"y"} yM{"M/y"} @@ -109,7 +109,7 @@ vun{ MMMd{"MMM d"} Md{"M/d"} d{"d"} - hm{"h:mm a"} + hm{"h:mm a"} ms{"mm:ss"} y{"y"} yM{"M/y"} diff --git a/icu4c/source/data/locales/wae.txt b/icu4c/source/data/locales/wae.txt index 386aa4d64b97..41708858cdc4 100644 --- a/icu4c/source/data/locales/wae.txt +++ b/icu4c/source/data/locales/wae.txt @@ -51,106 +51,106 @@ wae{ MMMEd{"E, d. MMM"} MMMd{"d. MMM"} Md{"d. MMM"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} yMMM{"MMM y"} yMMMEd{"E, d. MMM y"} yMMMd{"d. MMM y"} } intervalFormats{ H{ - H{"HH – HH"} + H{"HH – HH"} } Hm{ - H{"HH:mm – HH:mm"} - m{"HH:mm – HH:mm"} + H{"HH:mm – HH:mm"} + m{"HH:mm – HH:mm"} } Hmv{ - H{"HH:mm – HH:mm v"} - m{"HH:mm – HH:mm v"} + H{"HH:mm – HH:mm v"} + m{"HH:mm – HH:mm v"} } Hv{ - H{"HH – HH v"} + H{"HH – HH v"} } M{ - M{"MMM – MMM"} + M{"MMM – MMM"} } MEd{ - M{"E, d. MMM – E, d. MMM"} - d{"E, d. MMM – E, d. MMM"} + M{"E, d. MMM – E, d. MMM"} + d{"E, d. MMM – E, d. MMM"} } MMM{ - M{"MMM – MMM"} + M{"MMM – MMM"} } MMMEd{ - M{"E, d. MMM – E, d. MMM"} - d{"E, d. MMM – E, d. MMM"} + M{"E, d. MMM – E, d. MMM"} + d{"E, d. MMM – E, d. MMM"} } MMMd{ M{"d. – d. MMM"} d{"d. – d. MMM"} } Md{ - M{"d. MMM – d. MMM"} - d{"d. MMM – d. MMM"} + M{"d. MMM – d. MMM"} + d{"d. MMM – d. MMM"} } d{ - d{"d – d"} + d{"d – d"} } fallback{"{0} - {1}"} h{ - a{"h a – h a"} - h{"h – h a"} + a{"h a – h a"} + h{"h – h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm – h:mm a"} - m{"h:mm – h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm – h:mm a"} + m{"h:mm – h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm – h:mm a v"} - m{"h:mm – h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm – h:mm a v"} + m{"h:mm – h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h – h a v"} + a{"h a – h a v"} + h{"h – h a v"} } y{ - y{"y – y"} + y{"y – y"} } yM{ - M{"y-MM – y-MM"} - y{"y-MM – y-MM"} + M{"y-MM – y-MM"} + y{"y-MM – y-MM"} } yMEd{ - M{"E, d. MMM y – E, d. MMM y"} - d{"E, d. MMM y – E, d. MMM y"} - y{"E, d. MMM y – E, d. MMM y"} + M{"E, d. MMM y – E, d. MMM y"} + d{"E, d. MMM y – E, d. MMM y"} + y{"E, d. MMM y – E, d. MMM y"} } yMMM{ - M{"MMM – MMM y"} - y{"MMM y – MMM y"} + M{"MMM – MMM y"} + y{"MMM y – MMM y"} } yMMMEd{ - M{"E, d. MMM – E, d. MMM y"} + M{"E, d. MMM – E, d. MMM y"} d{"E, d. – E, d. MMM y"} - y{"E, d. MMM y – E, d. MMM y"} + y{"E, d. MMM y – E, d. MMM y"} } yMMMM{ - M{"MMMM – MMMM y"} - y{"MMMM y – MMMM y"} + M{"MMMM – MMMM y"} + y{"MMMM y – MMMM y"} } yMMMd{ - M{"d. MMM – d. MMM y"} + M{"d. MMM – d. MMM y"} d{"d. – d. MMM y"} - y{"d. MMM y – d. MMM y"} + y{"d. MMM y – d. MMM y"} } yMd{ - M{"y-MM-dd – y-MM-dd"} - d{"y-MM-dd – y-MM-dd"} - y{"y-MM-dd – y-MM-dd"} + M{"y-MM-dd – y-MM-dd"} + d{"y-MM-dd – y-MM-dd"} + y{"y-MM-dd – y-MM-dd"} } } } @@ -187,9 +187,9 @@ wae{ MMMEd{"E, d. MMM"} MMMd{"d. MMM"} Md{"d. MMM"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} yMMM{"MMM y"} yMMMEd{"E, d. MMM y"} yMMMd{"d. MMM y"} @@ -262,97 +262,97 @@ wae{ } intervalFormats{ H{ - H{"HH – HH"} + H{"HH – HH"} } Hm{ - H{"HH:mm – HH:mm"} - m{"HH:mm – HH:mm"} + H{"HH:mm – HH:mm"} + m{"HH:mm – HH:mm"} } Hmv{ - H{"HH:mm – HH:mm v"} - m{"HH:mm – HH:mm v"} + H{"HH:mm – HH:mm v"} + m{"HH:mm – HH:mm v"} } Hv{ - H{"HH – HH v"} + H{"HH – HH v"} } M{ - M{"MMM – MMM"} + M{"MMM – MMM"} } MEd{ - M{"E, d. MMM – E, d. MMM"} - d{"E, d. MMM – E, d. MMM"} + M{"E, d. MMM – E, d. MMM"} + d{"E, d. MMM – E, d. MMM"} } MMM{ - M{"MMM – MMM"} + M{"MMM – MMM"} } MMMEd{ - M{"E, d. MMM – E, d. MMM"} - d{"E, d. MMM – E, d. MMM"} + M{"E, d. MMM – E, d. MMM"} + d{"E, d. MMM – E, d. MMM"} } MMMd{ M{"d. – d. MMM"} d{"d. – d. MMM"} } Md{ - M{"d. MMM – d. MMM"} - d{"d. MMM – d. MMM"} + M{"d. MMM – d. MMM"} + d{"d. MMM – d. MMM"} } d{ - d{"d – d"} + d{"d – d"} } fallback{"{0} - {1}"} h{ - a{"h a – h a"} - h{"h – h a"} + a{"h a – h a"} + h{"h – h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm – h:mm a"} - m{"h:mm – h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm – h:mm a"} + m{"h:mm – h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm – h:mm a v"} - m{"h:mm – h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm – h:mm a v"} + m{"h:mm – h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h – h a v"} + a{"h a – h a v"} + h{"h – h a v"} } y{ - y{"y – y"} + y{"y – y"} } yM{ - M{"y-MM – y-MM"} - y{"y-MM – y-MM"} + M{"y-MM – y-MM"} + y{"y-MM – y-MM"} } yMEd{ - M{"E, d. MMM y – E, d. MMM y"} - d{"E, d. MMM y – E, d. MMM y"} - y{"E, d. MMM y – E, d. MMM y"} + M{"E, d. MMM y – E, d. MMM y"} + d{"E, d. MMM y – E, d. MMM y"} + y{"E, d. MMM y – E, d. MMM y"} } yMMM{ - M{"MMM – MMM y"} - y{"MMM y – MMM y"} + M{"MMM – MMM y"} + y{"MMM y – MMM y"} } yMMMEd{ - M{"E, d. MMM – E, d. MMM y"} + M{"E, d. MMM – E, d. MMM y"} d{"E, d. – E, d. MMM y"} - y{"E, d. MMM y – E, d. MMM y"} + y{"E, d. MMM y – E, d. MMM y"} } yMMMM{ - M{"MMMM – MMMM y"} - y{"MMMM y – MMMM y"} + M{"MMMM – MMMM y"} + y{"MMMM y – MMMM y"} } yMMMd{ - M{"d. MMM – d. MMM y"} + M{"d. MMM – d. MMM y"} d{"d. – d. MMM y"} - y{"d. MMM y – d. MMM y"} + y{"d. MMM y – d. MMM y"} } yMd{ - M{"y-MM-dd – y-MM-dd"} - d{"y-MM-dd – y-MM-dd"} - y{"y-MM-dd – y-MM-dd"} + M{"y-MM-dd – y-MM-dd"} + d{"y-MM-dd – y-MM-dd"} + y{"y-MM-dd – y-MM-dd"} } } monthNames{ diff --git a/icu4c/source/data/locales/wo.txt b/icu4c/source/data/locales/wo.txt index 8da305626872..186b2899bd13 100644 --- a/icu4c/source/data/locales/wo.txt +++ b/icu4c/source/data/locales/wo.txt @@ -49,6 +49,12 @@ wo{ "d MMM, y G", "dd-MM-y GGGGG", "{1} - {0}", + "{1} - {0}", + "{1} - {0}", + "{1} - {0}", + "{1} - {0}", + } + DateTimePatterns%atTime{ "{1} 'ci' {0}", "{1} 'ci' {0}", "{1} - {0}", @@ -118,6 +124,12 @@ wo{ "d MMM, y", "dd-MM-y", "{1} - {0}", + "{1} - {0}", + "{1} - {0}", + "{1} - {0}", + "{1} - {0}", + } + DateTimePatterns%atTime{ "{1} 'ci' {0}", "{1} 'ci' {0}", "{1} - {0}", @@ -141,8 +153,8 @@ wo{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"E, d"} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"y G"} GyMMM{"MMM, y G"} GyMMMEd{"E, d MMM, y G"} @@ -161,11 +173,11 @@ wo{ MMMd{"d MMM"} Md{"dd-MM"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} - hmsv{"h:mm:ss a v"} - hmv{"h:mm a v"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} + hmsv{"h:mm:ss a v"} + hmv{"h:mm a v"} ms{"mm:ss"} y{"y"} yM{"MM-y"} diff --git a/icu4c/source/data/locales/xh.txt b/icu4c/source/data/locales/xh.txt index 41a8a4aaa447..2eb60a01c33a 100644 --- a/icu4c/source/data/locales/xh.txt +++ b/icu4c/source/data/locales/xh.txt @@ -60,8 +60,8 @@ xh{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"d, E"} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"G y"} GyMMM{"G y MMM"} GyMMMEd{"G y MMM d, E"} @@ -83,11 +83,11 @@ xh{ MMMd{"MMM d"} Md{"MM-dd"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} - hmsv{"h:mm:ss a v"} - hmv{"h:mm a v"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} + hmsv{"h:mm:ss a v"} + hmv{"h:mm a v"} ms{"mm:ss"} y{"y"} yM{"y-MM"} @@ -193,80 +193,80 @@ xh{ M{"MM–MM"} } MEd{ - M{"MM-dd, E – MM-dd, E"} - d{"MM-dd, E – MM-dd, E"} + M{"MM-dd, E – MM-dd, E"} + d{"MM-dd, E – MM-dd, E"} } MMM{ M{"LLL–LLL"} } MMMEd{ - M{"MMM d, E – MMM d, E"} - d{"MMM d, E – MMM d, E"} + M{"MMM d, E – MMM d, E"} + d{"MMM d, E – MMM d, E"} } MMMd{ - M{"MMM d – MMM d"} + M{"MMM d – MMM d"} d{"MMM d–d"} } Md{ - M{"MM-dd – MM-dd"} - d{"MM-dd – MM-dd"} + M{"MM-dd – MM-dd"} + d{"MM-dd – MM-dd"} } d{ d{"d–d"} } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y"} } yM{ - M{"y-MM – y-MM"} - y{"y-MM – y-MM"} + M{"y-MM – y-MM"} + y{"y-MM – y-MM"} } yMEd{ - M{"y-MM-dd, E – y-MM-dd, E"} - d{"y-MM-dd, E – y-MM-dd, E"} - y{"y-MM-dd, E – y-MM-dd, E"} + M{"y-MM-dd, E – y-MM-dd, E"} + d{"y-MM-dd, E – y-MM-dd, E"} + y{"y-MM-dd, E – y-MM-dd, E"} } yMMM{ M{"y MMM–MMM"} - y{"y MMM – y MMM"} + y{"y MMM – y MMM"} } yMMMEd{ - M{"y MMM d, E – MMM d, E"} - d{"y MMM d, E – MMM d, E"} - y{"y MMM d, E – y MMM d, E"} + M{"y MMM d, E – MMM d, E"} + d{"y MMM d, E – MMM d, E"} + y{"y MMM d, E – y MMM d, E"} } yMMMM{ M{"y MMMM–MMMM"} - y{"y MMMM – y MMMM"} + y{"y MMMM – y MMMM"} } yMMMd{ - M{"y MMM d – MMM d"} + M{"y MMM d – MMM d"} d{"y MMM d–d"} - y{"y MMM d – y MMM d"} + y{"y MMM d – y MMM d"} } yMd{ - M{"y-MM-dd – y-MM-dd"} - d{"y-MM-dd – y-MM-dd"} - y{"y-MM-dd – y-MM-dd"} + M{"y-MM-dd – y-MM-dd"} + d{"y-MM-dd – y-MM-dd"} + y{"y-MM-dd – y-MM-dd"} } } monthNames{ diff --git a/icu4c/source/data/locales/xog.txt b/icu4c/source/data/locales/xog.txt index 42ede305ae01..032b5cc71dcd 100644 --- a/icu4c/source/data/locales/xog.txt +++ b/icu4c/source/data/locales/xog.txt @@ -50,7 +50,7 @@ xog{ MMMd{"MMM d"} Md{"M/d"} d{"d"} - hm{"h:mm a"} + hm{"h:mm a"} ms{"mm:ss"} y{"y"} yM{"M/y"} @@ -108,7 +108,7 @@ xog{ MMMd{"MMM d"} Md{"M/d"} d{"d"} - hm{"h:mm a"} + hm{"h:mm a"} ms{"mm:ss"} y{"y"} yM{"M/y"} diff --git a/icu4c/source/data/locales/yav.txt b/icu4c/source/data/locales/yav.txt index 2c307160a9f2..0de6087eef26 100644 --- a/icu4c/source/data/locales/yav.txt +++ b/icu4c/source/data/locales/yav.txt @@ -61,8 +61,8 @@ yav{ MMMd{"d MMM"} Md{"d/M"} d{"d"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"m:ss"} y{"y"} yM{"M/y"} @@ -120,8 +120,8 @@ yav{ MMMd{"d MMM"} Md{"d/M"} d{"d"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"m:ss"} y{"y"} yM{"M/y"} diff --git a/icu4c/source/data/locales/yo.txt b/icu4c/source/data/locales/yo.txt index 30be0cbcbbfc..21a78211f6a1 100644 --- a/icu4c/source/data/locales/yo.txt +++ b/icu4c/source/data/locales/yo.txt @@ -98,6 +98,12 @@ yo{ "d MM y G", "dd/MM/y G", "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + } + DateTimePatterns%atTime{ "{1} 'ní' {0}", "{1} 'ní' {0}", "{1} {0}", @@ -126,7 +132,7 @@ yo{ MMMd{"MMM d"} Md{"M/d"} d{"d"} - hm{"h:mm a"} + hm{"h:mm a"} ms{"mm:ss"} y{"y"} yM{"M/y"} @@ -187,8 +193,8 @@ yo{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"E, d"} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"G y"} GyMMM{"G y MMM"} GyMMMEd{"G y MMM d, E"} @@ -208,11 +214,11 @@ yo{ MMMd{"d MMM"} Md{"d/M"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} - hmsv{"h:mm:ss a v"} - hmv{"h:mm a v"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} + hmsv{"h:mm:ss a v"} + hmv{"h:mm a v"} ms{"mm:ss"} y{"y"} yM{"M/y"} @@ -329,65 +335,65 @@ yo{ M{"MM–MM"} } MEd{ - M{"MM-dd, E – MM-dd, E"} - d{"MM-dd, E – MM-dd, E"} + M{"MM-dd, E – MM-dd, E"} + d{"MM-dd, E – MM-dd, E"} } MMM{ M{"LLL–LLL"} } MMMEd{ - M{"MMM d, E – MMM d, E"} - d{"MMM d, E – MMM d, E"} + M{"MMM d, E – MMM d, E"} + d{"MMM d, E – MMM d, E"} } MMMd{ - M{"MMM d – MMM d"} + M{"MMM d – MMM d"} d{"MMM d–d"} } Md{ - M{"MM-dd – MM-dd"} - d{"MM-dd – MM-dd"} + M{"MM-dd – MM-dd"} + d{"MM-dd – MM-dd"} } d{ d{"d–d"} } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y"} } yM{ - M{"MM-y – MM-y"} - y{"y-MM – y-MM"} + M{"MM-y – MM-y"} + y{"y-MM – y-MM"} } yMEd{ - M{"y-MM-dd, E – y-MM-dd, E"} - d{"E, dd-MM-y – E dd-MM-y, E"} - y{"y-MM-dd, E – y-MM-dd, E"} + M{"y-MM-dd, E – y-MM-dd, E"} + d{"E, dd-MM-y – E dd-MM-y, E"} + y{"y-MM-dd, E – y-MM-dd, E"} } yMMM{ M{"y MMM–MMM"} - y{"y MMM – y MMM"} + y{"y MMM – y MMM"} } yMMMEd{ - M{"MMM d, E – MMM d, E y"} - d{"MMM d, E – MMM d, E y"} + M{"MMM d, E – MMM d, E y"} + d{"MMM d, E – MMM d, E y"} y{"y MMM d y, E – MMM d, E y"} } yMMMM{ @@ -395,14 +401,14 @@ yo{ y{"MMMM – y MMMM y"} } yMMMd{ - M{"MMM d – MMM d y"} + M{"MMM d – MMM d y"} d{"MMM d–d y"} - y{"y MMM d – y MMM d"} + y{"y MMM d – y MMM d"} } yMd{ - M{"y-MM-dd – y-MM-dd"} - d{"y-MM-dd – y-MM-dd"} - y{"y-MM-dd – y-MM-dd"} + M{"y-MM-dd – y-MM-dd"} + d{"y-MM-dd – y-MM-dd"} + y{"y-MM-dd – y-MM-dd"} } } monthNames{ diff --git a/icu4c/source/data/locales/yrl.txt b/icu4c/source/data/locales/yrl.txt index e447c1321ea8..8624e3b0e930 100644 --- a/icu4c/source/data/locales/yrl.txt +++ b/icu4c/source/data/locales/yrl.txt @@ -364,8 +364,8 @@ yrl{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"E, d"} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"y G"} GyMMM{"MMM y G"} GyMMMEd{"E, d MMM y G"} @@ -382,9 +382,9 @@ yrl{ MMMd{"d MMM"} Md{"d/M"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"mm:ss"} y{"y G"} yyyy{"y G"} @@ -402,7 +402,7 @@ yrl{ } intervalFormats{ Bhm{ - h{"h:mm – h:mm B"} + h{"h:mm – h:mm B"} } H{ H{"HH'h' - HH'h'"} @@ -416,86 +416,86 @@ yrl{ m{"HH:mm–HH:mm v"} } Hv{ - H{"HH – HH v"} + H{"HH – HH v"} } M{ M{"M–M"} } MEd{ - M{"E, dd/MM – E, dd/MM"} - d{"E, dd/MM – E, dd/MM"} + M{"E, dd/MM – E, dd/MM"} + d{"E, dd/MM – E, dd/MM"} } MMM{ - M{"MMM – MMM"} + M{"MMM – MMM"} } MMMEd{ - M{"E, d MMM – E, d MMM"} - d{"E, d MMM – E, d MMM"} + M{"E, d MMM – E, d MMM"} + d{"E, d MMM – E, d MMM"} } MMMd{ - M{"d MMM – d MMM"} + M{"d MMM – d MMM"} d{"d–d MMM"} } Md{ - M{"dd/MM – dd/MM"} - d{"dd/MM – dd/MM"} + M{"dd/MM – dd/MM"} + d{"dd/MM – dd/MM"} } d{ d{"d–d"} } fallback{"{0} - {1}"} h{ - a{"h'h' a – h'h' a"} + a{"h'h' a – h'h' a"} h{"h'h' - h'h' a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h – h a v"} + a{"h a – h a v"} + h{"h – h a v"} } y{ - y{"y – y G"} + y{"y – y G"} } yM{ - M{"MM/y – MM/y G"} - y{"MM/y – MM/y G"} + M{"MM/y – MM/y G"} + y{"MM/y – MM/y G"} } yMEd{ - M{"E, dd/MM/y – E, dd/MM/y G"} - d{"E, dd/MM/y – E, dd/MM/y G"} - y{"E, dd/MM/y – E, dd/MM/y G"} + M{"E, dd/MM/y – E, dd/MM/y G"} + d{"E, dd/MM/y – E, dd/MM/y G"} + y{"E, dd/MM/y – E, dd/MM/y G"} } yMMM{ M{"MMM–MMM y G"} - y{"MMM y – MMM y G"} + y{"MMM y – MMM y G"} } yMMMEd{ - M{"E, d MMM – E, d MMM y G"} - d{"E, d MMM – E, d MMM y G"} - y{"E, d MMM y – E, d MMM y G"} + M{"E, d MMM – E, d MMM y G"} + d{"E, d MMM – E, d MMM y G"} + y{"E, d MMM y – E, d MMM y G"} } yMMMM{ M{"MMMM–MMMM y G"} - y{"MMMM y – MMMM y G"} + y{"MMMM y – MMMM y G"} } yMMMd{ - M{"d MMM – d MMM y G"} + M{"d MMM – d MMM y G"} d{"d–d MMM y"} - y{"d MMM y – d MMM y G"} + y{"d MMM y – d MMM y G"} } yMd{ - M{"dd/MM/y – dd/MM/y G"} - d{"dd/MM/y – dd/MM/y G"} - y{"dd/MM/y – dd/MM/y G"} + M{"dd/MM/y – dd/MM/y G"} + d{"dd/MM/y – dd/MM/y G"} + y{"dd/MM/y – dd/MM/y G"} } } } @@ -540,8 +540,8 @@ yrl{ EHm{"E, HH:mm"} EHms{"E, HH:mm:ss"} Ed{"E, d"} - Ehm{"E, h:mm a"} - Ehms{"E, h:mm:ss a"} + Ehm{"E, h:mm a"} + Ehms{"E, h:mm:ss a"} Gy{"y G"} GyMMM{"MMM y G"} GyMMMEd{"E, d MMM y G"} @@ -565,11 +565,11 @@ yrl{ MMdd{"dd/MM"} Md{"d/M"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} - hmsv{"h:mm:ss a v"} - hmv{"h:mm a v"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} + hmsv{"h:mm:ss a v"} + hmv{"h:mm a v"} ms{"mm:ss"} y{"y"} yM{"MM/y"} @@ -720,144 +720,144 @@ yrl{ } intervalFormats{ Bh{ - B{"h B – h B"} - h{"h – h B"} + B{"h B – h B"} + h{"h – h B"} } Bhm{ - B{"h:mm B – h:mm B"} - h{"h:mm – h:mm B"} - m{"h:mm – h:mm B"} + B{"h:mm B – h:mm B"} + h{"h:mm – h:mm B"} + m{"h:mm – h:mm B"} } Gy{ - G{"G y – G y"} - y{"G y – y"} + G{"G y – G y"} + y{"G y – y"} } GyM{ - G{"GGGGG MM/y – GGGGG MM/y"} - M{"GGGGG MM/y – MM/y"} - y{"GGGGG MM/y – MM/y"} + G{"GGGGG MM/y – GGGGG MM/y"} + M{"GGGGG MM/y – MM/y"} + y{"GGGGG MM/y – MM/y"} } GyMEd{ - G{"GGGGG E dd/MM/y – GGGGG E dd/MM/y"} - M{"GGGGG E dd/MM/y – E dd/MM/y"} - d{"GGGGG E dd/MM/y – dd/MM/y"} - y{"GGGGG E dd/MM/y – E dd/MM/y"} + G{"GGGGG E dd/MM/y – GGGGG E dd/MM/y"} + M{"GGGGG E dd/MM/y – E dd/MM/y"} + d{"GGGGG E dd/MM/y – dd/MM/y"} + y{"GGGGG E dd/MM/y – E dd/MM/y"} } GyMMM{ - G{"G MMM y – G MMM y"} - M{"G MMM y – MMM"} - y{"G MMM y – MMM y"} + G{"G MMM y – G MMM y"} + M{"G MMM y – MMM"} + y{"G MMM y – MMM y"} } GyMMMEd{ - G{"G E, d MMM y – G E, d MMM y"} - M{"G E, d MMM y – E, d MMM"} - d{"G E, d MMM y – E, d MMM"} - y{"G E, d MMM y – E, d MMM y"} + G{"G E, d MMM y – G E, d MMM y"} + M{"G E, d MMM y – E, d MMM"} + d{"G E, d MMM y – E, d MMM"} + y{"G E, d MMM y – E, d MMM y"} } GyMMMd{ - G{"G d MMM y – G d MMM y"} - M{"G d MMM y – d MMM"} - d{"G d – d MMM y"} - y{"G d MMM y – d MMM y"} + G{"G d MMM y – G d MMM y"} + M{"G d MMM y – d MMM"} + d{"G d – d MMM y"} + y{"G d MMM y – d MMM y"} } GyMd{ - G{"GGGGG dd/MM/y – GGGGG dd/MM/y"} - M{"GGGGG dd/MM/y – dd/MM/y"} - d{"GGGGG dd/MM/y – dd/MM/y"} - y{"GGGGG dd/MM/y – dd/MM/y"} + G{"GGGGG dd/MM/y – GGGGG dd/MM/y"} + M{"GGGGG dd/MM/y – dd/MM/y"} + d{"GGGGG dd/MM/y – dd/MM/y"} + y{"GGGGG dd/MM/y – dd/MM/y"} } H{ H{"HH'h' - HH'h'"} } Hm{ - H{"HH:mm – HH:mm"} - m{"HH:mm – HH:mm"} + H{"HH:mm – HH:mm"} + m{"HH:mm – HH:mm"} } Hmv{ - H{"HH:mm – HH:mm v"} - m{"HH:mm – HH:mm v"} + H{"HH:mm – HH:mm v"} + m{"HH:mm – HH:mm v"} } Hv{ - H{"HH – HH v"} + H{"HH – HH v"} } M{ - M{"M – M"} + M{"M – M"} } MEd{ - M{"E, dd/MM – E, dd/MM"} - d{"E, dd/MM – E, dd/MM"} + M{"E, dd/MM – E, dd/MM"} + d{"E, dd/MM – E, dd/MM"} } MMM{ - M{"MMM – MMM"} + M{"MMM – MMM"} } MMMEd{ - M{"E, d MMM – E, d MMM"} - d{"E, d – E, d MMM"} + M{"E, d MMM – E, d MMM"} + d{"E, d – E, d MMM"} } MMMd{ - M{"d MMM – d MMM"} - d{"d – d MMM"} + M{"d MMM – d MMM"} + d{"d – d MMM"} } Md{ - M{"dd/MM – dd/MM"} - d{"dd/MM – dd/MM"} + M{"dd/MM – dd/MM"} + d{"dd/MM – dd/MM"} } d{ - d{"d – d"} + d{"d – d"} } fallback{"{0} - {1}"} h{ - a{"h a – h a"} - h{"h – h a"} + a{"h a – h a"} + h{"h – h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm – h:mm a"} - m{"h:mm – h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm – h:mm a"} + m{"h:mm – h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm – h:mm a v"} - m{"h:mm – h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm – h:mm a v"} + m{"h:mm – h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h – h a v"} + a{"h a – h a v"} + h{"h – h a v"} } y{ - y{"y – y"} + y{"y – y"} } yM{ - M{"MM/y – MM/y"} - y{"MM/y – MM/y"} + M{"MM/y – MM/y"} + y{"MM/y – MM/y"} } yMEd{ - M{"E, dd/MM/y – E, dd/MM/y"} - d{"E, dd/MM/y – E, dd/MM/y"} - y{"E, dd/MM/y – E, dd/MM/y"} + M{"E, dd/MM/y – E, dd/MM/y"} + d{"E, dd/MM/y – E, dd/MM/y"} + y{"E, dd/MM/y – E, dd/MM/y"} } yMMM{ - M{"MMM – MMM y"} - y{"MMM y – MMM y"} + M{"MMM – MMM y"} + y{"MMM y – MMM y"} } yMMMEd{ - M{"E, d MMM – E, d MMM y"} - d{"E, d – E, d MMM y"} - y{"E, d MMM y – E, d MMM y"} + M{"E, d MMM – E, d MMM y"} + d{"E, d – E, d MMM y"} + y{"E, d MMM y – E, d MMM y"} } yMMMM{ - M{"MMMM – MMMM y"} - y{"MMMM y – MMMM y"} + M{"MMMM – MMMM y"} + y{"MMMM y – MMMM y"} } yMMMd{ - M{"d MMM – d MMM y"} - d{"d – d MMM y"} - y{"d MMM y – d MMM y"} + M{"d MMM – d MMM y"} + d{"d – d MMM y"} + y{"d MMM y – d MMM y"} } yMd{ - M{"dd/MM/y – dd/MM/y"} - d{"dd/MM/y – dd/MM/y"} - y{"dd/MM/y – dd/MM/y"} + M{"dd/MM/y – dd/MM/y"} + d{"dd/MM/y – dd/MM/y"} + y{"dd/MM/y – dd/MM/y"} } } monthNames{ diff --git a/icu4c/source/data/locales/yrl_CO.txt b/icu4c/source/data/locales/yrl_CO.txt index fa477b49716d..a83b2ec99bec 100644 --- a/icu4c/source/data/locales/yrl_CO.txt +++ b/icu4c/source/data/locales/yrl_CO.txt @@ -61,10 +61,10 @@ yrl_CO{ "p. m.", } DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE, d MMMM y", "d MMMM y", "d MMM y", diff --git a/icu4c/source/data/locales/yrl_VE.txt b/icu4c/source/data/locales/yrl_VE.txt index bfda4d7c9698..6a6f2af90947 100644 --- a/icu4c/source/data/locales/yrl_VE.txt +++ b/icu4c/source/data/locales/yrl_VE.txt @@ -61,10 +61,10 @@ yrl_VE{ "p. m.", } DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", "EEEE, d MMMM y", "d MMMM y", "d MMM y", diff --git a/icu4c/source/data/locales/zu.txt b/icu4c/source/data/locales/zu.txt index 8b0046f98448..d12aeb4a67c1 100644 --- a/icu4c/source/data/locales/zu.txt +++ b/icu4c/source/data/locales/zu.txt @@ -258,8 +258,8 @@ zu{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"d E"} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"y G"} GyMMM{"MMM y G"} GyMMMEd{"E, MMM d, y G"} @@ -275,9 +275,9 @@ zu{ MMMd{"MMM d"} Md{"M/d"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} ms{"mm:ss"} y{"y G"} yM{"yM"} @@ -318,80 +318,80 @@ zu{ M{"M–M"} } MEd{ - M{"E, M/d – E, M/d"} - d{"E, M/d – E, M/d"} + M{"E, M/d – E, M/d"} + d{"E, M/d – E, M/d"} } MMM{ M{"MMM–MMM"} } MMMEd{ - M{"E, MMM d – E, MMM d"} - d{"E, MMM d – E, MMM d"} + M{"E, MMM d – E, MMM d"} + d{"E, MMM d – E, MMM d"} } MMMd{ - M{"MMM d – MMM d"} - d{"MMM d – d"} + M{"MMM d – MMM d"} + d{"MMM d – d"} } Md{ - M{"M/d – M/d"} - d{"M/d – M/d"} + M{"M/d – M/d"} + d{"M/d – M/d"} } d{ d{"d–d"} } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y"} } yM{ - M{"M/y – M/y"} - y{"M/y – M/y"} + M{"M/y – M/y"} + y{"M/y – M/y"} } yMEd{ - M{"E, M/d/y – E, M/d/y"} - d{"E, M/d/y – E, M/d/y"} - y{"E, M/d/y – E, M/d/y"} + M{"E, M/d/y – E, M/d/y"} + d{"E, M/d/y – E, M/d/y"} + y{"E, M/d/y – E, M/d/y"} } yMMM{ - M{"MMM – MMM y G"} - y{"MMM y – MMM y"} + M{"MMM – MMM y G"} + y{"MMM y – MMM y"} } yMMMEd{ - M{"E, MMM d – E, MMM d, y"} - d{"E, MMM d – E, MMM d, y"} - y{"E, MMM d, y – E, MMM d, y"} + M{"E, MMM d – E, MMM d, y"} + d{"E, MMM d – E, MMM d, y"} + y{"E, MMM d, y – E, MMM d, y"} } yMMMM{ - M{"MMMM – MMMM y G"} - y{"MMMM y – MMMM y"} + M{"MMMM – MMMM y G"} + y{"MMMM y – MMMM y"} } yMMMd{ - M{"MMM d – MMM d, y"} - d{"MMM d – d, y G"} - y{"MMM d, y – MMM d, y"} + M{"MMM d – MMM d, y"} + d{"MMM d – d, y G"} + y{"MMM d, y – MMM d, y"} } yMd{ - M{"M/d/y – M/d/y"} - d{"M/d/y – M/d/y"} - y{"M/d/y – M/d/y"} + M{"M/d/y – M/d/y"} + d{"M/d/y – M/d/y"} + y{"M/d/y – M/d/y"} } } } @@ -446,8 +446,8 @@ zu{ EHm{"E HH:mm"} EHms{"E HH:mm:ss"} Ed{"d E"} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} Gy{"G y"} GyMMM{"G y MMM"} GyMMMEd{"G y MMM d, E"} @@ -470,11 +470,11 @@ zu{ MMMd{"MMM d"} Md{"MM-dd"} d{"d"} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} - hmsv{"h:mm:ss a v"} - hmv{"h:mm a v"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} + hmsv{"h:mm:ss a v"} + hmv{"h:mm a v"} ms{"mm:ss"} y{"y"} yM{"y-MM"} @@ -643,97 +643,97 @@ zu{ } intervalFormats{ H{ - H{"HH – HH"} + H{"HH – HH"} } Hm{ - H{"HH:mm – HH:mm"} - m{"HH:mm – HH:mm"} + H{"HH:mm – HH:mm"} + m{"HH:mm – HH:mm"} } Hmv{ - H{"HH:mm – HH:mm v"} - m{"HH:mm – HH:mm v"} + H{"HH:mm – HH:mm v"} + m{"HH:mm – HH:mm v"} } Hv{ - H{"HH – HH v"} + H{"HH – HH v"} } M{ - M{"M – M"} + M{"M – M"} } MEd{ - M{"E, M/d – E, M/d"} - d{"E, M/d – E, M/d"} + M{"E, M/d – E, M/d"} + d{"E, M/d – E, M/d"} } MMM{ - M{"MMM – MMM"} + M{"MMM – MMM"} } MMMEd{ - M{"E, MMM d – E, MMM d"} - d{"E, MMM d – E, MMM d"} + M{"E, MMM d – E, MMM d"} + d{"E, MMM d – E, MMM d"} } MMMd{ - M{"MMM d – MMM d"} + M{"MMM d – MMM d"} d{"MMM d–d"} } Md{ - M{"M/d – M/d"} - d{"M/d – M/d"} + M{"M/d – M/d"} + d{"M/d – M/d"} } d{ d{"d–d"} } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h – h a"} + a{"h a – h a"} + h{"h – h a"} } hm{ - a{"h:mm a – h:mm a"} - h{"h:mm – h:mm a"} - m{"h:mm – h:mm a"} + a{"h:mm a – h:mm a"} + h{"h:mm – h:mm a"} + m{"h:mm – h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm – h:mm a v"} - m{"h:mm – h:mm a v"} + a{"h:mm a – h:mm a v"} + h{"h:mm – h:mm a v"} + m{"h:mm – h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h – h a v"} + a{"h a – h a v"} + h{"h – h a v"} } y{ y{"y–y"} } yM{ - M{"M/y – M/y"} - y{"M/y – M/y"} + M{"M/y – M/y"} + y{"M/y – M/y"} } yMEd{ - M{"E, M/d/y – E, M/d/y"} - d{"E, M/d/y – E, M/d/y"} - y{"E, M/d/y – E, M/d/y"} + M{"E, M/d/y – E, M/d/y"} + d{"E, M/d/y – E, M/d/y"} + y{"E, M/d/y – E, M/d/y"} } yMMM{ - M{"MMM – MMM y"} - y{"MMM y – MMM y"} + M{"MMM – MMM y"} + y{"MMM y – MMM y"} } yMMMEd{ - M{"E, MMM d – E, MMM d, y"} - d{"E, MMM d – E, MMM d, y"} - y{"E, MMM d, y – E, MMM d, y"} + M{"E, MMM d – E, MMM d, y"} + d{"E, MMM d – E, MMM d, y"} + y{"E, MMM d, y – E, MMM d, y"} } yMMMM{ - M{"MMMM – MMMM y"} - y{"MMMM y – MMMM y"} + M{"MMMM – MMMM y"} + y{"MMMM y – MMMM y"} } yMMMd{ - M{"MMM d – MMM d, y"} - d{"MMM d – d, y"} - y{"MMM d, y – MMM d, y"} + M{"MMM d – MMM d, y"} + d{"MMM d – d, y"} + y{"MMM d, y – MMM d, y"} } yMd{ - M{"M/d/y – M/d/y"} - d{"M/d/y – M/d/y"} - y{"M/d/y – M/d/y"} + M{"M/d/y – M/d/y"} + d{"M/d/y – M/d/y"} + y{"M/d/y – M/d/y"} } } monthNames{ diff --git a/icu4c/source/data/misc/icuver.txt b/icu4c/source/data/misc/icuver.txt index 73033a8caef2..4c39c8e258b4 100644 --- a/icu4c/source/data/misc/icuver.txt +++ b/icu4c/source/data/misc/icuver.txt @@ -8,7 +8,7 @@ // * // *************************************************************************** icuver:table(nofallback){ - CLDRVersion{"41"} - DataVersion{"71.1.0.0"} - ICUVersion{"71.1.0.0"} + CLDRVersion{"42"} + DataVersion{"72.0.1.0"} + ICUVersion{"72.0.1.0"} } diff --git a/icu4c/source/data/misc/langInfo.txt b/icu4c/source/data/misc/langInfo.txt index 270c89add51a..5bf19a07216f 100644 --- a/icu4c/source/data/misc/langInfo.txt +++ b/icu4c/source/data/misc/langInfo.txt @@ -8,6 +8,7 @@ langInfo:table(nofallback){ "adp","dz", "agp","apf", "ais","ami", + "ajt","aeb", "aju","jrb", "alb","sq", "als","sq", @@ -122,6 +123,7 @@ langInfo:table(nofallback){ "kzh","dgl", "kzj","dtp", "kzt","dtp", + "lak","ksp", "lbk","bnc", "leg","enl", "lii","raq", @@ -183,6 +185,8 @@ langInfo:table(nofallback){ "sgl","isk", "skk","oyb", "slo","sk", + "smd","kmb", + "snb","iba", "spy","kln", "src","sc", "sul","sgd", @@ -283,7 +287,7 @@ langInfo:table(nofallback){ "an","Latn","ES", "anc","Latn","ZZ", "ank","Latn","ZZ", - "ann","Latn","ZZ", + "ann","Latn","NG", "any","Latn","ZZ", "aoj","Latn","ZZ", "aom","Latn","ZZ", @@ -1244,6 +1248,7 @@ langInfo:table(nofallback){ "phn","Phnx","LB", "pil","Latn","ZZ", "pip","Latn","ZZ", + "pis","Latn","SB", "pka","Brah","IN", "pko","Latn","KE", "pl","Latn","PL", @@ -1460,6 +1465,7 @@ langInfo:table(nofallback){ "to","Latn","TO", "tof","Latn","ZZ", "tog","Latn","MW", + "tok","Latn","001", "toq","Latn","ZZ", "tpi","Latn","PG", "tpm","Latn","ZZ", @@ -1887,625 +1893,626 @@ langInfo:table(nofallback){ "ZR","CD", } trie:bin{ -001a6dcc3274c4f977c26777a2b778a4 -5279a4c27a0f6d7d7a5c7a30e1ada7e8 -2ef5af4b10e1a53b022a3c42cc4f4811 -616e01e2a3fff4a3fa0b4d25540e54ca -fc552a5610cea3fd10d3a3fc4dd81ebe +001a6dcc4074c4fc77c26777a2b778a4 +5279a4c27a0f6d7d7a5c7a30e1ada9e8 +2ef5af4d10e1a53b022a3c42cc5d4811 +616e01e2a3fff4a3fa0b4d25540e54cc +0a552a5610cea3fd10d3a3fc4dd81ecc 502a5310d2a3f802c1a3f7c6a3f5c8a3 -f647d50b473248d81ea04910c4a3f301 +f647d519473248d81eae4910c4a3f301 c2a3fbc6a3f16d326e36733a7910e2ad -a710e9af4910e5af4a10ed22012aa914 +a910e9af4b10e5af4c10ed22012aa914 4310c3a9156817683269366b3a6c10ed -af4810f8adc510e1af4710f4ada26132 -6436653a6710e8add310e7af4410eaaf -4510e1af4600126d46741b7434753877 -42e1adf8efaf0f10edaf1401f5af15f6 -af1610e1af176d3c6e406f50725a7301 -e7ad93ebaf1310efaf0b02e3af0ce9af -0df5af0e01e2af10f3af1110f3af1267 -266736683a693e6a4e6c10f3af0a10e9 -af0310e7af0402e2af05f5af06f6af07 -01e1af08e9af096138625463646501ec -a522f2af0204e5adf9eaadfaecadfbee -adfcf2adfd02f0adfef1adfff2af0010 -e9af010c6e3d7221722e7332774ee8af -1b10e2af2104e1adcbe9af22eca531ed -af23f2af2410e5af256e346f3e7001e5 -a791f2adc901e1adc3f2af1e01e7af1f -eeaf20651d653a6c3e6d02e6af1deead -b8f2adbb10f3af1a02e1af1ce3adb4e4 -adb5613462386301efad81f2ad8010f6 -af1810e9af190d6d49733073307534e9 -a736efaf3810f3af3d04e1af3ee532ea -af41f4af42f7af43012a2e4812616ef3 -af40012aaf3f4310ceaf406d3a6f3e72 -02e2af3ae5af3becaf3c10ecaf3710ee -af396520653e67426b4c6c02e5af34e7 -af35ecaf3610f2af3001f2af31f7af32 -10efaf33612e62606410e4a73607f40c -f4af29f6af2af9af2bfaaf2ceda7bbef -af26f0af27f3af2802e1af2de2af2ef9 -af2f74a25275a4d6760a6f1fe509e5ad -ebe9ad6defadf36f3472387501eeadf6 -f4adf710f4adf410efadf5613c654c69 -566c606d01e6adf1f7adf202e7ade9e9 -add8eeadea01e3adecf0aded01e3adee -f6adef10f3adf00026757ce91ff20ef2 -abd0f3abd4f4abdaf767f9abebe9abb5 -ebabbcecabc0eeabc6efabc87a247a36 -e1ab94e5aba6e72ee8abb110edabee01 -2a2e41127261e2abad012aabac5010cb -abad753c76527762786c7901e1abecf6 -abed03e8abe1ecabe2edabe3f1abe402 -e4a7beecabe5f5abe601e8abe7f1abe8 -01e7abe9efabea6b7d7049705e716e72 -7273827406f10cf1abc4f2abdef3abdf -f4abe0e4abdbe5abdceaabdd02e9abcc -edabcdfaabce10efabcf02f5abd1f6ab -d2f7abd304e4abd5e6abd6e7abd7eaab -d8f7abd96b426c526d626e6c6f02e6ab -c9e7abcaf1abcb02ecabbdf2abbef4ab -bf02e6abc1f8abc2f9abc301e8abc4f9 -abc510e8abc76546655e667467786888 -6906eb0cebabb8edabb9efabbaf6abbb -e2a3b3e6abb6e7abb703e4aba7edaba8 -efaba9f4abaa10e9abab02e3abaeefab -aff5abb002ecabb2f1abb3f2abb46144 -625a63866403e4aba2e7aba3e8aba4f5 -aba503eaab95ecab96eeab97f1ab9806 -e70ce7ab9cefab9df7ab9efaab9fe3ab -99e4ab9ae6ab9b01e9aba0f9aba10f73 -62e72ce742ebabf6f2ad55fa012a8641 -127261e2ade7012a2e43127972ecabf3 -022aabf24b2a4d10ceabf410daabf373 -607464766e7a10ee012a2e41127261e2 -ade7022aad01412a4310ceade810c6ad -e710e1ade301e8a54cf2ade401e8ade5 -ecade66d326d3e6e426f707202e9ade0 -f4ade1f7ade210e2abf801f226f8adde -012a2e44126576e1addd012aaddc4e10 -d0addd10ebaddf6232643667406c10e9 -abf710f5abef01e9abf0edabf110e1ab -f570c3a170a4fe71a6e372a6f0730028 -788cec39f229f509f5ab83f6ab89f7ab -8af22cf3ab7cf4ab8022032aab374da4 -c4522a5410d2ab3b01cfab3ad5ab38ec -ab5eedab63eeab6aefab70f16de431e4 -38e5ab46e7ab4be9ab54ebab5a032a36 -44444b4c5312696ee4ab43012aab4049 -10ceab41126576e1ab4112686feaab42 -7834793e7a48e1ab2be3ab3601eeab90 -f7ab9101ecab92f2a50f10ecab936cad -724f725873747484758e7705e809e8ab -8af0ab8ef6ab8fe2ab8be3ab8ce7ab8d -04e2ab79e3ab36eeab7af2ab7bf8a5f5 -02e4ab7de7ab7ef9ab7f01ebab81f1ab -8204e1ab84e5ab85ebab86f2ab87f3ab -886c4a6d666e8c6fa2437003e4ab76ec -ab77f3ab78f9a77804e4ab5fe9ab60ec -ab61efab5af9ab6205f009f0ab67f1ab -68f3ab69e1ab64eaab65eeab6604e3ab -6bebab6cf0ab6df8ab6ef9ab6f04e7ab -71ebab72f1ab73f5ab74f9ab75673e67 -426858696e6a846b02e3ab5bf2ab5cf3 -ab5d03e1ab4cf3ab4df7ab4efaab4f03 -e9ab50ebab51eeab52f5ab5303e4ab55 -e7ab56ecab57edab5810f2ab59614a62 -76638664a2686503e6ab47e8ab48e9ab -49f3ab4a06f30cf3ab2ff4ab30f6ab31 -faab32e6ab2ce8ab2df1ab2e02e1ab33 -e5ab34f0ab3505ee09eeab3eefab3ff2 -a703e32cebab3cecab3d22055211522e -53325410d2ab3b10cfab3a10d5ab382a -ab37312a4d10c5ab391137b2ab3801e3 -ab44e8ab4500176f5a752bec09eca9f5 -f3a9e6f4ab03754c7750e1012a2e4112 -7261e2a9de012aa9dd5010cba9de10f5 -ab0510e1ab067217722e733e7410f0ab -0402e1a9ffe4ab00e7ab0110f3ab026f -2e70327110eda9fe10eea9fb01e1a9fc -efa9fd68396c1d6c406d4a6e03e2a7d1 -e7a9f8eea9f9f4a9fa01e1a9f6f4a934 -10f3a9f76834693e6b01e1a9f3efa9f4 -01eca9efeea9f001eca9f1f0a9f26420 -642e65386610eca9ee01e3a9e9f4a9ea -04e4a9ebefa9ecf2a573f3a573f8a9ed -613462646301e4a9e7eda9e804e7a9df -ec32eda9e2f0a9e3f5a9e4012aa9e050 -12686cf0a9e101e9a9e5f5a9e6017526 -f5ab0702e3ab08e7ab09faab0700146f -457917ef09efa950f5ab24f7ab27792c -edab17eeab1c10f5ab2a6f3c724c7450 -75547701ebab28efab2902e2ab1fe6ab -20efab2110efab2210edab2302e5ab25 -e7ab26eda9506934693c6a566b5a6d5e -6e01e1ab1de7ab1e01e1ab12e622012a -ab134e10ccab1410f3ab1510f4ab1603 -e6ab18efab19f4ab1af5ab1b61366346 -654a675a6810e7ab1102e9ab0aeaa965 -efab0b10e6ab0c02eaab0decab0ef3ab -0f10eeab106da26c6ea6496f0e7426ea -0ceaa9cbeda5a4f2a9d4f3a9d7742e75 -387a3ce3a9c901e1a9d9eba9da10e9a9 -db10eda9dc6e236e32704272467310e1 -a9d802e7a9d0eea9d1f3a9d210eda9d3 -02efa9d5f5a9d6f9a9d4673a6a3e6b02 -e1a9cdf2a9cef6a9cf10e3a9ca01e7a9 -cbf3a9cc0022749fe926ef0fefa950f2 -a95bf3a488f4a95ff9a3d0e9a911eba9 -0beca945ee012abad34d126f6ee7a542 -783d7834793e7a64e7a934e8a93a01e3 -a96eeda96f05f709f7a973f8a974faa9 -75eba970eda971f6a97205f009f0a979 -f7a97afaa97beba976eda977eea97874 -44755a76707703eba96bf2a539f6a96c -f7a96d03e3a960e6a961e9a962f2a963 -03e1a964f0a965f2a966f3a96702e1a9 -68eea969f9a96a697b6e446e426f5e70 -7a71907202e4a95ceaa95defa95e04e1 -a94ce6a94de9a94eebb629f7a94f04e1 -a951e5a952e8a953f3a954f8a95503f0 -a956f3a957f4a958f8a95910eca95a69 -3e6b546c6a6d02efa949f5a94af8a94b -03e3a93de6a93eeea93ff7a94003e9a9 -41eca942f0a943f7a94402e5a946f0a9 -47f3a9486549653e666a67866802e9a9 -3beca93cf2a50106ee0ceea92bf2a92c -f4a92df5a92ee4a928e5a929eba92a04 -e1a92fe5a930eea931efa932f1a93304 -e8a935eca936efa937f0a938f9a93961 -5e62a25063a25d6406e80ce8a924eaa9 -25f2a926f8a927e1a921e5a922e6a923 -0bee1df712f7a913f926faa91622012a -a9144310c3a915eeb44aefa911f3a912 -e709e7a90ee9a90feba910e3a90be4a9 -0ce6a90d04e8a917efa918f1a919f5a9 -1af7a91b04e9a91cf0a91df1a91ef2a9 -1ff5a9200021745fe41dee0feea9a6ef -a9acf2a9b3f6a9c1f9a9c5e4a98be5a9 -8ee7a993eca54e791579307a3ae1a97c -e2a98401eda9c6eea9c710e9a9c87438 -7542775e7801f1a9c3f2a9c401eda9ba -f2a9bb04e9a9bcf0a9bdf3a9bef6a9bf -f8a9c010e2a9c26a606f356f4e706a71 -6e72727304eba9b5eea9b6efa9b7f3a9 -b8f4a9b904e4a9ade5a9aeeea9aff0a9 -b0f5a9b110e9a98e10efa9b210e2a9b4 -6a4a6b4e6d586e04e6a9a7e8a9a8eba9 -a9eda9aaf0a9ab10efa9a101e7a9a2ef -a9a301e7a9a4faa9a56637665a675e68 -6e6906ee0ceea99df5a99ef9a99ffaa9 -a0e6a99ae9a99beaa99c10f2a99202e1 -a994e2a995eca99602e2a997e5a998f7 -a999613e636a64906502e2a98ff7a990 -f8a99106ee0ceea980f0a981f1a982f3 -a983e3a97de6a97eeba97f05e809e8a9 -88efa989f5a98ae1a985e5a986e6a987 -01e3a98cf3a98d66c76969c49f69a41b -6aa4c66ba6136c001b744ae717ef0cef -a7f9f4a901f5a903f6a907e7a7e2e9a7 -e4eea7f6771577307a34e1a7cde2a7d4 -10eca90801e8a909faa90a742e753276 -10f3a90710e7a90203e1a904efa905f9 -a3d7faa9066a4a6d316d326e426f4c72 -10e3a90002eea7f3efa7f4f0a7f501f3 -a7f7f5a7f805f209f2a7fdf3a7fefaa7 -ffeaa7faeba7fbeca7fc6a346b386c01 -e5a7f1eea7f210f0a7ee01e9a7eff4a7 -f0644d6476657a67a2426907e80ce8a7 -eaeaa7ebeca7ecf3a7ede1a7e5e4a7e6 -e626e7a7e9012aa7e74c12696de2a7e8 -10e2a7da06f00cf0a7def1a7dff5a7e0 -faa7e1e4a7dbe5a7dceda7dd10e7a7e3 -6134625a6301eda7d8f0a7d905e809e8 -a7d1eaa7d2f3a7d3e2a7cee4a7cfe7a7 -d002e5a7d5f5a7d6f7a7d700197739eb -17f30cf3a711f4a728f5a71df7a729eb -a56aeea723efa725e409e4a713e7a718 -e9a71b772a7a34e1a70b01eda72af3a7 -2b01e8a72ce9a72d6a336d176d326e36 -6f3a7210e9a72710efa72210e8a72410 -f5a7266a2e6b326c10efa72110eaa71c -03e5a71deba71ef7a71ff8a720641a64 -3466446701e2a719e5a71a02e4a714e9 -a715f5a71610e5a717613a62446302e1 -a710e5a711e8a71201eea70cf2a70d02 -e1a3a8e2a70ef9a70f0b721ae909e9a7 -36f6a73cf7a73d722a752ee1a72e10e1 -a73a10f4a73b67176734693e6d01e3a7 -38eca73901eba731efa73510e2a73761 -2e623e6510eea73402e2a72feda730f2 -a73101efa732f5a733002875c0f0eb74 -f23ff628f6a795f7a7b7f9022a32414c -4c126174eea7c6022aa7c4432a5410d2 -a7c610cea7c5127261e2a7c5f2a788f3 -a7a1f5022aa46741a46d5912657ae9a7 -83eb38eca777eda77ceea787efa78c01 -2a2e41127261e2a772042aa770413243 -36493a4d10cea77410c6a77110cea772 -10d2a7737a1b7a38e1a5b3e7a75be9a7 -67eaa76b03e8a7c9eaa7caf2a7cbf4a7 -cc753c766e777e78947901e5a7c7f8a7 -c807ed0ceda7b0eea7b1f0a7b2f3a7b3 -e2a7ace4a7ade5a7aeeaa7af02e7a7b4 -f2a7b5f8a7b603eaa7b8eba7b9efa7ba -f1a7bb07ed0ceda7c0f0a7c1f7a7c2fa -a7c3e1a7bce3a7bde5a7beeca7bf6bc0 -d57063704a7170728673a2457403e2a7 -a8eda7a9efa7aaf2a7ab05f209f2a794 -f6a795f8a796e5a791e6a792efa79303 -e2a797e6a798f3a799f9a79a05ec09ec -a79ef3a79ff5a7a0e3a79be9a79ceaa7 -9d05e809e8a7a5eaa7a6f2a7a7e2a7a2 -e4a7a3e6a7a46b506c5a6d706ea2576f -04e9a78deba78aeca78ef3a78ffaa790 -01e3a775eaa77603eea778f1a779f4a7 -7af8a77b06f226f232f3a784f5a785f7 -a786022a3241405912657ae9a783012a -a7804c10c2a781127261e2a782e2a77d -e8a77eefa77f04e3a788e6a789e7a75b -eea78af0a78b665266486758686869a0 -6a03e4a76ce7a76df3a76ef9a76f02ef -a758f2a759f9a75a02e5a75ce6a75df0 -a75e08f10ff1a762f3a763f4a764f7a7 -65faa766e1a75fe2a760ebac95eea761 -02eaa768f5a769f7a76a6146627e63a2 -4164a24b6502e1a755eea756faa75708 -e90fe9a742eaa743eda744efa745f7a7 -46e1a73ee2a73fe3a740e4a74105f109 -f1a74af8a74bf9a74ce4a747eda748f0 -a74903e7a74deba74eeca74ff4a75003 -e5a751e8a752eca753f4a75466a2c267 -a4776800137546f20ff2a703f4a706f5 -a707f9a342faa70a7534e13ee5a5ece9 -62efa5ff01e9a708f2a70922032aa5e2 -372e43345310c4a5e31133b6a5e310cd -a5e4012aa5ee4c126174eea5ef6c386c -3c6d466e506f6c7301e2a704eea70501 -e1a5f6f5a5f701e4a5f8f4a5f904e4a5 -fae5a5fbeaa5fceea5fdefa5fe02e3a7 -00eaa701f4a702615862746478687c69 -05e809e8a5f3eca5f4eda5f5e1a5f0e6 -a5f1e7a5f204e7a5e5eba5e6eda5e7f7 -a5e8faa5e910e2a5ea10f9a5eb10f9a5 -ed00117553e90fe9a57deaa581efa584 -f2a58af9a59975427694e1a573e6012a -a5794112646ceda57a09e80fe8a593f1 -a594f2a595f6a596f9a597e2a58fe332 -e4a590e5a591e6a592012aa579411264 -6ceda57a10f2a5986d2f6d4e6f527062 -71667204e3a58be5a58af0a58cf2a58d -f3a58e10f0a58302e4a585eea586f2a5 -8710e5a58810f3a5896132665669606c -10f2a58205e908e9a577eea578f467e1 -a574e2a575e7a57601e9a57beda57c02 -e1a57eeca57ff4a580001a6e9f791dec -0ceca5bfeea5c3f5a5d3f6a5db792ce1 -a59ae4a5ac01e1a5a5e9a5e1733a733e -754276747702e3a5dee9a5dff4a5e010 -f7a5d207f20cf2a5d7f7a5d8f8a5d9fa -a5dae2a5d4e3a5d5e4a5d6e7a5c302e6 -a5dcf2a5b6f3a5dd6e5a6f6a7204e2a5 -a8e332e5a55df4a5d0f7a5d1012aa5ce -4c12696ee2a5cf02e4a5c4e7a5c5efa5 -c607ee0ceea5c6f2a5cbf3a5ccf4a5cd -e4a5c7e6a5c8e9a5c9eda5ca673c6a23 -6a386b486c526d01eda5c1f6a5c202eb -a5baeea5bbf5a5bc01eea5bdf0a5be10 -eba5c06734683e6901eca5b8eda5b901 -eea5b6efa56910f3a5b76428642e653e -6610eba5b502e5a5adeea5aef2a5af05 -ef09efa5b3f2a52ffaa5b4e2a5b0eaa5 -b1eca5b2612e626c6310f2a5ab09ed0f -eda5a0eea5a1f7a5a2f9a5a3faa5a4e1 -a59be6a59ce7a59de8a59eeaa59f05ef -09efa5a8f9a5a9faa5aae1a5a5e6a5a6 -eda5a763c2f463a2a364a4fa65001277 -33ee19ee38efa566f3a568f4a55bf5a3 -66012aa56253126861f7a56377347838 -7a3ce5a556eca55d10efa57010f4a571 -10e1a5726d466d486e7a728473887403 -f2a56cf4a56df5a56ef8a56f02e1a55e -e9a55feb012a2e4e126b6fefa561012a -a5604710cea56101eea564f1a56510e9 -a56702e7a569eba56af5a56b623e6642 -67466b02e1a55aeba55bf9a55c10f5a5 -5510e9a55701eca558f9a559001b7257 -e821f316f3a51bf52cf6a521f9a52201 -2aa51f47126c61e7a520e8a3edefa512 -f2a515771277307a34e1a3e3e5a3e910 -e4a51510e5a51b722e734a7410e4a51e -04e7a516e8a517eba518eca519f3a51a -01e2a51cf7a51d69556c336c326d426f -727010f3a51402e1a50de3a50ee4a50f -02e5a510e7a511ee022aa26342a2ae48 -11616e01e2a3fff4a3fa10f0a5136940 -6a446b03e2a509eca50aefa50bf9a50c -10e3a50502e1a506eda507f6a508658f -65a28066a28167a2826805ef09efa502 -f0a503f2a504e92ceba500eda501022a -3c42a2594811616e01e2a3fff4a3fa0b -4d2d5417542e55385610c4a3fd01c8a3 -f9d7a3fa01cba3fbd3a3fc4db4c0502a -5310d2a3f802c6a3f5c8a3f6daa3f747 -0e473048b4a44910c4a3f310c6a3f12a -a3ee412a4210cea3f010d5a3ef126f70 -efa3fe10e2a3ea10e1a3eb10e7a3ec61 -34623e6301e8a3e7f0a3e801e4a3e4ee -a3e510eaa3e60017726f791ce508e5a5 -2ff6a54ffa45792a7a34e1a52301efa5 -52f5a55310e7a554751d752e764a7710 -f7a55104e1a54ae3a54be4a54ce7a54d -f4a54e10e1a550724073747403eda546 -f0a547f3a548f9a54902e82ce9a543f3 -a544012a2e4d126f6ee7a542012aa541 -4310cea54210e2a545682d6d176daacf -6e3c6f03e2a53ee9a536f0a53ff7a540 -10eaa525682e69326a10e5a53c10e4a5 -3901e1a53af1a53b64286456655a6706 -ec0ceca535efa536f2a537faa538e1a5 -32e8a533e9a53410eea52e01e4a530ee -a531612e625a6310e3a52d06e80ce8a5 -27eba528f2a529f6a52ae4a524e6a525 -e7a52601e4a52bf1a52c2aa60061bed4 -62002373a5e51ded0feda3aaeea3afef -a3b3f2a3bcf3a3c1e5a37ce7a389e8a3 -8de9a39377417732783c794c7a72e1a3 -6201e4a3d4f2a3d502e8a3d6eba3d7f2 -a3c905f309f3a3dbf6a3dcf8a3dde5a3 -d8eea3d9f2a3da04e1a3dee5a3dfe6a3 -e0e8a3e1f7a3e27332744875587610e2 -a3d303eaa3c2f1a3c3f3a3c4f4a3c502 -efa3c6f4a3c7f6a3c809ed0feda3ceef -a3cff2a3d0f3a3d1f5a3d2e1a3c9e3a3 -cae4a3cbe7a3cceba3cd6a866e3b6e48 -6f587068716c7203e1a3bde8a3bef8a3 -bffaa3c002e7a3b0eda3b1f0a3b202ea -a3b4eda3b5eea3b610f9a3b703e3a3b8 -e9a3b9f0a3baf6a3bb6a446b766c926d -03e8a3abeba3acf1a3adf5a3ae07ef0c -efa39ef2a39ff4a3a0faa3a1e8a39ae9 -a39beaa39ceea39d04e3a3a2eda3a3f1 -a3a4f5a3a5f6a3a602e1a3a7e7a3a8f4 -a3a9656a6562669467a24468a24b6906 -ed0ceda396eea397efa398f1a399e2a3 -94e7a395eba37507f40cf4a381f7a382 -f8a383faa384e6a37de8a37eeaa37fed -a38003e4a385f1a386f4a387f9a38802 -e3a38aeea38bf8a38c05ec09eca391ef -a38df9a392e2a38ee7a38fe9a3906132 -626463906410e4a37b07f20cf2a367f3 -a368f6a369f8a36aeca363eea364f0a3 -65f1a36606e40ce4a36eeaa36ff0a370 -f2a371e1a36be2a36ce3a36d09ed0fed -a376eea377efa378f1a379f5a37ae3a3 -63e6a372e8a373e9a374eca37500184d -c28954c0e157365736584e59645a1261 -6ee2addb01612c631168efa9ab1172e1 -adda01702a731175f8691165efa9ec01 -652c691169e9a71b117ae9a783544455 -a29e5601612c691174e8add91169e9ad -d807684e683669866ea2426f1174efab -ea106101e158e9042aabb143324b364c -3a5410c8abb110cea7d910c8add510c1 -add6012aa54f4d10d6a54f01622a7210 -e8add710f4012aa3b34210d4451173e1 -a9b961346580668667116ce7add4056d -116d2e6e327610f4a3a910ecab9410e7 -abe967346b386c01e5aba2f5a76010e2 -add110f2add2116cf5aba6116ee7add3 -126761f2abf550c0c350a27252a2a853 -06694369426f6a759079016c2a7210e3 -a50f10efadd001643e6e01e4ab43e801 -2aab544c10cbab5410e4adcd02672e72 -387910efa51101e4ab71efadce10e1ab -79116ee4adcf613e675e6801612a7210 -e4adcc10f7a563026d2e72327510f2ab -3210f2ab6710e2adcb116ef7a34b0461 -38654a68506c76721174e9adc9016c2a -7510e3a51e10eda11172edadc702612e -6c326e10f8a9f010e7adc801e9a9e0f0 -a9e11172e4a5f8026a306f3675116ef2 -a9af116ee7adca1168e7ab114d8a4ea2 -ab4f0467386c3e72447358751167f2a9 -db1161edab4c1163ebab30016b2a7910 -e1a9d410e8a9da01672a6d10e1adc610 -e5a9d807722e725a7460756679116df2 -032aa3d0492e4d325410c8adc010cea7 -6410cda3d0116fefa95e1165e9adbe11 -6cf4adbf614265746c9a6f01642a6e10 -e7a54210e9adbd0368326b366e3a7210 -e3adb910eaadb610e1adb701e4a975e9 -adb80264346e387201e3adbbefadbc10 -e6a53d10e4adba1179eda94504613862 -58655c6b62731168f5adc502672e6e32 -7210e2adc310edadc110e4adc21161f4 -9f1177e1adc4116fefa56147c4114ac3 -354aa6c04ba6d94c03614665a69c69a6 -9e7901632a6410e9adb510e9adb4026e -a6796fa67a7410ee001a4bc139545b57 -1457ac7358ac7759305a01c1abfdd7ab -6a10d4ad71544055825603c1ad6cc5ad -6ecead6dd5a3930bce14d609d6abe5d7 -abd2daab8aceadb2cfabc8d2abd0cbc5 -d7cbabbdccad68cdabbc04c1adb3c7ad -6ad3a562d9ad6bdaad014e824e8a50a2 -4a52a26d530cce17d40cd4ad62d5a79e -d6ad63d9adb1cead60cfab70d2ad61ca -09caad5ecbab5acdad5fc3ad5dc5ab89 -c9ab5e06c70cc7abf9c9ad50cca54ecf -a984c1ad4dc3ad4ec5ad4f0acc14d409 -d4ad59d7a9e4d9a5c3cca9f5cdad56d2 -ad57c1ad52c5ad53c6ad54c7abccc8a5 -7f03c5ad5ccfa950d5a79ed7ab274b9e -4ca2434d0010cd1dd40fd4a95fd5a930 -d8abfbd9a914daad4ccda740cfadafd1 -ad4ad2adb0c60cc6ad49c7a934cbadae -cca3aac1adadc3ad47c4ad48c5ab3901 -c5ad3ccdadac04c9ad42d3ad43d4a901 -d5ad44d6a90743c0c246644656476648 -a24d4905d209d2adabd3a711d4a728c3 -ad39c4a713c5ad2d02c9a57dcfa584d2 -a58a0cce17d30cd3ad34d4ad35d5ad00 -d7ad36cead31d0ad32d1ad33c608c6ad -30c867cca777c1ad2fc2ad03c5adaa04 -cdad37cead38d2a703d4a706d5a70743 -5244a2424505d309d3a568d4ada4daad -2ec1ad29c3ad2ac5a55b0fcf1ad60cd6 -ad24d7ad05d9ada8daa51bcfad21d0ad -22d2ad23d5abfec9c68fc9ad1eccad1f -cdad20ceada705cb09cba523cfad27da -ada9c5a52fc7ad5bcaad26345e34ae8a -4178420bce14d209d2ab03d5a740d6ad -1acead17cfad18d1ad19c909c9ab1cca -ad15ccad16c1a3c1c5ad12c6ad130cd2 -17d50cd5abfad7ad10d8ad11daa35ed2 -ad0dd3ad0ed4ad0fcd09cdada6cfad0b -d1ad0cc4ad08c6ada5cc6d2aa562312c -321133b0ada41137b2a79e10e1a9ad10 -ef012aa7f94c10c1a7f91170e3a7de02 -6d2e6e327310f5a7ed10e2a7e801e1a7 -cee2a5cf01613a701161ee012aa72e4a -10d0a72e016d2a7610e1ada010efad9f -056e1e6e306f36741168e9ada31164e1 -a7871172e5012aa78c4b01d0ad3ed2a7 -8c61306850691174f3ada2026c2e6e32 -7710e9a74610e9a55c10e1ada102612e -6d326f10eaab4210f2a9ff10f2012aa7 -7c4b10c8a77c473448a25c49127461ec -a56d0465466c5a6f60727a75016a2a72 -10f5a9dd10f2a5d3116ff2012aa5b347 -10c5a5b31161e7a520016e2a7410e8a5 -cd01e7ad93eda5690161506510eb032a -a55d432e47325410d2a38c10d9ad2510 -d2a55d10eead94056c186c306d367511 -6ee7ad9e1175f7a5f7106e01e7ad9df0 -a5fc6130659c691172e1ad9c106e05ef -2aefad97f358f4042aa3fa433248364d -3a5410d7a3fa10c1ad9810cba3f210cf -a3f4012aa3ee4310cea3eee2a3ffe7ad -95e9ad961162f2032aa5ec4934533855 -01c1ad9ad3ad9b10cca5ec10c5ad9943 -c114437044a2cd450267406c46741168 -e9012a754501d2ad2cd4751179f0a559 -01622a7910edad9210e1ad910461a268 -68a2776fa28670a288791172ec0a4d33 -5414542e55385810cbad8a01caabacd2 -ad8910c1abf64d2e523e5310cbad8802 -c4ad86cba90bcea54102cfad87d3ab37 -d5ab242aab244138423c474c4b01c7a7 -c4daad4010ccad8302c1ad84c7a389d9 -a37c01c52dd2ad85026b2e6e327210e9 -ad8010eda3e810f3a71d02612e653272 -10f3ad8110eda50710f2a5041170f4a5 -13016d2a7210f4a5ce10ee012aad8243 -10d9ad8203653469866f8c751170ecad -901176e106491749324d364e3a5010cb -a3c810cea5ee10d5ad8d10d0a98e2aa5 -ee422a4610caad8c10d4ad8b1161ebad -8e1167f2ad8f2aa25441aa3142056f1f -6f3e72447501672a6810e4ad7f10e9ad -7e1170efa3fe106101e8a9f3e9ad7d61 -30655c68116bf3ad7c036c326d36733a -7410ebad7b10e9ad7a10f5a36a10f3a3 -c3116ee7012aa3af4210c4a3af00214a -c1c052c0cc5638563c5758586259665a -01d2abfcd7ab6a04c1ad6cc4ad6dc5ad -6ecead6dd5a39301c6ad6fd3ab6310cb -ad7003c4ad07c5ad07d4ad71d5ab3752 -46536c54a2575503c1abf6c7ad6ad9ad -6bdaad0105d309d3ab37d5ab24d7ab27 -c5ad5cc8ab6acfa9500ecd1ad40cd4ad -62d5ab24d6ad63d9ad64cdad5fcead60 -cfab70d2ad61c50cc5ab89c9ab5ecaad -5ecbab5ac1ad02c3ad5dc4ad060ecd1a -d20cd2abd0d6abe5d7a3fadaab8acdab -bccead69cfabc8d0ad68c80cc8abb1ca -abaccbabbdccad68c4ad65c6ad66c7ad -674e644e404fa89650785102c1ad5acf -ad5bd5ad2d09cc0fcca54ecfa984d0a9 -8ed1ad0cd4ad02c1ad4dc3ad4ec5ad4f -c8a393c9ad500dcd17d40cd4ad59d7a9 -e4d9a5c3daad52cdad56d2ad57d3ad58 -c70cc7abccc8a57fcbad55cca9f5c1ad -52c5ad53c6ad544aa2484ba24c4ca264 -4d0012ce20d50fd5a930d6a54fd8abfb -d9a914daad4ccea541cfa3f4d1ad4ad2 -ad4bd4a95fc60fc6ad49c7a934cba90b -cca3aacda3d0c1ad46c3ad47c4ad48c5 -ab3901cfad3bd0a72e07d00cd0ad3ed2 -a78cd7ad3fdaad40c5ad3cc7a7c4c8a7 -7ccdad3d08d30fd3ad43d4a901d5ad44 -d6a907d9ad45c1a7f9c2ad41c9ad42cb -ab5441c1604598456a46a24147a24e48 -a2754907d10cd1ad3ad2a573d3a711d4 -a728c3ad39c4a713cca5eccea5ee09d2 -0ed2ad2cd3a568d475d5ad2ddaad2ec1 -ad29c3ad2ac5a55bc79bc8ad2b04c9a5 -7dcfa584d1ad0cd2a58ad8a58a0bd014 -d309d3ad34d4ad35d7ad36d0ad32d1ad -33d2a55dc808c867cca777cead31c1ad -2fc5a5b3c6ad3006d20cd2a703d4a706 -d5a707d6ad13cba3f2cdad37cead3841 -5e42a24c43a2834406cb0ccba523cfad -27d9ad15daad28c4a52fc5a52fcaad26 -0dd117d40cd4ad0fd7ad10d8ad11daa3 -5ed1ad0cd2ad0dd3ad0ecc0bcc6dcda3 -42cead05cfad0bc4ad08c5ad09c6ad0a -0010cc1cd20ed2ab03d445d5a3d0d6ad -1ad9a37cccad16cead17cfad18d1ad19 -c70cc7a389c8ad14c9ab1ccaad15c1a3 -c1c4a3afc5ad12c6ad130010cf1dd50f -d5abfed6ad24d7ad05d9ad25daa51bcf -ad21d0ad22d2ad23d3ab37c90cc9ad1e -ccad1fcdad20cea3eec4abfcc6ad1bc7 -ad1cc8ad1d342234423548374e380138 -2a3910b0ab3710b6ad071131b9ad0411 -33b2ad051133b6ad062aa562305031a2 -6b3202302e33383810b0a52f01b0a51b -b2abf910b0750533233334354a3601b1 -ab63b2a5ee03b0a3eeb4a5eeb5a713b9 -a72802b3abfab4abffb7ad003034314a -3201b1a562b9abfe03b2abf9b3a562b5 -ab03b9abfa06b50bb59bb7abfcb8abfd -b9a562b1abf9b3abfbb4ab8a02342e35 -3e3710b2ab2402b2a3eeb3ad01b5ad02 -03b0ab24b1ab24b4ad03b5a52f046436 -673c68427246761173f44b116ceda57a -1168e2abf0116fed6301613c6d01e99d -ee012aa3424110cda34210e200134c62 -5131513c53405450556a5901c5ad07d4 -ab8b10c1ad5a02c1ad02c4ad06d9ad64 -04c791c8a92fcaad78cead69d2ad7910 -cbad734c3c4d464e624f665001cbad55 -d3ad5801c2ad41d9ad4504c1ad46cdad -72cea774d2ad4bd5ad7610c7ad7710cd -ad51452e4542474a494e4a644b02c8a5 -06cdad3dd7ad3f01c79bc8ad2b10c2ad -7303c4ad74cead75d1ad3ad2a57310cf -ad3b2a9b4132423c43464410daad2801 -c5ad09c6ad0a01c8ad14d5ad7201c3a9 -15ceabf200217588e62bf221f29bf3a3 -49f6a353f9a35cfa012a2e41127261e2 -a360022aa35e498a5210d5a361e651eb -67ed75ee7f7a2d7a2ce125e22de54b10 -ea012a2e41127261e2a360032aa35e31 -2e49345310d5a3611137b2a36101d1a3 -5fd2a3607538763c77527901e2a35df2 -a35c10f9a35203eca354eea355f4a356 -f5a35703e1a358e2a359efa35af8a35b -6b966f696f44704e726873a2507402e1 -a34fe7a350eaa35102ea89ed8bfa8d05 -f206f295f397fa99e38fe491e59309ef -0fefa344f1a345f3a346f9a347faa348 -e29be332e8a341eda342eea343022a9d -4e2c5012616ceda1126261f49f04e1a3 -4ae5a34be7a34cefa34df4a34e6b3c6c -3e6d586e03e381eb83ee85f98710eb69 -05ee06ee71f36df473e16be26de96f03 -ed77ee79ef7bf07d6525653067366850 -6a10e76501e24df94f05ed06ed59ef5b +af4a10f8adc710e1af4910f4ada46132 +6436653a6710e8add510e7af4610eaaf +4710e1af4800126d46741b7434753877 +42e1adfaefaf1110edaf1601f5af17f6 +af1810e1af196d3c6e406f50725a7301 +e7ad95ebaf1510efaf0d02e3af0ee9af +0ff5af1001e2af12f3af1310f3af1467 +266736683a693e6a4e6c10f3af0c10e9 +af0510e7af0602e2af07f5af08f6af09 +01e1af0ae9af0b6138625463646501ec +a522f2af0404e5adfbeaadfcecadfdee +adfef2adff02f0af00f1af01f2af0210 +e9af030c6e3d7221722e7332774ee8af +1d10e2af2304e1adcde9af24eca531ed +af25f2af2610e5af276e346f3e7001e5 +a791f2adcb01e1adc5f2af2001e7af21 +eeaf22651d653a6c3e6d02e6af1feead +baf2adbd10f3af1c02e1af1ee3adb6e4 +adb7613462386301efad83f2ad8210f6 +af1a10e9af1b0d6d49733073307534e9 +a736efaf3a10f3af3f04e1af40e532ea +af43f4af44f7af45012a2e4812616ef3 +af42012aaf414310ceaf426d3a6f3e72 +02e2af3ce5af3decaf3e10ecaf3910ee +af3b6520653e67426b4c6c02e5af36e7 +af37ecaf3810f2af3201f2af33f7af34 +10efaf35612e62606410e4a73607f40c +f4af2bf6af2cf9af2dfaaf2eeda7bbef +af28f0af29f3af2a02e1af2fe2af30f9 +af3174a25275a4d9760a6f1fe509e5ad +ede9ad6fefadf56f3472387501eeadf8 +f4adf910f4adf610efadf7613c654c69 +566c606d01e6adf3f7adf402e7adebe9 +addaeeadec01e3adeef0adef01e3adf0 +f6adf110f3adf20026757ce91ff20ef2 +abd2f3abd6f4abdcf767f9abede9abb6 +ebabbdecabc1eeabc7efabc97a247a36 +e1ab95e5aba7e72ee8abb210edabf001 +2a2e41127261e2abae012aabad5010cb +abae753c76527762786c7901e1abeef6 +abef03e8abe3ecabe4edabe5f1abe602 +e4a7beecabe7f5abe801e8abe9f1abea +01e7abebefabec6b807049705e716e72 +7273827406f10cf1abc5f2abe0f3abe1 +f4abe2e4abdde5abdeeaabdf02e9abce +edabcffaabd010efabd102f5abd3f6ab +d4f7abd504e4abd7e6abd8e7abd9eaab +daf7abdb6b486c586d686e726f03e6ab +cae7abcbebabccf1abcd02ecabbef2ab +bff4abc002e6abc2f8abc3f9abc401e8 +abc5f9abc610e8abc86546655e667467 +7868886906eb0cebabb9edabbaefabbb +f6abbce2a3b3e6abb7e7abb803e4aba8 +edaba9efabaaf4abab10e9abac02e3ab +afefabb0f5abb102ecabb3f1abb4f2ab +b56144625a63866403e4aba3e7aba4e8 +aba5f5aba603eaab96ecab97eeab98f1 +ab9906e70ce7ab9defab9ef7ab9ffaab +a0e3ab9ae4ab9be6ab9c01e9aba1f9ab +a20f7362e72ce742ebabf8f2ad57fa01 +2a8641127261e2ade9012a2e43127972 +ecabf5022aabf44b2a4d10ceabf610da +abf573607464766e7a10ee012a2e4112 +7261e2ade9022aad03412a4310ceadea +10c6ade910e1ade501e8a54cf2ade601 +e8ade7ecade86d326d3e6e426f707202 +e9ade2f4ade3f7ade410e2abfa01f226 +f8ade0012a2e44126576e1addf012aad +de4e10d0addf10ebade1623264366740 +6c10e9abf910f5abf101e9abf2edabf3 +10e1abf770c3ac70a60671a6ee72a6fb +730028788cec39f229f509f5ab84f6ab +8af7ab8bf22cf3ab7df4ab8122032aab +384da4cc522a5410d2ab3c01cfab3bd5 +ab39ecab5fedab64eeab6befab71f16d +e431e438e5ab47e7ab4ce9ab55ebab5b +032a3644444b4c5312696ee4ab44012a +ab414910ceab42126576e1ab4212686f +eaab437834793e7a48e1ab2ce3ab3701 +eeab91f7ab9201ecab93f2a50f10ecab +946cb5724f725873747484758e7705e8 +09e8ab8bf0ab8ff6ab90e2ab8ce3ab8d +e7ab8e04e2ab7ae3ab37eeab7bf2ab7c +f8a5f502e4ab7ee7ab7ff9ab8001ebab +82f1ab8304e1ab85e5ab86ebab87f2ab +88f3ab896c4a6d666e926fa24b7003e4 +ab77ecab78f3ab79f9a77804e4ab60e9 +ab61ecab62efab5bf9ab6306ee0ceeab +67f0ab68f1ab69f3ab6ae1ab65e4a77d +eaab6605f009f0ab6ef8ab6ff9ab70e2 +a3a8e3ab6cebab6d04e7ab72ebab73f1 +ab74f5ab75f9ab76673e67426858696e +6a846b02e3ab5cf2ab5df3ab5e03e1ab +4df3ab4ef7ab4ffaab5003e9ab51ebab +52eeab53f5ab5403e4ab56e7ab57ecab +58edab5910f2ab5a614a6276638664a2 +686503e6ab48e8ab49e9ab4af3ab4b06 +f30cf3ab30f4ab31f6ab32faab33e6ab +2de8ab2ef1ab2f02e1ab34e5ab35f0ab +3605ee09eeab3fefab40f2a703e32ceb +ab3decab3e22055211522e53325410d2 +ab3c10cfab3b10d5ab392aab38312a4d +10c5ab3a1137b2ab3901e3ab45e8ab46 +00176f5a752bec09eca9f6f3a9e6f4ab +04754c7750e1012a2e41127261e2a9de +012aa9dd5010cba9de10f5ab0610e1ab +077217722e733e7410f0ab0502e1ab00 +e4ab01e7ab0210f3ab036f2e70327110 +eda9ff10eea9fc01e1a9fdefa9fe683c +6c1d6c406d4a6e03e2a7d1e7a9f9eea9 +faf4a9fb01e1a9f7f4a93410f3a9f868 +34693e6b01e1a9f4efa9f501eca9efee +a9f002eca9f1f0a9f2f3a9f36420642e +65386610eca9ee01e3a9e9f4a9ea04e4 +a9ebefa9ecf2a573f3a573f8a9ed6134 +62646301e4a9e7eda9e804e7a9dfec32 +eda9e2f0a9e3f5a9e4012aa9e0501268 +6cf0a9e101e9a9e5f5a9e6017526f5ab +0802e3ab09e7ab0afaab0800146f4579 +17ef09efa950f5ab25f7ab28792cedab +18eeab1d10f5ab2b6f3c724c74507554 +7701ebab29efab2a02e2ab20e6ab21ef +ab2210efab2310edab2402e5ab26e7ab +27eda9506934693c6a566b5a6d5e6e01 +e1ab1ee7ab1f01e1ab13e622012aab14 +4e10ccab1510f3ab1610f4ab1703e6ab +19efab1af4ab1bf5ab1c61366346654a +675a6810e7ab1202e9ab0beaa965efab +0c10e6ab0d02eaab0eecab0ff3ab1010 +eeab116da26c6ea6496f0e7426ea0cea +a9cbeda5a4f2a9d4f3a9d7742e75387a +3ce3a9c901e1a9d9eba9da10e9a9db10 +eda9dc6e236e32704272467310e1a9d8 +02e7a9d0eea9d1f3a9d210eda9d302ef +a9d5f5a9d6f9a9d4673a6a3e6b02e1a9 +cdf2a9cef6a9cf10e3a9ca01e7a9cbf3 +a9cc0022749fe926ef0fefa950f2a95b +f3a488f4a95ff9a3d0e9a911eba90bec +a945ee012abad34d126f6ee7a542783d +7834793e7a64e7a934e8a93a01e3a96e +eda96f05f709f7a973f8a974faa975eb +a970eda971f6a97205f009f0a979f7a9 +7afaa97beba976eda977eea978744475 +5a76707703eba96bf2a539f6a96cf7a9 +6d03e3a960e6a961e9a962f2a96303e1 +a964f0a965f2a966f3a96702e1a968ee +a969f9a96a697b6e446e426f5e707a71 +907202e4a95ceaa95defa95e04e1a94c +e6a94de9a94eebb629f7a94f04e1a951 +e5a952e8a953f3a954f8a95503f0a956 +f3a957f4a958f8a95910eca95a693e6b +546c6a6d02efa949f5a94af8a94b03e3 +a93de6a93eeea93ff7a94003e9a941ec +a942f0a943f7a94402e5a946f0a947f3 +a9486549653e666a67866802e9a93bec +a93cf2a50106ee0ceea92bf2a92cf4a9 +2df5a92ee4a928e5a929eba92a04e1a9 +2fe5a930eea931efa932f1a93304e8a9 +35eca936efa937f0a938f9a939615e62 +a25063a25d6406e80ce8a924eaa925f2 +a926f8a927e1a921e5a922e6a9230bee +1df712f7a913f926faa91622012aa914 +4310c3a915eeb44aefa911f3a912e709 +e7a90ee9a90feba910e3a90be4a90ce6 +a90d04e8a917efa918f1a919f5a91af7 +a91b04e9a91cf0a91df1a91ef2a91ff5 +a9200021745fe41dee0feea9a6efa9ac +f2a9b3f6a9c1f9a9c5e4a98be5a98ee7 +a993eca54e791579307a3ae1a97ce2a9 +8401eda9c6eea9c710e9a9c874387542 +775e7801f1a9c3f2a9c401eda9baf2a9 +bb04e9a9bcf0a9bdf3a9bef6a9bff8a9 +c010e2a9c26a606f356f4e706a716e72 +727304eba9b5eea9b6efa9b7f3a9b8f4 +a9b904e4a9ade5a9aeeea9aff0a9b0f5 +a9b110e9a98e10efa9b210e2a9b46a4a +6b4e6d586e04e6a9a7e8a9a8eba9a9ed +a9aaf0a9ab10efa9a101e7a9a2efa9a3 +01e7a9a4faa9a56637665a675e686e69 +06ee0ceea99df5a99ef9a99ffaa9a0e6 +a99ae9a99beaa99c10f2a99202e1a994 +e2a995eca99602e2a997e5a998f7a999 +613e636a64906502e2a98ff7a990f8a9 +9106ee0ceea980f0a981f1a982f3a983 +e3a97de6a97eeba97f05e809e8a988ef +a989f5a98ae1a985e5a986e6a98701e3 +a98cf3a98d66c76969c49f69a41b6aa4 +c66ba6136c001b744ae717ef0cefa7f9 +f4a901f5a903f6a907e7a7e2e9a7e4ee +a7f6771577307a34e1a7cde2a7d410ec +a90801e8a909faa90a742e75327610f3 +a90710e7a90203e1a904efa905f9a3d7 +faa9066a4a6d316d326e426f4c7210e3 +a90002eea7f3efa7f4f0a7f501f3a7f7 +f5a7f805f209f2a7fdf3a7fefaa7ffea +a7faeba7fbeca7fc6a346b386c01e5a7 +f1eea7f210f0a7ee01e9a7eff4a7f064 +4d6476657a67a2426907e80ce8a7eaea +a7ebeca7ecf3a7ede1a7e5e4a7e6e626 +e7a7e9012aa7e74c12696de2a7e810e2 +a7da06f00cf0a7def1a7dff5a7e0faa7 +e1e4a7dbe5a7dceda7dd10e7a7e36134 +625a6301eda7d8f0a7d905e809e8a7d1 +eaa7d2f3a7d3e2a7cee4a7cfe7a7d002 +e5a7d5f5a7d6f7a7d700197739eb17f3 +0cf3a711f4a728f5a71df7a729eba56a +eea723efa725e409e4a713e7a718e9a7 +1b772a7a34e1a70b01eda72af3a72b01 +e8a72ce9a72d6a336d176d326e366f3a +7210e9a72710efa72210e8a72410f5a7 +266a2e6b326c10efa72110eaa71c03e5 +a71deba71ef7a71ff8a720641a643466 +446701e2a719e5a71a02e4a714e9a715 +f5a71610e5a717613a62446302e1a710 +e5a711e8a71201eea70cf2a70d02e1a3 +a8e2a70ef9a70f0b721ae909e9a736f6 +a73cf7a73d722a752ee1a72e10e1a73a +10f4a73b67176734693e6d01e3a738ec +a73901eba731efa73510e2a737612e62 +3e6510eea73402e2a72feda730f2a731 +01efa732f5a733002875c0f0eb74f23f +f628f6a795f7a7b7f9022a32414c4c12 +6174eea7c6022aa7c4432a5410d2a7c6 +10cea7c5127261e2a7c5f2a788f3a7a1 +f5022aa46741a46d5912657ae9a783eb +38eca777eda77ceea787efa78c012a2e +41127261e2a772042aa7704132433649 +3a4d10cea77410c6a77110cea77210d2 +a7737a1b7a38e1a5b3e7a75be9a767ea +a76b03e8a7c9eaa7caf2a7cbf4a7cc75 +3c766e777e78947901e5a7c7f8a7c807 +ed0ceda7b0eea7b1f0a7b2f3a7b3e2a7 +ace4a7ade5a7aeeaa7af02e7a7b4f2a7 +b5f8a7b603eaa7b8eba7b9efa7baf1a7 +bb07ed0ceda7c0f0a7c1f7a7c2faa7c3 +e1a7bce3a7bde5a7beeca7bf6bc0d570 +63704a7170728673a2457403e2a7a8ed +a7a9efa7aaf2a7ab05f209f2a794f6a7 +95f8a796e5a791e6a792efa79303e2a7 +97e6a798f3a799f9a79a05ec09eca79e +f3a79ff5a7a0e3a79be9a79ceaa79d05 +e809e8a7a5eaa7a6f2a7a7e2a7a2e4a7 +a3e6a7a46b506c5a6d706ea2576f04e9 +a78deba78aeca78ef3a78ffaa79001e3 +a775eaa77603eea778f1a779f4a77af8 +a77b06f226f232f3a784f5a785f7a786 +022a3241405912657ae9a783012aa780 +4c10c2a781127261e2a782e2a77de8a7 +7eefa77f04e3a788e6a789e7a75beea7 +8af0a78b665266486758686869a06a03 +e4a76ce7a76df3a76ef9a76f02efa758 +f2a759f9a75a02e5a75ce6a75df0a75e +08f10ff1a762f3a763f4a764f7a765fa +a766e1a75fe2a760ebac95eea76102ea +a768f5a769f7a76a6146627e63a24164 +a24b6502e1a755eea756faa75708e90f +e9a742eaa743eda744efa745f7a746e1 +a73ee2a73fe3a740e4a74105f109f1a7 +4af8a74bf9a74ce4a747eda748f0a749 +03e7a74deba74eeca74ff4a75003e5a7 +51e8a752eca753f4a75466a2c267a477 +6800137546f20ff2a703f4a706f5a707 +f9a342faa70a7534e13ee5a5ece962ef +a5ff01e9a708f2a70922032aa5e2372e +43345310c4a5e31133b6a5e310cda5e4 +012aa5ee4c126174eea5ef6c386c3c6d +466e506f6c7301e2a704eea70501e1a5 +f6f5a5f701e4a5f8f4a5f904e4a5fae5 +a5fbeaa5fceea5fdefa5fe02e3a700ea +a701f4a702615862746478687c6905e8 +09e8a5f3eca5f4eda5f5e1a5f0e6a5f1 +e7a5f204e7a5e5eba5e6eda5e7f7a5e8 +faa5e910e2a5ea10f9a5eb10f9a5ed00 +117553e90fe9a57deaa581efa584f2a5 +8af9a59975427694e1a573e6012aa579 +4112646ceda57a09e80fe8a593f1a594 +f2a595f6a596f9a597e2a58fe332e4a5 +90e5a591e6a592012aa5794112646ced +a57a10f2a5986d2f6d4e6f5270627166 +7204e3a58be5a58af0a58cf2a58df3a5 +8e10f0a58302e4a585eea586f2a58710 +e5a58810f3a5896132665669606c10f2 +a58205e908e9a577eea578f467e1a574 +e2a575e7a57601e9a57beda57c02e1a5 +7eeca57ff4a580001a6e9f791dec0cec +a5bfeea5c3f5a5d3f6a5db792ce1a59a +e4a5ac01e1a5a5e9a5e1733a733e7542 +76747702e3a5dee9a5dff4a5e010f7a5 +d207f20cf2a5d7f7a5d8f8a5d9faa5da +e2a5d4e3a5d5e4a5d6e7a5c302e6a5dc +f2a5b6f3a5dd6e5a6f6a7204e2a5a8e3 +32e5a55df4a5d0f7a5d1012aa5ce4c12 +696ee2a5cf02e4a5c4e7a5c5efa5c607 +ee0ceea5c6f2a5cbf3a5ccf4a5cde4a5 +c7e6a5c8e9a5c9eda5ca673c6a236a38 +6b486c526d01eda5c1f6a5c202eba5ba +eea5bbf5a5bc01eea5bdf0a5be10eba5 +c06734683e6901eca5b8eda5b901eea5 +b6efa56910f3a5b76428642e653e6610 +eba5b502e5a5adeea5aef2a5af05ef09 +efa5b3f2a52ffaa5b4e2a5b0eaa5b1ec +a5b2612e626c6310f2a5ab09ed0feda5 +a0eea5a1f7a5a2f9a5a3faa5a4e1a59b +e6a59ce7a59de8a59eeaa59f05ef09ef +a5a8f9a5a9faa5aae1a5a5e6a5a6eda5 +a763c2f463a2a364a4fa6500127733ee +19ee38efa566f3a568f4a55bf5a36601 +2aa56253126861f7a563773478387a3c +e5a556eca55d10efa57010f4a57110e1 +a5726d466d486e7a728473887403f2a5 +6cf4a56df5a56ef8a56f02e1a55ee9a5 +5feb012a2e4e126b6fefa561012aa560 +4710cea56101eea564f1a56510e9a567 +02e7a569eba56af5a56b623e66426746 +6b02e1a55aeba55bf9a55c10f5a55510 +e9a55701eca558f9a559001b7257e821 +f316f3a51bf52cf6a521f9a522012aa5 +1f47126c61e7a520e8a3edefa512f2a5 +15771277307a34e1a3e3e5a3e910e4a5 +1510e5a51b722e734a7410e4a51e04e7 +a516e8a517eba518eca519f3a51a01e2 +a51cf7a51d69556c336c326d426f7270 +10f3a51402e1a50de3a50ee4a50f02e5 +a510e7a511ee022aa26342a2ae481161 +6e01e2a3fff4a3fa10f0a51369406a44 +6b03e2a509eca50aefa50bf9a50c10e3 +a50502e1a506eda507f6a508658f65a2 +8066a28167a2826805ef09efa502f0a5 +03f2a504e92ceba500eda501022a3c42 +a2594811616e01e2a3fff4a3fa0b4d2d +5417542e55385610c4a3fd01c8a3f9d7 +a3fa01cba3fbd3a3fc4db4c0502a5310 +d2a3f802c6a3f5c8a3f6daa3f7470e47 +3048b4a44910c4a3f310c6a3f12aa3ee +412a4210cea3f010d5a3ef126f70efa3 +fe10e2a3ea10e1a3eb10e7a3ec613462 +3e6301e8a3e7f0a3e801e4a3e4eea3e5 +10eaa3e60017726f791ce508e5a52ff6 +a54ffa45792a7a34e1a52301efa552f5 +a55310e7a554751d752e764a7710f7a5 +5104e1a54ae3a54be4a54ce7a54df4a5 +4e10e1a550724073747403eda546f0a5 +47f3a548f9a54902e82ce9a543f3a544 +012a2e4d126f6ee7a542012aa5414310 +cea54210e2a545682d6d176daacf6e3c +6f03e2a53ee9a536f0a53ff7a54010ea +a525682e69326a10e5a53c10e4a53901 +e1a53af1a53b64286456655a6706ec0c +eca535efa536f2a537faa538e1a532e8 +a533e9a53410eea52e01e4a530eea531 +612e625a6310e3a52d06e80ce8a527eb +a528f2a529f6a52ae4a524e6a525e7a5 +2601e4a52bf1a52c2aa60061bed46200 +2373a5e51ded0feda3aaeea3afefa3b3 +f2a3bcf3a3c1e5a37ce7a389e8a38de9 +a39377417732783c794c7a72e1a36201 +e4a3d4f2a3d502e8a3d6eba3d7f2a3c9 +05f309f3a3dbf6a3dcf8a3dde5a3d8ee +a3d9f2a3da04e1a3dee5a3dfe6a3e0e8 +a3e1f7a3e27332744875587610e2a3d3 +03eaa3c2f1a3c3f3a3c4f4a3c502efa3 +c6f4a3c7f6a3c809ed0feda3ceefa3cf +f2a3d0f3a3d1f5a3d2e1a3c9e3a3cae4 +a3cbe7a3cceba3cd6a866e3b6e486f58 +7068716c7203e1a3bde8a3bef8a3bffa +a3c002e7a3b0eda3b1f0a3b202eaa3b4 +eda3b5eea3b610f9a3b703e3a3b8e9a3 +b9f0a3baf6a3bb6a446b766c926d03e8 +a3abeba3acf1a3adf5a3ae07ef0cefa3 +9ef2a39ff4a3a0faa3a1e8a39ae9a39b +eaa39ceea39d04e3a3a2eda3a3f1a3a4 +f5a3a5f6a3a602e1a3a7e7a3a8f4a3a9 +656a6562669467a24468a24b6906ed0c +eda396eea397efa398f1a399e2a394e7 +a395eba37507f40cf4a381f7a382f8a3 +83faa384e6a37de8a37eeaa37feda380 +03e4a385f1a386f4a387f9a38802e3a3 +8aeea38bf8a38c05ec09eca391efa38d +f9a392e2a38ee7a38fe9a39061326264 +63906410e4a37b07f20cf2a367f3a368 +f6a369f8a36aeca363eea364f0a365f1 +a36606e40ce4a36eeaa36ff0a370f2a3 +71e1a36be2a36ce3a36d09ed0feda376 +eea377efa378f1a379f5a37ae3a363e6 +a372e8a373e9a374eca37500184dc289 +54c0e157365736584e59645a12616ee2 +addd01612c631168efa9ab1172e1addc +01702a731175f8691165efa9ec01652c +691169e9a71b117ae9a783544455a29e +5601612c691174e8addb1169e9adda07 +684e683669866ea2426f1174efabec10 +6101e158e9042aabb243324b364c3a54 +10c8abb210cea7d910c8add710c1add8 +012aa54f4d10d6a54f01622a7210e8ad +d910f4012aa3b34210d4451173e1a9b9 +61346580668667116ce7add6056d116d +2e6e327610f4a3a910ecab9510e7abeb +67346b386c01e5aba3f5a76010e2add3 +10f2add4116cf5aba7116ee7add51267 +61f2abf750c0c350a27252a2a8530669 +4369426f6a759079016c2a7210e3a50f +10efadd201643e6e01e4ab44e8012aab +554c10cbab5510e4adcf02672e723879 +10efa51101e4ab72efadd010e1ab7a11 +6ee4add1613e675e6801612a7210e4ad +ce10f7a563026d2e72327510f2ab3310 +f2ab6810e2adcd116ef7a34b04613865 +4a68506c76721174e9adcb016c2a7510 +e3a51e10eda11172edadc902612e6c32 +6e10f8a9f010e7adca01e9a9e0f0a9e1 +1172e4a5f8026a306f3675116ef2a9af +116ee7adcc1168e7ab124d8a4ea2ab4f +0467386c3e72447358751167f2a9db11 +61edab4d1163ebab31016b2a7910e1a9 +d410e8a9da01672a6d10e1adc810e5a9 +d807722e725a7460756679116df2032a +a3d0492e4d325410c8adc210cea76410 +cda3d0116fefa95e1165e9adc0116cf4 +adc1614265746c9a6f01642a6e10e7a5 +4210e9adbf0368326b366e3a7210e3ad +bb10eaadb810e1adb901e4a975e9adba +0264346e387201e3adbdefadbe10e6a5 +3d10e4adbc1179eda945046138625865 +5c6b62731168f5adc702672e6e327210 +e2adc510edadc310e4adc41161f49f11 +77e1adc6116fefa56147c4114ac3354a +a6c04ba6d94c03614665a69c69a69e79 +01632a6410e9adb710e9adb6026ea679 +6fa67a7410ee001a4bc139545b571457 +ac7358ac7759305a01c1abffd7ab6b10 +d4ad73544055825603c1ad6ec5ad70ce +ad6fd5a3930bce14d609d6abe7d7abd4 +daab8bceadb4cfabc9d2abd2cbc5d7cb +abbeccad6acdabbd04c1adb5c7ad6cd3 +a562d9ad6ddaad034e824e8a50a24a52 +a26d530cce17d40cd4ad64d5a79ed6ad +65d9adb3cead62cfab71d2ad63ca09ca +ad60cbab5bcdad61c3ad5fc5ab8ac9ab +5f06c70cc7abfbc9ad52cca54ecfa984 +c1ad4fc3ad50c5ad510acc14d409d4ad +5bd7a9e4d9a5c3cca9f6cdad58d2ad59 +c1ad54c5ad55c6ad56c7abcec8a57f03 +c5ad5ecfa950d5a79ed7ab284b9e4ca2 +434d0010cd1dd40fd4a95fd5a930d8ab +fdd9a914daad4ecda740cfadb1d1ad4c +d2adb2c60cc6ad4bc7a934cbadb0cca3 +aac1adafc3ad49c4ad4ac5ab3a01c5ad +3ecdadae04c9ad44d3ad45d4a901d5ad +46d6a90743c0c246644656476648a24d +4905d209d2adadd3a711d4a728c3ad3b +c4a713c5ad2f02c9a57dcfa584d2a58a +0cce17d30cd3ad36d4ad37d5ad02d7ad +38cead33d0ad34d1ad35c608c6ad32c8 +67cca777c1ad31c2ad05c5adac04cdad +39cead3ad2a703d4a706d5a707435244 +a2424505d309d3a568d4ada6daad30c1 +ad2bc3ad2cc5a55b0fcf1ad60cd6ad26 +d7ad07d9adaadaa51bcfad23d0ad24d2 +ad25d5ad00c9c68fc9ad20ccad21cdad +22ceada905cb09cba523cfad29daadab +c5a52fc7ad5dcaad28345e34ae8a4178 +420bce14d209d2ab04d5a740d6ad1cce +ad19cfad1ad1ad1bc909c9ab1dcaad17 +ccad18c1a3c1c5ad14c6ad150cd217d5 +0cd5abfcd7ad12d8ad13daa35ed2ad0f +d3ad10d4ad11cd09cdada8cfad0dd1ad +0ec4ad0ac6ada7cc6d2aa562312c3211 +33b0ada61137b2a79e10e1a9ad10ef01 +2aa7f94c10c1a7f91170e3a7de026d2e +6e327310f5a7ed10e2a7e801e1a7cee2 +a5cf01613a701161ee012aa72e4a10d0 +a72e016d2a7610e1ada210efada1056e +1e6e306f36741168e9ada51164e1a787 +1172e5012aa78c4b01d0ad40d2a78c61 +306850691174f3ada4026c2e6e327710 +e9a74610e9a55c10e1ada302612e6d32 +6f10eaab4310f2ab0010f2012aa77c4b +10c8a77c473448a25c49127461eca56d +0465466c5a6f60727a75016a2a7210f5 +a9dd10f2a5d3116ff2012aa5b34710c5 +a5b31161e7a520016e2a7410e8a5cd01 +e7ad95eda5690161506510eb032aa55d +432e47325410d2a38c10d9ad2710d2a5 +5d10eead96056c186c306d3675116ee7 +ada01175f7a5f7106e01e7ad9ff0a5fc +6130659c691172e1ad9e106e05ef2aef +ad99f358f4042aa3fa433248364d3a54 +10d7a3fa10c1ad9a10cba3f210cfa3f4 +012aa3ee4310cea3eee2a3ffe7ad97e9 +ad981162f2032aa5ec493453385501c1 +ad9cd3ad9d10cca5ec10c5ad9b43c114 +437044a2cd450267406c46741168e901 +2a754501d2ad2ed4751179f0a5590162 +2a7910edad9410e1ad930461a26868a2 +776fa28670a288791172ec0a4d335414 +542e55385810cbad8c01caabadd2ad8b +10c1abf84d2e523e5310cbad8a02c4ad +88cba90bcea54102cfad89d3ab38d5ab +252aab254138423c474c4b01c7a7c4da +ad4210ccad8502c1ad86c7a389d9a37c +01c52dd2ad87026b2e6e327210e9ad82 +10eda3e810f3a71d02612e65327210f3 +ad8310eda50710f2a5041170f4a51301 +6d2a7210f4a5ce10ee012aad844310d9 +ad8403653469866f8c751170ecad9211 +76e106491749324d364e3a5010cba3c8 +10cea5ee10d5ad8f10d0a98e2aa5ee42 +2a4610caad8e10d4ad8d1161ebad9011 +67f2ad912aa25441aa3142056f1f6f3e +72447501672a6810e4ad8110e9ad8011 +70efa3fe106101e8a9f4e9ad7f613065 +5c68116bf3ad7e036c326d36733a7410 +ebad7d10e9ad7c10f5a36a10f3a3c311 +6ee7012aa3af4210c4a3af00214ac1c0 +52c0cc5638563c5758586259665a01d2 +abfed7ab6b04c1ad6ec4ad6fc5ad70ce +ad6fd5a39301c6ad71d3ab6410cbad72 +03c4ad09c5ad09d4ad73d5ab38524653 +6c54a2575503c1abf8c7ad6cd9ad6dda +ad0305d309d3ab38d5ab25d7ab28c5ad +5ec8ab6bcfa9500ecd1ad40cd4ad64d5 +ab25d6ad65d9ad66cdad61cead62cfab +71d2ad63c50cc5ab8ac9ab5fcaad60cb +ab5bc1ad04c3ad5fc4ad080ecd1ad20c +d2abd2d6abe7d7a3fadaab8bcdabbdce +ad6bcfabc9d0ad6ac80cc8abb2caabad +cbabbeccad6ac4ad67c6ad68c7ad694e +644e404fa89650785102c1ad5ccfad5d +d5ad2f09cc0fcca54ecfa984d0a98ed1 +ad0ed4ad04c1ad4fc3ad50c5ad51c8a3 +93c9ad520dcd17d40cd4ad5bd7a9e4d9 +a5c3daad54cdad58d2ad59d3ad5ac70c +c7abcec8a57fcbad57cca9f6c1ad54c5 +ad55c6ad564aa2484ba24c4ca2644d00 +12ce20d50fd5a930d6a54fd8abfdd9a9 +14daad4ecea541cfa3f4d1ad4cd2ad4d +d4a95fc60fc6ad4bc7a934cba90bcca3 +aacda3d0c1ad48c3ad49c4ad4ac5ab3a +01cfad3dd0a72e07d00cd0ad40d2a78c +d7ad41daad42c5ad3ec7a7c4c8a77ccd +ad3f08d30fd3ad45d4a901d5ad46d6a9 +07d9ad47c1a7f9c2ad43c9ad44cbab55 +41c1604598456a46a24147a24e48a275 +4907d10cd1ad3cd2a573d3a711d4a728 +c3ad3bc4a713cca5eccea5ee09d20ed2 +ad2ed3a568d475d5ad2fdaad30c1ad2b +c3ad2cc5a55bc79bc8ad2d04c9a57dcf +a584d1ad0ed2a58ad8a58a0bd014d309 +d3ad36d4ad37d7ad38d0ad34d1ad35d2 +a55dc808c867cca777cead33c1ad31c5 +a5b3c6ad3206d20cd2a703d4a706d5a7 +07d6ad15cba3f2cdad39cead3a415e42 +a24c43a2834406cb0ccba523cfad29d9 +ad17daad2ac4a52fc5a52fcaad280dd1 +17d40cd4ad11d7ad12d8ad13daa35ed1 +ad0ed2ad0fd3ad10cc0bcc6dcda342ce +ad07cfad0dc4ad0ac5ad0bc6ad0c0010 +cc1cd20ed2ab04d445d5a3d0d6ad1cd9 +a37cccad18cead19cfad1ad1ad1bc70c +c7a389c8ad16c9ab1dcaad17c1a3c1c4 +a3afc5ad14c6ad150010cf1dd50fd5ad +00d6ad26d7ad07d9ad27daa51bcfad23 +d0ad24d2ad25d3ab38c90cc9ad20ccad +21cdad22cea3eec4abfec6ad1dc7ad1e +c8ad1f342234423548374e3801382a39 +10b0ab3810b6ad091131b9ad061133b2 +ad071133b6ad082aa562305031a26b32 +02302e33383810b0a52f01b0a51bb2ab +fb10b0750533233334354a3601b1ab64 +b2a5ee03b0a3eeb4a5eeb5a713b9a728 +02b3abfcb4ad01b7ad023034314a3201 +b1a562b9ad0003b2abfbb3a562b5ab04 +b9abfc06b50bb59bb7abfeb8abffb9a5 +62b1abfbb3abfdb4ab8b02342e353e37 +10b2ab2502b2a3eeb3ad03b5ad0403b0 +ab25b1ab25b4ad05b5a52f046436673c +68427246761173f44b116ceda57a1168 +e2abf2116fed6301613c6d01e99dee01 +2aa3424110cda34210e200134c625131 +513c53405450556a5901c5ad09d4ab8c +10c1ad5c02c1ad04c4ad08d9ad6604c7 +91c8a92fcaad7acead6bd2ad7b10cbad +754c3c4d464e624f665001cbad57d3ad +5a01c2ad43d9ad4704c1ad48cdad74ce +a774d2ad4dd5ad7810c7ad7910cdad53 +452e4542474a494e4a644b02c8a506cd +ad3fd7ad4101c79bc8ad2d10c2ad7503 +c4ad76cead77d1ad3cd2a57310cfad3d +2a9b4132423c43464410daad2a01c5ad +0bc6ad0c01c8ad16d5ad7401c3a915ce +abf400217588e62bf221f29bf3a349f6 +a353f9a35cfa012a2e41127261e2a360 +022aa35e498a5210d5a361e651eb67ed +75ee7f7a2d7a2ce125e22de54b10ea01 +2a2e41127261e2a360032aa35e312e49 +345310d5a3611137b2a36101d1a35fd2 +a3607538763c77527901e2a35df2a35c +10f9a35203eca354eea355f4a356f5a3 +5703e1a358e2a359efa35af8a35b6b96 +6f696f44704e726873a2507402e1a34f +e7a350eaa35102ea89ed8bfa8d05f206 +f295f397fa99e38fe491e59309ef0fef +a344f1a345f3a346f9a347faa348e29b +e332e8a341eda342eea343022a9d4e2c +5012616ceda1126261f49f04e1a34ae5 +a34be7a34cefa34df4a34e6b3c6c3e6d +586e03e381eb83ee85f98710eb6905ee +06ee71f36df473e16be26de96f03ed77 +ee79ef7bf07d65276534673a68546a01 +e765f44d01e24df94f05ed06ed59ef5b f15de353e455e75702e15fec61ef6361 48625263646405f006f045f947fa49e1 3fe541ea4302e927eb29f52b04e92ff1 diff --git a/icu4c/source/data/misc/likelySubtags.txt b/icu4c/source/data/misc/likelySubtags.txt index d0bd176e1502..52601f9fd7ac 100644 --- a/icu4c/source/data/misc/likelySubtags.txt +++ b/icu4c/source/data/misc/likelySubtags.txt @@ -49,7 +49,7 @@ likelySubtags:table(nofallback){ an{"an_Latn_ES"} anc{"anc_Latn_ZZ"} ank{"ank_Latn_ZZ"} - ann{"ann_Latn_ZZ"} + ann{"ann_Latn_NG"} any{"any_Latn_ZZ"} aoj{"aoj_Latn_ZZ"} aom{"aom_Latn_ZZ"} @@ -1000,6 +1000,7 @@ likelySubtags:table(nofallback){ phn{"phn_Phnx_LB"} pil{"pil_Latn_ZZ"} pip{"pip_Latn_ZZ"} + pis{"pis_Latn_SB"} pka{"pka_Brah_IN"} pko{"pko_Latn_KE"} pl{"pl_Latn_PL"} @@ -1224,6 +1225,7 @@ likelySubtags:table(nofallback){ to{"to_Latn_TO"} tof{"tof_Latn_ZZ"} tog{"tog_Latn_MW"} + tok{"tok_Latn_001"} toq{"toq_Latn_ZZ"} tpi{"tpi_Latn_PG"} tpm{"tpm_Latn_ZZ"} diff --git a/icu4c/source/data/misc/metadata.txt b/icu4c/source/data/misc/metadata.txt index 453954ad9064..d21503d71d07 100644 --- a/icu4c/source/data/misc/metadata.txt +++ b/icu4c/source/data/misc/metadata.txt @@ -36,6 +36,10 @@ metadata:table(nofallback){ reason{"deprecated"} replacement{"ami"} } + ajt{ + reason{"deprecated"} + replacement{"aeb"} + } aju{ reason{"macrolanguage"} replacement{"jrb"} @@ -924,6 +928,10 @@ metadata:table(nofallback){ reason{"deprecated"} replacement{"dtp"} } + lak{ + reason{"deprecated"} + replacement{"ksp"} + } lao{ reason{"overlong"} replacement{"lo"} @@ -1484,6 +1492,10 @@ metadata:table(nofallback){ reason{"overlong"} replacement{"sl"} } + smd{ + reason{"deprecated"} + replacement{"kmb"} + } sme{ reason{"overlong"} replacement{"se"} @@ -1496,6 +1508,10 @@ metadata:table(nofallback){ reason{"overlong"} replacement{"sn"} } + snb{ + reason{"deprecated"} + replacement{"iba"} + } snd{ reason{"overlong"} replacement{"sd"} @@ -5150,6 +5166,7 @@ metadata:table(nofallback){ "ak_GH", "am_ET", "an_ES", + "ann_NG", "ar_001", "arn_CL", "as_IN", @@ -5168,7 +5185,9 @@ metadata:table(nofallback){ "bem_ZM", "bez_TZ", "bg_BG", + "bgc_IN", "bgn_PK", + "bho_IN", "blt_VN", "bm_ML", "bm_Nkoo_ML", @@ -5308,6 +5327,7 @@ metadata:table(nofallback){ "lv_LV", "mai_IN", "mas_KE", + "mdf_RU", "mer_KE", "mfe_MU", "mg_MG", @@ -5357,12 +5377,14 @@ metadata:table(nofallback){ "pa_Guru", "pa_Guru_IN", "pcm_NG", + "pis_SB", "pl_PL", "prg_001", "ps_AF", "pt_BR", "qu_PE", "quc_GT", + "raj_IN", "rhg_Rohg", "rhg_Rohg_MM", "rm_CH", @@ -5425,6 +5447,7 @@ metadata:table(nofallback){ "tk_TM", "tn_ZA", "to_TO", + "tok_001", "tpi_PG", "tr_TR", "trv_TW", diff --git a/icu4c/source/data/misc/plurals.txt b/icu4c/source/data/misc/plurals.txt index 6ca9689b4af7..b09a896e6a43 100644 --- a/icu4c/source/data/misc/plurals.txt +++ b/icu4c/source/data/misc/plurals.txt @@ -22,10 +22,10 @@ plurals:table(nofallback){ bm{"set0"} bn{"set1"} bo{"set0"} - br{"set33"} + br{"set32"} brx{"set7"} bs{"set18"} - ca{"set3"} + ca{"set21"} ce{"set7"} ceb{"set11"} cgg{"set7"} @@ -123,7 +123,7 @@ plurals:table(nofallback){ mo{"set17"} mr{"set7"} ms{"set0"} - mt{"set31"} + mt{"set33"} my{"set0"} nah{"set7"} naq{"set15"} @@ -155,7 +155,7 @@ plurals:table(nofallback){ ro{"set17"} rof{"set7"} root{"set0"} - ru{"set32"} + ru{"set31"} rwk{"set7"} sah{"set0"} saq{"set7"} @@ -204,7 +204,7 @@ plurals:table(nofallback){ ts{"set7"} tzm{"set6"} ug{"set7"} - uk{"set32"} + uk{"set31"} ur{"set3"} uz{"set7"} ve{"set7"} @@ -228,6 +228,7 @@ plurals:table(nofallback){ an{"set39"} ar{"set39"} as{"set60"} + ast{"set39"} az{"set58"} bal{"set41"} be{"set44"} @@ -642,21 +643,6 @@ plurals:table(nofallback){ } } set31{ - few{ - "n = 0 or n % 100 = 2..10 @integer 0, 2~10, 102~107, 1002, … @decimal" - " 0.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 10.0, 102.0, 1002.0, …" - } - many{ - "n % 100 = 11..19 @integer 11~19, 111~117, 1011, … @decimal 11.0, 12." - "0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0, 111.0, 1011.0, …" - } - one{"n = 1 @integer 1 @decimal 1.0, 1.00, 1.000, 1.0000"} - other{ - " @integer 20~35, 100, 1000, 10000, 100000, 1000000, … @decimal 0.1~0" - ".9, 1.1~1.7, 10.1, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …" - } - } - set32{ few{ "v = 0 and i % 10 = 2..4 and i % 100 != 12..14 @integer 2~4, 22~24, 3" "2~34, 42~44, 52~54, 62, 102, 1002, …" @@ -674,7 +660,7 @@ plurals:table(nofallback){ ".0, …" } } - set33{ + set32{ few{ "n % 10 = 3..4,9 and n % 100 != 10..19,70..79,90..99 @integer 3, 4, 9" ", 23, 24, 29, 33, 34, 39, 43, 44, 49, 103, 1003, … @decimal 3.0, 4.0" @@ -699,6 +685,22 @@ plurals:table(nofallback){ "2.0, 1002.0, …" } } + set33{ + few{ + "n = 0 or n % 100 = 3..10 @integer 0, 3~10, 103~109, 1003, … @decimal" + " 0.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 103.0, 1003.0, …" + } + many{ + "n % 100 = 11..19 @integer 11~19, 111~117, 1011, … @decimal 11.0, 12." + "0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0, 111.0, 1011.0, …" + } + one{"n = 1 @integer 1 @decimal 1.0, 1.00, 1.000, 1.0000"} + other{ + " @integer 20~35, 100, 1000, 10000, 100000, 1000000, … @decimal 0.1~0" + ".9, 1.1~1.7, 10.1, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …" + } + two{"n = 2 @integer 2 @decimal 2.0, 2.00, 2.000, 2.0000"} + } set34{ few{ "n = 3..6 @integer 3~6 @decimal 3.0, 4.0, 5.0, 6.0, 3.00, 4.00, 5.00," diff --git a/icu4c/source/data/misc/supplementalData.txt b/icu4c/source/data/misc/supplementalData.txt index b73223518884..b4253cc5cd67 100644 --- a/icu4c/source/data/misc/supplementalData.txt +++ b/icu4c/source/data/misc/supplementalData.txt @@ -1903,6 +1903,22 @@ supplementalData:table(nofallback){ "islamic-civil", "islamic-tbla", } + AL{ + "gregorian", + "islamic-civil", + "islamic-tbla", + } + AZ{ + "gregorian", + "islamic-civil", + "islamic-tbla", + } + BD{ + "gregorian", + "islamic", + "islamic-civil", + "islamic-tbla", + } BH{ "gregorian", "islamic-umalqura", @@ -1957,6 +1973,12 @@ supplementalData:table(nofallback){ "gregorian", "chinese", } + ID{ + "gregorian", + "islamic", + "islamic-civil", + "islamic-tbla", + } IL{ "gregorian", "hebrew", @@ -2036,12 +2058,35 @@ supplementalData:table(nofallback){ "islamic-civil", "islamic-tbla", } + MV{ + "gregorian", + "islamic-civil", + "islamic-tbla", + } + MY{ + "gregorian", + "islamic", + "islamic-civil", + "islamic-tbla", + } + NE{ + "gregorian", + "islamic", + "islamic-civil", + "islamic-tbla", + } OM{ "gregorian", "islamic", "islamic-civil", "islamic-tbla", } + PK{ + "gregorian", + "islamic", + "islamic-civil", + "islamic-tbla", + } PS{ "gregorian", "islamic", @@ -2087,17 +2132,42 @@ supplementalData:table(nofallback){ "buddhist", "gregorian", } + TJ{ + "gregorian", + "islamic-civil", + "islamic-tbla", + } + TM{ + "gregorian", + "islamic-civil", + "islamic-tbla", + } TN{ "gregorian", "islamic", "islamic-civil", "islamic-tbla", } + TR{ + "gregorian", + "islamic-civil", + "islamic-tbla", + } TW{ "gregorian", "roc", "chinese", } + UZ{ + "gregorian", + "islamic-civil", + "islamic-tbla", + } + XK{ + "gregorian", + "islamic-civil", + "islamic-tbla", + } YE{ "gregorian", "islamic", @@ -2105,7 +2175,7 @@ supplementalData:table(nofallback){ "islamic-tbla", } } - cldrVersion{"41"} + cldrVersion{"42"} codeMappings{ { "AA", @@ -4666,7 +4736,7 @@ supplementalData:table(nofallback){ "adp", "agp", "ais", - "aju", + "ajt~u", "als", "aoh", "arb", @@ -4709,6 +4779,7 @@ supplementalData:table(nofallback){ "cnr", "coy", "cqu", + "cug", "cum", "cwd", "daf", @@ -4793,6 +4864,7 @@ supplementalData:table(nofallback){ "kzh", "kzj", "kzt", + "lak", "lba", "lbk", "leg", @@ -4800,6 +4872,7 @@ supplementalData:table(nofallback){ "llo", "lmm", "lmz", + "lno", "lsg", "lvs", "meg", @@ -4845,6 +4918,7 @@ supplementalData:table(nofallback){ "pcr", "pes", "pgy", + "pii", "plp", "plt", "pmc", @@ -4871,6 +4945,8 @@ supplementalData:table(nofallback){ "sgo", "sh", "skk", + "smd", + "snb", "snh", "spy", "src", @@ -4896,12 +4972,15 @@ supplementalData:table(nofallback){ "umu", "unp", "uok", + "uun", "uzn", "vki", "wgw", "wit", "wiw", "wra", + "wrd", + "wya", "xba", "xbx", "xia", @@ -4995,7 +5074,7 @@ supplementalData:table(nofallback){ "aji", "ajn", "ajp", - "ajt", + "ajs", "ajw", "ajz", "ak", @@ -5114,7 +5193,7 @@ supplementalData:table(nofallback){ "boe~r", "bot~z", "bpa", - "bpd~e", + "bpc~e", "bpg~z", "bqa~d", "bqf~z", @@ -5224,7 +5303,7 @@ supplementalData:table(nofallback){ "cna~c", "cng~i", "cnk~l", - "cno~p", + "cno~q", "cns~u", "cnw~x", "co", @@ -5254,7 +5333,7 @@ supplementalData:table(nofallback){ "cty~z", "cu", "cua~c", - "cug~l", + "cuh~l", "cuo~y", "cv", "cvg", @@ -5363,6 +5442,7 @@ supplementalData:table(nofallback){ "dsl", "dsn~o", "dsq", + "dsz", "dta~b", "dtd", "dth~i", @@ -5410,7 +5490,7 @@ supplementalData:table(nofallback){ "efe", "efi", "ega", - "egl", + "egl~m", "ego", "egx~y", "ehs", @@ -5621,8 +5701,7 @@ supplementalData:table(nofallback){ "gnt~u", "gnw", "gnz", - "goa~u", - "gow~z", + "goa~z", "gpa", "gpe", "gpn", @@ -5827,7 +5906,7 @@ supplementalData:table(nofallback){ "imi", "iml", "imn~o", - "imr~s", + "imr~t", "imy", "inb~c", "ine", @@ -6050,7 +6129,8 @@ supplementalData:table(nofallback){ "kzk~s", "kzu~z", "la", - "laa~n", + "laa~j", + "lal~n", "lap~s", "lau", "law~z", @@ -6075,7 +6155,7 @@ supplementalData:table(nofallback){ "lg", "lga~b", "lgg~i", - "lgk~n", + "lgk~o", "lgq~r", "lgt~u", "lgz", @@ -6112,7 +6192,7 @@ supplementalData:table(nofallback){ "lna~b", "lnd", "lng~j", - "lnl~o", + "lnl~n", "lns", "lnu", "lnw", @@ -6124,6 +6204,7 @@ supplementalData:table(nofallback){ "lpe", "lpn~o", "lpx", + "lqr", "lra", "lrc", "lre", @@ -6134,12 +6215,11 @@ supplementalData:table(nofallback){ "lrt", "lrv", "lrz", - "lsa~b", - "lsd~e", + "lsa~e", "lsh~i", "lsl~p", "lsr~t", - "lsv", + "lsv~w", "lsy", "lt", "ltc", @@ -6365,7 +6445,7 @@ supplementalData:table(nofallback){ "nwm", "nwo", "nwr", - "nwx~y", + "nww~y", "nxa", "nxd~e", "nxg", @@ -6411,6 +6491,7 @@ supplementalData:table(nofallback){ "ogu", "oht~u", "oia", + "oie", "oin", "oj", "ojb~c", @@ -6525,12 +6606,12 @@ supplementalData:table(nofallback){ "pgz", "pha", "phd", - "phg~i", - "phk~o", + "phg~o", "phq~r", "pht~w", "pi", - "pia~j", + "pia~h", + "pij", "pil~p", "pir~z", "pjt", @@ -6604,6 +6685,7 @@ supplementalData:table(nofallback){ "pys", "pyu", "pyx~y", + "pzh", "pzn", "qu", "qua~d", @@ -6655,7 +6737,7 @@ supplementalData:table(nofallback){ "rgu", "rhg", "rhp", - "ria", + "ria~b", "rif", "ril~n", "rir", @@ -6674,6 +6756,7 @@ supplementalData:table(nofallback){ "rms~x", "rmz", "rn", + "rnb", "rnd", "rng", "rnl", @@ -6694,7 +6777,7 @@ supplementalData:table(nofallback){ "rro", "rrt", "rsb", - "rsl~m", + "rsk~n", "rtc", "rth", "rtm", @@ -6774,11 +6857,11 @@ supplementalData:table(nofallback){ "slp~u", "slw~z", "sm", - "sma~d", + "sma~c", "smf~n", "smp~z", "sn", - "snb~c", + "snc", "sne~g", "sni~s", "snu~z", @@ -6913,8 +6996,7 @@ supplementalData:table(nofallback){ "tnk~z", "to", "tob~d", - "tof~j", - "tol~m", + "tof~m", "too~s", "tou~z", "tpa", @@ -6987,6 +7069,7 @@ supplementalData:table(nofallback){ "ug", "uga~b", "uge", + "ugh", "ugn~o", "ugy", "uha", @@ -7023,6 +7106,7 @@ supplementalData:table(nofallback){ "unu", "unx", "unz", + "uon", "upi", "upv", "ur", @@ -7042,7 +7126,7 @@ supplementalData:table(nofallback){ "utp", "utr", "utu", - "uum~n", + "uum", "uur", "uuu", "uve", @@ -7111,7 +7195,7 @@ supplementalData:table(nofallback){ "wdd", "wdg", "wdj~k", - "wdu", + "wdt~u", "wdy", "wea", "wec~d", @@ -7175,7 +7259,6 @@ supplementalData:table(nofallback){ "woy", "wpc", "wrb", - "wrd", "wrg~i", "wrk~p", "wrr~s", @@ -7204,9 +7287,9 @@ supplementalData:table(nofallback){ "www", "wxa", "wxw", - "wya~b", + "wyb", "wyi", - "wym", + "wym~n", "wyr", "wyy", "xaa~e", @@ -7232,6 +7315,7 @@ supplementalData:table(nofallback){ "xdk", "xdm", "xdo", + "xdq", "xdy", "xeb", "xed", @@ -7251,6 +7335,7 @@ supplementalData:table(nofallback){ "xh", "xha", "xhc~e", + "xhm", "xhr", "xht~v", "xib", @@ -7467,6 +7552,7 @@ supplementalData:table(nofallback){ "zbt~u", "zbw", "zca", + "zcd", "zch", "zdj", "zea", @@ -11602,6 +11688,7 @@ supplementalData:table(nofallback){ "duration-month", "duration-month-person", "duration-nanosecond", + "duration-quarter", "duration-second", "duration-week", "duration-week-person", @@ -12017,6 +12104,12 @@ supplementalData:table(nofallback){ scripts{"Latn"} } } + ann{ + primary{ + scripts{"Latn"} + territories{"NG"} + } + } anp{ primary{ scripts{"Deva"} @@ -15874,6 +15967,12 @@ supplementalData:table(nofallback){ } } } + pis{ + primary{ + scripts{"Latn"} + territories{"SB"} + } + } pko{ primary{ scripts{"Latn"} @@ -16521,6 +16620,7 @@ supplementalData:table(nofallback){ sms{ primary{ scripts{"Latn"} + territories{"FI"} } } sn{ @@ -16992,6 +17092,11 @@ supplementalData:table(nofallback){ scripts{"Latn"} } } + tok{ + primary{ + scripts{"Latn"} + } + } tpi{ primary{ scripts{"Latn"} @@ -20190,6 +20295,7 @@ supplementalData:table(nofallback){ "es_UY", "es_VE", } + fr_HT{"ht"} no{ "nb", "nn", @@ -20254,6 +20360,22 @@ supplementalData:table(nofallback){ } zh_Hant_HK{"zh_Hant_MO"} } + personNamesDefaults{ + nameOrderLocalesDefault{ + givenFirst{ + "en", + "und", + } + surnameFirst{ + "hu", + "ja", + "ko", + "vi", + "yue", + "zh", + } + } + } subdivisionContainment{ AD{ "ad02", @@ -31133,6 +31255,9 @@ supplementalData:table(nofallback){ amo{ populationShareF:int{45870000} } + ann{ + populationShareF:int{45150000} + } ar{ populationShareF:int{46710000} } @@ -32106,6 +32231,9 @@ supplementalData:table(nofallback){ officialStatus{"official"} populationShareF:int{50100000} } + pis{ + populationShareF:int{49823300} + } rug{ populationShareF:int{48140000} } diff --git a/icu4c/source/data/misc/units.txt b/icu4c/source/data/misc/units.txt index 5641aa5acea0..236ea6a17c1b 100644 --- a/icu4c/source/data/misc/units.txt +++ b/icu4c/source/data/misc/units.txt @@ -2,7 +2,7 @@ // License & terms of use: http://www.unicode.org/copyright.html // Generated using tools/cldr/cldr-to-icu/build-icu-data.xml units:table(nofallback){ - cldrVersion{"41"} + cldrVersion{"42"} convertUnits{ 100-kilometer{ factor{"100000"} @@ -382,6 +382,10 @@ units:table(nofallback){ factor{"gal_imp_to_m3/4"} target{"cubic-meter"} } + quarter{ + factor{"1/4"} + target{"year"} + } radian{ factor{"1/2*PI"} target{"revolution"} diff --git a/icu4c/source/data/rbnf/LOCALE_DEPS.json b/icu4c/source/data/rbnf/LOCALE_DEPS.json index b9db913fefc7..63d6761f89e3 100644 --- a/icu4c/source/data/rbnf/LOCALE_DEPS.json +++ b/icu4c/source/data/rbnf/LOCALE_DEPS.json @@ -3,7 +3,7 @@ // Generated using tools/cldr/cldr-to-icu/build-icu-data.xml { - "cldrVersion": "41", + "cldrVersion": "42", "aliases": { "ars": "ar_SA", "in": "id", diff --git a/icu4c/source/data/rbnf/root.txt b/icu4c/source/data/rbnf/root.txt index 518dc92a93a7..6db5ee9add69 100644 --- a/icu4c/source/data/rbnf/root.txt +++ b/icu4c/source/data/rbnf/root.txt @@ -683,5 +683,5 @@ root{ "0: =#,##0.#=.;", } } - Version{"41"} + Version{"42"} } diff --git a/icu4c/source/data/region/LOCALE_DEPS.json b/icu4c/source/data/region/LOCALE_DEPS.json index 93facb19926a..b0667cbdf0a5 100644 --- a/icu4c/source/data/region/LOCALE_DEPS.json +++ b/icu4c/source/data/region/LOCALE_DEPS.json @@ -3,7 +3,7 @@ // Generated using tools/cldr/cldr-to-icu/build-icu-data.xml { - "cldrVersion": "41", + "cldrVersion": "42", "aliases": { "ars": "ar_SA", "az_AZ": "az_Latn_AZ", diff --git a/icu4c/source/data/region/root.txt b/icu4c/source/data/region/root.txt index e5bc81ce57d3..c51c3fd855df 100644 --- a/icu4c/source/data/region/root.txt +++ b/icu4c/source/data/region/root.txt @@ -2,5 +2,5 @@ // License & terms of use: http://www.unicode.org/copyright.html // Generated using tools/cldr/cldr-to-icu/build-icu-data.xml root{ - Version{"41"} + Version{"42"} } diff --git a/icu4c/source/data/unit/LOCALE_DEPS.json b/icu4c/source/data/unit/LOCALE_DEPS.json index 93facb19926a..b0667cbdf0a5 100644 --- a/icu4c/source/data/unit/LOCALE_DEPS.json +++ b/icu4c/source/data/unit/LOCALE_DEPS.json @@ -3,7 +3,7 @@ // Generated using tools/cldr/cldr-to-icu/build-icu-data.xml { - "cldrVersion": "41", + "cldrVersion": "42", "aliases": { "ars": "ar_SA", "az_AZ": "az_Latn_AZ", diff --git a/icu4c/source/data/unit/en.txt b/icu4c/source/data/unit/en.txt index 4768cc9c6eb6..b659c6805348 100644 --- a/icu4c/source/data/unit/en.txt +++ b/icu4c/source/data/unit/en.txt @@ -338,6 +338,11 @@ en{ one{"{0} nanosecond"} other{"{0} nanoseconds"} } + quarter{ + dnam{"quarters"} + one{"{0} quarter"} + other{"{0} quarters"} + } second{ dnam{"seconds"} one{"{0} second"} @@ -844,6 +849,11 @@ en{ one{"{0} degree Fahrenheit"} other{"{0} degrees Fahrenheit"} } + generic{ + dnam{"degrees temperature"} + one{"{0} degree temperature"} + other{"{0} degrees temperature"} + } kelvin{ dnam{"kelvins"} one{"{0} kelvin"} @@ -1313,6 +1323,11 @@ en{ one{"{0}ns"} other{"{0}ns"} } + quarter{ + dnam{"qtr"} + one{"{0}q"} + other{"{0}q"} + } second{ dnam{"sec"} one{"{0}s"} @@ -2286,6 +2301,11 @@ en{ one{"{0} ns"} other{"{0} ns"} } + quarter{ + dnam{"qtr"} + one{"{0} qtr"} + other{"{0} qtrs"} + } second{ dnam{"secs"} one{"{0} sec"} diff --git a/icu4c/source/data/unit/en_AU.txt b/icu4c/source/data/unit/en_AU.txt index 0197fe2e8edb..83cd58530b28 100644 --- a/icu4c/source/data/unit/en_AU.txt +++ b/icu4c/source/data/unit/en_AU.txt @@ -47,6 +47,8 @@ en_AU{ temperature{ generic{ dnam{"degrees"} + one{"{0} degree"} + other{"{0} degrees"} } } volume{ diff --git a/icu4c/source/data/unit/mt.txt b/icu4c/source/data/unit/mt.txt index 6177fdd914ae..d769adc01e3e 100644 --- a/icu4c/source/data/unit/mt.txt +++ b/icu4c/source/data/unit/mt.txt @@ -9,6 +9,7 @@ mt{ many{"{0}′"} one{"{0}′"} other{"{0}′"} + two{"{0}′"} } } concentr{ @@ -18,24 +19,27 @@ mt{ many{"{0} kt"} one{"{0} kt"} other{"{0} kt"} + two{"{0} kt"} } } consumption{ liter-per-kilometer{ dnam{"L/km"} few{"{0} litri kull kilometru"} - many{"{0} litri kull kilometru"} + many{"{0}-il litru kull kilometru"} one{"{0} litru kull kilometru"} - other{"{0} litri kull kilometru"} + other{"{0} litru kull kilometru"} + two{"{0} litri kull kilometru"} } } digital{ megabyte{ dnam{"megabytes"} few{"{0} megabytes"} - many{"{0} megabytes"} + many{"{0}-il megabyte"} one{"{0} megabyte"} - other{"{0} megabytes"} + other{"{0} megabyte"} + two{"{0} megabytes"} } terabit{ dnam{"terabits"} @@ -43,6 +47,7 @@ mt{ many{"{0} terabits"} one{"{0} terabit"} other{"{0} terabits"} + two{"{0} terabits"} } terabyte{ dnam{"terabytes"} @@ -50,15 +55,17 @@ mt{ many{"{0} terabytes"} one{"{0} terabyte"} other{"{0} terabytes"} + two{"{0} terabytes"} } } duration{ millisecond{ dnam{"millisekondi"} few{"{0} millisekondi"} - many{"{0} millisekondi"} + many{"{0}-il millisekonda"} one{"{0} millisekonda"} - other{"{0} millisekondi"} + other{"{0} millisekonda"} + two{"{0} millisekondi"} } } light{ @@ -68,6 +75,7 @@ mt{ many{"{0} lx"} one{"{0} lx"} other{"{0} lx"} + two{"{0} lx"} } } } @@ -79,6 +87,7 @@ mt{ many{"{0}ms"} one{"{0}ms"} other{"{0}ms"} + two{"{0}ms"} } } } @@ -90,6 +99,7 @@ mt{ many{"{0} kt"} one{"{0} kt"} other{"{0} kt"} + two{"{0} kt"} } } consumption{ @@ -99,6 +109,7 @@ mt{ many{"{0} L/km"} one{"{0} L/km"} other{"{0} L/km"} + two{"{0} L/km"} } } digital{ @@ -107,6 +118,7 @@ mt{ many{"{0} Mb"} one{"{0} Mb"} other{"{0} Mb"} + two{"{0} Mb"} } megabyte{ dnam{"MB"} @@ -114,6 +126,7 @@ mt{ many{"{0} MB"} one{"{0} MB"} other{"{0} MB"} + two{"{0} MB"} } terabit{ dnam{"Tb"} @@ -121,6 +134,7 @@ mt{ many{"{0} Tb"} one{"{0} Tb"} other{"{0} Tb"} + two{"{0} Tb"} } terabyte{ dnam{"TB"} @@ -128,6 +142,7 @@ mt{ many{"{0} TB"} one{"{0} TB"} other{"{0} TB"} + two{"{0} TB"} } } duration{ @@ -137,6 +152,7 @@ mt{ many{"{0} ms"} one{"{0} ms"} other{"{0} ms"} + two{"{0} ms"} } } light{ @@ -146,6 +162,7 @@ mt{ many{"{0} lx"} one{"{0} lx"} other{"{0} lx"} + two{"{0} lx"} } } } diff --git a/icu4c/source/data/unit/root.txt b/icu4c/source/data/unit/root.txt index 5a54b720027e..3e1c078eee9d 100644 --- a/icu4c/source/data/unit/root.txt +++ b/icu4c/source/data/unit/root.txt @@ -2,7 +2,7 @@ // License & terms of use: http://www.unicode.org/copyright.html // Generated using tools/cldr/cldr-to-icu/build-icu-data.xml root{ - Version{"41"} + Version{"42"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -288,6 +288,11 @@ root{ dnam{"ns"} other{"{0} ns"} } + quarter{ + dnam{"qtr"} + other{"{0} q"} + per{"{0}/q"} + } second{ dnam{"sec"} other{"{0} s"} diff --git a/icu4c/source/data/zone/LOCALE_DEPS.json b/icu4c/source/data/zone/LOCALE_DEPS.json index 93facb19926a..b0667cbdf0a5 100644 --- a/icu4c/source/data/zone/LOCALE_DEPS.json +++ b/icu4c/source/data/zone/LOCALE_DEPS.json @@ -3,7 +3,7 @@ // Generated using tools/cldr/cldr-to-icu/build-icu-data.xml { - "cldrVersion": "41", + "cldrVersion": "42", "aliases": { "ars": "ar_SA", "az_AZ": "az_Latn_AZ", diff --git a/icu4c/source/data/zone/hi_Latn.txt b/icu4c/source/data/zone/hi_Latn.txt index 0323fca87ffe..d9eb14f93340 100644 --- a/icu4c/source/data/zone/hi_Latn.txt +++ b/icu4c/source/data/zone/hi_Latn.txt @@ -536,7 +536,7 @@ hi_Latn{ ec{"Santiago"} } "America:Santo_Domingo"{ - ec{"Santo_Domingo"} + ec{"Santo Domingo"} } "America:Sao_Paulo"{ ec{"Sao Paulo"} diff --git a/icu4c/source/data/zone/root.txt b/icu4c/source/data/zone/root.txt index e5154e08f6d7..3adba253b634 100644 --- a/icu4c/source/data/zone/root.txt +++ b/icu4c/source/data/zone/root.txt @@ -2,7 +2,7 @@ // License & terms of use: http://www.unicode.org/copyright.html // Generated using tools/cldr/cldr-to-icu/build-icu-data.xml root{ - Version{"41"} + Version{"42"} zoneStrings{ "Africa:Asmera"{ ec{"Asmara"} diff --git a/icu4c/source/i18n/dtitvfmt.cpp b/icu4c/source/i18n/dtitvfmt.cpp index df9d23bd444a..23b285aff81e 100644 --- a/icu4c/source/i18n/dtitvfmt.cpp +++ b/icu4c/source/i18n/dtitvfmt.cpp @@ -1725,7 +1725,13 @@ DateIntervalFormat::adjustFieldWidth(const UnicodeString& inputSkeleton, DateIntervalInfo::parseSkeleton(inputSkeleton, inputSkeletonFieldWidth); DateIntervalInfo::parseSkeleton(bestMatchSkeleton, bestMatchSkeletonFieldWidth); if (suppressDayPeriodField) { + // remove the 'a' and any NBSP/NNBSP on one side of it + findReplaceInPattern(adjustedPtn, UnicodeString(u"\u00A0a",-1), UnicodeString()); + findReplaceInPattern(adjustedPtn, UnicodeString(u"\u202Fa",-1), UnicodeString()); + findReplaceInPattern(adjustedPtn, UnicodeString(u"a\u00A0",-1), UnicodeString()); + findReplaceInPattern(adjustedPtn, UnicodeString(u"a\u202F",-1), UnicodeString()); findReplaceInPattern(adjustedPtn, UnicodeString(LOW_A), UnicodeString()); + // adjust interior double spaces, remove exterior whitespace findReplaceInPattern(adjustedPtn, UnicodeString(" "), UnicodeString(" ")); adjustedPtn.trim(); } diff --git a/icu4c/source/i18n/dtptngen.cpp b/icu4c/source/i18n/dtptngen.cpp index a029b2aadfef..3171dfd5c3dc 100644 --- a/icu4c/source/i18n/dtptngen.cpp +++ b/icu4c/source/i18n/dtptngen.cpp @@ -283,6 +283,7 @@ static const UChar UDATPG_ItemFormat[]= {0x7B, 0x30, 0x7D, 0x20, 0x251C, 0x7B, 0 //static const UChar repeatedPatterns[6]={CAP_G, CAP_E, LOW_Z, LOW_V, CAP_Q, 0}; // "GEzvQ" static const char DT_DateTimePatternsTag[]="DateTimePatterns"; +static const char DT_DateAtTimePatternsTag[]="DateTimePatterns%atTime"; static const char DT_DateTimeCalendarTag[]="calendar"; static const char DT_DateTimeGregorianTag[]="gregorian"; static const char DT_DateTimeAppendItemsTag[]="appendItems"; @@ -1396,6 +1397,8 @@ DateTimePatternGenerator::getDateTimeFormat(UDateFormatStyle style, UErrorCode& return dateTimeFormat[style]; } +static const int32_t cTypeBufMax = 32; + void DateTimePatternGenerator::setDateTimeFromCalendar(const Locale& locale, UErrorCode& status) { if (U_FAILURE(status)) { return; } @@ -1403,39 +1406,67 @@ DateTimePatternGenerator::setDateTimeFromCalendar(const Locale& locale, UErrorCo const UChar *resStr; int32_t resStrLen = 0; - LocalPointer fCalendar(Calendar::createInstance(locale, status), status); - if (U_FAILURE(status)) { return; } - LocalUResourceBundlePointer calData(ures_open(nullptr, locale.getBaseName(), &status)); if (U_FAILURE(status)) { return; } ures_getByKey(calData.getAlias(), DT_DateTimeCalendarTag, calData.getAlias(), &status); if (U_FAILURE(status)) { return; } - LocalUResourceBundlePointer dateTimePatterns; - if (fCalendar->getType() != nullptr && *fCalendar->getType() != '\0' - && uprv_strcmp(fCalendar->getType(), DT_DateTimeGregorianTag) != 0) { - dateTimePatterns.adoptInstead(ures_getByKeyWithFallback(calData.getAlias(), fCalendar->getType(), - nullptr, &status)); - ures_getByKeyWithFallback(dateTimePatterns.getAlias(), DT_DateTimePatternsTag, - dateTimePatterns.getAlias(), &status); + char cType[cTypeBufMax + 1]; + Calendar::getCalendarTypeFromLocale(locale, cType, cTypeBufMax, status); + cType[cTypeBufMax] = 0; + if (U_FAILURE(status) || cType[0] == 0) { + status = U_ZERO_ERROR; + uprv_strcpy(cType, DT_DateTimeGregorianTag); } + UBool cTypeIsGregorian = (uprv_strcmp(cType, DT_DateTimeGregorianTag) == 0); + // Currently, for compatibility with pre-CLDR-42 data, we default to the "atTime" + // combining patterns. Depending on guidance in CLDR 42 spec and on DisplayOptions, + // we may change this. + LocalUResourceBundlePointer specificCalBundle; + LocalUResourceBundlePointer dateTimePatterns; + int32_t dateTimeOffset = 0; // initially for DateTimePatterns%atTime + if (!cTypeIsGregorian) { + specificCalBundle.adoptInstead(ures_getByKeyWithFallback(calData.getAlias(), cType, + nullptr, &status)); + dateTimePatterns.adoptInstead(ures_getByKeyWithFallback(specificCalBundle.getAlias(), DT_DateAtTimePatternsTag, // the %atTime variant, 4 entries + nullptr, &status)); + } if (dateTimePatterns.isNull() || status == U_MISSING_RESOURCE_ERROR) { status = U_ZERO_ERROR; - dateTimePatterns.adoptInstead(ures_getByKeyWithFallback(calData.getAlias(), DT_DateTimeGregorianTag, - dateTimePatterns.orphan(), &status)); - ures_getByKeyWithFallback(dateTimePatterns.getAlias(), DT_DateTimePatternsTag, - dateTimePatterns.getAlias(), &status); + specificCalBundle.adoptInstead(ures_getByKeyWithFallback(calData.getAlias(), DT_DateTimeGregorianTag, + nullptr, &status)); + dateTimePatterns.adoptInstead(ures_getByKeyWithFallback(specificCalBundle.getAlias(), DT_DateAtTimePatternsTag, // the %atTime variant, 4 entries + nullptr, &status)); } - if (U_FAILURE(status)) { return; } - - if (ures_getSize(dateTimePatterns.getAlias()) <= DateFormat::kDateTimeOffset + DateFormat::kShort) - { + if (U_SUCCESS(status) && (ures_getSize(dateTimePatterns.getAlias()) < 4)) { status = U_INVALID_FORMAT_ERROR; - return; } + if (status == U_MISSING_RESOURCE_ERROR) { + // Try again with standard variant + status = U_ZERO_ERROR; + dateTimePatterns.orphan(); + dateTimeOffset = (int32_t)DateFormat::kDateTimeOffset; + if (!cTypeIsGregorian) { + specificCalBundle.adoptInstead(ures_getByKeyWithFallback(calData.getAlias(), cType, + nullptr, &status)); + dateTimePatterns.adoptInstead(ures_getByKeyWithFallback(specificCalBundle.getAlias(), DT_DateTimePatternsTag, // the standard variant, 13 entries + nullptr, &status)); + } + if (dateTimePatterns.isNull() || status == U_MISSING_RESOURCE_ERROR) { + status = U_ZERO_ERROR; + specificCalBundle.adoptInstead(ures_getByKeyWithFallback(calData.getAlias(), DT_DateTimeGregorianTag, + nullptr, &status)); + dateTimePatterns.adoptInstead(ures_getByKeyWithFallback(specificCalBundle.getAlias(), DT_DateTimePatternsTag, // the standard variant, 13 entries + nullptr, &status)); + } + if (U_SUCCESS(status) && (ures_getSize(dateTimePatterns.getAlias()) <= DateFormat::kDateTimeOffset + DateFormat::kShort)) { + status = U_INVALID_FORMAT_ERROR; + } + } + if (U_FAILURE(status)) { return; } for (int32_t style = UDAT_FULL; style <= UDAT_SHORT; style++) { - resStr = ures_getStringByIndex(dateTimePatterns.getAlias(), (int32_t)DateFormat::kDateTimeOffset + style, &resStrLen, &status); + resStr = ures_getStringByIndex(dateTimePatterns.getAlias(), dateTimeOffset + style, &resStrLen, &status); setDateTimeFormat((UDateFormatStyle)style, UnicodeString(TRUE, resStr, resStrLen), status); } } diff --git a/icu4c/source/i18n/measunit.cpp b/icu4c/source/i18n/measunit.cpp index 5ad3991974d5..e1e3003807f3 100644 --- a/icu4c/source/i18n/measunit.cpp +++ b/icu4c/source/i18n/measunit.cpp @@ -43,24 +43,24 @@ static const int32_t gOffsets[] = { 17, 27, 31, - 330, - 341, - 357, - 361, - 370, + 332, + 343, + 360, + 364, 373, - 377, - 385, - 407, - 411, - 426, - 427, - 433, - 443, - 447, - 451, - 453, - 487 + 376, + 380, + 388, + 410, + 414, + 429, + 430, + 436, + 446, + 450, + 454, + 456, + 490 }; static const int32_t kCurrencyOffset = 5; @@ -345,6 +345,7 @@ static const char * const gSubTypes[] = { "SHP", "SIT", "SKK", + "SLE", "SLL", "SOS", "SRD", @@ -384,6 +385,7 @@ static const char * const gSubTypes[] = { "UYW", "UZS", "VEB", + "VED", "VEF", "VES", "VNC", @@ -446,6 +448,7 @@ static const char * const gSubTypes[] = { "month", "month-person", "nanosecond", + "quarter", "second", "week", "week-person", @@ -1011,46 +1014,54 @@ MeasureUnit MeasureUnit::getNanosecond() { return MeasureUnit(7, 10); } -MeasureUnit *MeasureUnit::createSecond(UErrorCode &status) { +MeasureUnit *MeasureUnit::createQuarter(UErrorCode &status) { return MeasureUnit::create(7, 11, status); } -MeasureUnit MeasureUnit::getSecond() { +MeasureUnit MeasureUnit::getQuarter() { return MeasureUnit(7, 11); } -MeasureUnit *MeasureUnit::createWeek(UErrorCode &status) { +MeasureUnit *MeasureUnit::createSecond(UErrorCode &status) { return MeasureUnit::create(7, 12, status); } -MeasureUnit MeasureUnit::getWeek() { +MeasureUnit MeasureUnit::getSecond() { return MeasureUnit(7, 12); } -MeasureUnit *MeasureUnit::createWeekPerson(UErrorCode &status) { +MeasureUnit *MeasureUnit::createWeek(UErrorCode &status) { return MeasureUnit::create(7, 13, status); } -MeasureUnit MeasureUnit::getWeekPerson() { +MeasureUnit MeasureUnit::getWeek() { return MeasureUnit(7, 13); } -MeasureUnit *MeasureUnit::createYear(UErrorCode &status) { +MeasureUnit *MeasureUnit::createWeekPerson(UErrorCode &status) { return MeasureUnit::create(7, 14, status); } -MeasureUnit MeasureUnit::getYear() { +MeasureUnit MeasureUnit::getWeekPerson() { return MeasureUnit(7, 14); } -MeasureUnit *MeasureUnit::createYearPerson(UErrorCode &status) { +MeasureUnit *MeasureUnit::createYear(UErrorCode &status) { return MeasureUnit::create(7, 15, status); } -MeasureUnit MeasureUnit::getYearPerson() { +MeasureUnit MeasureUnit::getYear() { return MeasureUnit(7, 15); } +MeasureUnit *MeasureUnit::createYearPerson(UErrorCode &status) { + return MeasureUnit::create(7, 16, status); +} + +MeasureUnit MeasureUnit::getYearPerson() { + return MeasureUnit(7, 16); +} + MeasureUnit *MeasureUnit::createAmpere(UErrorCode &status) { return MeasureUnit::create(8, 0, status); } diff --git a/icu4c/source/i18n/reldatefmt.cpp b/icu4c/source/i18n/reldatefmt.cpp index 6ef516079862..d8df4c88284d 100644 --- a/icu4c/source/i18n/reldatefmt.cpp +++ b/icu4c/source/i18n/reldatefmt.cpp @@ -16,6 +16,8 @@ #include #include +#include "unicode/calendar.h" +#include "unicode/datefmt.h" #include "unicode/dtfmtsym.h" #include "unicode/ucasemap.h" #include "unicode/ureldatefmt.h" @@ -184,22 +186,6 @@ const UnicodeString& RelativeDateTimeCacheData::getAbsoluteUnitString( return nullptr; // No formatter found. } -static UBool getStringWithFallback( - const UResourceBundle *resource, - const char *key, - UnicodeString &result, - UErrorCode &status) { - int32_t len = 0; - const UChar *resStr = ures_getStringByKeyWithFallback( - resource, key, &len, &status); - if (U_FAILURE(status)) { - return FALSE; - } - result.setTo(TRUE, resStr, len); - return TRUE; -} - - static UBool getStringByIndex( const UResourceBundle *resource, int32_t idx, @@ -661,36 +647,58 @@ static UBool loadUnitData( return U_SUCCESS(status); } +static const int32_t cTypeBufMax = 32; + static UBool getDateTimePattern( + Locale locale, const UResourceBundle *resource, UnicodeString &result, UErrorCode &status) { - UnicodeString defaultCalendarName; - if (!getStringWithFallback( - resource, - "calendar/default", - defaultCalendarName, - status)) { + if (U_FAILURE(status)) { return FALSE; } + char cType[cTypeBufMax + 1]; + Calendar::getCalendarTypeFromLocale(locale, cType, cTypeBufMax, status); + cType[cTypeBufMax] = 0; + if (U_FAILURE(status) || cType[0] == 0) { + status = U_ZERO_ERROR; + uprv_strcpy(cType, "gregorian"); + } + + LocalUResourceBundlePointer topLevel; + int32_t dateTimeFormatOffset = DateFormat::kMedium; CharString pathBuffer; + // Currently, for compatibility with pre-CLDR-42 data, we default to the "atTime" + // combining patterns. Depending on guidance in CLDR 42 spec and on DisplayOptions, + // we may change this. pathBuffer.append("calendar/", status) - .appendInvariantChars(defaultCalendarName, status) - .append("/DateTimePatterns", status); - LocalUResourceBundlePointer topLevel( + .append(cType, status) + .append("/DateTimePatterns%atTime", status); + topLevel.adoptInstead( ures_getByKeyWithFallback( resource, pathBuffer.data(), nullptr, &status)); + if (U_FAILURE(status) || ures_getSize(topLevel.getAlias()) < 4) { + // Fall back to standard combining patterns + status = U_ZERO_ERROR; + dateTimeFormatOffset = DateFormat::kDateTime; + pathBuffer.clear(); + pathBuffer.append("calendar/", status) + .append(cType, status) + .append("/DateTimePatterns", status); + topLevel.adoptInstead( + ures_getByKeyWithFallback( + resource, pathBuffer.data(), nullptr, &status)); + } if (U_FAILURE(status)) { return FALSE; } - int32_t size = ures_getSize(topLevel.getAlias()); - if (size <= 8) { + if (dateTimeFormatOffset == DateFormat::kDateTime && ures_getSize(topLevel.getAlias()) <= DateFormat::kDateTime) { // Oops, size is too small to access the index that we want, fallback // to a hard-coded value. result = UNICODE_STRING_SIMPLE("{1} {0}"); return TRUE; } - return getStringByIndex(topLevel.getAlias(), 8, result, status); + return getStringByIndex(topLevel.getAlias(), dateTimeFormatOffset, result, status); } template<> U_I18N_API @@ -714,7 +722,7 @@ const RelativeDateTimeCacheData *LocaleCacheKey::crea return nullptr; } UnicodeString dateTimePattern; - if (!getDateTimePattern(topLevel.getAlias(), dateTimePattern, status)) { + if (!getDateTimePattern(fLoc, topLevel.getAlias(), dateTimePattern, status)) { return nullptr; } result->adoptCombinedDateAndTime( diff --git a/icu4c/source/i18n/smpdtfmt.cpp b/icu4c/source/i18n/smpdtfmt.cpp index c1e943a0949d..2d5a560b101a 100644 --- a/icu4c/source/i18n/smpdtfmt.cpp +++ b/icu4c/source/i18n/smpdtfmt.cpp @@ -161,8 +161,8 @@ static const int8_t kTimeFieldsCount = 10; // of a resource. static const UChar gDefaultPattern[] = { - 0x79, 0x79, 0x79, 0x79, 0x4D, 0x4D, 0x64, 0x64, 0x20, 0x68, 0x68, 0x3A, 0x6D, 0x6D, 0x20, 0x61, 0 -}; /* "yyyyMMdd hh:mm a" */ + 0x79, 0x4D, 0x4D, 0x64, 0x64, 0x20, 0x68, 0x68, 0x3A, 0x6D, 0x6D, 0x20, 0x61, 0 +}; /* "yMMdd hh:mm a" */ // This prefix is designed to NEVER MATCH real text, in order to // suppress the parsing of negative numbers. Adjust as needed (if @@ -842,14 +842,37 @@ void SimpleDateFormat::construct(EStyle timeStyle, UnicodeString tempus2(TRUE, resStr, resStrLen); - int32_t glueIndex = kDateTime; - int32_t patternsSize = ures_getSize(dateTimePatterns.getAlias()); - if (patternsSize >= (kDateTimeOffset + kShort + 1)) { - // Get proper date time format - glueIndex = (int32_t)(kDateTimeOffset + (dateStyle - kDateOffset)); + // Currently, for compatibility with pre-CLDR-42 data, we default to the "atTime" + // combining patterns. Depending on guidance in CLDR 42 spec and on DisplayOptions, + // we may change this. + LocalUResourceBundlePointer dateAtTimePatterns; + if (!cTypeIsGregorian) { + CharString resourcePath("calendar/", status); + resourcePath.append(cType, status).append("/DateTimePatterns%atTime", status); + dateAtTimePatterns.adoptInstead( + ures_getByKeyWithFallback(bundle.getAlias(), resourcePath.data(), + nullptr, &status)); + } + if (cTypeIsGregorian || status == U_MISSING_RESOURCE_ERROR) { + status = U_ZERO_ERROR; + dateAtTimePatterns.adoptInstead( + ures_getByKeyWithFallback(bundle.getAlias(), + "calendar/gregorian/DateTimePatterns%atTime", + nullptr, &status)); } + if (U_SUCCESS(status) && ures_getSize(dateAtTimePatterns.getAlias()) >= 4) { + resStr = ures_getStringByIndex(dateAtTimePatterns.getAlias(), dateStyle - kDateOffset, &resStrLen, &status); + } else { + status = U_ZERO_ERROR; + int32_t glueIndex = kDateTime; + int32_t patternsSize = ures_getSize(dateTimePatterns.getAlias()); + if (patternsSize >= (kDateTimeOffset + kShort + 1)) { + // Get proper date time format + glueIndex = (int32_t)(kDateTimeOffset + (dateStyle - kDateOffset)); + } - resStr = ures_getStringByIndex(dateTimePatterns.getAlias(), glueIndex, &resStrLen, &status); + resStr = ures_getStringByIndex(dateTimePatterns.getAlias(), glueIndex, &resStrLen, &status); + } SimpleFormatter(UnicodeString(TRUE, resStr, resStrLen), 2, 2, status). format(tempus1, tempus2, fPattern, status); } diff --git a/icu4c/source/i18n/unicode/measunit.h b/icu4c/source/i18n/unicode/measunit.h index b7e8e1676a41..55717020f8e2 100644 --- a/icu4c/source/i18n/unicode/measunit.h +++ b/icu4c/source/i18n/unicode/measunit.h @@ -950,23 +950,21 @@ class U_I18N_API MeasureUnit: public UObject { */ static MeasureUnit getSquareYard(); -#ifndef U_HIDE_DRAFT_API /** * Returns by pointer, unit of concentr: item. * Caller owns returned value and must free it. * Also see {@link #getItem()}. * @param status ICU error code. - * @draft ICU 70 + * @stable ICU 70 */ static MeasureUnit *createItem(UErrorCode &status); /** * Returns by value, unit of concentr: item. * Also see {@link #createItem()}. - * @draft ICU 70 + * @stable ICU 70 */ static MeasureUnit getItem(); -#endif /* U_HIDE_DRAFT_API */ /** * Returns by pointer, unit of concentr: karat. @@ -1528,6 +1526,24 @@ class U_I18N_API MeasureUnit: public UObject { */ static MeasureUnit getNanosecond(); +#ifndef U_HIDE_DRAFT_API + /** + * Returns by pointer, unit of duration: quarter. + * Caller owns returned value and must free it. + * Also see {@link #getQuarter()}. + * @param status ICU error code. + * @draft ICU 72 + */ + static MeasureUnit *createQuarter(UErrorCode &status); + + /** + * Returns by value, unit of duration: quarter. + * Also see {@link #createQuarter()}. + * @draft ICU 72 + */ + static MeasureUnit getQuarter(); +#endif /* U_HIDE_DRAFT_API */ + /** * Returns by pointer, unit of duration: second. * Caller owns returned value and must free it. @@ -1816,23 +1832,21 @@ class U_I18N_API MeasureUnit: public UObject { */ static MeasureUnit getThermUs(); -#ifndef U_HIDE_DRAFT_API /** * Returns by pointer, unit of force: kilowatt-hour-per-100-kilometer. * Caller owns returned value and must free it. * Also see {@link #getKilowattHourPer100Kilometer()}. * @param status ICU error code. - * @draft ICU 70 + * @stable ICU 70 */ static MeasureUnit *createKilowattHourPer100Kilometer(UErrorCode &status); /** * Returns by value, unit of force: kilowatt-hour-per-100-kilometer. * Also see {@link #createKilowattHourPer100Kilometer()}. - * @draft ICU 70 + * @stable ICU 70 */ static MeasureUnit getKilowattHourPer100Kilometer(); -#endif /* U_HIDE_DRAFT_API */ /** * Returns by pointer, unit of force: newton. diff --git a/icu4c/source/test/cintltst/ccaltst.c b/icu4c/source/test/cintltst/ccaltst.c index b30db4cce305..6f62fd89deb8 100644 --- a/icu4c/source/test/cintltst/ccaltst.c +++ b/icu4c/source/test/cintltst/ccaltst.c @@ -714,7 +714,7 @@ static void TestGetSetDateAPI() /*Testing if setDate works fine */ log_verbose("\nTesting the ucal_setDate() function \n"); - u_uastrcpy(temp, "Dec 17, 1971, 11:05:28 PM"); + u_strcpy(temp, u"Dec 17, 1971, 11:05:28\u202FPM"); ucal_setDate(caldef,1971, UCAL_DECEMBER, 17, &status); if(U_FAILURE(status)){ log_err("error in setting the calendar date : %s\n", u_errorName(status)); @@ -745,7 +745,7 @@ static void TestGetSetDateAPI() /*Testing if setDateTime works fine */ log_verbose("\nTesting the ucal_setDateTime() function \n"); - u_uastrcpy(temp, "May 3, 1972, 4:30:42 PM"); + u_strcpy(temp, u"May 3, 1972, 4:30:42\u202FPM"); ucal_setDateTime(caldef,1972, UCAL_MAY, 3, 16, 30, 42, &status); if(U_FAILURE(status)){ log_err("error in setting the calendar date : %s\n", u_errorName(status)); diff --git a/icu4c/source/test/cintltst/cdateintervalformattest.c b/icu4c/source/test/cintltst/cdateintervalformattest.c index 8f157d2f5d49..07817a91ea78 100644 --- a/icu4c/source/test/cintltst/cdateintervalformattest.c +++ b/icu4c/source/test/cintltst/cdateintervalformattest.c @@ -53,7 +53,7 @@ typedef struct { const char * tzid; const UDate from; const UDate to; - const char * resultExpected; + const UChar * resultExpected; } DateIntervalFormatTestItem; #define CAP_NONE UDISPCTX_CAPITALIZATION_NONE @@ -63,28 +63,28 @@ typedef struct { /* Just a small set of tests for now, the real functionality is tested in the C++ tests */ static const DateIntervalFormatTestItem testItems[] = { - { "en", "MMMdHHmm", CAP_NONE, tzUSPacific, Date201103021030, Date201103021030 + 7.0*_HOUR, "Mar 2, 10:30 \\u2013 17:30" }, - { "en", "MMMdHHmm", CAP_NONE, tzAsiaTokyo, Date201103021030, Date201103021030 + 7.0*_HOUR, "Mar 3, 03:30 \\u2013 10:30" }, - { "en", "yMMMEd", CAP_NONE, tzUSPacific, Date201009270800, Date201009270800 + 12.0*_HOUR, "Mon, Sep 27, 2010" }, - { "en", "yMMMEd", CAP_NONE, tzUSPacific, Date201009270800, Date201009270800 + 31.0*_DAY, "Mon, Sep 27 \\u2013 Thu, Oct 28, 2010" }, - { "en", "yMMMEd", CAP_NONE, tzUSPacific, Date201009270800, Date201009270800 + 410.0*_DAY, "Mon, Sep 27, 2010 \\u2013 Fri, Nov 11, 2011" }, - { "de", "Hm", CAP_NONE, tzUSPacific, Date201009270800, Date201009270800 + 12.0*_HOUR, "08:00\\u201320:00 Uhr" }, - { "de", "Hm", CAP_NONE, tzUSPacific, Date201009270800, Date201009270800 + 31.0*_DAY, "27.9.2010, 08:00 \\u2013 28.10.2010, 08:00" }, - { "ja", "MMMd", CAP_NONE, tzUSPacific, Date201009270800, Date201009270800 + 1.0*_DAY, "9\\u670827\\u65E5\\uFF5E28\\u65E5" }, - { "cs", "MMMEd", CAP_NONE, tzUSPacific, Date201009270800, Date201009270800 + 60.0*_DAY, "po 27. 9. \\u2013 p\\u00E1 26. 11." }, - { "cs", "yMMMM", CAP_NONE, tzUSPacific, Date201009270800, Date201009270800 + 60.0*_DAY, "z\\u00E1\\u0159\\u00ED\\u2013listopad 2010" }, - { "cs", "yMMMM", CAP_NONE, tzUSPacific, Date201009270800, Date201009270800 + 1.0*_DAY, "z\\u00E1\\u0159\\u00ED 2010" }, + { "en", "MMMdHHmm", CAP_NONE, tzUSPacific, Date201103021030, Date201103021030 + 7.0*_HOUR, u"Mar 2, 10:30\u2009\u2013\u200917:30" }, + { "en", "MMMdHHmm", CAP_NONE, tzAsiaTokyo, Date201103021030, Date201103021030 + 7.0*_HOUR, u"Mar 3, 03:30\u2009\u2013\u200910:30" }, + { "en", "yMMMEd", CAP_NONE, tzUSPacific, Date201009270800, Date201009270800 + 12.0*_HOUR, u"Mon, Sep 27, 2010" }, + { "en", "yMMMEd", CAP_NONE, tzUSPacific, Date201009270800, Date201009270800 + 31.0*_DAY, u"Mon, Sep 27\u2009\u2013\u2009Thu, Oct 28, 2010" }, + { "en", "yMMMEd", CAP_NONE, tzUSPacific, Date201009270800, Date201009270800 + 410.0*_DAY, u"Mon, Sep 27, 2010\u2009\u2013\u2009Fri, Nov 11, 2011" }, + { "de", "Hm", CAP_NONE, tzUSPacific, Date201009270800, Date201009270800 + 12.0*_HOUR, u"08:00\u201320:00 Uhr" }, + { "de", "Hm", CAP_NONE, tzUSPacific, Date201009270800, Date201009270800 + 31.0*_DAY, u"27.9.2010, 08:00 \u2013 28.10.2010, 08:00" }, + { "ja", "MMMd", CAP_NONE, tzUSPacific, Date201009270800, Date201009270800 + 1.0*_DAY, u"9月27日～28日" }, + { "cs", "MMMEd", CAP_NONE, tzUSPacific, Date201009270800, Date201009270800 + 60.0*_DAY, u"po 27. 9. \u2013 pá 26. 11." }, + { "cs", "yMMMM", CAP_NONE, tzUSPacific, Date201009270800, Date201009270800 + 60.0*_DAY, u"září\u2013listopad 2010" }, + { "cs", "yMMMM", CAP_NONE, tzUSPacific, Date201009270800, Date201009270800 + 1.0*_DAY, u"září 2010" }, #if !UCONFIG_NO_BREAK_ITERATION - { "cs", "MMMEd", CAP_BEGIN, tzUSPacific, Date201009270800, Date201009270800 + 60.0*_DAY, "Po 27. 9. \\u2013 p\\u00E1 26. 11." }, - { "cs", "yMMMM", CAP_BEGIN, tzUSPacific, Date201009270800, Date201009270800 + 60.0*_DAY, "Z\\u00E1\\u0159\\u00ED\\u2013listopad 2010" }, - { "cs", "yMMMM", CAP_BEGIN, tzUSPacific, Date201009270800, Date201009270800 + 1.0*_DAY, "Z\\u00E1\\u0159\\u00ED 2010" }, - { "cs", "MMMEd", CAP_LIST, tzUSPacific, Date201009270800, Date201009270800 + 60.0*_DAY, "Po 27. 9. \\u2013 p\\u00E1 26. 11." }, - { "cs", "yMMMM", CAP_LIST, tzUSPacific, Date201009270800, Date201009270800 + 60.0*_DAY, "Z\\u00E1\\u0159\\u00ED\\u2013listopad 2010" }, - { "cs", "yMMMM", CAP_LIST, tzUSPacific, Date201009270800, Date201009270800 + 1.0*_DAY, "Z\\u00E1\\u0159\\u00ED 2010" }, - { "cs", "MMMEd", CAP_ALONE, tzUSPacific, Date201009270800, Date201009270800 + 60.0*_DAY, "po 27. 9. \\u2013 p\\u00E1 26. 11." }, + { "cs", "MMMEd", CAP_BEGIN, tzUSPacific, Date201009270800, Date201009270800 + 60.0*_DAY, u"Po 27. 9. \u2013 pá 26. 11." }, + { "cs", "yMMMM", CAP_BEGIN, tzUSPacific, Date201009270800, Date201009270800 + 60.0*_DAY, u"Září\u2013listopad 2010" }, + { "cs", "yMMMM", CAP_BEGIN, tzUSPacific, Date201009270800, Date201009270800 + 1.0*_DAY, u"Září 2010" }, + { "cs", "MMMEd", CAP_LIST, tzUSPacific, Date201009270800, Date201009270800 + 60.0*_DAY, u"Po 27. 9. \u2013 pá 26. 11." }, + { "cs", "yMMMM", CAP_LIST, tzUSPacific, Date201009270800, Date201009270800 + 60.0*_DAY, u"Září\u2013listopad 2010" }, + { "cs", "yMMMM", CAP_LIST, tzUSPacific, Date201009270800, Date201009270800 + 1.0*_DAY, u"Září 2010" }, + { "cs", "MMMEd", CAP_ALONE, tzUSPacific, Date201009270800, Date201009270800 + 60.0*_DAY, u"po 27. 9. \u2013 pá 26. 11." }, #endif - { "cs", "yMMMM", CAP_ALONE, tzUSPacific, Date201009270800, Date201009270800 + 60.0*_DAY, "z\\u00E1\\u0159\\u00ED\\u2013listopad 2010" }, - { "cs", "yMMMM", CAP_ALONE, tzUSPacific, Date201009270800, Date201009270800 + 1.0*_DAY, "z\\u00E1\\u0159\\u00ED 2010" }, + { "cs", "yMMMM", CAP_ALONE, tzUSPacific, Date201009270800, Date201009270800 + 60.0*_DAY, u"září\u2013listopad 2010" }, + { "cs", "yMMMM", CAP_ALONE, tzUSPacific, Date201009270800, Date201009270800 + 1.0*_DAY, u"září 2010" }, { NULL, NULL, CAP_NONE, NULL, 0, 0, NULL } }; @@ -118,7 +118,6 @@ static void TestDateIntervalFormat() udtitvfmt = udtitvfmt_open(testItemPtr->locale, skelBuf, -1, tzidBuf, tzidLen, &status); if ( U_SUCCESS(status) ) { UChar result[kFormatBufLen]; - UChar resultExpected[kFormatBufLen]; udtitvfmt_setContext(udtitvfmt, testItemPtr->context, &status); if ( U_FAILURE(status) ) { @@ -140,12 +139,12 @@ static void TestDateIntervalFormat() result[kFormatBufLen-1] = 0; } if ( U_SUCCESS(status) ) { - u_unescape(testItemPtr->resultExpected, resultExpected, kFormatBufLen); - if ( u_strcmp(result, resultExpected) != 0 ) { - char bcharBuf[kFormatBufLen]; + if ( u_strcmp(result, testItemPtr->resultExpected) != 0 ) { + char bcharBufExp[kFormatBufLen]; + char bcharBufGet[kFormatBufLen]; log_err("ERROR: udtitvfmt_format for locale %s, skeleton %s, tzid %s, from %.1f, to %.1f: expect %s, get %s\n", testItemPtr->locale, testItemPtr->skeleton, tzidForLog, testItemPtr->from, testItemPtr->to, - testItemPtr->resultExpected, u_austrcpy(bcharBuf,result) ); + u_austrcpy(bcharBufExp,testItemPtr->resultExpected), u_austrcpy(bcharBufGet,result) ); } } else { log_err("FAIL: udtitvfmt_format for locale %s, skeleton %s, tzid %s, from %.1f, to %.1f: %s\n", @@ -192,9 +191,9 @@ static const ExpectPosAndFormat exp_en_HHmm[kNumDeltas] = { { 3, 5, "09:00" }, { 3, 5, "09:00" }, { 3, 5, "09:00" }, - { 3, 5, "09:00 \\u2013 09:20" }, - { 3, 5, "09:00 \\u2013 11:00" }, - { 3, 5, "09:00 \\u2013 21:00" }, + { 3, 5, "09:00\\u2009\\u2013\\u200909:20" }, + { 3, 5, "09:00\\u2009\\u2013\\u200911:00" }, + { 3, 5, "09:00\\u2009\\u2013\\u200921:00" }, { 15, 17, "11/20/2014, 09:00 \\u2013 11/28/2014, 09:00" }, { 15, 17, "11/20/2014, 09:00 \\u2013 12/6/2014, 09:00" }, { 15, 17, "11/20/2014, 09:00 \\u2013 2/28/2015, 09:00" } @@ -219,18 +218,18 @@ static const ExpectPosAndFormat exp_en_yyMMdd[kNumDeltas] = { { 0, 0, "11/20/14" }, { 0, 0, "11/20/14" }, { 0, 0, "11/20/14" }, - { 0, 0, "11/20/14 \\u2013 11/28/14" }, - { 0, 0, "11/20/14 \\u2013 12/6/14" }, - { 0, 0, "11/20/14 \\u2013 2/28/15" } + { 0, 0, "11/20/14\\u2009\\u2013\\u200911/28/14" }, + { 0, 0, "11/20/14\\u2009\\u2013\\u200912/6/14" }, + { 0, 0, "11/20/14\\u2009\\u2013\\u20092/28/15" } }; static const ExpectPosAndFormat exp_en_yyMMddHHmm[kNumDeltas] = { { 13, 15, "11/20/14, 09:00" }, { 13, 15, "11/20/14, 09:00" }, { 13, 15, "11/20/14, 09:00" }, - { 13, 15, "11/20/14, 09:00 \\u2013 09:20" }, - { 13, 15, "11/20/14, 09:00 \\u2013 11:00" }, - { 13, 15, "11/20/14, 09:00 \\u2013 21:00" }, + { 13, 15, "11/20/14, 09:00\\u2009\\u2013\\u200909:20" }, + { 13, 15, "11/20/14, 09:00\\u2009\\u2013\\u200911:00" }, + { 13, 15, "11/20/14, 09:00\\u2009\\u2013\\u200921:00" }, { 13, 15, "11/20/14, 09:00 \\u2013 11/28/14, 09:00" }, { 13, 15, "11/20/14, 09:00 \\u2013 12/06/14, 09:00" }, { 13, 15, "11/20/14, 09:00 \\u2013 02/28/15, 09:00" } @@ -249,15 +248,15 @@ static const ExpectPosAndFormat exp_en_yyMMddHHmmss[kNumDeltas] = { }; static const ExpectPosAndFormat exp_en_yMMMdhmmssz[kNumDeltas] = { - { 16, 18, "Nov 20, 2014, 9:00:00 AM GMT" }, - { 16, 18, "Nov 20, 2014, 9:00:00 AM GMT" }, - { 16, 18, "Nov 20, 2014, 9:00:00 AM GMT \\u2013 9:00:20 AM GMT" }, - { 16, 18, "Nov 20, 2014, 9:00:00 AM GMT \\u2013 9:20:00 AM GMT" }, - { 16, 18, "Nov 20, 2014, 9:00:00 AM GMT \\u2013 11:00:00 AM GMT" }, - { 16, 18, "Nov 20, 2014, 9:00:00 AM GMT \\u2013 9:00:00 PM GMT" }, - { 16, 18, "Nov 20, 2014, 9:00:00 AM GMT \\u2013 Nov 28, 2014, 9:00:00 AM GMT" }, - { 16, 18, "Nov 20, 2014, 9:00:00 AM GMT \\u2013 Dec 6, 2014, 9:00:00 AM GMT" }, - { 16, 18, "Nov 20, 2014, 9:00:00 AM GMT \\u2013 Feb 28, 2015, 9:00:00 AM GMT" } + { 16, 18, "Nov 20, 2014, 9:00:00\\u202FAM GMT" }, + { 16, 18, "Nov 20, 2014, 9:00:00\\u202FAM GMT" }, + { 16, 18, "Nov 20, 2014, 9:00:00\\u202FAM GMT \\u2013 9:00:20\\u202FAM GMT" }, + { 16, 18, "Nov 20, 2014, 9:00:00\\u202FAM GMT \\u2013 9:20:00\\u202FAM GMT" }, + { 16, 18, "Nov 20, 2014, 9:00:00\\u202FAM GMT \\u2013 11:00:00\\u202FAM GMT" }, + { 16, 18, "Nov 20, 2014, 9:00:00\\u202FAM GMT \\u2013 9:00:00\\u202FPM GMT" }, + { 16, 18, "Nov 20, 2014, 9:00:00\\u202FAM GMT \\u2013 Nov 28, 2014, 9:00:00\\u202FAM GMT" }, + { 16, 18, "Nov 20, 2014, 9:00:00\\u202FAM GMT \\u2013 Dec 6, 2014, 9:00:00\\u202FAM GMT" }, + { 16, 18, "Nov 20, 2014, 9:00:00\\u202FAM GMT \\u2013 Feb 28, 2015, 9:00:00\\u202FAM GMT" } }; static const ExpectPosAndFormat exp_ja_yyMMddHHmm[kNumDeltas] = { diff --git a/icu4c/source/test/cintltst/cdattst.c b/icu4c/source/test/cintltst/cdattst.c index 2c5d51c64b24..72182fd420a4 100644 --- a/icu4c/source/test/cintltst/cdattst.c +++ b/icu4c/source/test/cintltst/cdattst.c @@ -167,7 +167,7 @@ static void TestDateFormat() /*Testing udat_format()*/ log_verbose("\nTesting the udat_format() function of date format\n"); - u_uastrcpy(temp, "7/10/96, 4:05 PM"); + u_strcpy(temp, u"7/10/96, 4:05\u202FPM"); /*format using def */ resultlength=0; resultlengthneeded=udat_format(def, d, NULL, resultlength, NULL, &status); @@ -236,7 +236,7 @@ static void TestDateFormat() /*Testing parsing using udat_parse()*/ log_verbose("\nTesting parsing using udat_parse()\n"); - u_uastrcpy(temp,"2/3/76, 2:50 AM"); + u_strcpy(temp, u"2/3/76, 2:50\u202FAM"); parsepos=0; status=U_ZERO_ERROR; @@ -943,10 +943,10 @@ static void TestDateFormatCalendar() { u_errorName(ec)); goto FAIL; } - expected = "5:45 PM"; - u_uastrcpy(uExpected, expected); + u_strcpy(uExpected, u"5:45\u202FPM"); + u_austrcpy(cbuf, uExpected); if (u_strlen(uExpected) != len1 || u_strncmp(uExpected, buf1, len1) != 0) { - log_err("FAIL: udat_formatCalendar(17:45), expected: %s", expected); + log_err("FAIL: udat_formatCalendar(17:45), expected: %s", cbuf); } /* Check result */ diff --git a/icu4c/source/test/cintltst/cdtrgtst.c b/icu4c/source/test/cintltst/cdtrgtst.c index ab74880a330b..6713396b5dbe 100644 --- a/icu4c/source/test/cintltst/cdtrgtst.c +++ b/icu4c/source/test/cintltst/cdtrgtst.c @@ -474,11 +474,10 @@ void Test4162071() void Test714(void) { UDate d=978103543000.0; - UChar temp[20]; UErrorCode status = U_ZERO_ERROR; UDateFormat *fmt; UChar *result; - const char* expect = "7:25:43 AM"; + const UChar* expect = u"7:25:43\u202FAM"; ctest_setTimeZone(NULL, &status); @@ -494,12 +493,11 @@ void Test714(void) log_data_err("Fail: could not format - exiting test\n"); return; } - u_uastrcpy(temp, expect); - if (u_strcmp(result, temp)!=0){ - log_err("Fail: %s != %s\n", austrdup(result), expect); + if (u_strcmp(result, expect)!=0){ + log_err("Fail: %s != %s\n", austrdup(result), austrdup(expect)); } else{ - log_verbose("Ok: %s == %s\n", austrdup(result), expect ); + log_verbose("Ok: %s == %s\n", austrdup(result), austrdup(expect)); } udat_close(fmt); diff --git a/icu4c/source/test/cintltst/cmsgtst.c b/icu4c/source/test/cintltst/cmsgtst.c index 06952d834690..ff33fbfdb335 100644 --- a/icu4c/source/test/cintltst/cmsgtst.c +++ b/icu4c/source/test/cintltst/cmsgtst.c @@ -43,7 +43,7 @@ static const char* const txt_testResultStrings[] = { "Quotes ', {, a 1 {0}", "Quotes ', {, a 1 {0}", "You deposited 1 times an amount of $3,456.00 on 1/12/70", - "{2,time,full}, for 3,456, 1 is 5:46:40 AM Pacific Standard Time and full date is Monday, January 12, 1970", + "{2,time,full}, for 3,456, 1 is 5:46:40\\u202FAM Pacific Standard Time and full date is Monday, January 12, 1970", "{1,number,percent} for 1 is 345,600%" }; @@ -69,7 +69,7 @@ static void InitStrings( void ) for (i=0; i < cnt_testCases; i++ ) { uint32_t strSize = (uint32_t)strlen(txt_testResultStrings[i]) + 1; testResultStrings[i] = (UChar*)malloc(sizeof(UChar) * strSize); - u_uastrncpy(testResultStrings[i], txt_testResultStrings[i], strSize); + u_unescape(txt_testResultStrings[i], testResultStrings[i], strSize); } strings_initialized = TRUE; diff --git a/icu4c/source/test/cintltst/creststn.c b/icu4c/source/test/cintltst/creststn.c index c61f063a950d..5b69d9c59a84 100644 --- a/icu4c/source/test/cintltst/creststn.c +++ b/icu4c/source/test/cintltst/creststn.c @@ -2180,7 +2180,7 @@ static void TestFallback() UResourceBundle* myResB = ures_open(NULL,"no_NO_NY",&err); UResourceBundle* resLocID = ures_getByKey(myResB, "Version", NULL, &err); const UChar* version = NULL; - static const UChar versionStr[] = u"41"; // 41 in nn_NO or in a parent bundle/root + static const UChar versionStr[] = u"42"; // 42 in nn_NO or in a parent bundle/root if(U_FAILURE(err)) { log_data_err("Expected success when trying to test no_NO_NY aliased to nn_NO for Version " diff --git a/icu4c/source/test/cintltst/udatpg_test.c b/icu4c/source/test/cintltst/udatpg_test.c index 66cfb41d47f8..9a70ce1eae0b 100644 --- a/icu4c/source/test/cintltst/udatpg_test.c +++ b/icu4c/source/test/cintltst/udatpg_test.c @@ -393,16 +393,16 @@ typedef struct DTPtnGenOptionsData { } DTPtnGenOptionsData; enum { kTestOptionsPatLenMax = 32 }; -static const UChar skel_Hmm[] = { 0x0048, 0x006D, 0x006D, 0 }; -static const UChar skel_HHmm[] = { 0x0048, 0x0048, 0x006D, 0x006D, 0 }; -static const UChar skel_hhmm[] = { 0x0068, 0x0068, 0x006D, 0x006D, 0 }; -static const UChar patn_hcmm_a[] = { 0x0068, 0x003A, 0x006D, 0x006D, 0x0020, 0x0061, 0 }; /* h:mm a */ -static const UChar patn_HHcmm[] = { 0x0048, 0x0048, 0x003A, 0x006D, 0x006D, 0 }; /* HH:mm */ -static const UChar patn_hhcmm_a[] = { 0x0068, 0x0068, 0x003A, 0x006D, 0x006D, 0x0020, 0x0061, 0 }; /* hh:mm a */ -static const UChar patn_HHpmm[] = { 0x0048, 0x0048, 0x002E, 0x006D, 0x006D, 0 }; /* HH.mm */ -static const UChar patn_hpmm_a[] = { 0x0068, 0x002E, 0x006D, 0x006D, 0x0020, 0x0061, 0 }; /* h.mm a */ -static const UChar patn_Hpmm[] = { 0x0048, 0x002E, 0x006D, 0x006D, 0 }; /* H.mm */ -static const UChar patn_hhpmm_a[] = { 0x0068, 0x0068, 0x002E, 0x006D, 0x006D, 0x0020, 0x0061, 0 }; /* hh.mm a */ +static const UChar skel_Hmm[] = u"Hmm"; +static const UChar skel_HHmm[] = u"HHmm"; +static const UChar skel_hhmm[] = u"hhmm"; +static const UChar patn_hcmm_a[] = u"h:mm\u202Fa"; +static const UChar patn_HHcmm[] = u"HH:mm"; +static const UChar patn_hhcmm_a[] = u"hh:mm\u202Fa"; +static const UChar patn_HHpmm[] = u"HH.mm"; +static const UChar patn_hpmm_a[] = u"h.mm\u202Fa"; +static const UChar patn_Hpmm[] = u"H.mm"; +static const UChar patn_hhpmm_a[] = u"hh.mm\u202Fa"; static void TestOptions() { const DTPtnGenOptionsData testData[] = { @@ -637,10 +637,10 @@ static void TestDateTimePatterns(void) { // The following tests some locales in which there are differences between the // DateTimePatterns of various length styles. DTPLocaleAndResults localeAndResults[] = { - { "en", { u"EEEE, MMMM d, y 'at' h:mm a", // long != medium - u"MMMM d, y 'at' h:mm a", - u"MMM d, y, h:mm a", - u"M/d/y, h:mm a" } }, + { "en", { u"EEEE, MMMM d, y 'at' h:mm\u202Fa", // long != medium + u"MMMM d, y 'at' h:mm\u202Fa", + u"MMM d, y, h:mm\u202Fa", + u"M/d/y, h:mm\u202Fa" } }, { "fr", { u"EEEE d MMMM y 'à' HH:mm", // medium != short u"d MMMM y 'à' HH:mm", u"d MMM y, HH:mm", @@ -664,10 +664,10 @@ static void TestDateTimePatterns(void) { u"{1} _2_ {0}", u"{1} _3_ {0}" }; - DTPLocaleAndResults enModResults = { "en", { u"EEEE, MMMM d, y _0_ h:mm a", - u"MMMM d, y _1_ h:mm a", - u"MMM d, y _2_ h:mm a", - u"M/d/y _3_ h:mm a" } + DTPLocaleAndResults enModResults = { "en", { u"EEEE, MMMM d, y _0_ h:mm\u202Fa", + u"MMMM d, y _1_ h:mm\u202Fa", + u"MMM d, y _2_ h:mm\u202Fa", + u"M/d/y _3_ h:mm\u202Fa" } }; // Test various locales with standard data diff --git a/icu4c/source/test/intltest/dtfmrgts.cpp b/icu4c/source/test/intltest/dtfmrgts.cpp index b72f0df106de..fe3d1df7cd10 100644 --- a/icu4c/source/test/intltest/dtfmrgts.cpp +++ b/icu4c/source/test/intltest/dtfmrgts.cpp @@ -144,8 +144,8 @@ void DateFormatRegressionTest::Test4052408(void) str = fmt->format(dt, str); logln(str); - if(str != "5/3/97, 8:55 AM") - errln("Fail: Test broken; Want 5/3/97 8:55 AM Got " + str); + if(str != u"5/3/97, 8:55\u202FAM") + errln(UnicodeString(u"Fail: Test broken; Want 5/3/97, 8:55\u202FAM Got ", -1) + str); UnicodeString expected[] = { (UnicodeString) "", //"ERA_FIELD", @@ -1230,7 +1230,7 @@ void DateFormatRegressionTest::Test714(void) UnicodeString s; UnicodeString tests = - (UnicodeString) "7:25:43 AM" ; + (UnicodeString) u"7:25:43\u202FAM" ; UErrorCode status = U_ZERO_ERROR; fmt->format (d,s); if(U_FAILURE(status)) diff --git a/icu4c/source/test/intltest/dtfmttst.cpp b/icu4c/source/test/intltest/dtfmttst.cpp index ecc90e94ec0d..acd2ed814ec1 100644 --- a/icu4c/source/test/intltest/dtfmttst.cpp +++ b/icu4c/source/test/intltest/dtfmttst.cpp @@ -140,58 +140,58 @@ void DateFormatTest::TestPatterns() { const char *actualPattern; const char *expectedPattern; const char *localeID; - const char *expectedLocalPattern; + const UChar *expectedLocalPattern; } EXPECTED[] = { - {UDAT_YEAR, "y","en","y"}, - - {UDAT_QUARTER, "QQQQ", "en", "QQQQ"}, - {UDAT_ABBR_QUARTER, "QQQ", "en", "QQQ"}, - {UDAT_YEAR_QUARTER, "yQQQQ", "en", "QQQQ y"}, - {UDAT_YEAR_ABBR_QUARTER, "yQQQ", "en", "QQQ y"}, - - {UDAT_NUM_MONTH, "M", "en", "L"}, - {UDAT_ABBR_MONTH, "MMM", "en", "LLL"}, - {UDAT_MONTH, "MMMM", "en", "LLLL"}, - {UDAT_YEAR_NUM_MONTH, "yM","en","M/y"}, - {UDAT_YEAR_ABBR_MONTH, "yMMM","en","MMM y"}, - {UDAT_YEAR_MONTH, "yMMMM","en","MMMM y"}, - - {UDAT_DAY, "d","en","d"}, - {UDAT_YEAR_NUM_MONTH_DAY, "yMd", "en", "M/d/y"}, - {UDAT_YEAR_ABBR_MONTH_DAY, "yMMMd", "en", "MMM d, y"}, - {UDAT_YEAR_MONTH_DAY, "yMMMMd", "en", "MMMM d, y"}, - {UDAT_YEAR_NUM_MONTH_WEEKDAY_DAY, "yMEd", "en", "EEE, M/d/y"}, - {UDAT_YEAR_ABBR_MONTH_WEEKDAY_DAY, "yMMMEd", "en", "EEE, MMM d, y"}, - {UDAT_YEAR_MONTH_WEEKDAY_DAY, "yMMMMEEEEd", "en", "EEEE, MMMM d, y"}, - - {UDAT_NUM_MONTH_DAY, "Md","en","M/d"}, - {UDAT_ABBR_MONTH_DAY, "MMMd","en","MMM d"}, - {UDAT_MONTH_DAY, "MMMMd","en","MMMM d"}, - {UDAT_NUM_MONTH_WEEKDAY_DAY, "MEd","en","EEE, M/d"}, - {UDAT_ABBR_MONTH_WEEKDAY_DAY, "MMMEd","en","EEE, MMM d"}, - {UDAT_MONTH_WEEKDAY_DAY, "MMMMEEEEd","en","EEEE, MMMM d"}, - - {UDAT_HOUR, "j", "en", "h a"}, // (fixed expected result per ticket 6872<-6626) - {UDAT_HOUR24, "H", "en", "HH"}, // (fixed expected result per ticket 6872<-6626 - - {UDAT_MINUTE, "m", "en", "m"}, - {UDAT_HOUR_MINUTE, "jm","en","h:mm a"}, // (fixed expected result per ticket 6872<-7180) - {UDAT_HOUR24_MINUTE, "Hm", "en", "HH:mm"}, // (fixed expected result per ticket 6872<-6626) - - {UDAT_SECOND, "s", "en", "s"}, - {UDAT_HOUR_MINUTE_SECOND, "jms","en","h:mm:ss a"}, // (fixed expected result per ticket 6872<-7180) - {UDAT_HOUR24_MINUTE_SECOND, "Hms","en","HH:mm:ss"}, // (fixed expected result per ticket 6872<-6626) - {UDAT_MINUTE_SECOND, "ms", "en", "mm:ss"}, // (fixed expected result per ticket 6872<-6626) - - {UDAT_LOCATION_TZ, "VVVV", "en", "VVVV"}, - {UDAT_GENERIC_TZ, "vvvv", "en", "vvvv"}, - {UDAT_ABBR_GENERIC_TZ, "v", "en", "v"}, - {UDAT_SPECIFIC_TZ, "zzzz", "en", "zzzz"}, - {UDAT_ABBR_SPECIFIC_TZ, "z", "en", "z"}, - {UDAT_ABBR_UTC_TZ, "ZZZZ", "en", "ZZZZ"}, - - {UDAT_YEAR_NUM_MONTH_DAY UDAT_ABBR_UTC_TZ, "yMdZZZZ", "en", "M/d/y, ZZZZ"}, - {UDAT_MONTH_DAY UDAT_LOCATION_TZ, "MMMMdVVVV", "en", "MMMM d 'at' VVVV"} + {UDAT_YEAR, "y", "en",u"y"}, + + {UDAT_QUARTER, "QQQQ", "en", u"QQQQ"}, + {UDAT_ABBR_QUARTER, "QQQ", "en", u"QQQ"}, + {UDAT_YEAR_QUARTER, "yQQQQ", "en", u"QQQQ y"}, + {UDAT_YEAR_ABBR_QUARTER, "yQQQ", "en", u"QQQ y"}, + + {UDAT_NUM_MONTH, "M", "en", u"L"}, + {UDAT_ABBR_MONTH, "MMM", "en", u"LLL"}, + {UDAT_MONTH, "MMMM", "en", u"LLLL"}, + {UDAT_YEAR_NUM_MONTH, "yM","en",u"M/y"}, + {UDAT_YEAR_ABBR_MONTH, "yMMM","en",u"MMM y"}, + {UDAT_YEAR_MONTH, "yMMMM","en",u"MMMM y"}, + + {UDAT_DAY, "d","en",u"d"}, + {UDAT_YEAR_NUM_MONTH_DAY, "yMd", "en", u"M/d/y"}, + {UDAT_YEAR_ABBR_MONTH_DAY, "yMMMd", "en", u"MMM d, y"}, + {UDAT_YEAR_MONTH_DAY, "yMMMMd", "en", u"MMMM d, y"}, + {UDAT_YEAR_NUM_MONTH_WEEKDAY_DAY, "yMEd", "en", u"EEE, M/d/y"}, + {UDAT_YEAR_ABBR_MONTH_WEEKDAY_DAY, "yMMMEd", "en", u"EEE, MMM d, y"}, + {UDAT_YEAR_MONTH_WEEKDAY_DAY, "yMMMMEEEEd", "en", u"EEEE, MMMM d, y"}, + + {UDAT_NUM_MONTH_DAY, "Md","en",u"M/d"}, + {UDAT_ABBR_MONTH_DAY, "MMMd","en",u"MMM d"}, + {UDAT_MONTH_DAY, "MMMMd","en",u"MMMM d"}, + {UDAT_NUM_MONTH_WEEKDAY_DAY, "MEd","en",u"EEE, M/d"}, + {UDAT_ABBR_MONTH_WEEKDAY_DAY, "MMMEd","en",u"EEE, MMM d"}, + {UDAT_MONTH_WEEKDAY_DAY, "MMMMEEEEd","en",u"EEEE, MMMM d"}, + + {UDAT_HOUR, "j", "en", u"h\u202Fa"}, // (fixed expected result per ticket 6872<-6626) + {UDAT_HOUR24, "H", "en", u"HH"}, // (fixed expected result per ticket 6872<-6626 + + {UDAT_MINUTE, "m", "en", u"m"}, + {UDAT_HOUR_MINUTE, "jm","en",u"h:mm\u202Fa"}, // (fixed expected result per ticket 6872<-7180) + {UDAT_HOUR24_MINUTE, "Hm", "en", u"HH:mm"}, // (fixed expected result per ticket 6872<-6626) + + {UDAT_SECOND, "s", "en", u"s"}, + {UDAT_HOUR_MINUTE_SECOND, "jms","en",u"h:mm:ss\u202Fa"}, // (fixed expected result per ticket 6872<-7180) + {UDAT_HOUR24_MINUTE_SECOND, "Hms","en",u"HH:mm:ss"}, // (fixed expected result per ticket 6872<-6626) + {UDAT_MINUTE_SECOND, "ms", "en", u"mm:ss"}, // (fixed expected result per ticket 6872<-6626) + + {UDAT_LOCATION_TZ, "VVVV", "en", u"VVVV"}, + {UDAT_GENERIC_TZ, "vvvv", "en", u"vvvv"}, + {UDAT_ABBR_GENERIC_TZ, "v", "en", u"v"}, + {UDAT_SPECIFIC_TZ, "zzzz", "en", u"zzzz"}, + {UDAT_ABBR_SPECIFIC_TZ, "z", "en", u"z"}, + {UDAT_ABBR_UTC_TZ, "ZZZZ", "en", u"ZZZZ"}, + + {UDAT_YEAR_NUM_MONTH_DAY UDAT_ABBR_UTC_TZ, "yMdZZZZ", "en", u"M/d/y, ZZZZ"}, + {UDAT_MONTH_DAY UDAT_LOCATION_TZ, "MMMMdVVVV", "en", u"MMMM d 'at' VVVV"} }; IcuTestErrorCode errorCode(*this, "TestPatterns()"); @@ -228,7 +228,7 @@ void DateFormatTest::TestPatterns() { continue; } - UnicodeString expectedLocalPattern(EXPECTED[i].expectedLocalPattern, -1, US_INV); + UnicodeString expectedLocalPattern(EXPECTED[i].expectedLocalPattern, -1); UnicodeString actualLocalPattern1; UnicodeString actualLocalPattern2; date1.toLocalizedPattern(actualLocalPattern1, errorCode); @@ -988,12 +988,12 @@ DateFormatTest::TestBadInput135() "Mar 15", "Mar 15 1997", "asdf", "3/1/97 1:23:", "3/1/00 1:23:45 AM" }; int32_t strings_length = UPRV_LENGTHOF(strings); - DateFormat *full = DateFormat::createDateTimeInstance(DateFormat::LONG, DateFormat::LONG); - if(full==NULL) { + DateFormat *longFmt = DateFormat::createDateTimeInstance(DateFormat::LONG, DateFormat::MEDIUM, Locale::getEnglish()); + if(longFmt==NULL) { dataerrln("could not create date time instance"); return; } - UnicodeString expected("March 1, 2000 at 1:23:45 AM "); + UnicodeString expected(u"March 1, 2000 at 1:23:45\u202FAM", -1); for (int32_t i = 0; i < strings_length;++i) { const char* text = strings[i]; for (int32_t j = 0; j < looks_length;++j) { @@ -1020,7 +1020,7 @@ DateFormatTest::TestBadInput135() if (sdtfmt != NULL) { sdtfmt->toPattern(pattern); } - full->format(when, format); + longFmt->format(when, format); logln(prefix + "OK: " + format); if (0!=format.compareBetween(0, expected.length(), expected, 0, expected.length())) errln((UnicodeString)"FAIL: Parse \"" + text + "\", pattern \"" + pattern + "\", expected " + expected + " got " + format); @@ -1037,7 +1037,7 @@ DateFormatTest::TestBadInput135() } } } - delete full; + delete longFmt; if (U_FAILURE(status)) errln((UnicodeString)"FAIL: UErrorCode received during test: " + (int32_t)status); } @@ -1330,9 +1330,9 @@ DateFormatTest::TestLocaleDateFormat() // Bug 495 DateFormat::FULL, Locale::getFrench()); DateFormat *dfUS = DateFormat::createDateTimeInstance(DateFormat::FULL, DateFormat::FULL, Locale::getUS()); - UnicodeString expectedFRENCH ( "lundi 15 septembre 1997 \\u00E0 00:00:00 heure d\\u2019\\u00E9t\\u00E9 du Pacifique", -1, US_INV ); + UnicodeString expectedFRENCH ( u"lundi 15 septembre 1997 à 00:00:00 heure d’été du Pacifique", -1 ); expectedFRENCH = expectedFRENCH.unescape(); - UnicodeString expectedUS ( "Monday, September 15, 1997 at 12:00:00 AM Pacific Daylight Time" ); + UnicodeString expectedUS ( u"Monday, September 15, 1997 at 12:00:00\u202FAM Pacific Daylight Time", -1 ); logln((UnicodeString)"Date set to : " + dateToString(testDate)); UnicodeString out; if (dfUS == NULL || dfFrench == NULL){ @@ -1345,12 +1345,12 @@ DateFormatTest::TestLocaleDateFormat() // Bug 495 dfFrench->format(testDate, out); logln((UnicodeString)"Date Formatted with French Locale " + out); if (!(out == expectedFRENCH)) - errln((UnicodeString)"FAIL: Expected " + expectedFRENCH); + errln((UnicodeString)"FAIL: Expected " + expectedFRENCH + ", got " + out); out.truncate(0); dfUS->format(testDate, out); logln((UnicodeString)"Date Formatted with US Locale " + out); if (!(out == expectedUS)) - errln((UnicodeString)"FAIL: Expected " + expectedUS); + errln((UnicodeString)"FAIL: Expected " + expectedUS + ", got " + out); delete dfUS; delete dfFrench; } @@ -4998,43 +4998,43 @@ void DateFormatTest::TestPatternFromSkeleton() { static const struct { const Locale& locale; const char* const skeleton; - const char* const pattern; + const UChar* const pattern; } TESTDATA[] = { // Ticket #11985 - {Locale::getEnglish(), "jjmm", "h:mm a"}, - {Locale::getEnglish(), "JJmm", "hh:mm"}, - {Locale::getGerman(), "jjmm", "HH:mm"}, - {Locale::getGerman(), "JJmm", "HH:mm"}, + {Locale::getEnglish(), "jjmm", u"h:mm\u202Fa"}, + {Locale::getEnglish(), "JJmm", u"hh:mm"}, + {Locale::getGerman(), "jjmm", u"HH:mm"}, + {Locale::getGerman(), "JJmm", u"HH:mm"}, // Ticket #20739 // minutes+milliseconds, seconds missing, should be repaired - {Locale::getEnglish(), "SSSSm", "mm:ss.SSSS"}, - {Locale::getEnglish(), "mSSSS", "mm:ss.SSSS"}, - {Locale::getEnglish(), "SSSm", "mm:ss.SSS"}, - {Locale::getEnglish(), "mSSS", "mm:ss.SSS"}, - {Locale::getEnglish(), "SSm", "mm:ss.SS"}, - {Locale::getEnglish(), "mSS", "mm:ss.SS"}, - {Locale::getEnglish(), "Sm", "mm:ss.S"}, - {Locale::getEnglish(), "mS", "mm:ss.S"}, + {Locale::getEnglish(), "SSSSm", u"mm:ss.SSSS"}, + {Locale::getEnglish(), "mSSSS", u"mm:ss.SSSS"}, + {Locale::getEnglish(), "SSSm", u"mm:ss.SSS"}, + {Locale::getEnglish(), "mSSS", u"mm:ss.SSS"}, + {Locale::getEnglish(), "SSm", u"mm:ss.SS"}, + {Locale::getEnglish(), "mSS", u"mm:ss.SS"}, + {Locale::getEnglish(), "Sm", u"mm:ss.S"}, + {Locale::getEnglish(), "mS", u"mm:ss.S"}, // only milliseconds, untouched, no repairs - {Locale::getEnglish(), "S", "S"}, - {Locale::getEnglish(), "SS", "SS"}, - {Locale::getEnglish(), "SSS", "SSS"}, - {Locale::getEnglish(), "SSSS", "SSSS"}, + {Locale::getEnglish(), "S", u"S"}, + {Locale::getEnglish(), "SS", u"SS"}, + {Locale::getEnglish(), "SSS", u"SSS"}, + {Locale::getEnglish(), "SSSS", u"SSSS"}, // hour:minute+seconds+milliseconds, correct, no repairs, proper pattern - {Locale::getEnglish(), "jmsSSS", "h:mm:ss.SSS a"}, - {Locale::getEnglish(), "jmSSS", "h:mm:ss.SSS a"}, + {Locale::getEnglish(), "jmsSSS", u"h:mm:ss.SSS\u202Fa"}, + {Locale::getEnglish(), "jmSSS", u"h:mm:ss.SSS\u202Fa"}, // Ticket #20738 // seconds+milliseconds, correct, no repairs, proper pattern - {Locale::getEnglish(), "sS", "s.S"}, - {Locale::getEnglish(), "sSS", "s.SS"}, - {Locale::getEnglish(), "sSSS", "s.SSS"}, - {Locale::getEnglish(), "sSSSS", "s.SSSS"}, - {Locale::getEnglish(), "sS", "s.S"}, + {Locale::getEnglish(), "sS", u"s.S"}, + {Locale::getEnglish(), "sSS", u"s.SS"}, + {Locale::getEnglish(), "sSSS", u"s.SSS"}, + {Locale::getEnglish(), "sSSSS", u"s.SSSS"}, + {Locale::getEnglish(), "sS", u"s.S"}, // minutes+seconds+milliseconds, correct, no repairs, proper pattern - {Locale::getEnglish(), "msS", "mm:ss.S"}, - {Locale::getEnglish(), "msSS", "mm:ss.SS"}, - {Locale::getEnglish(), "msSSS", "mm:ss.SSS"}, - {Locale::getEnglish(), "msSSSS", "mm:ss.SSSS"} + {Locale::getEnglish(), "msS", u"mm:ss.S"}, + {Locale::getEnglish(), "msSS", u"mm:ss.SS"}, + {Locale::getEnglish(), "msSSS", u"mm:ss.SSS"}, + {Locale::getEnglish(), "msSSSS", u"mm:ss.SSSS"} }; for (size_t i = 0; i < UPRV_LENGTHOF(TESTDATA); i++) { diff --git a/icu4c/source/test/intltest/dtifmtts.cpp b/icu4c/source/test/intltest/dtifmtts.cpp index f2774433296a..54b7623eb0dd 100644 --- a/icu4c/source/test/intltest/dtifmtts.cpp +++ b/icu4c/source/test/intltest/dtifmtts.cpp @@ -345,8 +345,8 @@ void DateIntervalFormatTest::testAPI() { DateInterval * dtitv12 = new DateInterval(date1, date2); TimeZone * tzCalif = TimeZone::createTimeZone("US/Pacific"); TimeZone * tzTokyo = TimeZone::createTimeZone("Asia/Tokyo"); - UnicodeString fmtCalif = UnicodeString(ctou("Mar 2, 10:30 \\u2013 17:30")); - UnicodeString fmtTokyo = UnicodeString(ctou("Mar 3, 03:30 \\u2013 10:30")); + UnicodeString fmtCalif = UnicodeString(u"Mar 2, 10:30\u2009\u2013\u200917:30", -1); + UnicodeString fmtTokyo = UnicodeString(u"Mar 3, 03:30\u2009\u2013\u200910:30", -1); dtitvfmt->adoptTimeZone(tzCalif); res.remove(); @@ -368,7 +368,7 @@ void DateIntervalFormatTest::testAPI() { dtitvfmt->format(dtitv12, res, pos, status); if ( U_SUCCESS(status) ) { if ( res.compare(fmtTokyo) != 0 ) { - errln("ERROR: DateIntervalFormat::format for fmtTokyo, expect " + fmtTokyo + ", get " + res); + errln("ERROR: DateIntervalFormat::format for tzTokyo, expect " + fmtTokyo + ", get " + res); } } else { errln("ERROR: DateIntervalFormat::format for tzTokyo, status %s", u_errorName(status)); @@ -422,185 +422,185 @@ void DateIntervalFormatTest::testFormat() { // test 'H' and 'h', using availableFormat in fallback "en", "CE 2007 11 10 10:10:10", "CE 2007 11 10 15:10:10", "Hms", "10:10:10 \\u2013 15:10:10", - "en", "CE 2007 11 10 10:10:10", "CE 2007 11 10 15:10:10", "hms", "10:10:10 AM \\u2013 3:10:10 PM", + "en", "CE 2007 11 10 10:10:10", "CE 2007 11 10 15:10:10", "hms", "10:10:10\\u202FAM \\u2013 3:10:10\\u202FPM", - "en", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "MMMM", "October 2007 \\u2013 October 2008", - "en", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "MMM", "Oct 2007 \\u2013 Oct 2008", + "en", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "MMMM", "October 2007\\u2009\\u2013\\u2009October 2008", + "en", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "MMM", "Oct 2007\\u2009\\u2013\\u2009Oct 2008", // test skeleton with both date and time - "en", "CE 2007 11 10 10:10:10", "CE 2007 11 20 10:10:10", "dMMMyhm", "Nov 10, 2007, 10:10 AM \\u2013 Nov 20, 2007, 10:10 AM", + "en", "CE 2007 11 10 10:10:10", "CE 2007 11 20 10:10:10", "dMMMyhm", "Nov 10, 2007, 10:10\\u202FAM \\u2013 Nov 20, 2007, 10:10\\u202FAM", - "en", "CE 2007 11 10 10:10:10", "CE 2007 11 10 11:10:10", "dMMMyhm", "Nov 10, 2007, 10:10 \\u2013 11:10 AM", + "en", "CE 2007 11 10 10:10:10", "CE 2007 11 10 11:10:10", "dMMMyhm", "Nov 10, 2007, 10:10\\u2009\\u2013\\u200911:10\\u202FAM", - "en", "CE 2007 11 10 10:10:10", "CE 2007 11 10 11:10:10", "hms", "10:10:10 AM \\u2013 11:10:10 AM", + "en", "CE 2007 11 10 10:10:10", "CE 2007 11 10 11:10:10", "hms", "10:10:10\\u202FAM \\u2013 11:10:10\\u202FAM", "en", "CE 2007 11 10 10:10:10", "CE 2007 11 10 11:10:10", "Hms", "10:10:10 \\u2013 11:10:10", "en", "CE 2007 11 10 20:10:10", "CE 2007 11 10 21:10:10", "Hms", "20:10:10 \\u2013 21:10:10", - "en", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "EEEEdMMMMy", "Wednesday, October 10, 2007 \\u2013 Friday, October 10, 2008", + "en", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "EEEEdMMMMy", "Wednesday, October 10, 2007\\u2009\\u2013\\u2009Friday, October 10, 2008", - "en", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "dMMMMy", "October 10, 2007 \\u2013 October 10, 2008", + "en", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "dMMMMy", "October 10, 2007\\u2009\\u2013\\u2009October 10, 2008", - "en", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "dMMMM", "October 10, 2007 \\u2013 October 10, 2008", + "en", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "dMMMM", "October 10, 2007\\u2009\\u2013\\u2009October 10, 2008", - "en", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "MMMMy", "October 2007 \\u2013 October 2008", + "en", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "MMMMy", "October 2007\\u2009\\u2013\\u2009October 2008", - "en", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "EEEEdMMMM", "Wednesday, October 10, 2007 \\u2013 Friday, October 10, 2008", + "en", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "EEEEdMMMM", "Wednesday, October 10, 2007\\u2009\\u2013\\u2009Friday, October 10, 2008", - "en", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "EdMMMy", "Wed, Oct 10, 2007 \\u2013 Fri, Oct 10, 2008", + "en", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "EdMMMy", "Wed, Oct 10, 2007\\u2009\\u2013\\u2009Fri, Oct 10, 2008", - "en", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "dMMMy", "Oct 10, 2007 \\u2013 Oct 10, 2008", + "en", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "dMMMy", "Oct 10, 2007\\u2009\\u2013\\u2009Oct 10, 2008", - "en", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "dMMM", "Oct 10, 2007 \\u2013 Oct 10, 2008", + "en", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "dMMM", "Oct 10, 2007\\u2009\\u2013\\u2009Oct 10, 2008", - "en", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "MMMy", "Oct 2007 \\u2013 Oct 2008", + "en", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "MMMy", "Oct 2007\\u2009\\u2013\\u2009Oct 2008", - "en", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "EdMMM", "Wed, Oct 10, 2007 \\u2013 Fri, Oct 10, 2008", + "en", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "EdMMM", "Wed, Oct 10, 2007\\u2009\\u2013\\u2009Fri, Oct 10, 2008", - "en", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "EdMy", "Wed, 10/10/2007 \\u2013 Fri, 10/10/2008", + "en", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "EdMy", "Wed, 10/10/2007\\u2009\\u2013\\u2009Fri, 10/10/2008", - "en", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "dMy", "10/10/2007 \\u2013 10/10/2008", + "en", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "dMy", "10/10/2007\\u2009\\u2013\\u200910/10/2008", - "en", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "dM", "10/10/2007 \\u2013 10/10/2008", + "en", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "dM", "10/10/2007\\u2009\\u2013\\u200910/10/2008", - "en", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "My", "10/2007 \\u2013 10/2008", + "en", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "My", "10/2007\\u2009\\u2013\\u200910/2008", - "en", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "EdM", "Wed, 10/10/2007 \\u2013 Fri, 10/10/2008", + "en", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "EdM", "Wed, 10/10/2007\\u2009\\u2013\\u2009Fri, 10/10/2008", - "en", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "d", "10/10/2007 \\u2013 10/10/2008", + "en", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "d", "10/10/2007\\u2009\\u2013\\u200910/10/2008", "en", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "Ed", "10 Wed \\u2013 10 Fri", - "en", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "y", "2007 \\u2013 2008", + "en", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "y", "2007\\u2009\\u2013\\u20092008", - "en", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "M", "10/2007 \\u2013 10/2008", + "en", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "M", "10/2007\\u2009\\u2013\\u200910/2008", - "en", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "hm", "10/10/2007, 10:10 AM \\u2013 10/10/2008, 10:10 AM", + "en", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "hm", "10/10/2007, 10:10\\u202FAM \\u2013 10/10/2008, 10:10\\u202FAM", "en", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "Hm", "10/10/2007, 10:10 \\u2013 10/10/2008, 10:10", "en", "CE 2007 10 10 20:10:10", "CE 2008 10 10 20:10:10", "Hm", "10/10/2007, 20:10 \\u2013 10/10/2008, 20:10", - "en", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "hmv", "10/10/2007, 10:10 AM PT \\u2013 10/10/2008, 10:10 AM PT", + "en", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "hmv", "10/10/2007, 10:10\\u202FAM PT \\u2013 10/10/2008, 10:10\\u202FAM PT", - "en", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "hmz", "10/10/2007, 10:10 AM PDT \\u2013 10/10/2008, 10:10 AM PDT", + "en", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "hmz", "10/10/2007, 10:10\\u202FAM PDT \\u2013 10/10/2008, 10:10\\u202FAM PDT", - "en", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "h", "10/10/2007, 10 AM \\u2013 10/10/2008, 10 AM", + "en", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "h", "10/10/2007, 10\\u202FAM \\u2013 10/10/2008, 10\\u202FAM", - "en", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "hv", "10/10/2007, 10 AM PT \\u2013 10/10/2008, 10 AM PT", + "en", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "hv", "10/10/2007, 10\\u202FAM PT \\u2013 10/10/2008, 10\\u202FAM PT", - "en", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "hz", "10/10/2007, 10 AM PDT \\u2013 10/10/2008, 10 AM PDT", + "en", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "hz", "10/10/2007, 10\\u202FAM PDT \\u2013 10/10/2008, 10\\u202FAM PDT", - "en", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "EEddMMyyyy", "Wed, 10/10/2007 \\u2013 Fri, 10/10/2008", + "en", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "EEddMMyyyy", "Wed, 10/10/2007\\u2009\\u2013\\u2009Fri, 10/10/2008", - "en", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "EddMMy", "Wed, 10/10/2007 \\u2013 Fri, 10/10/2008", + "en", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "EddMMy", "Wed, 10/10/2007\\u2009\\u2013\\u2009Fri, 10/10/2008", - "en", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "hhmm", "10/10/2007, 10:10 AM \\u2013 10/10/2008, 10:10 AM", + "en", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "hhmm", "10/10/2007, 10:10\\u202FAM \\u2013 10/10/2008, 10:10\\u202FAM", - "en", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "hhmmzz", "10/10/2007, 10:10 AM PDT \\u2013 10/10/2008, 10:10 AM PDT", + "en", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "hhmmzz", "10/10/2007, 10:10\\u202FAM PDT \\u2013 10/10/2008, 10:10\\u202FAM PDT", - "en", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "hms", "10/10/2007, 10:10:10 AM \\u2013 10/10/2008, 10:10:10 AM", + "en", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "hms", "10/10/2007, 10:10:10\\u202FAM \\u2013 10/10/2008, 10:10:10\\u202FAM", - "en", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "dMMMMMy", "O 10, 2007 \\u2013 O 10, 2008", + "en", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "dMMMMMy", "O 10, 2007\\u2009\\u2013\\u2009O 10, 2008", - "en", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "EEEEEdM", "W, 10/10/2007 \\u2013 F, 10/10/2008", + "en", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "EEEEEdM", "W, 10/10/2007\\u2009\\u2013\\u2009F, 10/10/2008", - "en", "CE 2007 10 10 10:10:10", "CE 2007 11 10 10:10:10", "EEEEdMMMMy", "Wednesday, October 10 \\u2013 Saturday, November 10, 2007", + "en", "CE 2007 10 10 10:10:10", "CE 2007 11 10 10:10:10", "EEEEdMMMMy", "Wednesday, October 10\\u2009\\u2013\\u2009Saturday, November 10, 2007", - "en", "CE 2007 10 10 10:10:10", "CE 2007 11 10 10:10:10", "dMMMMy", "October 10 \\u2013 November 10, 2007", + "en", "CE 2007 10 10 10:10:10", "CE 2007 11 10 10:10:10", "dMMMMy", "October 10\\u2009\\u2013\\u2009November 10, 2007", - "en", "CE 2007 10 10 10:10:10", "CE 2007 11 10 10:10:10", "dMMMM", "October 10 \\u2013 November 10", + "en", "CE 2007 10 10 10:10:10", "CE 2007 11 10 10:10:10", "dMMMM", "October 10\\u2009\\u2013\\u2009November 10", - "en", "CE 2007 10 10 10:10:10", "CE 2007 11 10 10:10:10", "MMMMy", "October \\u2013 November 2007", + "en", "CE 2007 10 10 10:10:10", "CE 2007 11 10 10:10:10", "MMMMy", "October\\u2009\\u2013\\u2009November 2007", - "en", "CE 2007 10 10 10:10:10", "CE 2007 11 10 10:10:10", "EEEEdMMMM", "Wednesday, October 10 \\u2013 Saturday, November 10", + "en", "CE 2007 10 10 10:10:10", "CE 2007 11 10 10:10:10", "EEEEdMMMM", "Wednesday, October 10\\u2009\\u2013\\u2009Saturday, November 10", - "en", "CE 2007 10 10 10:10:10", "CE 2007 11 10 10:10:10", "EdMMMy", "Wed, Oct 10 \\u2013 Sat, Nov 10, 2007", + "en", "CE 2007 10 10 10:10:10", "CE 2007 11 10 10:10:10", "EdMMMy", "Wed, Oct 10\\u2009\\u2013\\u2009Sat, Nov 10, 2007", - "en", "CE 2007 10 10 10:10:10", "CE 2007 11 10 10:10:10", "dMMMy", "Oct 10 \\u2013 Nov 10, 2007", + "en", "CE 2007 10 10 10:10:10", "CE 2007 11 10 10:10:10", "dMMMy", "Oct 10\\u2009\\u2013\\u2009Nov 10, 2007", - "en", "CE 2007 10 10 10:10:10", "CE 2007 11 10 10:10:10", "dMMM", "Oct 10 \\u2013 Nov 10", + "en", "CE 2007 10 10 10:10:10", "CE 2007 11 10 10:10:10", "dMMM", "Oct 10\\u2009\\u2013\\u2009Nov 10", - "en", "CE 2007 10 10 10:10:10", "CE 2007 11 10 10:10:10", "MMMy", "Oct \\u2013 Nov 2007", + "en", "CE 2007 10 10 10:10:10", "CE 2007 11 10 10:10:10", "MMMy", "Oct\\u2009\\u2013\\u2009Nov 2007", - "en", "CE 2007 10 10 10:10:10", "CE 2007 11 10 10:10:10", "EdMMM", "Wed, Oct 10 \\u2013 Sat, Nov 10", + "en", "CE 2007 10 10 10:10:10", "CE 2007 11 10 10:10:10", "EdMMM", "Wed, Oct 10\\u2009\\u2013\\u2009Sat, Nov 10", - "en", "CE 2007 10 10 10:10:10", "CE 2007 11 10 10:10:10", "EdMy", "Wed, 10/10/2007 \\u2013 Sat, 11/10/2007", + "en", "CE 2007 10 10 10:10:10", "CE 2007 11 10 10:10:10", "EdMy", "Wed, 10/10/2007\\u2009\\u2013\\u2009Sat, 11/10/2007", - "en", "CE 2007 10 10 10:10:10", "CE 2007 11 10 10:10:10", "dMy", "10/10/2007 \\u2013 11/10/2007", + "en", "CE 2007 10 10 10:10:10", "CE 2007 11 10 10:10:10", "dMy", "10/10/2007\\u2009\\u2013\\u200911/10/2007", - "en", "CE 2007 10 10 10:10:10", "CE 2007 11 10 10:10:10", "My", "10/2007 \\u2013 11/2007", + "en", "CE 2007 10 10 10:10:10", "CE 2007 11 10 10:10:10", "My", "10/2007\\u2009\\u2013\\u200911/2007", - "en", "CE 2007 10 10 10:10:10", "CE 2007 11 10 10:10:10", "EdM", "Wed, 10/10 \\u2013 Sat, 11/10", + "en", "CE 2007 10 10 10:10:10", "CE 2007 11 10 10:10:10", "EdM", "Wed, 10/10\\u2009\\u2013\\u2009Sat, 11/10", - "en", "CE 2007 10 10 10:10:10", "CE 2007 11 10 10:10:10", "d", "10/10 \\u2013 11/10", + "en", "CE 2007 10 10 10:10:10", "CE 2007 11 10 10:10:10", "d", "10/10\\u2009\\u2013\\u200911/10", "en", "CE 2007 10 10 10:10:10", "CE 2007 11 10 10:10:10", "Ed", "10 Wed \\u2013 10 Sat", "en", "CE 2007 10 10 10:10:10", "CE 2007 11 10 10:10:10", "y", "2007", - "en", "CE 2007 10 10 10:10:10", "CE 2007 11 10 10:10:10", "M", "10 \\u2013 11", + "en", "CE 2007 10 10 10:10:10", "CE 2007 11 10 10:10:10", "M", "10\\u2009\\u2013\\u200911", - "en", "CE 2007 10 10 10:10:10", "CE 2007 11 10 10:10:10", "MMM", "Oct \\u2013 Nov", + "en", "CE 2007 10 10 10:10:10", "CE 2007 11 10 10:10:10", "MMM", "Oct\\u2009\\u2013\\u2009Nov", - "en", "CE 2007 10 10 10:10:10", "CE 2007 11 10 10:10:10", "MMMM", "October \\u2013 November", + "en", "CE 2007 10 10 10:10:10", "CE 2007 11 10 10:10:10", "MMMM", "October\\u2009\\u2013\\u2009November", - "en", "CE 2007 10 10 10:10:10", "CE 2007 11 10 10:10:10", "hm", "10/10/2007, 10:10 AM \\u2013 11/10/2007, 10:10 AM", + "en", "CE 2007 10 10 10:10:10", "CE 2007 11 10 10:10:10", "hm", "10/10/2007, 10:10\\u202FAM \\u2013 11/10/2007, 10:10\\u202FAM", "en", "CE 2007 10 10 10:10:10", "CE 2007 11 10 10:10:10", "Hm", "10/10/2007, 10:10 \\u2013 11/10/2007, 10:10", "en", "CE 2007 10 10 20:10:10", "CE 2007 11 10 20:10:10", "Hm", "10/10/2007, 20:10 \\u2013 11/10/2007, 20:10", - "en", "CE 2007 10 10 10:10:10", "CE 2007 11 10 10:10:10", "hmv", "10/10/2007, 10:10 AM PT \\u2013 11/10/2007, 10:10 AM PT", + "en", "CE 2007 10 10 10:10:10", "CE 2007 11 10 10:10:10", "hmv", "10/10/2007, 10:10\\u202FAM PT \\u2013 11/10/2007, 10:10\\u202FAM PT", - "en", "CE 2007 10 10 10:10:10", "CE 2007 11 10 10:10:10", "hmz", "10/10/2007, 10:10 AM PDT \\u2013 11/10/2007, 10:10 AM PST", + "en", "CE 2007 10 10 10:10:10", "CE 2007 11 10 10:10:10", "hmz", "10/10/2007, 10:10\\u202FAM PDT \\u2013 11/10/2007, 10:10\\u202FAM PST", - "en", "CE 2007 10 10 10:10:10", "CE 2007 11 10 10:10:10", "h", "10/10/2007, 10 AM \\u2013 11/10/2007, 10 AM", + "en", "CE 2007 10 10 10:10:10", "CE 2007 11 10 10:10:10", "h", "10/10/2007, 10\\u202FAM \\u2013 11/10/2007, 10\\u202FAM", - "en", "CE 2007 10 10 10:10:10", "CE 2007 11 10 10:10:10", "hv", "10/10/2007, 10 AM PT \\u2013 11/10/2007, 10 AM PT", + "en", "CE 2007 10 10 10:10:10", "CE 2007 11 10 10:10:10", "hv", "10/10/2007, 10\\u202FAM PT \\u2013 11/10/2007, 10\\u202FAM PT", - "en", "CE 2007 10 10 10:10:10", "CE 2007 11 10 10:10:10", "hz", "10/10/2007, 10 AM PDT \\u2013 11/10/2007, 10 AM PST", + "en", "CE 2007 10 10 10:10:10", "CE 2007 11 10 10:10:10", "hz", "10/10/2007, 10\\u202FAM PDT \\u2013 11/10/2007, 10\\u202FAM PST", - "en", "CE 2007 10 10 10:10:10", "CE 2007 11 10 10:10:10", "EEddMMyyyy", "Wed, 10/10/2007 \\u2013 Sat, 11/10/2007", + "en", "CE 2007 10 10 10:10:10", "CE 2007 11 10 10:10:10", "EEddMMyyyy", "Wed, 10/10/2007\\u2009\\u2013\\u2009Sat, 11/10/2007", - "en", "CE 2007 10 10 10:10:10", "CE 2007 11 10 10:10:10", "EddMMy", "Wed, 10/10/2007 \\u2013 Sat, 11/10/2007", + "en", "CE 2007 10 10 10:10:10", "CE 2007 11 10 10:10:10", "EddMMy", "Wed, 10/10/2007\\u2009\\u2013\\u2009Sat, 11/10/2007", - "en", "CE 2007 10 10 10:10:10", "CE 2007 11 10 10:10:10", "hhmmzz", "10/10/2007, 10:10 AM PDT \\u2013 11/10/2007, 10:10 AM PST", + "en", "CE 2007 10 10 10:10:10", "CE 2007 11 10 10:10:10", "hhmmzz", "10/10/2007, 10:10\\u202FAM PDT \\u2013 11/10/2007, 10:10\\u202FAM PST", - "en", "CE 2007 10 10 10:10:10", "CE 2007 11 10 10:10:10", "hms", "10/10/2007, 10:10:10 AM \\u2013 11/10/2007, 10:10:10 AM", + "en", "CE 2007 10 10 10:10:10", "CE 2007 11 10 10:10:10", "hms", "10/10/2007, 10:10:10\\u202FAM \\u2013 11/10/2007, 10:10:10\\u202FAM", - "en", "CE 2007 10 10 10:10:10", "CE 2007 11 10 10:10:10", "dMMMMMy", "O 10 \\u2013 N 10, 2007", + "en", "CE 2007 10 10 10:10:10", "CE 2007 11 10 10:10:10", "dMMMMMy", "O 10\\u2009\\u2013\\u2009N 10, 2007", - "en", "CE 2007 10 10 10:10:10", "CE 2007 11 10 10:10:10", "EEEEEdM", "W, 10/10 \\u2013 S, 11/10", + "en", "CE 2007 10 10 10:10:10", "CE 2007 11 10 10:10:10", "EEEEEdM", "W, 10/10\\u2009\\u2013\\u2009S, 11/10", - "en", "CE 2007 11 10 10:10:10", "CE 2007 11 20 10:10:10", "EEEEdMMMMy", "Saturday, November 10 \\u2013 Tuesday, November 20, 2007", + "en", "CE 2007 11 10 10:10:10", "CE 2007 11 20 10:10:10", "EEEEdMMMMy", "Saturday, November 10\\u2009\\u2013\\u2009Tuesday, November 20, 2007", - "en", "CE 2007 11 10 10:10:10", "CE 2007 11 20 10:10:10", "dMMMMy", "November 10 \\u2013 20, 2007", + "en", "CE 2007 11 10 10:10:10", "CE 2007 11 20 10:10:10", "dMMMMy", "November 10\\u2009\\u2013\\u200920, 2007", - "en", "CE 2007 11 10 10:10:10", "CE 2007 11 20 10:10:10", "dMMMM", "November 10 \\u2013 20", + "en", "CE 2007 11 10 10:10:10", "CE 2007 11 20 10:10:10", "dMMMM", "November 10\\u2009\\u2013\\u200920", - "en", "CE 2007 11 10 10:10:10", "CE 2007 11 20 10:10:10", "EEEEdMMMM", "Saturday, November 10 \\u2013 Tuesday, November 20", + "en", "CE 2007 11 10 10:10:10", "CE 2007 11 20 10:10:10", "EEEEdMMMM", "Saturday, November 10\\u2009\\u2013\\u2009Tuesday, November 20", - "en", "CE 2007 11 10 10:10:10", "CE 2007 11 20 10:10:10", "EdMMMy", "Sat, Nov 10 \\u2013 Tue, Nov 20, 2007", + "en", "CE 2007 11 10 10:10:10", "CE 2007 11 20 10:10:10", "EdMMMy", "Sat, Nov 10\\u2009\\u2013\\u2009Tue, Nov 20, 2007", - "en", "CE 2007 11 10 10:10:10", "CE 2007 11 20 10:10:10", "dMMMy", "Nov 10 \\u2013 20, 2007", + "en", "CE 2007 11 10 10:10:10", "CE 2007 11 20 10:10:10", "dMMMy", "Nov 10\\u2009\\u2013\\u200920, 2007", - "en", "CE 2007 11 10 10:10:10", "CE 2007 11 20 10:10:10", "dMMM", "Nov 10 \\u2013 20", + "en", "CE 2007 11 10 10:10:10", "CE 2007 11 20 10:10:10", "dMMM", "Nov 10\\u2009\\u2013\\u200920", "en", "CE 2007 11 10 10:10:10", "CE 2007 11 20 10:10:10", "MMMy", "Nov 2007", - "en", "CE 2007 11 10 10:10:10", "CE 2007 11 20 10:10:10", "EdMMM", "Sat, Nov 10 \\u2013 Tue, Nov 20", + "en", "CE 2007 11 10 10:10:10", "CE 2007 11 20 10:10:10", "EdMMM", "Sat, Nov 10\\u2009\\u2013\\u2009Tue, Nov 20", - "en", "CE 2007 11 10 10:10:10", "CE 2007 11 20 10:10:10", "EdMy", "Sat, 11/10/2007 \\u2013 Tue, 11/20/2007", + "en", "CE 2007 11 10 10:10:10", "CE 2007 11 20 10:10:10", "EdMy", "Sat, 11/10/2007\\u2009\\u2013\\u2009Tue, 11/20/2007", - "en", "CE 2007 11 10 10:10:10", "CE 2007 11 20 10:10:10", "dMy", "11/10/2007 \\u2013 11/20/2007", + "en", "CE 2007 11 10 10:10:10", "CE 2007 11 20 10:10:10", "dMy", "11/10/2007\\u2009\\u2013\\u200911/20/2007", - "en", "CE 2007 11 10 10:10:10", "CE 2007 11 20 10:10:10", "dM", "11/10 \\u2013 11/20", + "en", "CE 2007 11 10 10:10:10", "CE 2007 11 20 10:10:10", "dM", "11/10\\u2009\\u2013\\u200911/20", "en", "CE 2007 11 10 10:10:10", "CE 2007 11 20 10:10:10", "My", "11/2007", - "en", "CE 2007 11 10 10:10:10", "CE 2007 11 20 10:10:10", "EdM", "Sat, 11/10 \\u2013 Tue, 11/20", + "en", "CE 2007 11 10 10:10:10", "CE 2007 11 20 10:10:10", "EdM", "Sat, 11/10\\u2009\\u2013\\u2009Tue, 11/20", - "en", "CE 2007 11 10 10:10:10", "CE 2007 11 20 10:10:10", "d", "10 \\u2013 20", + "en", "CE 2007 11 10 10:10:10", "CE 2007 11 20 10:10:10", "d", "10\\u2009\\u2013\\u200920", "en", "CE 2007 11 10 10:10:10", "CE 2007 11 20 10:10:10", "Ed", "10 Sat \\u2013 20 Tue", @@ -612,35 +612,35 @@ void DateIntervalFormatTest::testFormat() { "en", "CE 2007 11 10 10:10:10", "CE 2007 11 20 10:10:10", "MMMM", "November", - "en", "CE 2007 11 10 10:10:10", "CE 2007 11 20 10:10:10", "hm", "11/10/2007, 10:10 AM \\u2013 11/20/2007, 10:10 AM", + "en", "CE 2007 11 10 10:10:10", "CE 2007 11 20 10:10:10", "hm", "11/10/2007, 10:10\\u202FAM \\u2013 11/20/2007, 10:10\\u202FAM", "en", "CE 2007 11 10 10:10:10", "CE 2007 11 20 10:10:10", "Hm", "11/10/2007, 10:10 \\u2013 11/20/2007, 10:10", "en", "CE 2007 11 10 20:10:10", "CE 2007 11 20 20:10:10", "Hm", "11/10/2007, 20:10 \\u2013 11/20/2007, 20:10", - "en", "CE 2007 11 10 10:10:10", "CE 2007 11 20 10:10:10", "hmv", "11/10/2007, 10:10 AM PT \\u2013 11/20/2007, 10:10 AM PT", + "en", "CE 2007 11 10 10:10:10", "CE 2007 11 20 10:10:10", "hmv", "11/10/2007, 10:10\\u202FAM PT \\u2013 11/20/2007, 10:10\\u202FAM PT", - "en", "CE 2007 11 10 10:10:10", "CE 2007 11 20 10:10:10", "hmz", "11/10/2007, 10:10 AM PST \\u2013 11/20/2007, 10:10 AM PST", + "en", "CE 2007 11 10 10:10:10", "CE 2007 11 20 10:10:10", "hmz", "11/10/2007, 10:10\\u202FAM PST \\u2013 11/20/2007, 10:10\\u202FAM PST", - "en", "CE 2007 11 10 10:10:10", "CE 2007 11 20 10:10:10", "h", "11/10/2007, 10 AM \\u2013 11/20/2007, 10 AM", + "en", "CE 2007 11 10 10:10:10", "CE 2007 11 20 10:10:10", "h", "11/10/2007, 10\\u202FAM \\u2013 11/20/2007, 10\\u202FAM", - "en", "CE 2007 11 10 10:10:10", "CE 2007 11 20 10:10:10", "hv", "11/10/2007, 10 AM PT \\u2013 11/20/2007, 10 AM PT", + "en", "CE 2007 11 10 10:10:10", "CE 2007 11 20 10:10:10", "hv", "11/10/2007, 10\\u202FAM PT \\u2013 11/20/2007, 10\\u202FAM PT", - "en", "CE 2007 11 10 10:10:10", "CE 2007 11 20 10:10:10", "hz", "11/10/2007, 10 AM PST \\u2013 11/20/2007, 10 AM PST", + "en", "CE 2007 11 10 10:10:10", "CE 2007 11 20 10:10:10", "hz", "11/10/2007, 10\\u202FAM PST \\u2013 11/20/2007, 10\\u202FAM PST", - "en", "CE 2007 11 10 10:10:10", "CE 2007 11 20 10:10:10", "EEddMMyyyy", "Sat, 11/10/2007 \\u2013 Tue, 11/20/2007", + "en", "CE 2007 11 10 10:10:10", "CE 2007 11 20 10:10:10", "EEddMMyyyy", "Sat, 11/10/2007\\u2009\\u2013\\u2009Tue, 11/20/2007", - "en", "CE 2007 11 10 10:10:10", "CE 2007 11 20 10:10:10", "EddMMy", "Sat, 11/10/2007 \\u2013 Tue, 11/20/2007", + "en", "CE 2007 11 10 10:10:10", "CE 2007 11 20 10:10:10", "EddMMy", "Sat, 11/10/2007\\u2009\\u2013\\u2009Tue, 11/20/2007", - "en", "CE 2007 11 10 10:10:10", "CE 2007 11 20 10:10:10", "hhmm", "11/10/2007, 10:10 AM \\u2013 11/20/2007, 10:10 AM", + "en", "CE 2007 11 10 10:10:10", "CE 2007 11 20 10:10:10", "hhmm", "11/10/2007, 10:10\\u202FAM \\u2013 11/20/2007, 10:10\\u202FAM", - "en", "CE 2007 11 10 10:10:10", "CE 2007 11 20 10:10:10", "hhmmzz", "11/10/2007, 10:10 AM PST \\u2013 11/20/2007, 10:10 AM PST", + "en", "CE 2007 11 10 10:10:10", "CE 2007 11 20 10:10:10", "hhmmzz", "11/10/2007, 10:10\\u202FAM PST \\u2013 11/20/2007, 10:10\\u202FAM PST", - "en", "CE 2007 11 10 10:10:10", "CE 2007 11 20 10:10:10", "hms", "11/10/2007, 10:10:10 AM \\u2013 11/20/2007, 10:10:10 AM", + "en", "CE 2007 11 10 10:10:10", "CE 2007 11 20 10:10:10", "hms", "11/10/2007, 10:10:10\\u202FAM \\u2013 11/20/2007, 10:10:10\\u202FAM", "en", "CE 2007 11 10 10:10:10", "CE 2007 11 20 10:10:10", "Hms", "11/10/2007, 10:10:10 \\u2013 11/20/2007, 10:10:10", "en", "CE 2007 11 10 20:10:10", "CE 2007 11 20 20:10:10", "Hms", "11/10/2007, 20:10:10 \\u2013 11/20/2007, 20:10:10", - "en", "CE 2007 11 10 10:10:10", "CE 2007 11 20 10:10:10", "dMMMMMy", "N 10 \\u2013 20, 2007", + "en", "CE 2007 11 10 10:10:10", "CE 2007 11 20 10:10:10", "dMMMMMy", "N 10\\u2009\\u2013\\u200920, 2007", - "en", "CE 2007 11 10 10:10:10", "CE 2007 11 20 10:10:10", "EEEEEdM", "S, 11/10 \\u2013 T, 11/20", + "en", "CE 2007 11 10 10:10:10", "CE 2007 11 20 10:10:10", "EEEEEdM", "S, 11/10\\u2009\\u2013\\u2009T, 11/20", "en", "CE 2007 01 10 10:00:10", "CE 2007 01 10 14:10:10", "EEEEdMMMMy", "Wednesday, January 10, 2007", @@ -683,29 +683,29 @@ void DateIntervalFormatTest::testFormat() { "en", "CE 2007 01 10 10:00:10", "CE 2007 01 10 14:10:10", "MMMM", "January", - "en", "CE 2007 01 10 10:00:10", "CE 2007 01 10 14:10:10", "hm", "10:00 AM \\u2013 2:10 PM", - "en", "CE 2007 01 10 10:00:10", "CE 2007 01 10 14:10:10", "Hm", "10:00 \\u2013 14:10", + "en", "CE 2007 01 10 10:00:10", "CE 2007 01 10 14:10:10", "hm", "10:00\\u202FAM\\u2009\\u2013\\u20092:10\\u202FPM", + "en", "CE 2007 01 10 10:00:10", "CE 2007 01 10 14:10:10", "Hm", "10:00\\u2009\\u2013\\u200914:10", - "en", "CE 2007 01 10 10:00:10", "CE 2007 01 10 14:10:10", "hmv", "10:00 AM \\u2013 2:10 PM PT", + "en", "CE 2007 01 10 10:00:10", "CE 2007 01 10 14:10:10", "hmv", "10:00\\u202FAM\\u2009\\u2013\\u20092:10\\u202FPM PT", - "en", "CE 2007 01 10 10:00:10", "CE 2007 01 10 14:10:10", "hmz", "10:00 AM \\u2013 2:10 PM PST", + "en", "CE 2007 01 10 10:00:10", "CE 2007 01 10 14:10:10", "hmz", "10:00\\u202FAM\\u2009\\u2013\\u20092:10\\u202FPM PST", - "en", "CE 2007 01 10 10:00:10", "CE 2007 01 10 14:10:10", "h", "10 AM \\u2013 2 PM", - "en", "CE 2007 01 10 10:00:10", "CE 2007 01 10 14:10:10", "H", "10 \\u2013 14", + "en", "CE 2007 01 10 10:00:10", "CE 2007 01 10 14:10:10", "h", "10\\u202FAM\\u2009\\u2013\\u20092\\u202FPM", + "en", "CE 2007 01 10 10:00:10", "CE 2007 01 10 14:10:10", "H", "10\\u2009\\u2013\\u200914", - "en", "CE 2007 01 10 10:00:10", "CE 2007 01 10 14:10:10", "hz", "10 AM \\u2013 2 PM PST", + "en", "CE 2007 01 10 10:00:10", "CE 2007 01 10 14:10:10", "hz", "10\\u202FAM\\u2009\\u2013\\u20092\\u202FPM PST", "en", "CE 2007 01 10 10:00:10", "CE 2007 01 10 14:10:10", "EEddMMyyyy", "Wed, 01/10/2007", "en", "CE 2007 01 10 10:00:10", "CE 2007 01 10 14:10:10", "EddMMy", "Wed, 01/10/2007", - "en", "CE 2007 01 10 10:00:10", "CE 2007 01 10 14:10:10", "hhmm", "10:00 AM \\u2013 2:10 PM", - "en", "CE 2007 01 10 10:00:10", "CE 2007 01 10 14:10:10", "HHmm", "10:00 \\u2013 14:10", + "en", "CE 2007 01 10 10:00:10", "CE 2007 01 10 14:10:10", "hhmm", "10:00\\u202FAM\\u2009\\u2013\\u20092:10\\u202FPM", + "en", "CE 2007 01 10 10:00:10", "CE 2007 01 10 14:10:10", "HHmm", "10:00\\u2009\\u2013\\u200914:10", - "en", "CE 2007 01 10 10:00:10", "CE 2007 01 10 14:10:10", "hhmmzz", "10:00 AM \\u2013 2:10 PM PST", + "en", "CE 2007 01 10 10:00:10", "CE 2007 01 10 14:10:10", "hhmmzz", "10:00\\u202FAM\\u2009\\u2013\\u20092:10\\u202FPM PST", - "en", "CE 2007 01 10 10:00:10", "CE 2007 01 10 14:10:10", "hms", "10:00:10 AM \\u2013 2:10:10 PM", + "en", "CE 2007 01 10 10:00:10", "CE 2007 01 10 14:10:10", "hms", "10:00:10\\u202FAM \\u2013 2:10:10\\u202FPM", "en", "CE 2007 01 10 10:00:10", "CE 2007 01 10 14:10:10", "Hms", "10:00:10 \\u2013 14:10:10", "en", "CE 2007 01 10 10:00:10", "CE 2007 01 10 14:10:10", "dMMMMMy", "J 10, 2007", @@ -746,23 +746,23 @@ void DateIntervalFormatTest::testFormat() { - "en", "CE 2007 01 10 10:00:10", "CE 2007 01 10 10:20:10", "hm", "10:00 \\u2013 10:20 AM", - "en", "CE 2007 01 10 10:00:10", "CE 2007 01 10 10:20:10", "Hm", "10:00 \\u2013 10:20", + "en", "CE 2007 01 10 10:00:10", "CE 2007 01 10 10:20:10", "hm", "10:00\\u2009\\u2013\\u200910:20\\u202FAM", + "en", "CE 2007 01 10 10:00:10", "CE 2007 01 10 10:20:10", "Hm", "10:00\\u2009\\u2013\\u200910:20", - "en", "CE 2007 01 10 10:00:10", "CE 2007 01 10 10:20:10", "hmz", "10:00 \\u2013 10:20 AM PST", + "en", "CE 2007 01 10 10:00:10", "CE 2007 01 10 10:20:10", "hmz", "10:00\\u2009\\u2013\\u200910:20\\u202FAM PST", - "en", "CE 2007 01 10 10:00:10", "CE 2007 01 10 10:20:10", "hv", "10 AM PT", + "en", "CE 2007 01 10 10:00:10", "CE 2007 01 10 10:20:10", "hv", "10\\u202FAM PT", "en", "CE 2007 01 10 10:00:10", "CE 2007 01 10 10:20:10", "EddMMy", "Wed, 01/10/2007", - "en", "CE 2007 01 10 10:00:10", "CE 2007 01 10 10:20:10", "hhmm", "10:00 \\u2013 10:20 AM", - "en", "CE 2007 01 10 10:00:10", "CE 2007 01 10 10:20:10", "HHmm", "10:00 \\u2013 10:20", + "en", "CE 2007 01 10 10:00:10", "CE 2007 01 10 10:20:10", "hhmm", "10:00\\u2009\\u2013\\u200910:20\\u202FAM", + "en", "CE 2007 01 10 10:00:10", "CE 2007 01 10 10:20:10", "HHmm", "10:00\\u2009\\u2013\\u200910:20", - "en", "CE 2007 01 10 10:00:10", "CE 2007 01 10 10:20:10", "hhmmzz", "10:00 \\u2013 10:20 AM PST", + "en", "CE 2007 01 10 10:00:10", "CE 2007 01 10 10:20:10", "hhmmzz", "10:00\\u2009\\u2013\\u200910:20\\u202FAM PST", "en", "CE 2007 01 10 10:00:10", "CE 2007 01 10 10:20:10", "dMMMMMy", "J 10, 2007", @@ -804,24 +804,24 @@ void DateIntervalFormatTest::testFormat() { "en", "CE 2007 01 10 10:10:10", "CE 2007 01 10 10:10:20", "MMMM", "January", - "en", "CE 2007 01 10 10:10:10", "CE 2007 01 10 10:10:20", "hm", "10:10 AM", + "en", "CE 2007 01 10 10:10:10", "CE 2007 01 10 10:10:20", "hm", "10:10\\u202FAM", "en", "CE 2007 01 10 10:10:10", "CE 2007 01 10 10:10:20", "Hm", "10:10", - "en", "CE 2007 01 10 10:10:10", "CE 2007 01 10 10:10:20", "hmz", "10:10 AM PST", + "en", "CE 2007 01 10 10:10:10", "CE 2007 01 10 10:10:20", "hmz", "10:10\\u202FAM PST", - "en", "CE 2007 01 10 10:10:10", "CE 2007 01 10 10:10:20", "h", "10 AM", + "en", "CE 2007 01 10 10:10:10", "CE 2007 01 10 10:10:20", "h", "10\\u202FAM", - "en", "CE 2007 01 10 10:10:10", "CE 2007 01 10 10:10:20", "hv", "10 AM PT", + "en", "CE 2007 01 10 10:10:10", "CE 2007 01 10 10:10:20", "hv", "10\\u202FAM PT", "en", "CE 2007 01 10 10:10:10", "CE 2007 01 10 10:10:20", "EEddMMyyyy", "Wed, 01/10/2007", - "en", "CE 2007 01 10 10:10:10", "CE 2007 01 10 10:10:20", "hhmm", "10:10 AM", + "en", "CE 2007 01 10 10:10:10", "CE 2007 01 10 10:10:20", "hhmm", "10:10\\u202FAM", "en", "CE 2007 01 10 10:10:10", "CE 2007 01 10 10:10:20", "HHmm", "10:10", - "en", "CE 2007 01 10 10:10:10", "CE 2007 01 10 10:10:20", "hhmmzz", "10:10 AM PST", + "en", "CE 2007 01 10 10:10:10", "CE 2007 01 10 10:10:20", "hhmmzz", "10:10\\u202FAM PST", "en", "CE 2007 01 10 10:10:10", "CE 2007 01 10 10:10:20", "dMMMMMy", "J 10, 2007", @@ -891,45 +891,45 @@ void DateIntervalFormatTest::testFormat() { "zh", "CE 2007 01 10 10:10:10", "CE 2007 01 10 10:10:20", "h", "\\u4e0a\\u534810\\u65f6", - "de", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "EEEEdMMMy", "Mittwoch, 10. Okt. 2007 \\u2013 Freitag, 10. Okt. 2008", + "de", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "EEEEdMMMy", "Mittwoch, 10. Okt. 2007\\u2009\\u2013\\u2009Freitag, 10. Okt. 2008", - "de", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "dMMM", "10. Okt. 2007 \\u2013 10. Okt. 2008", + "de", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "dMMM", "10. Okt. 2007\\u2009\\u2013\\u200910. Okt. 2008", - "de", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "MMMy", "Okt. 2007 \\u2013 Okt. 2008", + "de", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "MMMy", "Okt. 2007\\u2009\\u2013\\u2009Okt. 2008", - "de", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "EdMy", "Mi., 10.10.2007 \\u2013 Fr., 10.10.2008", + "de", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "EdMy", "Mi., 10.10.2007\\u2009\\u2013\\u2009Fr., 10.10.2008", - "de", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "dMy", "10.10.2007 \\u2013 10.10.2008", + "de", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "dMy", "10.10.2007\\u2009\\u2013\\u200910.10.2008", - "de", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "My", "10.2007 \\u2013 10.2008", + "de", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "My", "10.2007\\u2009\\u2013\\u200910.2008", - "de", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "EdM", "Mi., 10.10.2007 \\u2013 Fr., 10.10.2008", + "de", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "EdM", "Mi., 10.10.2007\\u2009\\u2013\\u2009Fr., 10.10.2008", "de", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "y", "2007\\u20132008", - "de", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "M", "10.2007 \\u2013 10.2008", + "de", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "M", "10.2007\\u2009\\u2013\\u200910.2008", - "de", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "hm", "10.10.2007, 10:10 AM \\u2013 10.10.2008, 10:10 AM", + "de", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "hm", "10.10.2007, 10:10\\u202FAM \\u2013 10.10.2008, 10:10\\u202FAM", "de", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "Hm", "10.10.2007, 10:10 \\u2013 10.10.2008, 10:10", - "de", "CE 2007 10 10 10:10:10", "CE 2007 11 10 10:10:10", "EEEEdMMMy", "Mittwoch, 10. Okt. \\u2013 Samstag, 10. Nov. 2007", + "de", "CE 2007 10 10 10:10:10", "CE 2007 11 10 10:10:10", "EEEEdMMMy", "Mittwoch, 10. Okt.\\u2009\\u2013\\u2009Samstag, 10. Nov. 2007", - "de", "CE 2007 10 10 10:10:10", "CE 2007 11 10 10:10:10", "dMMM", "10. Okt. \\u2013 10. Nov.", + "de", "CE 2007 10 10 10:10:10", "CE 2007 11 10 10:10:10", "dMMM", "10. Okt.\\u2009\\u2013\\u200910. Nov.", "de", "CE 2007 10 10 10:10:10", "CE 2007 11 10 10:10:10", "MMMy", "Okt.\\u2013Nov. 2007", - "de", "CE 2007 10 10 10:10:10", "CE 2007 11 10 10:10:10", "EEEEdMMM", "Mittwoch, 10. Okt. \\u2013 Samstag, 10. Nov.", + "de", "CE 2007 10 10 10:10:10", "CE 2007 11 10 10:10:10", "EEEEdMMM", "Mittwoch, 10. Okt.\\u2009\\u2013\\u2009Samstag, 10. Nov.", "de", "CE 2007 10 10 10:10:10", "CE 2007 11 10 10:10:10", "dM", "10.10. \\u2013 10.11.", - "de", "CE 2007 10 10 10:10:10", "CE 2007 11 10 10:10:10", "My", "10.2007 \\u2013 11.2007", + "de", "CE 2007 10 10 10:10:10", "CE 2007 11 10 10:10:10", "My", "10.2007\\u2009\\u2013\\u200911.2007", "de", "CE 2007 10 10 10:10:10", "CE 2007 11 10 10:10:10", "d", "10.10. \\u2013 10.11.", @@ -940,7 +940,7 @@ void DateIntervalFormatTest::testFormat() { "de", "CE 2007 10 10 10:10:10", "CE 2007 11 10 10:10:10", "MMM", "Okt.\\u2013Nov.", - "de", "CE 2007 10 10 10:10:10", "CE 2007 11 10 10:10:10", "hms", "10.10.2007, 10:10:10 AM \\u2013 10.11.2007, 10:10:10 AM", + "de", "CE 2007 10 10 10:10:10", "CE 2007 11 10 10:10:10", "hms", "10.10.2007, 10:10:10\\u202FAM \\u2013 10.11.2007, 10:10:10\\u202FAM", "de", "CE 2007 10 10 10:10:10", "CE 2007 11 10 10:10:10", "Hms", "10.10.2007, 10:10:10 \\u2013 10.11.2007, 10:10:10", "de", "CE 2007 11 10 10:10:10", "CE 2007 11 20 10:10:10", "EEEEdMMMy", "Samstag, 10. \\u2013 Dienstag, 20. Nov. 2007", @@ -965,7 +965,7 @@ void DateIntervalFormatTest::testFormat() { "de", "CE 2007 11 10 10:10:10", "CE 2007 11 20 10:10:10", "y", "2007", - "de", "CE 2007 11 10 10:10:10", "CE 2007 11 20 10:10:10", "hmv", "10.11.2007, 10:10 AM Los Angeles Zeit \\u2013 20.11.2007, 10:10 AM Los Angeles Zeit", + "de", "CE 2007 11 10 10:10:10", "CE 2007 11 20 10:10:10", "hmv", "10.11.2007, 10:10\\u202FAM Los Angeles Zeit \\u2013 20.11.2007, 10:10\\u202FAM Los Angeles Zeit", "de", "CE 2007 01 10 10:00:10", "CE 2007 01 10 14:10:10", "EEEEdMMMy", "Mittwoch, 10. Jan. 2007", @@ -978,15 +978,15 @@ void DateIntervalFormatTest::testFormat() { /* Following is an important test, because the 'h' in 'Uhr' is interpreted as a pattern if not escaped properly. */ - "de", "CE 2007 01 10 10:00:10", "CE 2007 01 10 14:10:10", "h", "10 Uhr AM \\u2013 2 Uhr PM", + "de", "CE 2007 01 10 10:00:10", "CE 2007 01 10 14:10:10", "h", "10 Uhr AM\\u2009\\u2013\\u20092 Uhr PM", "de", "CE 2007 01 10 10:00:10", "CE 2007 01 10 14:10:10", "H", "10\\u201314 Uhr", "de", "CE 2007 01 10 10:00:10", "CE 2007 01 10 10:20:10", "EEEEdMMM", "Mittwoch, 10. Jan.", - "de", "CE 2007 01 10 10:00:10", "CE 2007 01 10 10:20:10", "hmv", "10:00\\u201310:20 AM Los Angeles Zeit", + "de", "CE 2007 01 10 10:00:10", "CE 2007 01 10 10:20:10", "hmv", "10:00\\u201310:20\\u202FAM Los Angeles Zeit", - "de", "CE 2007 01 10 10:00:10", "CE 2007 01 10 10:20:10", "hmz", "10:00\\u201310:20 AM GMT-8", + "de", "CE 2007 01 10 10:00:10", "CE 2007 01 10 10:20:10", "hmz", "10:00\\u201310:20\\u202FAM GMT-8", "de", "CE 2007 01 10 10:00:10", "CE 2007 01 10 10:20:10", "h", "10 Uhr AM", "de", "CE 2007 01 10 10:00:10", "CE 2007 01 10 10:20:10", "H", "10 Uhr", @@ -997,9 +997,9 @@ void DateIntervalFormatTest::testFormat() { "de", "CE 2007 01 10 10:10:10", "CE 2007 01 10 10:10:20", "EEEEdMMMy", "Mittwoch, 10. Jan. 2007", - "de", "CE 2007 01 10 10:10:10", "CE 2007 01 10 10:10:20", "hmv", "10:10 AM Los Angeles Zeit", + "de", "CE 2007 01 10 10:10:10", "CE 2007 01 10 10:10:20", "hmv", "10:10\\u202FAM Los Angeles Zeit", - "de", "CE 2007 01 10 10:10:10", "CE 2007 01 10 10:10:20", "hmz", "10:10 AM GMT-8", + "de", "CE 2007 01 10 10:10:10", "CE 2007 01 10 10:10:20", "hmz", "10:10\\u202FAM GMT-8", "de", "CE 2007 01 10 10:10:10", "CE 2007 01 10 10:10:20", "hv", "10 Uhr AM Los Angeles Zeit", @@ -1052,17 +1052,17 @@ void DateIntervalFormatTest::testFormat() { // Tests for Japanese calendar with eras, including new era in 2019 (Heisei 31 through April 30, then new era) - "en-u-ca-japanese", "H 31 03 15 09:00:00", "H 31 04 15 09:00:00", "GyMMMd", "Mar 15 \\u2013 Apr 15, 31 Heisei", + "en-u-ca-japanese", "H 31 03 15 09:00:00", "H 31 04 15 09:00:00", "GyMMMd", "Mar 15\\u2009\\u2013\\u2009Apr 15, 31 Heisei", - "en-u-ca-japanese", "H 31 03 15 09:00:00", "H 31 04 15 09:00:00", "GGGGGyMd", "3/15/31 \\u2013 4/15/31 H", + "en-u-ca-japanese", "H 31 03 15 09:00:00", "H 31 04 15 09:00:00", "GGGGGyMd", "3/15/31\\u2009\\u2013\\u20094/15/31 H", - "en-u-ca-japanese", "S 64 01 05 09:00:00", "H 1 01 15 09:00:00", "GyMMMd", "Jan 5, 64 Sh\\u014Dwa \\u2013 Jan 15, 1 Heisei", + "en-u-ca-japanese", "S 64 01 05 09:00:00", "H 1 01 15 09:00:00", "GyMMMd", "Jan 5, 64 Sh\\u014Dwa\\u2009\\u2013\\u2009Jan 15, 1 Heisei", - "en-u-ca-japanese", "S 64 01 05 09:00:00", "H 1 01 15 09:00:00", "GGGGGyMd", "1/5/64 S \\u2013 1/15/1 H", + "en-u-ca-japanese", "S 64 01 05 09:00:00", "H 1 01 15 09:00:00", "GGGGGyMd", "1/5/64 S\\u2009\\u2013\\u20091/15/1 H", - "en-u-ca-japanese", "H 31 04 15 09:00:00", JP_ERA_2019_NARROW " 1 05 15 09:00:00", "GyMMMd", "Apr 15, 31 Heisei \\u2013 May 15, 1 " JP_ERA_2019_ROOT, + "en-u-ca-japanese", "H 31 04 15 09:00:00", JP_ERA_2019_NARROW " 1 05 15 09:00:00", "GyMMMd", "Apr 15, 31 Heisei\\u2009\\u2013\\u2009May 15, 1 " JP_ERA_2019_ROOT, - "en-u-ca-japanese", "H 31 04 15 09:00:00", JP_ERA_2019_NARROW " 1 05 15 09:00:00", "GGGGGyMd", "4/15/31 H \\u2013 5/15/1 " JP_ERA_2019_NARROW, + "en-u-ca-japanese", "H 31 04 15 09:00:00", JP_ERA_2019_NARROW " 1 05 15 09:00:00", "GGGGGyMd", "4/15/31 H\\u2009\\u2013\\u20095/15/1 " JP_ERA_2019_NARROW, "ja-u-ca-japanese", "H 31 03 15 09:00:00", "H 31 04 15 09:00:00", "GyMMMd", "\\u5E73\\u621031\\u5E743\\u670815\\u65E5\\uFF5E4\\u670815\\u65E5", @@ -1103,63 +1103,63 @@ void DateIntervalFormatTest::testHourMetacharacters() { // - In all cases, if the day period of both ends of the range is the same, you only see it once // baseline (h and H) - "en", "CE 2010 09 27 00:00:00", "CE 2010 09 27 01:00:00", "hh", "12 \\u2013 1 AM", + "en", "CE 2010 09 27 00:00:00", "CE 2010 09 27 01:00:00", "hh", "12\\u2009\\u2013\\u20091\\u202FAM", "de", "CE 2010 09 27 00:00:00", "CE 2010 09 27 01:00:00", "HH", "00\\u201301 Uhr", // k and K (ICU-21154 and ICU-21156) // (should behave the same as h and H if not overridden in locale ID) - "en", "CE 2010 09 27 00:00:00", "CE 2010 09 27 01:00:00", "KK", "12 \\u2013 1 AM", + "en", "CE 2010 09 27 00:00:00", "CE 2010 09 27 01:00:00", "KK", "12\\u2009\\u2013\\u20091\\u202FAM", "de", "CE 2010 09 27 00:00:00", "CE 2010 09 27 01:00:00", "kk", "00\\u201301 Uhr", // (overriding hour cycle in locale ID should affect both h and K [or both H and k]) - "en-u-hc-h11", "CE 2010 09 27 00:00:00", "CE 2010 09 27 01:00:00", "hh", "0 \\u2013 1 AM", - "en-u-hc-h11", "CE 2010 09 27 00:00:00", "CE 2010 09 27 01:00:00", "KK", "0 \\u2013 1 AM", + "en-u-hc-h11", "CE 2010 09 27 00:00:00", "CE 2010 09 27 01:00:00", "hh", "0\\u2009\\u2013\\u20091\\u202FAM", + "en-u-hc-h11", "CE 2010 09 27 00:00:00", "CE 2010 09 27 01:00:00", "KK", "0\\u2009\\u2013\\u20091\\u202FAM", "de-u-hc-h24", "CE 2010 09 27 00:00:00", "CE 2010 09 27 01:00:00", "HH", "24\\u201301 Uhr", "de-u-hc-h24", "CE 2010 09 27 00:00:00", "CE 2010 09 27 01:00:00", "kk", "24\\u201301 Uhr", // (overriding hour cycle to h11 should NOT affect H and k; overriding to h24 should NOT affect h and K) - "en", "CE 2010 09 27 00:00:00", "CE 2010 09 27 01:00:00", "HH", "00 \\u2013 01", - "en", "CE 2010 09 27 00:00:00", "CE 2010 09 27 01:00:00", "kk", "00 \\u2013 01", - "en-u-hc-h11", "CE 2010 09 27 00:00:00", "CE 2010 09 27 01:00:00", "HH", "00 \\u2013 01", - "en-u-hc-h11", "CE 2010 09 27 00:00:00", "CE 2010 09 27 01:00:00", "kk", "00 \\u2013 01", - "de", "CE 2010 09 27 00:00:00", "CE 2010 09 27 01:00:00", "hh", "12 \\u2013 1 Uhr AM", - "de", "CE 2010 09 27 00:00:00", "CE 2010 09 27 01:00:00", "KK", "12 \\u2013 1 Uhr AM", - "de-u-hc-h24", "CE 2010 09 27 00:00:00", "CE 2010 09 27 01:00:00", "hh", "12 \\u2013 1 Uhr AM", - "de-u-hc-h24", "CE 2010 09 27 00:00:00", "CE 2010 09 27 01:00:00", "KK", "12 \\u2013 1 Uhr AM", + "en", "CE 2010 09 27 00:00:00", "CE 2010 09 27 01:00:00", "HH", "00\\u2009\\u2013\\u200901", + "en", "CE 2010 09 27 00:00:00", "CE 2010 09 27 01:00:00", "kk", "00\\u2009\\u2013\\u200901", + "en-u-hc-h11", "CE 2010 09 27 00:00:00", "CE 2010 09 27 01:00:00", "HH", "00\\u2009\\u2013\\u200901", + "en-u-hc-h11", "CE 2010 09 27 00:00:00", "CE 2010 09 27 01:00:00", "kk", "00\\u2009\\u2013\\u200901", + "de", "CE 2010 09 27 00:00:00", "CE 2010 09 27 01:00:00", "hh", "12\\u2009\\u2013\\u20091 Uhr AM", + "de", "CE 2010 09 27 00:00:00", "CE 2010 09 27 01:00:00", "KK", "12\\u2009\\u2013\\u20091 Uhr AM", + "de-u-hc-h24", "CE 2010 09 27 00:00:00", "CE 2010 09 27 01:00:00", "hh", "12\\u2009\\u2013\\u20091 Uhr AM", + "de-u-hc-h24", "CE 2010 09 27 00:00:00", "CE 2010 09 27 01:00:00", "KK", "12\\u2009\\u2013\\u20091 Uhr AM", // different lengths of the 'a' field - "en", "CE 2010 09 27 10:00:00", "CE 2010 09 27 13:00:00", "ha", "10 AM \\u2013 1 PM", - "en", "CE 2010 09 27 00:00:00", "CE 2010 09 27 01:00:00", "ha", "12 \\u2013 1 AM", - "en", "CE 2010 09 27 10:00:00", "CE 2010 09 27 12:00:00", "haaaaa", "10 a \\u2013 12 p", - "en", "CE 2010 09 27 00:00:00", "CE 2010 09 27 01:00:00", "haaaaa", "12 \\u2013 1 a", + "en", "CE 2010 09 27 10:00:00", "CE 2010 09 27 13:00:00", "ha", "10\\u202FAM\\u2009\\u2013\\u20091\\u202FPM", + "en", "CE 2010 09 27 00:00:00", "CE 2010 09 27 01:00:00", "ha", "12\\u2009\\u2013\\u20091\\u202FAM", + "en", "CE 2010 09 27 10:00:00", "CE 2010 09 27 12:00:00", "haaaaa", "10\\u202Fa\\u2009\\u2013\\u200912\\u202Fp", + "en", "CE 2010 09 27 00:00:00", "CE 2010 09 27 01:00:00", "haaaaa", "12\\u2009\\u2013\\u20091\\u202Fa", // j (ICU-21155) - "en", "CE 2010 09 27 10:00:00", "CE 2010 09 27 13:00:00", "jj", "10 AM \\u2013 1 PM", - "en", "CE 2010 09 27 00:00:00", "CE 2010 09 27 01:00:00", "jj", "12 \\u2013 1 AM", - "en", "CE 2010 09 27 10:00:00", "CE 2010 09 27 13:00:00", "jjjjj", "10 a \\u2013 1 p", - "en", "CE 2010 09 27 00:00:00", "CE 2010 09 27 01:00:00", "jjjjj", "12 \\u2013 1 a", + "en", "CE 2010 09 27 10:00:00", "CE 2010 09 27 13:00:00", "jj", "10\\u202FAM\\u2009\\u2013\\u20091\\u202FPM", + "en", "CE 2010 09 27 00:00:00", "CE 2010 09 27 01:00:00", "jj", "12\\u2009\\u2013\\u20091\\u202FAM", + "en", "CE 2010 09 27 10:00:00", "CE 2010 09 27 13:00:00", "jjjjj", "10\\u202Fa\\u2009\\u2013\\u20091\\u202Fp", + "en", "CE 2010 09 27 00:00:00", "CE 2010 09 27 01:00:00", "jjjjj", "12\\u2009\\u2013\\u20091\\u202Fa", "de", "CE 2010 09 27 10:00:00", "CE 2010 09 27 13:00:00", "jj", "10\\u201313 Uhr", "de", "CE 2010 09 27 00:00:00", "CE 2010 09 27 01:00:00", "jj", "00\\u201301 Uhr", "de", "CE 2010 09 27 10:00:00", "CE 2010 09 27 13:00:00", "jjjjj", "10\\u201313 Uhr", "de", "CE 2010 09 27 00:00:00", "CE 2010 09 27 01:00:00", "jjjjj", "00\\u201301 Uhr", // b and B - "en", "CE 2010 09 27 10:00:00", "CE 2010 09 27 12:00:00", "hb", "10 AM \\u2013 12 noon", - "en", "CE 2010 09 27 10:00:00", "CE 2010 09 27 12:00:00", "hbbbbb", "10 a \\u2013 12 n", - "en", "CE 2010 09 27 13:00:00", "CE 2010 09 27 14:00:00", "hb", "1 \\u2013 2 PM", - "en", "CE 2010 09 27 10:00:00", "CE 2010 09 27 13:00:00", "hB", "10 in the morning \\u2013 1 in the afternoon", - "en", "CE 2010 09 27 00:00:00", "CE 2010 09 27 01:00:00", "hB", "12 \\u2013 1 at night", + "en", "CE 2010 09 27 10:00:00", "CE 2010 09 27 12:00:00", "hb", "10\\u202FAM\\u2009\\u2013\\u200912\\u202Fnoon", + "en", "CE 2010 09 27 10:00:00", "CE 2010 09 27 12:00:00", "hbbbbb", "10\\u202Fa\\u2009\\u2013\\u200912\\u202Fn", + "en", "CE 2010 09 27 13:00:00", "CE 2010 09 27 14:00:00", "hb", "1\\u2009\\u2013\\u20092\\u202FPM", + "en", "CE 2010 09 27 10:00:00", "CE 2010 09 27 13:00:00", "hB", "10 in the morning\\u2009\\u2013\\u20091 in the afternoon", + "en", "CE 2010 09 27 00:00:00", "CE 2010 09 27 01:00:00", "hB", "12\\u2009\\u2013\\u20091 at night", // J - "en", "CE 2010 09 27 10:00:00", "CE 2010 09 27 13:00:00", "J", "10 \\u2013 1", - "en", "CE 2010 09 27 00:00:00", "CE 2010 09 27 01:00:00", "J", "12 \\u2013 1", + "en", "CE 2010 09 27 10:00:00", "CE 2010 09 27 13:00:00", "J", "10\\u2009\\u2013\\u20091", + "en", "CE 2010 09 27 00:00:00", "CE 2010 09 27 01:00:00", "J", "12\\u2009\\u2013\\u20091", "de", "CE 2010 09 27 10:00:00", "CE 2010 09 27 13:00:00", "J", "10\\u201313 Uhr", "de", "CE 2010 09 27 00:00:00", "CE 2010 09 27 01:00:00", "J", "00\\u201301 Uhr", // C // (for English and German, C should do the same thing as j) - "en", "CE 2010 09 27 10:00:00", "CE 2010 09 27 13:00:00", "CC", "10 AM \\u2013 1 PM", - "en", "CE 2010 09 27 00:00:00", "CE 2010 09 27 01:00:00", "CC", "12 \\u2013 1 AM", - "en", "CE 2010 09 27 10:00:00", "CE 2010 09 27 13:00:00", "CCCCC", "10 a \\u2013 1 p", - "en", "CE 2010 09 27 00:00:00", "CE 2010 09 27 01:00:00", "CCCCC", "12 \\u2013 1 a", + "en", "CE 2010 09 27 10:00:00", "CE 2010 09 27 13:00:00", "CC", "10\\u202FAM\\u2009\\u2013\\u20091\\u202FPM", + "en", "CE 2010 09 27 00:00:00", "CE 2010 09 27 01:00:00", "CC", "12\\u2009\\u2013\\u20091\\u202FAM", + "en", "CE 2010 09 27 10:00:00", "CE 2010 09 27 13:00:00", "CCCCC", "10\\u202Fa\\u2009\\u2013\\u20091\\u202Fp", + "en", "CE 2010 09 27 00:00:00", "CE 2010 09 27 01:00:00", "CCCCC", "12\\u2009\\u2013\\u20091\\u202Fa", "de", "CE 2010 09 27 10:00:00", "CE 2010 09 27 13:00:00", "CC", "10\\u201313 Uhr", "de", "CE 2010 09 27 00:00:00", "CE 2010 09 27 01:00:00", "CC", "00\\u201301 Uhr", "de", "CE 2010 09 27 10:00:00", "CE 2010 09 27 13:00:00", "CCCCC", "10\\u201313 Uhr", @@ -1185,19 +1185,19 @@ void DateIntervalFormatTest::testHourMetacharacters() { "en-gb-u-hc-h24", "CE 2010 09 27 00:00:00", "CE 2010 09 27 13:00:00", "kk", "24\\u201313", // regression test for ICU-21343 - "de", "CE 2010 09 27 01:00:00", "CE 2010 09 27 10:00:00", "KK", "1 \\u2013 10 Uhr AM", + "de", "CE 2010 09 27 01:00:00", "CE 2010 09 27 10:00:00", "KK", "1\\u2009\\u2013\\u200910 Uhr AM", // regression test for ICU-21154 (single-date ranges should use the same hour cycle as multi-date ranges) - "en", "CE 2010 09 27 00:00:00", "CE 2010 09 27 00:00:00", "hh", "12 AM", - "en", "CE 2010 09 27 00:00:00", "CE 2010 09 27 01:00:00", "hh", "12 \\u2013 1 AM", - "en", "CE 2010 09 27 00:00:00", "CE 2010 09 27 00:00:00", "KK", "12 AM", - "en", "CE 2010 09 27 00:00:00", "CE 2010 09 27 01:00:00", "KK", "12 \\u2013 1 AM", // (this was producing "0 - 1 AM" before) - "en", "CE 2010 09 27 00:00:00", "CE 2010 09 27 00:00:00", "jj", "12 AM", - "en", "CE 2010 09 27 00:00:00", "CE 2010 09 27 01:00:00", "jj", "12 \\u2013 1 AM", + "en", "CE 2010 09 27 00:00:00", "CE 2010 09 27 00:00:00", "hh", "12\\u202FAM", + "en", "CE 2010 09 27 00:00:00", "CE 2010 09 27 01:00:00", "hh", "12\\u2009\\u2013\\u20091\\u202FAM", + "en", "CE 2010 09 27 00:00:00", "CE 2010 09 27 00:00:00", "KK", "12\\u202FAM", + "en", "CE 2010 09 27 00:00:00", "CE 2010 09 27 01:00:00", "KK", "12\\u2009\\u2013\\u20091\\u202FAM", // (this was producing "0 - 1\\u202FAM" before) + "en", "CE 2010 09 27 00:00:00", "CE 2010 09 27 00:00:00", "jj", "12\\u202FAM", + "en", "CE 2010 09 27 00:00:00", "CE 2010 09 27 01:00:00", "jj", "12\\u2009\\u2013\\u20091\\u202FAM", // regression test for ICU-21984 (multiple day-period characters in date-interval patterns) - "en", "CE 2010 09 27 00:00:00", "CE 2010 09 27 01:00:00", "MMMdhhmma", "Sep 27, 12:00 \\u2013 1:00 AM", - "sq", "CE 2010 09 27 00:00:00", "CE 2010 09 27 01:00:00", "Bhm", "12:00 \\u2013 1:00 e nat\\u00EBs", + "en", "CE 2010 09 27 00:00:00", "CE 2010 09 27 01:00:00", "MMMdhhmma", "Sep 27, 12:00\\u2009\\u2013\\u20091:00\\u202FAM", + "sq", "CE 2010 09 27 00:00:00", "CE 2010 09 27 01:00:00", "Bhm", "12:00\\u2009\\u2013\\u20091:00 e nat\\u00EBs", }; expect(DATA, UPRV_LENGTHOF(DATA)); } @@ -1403,7 +1403,7 @@ void DateIntervalFormatTest::testSetIntervalPatternNoSideEffect() { } UnicodeString expected; dtitvinf->getIntervalPattern(ctou("yMd"), UCAL_DATE, expected, ec); - dtitvinf->setIntervalPattern(ctou("yMd"), UCAL_DATE, ctou("M/d/y \\u2013 d"), ec); + dtitvinf->setIntervalPattern(ctou("yMd"), UCAL_DATE, ctou("M/d/y\\u2009\\u2013\\u2009d"), ec); if (U_FAILURE(ec)) { errln("Failure encountered: %s", u_errorName(ec)); return; @@ -1445,7 +1445,7 @@ void DateIntervalFormatTest::testYearFormats() { return; } UnicodeString actual; - UnicodeString expected(ctou("4/26/0113 \\u2013 4/28/0113")); + UnicodeString expected(ctou("4/26/0113\\u2009\\u2013\\u20094/28/0113")); FieldPosition pos; dif->format(*fromTime, *toTime, actual, pos, status); if (U_FAILURE(status)) { @@ -1463,7 +1463,7 @@ void DateIntervalFormatTest::testYearFormats() { return; } UnicodeString actual; - UnicodeString expected(ctou("4/26/13 \\u2013 4/28/13")); + UnicodeString expected(ctou("4/26/13\\u2009\\u2013\\u20094/28/13")); FieldPosition pos(FieldPosition::DONT_CARE); dif->format(*fromTime, *toTime, actual, pos, status); if (U_FAILURE(status)) { @@ -1481,7 +1481,7 @@ void DateIntervalFormatTest::testYearFormats() { return; } UnicodeString actual; - UnicodeString expected(ctou("4/26/113 \\u2013 4/28/113")); + UnicodeString expected(ctou("4/26/113\\u2009\\u2013\\u20094/28/113")); FieldPosition pos(FieldPosition::DONT_CARE); dif->format(*fromTime, *toTime, actual, pos, status); if (U_FAILURE(status)) { @@ -1755,7 +1755,7 @@ void DateIntervalFormatTest::testTicket11583_2() { DateInterval interval((UDate) 1232364615000.0, (UDate) 1328787015000.0); UnicodeString appendTo; FieldPosition fpos(FieldPosition::DONT_CARE); - UnicodeString expected("ene de 2009 \\u2013 feb de 2012"); + UnicodeString expected("ene de 2009\\u2009\\u2013\\u2009feb de 2012"); assertEquals( "", expected.unescape(), @@ -1775,7 +1775,7 @@ void DateIntervalFormatTest::testTicket11985() { } UnicodeString pattern; static_cast(fmt->getDateFormat())->toPattern(pattern); - assertEquals("Format pattern", "h:mm a", pattern); + assertEquals("Format pattern", u"h:mm\u202Fa", pattern); } // Ticket 11669 - thread safety of DateIntervalFormat::format(). This test failed before @@ -1874,7 +1874,7 @@ void DateIntervalFormatTest::testFormattedDateInterval() { { const char16_t* message = u"FormattedDateInterval test 1"; - const char16_t* expectedString = u"July 20 \u2013 25, 2018"; + const char16_t* expectedString = u"July 20\u2009\u2013\u200925, 2018"; LocalPointer input1(Calendar::createInstance("en-GB", status)); if (status.errIfFailureAndReset()) { return; } LocalPointer input2(Calendar::createInstance("en-GB", status)); @@ -1928,7 +1928,7 @@ void DateIntervalFormatTest::testFormattedDateInterval() { // Let input1 be July 20, 2018 and input2 be August 3, 2018: FormattedDateInterval result = fmt->formatToValue(*input1, *input2, status); assertEquals("Expected output from format", - u"July 20 \u2013 August 3, 2018", result.toString(status)); + u"July 20\u2009\u2013\u2009August 3, 2018", result.toString(status)); ConstrainedFieldPosition cfpos; cfpos.constrainField(UFIELD_CATEGORY_DATE_INTERVAL_SPAN, 0); if (result.nextPosition(cfpos, status)) { @@ -2131,15 +2131,15 @@ void DateIntervalFormatTest::testTicket20707() { // Clomuns: hh, HH, kk, KK, jj, JJs, CC UnicodeString expected[][7] = { // Hour-cycle: k - {u"12 AM", u"24", u"24", u"12 AM", u"24", u"0 (hour: 24)", u"12 AM"}, + {u"12\u202FAM", u"24", u"24", u"12\u202FAM", u"24", u"0 (hour: 24)", u"12\u202FAM"}, // Hour-cycle: H - {u"12 AM", u"00", u"00", u"12 AM", u"00", u"0 (hour: 00)", u"12 AM"}, + {u"12\u202FAM", u"00", u"00", u"12\u202FAM", u"00", u"0 (hour: 00)", u"12\u202FAM"}, // Hour-cycle: h - {u"12 AM", u"00", u"00", u"12 AM", u"12 AM", u"0 (hour: 12)", u"12 AM"}, + {u"12\u202FAM", u"00", u"00", u"12\u202FAM", u"12\u202FAM", u"0 (hour: 12)", u"12\u202FAM"}, // Hour-cycle: K - {u"0 AM", u"00", u"00", u"0 AM", u"0 AM", u"0 (hour: 00)", u"0 AM"}, - {u"12 AM", u"00", u"00", u"12 AM", u"12 AM", u"0 (hour: 12)", u"12 AM"}, - {u"12 AM", u"00", u"00", u"12 AM", u"12 AM", u"0 (hour: 12)", u"12 AM"}, + {u"0\u202FAM", u"00", u"00", u"0\u202FAM", u"0\u202FAM", u"0 (hour: 00)", u"0\u202FAM"}, + {u"12\u202FAM", u"00", u"00", u"12\u202FAM", u"12\u202FAM", u"0 (hour: 12)", u"12\u202FAM"}, + {u"12\u202FAM", u"00", u"00", u"12\u202FAM", u"12\u202FAM", u"0 (hour: 12)", u"12\u202FAM"}, // Hour-cycle: K {u"0 am", u"00", u"00", u"0 am", u"0 am", u"0 (\u0918\u0902\u091F\u093E: 00)", u"\u0930\u093E\u0924 0"} }; @@ -2233,17 +2233,17 @@ void DateIntervalFormatTest::testTicket21222GregorianEraDiff() { formatted = g->formatToValue(bothAD, status); assertEquals("Gregorian - calendar both dates in AD", - u"4/5/123, 6 AM \u2013 4/5/124, 6 AM", + u"4/5/123, 6\u202FAM \u2013 4/5/124, 6\u202FAM", formatted.toString(status)); formatted = g->formatToValue(bothBC, status); assertEquals("Gregorian - calendar both dates in BC", - u"4/5/124, 6 AM \u2013 4/5/123, 6 AM", + u"4/5/124, 6\u202FAM \u2013 4/5/123, 6\u202FAM", formatted.toString(status)); formatted = g->formatToValue(BCtoAD, status); assertEquals("Gregorian - BC to AD", - u"4/5/123 B, 6 AM \u2013 4/5/124 A, 6 AM", + u"4/5/123 BC, 6\u202FAM \u2013 4/5/124 AD, 6\u202FAM", formatted.toString(status)); } diff --git a/icu4c/source/test/intltest/dtptngts.cpp b/icu4c/source/test/intltest/dtptngts.cpp index dde9d4dd3acf..63611d057892 100644 --- a/icu4c/source/test/intltest/dtptngts.cpp +++ b/icu4c/source/test/intltest/dtptngts.cpp @@ -105,14 +105,14 @@ void IntlTestDateTimePatternGeneratorAPI::testAPI(/*char *par*/) UnicodeString("Jan 13"), // 05: MMMd UnicodeString("January 13"), // 06: MMMMd UnicodeString("Q1 1999"), // 07: yQQQ - UnicodeString("11:58 PM"), // 08: hhmm + UnicodeString(u"11:58\u202FPM", -1), // 08: hhmm UnicodeString("23:58"), // 09: HHmm - UnicodeString("11:58 PM"), // 10: jjmm + UnicodeString(u"11:58\u202FPM", -1), // 10: jjmm UnicodeString("58:59"), // 11: mmss UnicodeString("January 1999"), // 12: yyyyMMMM UnicodeString("Wed, Jan 13"), // 13: MMMEd -> EEE, MMM d UnicodeString("13 Wed"), // 14: Ed -> d EEE - UnicodeString("11:58:59.123 PM"), // 15: jmmssSSS -> "h:mm:ss.SSS a" + UnicodeString(u"11:58:59.123\u202FPM", -1), // 15: jmmssSSS -> "h:mm:ss.SSS a" UnicodeString("11:58"), // 16: JJmm }; @@ -126,14 +126,14 @@ void IntlTestDateTimePatternGeneratorAPI::testAPI(/*char *par*/) UnicodeString("Jan 13"), // 5: MMMd UnicodeString("January 13"), // 6: MMMMd UnicodeString("Q1 11 Heisei"), // 7: yQQQ - UnicodeString("11:58 PM"), // 8: hhmm + UnicodeString(u"11:58\u202FPM", -1), // 8: hhmm UnicodeString("23:58"), // 9: HHmm - UnicodeString("11:58 PM"), // 10: jjmm + UnicodeString(u"11:58\u202FPM", -1), // 10: jjmm UnicodeString("58:59"), // 11: mmss UnicodeString("January 11 Heisei"), // 12: yyyyMMMM UnicodeString("Wed, Jan 13"), // 13: MMMEd -> EEE, MMM d" UnicodeString("13 Wed"), // 14: Ed -> d EEE - UnicodeString("11:58:59.123 PM"), // 15: jmmssSSS -> "h:mm:ss.SSS a" + UnicodeString(u"11:58:59.123\u202FPM", -1), // 15: jmmssSSS -> "h:mm:ss.SSS a" UnicodeString("11:58"), // 16: JJmm }; @@ -147,7 +147,7 @@ void IntlTestDateTimePatternGeneratorAPI::testAPI(/*char *par*/) UnicodeString("13. Jan."), // 05: MMMd UnicodeString("13. Januar"), // 06: MMMMd UnicodeString("Q1 1999"), // 07: yQQQ - UnicodeString("11:58 PM"), // 08: hhmm + UnicodeString(u"11:58\u202FPM", -1), // 08: hhmm UnicodeString("23:58"), // 09: HHmm UnicodeString("23:58"), // 10: jjmm UnicodeString("58:59"), // 11: mmss @@ -168,7 +168,7 @@ void IntlTestDateTimePatternGeneratorAPI::testAPI(/*char *par*/) UnicodeString("13. tammik."), // 05: MMMd UnicodeString("13. tammikuuta"), // 06: MMMMd UnicodeString("1. nelj. 1999"), // 07: yQQQ - UnicodeString("11.58 ip."), // 08: hhmm + UnicodeString(u"11.58\u202Fip.", -1), // 08: hhmm UnicodeString("23.58"), // 09: HHmm UnicodeString("23.58"), // 10: jjmm UnicodeString("58.59"), // 11: mmss @@ -189,7 +189,7 @@ void IntlTestDateTimePatternGeneratorAPI::testAPI(/*char *par*/) UnicodeString("13 ene"), // 05: MMMd -> "d 'de' MMM" UnicodeString("13 de enero"), // 06: MMMMd -> "d 'de' MMMM" UnicodeString("T1 1999"), // 07: yQQQ -> "QQQ y" - CharsToUnicodeString("11:58 p.\\u00A0m."), // 08: hhmm -> "hh:mm a" + UnicodeString(u"11:58\u202Fp.\u00A0m.", -1), // 08: hhmm -> "hh:mm a" UnicodeString("23:58"), // 09: HHmm -> "HH:mm" UnicodeString("23:58"), // 10: jjmm -> "HH:mm" UnicodeString("58:59"), // 11: mmss -> "mm:ss" @@ -287,18 +287,18 @@ void IntlTestDateTimePatternGeneratorAPI::testAPI(/*char *par*/) UnicodeString patternResults_ru[] = { // ru // 9 ru UnicodeString("01.1999"), // 00: yM -> MM.y - CharsToUnicodeString("\\u044F\\u043D\\u0432. 1999 \\u0433."), // 01: yMMM -> LLL y + UnicodeString(u"\u044F\u043D\u0432. 1999\u202F\u0433.", -1), // 01: yMMM -> LLL y UnicodeString("13.01.1999"), // 02: yMd -> dd.MM.y - CharsToUnicodeString("13 \\u044F\\u043D\\u0432. 1999 \\u0433."), // 03: yMMMd -> d MMM y + UnicodeString(u"13 \u044F\u043D\u0432. 1999\u202F\u0433.",-1), // 03: yMMMd -> d MMM y UnicodeString("13.01"), // 04: Md -> dd.MM CharsToUnicodeString("13 \\u044F\\u043D\\u0432."), // 05: MMMd -> d MMM CharsToUnicodeString("13 \\u044F\\u043D\\u0432\\u0430\\u0440\\u044F"), // 06: MMMMd -> d MMMM - CharsToUnicodeString("1-\\u0439 \\u043A\\u0432. 1999 \\u0433."), // 07: yQQQ -> y QQQ - CharsToUnicodeString("11:58 PM"), // 08: hhmm -> hh:mm a + UnicodeString(u"1-\u0439 \u043A\u0432. 1999\u202F\u0433.",-1), // 07: yQQQ -> y QQQ + UnicodeString(u"11:58\u202FPM", -1), // 08: hhmm -> hh:mm a UnicodeString("23:58"), // 09: HHmm -> HH:mm UnicodeString("23:58"), // 10: jjmm -> HH:mm UnicodeString("58:59"), // 11: mmss -> mm:ss - CharsToUnicodeString("\\u044F\\u043D\\u0432\\u0430\\u0440\\u044C 1999 \\u0433."), // 12: yyyyMMMM -> LLLL y + UnicodeString(u"\u044F\u043D\u0432\u0430\u0440\u044C 1999\u202F\u0433.",-1), // 12: yyyyMMMM -> LLLL y CharsToUnicodeString("\\u0441\\u0440, 13 \\u044F\\u043D\\u0432."), // 13: MMMEd -> ccc, d MMM CharsToUnicodeString("\\u0441\\u0440, 13"), // 14: Ed -> EEE, d UnicodeString("23:58:59,123"), // 15: jmmssSSS -> "H:mm:ss,SSS" @@ -397,15 +397,15 @@ void IntlTestDateTimePatternGeneratorAPI::testAPI(/*char *par*/) UnicodeString("O 14, 1999"), UnicodeString("T, O 14"), UnicodeString("Oct 14"), - UnicodeString("Oct 14, 6:58 AM"), - UnicodeString("Thu, Oct 14, 6:58:59 AM"), - UnicodeString("10/14, 6:58 AM"), - UnicodeString("Thursday, Oct 14, 6:58:59 AM"), - UnicodeString("Oct 14, 1999, 6:58:59 AM"), - UnicodeString("Thu, Oct 14, 1999, 6:58:59 AM"), - UnicodeString("6:58 AM"), - UnicodeString("6:58 AM"), - UnicodeString("6:58 AM GMT"), + UnicodeString(u"Oct 14, 6:58\u202FAM", -1), + UnicodeString(u"Thu, Oct 14, 6:58:59\u202FAM", -1), + UnicodeString(u"10/14, 6:58\u202FAM", -1), + UnicodeString(u"Thursday, Oct 14, 6:58:59\u202FAM", -1), + UnicodeString(u"Oct 14, 1999, 6:58:59\u202FAM", -1), + UnicodeString(u"Thu, Oct 14, 1999, 6:58:59\u202FAM", -1), + UnicodeString(u"6:58\u202FAM", -1), + UnicodeString(u"6:58\u202FAM", -1), + UnicodeString(u"6:58\u202FAM GMT", -1), UnicodeString(""), }; @@ -666,7 +666,7 @@ void IntlTestDateTimePatternGeneratorAPI::testAPI(/*char *par*/) // Trac# 6172 duplicate time pattern status = U_ZERO_ERROR; pattern = UnicodeString("hmv"); - UnicodeString expR = UnicodeString("h:mm a v"); // avail formats has hm -> "h:mm a" (fixed expected result per ticket:6626:) + UnicodeString expR = UnicodeString(u"h:mm\u202Fa v", -1); Locale loc("en"); DateTimePatternGenerator *patGen=DateTimePatternGenerator::createInstance(loc, status); if(U_FAILURE(status)) { @@ -919,48 +919,48 @@ void IntlTestDateTimePatternGeneratorAPI::testAPI(/*char *par*/) typedef struct DTPtnGenOptionsData { const char *locale; const char *skel; - const char *expectedPattern; + const UChar *expectedPattern; UDateTimePatternMatchOptions options; } DTPtnGenOptionsData; void IntlTestDateTimePatternGeneratorAPI::testOptions(/*char *par*/) { DTPtnGenOptionsData testData[] = { - // locale skel expectedPattern options - { "en", "Hmm", "HH:mm", UDATPG_MATCH_NO_OPTIONS }, - { "en", "HHmm", "HH:mm", UDATPG_MATCH_NO_OPTIONS }, - { "en", "hhmm", "h:mm a", UDATPG_MATCH_NO_OPTIONS }, - { "en", "Hmm", "HH:mm", UDATPG_MATCH_HOUR_FIELD_LENGTH }, - { "en", "HHmm", "HH:mm", UDATPG_MATCH_HOUR_FIELD_LENGTH }, - { "en", "hhmm", "hh:mm a", UDATPG_MATCH_HOUR_FIELD_LENGTH }, - { "da", "Hmm", "HH.mm", UDATPG_MATCH_NO_OPTIONS }, - { "da", "HHmm", "HH.mm", UDATPG_MATCH_NO_OPTIONS }, - { "da", "hhmm", "h.mm a", UDATPG_MATCH_NO_OPTIONS }, - { "da", "Hmm", "H.mm", UDATPG_MATCH_HOUR_FIELD_LENGTH }, - { "da", "HHmm", "HH.mm", UDATPG_MATCH_HOUR_FIELD_LENGTH }, - { "da", "hhmm", "hh.mm a", UDATPG_MATCH_HOUR_FIELD_LENGTH }, + // locale skel expectedPattern options + { "en", "Hmm", u"HH:mm", UDATPG_MATCH_NO_OPTIONS }, + { "en", "HHmm", u"HH:mm", UDATPG_MATCH_NO_OPTIONS }, + { "en", "hhmm", u"h:mm\u202Fa", UDATPG_MATCH_NO_OPTIONS }, + { "en", "Hmm", u"HH:mm", UDATPG_MATCH_HOUR_FIELD_LENGTH }, + { "en", "HHmm", u"HH:mm", UDATPG_MATCH_HOUR_FIELD_LENGTH }, + { "en", "hhmm", u"hh:mm\u202Fa", UDATPG_MATCH_HOUR_FIELD_LENGTH }, + { "da", "Hmm", u"HH.mm", UDATPG_MATCH_NO_OPTIONS }, + { "da", "HHmm", u"HH.mm", UDATPG_MATCH_NO_OPTIONS }, + { "da", "hhmm", u"h.mm\u202Fa", UDATPG_MATCH_NO_OPTIONS }, + { "da", "Hmm", u"H.mm", UDATPG_MATCH_HOUR_FIELD_LENGTH }, + { "da", "HHmm", u"HH.mm", UDATPG_MATCH_HOUR_FIELD_LENGTH }, + { "da", "hhmm", u"hh.mm\u202Fa", UDATPG_MATCH_HOUR_FIELD_LENGTH }, // - { "en", "yyyy", "yyyy", UDATPG_MATCH_NO_OPTIONS }, - { "en", "YYYY", "YYYY", UDATPG_MATCH_NO_OPTIONS }, - { "en", "U", "y", UDATPG_MATCH_NO_OPTIONS }, - { "en@calendar=japanese", "yyyy", "y G", UDATPG_MATCH_NO_OPTIONS }, - { "en@calendar=japanese", "YYYY", "Y G", UDATPG_MATCH_NO_OPTIONS }, - { "en@calendar=japanese", "U", "y G", UDATPG_MATCH_NO_OPTIONS }, - { "en@calendar=chinese", "yyyy", "r(U)", UDATPG_MATCH_NO_OPTIONS }, - { "en@calendar=chinese", "YYYY", "Y(Y)", UDATPG_MATCH_NO_OPTIONS }, // not a good result, want r(Y) or r(U) - { "en@calendar=chinese", "U", "r(U)", UDATPG_MATCH_NO_OPTIONS }, - { "en@calendar=chinese", "Gy", "r(U)", UDATPG_MATCH_NO_OPTIONS }, - { "en@calendar=chinese", "GU", "r(U)", UDATPG_MATCH_NO_OPTIONS }, - { "en@calendar=chinese", "ULLL", "MMM U", UDATPG_MATCH_NO_OPTIONS }, - { "en@calendar=chinese", "yMMM", "MMM r", UDATPG_MATCH_NO_OPTIONS }, - { "en@calendar=chinese", "GUMMM", "MMM r", UDATPG_MATCH_NO_OPTIONS }, - { "zh@calendar=chinese", "yyyy", "rU\\u5E74", UDATPG_MATCH_NO_OPTIONS }, - { "zh@calendar=chinese", "YYYY", "YY\\u5E74", UDATPG_MATCH_NO_OPTIONS }, // not a good result, may want r(Y) or r(U) - { "zh@calendar=chinese", "U", "rU\\u5E74", UDATPG_MATCH_NO_OPTIONS }, - { "zh@calendar=chinese", "Gy", "rU\\u5E74", UDATPG_MATCH_NO_OPTIONS }, - { "zh@calendar=chinese", "GU", "rU\\u5E74", UDATPG_MATCH_NO_OPTIONS }, - { "zh@calendar=chinese", "ULLL", "U\\u5E74MMM", UDATPG_MATCH_NO_OPTIONS }, - { "zh@calendar=chinese", "yMMM", "rU\\u5E74MMM", UDATPG_MATCH_NO_OPTIONS }, - { "zh@calendar=chinese", "GUMMM", "rU\\u5E74MMM", UDATPG_MATCH_NO_OPTIONS }, + { "en", "yyyy", u"yyyy", UDATPG_MATCH_NO_OPTIONS }, + { "en", "YYYY", u"YYYY", UDATPG_MATCH_NO_OPTIONS }, + { "en", "U", u"y", UDATPG_MATCH_NO_OPTIONS }, + { "en@calendar=japanese", "yyyy", u"y G", UDATPG_MATCH_NO_OPTIONS }, + { "en@calendar=japanese", "YYYY", u"Y G", UDATPG_MATCH_NO_OPTIONS }, + { "en@calendar=japanese", "U", u"y G", UDATPG_MATCH_NO_OPTIONS }, + { "en@calendar=chinese", "yyyy", u"r(U)", UDATPG_MATCH_NO_OPTIONS }, + { "en@calendar=chinese", "YYYY", u"Y(Y)", UDATPG_MATCH_NO_OPTIONS }, // not a good result, want r(Y) or r(U) + { "en@calendar=chinese", "U", u"r(U)", UDATPG_MATCH_NO_OPTIONS }, + { "en@calendar=chinese", "Gy", u"r(U)", UDATPG_MATCH_NO_OPTIONS }, + { "en@calendar=chinese", "GU", u"r(U)", UDATPG_MATCH_NO_OPTIONS }, + { "en@calendar=chinese", "ULLL", u"MMM U", UDATPG_MATCH_NO_OPTIONS }, + { "en@calendar=chinese", "yMMM", u"MMM r", UDATPG_MATCH_NO_OPTIONS }, + { "en@calendar=chinese", "GUMMM", u"MMM r", UDATPG_MATCH_NO_OPTIONS }, + { "zh@calendar=chinese", "yyyy", u"rU年", UDATPG_MATCH_NO_OPTIONS }, + { "zh@calendar=chinese", "YYYY", u"YY年", UDATPG_MATCH_NO_OPTIONS }, // not a good result, may want r(Y) or r(U) + { "zh@calendar=chinese", "U", u"rU年", UDATPG_MATCH_NO_OPTIONS }, + { "zh@calendar=chinese", "Gy", u"rU年", UDATPG_MATCH_NO_OPTIONS }, + { "zh@calendar=chinese", "GU", u"rU年", UDATPG_MATCH_NO_OPTIONS }, + { "zh@calendar=chinese", "ULLL", u"U年MMM", UDATPG_MATCH_NO_OPTIONS }, + { "zh@calendar=chinese", "yMMM", u"rU年MMM", UDATPG_MATCH_NO_OPTIONS }, + { "zh@calendar=chinese", "GUMMM", u"rU年MMM", UDATPG_MATCH_NO_OPTIONS }, }; int count = UPRV_LENGTHOF(testData); @@ -971,7 +971,7 @@ void IntlTestDateTimePatternGeneratorAPI::testOptions(/*char *par*/) Locale locale(testDataPtr->locale); UnicodeString skel(testDataPtr->skel); - UnicodeString expectedPattern(UnicodeString(testDataPtr->expectedPattern).unescape()); + UnicodeString expectedPattern(testDataPtr->expectedPattern, -1); UDateTimePatternMatchOptions options = testDataPtr->options; DateTimePatternGenerator * dtpgen = DateTimePatternGenerator::createInstance(locale, status); @@ -1171,13 +1171,13 @@ void IntlTestDateTimePatternGeneratorAPI::testC() { {"de", "CCm", "HH:mm"}, {"de", "CCCm", "HH:mm"}, {"de", "CCCCm", "HH:mm"}, - {"en", "Cm", "h:mm a"}, - {"en", "CCm", "hh:mm a"}, - {"en", "CCCm", "h:mm aaaa"}, - {"en", "CCCCm", "hh:mm aaaa"}, - {"en", "CCCCCm", "h:mm aaaaa"}, - {"en", "CCCCCCm", "hh:mm aaaaa"}, - {"en-BN", "Cm", "h:mm b"}, + {"en", "Cm", "h:mm\\u202Fa"}, + {"en", "CCm", "hh:mm\\u202Fa"}, + {"en", "CCCm", "h:mm\\u202Faaaa"}, + {"en", "CCCCm", "hh:mm\\u202Faaaa"}, + {"en", "CCCCCm", "h:mm\\u202Faaaaa"}, + {"en", "CCCCCCm", "hh:mm\\u202Faaaaa"}, + {"en-BN", "Cm", "h:mm\\u202Fb"}, {"gu-IN", "Cm", "h:mm B"}, {"und-IN", "Cm", "h:mm B"} }; @@ -1193,7 +1193,7 @@ void IntlTestDateTimePatternGeneratorAPI::testC() { } UDateTimePatternMatchOptions options = UDATPG_MATCH_HOUR_FIELD_LENGTH; UnicodeString pattern = gen->getBestPattern(tests[i][1], options, status); - UnicodeString expectedPattern = tests[i][2]; + UnicodeString expectedPattern = UnicodeString(tests[i][2]).unescape(); char message[100] = "\0"; strcat(message, tests[i][0]); @@ -1423,7 +1423,7 @@ void IntlTestDateTimePatternGeneratorAPI::test20640_HourCyclArsEnNH() { {"ars", u"h a", u"h:mm a", UDAT_HOUR_CYCLE_12}, // en_NH is interesting because NH is a deprecated region code; // formerly New Hebrides, now Vanuatu => VU => h. - {"en_NH", u"h a", u"h:mm a", UDAT_HOUR_CYCLE_12}, + {"en_NH", u"h\u202Fa", u"h:mm\u202Fa", UDAT_HOUR_CYCLE_12}, // ch_ZH is a typo (should be zh_CN), but we should fail gracefully. {"cn_ZH", u"HH", u"HH:mm", UDAT_HOUR_CYCLE_23 }, // Desired & now actual behavior (does this fix ICU-20653?) // a non-BCP47 locale without a country code should not fail @@ -1642,10 +1642,10 @@ void IntlTestDateTimePatternGeneratorAPI::testDateTimePatterns() { // The following tests some locales in which there are differences between the // DateTimePatterns of various length styles. DTPLocaleAndResults localeAndResults[] = { - { "en", { UnicodeString(u"EEEE, MMMM d, y 'at' h:mm a"), // long != medium - UnicodeString(u"MMMM d, y 'at' h:mm a"), - UnicodeString(u"MMM d, y, h:mm a"), - UnicodeString(u"M/d/y, h:mm a") } }, + { "en", { UnicodeString(u"EEEE, MMMM d, y 'at' h:mm\u202Fa"), // long != medium + UnicodeString(u"MMMM d, y 'at' h:mm\u202Fa"), + UnicodeString(u"MMM d, y, h:mm\u202Fa"), + UnicodeString(u"M/d/y, h:mm\u202Fa") } }, { "fr", { UnicodeString(u"EEEE d MMMM y 'à' HH:mm"), // medium != short UnicodeString(u"d MMMM y 'à' HH:mm"), UnicodeString(u"d MMM y, HH:mm"), @@ -1670,10 +1670,10 @@ void IntlTestDateTimePatternGeneratorAPI::testDateTimePatterns() { UnicodeString(u"{1} _2_ {0}"), UnicodeString(u"{1} _3_ {0}") }; - DTPLocaleAndResults enModResults = { "en", { UnicodeString(u"EEEE, MMMM d, y _0_ h:mm a"), - UnicodeString(u"MMMM d, y _1_ h:mm a"), - UnicodeString(u"MMM d, y _2_ h:mm a"), - UnicodeString(u"M/d/y _3_ h:mm a") } + DTPLocaleAndResults enModResults = { "en", { UnicodeString(u"EEEE, MMMM d, y _0_ h:mm\u202Fa"), + UnicodeString(u"MMMM d, y _1_ h:mm\u202Fa"), + UnicodeString(u"MMM d, y _2_ h:mm\u202Fa"), + UnicodeString(u"M/d/y _3_ h:mm\u202Fa") } }; // Test various locales with standard data diff --git a/icu4c/source/test/intltest/formatted_string_builder_test.cpp b/icu4c/source/test/intltest/formatted_string_builder_test.cpp index 57294e248563..debaaf496242 100644 --- a/icu4c/source/test/intltest/formatted_string_builder_test.cpp +++ b/icu4c/source/test/intltest/formatted_string_builder_test.cpp @@ -312,38 +312,58 @@ void FormattedStringBuilderTest::testCodePoints() { void FormattedStringBuilderTest::testInsertOverflow() { if (quick) return; + // Setup the test fixture in sb, sb2, ustr. UErrorCode status = U_ZERO_ERROR; FormattedStringBuilder sb; int32_t data_length = INT32_MAX / 2; - UnicodeString ustr(data_length, u'a', data_length); - sb.append(ustr, kUndefinedField, status); + infoln("# log: setup start, data_length %d", data_length); + UnicodeString ustr(data_length, u'a', data_length); // set ustr to length 1073741823 + sb.append(ustr, kUndefinedField, status); // set sb to length 1073741823 + infoln("# log: setup 1 done, ustr len %d, sb len %d, status %s", ustr.length(), sb.length(), u_errorName(status)); assertSuccess("Setup the first FormattedStringBuilder", status); FormattedStringBuilder sb2; sb2.append(ustr, kUndefinedField, status); - sb2.insert(0, ustr, 0, data_length / 2, kUndefinedField, status); + sb2.insert(0, ustr, 0, data_length / 2, kUndefinedField, status); // set sb2 to length 1610612734 sb2.writeTerminator(status); + infoln("# log: setup 2 done, sb2 len %d, status %s", sb2.length(), u_errorName(status)); assertSuccess("Setup the second FormattedStringBuilder", status); - ustr = sb2.toUnicodeString(); + if (!logKnownIssue("22047", "FormattedStringBuilder with long length crashes in toUnicodeString in CI Linux tests")) { + // The following should set ustr to have length 1610612734, but is currently crashing + // in the CI test "C: Linux Clang Exhaustive Tests (Ubuntu 18.04)", though not + // crashing when running exhaustive tests locally on e.g. macOS 12.4 on Intel). + // Skipping this leaves ustr with length 1073741823. + ustr = sb2.toUnicodeString(); + } else { + // Alternative approach which sets ustr to length 1073741871, still long + // enough to test the expected behavior for the remainder of the code here. + ustr.append(u"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",-1); + } // Complete setting up the test fixture in sb, sb2 and ustr. + infoln("# log: setup 3 done, ustr len %d", ustr.length()); // Test splice() of the second UnicodeString sb.splice(0, 1, ustr, 1, ustr.length(), kUndefinedField, status); + infoln("# log: sb.splice 1 done, sb len %d, status %s", sb.length(), u_errorName(status)); assertEquals( "splice() long text should not crash but return U_INPUT_TOO_LONG_ERROR", U_INPUT_TOO_LONG_ERROR, status); // Test sb.insert() of the first FormattedStringBuilder with the second one. + status = U_ZERO_ERROR; sb.insert(0, sb2, status); + infoln("# log: sb.insert 1 done, sb len %d, status %s", sb.length(), u_errorName(status)); assertEquals( "insert() long FormattedStringBuilder should not crash but return " "U_INPUT_TOO_LONG_ERROR", U_INPUT_TOO_LONG_ERROR, status); // Test sb.insert() of the first FormattedStringBuilder with UnicodeString. + status = U_ZERO_ERROR; sb.insert(0, ustr, 0, ustr.length(), kUndefinedField, status); + infoln("# log: sb.insert 2 done, sb len %d, status %s", sb.length(), u_errorName(status)); assertEquals( "insert() long UnicodeString should not crash but return " "U_INPUT_TOO_LONG_ERROR", U_INPUT_TOO_LONG_ERROR, status); diff --git a/icu4c/source/test/intltest/measfmttest.cpp b/icu4c/source/test/intltest/measfmttest.cpp index 05488b7c360f..eab308d07363 100644 --- a/icu4c/source/test/intltest/measfmttest.cpp +++ b/icu4c/source/test/intltest/measfmttest.cpp @@ -59,6 +59,7 @@ class MeasureFormatTest : public IntlTest { void TestCompatible68(); void TestCompatible69(); void TestCompatible70(); + void TestCompatible72(); void TestGetAvailable(); void TestExamplesInDocs(); void TestFormatPeriodEn(); @@ -193,6 +194,7 @@ void MeasureFormatTest::runIndexedTest( TESTCASE_AUTO(TestCompatible68); TESTCASE_AUTO(TestCompatible69); TESTCASE_AUTO(TestCompatible70); + TESTCASE_AUTO(TestCompatible72); TESTCASE_AUTO(TestGetAvailable); TESTCASE_AUTO(TestExamplesInDocs); TESTCASE_AUTO(TestFormatPeriodEn); @@ -3067,6 +3069,389 @@ void MeasureFormatTest::TestCompatible70() { // TestCompatible71 would be identi // TestCompatible71 would be identical to TestCompatible70, // no need to add it +void MeasureFormatTest::TestCompatible72() { + UErrorCode status = U_ZERO_ERROR; + LocalPointer measureUnit; + MeasureUnit measureUnitValue; + measureUnit.adoptInstead(MeasureUnit::createGForce(status)); + measureUnitValue = MeasureUnit::getGForce(); + measureUnit.adoptInstead(MeasureUnit::createMeterPerSecondSquared(status)); + measureUnitValue = MeasureUnit::getMeterPerSecondSquared(); + measureUnit.adoptInstead(MeasureUnit::createArcMinute(status)); + measureUnitValue = MeasureUnit::getArcMinute(); + measureUnit.adoptInstead(MeasureUnit::createArcSecond(status)); + measureUnitValue = MeasureUnit::getArcSecond(); + measureUnit.adoptInstead(MeasureUnit::createDegree(status)); + measureUnitValue = MeasureUnit::getDegree(); + measureUnit.adoptInstead(MeasureUnit::createRadian(status)); + measureUnitValue = MeasureUnit::getRadian(); + measureUnit.adoptInstead(MeasureUnit::createRevolutionAngle(status)); + measureUnitValue = MeasureUnit::getRevolutionAngle(); + measureUnit.adoptInstead(MeasureUnit::createAcre(status)); + measureUnitValue = MeasureUnit::getAcre(); + measureUnit.adoptInstead(MeasureUnit::createDunam(status)); + measureUnitValue = MeasureUnit::getDunam(); + measureUnit.adoptInstead(MeasureUnit::createHectare(status)); + measureUnitValue = MeasureUnit::getHectare(); + measureUnit.adoptInstead(MeasureUnit::createSquareCentimeter(status)); + measureUnitValue = MeasureUnit::getSquareCentimeter(); + measureUnit.adoptInstead(MeasureUnit::createSquareFoot(status)); + measureUnitValue = MeasureUnit::getSquareFoot(); + measureUnit.adoptInstead(MeasureUnit::createSquareInch(status)); + measureUnitValue = MeasureUnit::getSquareInch(); + measureUnit.adoptInstead(MeasureUnit::createSquareKilometer(status)); + measureUnitValue = MeasureUnit::getSquareKilometer(); + measureUnit.adoptInstead(MeasureUnit::createSquareMeter(status)); + measureUnitValue = MeasureUnit::getSquareMeter(); + measureUnit.adoptInstead(MeasureUnit::createSquareMile(status)); + measureUnitValue = MeasureUnit::getSquareMile(); + measureUnit.adoptInstead(MeasureUnit::createSquareYard(status)); + measureUnitValue = MeasureUnit::getSquareYard(); + measureUnit.adoptInstead(MeasureUnit::createItem(status)); + measureUnitValue = MeasureUnit::getItem(); + measureUnit.adoptInstead(MeasureUnit::createKarat(status)); + measureUnitValue = MeasureUnit::getKarat(); + measureUnit.adoptInstead(MeasureUnit::createMilligramOfglucosePerDeciliter(status)); + measureUnitValue = MeasureUnit::getMilligramOfglucosePerDeciliter(); + measureUnit.adoptInstead(MeasureUnit::createMilligramPerDeciliter(status)); + measureUnitValue = MeasureUnit::getMilligramPerDeciliter(); + measureUnit.adoptInstead(MeasureUnit::createMillimolePerLiter(status)); + measureUnitValue = MeasureUnit::getMillimolePerLiter(); + measureUnit.adoptInstead(MeasureUnit::createMole(status)); + measureUnitValue = MeasureUnit::getMole(); + measureUnit.adoptInstead(MeasureUnit::createPercent(status)); + measureUnitValue = MeasureUnit::getPercent(); + measureUnit.adoptInstead(MeasureUnit::createPermille(status)); + measureUnitValue = MeasureUnit::getPermille(); + measureUnit.adoptInstead(MeasureUnit::createPartPerMillion(status)); + measureUnitValue = MeasureUnit::getPartPerMillion(); + measureUnit.adoptInstead(MeasureUnit::createPermyriad(status)); + measureUnitValue = MeasureUnit::getPermyriad(); + measureUnit.adoptInstead(MeasureUnit::createLiterPer100Kilometers(status)); + measureUnitValue = MeasureUnit::getLiterPer100Kilometers(); + measureUnit.adoptInstead(MeasureUnit::createLiterPerKilometer(status)); + measureUnitValue = MeasureUnit::getLiterPerKilometer(); + measureUnit.adoptInstead(MeasureUnit::createMilePerGallon(status)); + measureUnitValue = MeasureUnit::getMilePerGallon(); + measureUnit.adoptInstead(MeasureUnit::createMilePerGallonImperial(status)); + measureUnitValue = MeasureUnit::getMilePerGallonImperial(); + measureUnit.adoptInstead(MeasureUnit::createBit(status)); + measureUnitValue = MeasureUnit::getBit(); + measureUnit.adoptInstead(MeasureUnit::createByte(status)); + measureUnitValue = MeasureUnit::getByte(); + measureUnit.adoptInstead(MeasureUnit::createGigabit(status)); + measureUnitValue = MeasureUnit::getGigabit(); + measureUnit.adoptInstead(MeasureUnit::createGigabyte(status)); + measureUnitValue = MeasureUnit::getGigabyte(); + measureUnit.adoptInstead(MeasureUnit::createKilobit(status)); + measureUnitValue = MeasureUnit::getKilobit(); + measureUnit.adoptInstead(MeasureUnit::createKilobyte(status)); + measureUnitValue = MeasureUnit::getKilobyte(); + measureUnit.adoptInstead(MeasureUnit::createMegabit(status)); + measureUnitValue = MeasureUnit::getMegabit(); + measureUnit.adoptInstead(MeasureUnit::createMegabyte(status)); + measureUnitValue = MeasureUnit::getMegabyte(); + measureUnit.adoptInstead(MeasureUnit::createPetabyte(status)); + measureUnitValue = MeasureUnit::getPetabyte(); + measureUnit.adoptInstead(MeasureUnit::createTerabit(status)); + measureUnitValue = MeasureUnit::getTerabit(); + measureUnit.adoptInstead(MeasureUnit::createTerabyte(status)); + measureUnitValue = MeasureUnit::getTerabyte(); + measureUnit.adoptInstead(MeasureUnit::createCentury(status)); + measureUnitValue = MeasureUnit::getCentury(); + measureUnit.adoptInstead(MeasureUnit::createDay(status)); + measureUnitValue = MeasureUnit::getDay(); + measureUnit.adoptInstead(MeasureUnit::createDayPerson(status)); + measureUnitValue = MeasureUnit::getDayPerson(); + measureUnit.adoptInstead(MeasureUnit::createDecade(status)); + measureUnitValue = MeasureUnit::getDecade(); + measureUnit.adoptInstead(MeasureUnit::createHour(status)); + measureUnitValue = MeasureUnit::getHour(); + measureUnit.adoptInstead(MeasureUnit::createMicrosecond(status)); + measureUnitValue = MeasureUnit::getMicrosecond(); + measureUnit.adoptInstead(MeasureUnit::createMillisecond(status)); + measureUnitValue = MeasureUnit::getMillisecond(); + measureUnit.adoptInstead(MeasureUnit::createMinute(status)); + measureUnitValue = MeasureUnit::getMinute(); + measureUnit.adoptInstead(MeasureUnit::createMonth(status)); + measureUnitValue = MeasureUnit::getMonth(); + measureUnit.adoptInstead(MeasureUnit::createMonthPerson(status)); + measureUnitValue = MeasureUnit::getMonthPerson(); + measureUnit.adoptInstead(MeasureUnit::createNanosecond(status)); + measureUnitValue = MeasureUnit::getNanosecond(); + measureUnit.adoptInstead(MeasureUnit::createQuarter(status)); + measureUnitValue = MeasureUnit::getQuarter(); + measureUnit.adoptInstead(MeasureUnit::createSecond(status)); + measureUnitValue = MeasureUnit::getSecond(); + measureUnit.adoptInstead(MeasureUnit::createWeek(status)); + measureUnitValue = MeasureUnit::getWeek(); + measureUnit.adoptInstead(MeasureUnit::createWeekPerson(status)); + measureUnitValue = MeasureUnit::getWeekPerson(); + measureUnit.adoptInstead(MeasureUnit::createYear(status)); + measureUnitValue = MeasureUnit::getYear(); + measureUnit.adoptInstead(MeasureUnit::createYearPerson(status)); + measureUnitValue = MeasureUnit::getYearPerson(); + measureUnit.adoptInstead(MeasureUnit::createAmpere(status)); + measureUnitValue = MeasureUnit::getAmpere(); + measureUnit.adoptInstead(MeasureUnit::createMilliampere(status)); + measureUnitValue = MeasureUnit::getMilliampere(); + measureUnit.adoptInstead(MeasureUnit::createOhm(status)); + measureUnitValue = MeasureUnit::getOhm(); + measureUnit.adoptInstead(MeasureUnit::createVolt(status)); + measureUnitValue = MeasureUnit::getVolt(); + measureUnit.adoptInstead(MeasureUnit::createBritishThermalUnit(status)); + measureUnitValue = MeasureUnit::getBritishThermalUnit(); + measureUnit.adoptInstead(MeasureUnit::createCalorie(status)); + measureUnitValue = MeasureUnit::getCalorie(); + measureUnit.adoptInstead(MeasureUnit::createElectronvolt(status)); + measureUnitValue = MeasureUnit::getElectronvolt(); + measureUnit.adoptInstead(MeasureUnit::createFoodcalorie(status)); + measureUnitValue = MeasureUnit::getFoodcalorie(); + measureUnit.adoptInstead(MeasureUnit::createJoule(status)); + measureUnitValue = MeasureUnit::getJoule(); + measureUnit.adoptInstead(MeasureUnit::createKilocalorie(status)); + measureUnitValue = MeasureUnit::getKilocalorie(); + measureUnit.adoptInstead(MeasureUnit::createKilojoule(status)); + measureUnitValue = MeasureUnit::getKilojoule(); + measureUnit.adoptInstead(MeasureUnit::createKilowattHour(status)); + measureUnitValue = MeasureUnit::getKilowattHour(); + measureUnit.adoptInstead(MeasureUnit::createThermUs(status)); + measureUnitValue = MeasureUnit::getThermUs(); + measureUnit.adoptInstead(MeasureUnit::createKilowattHourPer100Kilometer(status)); + measureUnitValue = MeasureUnit::getKilowattHourPer100Kilometer(); + measureUnit.adoptInstead(MeasureUnit::createNewton(status)); + measureUnitValue = MeasureUnit::getNewton(); + measureUnit.adoptInstead(MeasureUnit::createPoundForce(status)); + measureUnitValue = MeasureUnit::getPoundForce(); + measureUnit.adoptInstead(MeasureUnit::createGigahertz(status)); + measureUnitValue = MeasureUnit::getGigahertz(); + measureUnit.adoptInstead(MeasureUnit::createHertz(status)); + measureUnitValue = MeasureUnit::getHertz(); + measureUnit.adoptInstead(MeasureUnit::createKilohertz(status)); + measureUnitValue = MeasureUnit::getKilohertz(); + measureUnit.adoptInstead(MeasureUnit::createMegahertz(status)); + measureUnitValue = MeasureUnit::getMegahertz(); + measureUnit.adoptInstead(MeasureUnit::createDot(status)); + measureUnitValue = MeasureUnit::getDot(); + measureUnit.adoptInstead(MeasureUnit::createDotPerCentimeter(status)); + measureUnitValue = MeasureUnit::getDotPerCentimeter(); + measureUnit.adoptInstead(MeasureUnit::createDotPerInch(status)); + measureUnitValue = MeasureUnit::getDotPerInch(); + measureUnit.adoptInstead(MeasureUnit::createEm(status)); + measureUnitValue = MeasureUnit::getEm(); + measureUnit.adoptInstead(MeasureUnit::createMegapixel(status)); + measureUnitValue = MeasureUnit::getMegapixel(); + measureUnit.adoptInstead(MeasureUnit::createPixel(status)); + measureUnitValue = MeasureUnit::getPixel(); + measureUnit.adoptInstead(MeasureUnit::createPixelPerCentimeter(status)); + measureUnitValue = MeasureUnit::getPixelPerCentimeter(); + measureUnit.adoptInstead(MeasureUnit::createPixelPerInch(status)); + measureUnitValue = MeasureUnit::getPixelPerInch(); + measureUnit.adoptInstead(MeasureUnit::createAstronomicalUnit(status)); + measureUnitValue = MeasureUnit::getAstronomicalUnit(); + measureUnit.adoptInstead(MeasureUnit::createCentimeter(status)); + measureUnitValue = MeasureUnit::getCentimeter(); + measureUnit.adoptInstead(MeasureUnit::createDecimeter(status)); + measureUnitValue = MeasureUnit::getDecimeter(); + measureUnit.adoptInstead(MeasureUnit::createEarthRadius(status)); + measureUnitValue = MeasureUnit::getEarthRadius(); + measureUnit.adoptInstead(MeasureUnit::createFathom(status)); + measureUnitValue = MeasureUnit::getFathom(); + measureUnit.adoptInstead(MeasureUnit::createFoot(status)); + measureUnitValue = MeasureUnit::getFoot(); + measureUnit.adoptInstead(MeasureUnit::createFurlong(status)); + measureUnitValue = MeasureUnit::getFurlong(); + measureUnit.adoptInstead(MeasureUnit::createInch(status)); + measureUnitValue = MeasureUnit::getInch(); + measureUnit.adoptInstead(MeasureUnit::createKilometer(status)); + measureUnitValue = MeasureUnit::getKilometer(); + measureUnit.adoptInstead(MeasureUnit::createLightYear(status)); + measureUnitValue = MeasureUnit::getLightYear(); + measureUnit.adoptInstead(MeasureUnit::createMeter(status)); + measureUnitValue = MeasureUnit::getMeter(); + measureUnit.adoptInstead(MeasureUnit::createMicrometer(status)); + measureUnitValue = MeasureUnit::getMicrometer(); + measureUnit.adoptInstead(MeasureUnit::createMile(status)); + measureUnitValue = MeasureUnit::getMile(); + measureUnit.adoptInstead(MeasureUnit::createMileScandinavian(status)); + measureUnitValue = MeasureUnit::getMileScandinavian(); + measureUnit.adoptInstead(MeasureUnit::createMillimeter(status)); + measureUnitValue = MeasureUnit::getMillimeter(); + measureUnit.adoptInstead(MeasureUnit::createNanometer(status)); + measureUnitValue = MeasureUnit::getNanometer(); + measureUnit.adoptInstead(MeasureUnit::createNauticalMile(status)); + measureUnitValue = MeasureUnit::getNauticalMile(); + measureUnit.adoptInstead(MeasureUnit::createParsec(status)); + measureUnitValue = MeasureUnit::getParsec(); + measureUnit.adoptInstead(MeasureUnit::createPicometer(status)); + measureUnitValue = MeasureUnit::getPicometer(); + measureUnit.adoptInstead(MeasureUnit::createPoint(status)); + measureUnitValue = MeasureUnit::getPoint(); + measureUnit.adoptInstead(MeasureUnit::createSolarRadius(status)); + measureUnitValue = MeasureUnit::getSolarRadius(); + measureUnit.adoptInstead(MeasureUnit::createYard(status)); + measureUnitValue = MeasureUnit::getYard(); + measureUnit.adoptInstead(MeasureUnit::createCandela(status)); + measureUnitValue = MeasureUnit::getCandela(); + measureUnit.adoptInstead(MeasureUnit::createLumen(status)); + measureUnitValue = MeasureUnit::getLumen(); + measureUnit.adoptInstead(MeasureUnit::createLux(status)); + measureUnitValue = MeasureUnit::getLux(); + measureUnit.adoptInstead(MeasureUnit::createSolarLuminosity(status)); + measureUnitValue = MeasureUnit::getSolarLuminosity(); + measureUnit.adoptInstead(MeasureUnit::createCarat(status)); + measureUnitValue = MeasureUnit::getCarat(); + measureUnit.adoptInstead(MeasureUnit::createDalton(status)); + measureUnitValue = MeasureUnit::getDalton(); + measureUnit.adoptInstead(MeasureUnit::createEarthMass(status)); + measureUnitValue = MeasureUnit::getEarthMass(); + measureUnit.adoptInstead(MeasureUnit::createGrain(status)); + measureUnitValue = MeasureUnit::getGrain(); + measureUnit.adoptInstead(MeasureUnit::createGram(status)); + measureUnitValue = MeasureUnit::getGram(); + measureUnit.adoptInstead(MeasureUnit::createKilogram(status)); + measureUnitValue = MeasureUnit::getKilogram(); + measureUnit.adoptInstead(MeasureUnit::createMetricTon(status)); + measureUnitValue = MeasureUnit::getMetricTon(); + measureUnit.adoptInstead(MeasureUnit::createMicrogram(status)); + measureUnitValue = MeasureUnit::getMicrogram(); + measureUnit.adoptInstead(MeasureUnit::createMilligram(status)); + measureUnitValue = MeasureUnit::getMilligram(); + measureUnit.adoptInstead(MeasureUnit::createOunce(status)); + measureUnitValue = MeasureUnit::getOunce(); + measureUnit.adoptInstead(MeasureUnit::createOunceTroy(status)); + measureUnitValue = MeasureUnit::getOunceTroy(); + measureUnit.adoptInstead(MeasureUnit::createPound(status)); + measureUnitValue = MeasureUnit::getPound(); + measureUnit.adoptInstead(MeasureUnit::createSolarMass(status)); + measureUnitValue = MeasureUnit::getSolarMass(); + measureUnit.adoptInstead(MeasureUnit::createStone(status)); + measureUnitValue = MeasureUnit::getStone(); + measureUnit.adoptInstead(MeasureUnit::createTon(status)); + measureUnitValue = MeasureUnit::getTon(); + measureUnit.adoptInstead(MeasureUnit::createGigawatt(status)); + measureUnitValue = MeasureUnit::getGigawatt(); + measureUnit.adoptInstead(MeasureUnit::createHorsepower(status)); + measureUnitValue = MeasureUnit::getHorsepower(); + measureUnit.adoptInstead(MeasureUnit::createKilowatt(status)); + measureUnitValue = MeasureUnit::getKilowatt(); + measureUnit.adoptInstead(MeasureUnit::createMegawatt(status)); + measureUnitValue = MeasureUnit::getMegawatt(); + measureUnit.adoptInstead(MeasureUnit::createMilliwatt(status)); + measureUnitValue = MeasureUnit::getMilliwatt(); + measureUnit.adoptInstead(MeasureUnit::createWatt(status)); + measureUnitValue = MeasureUnit::getWatt(); + measureUnit.adoptInstead(MeasureUnit::createAtmosphere(status)); + measureUnitValue = MeasureUnit::getAtmosphere(); + measureUnit.adoptInstead(MeasureUnit::createBar(status)); + measureUnitValue = MeasureUnit::getBar(); + measureUnit.adoptInstead(MeasureUnit::createHectopascal(status)); + measureUnitValue = MeasureUnit::getHectopascal(); + measureUnit.adoptInstead(MeasureUnit::createInchHg(status)); + measureUnitValue = MeasureUnit::getInchHg(); + measureUnit.adoptInstead(MeasureUnit::createKilopascal(status)); + measureUnitValue = MeasureUnit::getKilopascal(); + measureUnit.adoptInstead(MeasureUnit::createMegapascal(status)); + measureUnitValue = MeasureUnit::getMegapascal(); + measureUnit.adoptInstead(MeasureUnit::createMillibar(status)); + measureUnitValue = MeasureUnit::getMillibar(); + measureUnit.adoptInstead(MeasureUnit::createMillimeterOfMercury(status)); + measureUnitValue = MeasureUnit::getMillimeterOfMercury(); + measureUnit.adoptInstead(MeasureUnit::createPascal(status)); + measureUnitValue = MeasureUnit::getPascal(); + measureUnit.adoptInstead(MeasureUnit::createPoundPerSquareInch(status)); + measureUnitValue = MeasureUnit::getPoundPerSquareInch(); + measureUnit.adoptInstead(MeasureUnit::createKilometerPerHour(status)); + measureUnitValue = MeasureUnit::getKilometerPerHour(); + measureUnit.adoptInstead(MeasureUnit::createKnot(status)); + measureUnitValue = MeasureUnit::getKnot(); + measureUnit.adoptInstead(MeasureUnit::createMeterPerSecond(status)); + measureUnitValue = MeasureUnit::getMeterPerSecond(); + measureUnit.adoptInstead(MeasureUnit::createMilePerHour(status)); + measureUnitValue = MeasureUnit::getMilePerHour(); + measureUnit.adoptInstead(MeasureUnit::createCelsius(status)); + measureUnitValue = MeasureUnit::getCelsius(); + measureUnit.adoptInstead(MeasureUnit::createFahrenheit(status)); + measureUnitValue = MeasureUnit::getFahrenheit(); + measureUnit.adoptInstead(MeasureUnit::createGenericTemperature(status)); + measureUnitValue = MeasureUnit::getGenericTemperature(); + measureUnit.adoptInstead(MeasureUnit::createKelvin(status)); + measureUnitValue = MeasureUnit::getKelvin(); + measureUnit.adoptInstead(MeasureUnit::createNewtonMeter(status)); + measureUnitValue = MeasureUnit::getNewtonMeter(); + measureUnit.adoptInstead(MeasureUnit::createPoundFoot(status)); + measureUnitValue = MeasureUnit::getPoundFoot(); + measureUnit.adoptInstead(MeasureUnit::createAcreFoot(status)); + measureUnitValue = MeasureUnit::getAcreFoot(); + measureUnit.adoptInstead(MeasureUnit::createBarrel(status)); + measureUnitValue = MeasureUnit::getBarrel(); + measureUnit.adoptInstead(MeasureUnit::createBushel(status)); + measureUnitValue = MeasureUnit::getBushel(); + measureUnit.adoptInstead(MeasureUnit::createCentiliter(status)); + measureUnitValue = MeasureUnit::getCentiliter(); + measureUnit.adoptInstead(MeasureUnit::createCubicCentimeter(status)); + measureUnitValue = MeasureUnit::getCubicCentimeter(); + measureUnit.adoptInstead(MeasureUnit::createCubicFoot(status)); + measureUnitValue = MeasureUnit::getCubicFoot(); + measureUnit.adoptInstead(MeasureUnit::createCubicInch(status)); + measureUnitValue = MeasureUnit::getCubicInch(); + measureUnit.adoptInstead(MeasureUnit::createCubicKilometer(status)); + measureUnitValue = MeasureUnit::getCubicKilometer(); + measureUnit.adoptInstead(MeasureUnit::createCubicMeter(status)); + measureUnitValue = MeasureUnit::getCubicMeter(); + measureUnit.adoptInstead(MeasureUnit::createCubicMile(status)); + measureUnitValue = MeasureUnit::getCubicMile(); + measureUnit.adoptInstead(MeasureUnit::createCubicYard(status)); + measureUnitValue = MeasureUnit::getCubicYard(); + measureUnit.adoptInstead(MeasureUnit::createCup(status)); + measureUnitValue = MeasureUnit::getCup(); + measureUnit.adoptInstead(MeasureUnit::createCupMetric(status)); + measureUnitValue = MeasureUnit::getCupMetric(); + measureUnit.adoptInstead(MeasureUnit::createDeciliter(status)); + measureUnitValue = MeasureUnit::getDeciliter(); + measureUnit.adoptInstead(MeasureUnit::createDessertSpoon(status)); + measureUnitValue = MeasureUnit::getDessertSpoon(); + measureUnit.adoptInstead(MeasureUnit::createDessertSpoonImperial(status)); + measureUnitValue = MeasureUnit::getDessertSpoonImperial(); + measureUnit.adoptInstead(MeasureUnit::createDram(status)); + measureUnitValue = MeasureUnit::getDram(); + measureUnit.adoptInstead(MeasureUnit::createDrop(status)); + measureUnitValue = MeasureUnit::getDrop(); + measureUnit.adoptInstead(MeasureUnit::createFluidOunce(status)); + measureUnitValue = MeasureUnit::getFluidOunce(); + measureUnit.adoptInstead(MeasureUnit::createFluidOunceImperial(status)); + measureUnitValue = MeasureUnit::getFluidOunceImperial(); + measureUnit.adoptInstead(MeasureUnit::createGallon(status)); + measureUnitValue = MeasureUnit::getGallon(); + measureUnit.adoptInstead(MeasureUnit::createGallonImperial(status)); + measureUnitValue = MeasureUnit::getGallonImperial(); + measureUnit.adoptInstead(MeasureUnit::createHectoliter(status)); + measureUnitValue = MeasureUnit::getHectoliter(); + measureUnit.adoptInstead(MeasureUnit::createJigger(status)); + measureUnitValue = MeasureUnit::getJigger(); + measureUnit.adoptInstead(MeasureUnit::createLiter(status)); + measureUnitValue = MeasureUnit::getLiter(); + measureUnit.adoptInstead(MeasureUnit::createMegaliter(status)); + measureUnitValue = MeasureUnit::getMegaliter(); + measureUnit.adoptInstead(MeasureUnit::createMilliliter(status)); + measureUnitValue = MeasureUnit::getMilliliter(); + measureUnit.adoptInstead(MeasureUnit::createPinch(status)); + measureUnitValue = MeasureUnit::getPinch(); + measureUnit.adoptInstead(MeasureUnit::createPint(status)); + measureUnitValue = MeasureUnit::getPint(); + measureUnit.adoptInstead(MeasureUnit::createPintMetric(status)); + measureUnitValue = MeasureUnit::getPintMetric(); + measureUnit.adoptInstead(MeasureUnit::createQuart(status)); + measureUnitValue = MeasureUnit::getQuart(); + measureUnit.adoptInstead(MeasureUnit::createQuartImperial(status)); + measureUnitValue = MeasureUnit::getQuartImperial(); + measureUnit.adoptInstead(MeasureUnit::createTablespoon(status)); + measureUnitValue = MeasureUnit::getTablespoon(); + measureUnit.adoptInstead(MeasureUnit::createTeaspoon(status)); + measureUnitValue = MeasureUnit::getTeaspoon(); + assertSuccess("", status); +} + void MeasureFormatTest::TestBasic() { UErrorCode status = U_ZERO_ERROR; MeasureUnit *ptr1 = MeasureUnit::createArcMinute(status); diff --git a/icu4c/source/test/intltest/numfmtst.cpp b/icu4c/source/test/intltest/numfmtst.cpp index 7f271cb3f662..1ed8cb2d4107 100644 --- a/icu4c/source/test/intltest/numfmtst.cpp +++ b/icu4c/source/test/intltest/numfmtst.cpp @@ -4909,9 +4909,9 @@ NumberFormatTest::TestParseCurrencyInUCurr() { "Portuguese escudos1.00", "GTQ1.00", "QAR1.00", - "Qatari Rial1.00", - "Qatari rial1.00", - "Qatari rials1.00", + "Qatari Riyal1.00", + "Qatari riyal1.00", + "Qatari riyals1.00", "RHD1.00", "RHD1.00", "RINET Funds1.00", @@ -5844,9 +5844,9 @@ NumberFormatTest::TestParseCurrencyInUCurr() { "1.00 Portuguese Guinea escudos random", "1.00 Portuguese escudo random", "1.00 Portuguese escudos random", - "1.00 Qatari Rial random", - "1.00 Qatari rial random", - "1.00 Qatari rials random", + "1.00 Qatari Riyal random", + "1.00 Qatari riyal random", + "1.00 Qatari riyals random", "1.00 RINET Funds random", "1.00 RINET Funds random", "1.00 Rhodesian Dollar random", @@ -6438,7 +6438,7 @@ NumberFormatTest::TestParseCurrencyInUCurr() { "Portuguese Guinea Escud1.00", "Pr1.00", "QA1.00", - "Qatari Ria1.00", + "Qatari Riya1.00", "RD1.00", "RH1.00", "RINET Fund1.00", diff --git a/icu4c/source/test/intltest/reldatefmttest.cpp b/icu4c/source/test/intltest/reldatefmttest.cpp index d785d7507504..7ae77e179863 100644 --- a/icu4c/source/test/intltest/reldatefmttest.cpp +++ b/icu4c/source/test/intltest/reldatefmttest.cpp @@ -193,7 +193,6 @@ static WithQuantityExpected kEnglishShort[] = { {0.5, UDAT_DIRECTION_NEXT, UDAT_RELATIVE_YEARS, "in 0.5 yr."}, {1.0, UDAT_DIRECTION_NEXT, UDAT_RELATIVE_YEARS, "in 1 yr."}, {2.0, UDAT_DIRECTION_NEXT, UDAT_RELATIVE_YEARS, "in 2 yr."}, - {0.0, UDAT_DIRECTION_LAST, UDAT_RELATIVE_SECONDS, "0 sec. ago"}, {0.5, UDAT_DIRECTION_LAST, UDAT_RELATIVE_SECONDS, "0.5 sec. ago"}, {1.0, UDAT_DIRECTION_LAST, UDAT_RELATIVE_SECONDS, "1 sec. ago"}, @@ -224,6 +223,66 @@ static WithQuantityExpected kEnglishShort[] = { {2.0, UDAT_DIRECTION_LAST, UDAT_RELATIVE_YEARS, "2 yr. ago"} }; +static WithQuantityExpected kEnglishNarrow[] = { + {0.0, UDAT_DIRECTION_NEXT, UDAT_RELATIVE_SECONDS, "in 0s"}, + {0.5, UDAT_DIRECTION_NEXT, UDAT_RELATIVE_SECONDS, "in 0.5s"}, + {1.0, UDAT_DIRECTION_NEXT, UDAT_RELATIVE_SECONDS, "in 1s"}, + {2.0, UDAT_DIRECTION_NEXT, UDAT_RELATIVE_SECONDS, "in 2s"}, + {0.0, UDAT_DIRECTION_NEXT, UDAT_RELATIVE_MINUTES, "in 0m"}, + {0.5, UDAT_DIRECTION_NEXT, UDAT_RELATIVE_MINUTES, "in 0.5m"}, + {1.0, UDAT_DIRECTION_NEXT, UDAT_RELATIVE_MINUTES, "in 1m"}, + {2.0, UDAT_DIRECTION_NEXT, UDAT_RELATIVE_MINUTES, "in 2m"}, + {0.0, UDAT_DIRECTION_NEXT, UDAT_RELATIVE_HOURS, "in 0h"}, + {0.5, UDAT_DIRECTION_NEXT, UDAT_RELATIVE_HOURS, "in 0.5h"}, + {1.0, UDAT_DIRECTION_NEXT, UDAT_RELATIVE_HOURS, "in 1h"}, + {2.0, UDAT_DIRECTION_NEXT, UDAT_RELATIVE_HOURS, "in 2h"}, + {0.0, UDAT_DIRECTION_NEXT, UDAT_RELATIVE_DAYS, "in 0d"}, + {0.5, UDAT_DIRECTION_NEXT, UDAT_RELATIVE_DAYS, "in 0.5d"}, + {1.0, UDAT_DIRECTION_NEXT, UDAT_RELATIVE_DAYS, "in 1d"}, + {2.0, UDAT_DIRECTION_NEXT, UDAT_RELATIVE_DAYS, "in 2d"}, + {0.0, UDAT_DIRECTION_NEXT, UDAT_RELATIVE_WEEKS, "in 0w"}, + {0.5, UDAT_DIRECTION_NEXT, UDAT_RELATIVE_WEEKS, "in 0.5w"}, + {1.0, UDAT_DIRECTION_NEXT, UDAT_RELATIVE_WEEKS, "in 1w"}, + {2.0, UDAT_DIRECTION_NEXT, UDAT_RELATIVE_WEEKS, "in 2w"}, + {0.0, UDAT_DIRECTION_NEXT, UDAT_RELATIVE_MONTHS, "in 0mo"}, + {0.5, UDAT_DIRECTION_NEXT, UDAT_RELATIVE_MONTHS, "in 0.5mo"}, + {1.0, UDAT_DIRECTION_NEXT, UDAT_RELATIVE_MONTHS, "in 1mo"}, + {2.0, UDAT_DIRECTION_NEXT, UDAT_RELATIVE_MONTHS, "in 2mo"}, + {0.0, UDAT_DIRECTION_NEXT, UDAT_RELATIVE_YEARS, "in 0y"}, + {0.5, UDAT_DIRECTION_NEXT, UDAT_RELATIVE_YEARS, "in 0.5y"}, + {1.0, UDAT_DIRECTION_NEXT, UDAT_RELATIVE_YEARS, "in 1y"}, + {2.0, UDAT_DIRECTION_NEXT, UDAT_RELATIVE_YEARS, "in 2y"}, + + {0.0, UDAT_DIRECTION_LAST, UDAT_RELATIVE_SECONDS, "0s ago"}, + {0.5, UDAT_DIRECTION_LAST, UDAT_RELATIVE_SECONDS, "0.5s ago"}, + {1.0, UDAT_DIRECTION_LAST, UDAT_RELATIVE_SECONDS, "1s ago"}, + {2.0, UDAT_DIRECTION_LAST, UDAT_RELATIVE_SECONDS, "2s ago"}, + {0.0, UDAT_DIRECTION_LAST, UDAT_RELATIVE_MINUTES, "0m ago"}, + {0.5, UDAT_DIRECTION_LAST, UDAT_RELATIVE_MINUTES, "0.5m ago"}, + {1.0, UDAT_DIRECTION_LAST, UDAT_RELATIVE_MINUTES, "1m ago"}, + {2.0, UDAT_DIRECTION_LAST, UDAT_RELATIVE_MINUTES, "2m ago"}, + {0.0, UDAT_DIRECTION_LAST, UDAT_RELATIVE_HOURS, "0h ago"}, + {0.5, UDAT_DIRECTION_LAST, UDAT_RELATIVE_HOURS, "0.5h ago"}, + {1.0, UDAT_DIRECTION_LAST, UDAT_RELATIVE_HOURS, "1h ago"}, + {2.0, UDAT_DIRECTION_LAST, UDAT_RELATIVE_HOURS, "2h ago"}, + {0.0, UDAT_DIRECTION_LAST, UDAT_RELATIVE_DAYS, "0d ago"}, + {0.5, UDAT_DIRECTION_LAST, UDAT_RELATIVE_DAYS, "0.5d ago"}, + {1.0, UDAT_DIRECTION_LAST, UDAT_RELATIVE_DAYS, "1d ago"}, + {2.0, UDAT_DIRECTION_LAST, UDAT_RELATIVE_DAYS, "2d ago"}, + {0.0, UDAT_DIRECTION_LAST, UDAT_RELATIVE_WEEKS, "0w ago"}, + {0.5, UDAT_DIRECTION_LAST, UDAT_RELATIVE_WEEKS, "0.5w ago"}, + {1.0, UDAT_DIRECTION_LAST, UDAT_RELATIVE_WEEKS, "1w ago"}, + {2.0, UDAT_DIRECTION_LAST, UDAT_RELATIVE_WEEKS, "2w ago"}, + {0.0, UDAT_DIRECTION_LAST, UDAT_RELATIVE_MONTHS, "0mo ago"}, + {0.5, UDAT_DIRECTION_LAST, UDAT_RELATIVE_MONTHS, "0.5mo ago"}, + {1.0, UDAT_DIRECTION_LAST, UDAT_RELATIVE_MONTHS, "1mo ago"}, + {2.0, UDAT_DIRECTION_LAST, UDAT_RELATIVE_MONTHS, "2mo ago"}, + {0.0, UDAT_DIRECTION_LAST, UDAT_RELATIVE_YEARS, "0y ago"}, + {0.5, UDAT_DIRECTION_LAST, UDAT_RELATIVE_YEARS, "0.5y ago"}, + {1.0, UDAT_DIRECTION_LAST, UDAT_RELATIVE_YEARS, "1y ago"}, + {2.0, UDAT_DIRECTION_LAST, UDAT_RELATIVE_YEARS, "2y ago"} +}; + static WithQuantityExpected kEnglishDecimal[] = { {0.0, UDAT_DIRECTION_NEXT, UDAT_RELATIVE_SECONDS, "in 0.0 seconds"}, {0.5, UDAT_DIRECTION_NEXT, UDAT_RELATIVE_SECONDS, "in 0.5 seconds"}, @@ -472,10 +531,10 @@ static WithoutQuantityExpected kEnglishNoQuantityNarrow[] = { {UDAT_DIRECTION_THIS, UDAT_ABSOLUTE_SUNDAY, "this Su"}, {UDAT_DIRECTION_PLAIN, UDAT_ABSOLUTE_DAY, "day"}, - {UDAT_DIRECTION_PLAIN, UDAT_ABSOLUTE_WEEK, "wk."}, - {UDAT_DIRECTION_PLAIN, UDAT_ABSOLUTE_MONTH, "mo."}, - {UDAT_DIRECTION_PLAIN, UDAT_ABSOLUTE_QUARTER, "qtr."}, - {UDAT_DIRECTION_PLAIN, UDAT_ABSOLUTE_YEAR, "yr."}, + {UDAT_DIRECTION_PLAIN, UDAT_ABSOLUTE_WEEK, "wk"}, + {UDAT_DIRECTION_PLAIN, UDAT_ABSOLUTE_MONTH, "mo"}, + {UDAT_DIRECTION_PLAIN, UDAT_ABSOLUTE_QUARTER, "qtr"}, + {UDAT_DIRECTION_PLAIN, UDAT_ABSOLUTE_YEAR, "yr"}, {UDAT_DIRECTION_PLAIN, UDAT_ABSOLUTE_MONDAY, "M"}, {UDAT_DIRECTION_PLAIN, UDAT_ABSOLUTE_TUESDAY, "T"}, {UDAT_DIRECTION_PLAIN, UDAT_ABSOLUTE_WEDNESDAY, "W"}, @@ -924,7 +983,7 @@ void RelativeDateTimeFormatterTest::TestEnglishShort() { } void RelativeDateTimeFormatterTest::TestEnglishNarrow() { - RunTest("en", UDAT_STYLE_NARROW, kEnglishShort, UPRV_LENGTHOF(kEnglishShort)); + RunTest("en", UDAT_STYLE_NARROW, kEnglishNarrow, UPRV_LENGTHOF(kEnglishNarrow)); } void RelativeDateTimeFormatterTest::TestSerbian() { diff --git a/icu4c/source/test/intltest/tmsgfmt.cpp b/icu4c/source/test/intltest/tmsgfmt.cpp index 66f498222170..3d6d6d643ba5 100644 --- a/icu4c/source/test/intltest/tmsgfmt.cpp +++ b/icu4c/source/test/intltest/tmsgfmt.cpp @@ -284,15 +284,15 @@ void TestMessageFormat::PatternTest() };*/ UnicodeString testResultStrings[] = { - "Quotes ', {, 'a' 1 {0}", - "Quotes ', {, 'a' 1 {0}", - "{1,number,'#',##} #34,56", - "There are 3,456 files on Disk at 1/12/70, 5:46 AM.", - "On Disk, there are 3,456 files, with $1.00.", - "{1,number,percent}, 345,600%,", - "{1,date,full}, Wednesday, December 31, 1969,", - "{3,date,full}, Monday, January 12, 1970,", - "{1,number,#,##} 34,56" + u"Quotes ', {, 'a' 1 {0}", + u"Quotes ', {, 'a' 1 {0}", + u"{1,number,'#',##} #34,56", + u"There are 3,456 files on Disk at 1/12/70, 5:46\u202FAM.", + u"On Disk, there are 3,456 files, with $1.00.", + u"{1,number,percent}, 345,600%,", + u"{1,date,full}, Wednesday, December 31, 1969,", + u"{3,date,full}, Monday, January 12, 1970,", + u"{1,number,#,##} 34,56" }; @@ -333,10 +333,12 @@ void TestMessageFormat::PatternTest() continue; } if (result != testResultStrings[i]) { - errln("TestMessageFormat::PatternTest failed test #4"); - logln("TestMessageFormat::PatternTest failed #4."); - logln(UnicodeString(" Result: ") + result ); - logln(UnicodeString(" Expected: ") + testResultStrings[i] ); + errln(UnicodeString("TestMessageFormat::PatternTest failed test #4.") + + UnicodeString("\n Result: ") + result + + UnicodeString("\n Expected: ") + testResultStrings[i]); + logln(UnicodeString("TestMessageFormat::PatternTest failed test #4.") + + UnicodeString("\n Result: ") + result + + UnicodeString("\n Expected: ") + testResultStrings[i]); } @@ -416,11 +418,11 @@ void TestMessageFormat::testStaticFormat() } const UnicodeString expected( - "At 12:20:00 PM on Aug 8, 1997, there was a disturbance in the Force on planet 7.", ""); + u"At 12:20:00\u202FPM on Aug 8, 1997, there was a disturbance in the Force on planet 7."); if (result != expected) { - errln("TestMessageFormat::testStaticFormat failed on test"); - logln( UnicodeString(" Result: ") + result ); - logln( UnicodeString(" Expected: ") + expected ); + errln(UnicodeString("TestMessageFormat::testStaticFormat failed on test") + + UnicodeString("\n Result: ") + result + + UnicodeString("\n Expected: ") + expected ); } } @@ -1498,13 +1500,13 @@ void TestMessageFormat::TestUnlimitedArgsAndSubformats() { Formattable ARGS_OBJ(ARGS, ARGS_LENGTH); UnicodeString expected = - "On Nov 20, 2286 (aka 11/20/86, aka November 20, 2286) " - "at 9:46:40 AM (aka 9:46 AM, aka 9:46:40 AM PST) " - "there were 1,303 werjes " - "(a 8% increase over 1,202) " - "despite the Glimmung's efforts " - "and to delight of the printers, Nick, his father, " - "his mother, the spiddles, and of course Horace."; + u"On Nov 20, 2286 (aka 11/20/86, aka November 20, 2286) " + u"at 9:46:40\u202FAM (aka 9:46\u202FAM, aka 9:46:40\u202FAM PST) " + u"there were 1,303 werjes " + u"(a 8% increase over 1,202) " + u"despite the Glimmung's efforts " + u"and to delight of the printers, Nick, his father, " + u"his mother, the spiddles, and of course Horace."; UnicodeString result; msg.format(ARGS_OBJ, result, ec); if (result == expected) { @@ -2051,7 +2053,7 @@ void TestMessageFormat::TestMessageFormatDateSkeleton() { UDate date = LocaleTest::date(2021-1900, UCAL_NOVEMBER, 23, 16, 42, 55); doTheRealDateTimeSkeletonTesting(date, u"{0,date,::MMMMd}", "en", u"November 23", status); - doTheRealDateTimeSkeletonTesting(date, u"{0,date,::yMMMMdjm}", "en", u"November 23, 2021 at 4:42 PM", status); + doTheRealDateTimeSkeletonTesting(date, u"{0,date,::yMMMMdjm}", "en", u"November 23, 2021 at 4:42\u202FPM", status); doTheRealDateTimeSkeletonTesting(date, u"{0,date, :: yMMMMd }", "en", u"November 23, 2021", status); doTheRealDateTimeSkeletonTesting(date, u"{0,date,::yMMMMd}", "fr", u"23 novembre 2021", status); doTheRealDateTimeSkeletonTesting(date, u"Expiration: {0,date,::yMMM}!", "en", u"Expiration: Nov 2021!", status); @@ -2065,7 +2067,7 @@ void TestMessageFormat::TestMessageFormatTimeSkeleton() { UDate date = LocaleTest::date(2021-1900, UCAL_NOVEMBER, 23, 16, 42, 55); doTheRealDateTimeSkeletonTesting(date, u"{0,time,::MMMMd}", "en", u"November 23", status); - doTheRealDateTimeSkeletonTesting(date, u"{0,time,::yMMMMdjm}", "en", u"November 23, 2021 at 4:42 PM", status); + doTheRealDateTimeSkeletonTesting(date, u"{0,time,::yMMMMdjm}", "en", u"November 23, 2021 at 4:42\u202FPM", status); doTheRealDateTimeSkeletonTesting(date, u"{0,time, :: yMMMMd }", "en", u"November 23, 2021", status); doTheRealDateTimeSkeletonTesting(date, u"{0,time,::yMMMMd}", "fr", u"23 novembre 2021", status); doTheRealDateTimeSkeletonTesting(date, u"Expiration: {0,time,::yMMM}!", "en", u"Expiration: Nov 2021!", status); diff --git a/icu4c/source/test/testdata/format.txt b/icu4c/source/test/testdata/format.txt index 02add1b96d64..c6121a1c57d3 100644 --- a/icu4c/source/test/testdata/format.txt +++ b/icu4c/source/test/testdata/format.txt @@ -37,7 +37,7 @@ format:table(nofallback) { "", "DATE=SHORT,TIME=SHORT", "ERA=1,YEAR=2007,MONTH=AUGUST,DATE=8,HOUR_OF_DAY=18,MINUTE=54,SECOND=0", - "8/8/07, 6:54 PM" + "8/8/07, 6:54 PM" }, { "zh_TW@calendar=roc", @@ -102,14 +102,14 @@ format:table(nofallback) { "GMT", "TIME=LONG", "ERA=1,YEAR=2012,MONTH=OCTOBER,DATE=8,HOUR_OF_DAY=23,MINUTE=59,SECOND=0", - "11:59:00 PM GMT" + "11:59:00 PM GMT" }, { "en_US@calendar=gregorian", "GMT", "TIME=LONG", "RELATIVE_ADD:DATE=-1,HOUR_OF_DAY=17,MINUTE=0,SECOND=0", // one day before now at specified time - "5:00:00 PM GMT" + "5:00:00 PM GMT" }, // normal formats, combined using 'at' { @@ -117,7 +117,7 @@ format:table(nofallback) { "GMT", "DATE=RELATIVE_FULL,TIME=LONG", "ERA=1,YEAR=2012,MONTH=OCTOBER,DATE=8,HOUR_OF_DAY=23,MINUTE=59,SECOND=0", - "Monday, October 8, 2012 at 11:59:00 PM GMT" + "Monday, October 8, 2012, 11:59:00 PM GMT" }, // normal formats, combined using ", " { @@ -125,7 +125,7 @@ format:table(nofallback) { "GMT", "DATE=RELATIVE_MEDIUM,TIME=SHORT", "ERA=1,YEAR=2012,MONTH=OCTOBER,DATE=8,HOUR_OF_DAY=23,MINUTE=59,SECOND=0", - "Oct 8, 2012, 11:59 PM" + "Oct 8, 2012, 11:59 PM" }, // formats with relative day, combined using 'at' { @@ -133,7 +133,7 @@ format:table(nofallback) { "GMT", "DATE=RELATIVE_FULL,TIME=LONG", "RELATIVE_ADD:DATE=-1,HOUR_OF_DAY=17,MINUTE=0,SECOND=0", // one day before now at specified time - "yesterday at 5:00:00 PM GMT" + "yesterday, 5:00:00 PM GMT" }, // formats with relative day, combined using ", " { @@ -141,7 +141,7 @@ format:table(nofallback) { "GMT", "DATE=RELATIVE_MEDIUM,TIME=SHORT", "RELATIVE_ADD:DATE=-1,HOUR_OF_DAY=17,MINUTE=0,SECOND=0", // one day before now at specified time - "yesterday, 5:00 PM" + "yesterday, 5:00 PM" }, // normal formats that have quoted literals, combined { @@ -172,14 +172,14 @@ format:table(nofallback) { "GMT", "DATE=RELATIVE_LONG,TIME=MEDIUM", "ERA=1,YEAR=2012,MONTH=OCTOBER,DATE=8,HOUR_OF_DAY=23,MINUTE=59,SECOND=0", - "8 Οκτωβρίου 2012 - 11:59:00 μ.μ." + "8 Οκτωβρίου 2012 - 11:59:00 μ.μ." }, { "el@calendar=gregorian", "GMT", "DATE=RELATIVE_LONG,TIME=MEDIUM", "RELATIVE_ADD:DATE=-1,HOUR_OF_DAY=17,MINUTE=0,SECOND=0", // one day before now at specified time - "χθες - 5:00:00 μ.μ." + "χθες - 5:00:00 μ.μ." }, // other tests { @@ -554,7 +554,7 @@ format:table(nofallback) { "", "DATE=FULL,TIME=FULL", "MILLIS=3076424179200000", - "Friday, 3 Heshvan 103217 at 12:00:00 AM GMT-08:00" + "Friday, 3 Heshvan 103217 at 12:00:00 AM GMT-08:00" }, } } diff --git a/icu4c/source/test/testdata/root.txt b/icu4c/source/test/testdata/root.txt index f3a9a151ee43..98251a46d596 100644 --- a/icu4c/source/test/testdata/root.txt +++ b/icu4c/source/test/testdata/root.txt @@ -13,8 +13,8 @@ root { Version { 44.0 } - ExpectCLDRVersionAtLeast { 41.0 } // 'base' cldr version. Allow up to version =.=.* of this - CurrentCLDRVersion { 41.0 } // Current CLDR version as of the test update. Warn if not an exact match. + ExpectCLDRVersionAtLeast { 42.0 } // 'base' cldr version. Allow up to version =.=.* of this + CurrentCLDRVersion { 42.0 } // Current CLDR version as of the test update. Warn if not an exact match. ShortLanguage { xxx } diff --git a/icu4c/source/test/testdata/structLocale.txt b/icu4c/source/test/testdata/structLocale.txt index ee04f3511ec9..cb1f6cd90b59 100644 --- a/icu4c/source/test/testdata/structLocale.txt +++ b/icu4c/source/test/testdata/structLocale.txt @@ -6111,7 +6111,11 @@ structLocale:table(nofallback){ } patterns{ accountingFormat{""} + accountingFormat%alphaNextToNumber{""} + accountingFormat%noCurrency{""} currencyFormat{""} + currencyFormat%alphaNextToNumber{""} + currencyFormat%noCurrency{""} decimalFormat{""} percentFormat{""} scientificFormat{""} @@ -6316,7 +6320,7 @@ structLocale:table(nofallback){ other{""} } } - decimalFormat{ + currencyFormat%alphaNextToNumber{ 1000{ zero{""} one{""} @@ -6414,43 +6418,8 @@ structLocale:table(nofallback){ other{""} } } - } - symbols{ - approximatelySign{""} - decimal{""} - exponential{""} - group{""} - infinity{""} - list{""} - minusSign{""} - nan{""} - perMille{""} - percentSign{""} - plusSign{""} - currencyDecimal{""} - currencyGroup{""} - superscriptingExponent{""} - timeSeparator{""} - } - } - arab{ - miscPatterns{ - approximately{""} - atLeast{""} - atMost{""} - range{""} - } - patterns{ - accountingFormat{""} - currencyFormat{""} - decimalFormat{""} - percentFormat{""} - scientificFormat{""} - } - patternsLong{ decimalFormat{ 1000{ - 1{""} zero{""} one{""} two{""} @@ -6548,9 +6517,46 @@ structLocale:table(nofallback){ } } } - patternsShort{ - currencyFormat{ + symbols{ + approximatelySign{""} + decimal{""} + exponential{""} + group{""} + infinity{""} + list{""} + minusSign{""} + nan{""} + perMille{""} + percentSign{""} + plusSign{""} + currencyDecimal{""} + currencyGroup{""} + superscriptingExponent{""} + timeSeparator{""} + } + } + arab{ + miscPatterns{ + approximately{""} + atLeast{""} + atMost{""} + range{""} + } + patterns{ + accountingFormat{""} + accountingFormat%alphaNextToNumber{""} + accountingFormat%noCurrency{""} + currencyFormat{""} + currencyFormat%alphaNextToNumber{""} + currencyFormat%noCurrency{""} + decimalFormat{""} + percentFormat{""} + scientificFormat{""} + } + patternsLong{ + decimalFormat{ 1000{ + 1{""} zero{""} one{""} two{""} @@ -6647,7 +6653,9 @@ structLocale:table(nofallback){ other{""} } } - decimalFormat{ + } + patternsShort{ + currencyFormat{ 1000{ zero{""} one{""} @@ -6745,43 +6753,8 @@ structLocale:table(nofallback){ other{""} } } - } - symbols{ - approximatelySign{""} - decimal{""} - exponential{""} - group{""} - infinity{""} - list{""} - minusSign{""} - nan{""} - perMille{""} - percentSign{""} - plusSign{""} - currencyDecimal{""} - currencyGroup{""} - superscriptingExponent{""} - timeSeparator{""} - } - } - arabext{ - miscPatterns{ - approximately{""} - atLeast{""} - atMost{""} - range{""} - } - patterns{ - accountingFormat{""} - currencyFormat{""} - decimalFormat{""} - percentFormat{""} - scientificFormat{""} - } - patternsLong{ - decimalFormat{ + currencyFormat%alphaNextToNumber{ 1000{ - 1{""} zero{""} one{""} two{""} @@ -6878,9 +6851,7 @@ structLocale:table(nofallback){ other{""} } } - } - patternsShort{ - currencyFormat{ + decimalFormat{ 1000{ zero{""} one{""} @@ -6978,8 +6949,47 @@ structLocale:table(nofallback){ other{""} } } + } + symbols{ + approximatelySign{""} + decimal{""} + exponential{""} + group{""} + infinity{""} + list{""} + minusSign{""} + nan{""} + perMille{""} + percentSign{""} + plusSign{""} + currencyDecimal{""} + currencyGroup{""} + superscriptingExponent{""} + timeSeparator{""} + } + } + arabext{ + miscPatterns{ + approximately{""} + atLeast{""} + atMost{""} + range{""} + } + patterns{ + accountingFormat{""} + accountingFormat%alphaNextToNumber{""} + accountingFormat%noCurrency{""} + currencyFormat{""} + currencyFormat%alphaNextToNumber{""} + currencyFormat%noCurrency{""} + decimalFormat{""} + percentFormat{""} + scientificFormat{""} + } + patternsLong{ decimalFormat{ 1000{ + 1{""} zero{""} one{""} two{""} @@ -7077,42 +7087,9 @@ structLocale:table(nofallback){ } } } - symbols{ - approximatelySign{""} - decimal{""} - exponential{""} - group{""} - infinity{""} - list{""} - minusSign{""} - nan{""} - perMille{""} - percentSign{""} - plusSign{""} - currencyDecimal{""} - currencyGroup{""} - superscriptingExponent{""} - timeSeparator{""} - } - } - bali{ - miscPatterns{ - approximately{""} - atLeast{""} - atMost{""} - range{""} - } - patterns{ - accountingFormat{""} - currencyFormat{""} - decimalFormat{""} - percentFormat{""} - scientificFormat{""} - } - patternsLong{ - decimalFormat{ + patternsShort{ + currencyFormat{ 1000{ - 1{""} zero{""} one{""} two{""} @@ -7209,9 +7186,7 @@ structLocale:table(nofallback){ other{""} } } - } - patternsShort{ - currencyFormat{ + currencyFormat%alphaNextToNumber{ 1000{ zero{""} one{""} @@ -7426,7 +7401,7 @@ structLocale:table(nofallback){ timeSeparator{""} } } - beng{ + bali{ miscPatterns{ approximately{""} atLeast{""} @@ -7435,7 +7410,11 @@ structLocale:table(nofallback){ } patterns{ accountingFormat{""} + accountingFormat%alphaNextToNumber{""} + accountingFormat%noCurrency{""} currencyFormat{""} + currencyFormat%alphaNextToNumber{""} + currencyFormat%noCurrency{""} decimalFormat{""} percentFormat{""} scientificFormat{""} @@ -7640,7 +7619,7 @@ structLocale:table(nofallback){ other{""} } } - decimalFormat{ + currencyFormat%alphaNextToNumber{ 1000{ zero{""} one{""} @@ -7738,43 +7717,8 @@ structLocale:table(nofallback){ other{""} } } - } - symbols{ - approximatelySign{""} - decimal{""} - exponential{""} - group{""} - infinity{""} - list{""} - minusSign{""} - nan{""} - perMille{""} - percentSign{""} - plusSign{""} - currencyDecimal{""} - currencyGroup{""} - superscriptingExponent{""} - timeSeparator{""} - } - } - brah{ - miscPatterns{ - approximately{""} - atLeast{""} - atMost{""} - range{""} - } - patterns{ - accountingFormat{""} - currencyFormat{""} - decimalFormat{""} - percentFormat{""} - scientificFormat{""} - } - patternsLong{ decimalFormat{ 1000{ - 1{""} zero{""} one{""} two{""} @@ -7872,32 +7816,69 @@ structLocale:table(nofallback){ } } } - patternsShort{ - currencyFormat{ - 1000{ - zero{""} - one{""} - two{""} - few{""} - many{""} - other{""} - } - 10000{ - zero{""} - one{""} - two{""} - few{""} - many{""} - other{""} - } - 100000{ - zero{""} - one{""} - two{""} - few{""} - many{""} - other{""} - } + symbols{ + approximatelySign{""} + decimal{""} + exponential{""} + group{""} + infinity{""} + list{""} + minusSign{""} + nan{""} + perMille{""} + percentSign{""} + plusSign{""} + currencyDecimal{""} + currencyGroup{""} + superscriptingExponent{""} + timeSeparator{""} + } + } + beng{ + miscPatterns{ + approximately{""} + atLeast{""} + atMost{""} + range{""} + } + patterns{ + accountingFormat{""} + accountingFormat%alphaNextToNumber{""} + accountingFormat%noCurrency{""} + currencyFormat{""} + currencyFormat%alphaNextToNumber{""} + currencyFormat%noCurrency{""} + decimalFormat{""} + percentFormat{""} + scientificFormat{""} + } + patternsLong{ + decimalFormat{ + 1000{ + 1{""} + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } 1000000{ zero{""} one{""} @@ -7971,7 +7952,9 @@ structLocale:table(nofallback){ other{""} } } - decimalFormat{ + } + patternsShort{ + currencyFormat{ 1000{ zero{""} one{""} @@ -8069,43 +8052,8 @@ structLocale:table(nofallback){ other{""} } } - } - symbols{ - approximatelySign{""} - decimal{""} - exponential{""} - group{""} - infinity{""} - list{""} - minusSign{""} - nan{""} - perMille{""} - percentSign{""} - plusSign{""} - currencyDecimal{""} - currencyGroup{""} - superscriptingExponent{""} - timeSeparator{""} - } - } - cakm{ - miscPatterns{ - approximately{""} - atLeast{""} - atMost{""} - range{""} - } - patterns{ - accountingFormat{""} - currencyFormat{""} - decimalFormat{""} - percentFormat{""} - scientificFormat{""} - } - patternsLong{ - decimalFormat{ + currencyFormat%alphaNextToNumber{ 1000{ - 1{""} zero{""} one{""} two{""} @@ -8202,9 +8150,7 @@ structLocale:table(nofallback){ other{""} } } - } - patternsShort{ - currencyFormat{ + decimalFormat{ 1000{ zero{""} one{""} @@ -8302,8 +8248,47 @@ structLocale:table(nofallback){ other{""} } } + } + symbols{ + approximatelySign{""} + decimal{""} + exponential{""} + group{""} + infinity{""} + list{""} + minusSign{""} + nan{""} + perMille{""} + percentSign{""} + plusSign{""} + currencyDecimal{""} + currencyGroup{""} + superscriptingExponent{""} + timeSeparator{""} + } + } + brah{ + miscPatterns{ + approximately{""} + atLeast{""} + atMost{""} + range{""} + } + patterns{ + accountingFormat{""} + accountingFormat%alphaNextToNumber{""} + accountingFormat%noCurrency{""} + currencyFormat{""} + currencyFormat%alphaNextToNumber{""} + currencyFormat%noCurrency{""} + decimalFormat{""} + percentFormat{""} + scientificFormat{""} + } + patternsLong{ decimalFormat{ 1000{ + 1{""} zero{""} one{""} two{""} @@ -8401,42 +8386,9 @@ structLocale:table(nofallback){ } } } - symbols{ - approximatelySign{""} - decimal{""} - exponential{""} - group{""} - infinity{""} - list{""} - minusSign{""} - nan{""} - perMille{""} - percentSign{""} - plusSign{""} - currencyDecimal{""} - currencyGroup{""} - superscriptingExponent{""} - timeSeparator{""} - } - } - cham{ - miscPatterns{ - approximately{""} - atLeast{""} - atMost{""} - range{""} - } - patterns{ - accountingFormat{""} - currencyFormat{""} - decimalFormat{""} - percentFormat{""} - scientificFormat{""} - } - patternsLong{ - decimalFormat{ + patternsShort{ + currencyFormat{ 1000{ - 1{""} zero{""} one{""} two{""} @@ -8533,9 +8485,7 @@ structLocale:table(nofallback){ other{""} } } - } - patternsShort{ - currencyFormat{ + currencyFormat%alphaNextToNumber{ 1000{ zero{""} one{""} @@ -8750,9 +8700,7 @@ structLocale:table(nofallback){ timeSeparator{""} } } - default{""} - default_latn{""} - deva{ + cakm{ miscPatterns{ approximately{""} atLeast{""} @@ -8761,7 +8709,11 @@ structLocale:table(nofallback){ } patterns{ accountingFormat{""} + accountingFormat%alphaNextToNumber{""} + accountingFormat%noCurrency{""} currencyFormat{""} + currencyFormat%alphaNextToNumber{""} + currencyFormat%noCurrency{""} decimalFormat{""} percentFormat{""} scientificFormat{""} @@ -8966,7 +8918,7 @@ structLocale:table(nofallback){ other{""} } } - decimalFormat{ + currencyFormat%alphaNextToNumber{ 1000{ zero{""} one{""} @@ -9064,44 +9016,8 @@ structLocale:table(nofallback){ other{""} } } - } - symbols{ - approximatelySign{""} - decimal{""} - exponential{""} - group{""} - infinity{""} - list{""} - minusSign{""} - nan{""} - perMille{""} - percentSign{""} - plusSign{""} - currencyDecimal{""} - currencyGroup{""} - superscriptingExponent{""} - timeSeparator{""} - } - } - finance{""} - fullwide{ - miscPatterns{ - approximately{""} - atLeast{""} - atMost{""} - range{""} - } - patterns{ - accountingFormat{""} - currencyFormat{""} - decimalFormat{""} - percentFormat{""} - scientificFormat{""} - } - patternsLong{ decimalFormat{ 1000{ - 1{""} zero{""} one{""} two{""} @@ -9199,9 +9115,46 @@ structLocale:table(nofallback){ } } } - patternsShort{ - currencyFormat{ + symbols{ + approximatelySign{""} + decimal{""} + exponential{""} + group{""} + infinity{""} + list{""} + minusSign{""} + nan{""} + perMille{""} + percentSign{""} + plusSign{""} + currencyDecimal{""} + currencyGroup{""} + superscriptingExponent{""} + timeSeparator{""} + } + } + cham{ + miscPatterns{ + approximately{""} + atLeast{""} + atMost{""} + range{""} + } + patterns{ + accountingFormat{""} + accountingFormat%alphaNextToNumber{""} + accountingFormat%noCurrency{""} + currencyFormat{""} + currencyFormat%alphaNextToNumber{""} + currencyFormat%noCurrency{""} + decimalFormat{""} + percentFormat{""} + scientificFormat{""} + } + patternsLong{ + decimalFormat{ 1000{ + 1{""} zero{""} one{""} two{""} @@ -9298,7 +9251,9 @@ structLocale:table(nofallback){ other{""} } } - decimalFormat{ + } + patternsShort{ + currencyFormat{ 1000{ zero{""} one{""} @@ -9396,43 +9351,8 @@ structLocale:table(nofallback){ other{""} } } - } - symbols{ - approximatelySign{""} - decimal{""} - exponential{""} - group{""} - infinity{""} - list{""} - minusSign{""} - nan{""} - perMille{""} - percentSign{""} - plusSign{""} - currencyDecimal{""} - currencyGroup{""} - superscriptingExponent{""} - timeSeparator{""} - } - } - gong{ - miscPatterns{ - approximately{""} - atLeast{""} - atMost{""} - range{""} - } - patterns{ - accountingFormat{""} - currencyFormat{""} - decimalFormat{""} - percentFormat{""} - scientificFormat{""} - } - patternsLong{ - decimalFormat{ + currencyFormat%alphaNextToNumber{ 1000{ - 1{""} zero{""} one{""} two{""} @@ -9529,9 +9449,7 @@ structLocale:table(nofallback){ other{""} } } - } - patternsShort{ - currencyFormat{ + decimalFormat{ 1000{ zero{""} one{""} @@ -9629,8 +9547,49 @@ structLocale:table(nofallback){ other{""} } } + } + symbols{ + approximatelySign{""} + decimal{""} + exponential{""} + group{""} + infinity{""} + list{""} + minusSign{""} + nan{""} + perMille{""} + percentSign{""} + plusSign{""} + currencyDecimal{""} + currencyGroup{""} + superscriptingExponent{""} + timeSeparator{""} + } + } + default{""} + default_latn{""} + deva{ + miscPatterns{ + approximately{""} + atLeast{""} + atMost{""} + range{""} + } + patterns{ + accountingFormat{""} + accountingFormat%alphaNextToNumber{""} + accountingFormat%noCurrency{""} + currencyFormat{""} + currencyFormat%alphaNextToNumber{""} + currencyFormat%noCurrency{""} + decimalFormat{""} + percentFormat{""} + scientificFormat{""} + } + patternsLong{ decimalFormat{ 1000{ + 1{""} zero{""} one{""} two{""} @@ -9728,42 +9687,9 @@ structLocale:table(nofallback){ } } } - symbols{ - approximatelySign{""} - decimal{""} - exponential{""} - group{""} - infinity{""} - list{""} - minusSign{""} - nan{""} - perMille{""} - percentSign{""} - plusSign{""} - currencyDecimal{""} - currencyGroup{""} - superscriptingExponent{""} - timeSeparator{""} - } - } - gonm{ - miscPatterns{ - approximately{""} - atLeast{""} - atMost{""} - range{""} - } - patterns{ - accountingFormat{""} - currencyFormat{""} - decimalFormat{""} - percentFormat{""} - scientificFormat{""} - } - patternsLong{ - decimalFormat{ + patternsShort{ + currencyFormat{ 1000{ - 1{""} zero{""} one{""} two{""} @@ -9860,9 +9786,7 @@ structLocale:table(nofallback){ other{""} } } - } - patternsShort{ - currencyFormat{ + currencyFormat%alphaNextToNumber{ 1000{ zero{""} one{""} @@ -10077,7 +10001,8 @@ structLocale:table(nofallback){ timeSeparator{""} } } - gujr{ + finance{""} + fullwide{ miscPatterns{ approximately{""} atLeast{""} @@ -10086,7 +10011,11 @@ structLocale:table(nofallback){ } patterns{ accountingFormat{""} + accountingFormat%alphaNextToNumber{""} + accountingFormat%noCurrency{""} currencyFormat{""} + currencyFormat%alphaNextToNumber{""} + currencyFormat%noCurrency{""} decimalFormat{""} percentFormat{""} scientificFormat{""} @@ -10291,7 +10220,7 @@ structLocale:table(nofallback){ other{""} } } - decimalFormat{ + currencyFormat%alphaNextToNumber{ 1000{ zero{""} one{""} @@ -10389,43 +10318,8 @@ structLocale:table(nofallback){ other{""} } } - } - symbols{ - approximatelySign{""} - decimal{""} - exponential{""} - group{""} - infinity{""} - list{""} - minusSign{""} - nan{""} - perMille{""} - percentSign{""} - plusSign{""} - currencyDecimal{""} - currencyGroup{""} - superscriptingExponent{""} - timeSeparator{""} - } - } - guru{ - miscPatterns{ - approximately{""} - atLeast{""} - atMost{""} - range{""} - } - patterns{ - accountingFormat{""} - currencyFormat{""} - decimalFormat{""} - percentFormat{""} - scientificFormat{""} - } - patternsLong{ decimalFormat{ 1000{ - 1{""} zero{""} one{""} two{""} @@ -10523,9 +10417,46 @@ structLocale:table(nofallback){ } } } - patternsShort{ - currencyFormat{ + symbols{ + approximatelySign{""} + decimal{""} + exponential{""} + group{""} + infinity{""} + list{""} + minusSign{""} + nan{""} + perMille{""} + percentSign{""} + plusSign{""} + currencyDecimal{""} + currencyGroup{""} + superscriptingExponent{""} + timeSeparator{""} + } + } + gong{ + miscPatterns{ + approximately{""} + atLeast{""} + atMost{""} + range{""} + } + patterns{ + accountingFormat{""} + accountingFormat%alphaNextToNumber{""} + accountingFormat%noCurrency{""} + currencyFormat{""} + currencyFormat%alphaNextToNumber{""} + currencyFormat%noCurrency{""} + decimalFormat{""} + percentFormat{""} + scientificFormat{""} + } + patternsLong{ + decimalFormat{ 1000{ + 1{""} zero{""} one{""} two{""} @@ -10622,7 +10553,9 @@ structLocale:table(nofallback){ other{""} } } - decimalFormat{ + } + patternsShort{ + currencyFormat{ 1000{ zero{""} one{""} @@ -10720,43 +10653,8 @@ structLocale:table(nofallback){ other{""} } } - } - symbols{ - approximatelySign{""} - decimal{""} - exponential{""} - group{""} - infinity{""} - list{""} - minusSign{""} - nan{""} - perMille{""} - percentSign{""} - plusSign{""} - currencyDecimal{""} - currencyGroup{""} - superscriptingExponent{""} - timeSeparator{""} - } - } - hanidec{ - miscPatterns{ - approximately{""} - atLeast{""} - atMost{""} - range{""} - } - patterns{ - accountingFormat{""} - currencyFormat{""} - decimalFormat{""} - percentFormat{""} - scientificFormat{""} - } - patternsLong{ - decimalFormat{ + currencyFormat%alphaNextToNumber{ 1000{ - 1{""} zero{""} one{""} two{""} @@ -10853,9 +10751,7 @@ structLocale:table(nofallback){ other{""} } } - } - patternsShort{ - currencyFormat{ + decimalFormat{ 1000{ zero{""} one{""} @@ -10953,21 +10849,60 @@ structLocale:table(nofallback){ other{""} } } - decimalFormat{ - 1000{ - zero{""} - one{""} - two{""} - few{""} - many{""} - other{""} - } - 10000{ - zero{""} - one{""} - two{""} - few{""} - many{""} + } + symbols{ + approximatelySign{""} + decimal{""} + exponential{""} + group{""} + infinity{""} + list{""} + minusSign{""} + nan{""} + perMille{""} + percentSign{""} + plusSign{""} + currencyDecimal{""} + currencyGroup{""} + superscriptingExponent{""} + timeSeparator{""} + } + } + gonm{ + miscPatterns{ + approximately{""} + atLeast{""} + atMost{""} + range{""} + } + patterns{ + accountingFormat{""} + accountingFormat%alphaNextToNumber{""} + accountingFormat%noCurrency{""} + currencyFormat{""} + currencyFormat%alphaNextToNumber{""} + currencyFormat%noCurrency{""} + decimalFormat{""} + percentFormat{""} + scientificFormat{""} + } + patternsLong{ + decimalFormat{ + 1000{ + 1{""} + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000{ + zero{""} + one{""} + two{""} + few{""} + many{""} other{""} } 100000{ @@ -11052,42 +10987,9 @@ structLocale:table(nofallback){ } } } - symbols{ - approximatelySign{""} - decimal{""} - exponential{""} - group{""} - infinity{""} - list{""} - minusSign{""} - nan{""} - perMille{""} - percentSign{""} - plusSign{""} - currencyDecimal{""} - currencyGroup{""} - superscriptingExponent{""} - timeSeparator{""} - } - } - hmnp{ - miscPatterns{ - approximately{""} - atLeast{""} - atMost{""} - range{""} - } - patterns{ - accountingFormat{""} - currencyFormat{""} - decimalFormat{""} - percentFormat{""} - scientificFormat{""} - } - patternsLong{ - decimalFormat{ + patternsShort{ + currencyFormat{ 1000{ - 1{""} zero{""} one{""} two{""} @@ -11184,9 +11086,7 @@ structLocale:table(nofallback){ other{""} } } - } - patternsShort{ - currencyFormat{ + currencyFormat%alphaNextToNumber{ 1000{ zero{""} one{""} @@ -11401,7 +11301,7 @@ structLocale:table(nofallback){ timeSeparator{""} } } - java{ + gujr{ miscPatterns{ approximately{""} atLeast{""} @@ -11410,7 +11310,11 @@ structLocale:table(nofallback){ } patterns{ accountingFormat{""} + accountingFormat%alphaNextToNumber{""} + accountingFormat%noCurrency{""} currencyFormat{""} + currencyFormat%alphaNextToNumber{""} + currencyFormat%noCurrency{""} decimalFormat{""} percentFormat{""} scientificFormat{""} @@ -11615,7 +11519,7 @@ structLocale:table(nofallback){ other{""} } } - decimalFormat{ + currencyFormat%alphaNextToNumber{ 1000{ zero{""} one{""} @@ -11713,43 +11617,8 @@ structLocale:table(nofallback){ other{""} } } - } - symbols{ - approximatelySign{""} - decimal{""} - exponential{""} - group{""} - infinity{""} - list{""} - minusSign{""} - nan{""} - perMille{""} - percentSign{""} - plusSign{""} - currencyDecimal{""} - currencyGroup{""} - superscriptingExponent{""} - timeSeparator{""} - } - } - kali{ - miscPatterns{ - approximately{""} - atLeast{""} - atMost{""} - range{""} - } - patterns{ - accountingFormat{""} - currencyFormat{""} - decimalFormat{""} - percentFormat{""} - scientificFormat{""} - } - patternsLong{ decimalFormat{ 1000{ - 1{""} zero{""} one{""} two{""} @@ -11847,9 +11716,46 @@ structLocale:table(nofallback){ } } } - patternsShort{ - currencyFormat{ + symbols{ + approximatelySign{""} + decimal{""} + exponential{""} + group{""} + infinity{""} + list{""} + minusSign{""} + nan{""} + perMille{""} + percentSign{""} + plusSign{""} + currencyDecimal{""} + currencyGroup{""} + superscriptingExponent{""} + timeSeparator{""} + } + } + guru{ + miscPatterns{ + approximately{""} + atLeast{""} + atMost{""} + range{""} + } + patterns{ + accountingFormat{""} + accountingFormat%alphaNextToNumber{""} + accountingFormat%noCurrency{""} + currencyFormat{""} + currencyFormat%alphaNextToNumber{""} + currencyFormat%noCurrency{""} + decimalFormat{""} + percentFormat{""} + scientificFormat{""} + } + patternsLong{ + decimalFormat{ 1000{ + 1{""} zero{""} one{""} two{""} @@ -11946,7 +11852,9 @@ structLocale:table(nofallback){ other{""} } } - decimalFormat{ + } + patternsShort{ + currencyFormat{ 1000{ zero{""} one{""} @@ -12044,43 +11952,8 @@ structLocale:table(nofallback){ other{""} } } - } - symbols{ - approximatelySign{""} - decimal{""} - exponential{""} - group{""} - infinity{""} - list{""} - minusSign{""} - nan{""} - perMille{""} - percentSign{""} - plusSign{""} - currencyDecimal{""} - currencyGroup{""} - superscriptingExponent{""} - timeSeparator{""} - } - } - khmr{ - miscPatterns{ - approximately{""} - atLeast{""} - atMost{""} - range{""} - } - patterns{ - accountingFormat{""} - currencyFormat{""} - decimalFormat{""} - percentFormat{""} - scientificFormat{""} - } - patternsLong{ - decimalFormat{ + currencyFormat%alphaNextToNumber{ 1000{ - 1{""} zero{""} one{""} two{""} @@ -12177,9 +12050,7 @@ structLocale:table(nofallback){ other{""} } } - } - patternsShort{ - currencyFormat{ + decimalFormat{ 1000{ zero{""} one{""} @@ -12277,8 +12148,47 @@ structLocale:table(nofallback){ other{""} } } + } + symbols{ + approximatelySign{""} + decimal{""} + exponential{""} + group{""} + infinity{""} + list{""} + minusSign{""} + nan{""} + perMille{""} + percentSign{""} + plusSign{""} + currencyDecimal{""} + currencyGroup{""} + superscriptingExponent{""} + timeSeparator{""} + } + } + hanidec{ + miscPatterns{ + approximately{""} + atLeast{""} + atMost{""} + range{""} + } + patterns{ + accountingFormat{""} + accountingFormat%alphaNextToNumber{""} + accountingFormat%noCurrency{""} + currencyFormat{""} + currencyFormat%alphaNextToNumber{""} + currencyFormat%noCurrency{""} + decimalFormat{""} + percentFormat{""} + scientificFormat{""} + } + patternsLong{ decimalFormat{ 1000{ + 1{""} zero{""} one{""} two{""} @@ -12376,42 +12286,9 @@ structLocale:table(nofallback){ } } } - symbols{ - approximatelySign{""} - decimal{""} - exponential{""} - group{""} - infinity{""} - list{""} - minusSign{""} - nan{""} - perMille{""} - percentSign{""} - plusSign{""} - currencyDecimal{""} - currencyGroup{""} - superscriptingExponent{""} - timeSeparator{""} - } - } - knda{ - miscPatterns{ - approximately{""} - atLeast{""} - atMost{""} - range{""} - } - patterns{ - accountingFormat{""} - currencyFormat{""} - decimalFormat{""} - percentFormat{""} - scientificFormat{""} - } - patternsLong{ - decimalFormat{ + patternsShort{ + currencyFormat{ 1000{ - 1{""} zero{""} one{""} two{""} @@ -12508,9 +12385,7 @@ structLocale:table(nofallback){ other{""} } } - } - patternsShort{ - currencyFormat{ + currencyFormat%alphaNextToNumber{ 1000{ zero{""} one{""} @@ -12725,7 +12600,7 @@ structLocale:table(nofallback){ timeSeparator{""} } } - lana{ + hmnp{ miscPatterns{ approximately{""} atLeast{""} @@ -12734,7 +12609,11 @@ structLocale:table(nofallback){ } patterns{ accountingFormat{""} + accountingFormat%alphaNextToNumber{""} + accountingFormat%noCurrency{""} currencyFormat{""} + currencyFormat%alphaNextToNumber{""} + currencyFormat%noCurrency{""} decimalFormat{""} percentFormat{""} scientificFormat{""} @@ -12939,7 +12818,7 @@ structLocale:table(nofallback){ other{""} } } - decimalFormat{ + currencyFormat%alphaNextToNumber{ 1000{ zero{""} one{""} @@ -13037,43 +12916,8 @@ structLocale:table(nofallback){ other{""} } } - } - symbols{ - approximatelySign{""} - decimal{""} - exponential{""} - group{""} - infinity{""} - list{""} - minusSign{""} - nan{""} - perMille{""} - percentSign{""} - plusSign{""} - currencyDecimal{""} - currencyGroup{""} - superscriptingExponent{""} - timeSeparator{""} - } - } - lanatham{ - miscPatterns{ - approximately{""} - atLeast{""} - atMost{""} - range{""} - } - patterns{ - accountingFormat{""} - currencyFormat{""} - decimalFormat{""} - percentFormat{""} - scientificFormat{""} - } - patternsLong{ decimalFormat{ 1000{ - 1{""} zero{""} one{""} two{""} @@ -13171,9 +13015,46 @@ structLocale:table(nofallback){ } } } - patternsShort{ - currencyFormat{ + symbols{ + approximatelySign{""} + decimal{""} + exponential{""} + group{""} + infinity{""} + list{""} + minusSign{""} + nan{""} + perMille{""} + percentSign{""} + plusSign{""} + currencyDecimal{""} + currencyGroup{""} + superscriptingExponent{""} + timeSeparator{""} + } + } + java{ + miscPatterns{ + approximately{""} + atLeast{""} + atMost{""} + range{""} + } + patterns{ + accountingFormat{""} + accountingFormat%alphaNextToNumber{""} + accountingFormat%noCurrency{""} + currencyFormat{""} + currencyFormat%alphaNextToNumber{""} + currencyFormat%noCurrency{""} + decimalFormat{""} + percentFormat{""} + scientificFormat{""} + } + patternsLong{ + decimalFormat{ 1000{ + 1{""} zero{""} one{""} two{""} @@ -13270,7 +13151,9 @@ structLocale:table(nofallback){ other{""} } } - decimalFormat{ + } + patternsShort{ + currencyFormat{ 1000{ zero{""} one{""} @@ -13368,43 +13251,8 @@ structLocale:table(nofallback){ other{""} } } - } - symbols{ - approximatelySign{""} - decimal{""} - exponential{""} - group{""} - infinity{""} - list{""} - minusSign{""} - nan{""} - perMille{""} - percentSign{""} - plusSign{""} - currencyDecimal{""} - currencyGroup{""} - superscriptingExponent{""} - timeSeparator{""} - } - } - laoo{ - miscPatterns{ - approximately{""} - atLeast{""} - atMost{""} - range{""} - } - patterns{ - accountingFormat{""} - currencyFormat{""} - decimalFormat{""} - percentFormat{""} - scientificFormat{""} - } - patternsLong{ - decimalFormat{ + currencyFormat%alphaNextToNumber{ 1000{ - 1{""} zero{""} one{""} two{""} @@ -13501,9 +13349,7 @@ structLocale:table(nofallback){ other{""} } } - } - patternsShort{ - currencyFormat{ + decimalFormat{ 1000{ zero{""} one{""} @@ -13601,8 +13447,47 @@ structLocale:table(nofallback){ other{""} } } + } + symbols{ + approximatelySign{""} + decimal{""} + exponential{""} + group{""} + infinity{""} + list{""} + minusSign{""} + nan{""} + perMille{""} + percentSign{""} + plusSign{""} + currencyDecimal{""} + currencyGroup{""} + superscriptingExponent{""} + timeSeparator{""} + } + } + kali{ + miscPatterns{ + approximately{""} + atLeast{""} + atMost{""} + range{""} + } + patterns{ + accountingFormat{""} + accountingFormat%alphaNextToNumber{""} + accountingFormat%noCurrency{""} + currencyFormat{""} + currencyFormat%alphaNextToNumber{""} + currencyFormat%noCurrency{""} + decimalFormat{""} + percentFormat{""} + scientificFormat{""} + } + patternsLong{ decimalFormat{ 1000{ + 1{""} zero{""} one{""} two{""} @@ -13700,42 +13585,9 @@ structLocale:table(nofallback){ } } } - symbols{ - approximatelySign{""} - decimal{""} - exponential{""} - group{""} - infinity{""} - list{""} - minusSign{""} - nan{""} - perMille{""} - percentSign{""} - plusSign{""} - currencyDecimal{""} - currencyGroup{""} - superscriptingExponent{""} - timeSeparator{""} - } - } - latn{ - miscPatterns{ - approximately{""} - atLeast{""} - atMost{""} - range{""} - } - patterns{ - accountingFormat{""} - currencyFormat{""} - decimalFormat{""} - percentFormat{""} - scientificFormat{""} - } - patternsLong{ - decimalFormat{ + patternsShort{ + currencyFormat{ 1000{ - 1{""} zero{""} one{""} two{""} @@ -13832,9 +13684,7 @@ structLocale:table(nofallback){ other{""} } } - } - patternsShort{ - currencyFormat{ + currencyFormat%alphaNextToNumber{ 1000{ zero{""} one{""} @@ -14049,16 +13899,20 @@ structLocale:table(nofallback){ timeSeparator{""} } } - lepc{ + khmr{ miscPatterns{ approximately{""} atLeast{""} atMost{""} range{""} } - patterns{ + patterns{ accountingFormat{""} + accountingFormat%alphaNextToNumber{""} + accountingFormat%noCurrency{""} currencyFormat{""} + currencyFormat%alphaNextToNumber{""} + currencyFormat%noCurrency{""} decimalFormat{""} percentFormat{""} scientificFormat{""} @@ -14263,7 +14117,7 @@ structLocale:table(nofallback){ other{""} } } - decimalFormat{ + currencyFormat%alphaNextToNumber{ 1000{ zero{""} one{""} @@ -14361,43 +14215,4619 @@ structLocale:table(nofallback){ other{""} } } - } - symbols{ - approximatelySign{""} - decimal{""} - exponential{""} - group{""} - infinity{""} - list{""} - minusSign{""} - nan{""} - perMille{""} - percentSign{""} - plusSign{""} - currencyDecimal{""} - currencyGroup{""} - superscriptingExponent{""} - timeSeparator{""} - } - } - limb{ - miscPatterns{ - approximately{""} - atLeast{""} - atMost{""} - range{""} - } - patterns{ - accountingFormat{""} - currencyFormat{""} + decimalFormat{ + 1000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + } + } + symbols{ + approximatelySign{""} + decimal{""} + exponential{""} + group{""} + infinity{""} + list{""} + minusSign{""} + nan{""} + perMille{""} + percentSign{""} + plusSign{""} + currencyDecimal{""} + currencyGroup{""} + superscriptingExponent{""} + timeSeparator{""} + } + } + knda{ + miscPatterns{ + approximately{""} + atLeast{""} + atMost{""} + range{""} + } + patterns{ + accountingFormat{""} + accountingFormat%alphaNextToNumber{""} + accountingFormat%noCurrency{""} + currencyFormat{""} + currencyFormat%alphaNextToNumber{""} + currencyFormat%noCurrency{""} + decimalFormat{""} + percentFormat{""} + scientificFormat{""} + } + patternsLong{ + decimalFormat{ + 1000{ + 1{""} + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + } + } + patternsShort{ + currencyFormat{ + 1000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + } + currencyFormat%alphaNextToNumber{ + 1000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + } + decimalFormat{ + 1000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + } + } + symbols{ + approximatelySign{""} + decimal{""} + exponential{""} + group{""} + infinity{""} + list{""} + minusSign{""} + nan{""} + perMille{""} + percentSign{""} + plusSign{""} + currencyDecimal{""} + currencyGroup{""} + superscriptingExponent{""} + timeSeparator{""} + } + } + lana{ + miscPatterns{ + approximately{""} + atLeast{""} + atMost{""} + range{""} + } + patterns{ + accountingFormat{""} + accountingFormat%alphaNextToNumber{""} + accountingFormat%noCurrency{""} + currencyFormat{""} + currencyFormat%alphaNextToNumber{""} + currencyFormat%noCurrency{""} + decimalFormat{""} + percentFormat{""} + scientificFormat{""} + } + patternsLong{ + decimalFormat{ + 1000{ + 1{""} + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + } + } + patternsShort{ + currencyFormat{ + 1000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + } + currencyFormat%alphaNextToNumber{ + 1000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + } + decimalFormat{ + 1000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + } + } + symbols{ + approximatelySign{""} + decimal{""} + exponential{""} + group{""} + infinity{""} + list{""} + minusSign{""} + nan{""} + perMille{""} + percentSign{""} + plusSign{""} + currencyDecimal{""} + currencyGroup{""} + superscriptingExponent{""} + timeSeparator{""} + } + } + lanatham{ + miscPatterns{ + approximately{""} + atLeast{""} + atMost{""} + range{""} + } + patterns{ + accountingFormat{""} + accountingFormat%alphaNextToNumber{""} + accountingFormat%noCurrency{""} + currencyFormat{""} + currencyFormat%alphaNextToNumber{""} + currencyFormat%noCurrency{""} + decimalFormat{""} + percentFormat{""} + scientificFormat{""} + } + patternsLong{ + decimalFormat{ + 1000{ + 1{""} + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + } + } + patternsShort{ + currencyFormat{ + 1000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + } + currencyFormat%alphaNextToNumber{ + 1000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + } + decimalFormat{ + 1000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + } + } + symbols{ + approximatelySign{""} + decimal{""} + exponential{""} + group{""} + infinity{""} + list{""} + minusSign{""} + nan{""} + perMille{""} + percentSign{""} + plusSign{""} + currencyDecimal{""} + currencyGroup{""} + superscriptingExponent{""} + timeSeparator{""} + } + } + laoo{ + miscPatterns{ + approximately{""} + atLeast{""} + atMost{""} + range{""} + } + patterns{ + accountingFormat{""} + accountingFormat%alphaNextToNumber{""} + accountingFormat%noCurrency{""} + currencyFormat{""} + currencyFormat%alphaNextToNumber{""} + currencyFormat%noCurrency{""} + decimalFormat{""} + percentFormat{""} + scientificFormat{""} + } + patternsLong{ + decimalFormat{ + 1000{ + 1{""} + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + } + } + patternsShort{ + currencyFormat{ + 1000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + } + currencyFormat%alphaNextToNumber{ + 1000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + } + decimalFormat{ + 1000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + } + } + symbols{ + approximatelySign{""} + decimal{""} + exponential{""} + group{""} + infinity{""} + list{""} + minusSign{""} + nan{""} + perMille{""} + percentSign{""} + plusSign{""} + currencyDecimal{""} + currencyGroup{""} + superscriptingExponent{""} + timeSeparator{""} + } + } + latn{ + miscPatterns{ + approximately{""} + atLeast{""} + atMost{""} + range{""} + } + patterns{ + accountingFormat{""} + accountingFormat%alphaNextToNumber{""} + accountingFormat%noCurrency{""} + currencyFormat{""} + currencyFormat%alphaNextToNumber{""} + currencyFormat%noCurrency{""} + decimalFormat{""} + percentFormat{""} + scientificFormat{""} + } + patternsLong{ + decimalFormat{ + 1000{ + 1{""} + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + } + } + patternsShort{ + currencyFormat{ + 1000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + } + currencyFormat%alphaNextToNumber{ + 1000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + } + decimalFormat{ + 1000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + } + } + symbols{ + approximatelySign{""} + decimal{""} + exponential{""} + group{""} + infinity{""} + list{""} + minusSign{""} + nan{""} + perMille{""} + percentSign{""} + plusSign{""} + currencyDecimal{""} + currencyGroup{""} + superscriptingExponent{""} + timeSeparator{""} + } + } + lepc{ + miscPatterns{ + approximately{""} + atLeast{""} + atMost{""} + range{""} + } + patterns{ + accountingFormat{""} + accountingFormat%alphaNextToNumber{""} + accountingFormat%noCurrency{""} + currencyFormat{""} + currencyFormat%alphaNextToNumber{""} + currencyFormat%noCurrency{""} + decimalFormat{""} + percentFormat{""} + scientificFormat{""} + } + patternsLong{ + decimalFormat{ + 1000{ + 1{""} + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + } + } + patternsShort{ + currencyFormat{ + 1000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + } + currencyFormat%alphaNextToNumber{ + 1000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + } + decimalFormat{ + 1000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + } + } + symbols{ + approximatelySign{""} + decimal{""} + exponential{""} + group{""} + infinity{""} + list{""} + minusSign{""} + nan{""} + perMille{""} + percentSign{""} + plusSign{""} + currencyDecimal{""} + currencyGroup{""} + superscriptingExponent{""} + timeSeparator{""} + } + } + limb{ + miscPatterns{ + approximately{""} + atLeast{""} + atMost{""} + range{""} + } + patterns{ + accountingFormat{""} + accountingFormat%alphaNextToNumber{""} + accountingFormat%noCurrency{""} + currencyFormat{""} + currencyFormat%alphaNextToNumber{""} + currencyFormat%noCurrency{""} + decimalFormat{""} + percentFormat{""} + scientificFormat{""} + } + patternsLong{ + decimalFormat{ + 1000{ + 1{""} + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + } + } + patternsShort{ + currencyFormat{ + 1000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + } + currencyFormat%alphaNextToNumber{ + 1000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + } + decimalFormat{ + 1000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + } + } + symbols{ + approximatelySign{""} + decimal{""} + exponential{""} + group{""} + infinity{""} + list{""} + minusSign{""} + nan{""} + perMille{""} + percentSign{""} + plusSign{""} + currencyDecimal{""} + currencyGroup{""} + superscriptingExponent{""} + timeSeparator{""} + } + } + minimalPairs{ + case{ + ablative{""} + accusative{""} + dative{""} + elative{""} + ergative{""} + genitive{""} + illative{""} + instrumental{""} + locative{""} + nominative{""} + oblique{""} + partitive{""} + prepositional{""} + sociative{""} + terminative{""} + translative{""} + vocative{""} + } + gender { + common{""} + feminine{""} + inanimate{""} + masculine{""} + neuter{""} + } + ordinal{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + plural{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + } + mlym{ + miscPatterns{ + approximately{""} + atLeast{""} + atMost{""} + range{""} + } + patterns{ + accountingFormat{""} + accountingFormat%alphaNextToNumber{""} + accountingFormat%noCurrency{""} + currencyFormat{""} + currencyFormat%alphaNextToNumber{""} + currencyFormat%noCurrency{""} + decimalFormat{""} + percentFormat{""} + scientificFormat{""} + } + patternsLong{ + decimalFormat{ + 1000{ + 1{""} + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + } + } + patternsShort{ + currencyFormat{ + 1000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + } + currencyFormat%alphaNextToNumber{ + 1000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + } + decimalFormat{ + 1000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + } + } + symbols{ + approximatelySign{""} + decimal{""} + exponential{""} + group{""} + infinity{""} + list{""} + minusSign{""} + nan{""} + perMille{""} + percentSign{""} + plusSign{""} + currencyDecimal{""} + currencyGroup{""} + superscriptingExponent{""} + timeSeparator{""} + } + } + mong{ + miscPatterns{ + approximately{""} + atLeast{""} + atMost{""} + range{""} + } + patterns{ + accountingFormat{""} + accountingFormat%alphaNextToNumber{""} + accountingFormat%noCurrency{""} + currencyFormat{""} + currencyFormat%alphaNextToNumber{""} + currencyFormat%noCurrency{""} + decimalFormat{""} + percentFormat{""} + scientificFormat{""} + } + patternsLong{ + decimalFormat{ + 1000{ + 1{""} + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + } + } + patternsShort{ + currencyFormat{ + 1000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + } + currencyFormat%alphaNextToNumber{ + 1000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + } + decimalFormat{ + 1000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + } + } + symbols{ + approximatelySign{""} + decimal{""} + exponential{""} + group{""} + infinity{""} + list{""} + minusSign{""} + nan{""} + perMille{""} + percentSign{""} + plusSign{""} + currencyDecimal{""} + currencyGroup{""} + superscriptingExponent{""} + timeSeparator{""} + } + } + mtei{ + miscPatterns{ + approximately{""} + atLeast{""} + atMost{""} + range{""} + } + patterns{ + accountingFormat{""} + accountingFormat%alphaNextToNumber{""} + accountingFormat%noCurrency{""} + currencyFormat{""} + currencyFormat%alphaNextToNumber{""} + currencyFormat%noCurrency{""} + decimalFormat{""} + percentFormat{""} + scientificFormat{""} + } + patternsLong{ + decimalFormat{ + 1000{ + 1{""} + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + } + } + patternsShort{ + currencyFormat{ + 1000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + } + currencyFormat%alphaNextToNumber{ + 1000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + } + decimalFormat{ + 1000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + } + } + symbols{ + approximatelySign{""} + decimal{""} + exponential{""} + group{""} + infinity{""} + list{""} + minusSign{""} + nan{""} + perMille{""} + percentSign{""} + plusSign{""} + currencyDecimal{""} + currencyGroup{""} + superscriptingExponent{""} + timeSeparator{""} + } + } + mymr{ + miscPatterns{ + approximately{""} + atLeast{""} + atMost{""} + range{""} + } + patterns{ + accountingFormat{""} + accountingFormat%alphaNextToNumber{""} + accountingFormat%noCurrency{""} + currencyFormat{""} + currencyFormat%alphaNextToNumber{""} + currencyFormat%noCurrency{""} decimalFormat{""} percentFormat{""} scientificFormat{""} } - patternsLong{ - decimalFormat{ + patternsLong{ + decimalFormat{ + 1000{ + 1{""} + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + } + } + patternsShort{ + currencyFormat{ 1000{ - 1{""} zero{""} one{""} two{""} @@ -14494,9 +18924,7 @@ structLocale:table(nofallback){ other{""} } } - } - patternsShort{ - currencyFormat{ + currencyFormat%alphaNextToNumber{ 1000{ zero{""} one{""} @@ -14711,51 +19139,7 @@ structLocale:table(nofallback){ timeSeparator{""} } } - minimalPairs{ - case{ - ablative{""} - accusative{""} - dative{""} - elative{""} - ergative{""} - genitive{""} - illative{""} - instrumental{""} - locative{""} - nominative{""} - oblique{""} - partitive{""} - prepositional{""} - sociative{""} - terminative{""} - translative{""} - vocative{""} - } - gender { - common{""} - feminine{""} - inanimate{""} - masculine{""} - neuter{""} - } - ordinal{ - zero{""} - one{""} - two{""} - few{""} - many{""} - other{""} - } - plural{ - zero{""} - one{""} - two{""} - few{""} - many{""} - other{""} - } - } - mlym{ + mymrshan{ miscPatterns{ approximately{""} atLeast{""} @@ -14764,7 +19148,11 @@ structLocale:table(nofallback){ } patterns{ accountingFormat{""} + accountingFormat%alphaNextToNumber{""} + accountingFormat%noCurrency{""} currencyFormat{""} + currencyFormat%alphaNextToNumber{""} + currencyFormat%noCurrency{""} decimalFormat{""} percentFormat{""} scientificFormat{""} @@ -14772,7 +19160,205 @@ structLocale:table(nofallback){ patternsLong{ decimalFormat{ 1000{ - 1{""} + 1{""} + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + } + } + patternsShort{ + currencyFormat{ + 1000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + } + currencyFormat%alphaNextToNumber{ + 1000{ zero{""} one{""} two{""} @@ -14869,9 +19455,7 @@ structLocale:table(nofallback){ other{""} } } - } - patternsShort{ - currencyFormat{ + decimalFormat{ 1000{ zero{""} one{""} @@ -14969,8 +19553,49 @@ structLocale:table(nofallback){ other{""} } } + } + symbols{ + approximatelySign{""} + decimal{""} + exponential{""} + group{""} + infinity{""} + list{""} + minusSign{""} + nan{""} + perMille{""} + percentSign{""} + plusSign{""} + currencyDecimal{""} + currencyGroup{""} + superscriptingExponent{""} + timeSeparator{""} + } + } + minimumGroupingDigits{""} + native{""} + nkoo{ + miscPatterns{ + approximately{""} + atLeast{""} + atMost{""} + range{""} + } + patterns{ + accountingFormat{""} + accountingFormat%alphaNextToNumber{""} + accountingFormat%noCurrency{""} + currencyFormat{""} + currencyFormat%alphaNextToNumber{""} + currencyFormat%noCurrency{""} + decimalFormat{""} + percentFormat{""} + scientificFormat{""} + } + patternsLong{ decimalFormat{ 1000{ + 1{""} zero{""} one{""} two{""} @@ -15068,42 +19693,9 @@ structLocale:table(nofallback){ } } } - symbols{ - approximatelySign{""} - decimal{""} - exponential{""} - group{""} - infinity{""} - list{""} - minusSign{""} - nan{""} - perMille{""} - percentSign{""} - plusSign{""} - currencyDecimal{""} - currencyGroup{""} - superscriptingExponent{""} - timeSeparator{""} - } - } - mong{ - miscPatterns{ - approximately{""} - atLeast{""} - atMost{""} - range{""} - } - patterns{ - accountingFormat{""} - currencyFormat{""} - decimalFormat{""} - percentFormat{""} - scientificFormat{""} - } - patternsLong{ - decimalFormat{ + patternsShort{ + currencyFormat{ 1000{ - 1{""} zero{""} one{""} two{""} @@ -15200,9 +19792,7 @@ structLocale:table(nofallback){ other{""} } } - } - patternsShort{ - currencyFormat{ + currencyFormat%alphaNextToNumber{ 1000{ zero{""} one{""} @@ -15417,7 +20007,7 @@ structLocale:table(nofallback){ timeSeparator{""} } } - mtei{ + olck{ miscPatterns{ approximately{""} atLeast{""} @@ -15426,7 +20016,11 @@ structLocale:table(nofallback){ } patterns{ accountingFormat{""} + accountingFormat%alphaNextToNumber{""} + accountingFormat%noCurrency{""} currencyFormat{""} + currencyFormat%alphaNextToNumber{""} + currencyFormat%noCurrency{""} decimalFormat{""} percentFormat{""} scientificFormat{""} @@ -15631,6 +20225,104 @@ structLocale:table(nofallback){ other{""} } } + currencyFormat%alphaNextToNumber{ + 1000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + } decimalFormat{ 1000{ zero{""} @@ -15748,7 +20440,7 @@ structLocale:table(nofallback){ timeSeparator{""} } } - mymr{ + orya{ miscPatterns{ approximately{""} atLeast{""} @@ -15757,7 +20449,11 @@ structLocale:table(nofallback){ } patterns{ accountingFormat{""} + accountingFormat%alphaNextToNumber{""} + accountingFormat%noCurrency{""} currencyFormat{""} + currencyFormat%alphaNextToNumber{""} + currencyFormat%noCurrency{""} decimalFormat{""} percentFormat{""} scientificFormat{""} @@ -15962,7 +20658,7 @@ structLocale:table(nofallback){ other{""} } } - decimalFormat{ + currencyFormat%alphaNextToNumber{ 1000{ zero{""} one{""} @@ -16060,43 +20756,8 @@ structLocale:table(nofallback){ other{""} } } - } - symbols{ - approximatelySign{""} - decimal{""} - exponential{""} - group{""} - infinity{""} - list{""} - minusSign{""} - nan{""} - perMille{""} - percentSign{""} - plusSign{""} - currencyDecimal{""} - currencyGroup{""} - superscriptingExponent{""} - timeSeparator{""} - } - } - mymrshan{ - miscPatterns{ - approximately{""} - atLeast{""} - atMost{""} - range{""} - } - patterns{ - accountingFormat{""} - currencyFormat{""} - decimalFormat{""} - percentFormat{""} - scientificFormat{""} - } - patternsLong{ decimalFormat{ 1000{ - 1{""} zero{""} one{""} two{""} @@ -16194,9 +20855,46 @@ structLocale:table(nofallback){ } } } - patternsShort{ - currencyFormat{ + symbols{ + approximatelySign{""} + decimal{""} + exponential{""} + group{""} + infinity{""} + list{""} + minusSign{""} + nan{""} + perMille{""} + percentSign{""} + plusSign{""} + currencyDecimal{""} + currencyGroup{""} + superscriptingExponent{""} + timeSeparator{""} + } + } + osma{ + miscPatterns{ + approximately{""} + atLeast{""} + atMost{""} + range{""} + } + patterns{ + accountingFormat{""} + accountingFormat%alphaNextToNumber{""} + accountingFormat%noCurrency{""} + currencyFormat{""} + currencyFormat%alphaNextToNumber{""} + currencyFormat%noCurrency{""} + decimalFormat{""} + percentFormat{""} + scientificFormat{""} + } + patternsLong{ + decimalFormat{ 1000{ + 1{""} zero{""} one{""} two{""} @@ -16293,7 +20991,9 @@ structLocale:table(nofallback){ other{""} } } - decimalFormat{ + } + patternsShort{ + currencyFormat{ 1000{ zero{""} one{""} @@ -16391,45 +21091,8 @@ structLocale:table(nofallback){ other{""} } } - } - symbols{ - approximatelySign{""} - decimal{""} - exponential{""} - group{""} - infinity{""} - list{""} - minusSign{""} - nan{""} - perMille{""} - percentSign{""} - plusSign{""} - currencyDecimal{""} - currencyGroup{""} - superscriptingExponent{""} - timeSeparator{""} - } - } - minimumGroupingDigits{""} - native{""} - nkoo{ - miscPatterns{ - approximately{""} - atLeast{""} - atMost{""} - range{""} - } - patterns{ - accountingFormat{""} - currencyFormat{""} - decimalFormat{""} - percentFormat{""} - scientificFormat{""} - } - patternsLong{ - decimalFormat{ + currencyFormat%alphaNextToNumber{ 1000{ - 1{""} zero{""} one{""} two{""} @@ -16526,9 +21189,7 @@ structLocale:table(nofallback){ other{""} } } - } - patternsShort{ - currencyFormat{ + decimalFormat{ 1000{ zero{""} one{""} @@ -16626,8 +21287,47 @@ structLocale:table(nofallback){ other{""} } } + } + symbols{ + approximatelySign{""} + decimal{""} + exponential{""} + group{""} + infinity{""} + list{""} + minusSign{""} + nan{""} + perMille{""} + percentSign{""} + plusSign{""} + currencyDecimal{""} + currencyGroup{""} + superscriptingExponent{""} + timeSeparator{""} + } + } + rohg{ + miscPatterns{ + approximately{""} + atLeast{""} + atMost{""} + range{""} + } + patterns{ + accountingFormat{""} + accountingFormat%alphaNextToNumber{""} + accountingFormat%noCurrency{""} + currencyFormat{""} + currencyFormat%alphaNextToNumber{""} + currencyFormat%noCurrency{""} + decimalFormat{""} + percentFormat{""} + scientificFormat{""} + } + patternsLong{ decimalFormat{ 1000{ + 1{""} zero{""} one{""} two{""} @@ -16725,42 +21425,9 @@ structLocale:table(nofallback){ } } } - symbols{ - approximatelySign{""} - decimal{""} - exponential{""} - group{""} - infinity{""} - list{""} - minusSign{""} - nan{""} - perMille{""} - percentSign{""} - plusSign{""} - currencyDecimal{""} - currencyGroup{""} - superscriptingExponent{""} - timeSeparator{""} - } - } - olck{ - miscPatterns{ - approximately{""} - atLeast{""} - atMost{""} - range{""} - } - patterns{ - accountingFormat{""} - currencyFormat{""} - decimalFormat{""} - percentFormat{""} - scientificFormat{""} - } - patternsLong{ - decimalFormat{ + patternsShort{ + currencyFormat{ 1000{ - 1{""} zero{""} one{""} two{""} @@ -16857,9 +21524,7 @@ structLocale:table(nofallback){ other{""} } } - } - patternsShort{ - currencyFormat{ + currencyFormat%alphaNextToNumber{ 1000{ zero{""} one{""} @@ -17074,7 +21739,7 @@ structLocale:table(nofallback){ timeSeparator{""} } } - orya{ + saur{ miscPatterns{ approximately{""} atLeast{""} @@ -17083,7 +21748,11 @@ structLocale:table(nofallback){ } patterns{ accountingFormat{""} + accountingFormat%alphaNextToNumber{""} + accountingFormat%noCurrency{""} currencyFormat{""} + currencyFormat%alphaNextToNumber{""} + currencyFormat%noCurrency{""} decimalFormat{""} percentFormat{""} scientificFormat{""} @@ -17288,7 +21957,7 @@ structLocale:table(nofallback){ other{""} } } - decimalFormat{ + currencyFormat%alphaNextToNumber{ 1000{ zero{""} one{""} @@ -17386,43 +22055,8 @@ structLocale:table(nofallback){ other{""} } } - } - symbols{ - approximatelySign{""} - decimal{""} - exponential{""} - group{""} - infinity{""} - list{""} - minusSign{""} - nan{""} - perMille{""} - percentSign{""} - plusSign{""} - currencyDecimal{""} - currencyGroup{""} - superscriptingExponent{""} - timeSeparator{""} - } - } - osma{ - miscPatterns{ - approximately{""} - atLeast{""} - atMost{""} - range{""} - } - patterns{ - accountingFormat{""} - currencyFormat{""} - decimalFormat{""} - percentFormat{""} - scientificFormat{""} - } - patternsLong{ decimalFormat{ 1000{ - 1{""} zero{""} one{""} two{""} @@ -17520,9 +22154,46 @@ structLocale:table(nofallback){ } } } - patternsShort{ - currencyFormat{ + symbols{ + approximatelySign{""} + decimal{""} + exponential{""} + group{""} + infinity{""} + list{""} + minusSign{""} + nan{""} + perMille{""} + percentSign{""} + plusSign{""} + currencyDecimal{""} + currencyGroup{""} + superscriptingExponent{""} + timeSeparator{""} + } + } + shrd{ + miscPatterns{ + approximately{""} + atLeast{""} + atMost{""} + range{""} + } + patterns{ + accountingFormat{""} + accountingFormat%alphaNextToNumber{""} + accountingFormat%noCurrency{""} + currencyFormat{""} + currencyFormat%alphaNextToNumber{""} + currencyFormat%noCurrency{""} + decimalFormat{""} + percentFormat{""} + scientificFormat{""} + } + patternsLong{ + decimalFormat{ 1000{ + 1{""} zero{""} one{""} two{""} @@ -17619,7 +22290,9 @@ structLocale:table(nofallback){ other{""} } } - decimalFormat{ + } + patternsShort{ + currencyFormat{ 1000{ zero{""} one{""} @@ -17706,54 +22379,19 @@ structLocale:table(nofallback){ two{""} few{""} many{""} - other{""} - } - 100000000000000{ - zero{""} - one{""} - two{""} - few{""} - many{""} - other{""} - } - } - } - symbols{ - approximatelySign{""} - decimal{""} - exponential{""} - group{""} - infinity{""} - list{""} - minusSign{""} - nan{""} - perMille{""} - percentSign{""} - plusSign{""} - currencyDecimal{""} - currencyGroup{""} - superscriptingExponent{""} - timeSeparator{""} - } - } - rohg{ - miscPatterns{ - approximately{""} - atLeast{""} - atMost{""} - range{""} - } - patterns{ - accountingFormat{""} - currencyFormat{""} - decimalFormat{""} - percentFormat{""} - scientificFormat{""} - } - patternsLong{ - decimalFormat{ + other{""} + } + 100000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + } + currencyFormat%alphaNextToNumber{ 1000{ - 1{""} zero{""} one{""} two{""} @@ -17850,9 +22488,7 @@ structLocale:table(nofallback){ other{""} } } - } - patternsShort{ - currencyFormat{ + decimalFormat{ 1000{ zero{""} one{""} @@ -17950,8 +22586,47 @@ structLocale:table(nofallback){ other{""} } } + } + symbols{ + approximatelySign{""} + decimal{""} + exponential{""} + group{""} + infinity{""} + list{""} + minusSign{""} + nan{""} + perMille{""} + percentSign{""} + plusSign{""} + currencyDecimal{""} + currencyGroup{""} + superscriptingExponent{""} + timeSeparator{""} + } + } + sora{ + miscPatterns{ + approximately{""} + atLeast{""} + atMost{""} + range{""} + } + patterns{ + accountingFormat{""} + accountingFormat%alphaNextToNumber{""} + accountingFormat%noCurrency{""} + currencyFormat{""} + currencyFormat%alphaNextToNumber{""} + currencyFormat%noCurrency{""} + decimalFormat{""} + percentFormat{""} + scientificFormat{""} + } + patternsLong{ decimalFormat{ 1000{ + 1{""} zero{""} one{""} two{""} @@ -18049,42 +22724,9 @@ structLocale:table(nofallback){ } } } - symbols{ - approximatelySign{""} - decimal{""} - exponential{""} - group{""} - infinity{""} - list{""} - minusSign{""} - nan{""} - perMille{""} - percentSign{""} - plusSign{""} - currencyDecimal{""} - currencyGroup{""} - superscriptingExponent{""} - timeSeparator{""} - } - } - saur{ - miscPatterns{ - approximately{""} - atLeast{""} - atMost{""} - range{""} - } - patterns{ - accountingFormat{""} - currencyFormat{""} - decimalFormat{""} - percentFormat{""} - scientificFormat{""} - } - patternsLong{ - decimalFormat{ + patternsShort{ + currencyFormat{ 1000{ - 1{""} zero{""} one{""} two{""} @@ -18181,9 +22823,7 @@ structLocale:table(nofallback){ other{""} } } - } - patternsShort{ - currencyFormat{ + currencyFormat%alphaNextToNumber{ 1000{ zero{""} one{""} @@ -18398,7 +23038,7 @@ structLocale:table(nofallback){ timeSeparator{""} } } - shrd{ + sund{ miscPatterns{ approximately{""} atLeast{""} @@ -18407,7 +23047,11 @@ structLocale:table(nofallback){ } patterns{ accountingFormat{""} + accountingFormat%alphaNextToNumber{""} + accountingFormat%noCurrency{""} currencyFormat{""} + currencyFormat%alphaNextToNumber{""} + currencyFormat%noCurrency{""} decimalFormat{""} percentFormat{""} scientificFormat{""} @@ -18612,6 +23256,104 @@ structLocale:table(nofallback){ other{""} } } + currencyFormat%alphaNextToNumber{ + 1000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + } decimalFormat{ 1000{ zero{""} @@ -18729,7 +23471,7 @@ structLocale:table(nofallback){ timeSeparator{""} } } - sora{ + takr{ miscPatterns{ approximately{""} atLeast{""} @@ -18738,7 +23480,11 @@ structLocale:table(nofallback){ } patterns{ accountingFormat{""} + accountingFormat%alphaNextToNumber{""} + accountingFormat%noCurrency{""} currencyFormat{""} + currencyFormat%alphaNextToNumber{""} + currencyFormat%noCurrency{""} decimalFormat{""} percentFormat{""} scientificFormat{""} @@ -18943,7 +23689,7 @@ structLocale:table(nofallback){ other{""} } } - decimalFormat{ + currencyFormat%alphaNextToNumber{ 1000{ zero{""} one{""} @@ -19041,43 +23787,8 @@ structLocale:table(nofallback){ other{""} } } - } - symbols{ - approximatelySign{""} - decimal{""} - exponential{""} - group{""} - infinity{""} - list{""} - minusSign{""} - nan{""} - perMille{""} - percentSign{""} - plusSign{""} - currencyDecimal{""} - currencyGroup{""} - superscriptingExponent{""} - timeSeparator{""} - } - } - sund{ - miscPatterns{ - approximately{""} - atLeast{""} - atMost{""} - range{""} - } - patterns{ - accountingFormat{""} - currencyFormat{""} - decimalFormat{""} - percentFormat{""} - scientificFormat{""} - } - patternsLong{ decimalFormat{ 1000{ - 1{""} zero{""} one{""} two{""} @@ -19175,9 +23886,46 @@ structLocale:table(nofallback){ } } } - patternsShort{ - currencyFormat{ + symbols{ + approximatelySign{""} + decimal{""} + exponential{""} + group{""} + infinity{""} + list{""} + minusSign{""} + nan{""} + perMille{""} + percentSign{""} + plusSign{""} + currencyDecimal{""} + currencyGroup{""} + superscriptingExponent{""} + timeSeparator{""} + } + } + talu{ + miscPatterns{ + approximately{""} + atLeast{""} + atMost{""} + range{""} + } + patterns{ + accountingFormat{""} + accountingFormat%alphaNextToNumber{""} + accountingFormat%noCurrency{""} + currencyFormat{""} + currencyFormat%alphaNextToNumber{""} + currencyFormat%noCurrency{""} + decimalFormat{""} + percentFormat{""} + scientificFormat{""} + } + patternsLong{ + decimalFormat{ 1000{ + 1{""} zero{""} one{""} two{""} @@ -19274,7 +24022,9 @@ structLocale:table(nofallback){ other{""} } } - decimalFormat{ + } + patternsShort{ + currencyFormat{ 1000{ zero{""} one{""} @@ -19372,43 +24122,8 @@ structLocale:table(nofallback){ other{""} } } - } - symbols{ - approximatelySign{""} - decimal{""} - exponential{""} - group{""} - infinity{""} - list{""} - minusSign{""} - nan{""} - perMille{""} - percentSign{""} - plusSign{""} - currencyDecimal{""} - currencyGroup{""} - superscriptingExponent{""} - timeSeparator{""} - } - } - takr{ - miscPatterns{ - approximately{""} - atLeast{""} - atMost{""} - range{""} - } - patterns{ - accountingFormat{""} - currencyFormat{""} - decimalFormat{""} - percentFormat{""} - scientificFormat{""} - } - patternsLong{ - decimalFormat{ + currencyFormat%alphaNextToNumber{ 1000{ - 1{""} zero{""} one{""} two{""} @@ -19505,9 +24220,7 @@ structLocale:table(nofallback){ other{""} } } - } - patternsShort{ - currencyFormat{ + decimalFormat{ 1000{ zero{""} one{""} @@ -19605,8 +24318,47 @@ structLocale:table(nofallback){ other{""} } } + } + symbols{ + approximatelySign{""} + decimal{""} + exponential{""} + group{""} + infinity{""} + list{""} + minusSign{""} + nan{""} + perMille{""} + percentSign{""} + plusSign{""} + currencyDecimal{""} + currencyGroup{""} + superscriptingExponent{""} + timeSeparator{""} + } + } + tamldec{ + miscPatterns{ + approximately{""} + atLeast{""} + atMost{""} + range{""} + } + patterns{ + accountingFormat{""} + accountingFormat%alphaNextToNumber{""} + accountingFormat%noCurrency{""} + currencyFormat{""} + currencyFormat%alphaNextToNumber{""} + currencyFormat%noCurrency{""} + decimalFormat{""} + percentFormat{""} + scientificFormat{""} + } + patternsLong{ decimalFormat{ 1000{ + 1{""} zero{""} one{""} two{""} @@ -19704,42 +24456,9 @@ structLocale:table(nofallback){ } } } - symbols{ - approximatelySign{""} - decimal{""} - exponential{""} - group{""} - infinity{""} - list{""} - minusSign{""} - nan{""} - perMille{""} - percentSign{""} - plusSign{""} - currencyDecimal{""} - currencyGroup{""} - superscriptingExponent{""} - timeSeparator{""} - } - } - talu{ - miscPatterns{ - approximately{""} - atLeast{""} - atMost{""} - range{""} - } - patterns{ - accountingFormat{""} - currencyFormat{""} - decimalFormat{""} - percentFormat{""} - scientificFormat{""} - } - patternsLong{ - decimalFormat{ + patternsShort{ + currencyFormat{ 1000{ - 1{""} zero{""} one{""} two{""} @@ -19836,9 +24555,7 @@ structLocale:table(nofallback){ other{""} } } - } - patternsShort{ - currencyFormat{ + currencyFormat%alphaNextToNumber{ 1000{ zero{""} one{""} @@ -20053,7 +24770,7 @@ structLocale:table(nofallback){ timeSeparator{""} } } - tamldec{ + telu{ miscPatterns{ approximately{""} atLeast{""} @@ -20062,7 +24779,11 @@ structLocale:table(nofallback){ } patterns{ accountingFormat{""} + accountingFormat%alphaNextToNumber{""} + accountingFormat%noCurrency{""} currencyFormat{""} + currencyFormat%alphaNextToNumber{""} + currencyFormat%noCurrency{""} decimalFormat{""} percentFormat{""} scientificFormat{""} @@ -20267,7 +24988,7 @@ structLocale:table(nofallback){ other{""} } } - decimalFormat{ + currencyFormat%alphaNextToNumber{ 1000{ zero{""} one{""} @@ -20365,43 +25086,8 @@ structLocale:table(nofallback){ other{""} } } - } - symbols{ - approximatelySign{""} - decimal{""} - exponential{""} - group{""} - infinity{""} - list{""} - minusSign{""} - nan{""} - perMille{""} - percentSign{""} - plusSign{""} - currencyDecimal{""} - currencyGroup{""} - superscriptingExponent{""} - timeSeparator{""} - } - } - telu{ - miscPatterns{ - approximately{""} - atLeast{""} - atMost{""} - range{""} - } - patterns{ - accountingFormat{""} - currencyFormat{""} - decimalFormat{""} - percentFormat{""} - scientificFormat{""} - } - patternsLong{ decimalFormat{ 1000{ - 1{""} zero{""} one{""} two{""} @@ -20499,9 +25185,46 @@ structLocale:table(nofallback){ } } } - patternsShort{ - currencyFormat{ + symbols{ + approximatelySign{""} + decimal{""} + exponential{""} + group{""} + infinity{""} + list{""} + minusSign{""} + nan{""} + perMille{""} + percentSign{""} + plusSign{""} + currencyDecimal{""} + currencyGroup{""} + superscriptingExponent{""} + timeSeparator{""} + } + } + thai{ + miscPatterns{ + approximately{""} + atLeast{""} + atMost{""} + range{""} + } + patterns{ + accountingFormat{""} + accountingFormat%alphaNextToNumber{""} + accountingFormat%noCurrency{""} + currencyFormat{""} + currencyFormat%alphaNextToNumber{""} + currencyFormat%noCurrency{""} + decimalFormat{""} + percentFormat{""} + scientificFormat{""} + } + patternsLong{ + decimalFormat{ 1000{ + 1{""} zero{""} one{""} two{""} @@ -20598,7 +25321,9 @@ structLocale:table(nofallback){ other{""} } } - decimalFormat{ + } + patternsShort{ + currencyFormat{ 1000{ zero{""} one{""} @@ -20682,57 +25407,22 @@ structLocale:table(nofallback){ 10000000000000{ zero{""} one{""} - two{""} - few{""} - many{""} - other{""} - } - 100000000000000{ - zero{""} - one{""} - two{""} - few{""} - many{""} - other{""} - } - } - } - symbols{ - approximatelySign{""} - decimal{""} - exponential{""} - group{""} - infinity{""} - list{""} - minusSign{""} - nan{""} - perMille{""} - percentSign{""} - plusSign{""} - currencyDecimal{""} - currencyGroup{""} - superscriptingExponent{""} - timeSeparator{""} - } - } - thai{ - miscPatterns{ - approximately{""} - atLeast{""} - atMost{""} - range{""} - } - patterns{ - accountingFormat{""} - currencyFormat{""} - decimalFormat{""} - percentFormat{""} - scientificFormat{""} - } - patternsLong{ - decimalFormat{ + two{""} + few{""} + many{""} + other{""} + } + 100000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + } + currencyFormat%alphaNextToNumber{ 1000{ - 1{""} zero{""} one{""} two{""} @@ -20829,9 +25519,7 @@ structLocale:table(nofallback){ other{""} } } - } - patternsShort{ - currencyFormat{ + decimalFormat{ 1000{ zero{""} one{""} @@ -20929,8 +25617,47 @@ structLocale:table(nofallback){ other{""} } } + } + symbols{ + approximatelySign{""} + decimal{""} + exponential{""} + group{""} + infinity{""} + list{""} + minusSign{""} + nan{""} + perMille{""} + percentSign{""} + plusSign{""} + currencyDecimal{""} + currencyGroup{""} + superscriptingExponent{""} + timeSeparator{""} + } + } + tibt{ + miscPatterns{ + approximately{""} + atLeast{""} + atMost{""} + range{""} + } + patterns{ + accountingFormat{""} + accountingFormat%alphaNextToNumber{""} + accountingFormat%noCurrency{""} + currencyFormat{""} + currencyFormat%alphaNextToNumber{""} + currencyFormat%noCurrency{""} + decimalFormat{""} + percentFormat{""} + scientificFormat{""} + } + patternsLong{ decimalFormat{ 1000{ + 1{""} zero{""} one{""} two{""} @@ -21028,42 +25755,9 @@ structLocale:table(nofallback){ } } } - symbols{ - approximatelySign{""} - decimal{""} - exponential{""} - group{""} - infinity{""} - list{""} - minusSign{""} - nan{""} - perMille{""} - percentSign{""} - plusSign{""} - currencyDecimal{""} - currencyGroup{""} - superscriptingExponent{""} - timeSeparator{""} - } - } - tibt{ - miscPatterns{ - approximately{""} - atLeast{""} - atMost{""} - range{""} - } - patterns{ - accountingFormat{""} - currencyFormat{""} - decimalFormat{""} - percentFormat{""} - scientificFormat{""} - } - patternsLong{ - decimalFormat{ + patternsShort{ + currencyFormat{ 1000{ - 1{""} zero{""} one{""} two{""} @@ -21160,9 +25854,7 @@ structLocale:table(nofallback){ other{""} } } - } - patternsShort{ - currencyFormat{ + currencyFormat%alphaNextToNumber{ 1000{ zero{""} one{""} @@ -21387,7 +26079,11 @@ structLocale:table(nofallback){ } patterns{ accountingFormat{""} + accountingFormat%alphaNextToNumber{""} + accountingFormat%noCurrency{""} currencyFormat{""} + currencyFormat%alphaNextToNumber{""} + currencyFormat%noCurrency{""} decimalFormat{""} percentFormat{""} scientificFormat{""} @@ -21592,6 +26288,104 @@ structLocale:table(nofallback){ other{""} } } + currencyFormat%alphaNextToNumber{ + 1000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 1000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 10000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + 100000000000000{ + zero{""} + one{""} + two{""} + few{""} + many{""} + other{""} + } + } decimalFormat{ 1000{ zero{""} @@ -22079,6 +26873,12 @@ structLocale:table(nofallback){ "A4", "A4", } + DateTimePatterns%atTime{ + "A4", + "A4", + "A4", + "A4", + } DateTimeSkeletons{ "", "", @@ -22321,6 +27121,12 @@ structLocale:table(nofallback){ "A4", "A4", } + DateTimePatterns%atTime{ + "A4", + "A4", + "A4", + "A4", + } DateTimeSkeletons{ "", "", @@ -23405,6 +28211,12 @@ structLocale:table(nofallback){ "A4", "A4", } + DateTimePatterns%atTime{ + "A4", + "A4", + "A4", + "A4", + } DateTimeSkeletons{ "", "", @@ -23763,6 +28575,12 @@ structLocale:table(nofallback){ "A4", "A4", } + DateTimePatterns%atTime{ + "A4", + "A4", + "A4", + "A4", + } DateTimeSkeletons{ "", "", @@ -24852,6 +29670,12 @@ structLocale:table(nofallback){ "A4", "A4", } + DateTimePatterns%atTime{ + "A4", + "A4", + "A4", + "A4", + } DateTimeSkeletons{ "", "", @@ -25518,6 +30342,12 @@ structLocale:table(nofallback){ "A4", "A4", } + DateTimePatterns%atTime{ + "A4", + "A4", + "A4", + "A4", + } DateTimeSkeletons{ "", "", @@ -25812,6 +30642,12 @@ structLocale:table(nofallback){ "A4", "A4", } + DateTimePatterns%atTime{ + "A4", + "A4", + "A4", + "A4", + } DateTimeSkeletons{ "", "", @@ -26417,6 +31253,12 @@ structLocale:table(nofallback){ "A4", "A4", } + DateTimePatterns%atTime{ + "A4", + "A4", + "A4", + "A4", + } DateTimeSkeletons{ "", "", @@ -26779,6 +31621,12 @@ structLocale:table(nofallback){ "A4", "A4", } + DateTimePatterns%atTime{ + "A4", + "A4", + "A4", + "A4", + } DateTimeSkeletons{ "", "", @@ -27103,6 +31951,12 @@ structLocale:table(nofallback){ "A4", "A4", } + DateTimePatterns%atTime{ + "A4", + "A4", + "A4", + "A4", + } DateTimeSkeletons{ "", "", @@ -27508,6 +32362,12 @@ structLocale:table(nofallback){ "A4", "A4", } + DateTimePatterns%atTime{ + "A4", + "A4", + "A4", + "A4", + } DateTimeSkeletons{ "", "", @@ -27844,6 +32704,12 @@ structLocale:table(nofallback){ "A4", "A4", } + DateTimePatterns%atTime{ + "A4", + "A4", + "A4", + "A4", + } DateTimeSkeletons{ "", "", @@ -28798,6 +33664,12 @@ structLocale:table(nofallback){ "A4", "A4", } + DateTimePatterns%atTime{ + "A4", + "A4", + "A4", + "A4", + } DateTimeSkeletons{ "", "", diff --git a/icu4j/main/classes/core/src/com/ibm/icu/impl/PatternProps.java b/icu4j/main/classes/core/src/com/ibm/icu/impl/PatternProps.java index 7d8bdfb7091f..8b1fca315681 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/impl/PatternProps.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/impl/PatternProps.java @@ -20,7 +20,7 @@ * Pattern_Syntax includes some unassigned code points. *

* [:Pattern_White_Space:] = - * [\u0009-\u000D\ \u0085\u200E\u200F\u2028\u2029] + * [\u0009-\u000D\ \u0020\u0085\u200E\u200F\u2028\u2029] *

* [:Pattern_Syntax:] = * [!-/\:-@\[-\^`\{-~\u00A1-\u00A7\u00A9\u00AB\u00AC\u00AE diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/DateIntervalFormat.java b/icu4j/main/classes/core/src/com/ibm/icu/text/DateIntervalFormat.java index 53d2b975e111..21c1da5973b2 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/text/DateIntervalFormat.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/text/DateIntervalFormat.java @@ -2126,8 +2126,16 @@ private static String adjustFieldWidth(String inputSkeleton, if (suppressDayPeriodField) { if (bestMatchIntervalPattern.indexOf(" a") != -1) { bestMatchIntervalPattern = findReplaceInPattern(bestMatchIntervalPattern, " a", ""); + } else if (bestMatchIntervalPattern.indexOf("\u00A0a") != -1) { + bestMatchIntervalPattern = findReplaceInPattern(bestMatchIntervalPattern, "\u00A0a", ""); + } else if (bestMatchIntervalPattern.indexOf("\u202Fa") != -1) { + bestMatchIntervalPattern = findReplaceInPattern(bestMatchIntervalPattern, "\u202Fa", ""); } else if (bestMatchIntervalPattern.indexOf("a ") != -1) { bestMatchIntervalPattern = findReplaceInPattern(bestMatchIntervalPattern, "a ", ""); + } else if (bestMatchIntervalPattern.indexOf("a\u00A0") != -1) { + bestMatchIntervalPattern = findReplaceInPattern(bestMatchIntervalPattern, "a\u00A0", ""); + } else if (bestMatchIntervalPattern.indexOf("a\u202F") != -1) { + bestMatchIntervalPattern = findReplaceInPattern(bestMatchIntervalPattern, "a\u202F", ""); } bestMatchIntervalPattern = findReplaceInPattern(bestMatchIntervalPattern, "a", ""); } diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/DateTimePatternGenerator.java b/icu4j/main/classes/core/src/com/ibm/icu/text/DateTimePatternGenerator.java index e60c1e40f277..af88dbd19ccc 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/text/DateTimePatternGenerator.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/text/DateTimePatternGenerator.java @@ -315,7 +315,7 @@ private void addCLDRData(PatternInfo returnInfo, ULocale uLocale) { private void setDateTimeFromCalendar(ULocale uLocale) { Calendar cal = Calendar.getInstance(uLocale); for (int style = DateFormat.FULL; style <= DateFormat.SHORT; style++) { - String dateTimeFormat = Calendar.getDateTimePattern(cal, uLocale, style); + String dateTimeFormat = Calendar.getDateAtTimePattern(cal, uLocale, style); setDateTimeFormat(style, dateTimeFormat); } } diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/RelativeDateTimeFormatter.java b/icu4j/main/classes/core/src/com/ibm/icu/text/RelativeDateTimeFormatter.java index d8e13eae2d31..332af23df549 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/text/RelativeDateTimeFormatter.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/text/RelativeDateTimeFormatter.java @@ -1502,28 +1502,9 @@ public Loader(ULocale ulocale) { this.ulocale = ulocale; } - private String getDateTimePattern(ICUResourceBundle r) { - String calType = r.getStringWithFallback("calendar/default"); - if (calType == null || calType.equals("")) { - calType = "gregorian"; - } - String resourcePath = "calendar/" + calType + "/DateTimePatterns"; - ICUResourceBundle patternsRb = r.findWithFallback(resourcePath); - if (patternsRb == null && calType.equals("gregorian")) { - // Try with gregorian. - patternsRb = r.findWithFallback("calendar/gregorian/DateTimePatterns"); - } - if (patternsRb == null || patternsRb.getSize() < 9) { - // Undefined or too few elements. - return "{1} {0}"; - } else { - int elementType = patternsRb.get(8).getType(); - if (elementType == UResourceBundle.ARRAY) { - return patternsRb.get(8).getString(0); - } else { - return patternsRb.getString(8); - } - } + private String getDateTimePattern() { + Calendar cal = Calendar.getInstance(ulocale); + return Calendar.getDateAtTimePattern(cal, ulocale, DateFormat.MEDIUM); } public RelativeDateTimeFormatterData load() { @@ -1551,7 +1532,7 @@ public RelativeDateTimeFormatterData load() { return new RelativeDateTimeFormatterData( sink.qualitativeUnitMap, sink.styleRelUnitPatterns, - getDateTimePattern(r)); + getDateTimePattern()); } } diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/SimpleDateFormat.java b/icu4j/main/classes/core/src/com/ibm/icu/text/SimpleDateFormat.java index 1f3d25f0c158..c43a9019d1a6 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/text/SimpleDateFormat.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/text/SimpleDateFormat.java @@ -1233,11 +1233,7 @@ private static synchronized String getDefaultPattern() { if (patternsRb == null || patternsRb.getSize() < 9) { cachedDefaultPattern = FALLBACKPATTERN; } else { - int defaultIndex = 8; - if (patternsRb.getSize() >= 13) { - defaultIndex += (SHORT + 1); - } - String basePattern = patternsRb.getString(defaultIndex); + String basePattern = Calendar.getDateAtTimePattern(cal, cachedDefaultLocale, SHORT); cachedDefaultPattern = SimpleFormatterImpl.formatRawPattern( basePattern, 2, 2, @@ -2535,7 +2531,7 @@ public void parse(String text, Calendar cal, ParsePosition parsePos) while (idx < plen) { char pch = patl.charAt(idx); - if (PatternProps.isWhiteSpace(pch)) + if (PatternProps.isWhiteSpace(pch) || UCharacter.isUWhiteSpace(pch)) idx++; else break; @@ -2842,16 +2838,18 @@ private int matchLiteral(String text, int pos, Object[] items, int itemIndex, bo while (idx < plen && pos < tlen) { char pch = patternLiteral.charAt(idx); char ich = text.charAt(pos); - if (PatternProps.isWhiteSpace(pch) - && PatternProps.isWhiteSpace(ich)) { + if ((PatternProps.isWhiteSpace(pch) || UCharacter.isUWhiteSpace(pch)) + && (PatternProps.isWhiteSpace(ich) || UCharacter.isUWhiteSpace(ich))) { // White space characters found in both patten and input. // Skip contiguous white spaces. while ((idx + 1) < plen && - PatternProps.isWhiteSpace(patternLiteral.charAt(idx + 1))) { + (PatternProps.isWhiteSpace(patternLiteral.charAt(idx + 1)) || + UCharacter.isUWhiteSpace(patternLiteral.charAt(idx + 1)))) { ++idx; } while ((pos + 1) < tlen && - PatternProps.isWhiteSpace(text.charAt(pos + 1))) { + (PatternProps.isWhiteSpace(text.charAt(pos + 1)) || + UCharacter.isUWhiteSpace(text.charAt(pos + 1)))) { ++pos; } } else if (pch != ich) { @@ -3192,7 +3190,9 @@ private int subParse(String text, int start, char ch, int count, return ~start; } int c = UTF16.charAt(text, start); - if (!UCharacter.isUWhiteSpace(c) || !PatternProps.isWhiteSpace(c)) { + // Changed the following from || to &&, as in ICU4C; needed to skip NBSP, NNBSP. + // Only UWhiteSpace includes \u00A0\u202F\u2009\u3000...; only PatternProps.isWhiteSpace includes \u200E\u200F + if (!UCharacter.isUWhiteSpace(c) && !PatternProps.isWhiteSpace(c)) { break; } start += UTF16.getCharCount(c); diff --git a/icu4j/main/classes/core/src/com/ibm/icu/util/Calendar.java b/icu4j/main/classes/core/src/com/ibm/icu/util/Calendar.java index 9a86b8a549c0..3d9275adfd8b 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/util/Calendar.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/util/Calendar.java @@ -3498,17 +3498,23 @@ protected DateFormat handleGetDateFormat(String pattern, String override, ULocal // date format pattern cache private static final ICUCache PATTERN_CACHE = new SimpleCache<>(); - // final fallback patterns + // final fallback patterns (match current root) private static final String[] DEFAULT_PATTERNS = { "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", + "y MMMM d, EEEE", + "y MMMM d", + "y MMM d", + "y-MM-dd", + "{1} {0}", + "{1} {0}", "{1} {0}", + "{1} {0}", + "{1} {0}" + }; + private static final String[] DEFAULT_ATTIME_PATTERNS = { "{1} {0}", "{1} {0}", "{1} {0}", @@ -3538,7 +3544,7 @@ static private DateFormat formatHelper(Calendar cal, ULocale loc, int dateStyle, String pattern = null; if ((timeStyle >= 0) && (dateStyle >= 0)) { pattern = SimpleFormatterImpl.formatRawPattern( - patternData.getDateTimePattern(dateStyle), 2, 2, + patternData.getDateAtTimePattern(dateStyle), 2, 2, patternData.patterns[timeStyle], patternData.patterns[dateStyle + 4]); // Might need to merge the overrides from the date and time into a single @@ -3574,9 +3580,11 @@ static class PatternData { // TODO make this even more object oriented private String[] patterns; private String[] overrides; - public PatternData(String[] patterns, String[] overrides) { + private String[] atTimePatterns; + public PatternData(String[] patterns, String[] overrides, String[] atTimePatterns) { this.patterns = patterns; this.overrides = overrides; + this.atTimePatterns = atTimePatterns; } private String getDateTimePattern(int dateStyle) { int glueIndex = 8; @@ -3586,6 +3594,14 @@ private String getDateTimePattern(int dateStyle) { final String dateTimePattern = patterns[glueIndex]; return dateTimePattern; } + private String getDateAtTimePattern(int dateStyle) { + if (atTimePatterns != null && atTimePatterns.length >= 4) { + final String dateTimePattern = atTimePatterns[dateStyle]; + return dateTimePattern; + } else { + return getDateTimePattern(dateStyle); + } + } private static PatternData make(Calendar cal, ULocale loc) { // First, try to get a pattern from PATTERN_CACHE String calType = cal.getType(); @@ -3596,7 +3612,7 @@ private static PatternData make(Calendar cal, ULocale loc) { try { patternData = getPatternData(loc, calType); } catch (MissingResourceException e) { - patternData = new PatternData(DEFAULT_PATTERNS, null); + patternData = new PatternData(DEFAULT_PATTERNS, null, DEFAULT_ATTIME_PATTERNS); } PATTERN_CACHE.put(key, patternData); } @@ -3666,7 +3682,26 @@ private static PatternData getPatternData(ULocale locale, String calType) { break; } } - return new PatternData(dateTimePatterns, dateTimePatternsOverrides); + + dtPatternsRb = rb.findWithFallback("calendar/" + calType + "/DateTimePatterns%atTime"); + if (dtPatternsRb == null) { + dtPatternsRb = rb.findWithFallback("calendar/gregorian/DateTimePatterns%atTime"); + } + String[] atTimePatterns = null; + if (dtPatternsRb != null) { + patternsSize = dtPatternsRb.getSize(); + atTimePatterns = new String[patternsSize]; + if (patternsSize >= 4) { + for (i = 0; i < 4; i++) { + ICUResourceBundle concatenationPatternRb = (ICUResourceBundle) dtPatternsRb.get(i); + if (concatenationPatternRb.getType() == UResourceBundle.STRING) { + atTimePatterns[i] = concatenationPatternRb.getString(); + } + } + } + } + + return new PatternData(dateTimePatterns, dateTimePatternsOverrides, atTimePatterns); } /** @@ -3679,6 +3714,16 @@ public static String getDateTimePattern(Calendar cal, ULocale uLocale, int dateS return patternData.getDateTimePattern(dateStyle); } + /** + * @internal + * @deprecated This API is ICU internal only. + */ + @Deprecated + public static String getDateAtTimePattern(Calendar cal, ULocale uLocale, int dateStyle) { + PatternData patternData = PatternData.make(cal, uLocale); + return patternData.getDateAtTimePattern(dateStyle); + } + private static String mergeOverrideStrings( String datePattern, String timePattern, String dateOverride, String timeOverride ) { diff --git a/icu4j/main/classes/core/src/com/ibm/icu/util/MeasureUnit.java b/icu4j/main/classes/core/src/com/ibm/icu/util/MeasureUnit.java index 86181cbe1f38..80a11220ad12 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/util/MeasureUnit.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/util/MeasureUnit.java @@ -995,7 +995,7 @@ protected synchronized static MeasureUnit addUnit(String type, String unitName, /** * Constant for unit of concentr: item - * @draft ICU 70 + * @stable ICU 70 */ public static final MeasureUnit ITEM = MeasureUnit.internalGetInstance("concentr", "item"); @@ -1209,6 +1209,12 @@ protected synchronized static MeasureUnit addUnit(String type, String unitName, */ public static final MeasureUnit NANOSECOND = MeasureUnit.internalGetInstance("duration", "nanosecond"); + /** + * Constant for unit of duration: quarter + * @draft ICU 72 + */ + public static final MeasureUnit QUARTER = MeasureUnit.internalGetInstance("duration", "quarter"); + /** * Constant for unit of duration: second * @stable ICU 4.0 @@ -1319,7 +1325,7 @@ protected synchronized static MeasureUnit addUnit(String type, String unitName, /** * Constant for unit of force: kilowatt-hour-per-100-kilometer - * @draft ICU 70 + * @stable ICU 70 */ public static final MeasureUnit KILOWATT_HOUR_PER_100_KILOMETER = MeasureUnit.internalGetInstance("force", "kilowatt-hour-per-100-kilometer"); diff --git a/icu4j/main/shared/data/icudata.jar b/icu4j/main/shared/data/icudata.jar index 87fafd922b04..c8166f6987d4 100644 --- a/icu4j/main/shared/data/icudata.jar +++ b/icu4j/main/shared/data/icudata.jar @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:10b9cd7747507f6c383a27e06d586f64fc4ac41d38d40f0123251afae6d8b0d3 -size 13890024 +oid sha256:2457bed232396477e0d81af16e06e9bbdad4ff372f0d63f7a80a5572fc897819 +size 13896306 diff --git a/icu4j/main/shared/data/icutzdata.jar b/icu4j/main/shared/data/icutzdata.jar index f2f8bc988583..f39021dbeb0e 100644 --- a/icu4j/main/shared/data/icutzdata.jar +++ b/icu4j/main/shared/data/icutzdata.jar @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b55aff3d90f361066c569d6d9947f2e8121025b52fb079f346678877f5c08505 -size 95818 +oid sha256:3095101c21b62e93f4a92be0e66e16f37d663ea50a8f705ac1ad91b3693e4046 +size 95822 diff --git a/icu4j/main/shared/data/testdata.jar b/icu4j/main/shared/data/testdata.jar index 155d605927d5..5037a7a10e96 100644 --- a/icu4j/main/shared/data/testdata.jar +++ b/icu4j/main/shared/data/testdata.jar @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d64f584205d3e553dc135b5a57a5eb8ec6bad24210c218c6927ed161411bb3a1 -size 826067 +oid sha256:06f77ebe35fbb0ebc09fd3e03d8af9280f5d4f84052615cd47b427ae9777be74 +size 827989 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/calendar/CalendarRegressionTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/calendar/CalendarRegressionTest.java index 9d8d0dc5e480..1d21f063305b 100644 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/calendar/CalendarRegressionTest.java +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/calendar/CalendarRegressionTest.java @@ -1939,11 +1939,11 @@ public void TestDateFormatFactoryJ26() { DateFormat.getTimeInstance(DateFormat.SHORT, loc), "DateFormat.getTimeInstance(DateFormat.SHORT, loc)", - "5:43 PM", + "5:43\u202FPM", DateFormat.getDateTimeInstance(DateFormat.FULL, DateFormat.SHORT, loc), "DateFormat.getDateTimeInstance(DateFormat.FULL, DateFormat.SHORT, loc)", - "Thursday, April 5, 2001 at 5:43 PM", + "Thursday, April 5, 2001 at 5:43\u202FPM", DateFormat.getDateInstance(cal, DateFormat.SHORT, loc), "DateFormat.getDateInstance(cal, DateFormat.SHORT, loc)", @@ -1951,19 +1951,19 @@ public void TestDateFormatFactoryJ26() { DateFormat.getTimeInstance(cal, DateFormat.SHORT, loc), "DateFormat.getTimeInstance(cal, DateFormat.SHORT, loc)", - "5:43 PM", + "5:43\u202FPM", DateFormat.getDateTimeInstance(cal, DateFormat.FULL, DateFormat.SHORT, loc), "DateFormat.getDateTimeInstance(cal, DateFormat.FULL, DateFormat.SHORT, loc)", - "Thursday, April 5, 2001 at 5:43 PM", + "Thursday, April 5, 2001 at 5:43\u202FPM", cal.getDateTimeFormat(DateFormat.SHORT, DateFormat.FULL, loc), "cal.getDateTimeFormat(DateFormat.SHORT, DateFormat.FULL, loc)", - "4/5/01, 5:43:53 PM Pacific Daylight Time", + "4/5/01, 5:43:53\u202FPM Pacific Daylight Time", cal.getDateTimeFormat(DateFormat.FULL, DateFormat.SHORT, loc), "cal.getDateTimeFormat(DateFormat.FULL, DateFormat.SHORT, loc)", - "Thursday, April 5, 2001 at 5:43 PM", + "Thursday, April 5, 2001 at 5:43\u202FPM", }; for (int i=0; i other) { } } - private static final String[] DRAFT_VERSIONS = {"70", "71"}; + private static final String[] DRAFT_VERSIONS = {"71", "72"}; private static final HashSet DRAFT_VERSION_SET = new HashSet<>(); @@ -279,6 +279,7 @@ public int compareTo(OrderedPair other) { {"MILLIGRAM_OFGLUCOSE_PER_DECILITER", "69"}, {"ITEM", "70"}, {"KILOWATT_HOUR_PER_100_KILOMETER", "70"}, + {"QUARTER", "72"}, }; private static final HashMap JAVA_VERSION_MAP = new HashMap<>(); @@ -322,12 +323,12 @@ public void testZZZ() { // various generateXXX calls go here, see // docs/processes/release/tasks/updating-measure-unit.md // use this test to run each of the ollowing in succession - //generateConstants("71"); // for MeasureUnit.java, update generated MeasureUnit constants - //generateBackwardCompatibilityTest("71"); // for MeasureUnitTest.java, create TestCompatible70 - //generateCXXHConstants("71"); // for measunit.h, update generated createXXX methods + //generateConstants("72"); // for MeasureUnit.java, update generated MeasureUnit constants + //generateBackwardCompatibilityTest("72"); // for MeasureUnitTest.java, create TestCompatible72 + //generateCXXHConstants("72"); // for measunit.h, update generated createXXX methods //generateCXXConstants(); // for measunit.cpp, update generated code - //generateCXXBackwardCompatibilityTest("71"); // for measfmttest.cpp, create TestCompatible70 - //updateJAVAVersions("71"); // for MeasureUnitTest.java, JAVA_VERSIONS + //generateCXXBackwardCompatibilityTest("72"); // for measfmttest.cpp, create TestCompatible72 + updateJAVAVersions("72"); // for MeasureUnitTest.java, JAVA_VERSIONS } @Test @@ -2280,6 +2281,201 @@ public void TestCompatible70() { // TestCompatible71 would be identical // TestCompatible71 would be identical to TestCompatible70, // no need to add it + @Test + public void TestCompatible72() { + MeasureUnit[] units = { + MeasureUnit.G_FORCE, + MeasureUnit.METER_PER_SECOND_SQUARED, + MeasureUnit.ARC_MINUTE, + MeasureUnit.ARC_SECOND, + MeasureUnit.DEGREE, + MeasureUnit.RADIAN, + MeasureUnit.REVOLUTION_ANGLE, + MeasureUnit.ACRE, + MeasureUnit.DUNAM, + MeasureUnit.HECTARE, + MeasureUnit.SQUARE_CENTIMETER, + MeasureUnit.SQUARE_FOOT, + MeasureUnit.SQUARE_INCH, + MeasureUnit.SQUARE_KILOMETER, + MeasureUnit.SQUARE_METER, + MeasureUnit.SQUARE_MILE, + MeasureUnit.SQUARE_YARD, + MeasureUnit.ITEM, + MeasureUnit.KARAT, + MeasureUnit.MILLIGRAM_OFGLUCOSE_PER_DECILITER, + MeasureUnit.MILLIGRAM_PER_DECILITER, + MeasureUnit.MILLIMOLE_PER_LITER, + MeasureUnit.MOLE, + MeasureUnit.PERCENT, + MeasureUnit.PERMILLE, + MeasureUnit.PART_PER_MILLION, + MeasureUnit.PERMYRIAD, + MeasureUnit.LITER_PER_100KILOMETERS, + MeasureUnit.LITER_PER_KILOMETER, + MeasureUnit.MILE_PER_GALLON, + MeasureUnit.MILE_PER_GALLON_IMPERIAL, + MeasureUnit.BIT, + MeasureUnit.BYTE, + MeasureUnit.GIGABIT, + MeasureUnit.GIGABYTE, + MeasureUnit.KILOBIT, + MeasureUnit.KILOBYTE, + MeasureUnit.MEGABIT, + MeasureUnit.MEGABYTE, + MeasureUnit.PETABYTE, + MeasureUnit.TERABIT, + MeasureUnit.TERABYTE, + MeasureUnit.CENTURY, + MeasureUnit.DAY, + MeasureUnit.DAY_PERSON, + MeasureUnit.DECADE, + MeasureUnit.HOUR, + MeasureUnit.MICROSECOND, + MeasureUnit.MILLISECOND, + MeasureUnit.MINUTE, + MeasureUnit.MONTH, + MeasureUnit.MONTH_PERSON, + MeasureUnit.NANOSECOND, + MeasureUnit.QUARTER, + MeasureUnit.SECOND, + MeasureUnit.WEEK, + MeasureUnit.WEEK_PERSON, + MeasureUnit.YEAR, + MeasureUnit.YEAR_PERSON, + MeasureUnit.AMPERE, + MeasureUnit.MILLIAMPERE, + MeasureUnit.OHM, + MeasureUnit.VOLT, + MeasureUnit.BRITISH_THERMAL_UNIT, + MeasureUnit.CALORIE, + MeasureUnit.ELECTRONVOLT, + MeasureUnit.FOODCALORIE, + MeasureUnit.JOULE, + MeasureUnit.KILOCALORIE, + MeasureUnit.KILOJOULE, + MeasureUnit.KILOWATT_HOUR, + MeasureUnit.THERM_US, + MeasureUnit.KILOWATT_HOUR_PER_100_KILOMETER, + MeasureUnit.NEWTON, + MeasureUnit.POUND_FORCE, + MeasureUnit.GIGAHERTZ, + MeasureUnit.HERTZ, + MeasureUnit.KILOHERTZ, + MeasureUnit.MEGAHERTZ, + MeasureUnit.DOT, + MeasureUnit.DOT_PER_CENTIMETER, + MeasureUnit.DOT_PER_INCH, + MeasureUnit.EM, + MeasureUnit.MEGAPIXEL, + MeasureUnit.PIXEL, + MeasureUnit.PIXEL_PER_CENTIMETER, + MeasureUnit.PIXEL_PER_INCH, + MeasureUnit.ASTRONOMICAL_UNIT, + MeasureUnit.CENTIMETER, + MeasureUnit.DECIMETER, + MeasureUnit.EARTH_RADIUS, + MeasureUnit.FATHOM, + MeasureUnit.FOOT, + MeasureUnit.FURLONG, + MeasureUnit.INCH, + MeasureUnit.KILOMETER, + MeasureUnit.LIGHT_YEAR, + MeasureUnit.METER, + MeasureUnit.MICROMETER, + MeasureUnit.MILE, + MeasureUnit.MILE_SCANDINAVIAN, + MeasureUnit.MILLIMETER, + MeasureUnit.NANOMETER, + MeasureUnit.NAUTICAL_MILE, + MeasureUnit.PARSEC, + MeasureUnit.PICOMETER, + MeasureUnit.POINT, + MeasureUnit.SOLAR_RADIUS, + MeasureUnit.YARD, + MeasureUnit.CANDELA, + MeasureUnit.LUMEN, + MeasureUnit.LUX, + MeasureUnit.SOLAR_LUMINOSITY, + MeasureUnit.CARAT, + MeasureUnit.DALTON, + MeasureUnit.EARTH_MASS, + MeasureUnit.GRAIN, + MeasureUnit.GRAM, + MeasureUnit.KILOGRAM, + MeasureUnit.METRIC_TON, + MeasureUnit.MICROGRAM, + MeasureUnit.MILLIGRAM, + MeasureUnit.OUNCE, + MeasureUnit.OUNCE_TROY, + MeasureUnit.POUND, + MeasureUnit.SOLAR_MASS, + MeasureUnit.STONE, + MeasureUnit.TON, + MeasureUnit.GIGAWATT, + MeasureUnit.HORSEPOWER, + MeasureUnit.KILOWATT, + MeasureUnit.MEGAWATT, + MeasureUnit.MILLIWATT, + MeasureUnit.WATT, + MeasureUnit.ATMOSPHERE, + MeasureUnit.BAR, + MeasureUnit.HECTOPASCAL, + MeasureUnit.INCH_HG, + MeasureUnit.KILOPASCAL, + MeasureUnit.MEGAPASCAL, + MeasureUnit.MILLIBAR, + MeasureUnit.MILLIMETER_OF_MERCURY, + MeasureUnit.PASCAL, + MeasureUnit.POUND_PER_SQUARE_INCH, + MeasureUnit.KILOMETER_PER_HOUR, + MeasureUnit.KNOT, + MeasureUnit.METER_PER_SECOND, + MeasureUnit.MILE_PER_HOUR, + MeasureUnit.CELSIUS, + MeasureUnit.FAHRENHEIT, + MeasureUnit.GENERIC_TEMPERATURE, + MeasureUnit.KELVIN, + MeasureUnit.NEWTON_METER, + MeasureUnit.POUND_FOOT, + MeasureUnit.ACRE_FOOT, + MeasureUnit.BARREL, + MeasureUnit.BUSHEL, + MeasureUnit.CENTILITER, + MeasureUnit.CUBIC_CENTIMETER, + MeasureUnit.CUBIC_FOOT, + MeasureUnit.CUBIC_INCH, + MeasureUnit.CUBIC_KILOMETER, + MeasureUnit.CUBIC_METER, + MeasureUnit.CUBIC_MILE, + MeasureUnit.CUBIC_YARD, + MeasureUnit.CUP, + MeasureUnit.CUP_METRIC, + MeasureUnit.DECILITER, + MeasureUnit.DESSERT_SPOON, + MeasureUnit.DESSERT_SPOON_IMPERIAL, + MeasureUnit.DRAM, + MeasureUnit.DROP, + MeasureUnit.FLUID_OUNCE, + MeasureUnit.FLUID_OUNCE_IMPERIAL, + MeasureUnit.GALLON, + MeasureUnit.GALLON_IMPERIAL, + MeasureUnit.HECTOLITER, + MeasureUnit.JIGGER, + MeasureUnit.LITER, + MeasureUnit.MEGALITER, + MeasureUnit.MILLILITER, + MeasureUnit.PINCH, + MeasureUnit.PINT, + MeasureUnit.PINT_METRIC, + MeasureUnit.QUART, + MeasureUnit.QUART_IMPERIAL, + MeasureUnit.TABLESPOON, + MeasureUnit.TEASPOON, + }; + assertEquals("", 188, units.length); + } + @Test public void TestExamplesInDocs() { MeasureFormat fmtFr = MeasureFormat.getInstance( diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/PluralRulesTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/PluralRulesTest.java index c62fdc76ed8f..d07f41e3a756 100644 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/PluralRulesTest.java +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/PluralRulesTest.java @@ -386,8 +386,6 @@ public void testOperands() { } } - private static final Set compactExponentLocales = new HashSet(Arrays.asList("es", "fr", "it", "pt")); - @Test public void testUniqueRules() { main: for (ULocale locale : factory.getAvailableULocales()) { @@ -1274,10 +1272,6 @@ public void TestLocales() { if (factory.hasOverride(locale)) { continue; // skip for now } - if (compactExponentLocales.contains(locale.getLanguage()) && logKnownIssue("21322", "PluralRules::getSamples cannot distinguish 1e5 from 100000")) { - // or logKnownIssue("21714", "PluralRules.select treats 1c6 as 1") ? - continue; - } PluralRules rules = factory.forLocale(locale); for (int i = 1; i < parts.length; ++i) { checkCategoriesAndExpected(localeString, parts[i], rules); @@ -1335,23 +1329,22 @@ private EnumSet getCanonicalSet(Set keywords) } static final String[] LOCALE_SNAPSHOT = { + // Last regenerated 2022-05-25 as part of CLDR 42m1 integration // [other] - "bm,bo,dz,id,ig,ii,in,ja,jbo,jv,jw,kde,kea,km,ko,lkt,lo,ms,my,nqo,root,sah,ses,sg,th,to,vi,wo,yo,zh; other: @integer 0~15, 100, 1000, 10000, 100000, 1000000, …", + "bm,bo,dz,hnj,id,ig,ii,ja,jbo,jv,kde,kea,km,ko,lkt,lo,ms,my,nqo,osa,root,sah,ses,sg,su,th,to,tpi,vi,wo,yo,yue,zh; other: @integer 0~15, 100, 1000, 10000, 100000, 1000000, …", // [one, other] - "am,bn,fa,gu,hi,kn,mr,zu; one: @integer 0, 1; other: @integer 2~17, 100, 1000, 10000, 100000, 1000000, …", + "am,as,bn,doi,fa,gu,hi,kn,pcm,zu; one: @integer 0, 1; other: @integer 2~17, 100, 1000, 10000, 100000, 1000000, …", "ff,hy,kab; one: @integer 0, 1; other: @integer 2~17, 100, 1000, 10000, 100000, 1000000, …", - "ast,ca,de,en,et,fi,fy,gl,it,ji,nl,sv,sw,ur,yi; one: @integer 1; other: @integer 0, 2~16, 100, 1000, 10000, 100000, 1000000, …", - "pt; one: @integer 1; other: @integer 0, 2~16, 100, 1000, 10000, 100000, 1000000, …", + "ast,de,en,et,fi,fy,gl,ia,io,lij,nl,sc,scn,sv,sw,ur,yi; one: @integer 1; other: @integer 0, 2~16, 100, 1000, 10000, 100000, 1000000, …", "si; one: @integer 0, 1; other: @integer 2~17, 100, 1000, 10000, 100000, 1000000, …", "ak,bho,guw,ln,mg,nso,pa,ti,wa; one: @integer 0, 1; other: @integer 2~17, 100, 1000, 10000, 100000, 1000000, …", "tzm; one: @integer 0, 1, 11~24; other: @integer 2~10, 100~106, 1000, 10000, 100000, 1000000, …", - "af,asa,az,bem,bez,bg,brx,cgg,chr,ckb,dv,ee,el,eo,es,eu,fo,fur,gsw,ha,haw,hu,jgo,jmc,ka,kaj,kcg,kk,kkj,kl,ks,ksb,ku,ky,lb,lg,mas,mgo,ml,mn,nah,nb,nd,ne,nn,nnh,no,nr,ny,nyn,om,or,os,pap,ps,rm,rof,rwk,saq,seh,sn,so,sq,ss,ssy,st,syr,ta,te,teo,tig,tk,tn,tr,ts,ug,uz,ve,vo,vun,wae,xh,xog; one: @integer 1; other: @integer 0, 2~16, 100, 1000, 10000, 100000, 1000000, …", - "pt_PT; one: @integer 1; other: @integer 0, 2~16, 100, 1000, 10000, 100000, 1000000, …", + "af,an,asa,az,bal,bem,bez,bg,brx,ce,cgg,chr,ckb,dv,ee,el,eo,eu,fo,fur,gsw,ha,haw,hu,jgo,jmc,ka,kaj,kcg,kk,kkj,kl,ks,ksb,ku,ky,lb,lg,mas,mgo,ml,mn,mr,nah,nb,nd,ne,nn,nnh,no,nr,ny,nyn,om,or,os,pap,ps,rm,rof,rwk,saq,sd,sdh,seh,sn,so,sq,ss,ssy,st,syr,ta,te,teo,tig,tk,tn,tr,ts,ug,uz,ve,vo,vun,wae,xh,xog; one: @integer 1; other: @integer 0, 2~16, 100, 1000, 10000, 100000, 1000000, …", "da; one: @integer 1; other: @integer 0, 2~16, 100, 1000, 10000, 100000, 1000000, …", "is; one: @integer 1, 21, 31, 41, 51, 61, 71, 81, 101, 1001, …; other: @integer 0, 2~16, 100, 1000, 10000, 100000, 1000000, …", "mk; one: @integer 1, 21, 31, 41, 51, 61, 71, 81, 101, 1001, …; other: @integer 0, 2~16, 100, 1000, 10000, 100000, 1000000, …", - "fil,tl; one: @integer 0~3, 5, 7, 8, 10~13, 15, 17, 18, 20, 21, 100, 1000, 10000, 100000, 1000000, …; other: @integer 4, 6, 9, 14, 16, 19, 24, 26, 104, 1004, …", + "ceb,fil; one: @integer 0~3, 5, 7, 8, 10~13, 15, 17, 18, 20, 21, 100, 1000, 10000, 100000, 1000000, …; other: @integer 4, 6, 9, 14, 16, 19, 24, 26, 104, 1004, …", // [zero, one, other] "lag; zero: @integer 0; one: @integer 1; other: @integer 2~17, 100, 1000, 10000, 100000, 1000000, …", @@ -1359,40 +1352,44 @@ private EnumSet getCanonicalSet(Set keywords) "ksh; zero: @integer 0; one: @integer 1; other: @integer 2~17, 100, 1000, 10000, 100000, 1000000, …", // [one, two, other] - "iu,naq,se,sma,smi,smj,smn,sms; one: @integer 1; two: @integer 2; other: @integer 0, 3~17, 100, 1000, 10000, 100000, 1000000, …", - - // [one, many, other] - "fr; one: @integer 0, 1; many: @integer 1000000; other: @integer 2~17, 100, 1000, 10000, 100000, …", + "iu,naq,sat,se,sma,smi,smj,smn,sms; one: @integer 1; two: @integer 2; other: @integer 0, 3~17, 100, 1000, 10000, 100000, 1000000, …", // [one, few, other] "shi; one: @integer 0, 1; few: @integer 2~10; other: @integer 11~26, 100, 1000, 10000, 100000, 1000000, …", - "mo,ro; one: @integer 1; few: @integer 0, 2~16, 102, 1002, …; other: @integer 20~35, 100, 1000, 10000, 100000, 1000000, …", - "bs,hr,sh,sr; one: @integer 1, 21, 31, 41, 51, 61, 71, 81, 101, 1001, …; few: @integer 2~4, 22~24, 32~34, 42~44, 52~54, 62, 102, 1002, …; other: @integer 0, 5~19, 100, 1000, 10000, 100000, 1000000, …", + "ro; one: @integer 1; few: @integer 0, 2~16, 102, 1002, …; other: @integer 20~35, 100, 1000, 10000, 100000, 1000000, …", + "bs,hr,sr,sr_Latn; one: @integer 1, 21, 31, 41, 51, 61, 71, 81, 101, 1001, …; few: @integer 2~4, 22~24, 32~34, 42~44, 52~54, 62, 102, 1002, …; other: @integer 0, 5~19, 100, 1000, 10000, 100000, 1000000, …", + + // [one, many, other] + "fr; one: @integer 0, 1; many: @integer 1000000, 1e6, 2e6, 3e6, 4e6, 5e6, 6e6, …; other: @integer 2~17, 100, 1000, 10000, 100000, 1e3, 2e3, 3e3, 4e3, 5e3, 6e3, …", + "pt; one: @integer 0, 1; many: @integer 1000000, 1e6, 2e6, 3e6, 4e6, 5e6, 6e6, …; other: @integer 2~17, 100, 1000, 10000, 100000, 1e3, 2e3, 3e3, 4e3, 5e3, 6e3, …", + "ca,it,pt_PT; one: @integer 1; many: @integer 1000000, 1e6, 2e6, 3e6, 4e6, 5e6, 6e6, …; other: @integer 0, 2~16, 100, 1000, 10000, 100000, 1e3, 2e3, 3e3, 4e3, 5e3, 6e3, …", + "es; one: @integer 1; many: @integer 1000000, 1e6, 2e6, 3e6, 4e6, 5e6, 6e6, …; other: @integer 0, 2~16, 100, 1000, 10000, 100000, 1e3, 2e3, 3e3, 4e3, 5e3, 6e3, …", // [one, two, few, other] "gd; one: @integer 1, 11; two: @integer 2, 12; few: @integer 3~10, 13~19; other: @integer 0, 20~34, 100, 1000, 10000, 100000, 1000000, …", + "dsb,hsb; one: @integer 1, 101, 201, 301, 401, 501, 601, 701, 1001, …; two: @integer 2, 102, 202, 302, 402, 502, 602, 702, 1002, …; few: @integer 3, 4, 103, 104, 203, 204, 303, 304, 403, 404, 503, 504, 603, 604, 703, 704, 1003, …; other: @integer 0, 5~19, 100, 1000, 10000, 100000, 1000000, …", "sl; one: @integer 1, 101, 201, 301, 401, 501, 601, 701, 1001, …; two: @integer 2, 102, 202, 302, 402, 502, 602, 702, 1002, …; few: @integer 3, 4, 103, 104, 203, 204, 303, 304, 403, 404, 503, 504, 603, 604, 703, 704, 1003, …; other: @integer 0, 5~19, 100, 1000, 10000, 100000, 1000000, …", // [one, two, many, other] - "he,iw; one: @integer 1; two: @integer 2; many: @integer 20, 30, 40, 50, 60, 70, 80, 90, 100, 1000, 10000, 100000, 1000000, …; other: @integer 0, 3~17, 101, 1001, …", + "he; one: @integer 1; two: @integer 2; many: @integer 20, 30, 40, 50, 60, 70, 80, 90, 100, 1000, 10000, 100000, 1000000, …; other: @integer 0, 3~17, 101, 1001, …", // [one, few, many, other] "cs,sk; one: @integer 1; few: @integer 2~4; many: null; other: @integer 0, 5~19, 100, 1000, 10000, 100000, 1000000, …", "be; one: @integer 1, 21, 31, 41, 51, 61, 71, 81, 101, 1001, …; few: @integer 2~4, 22~24, 32~34, 42~44, 52~54, 62, 102, 1002, …; many: @integer 0, 5~19, 100, 1000, 10000, 100000, 1000000, …; other: null", "lt; one: @integer 1, 21, 31, 41, 51, 61, 71, 81, 101, 1001, …; few: @integer 2~9, 22~29, 102, 1002, …; many: null; other: @integer 0, 10~20, 30, 40, 50, 60, 100, 1000, 10000, 100000, 1000000, …", - "mt; one: @integer 1; few: @integer 0, 2~10, 102~107, 1002, …; many: @integer 11~19, 111~117, 1011, …; other: @integer 20~35, 100, 1000, 10000, 100000, 1000000, …", "pl; one: @integer 1; few: @integer 2~4, 22~24, 32~34, 42~44, 52~54, 62, 102, 1002, …; many: @integer 0, 5~19, 100, 1000, 10000, 100000, 1000000, …; other: null", "ru,uk; one: @integer 1, 21, 31, 41, 51, 61, 71, 81, 101, 1001, …; few: @integer 2~4, 22~24, 32~34, 42~44, 52~54, 62, 102, 1002, …; many: @integer 0, 5~19, 100, 1000, 10000, 100000, 1000000, …; other: null", // [one, two, few, many, other] "br; one: @integer 1, 21, 31, 41, 51, 61, 81, 101, 1001, …; two: @integer 2, 22, 32, 42, 52, 62, 82, 102, 1002, …; few: @integer 3, 4, 9, 23, 24, 29, 33, 34, 39, 43, 44, 49, 103, 1003, …; many: @integer 1000000, …; other: @integer 0, 5~8, 10~20, 100, 1000, 10000, 100000, …", + "mt; one: @integer 1; two: @integer 2; few: @integer 0, 3~10, 103~109, 1003, …; many: @integer 11~19, 111~117, 1011, …; other: @integer 20~35, 100, 1000, 10000, 100000, 1000000, …", "ga; one: @integer 1; two: @integer 2; few: @integer 3~6; many: @integer 7~10; other: @integer 0, 11~25, 100, 1000, 10000, 100000, 1000000, …", "gv; one: @integer 1, 11, 21, 31, 41, 51, 61, 71, 101, 1001, …; two: @integer 2, 12, 22, 32, 42, 52, 62, 72, 102, 1002, …; few: @integer 0, 20, 40, 60, 80, 100, 120, 140, 1000, 10000, 100000, 1000000, …; many: null; other: @integer 3~10, 13~19, 23, 103, 1003, …", // [zero, one, two, few, many, other] - "ar; zero: @integer 0; one: @integer 1; two: @integer 2; few: @integer 3~10, 103~110, 1003, …; many: @integer 11~26, 111, 1011, …; other: @integer 100~102, 200~202, 300~302, 400~402, 500~502, 600, 1000, 10000, 100000, 1000000, …", - "cy; zero: @integer 0; one: @integer 1; two: @integer 2; few: @integer 3; many: @integer 6; other: @integer 4, 5, 7~20, 100, 1000, 10000, 100000, 1000000, …", - "kw; zero: @integer 0; one: @integer 1; two: @integer 2, 22, 42, 62, 82, 102, 122, 142, 1002, …; few: @integer 3, 23, 43, 63, 83, 103, 123, 143, 1003, …; many: @integer 21, 41, 61, 81, 101, 121, 141, 161, 1001, …; other: @integer 4~19, 100, 1000000, …", }; + "kw; zero: @integer 0; one: @integer 1; two: @integer 2, 22, 42, 62, 82, 102, 122, 142, 1000, 10000, 100000, …; few: @integer 3, 23, 43, 63, 83, 103, 123, 143, 1003, …; many: @integer 21, 41, 61, 81, 101, 121, 141, 161, 1001, …; other: @integer 4~19, 100, 1004, 1000000, …", + "ar,ars; zero: @integer 0; one: @integer 1; two: @integer 2; few: @integer 3~10, 103~110, 1003, …; many: @integer 11~26, 111, 1011, …; other: @integer 100~102, 200~202, 300~302, 400~402, 500~502, 600, 1000, 10000, 100000, 1000000, …", + "cy; zero: @integer 0; one: @integer 1; two: @integer 2; few: @integer 3; many: @integer 6; other: @integer 4, 5, 7~20, 100, 1000, 10000, 100000, 1000000, …", }; private T serializeAndDeserialize(T original, Output size) { try { diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/RelativeDateTimeFormatterTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/RelativeDateTimeFormatterTest.java index 2080f0106b7a..36d6f655cd3c 100644 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/RelativeDateTimeFormatterTest.java +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/RelativeDateTimeFormatterTest.java @@ -252,64 +252,64 @@ public void TestRelativeDateWithQuantityShort() { @Test public void TestRelativeDateWithQuantityNarrow() { Object[][] data = { - {0.0, Direction.NEXT, RelativeUnit.SECONDS, "in 0 sec."}, - {0.5, Direction.NEXT, RelativeUnit.SECONDS, "in 0.5 sec."}, - - {1.0, Direction.NEXT, RelativeUnit.SECONDS, "in 1 sec."}, - {2.0, Direction.NEXT, RelativeUnit.SECONDS, "in 2 sec."}, - {0.0, Direction.NEXT, RelativeUnit.MINUTES, "in 0 min."}, - {0.5, Direction.NEXT, RelativeUnit.MINUTES, "in 0.5 min."}, - {1.0, Direction.NEXT, RelativeUnit.MINUTES, "in 1 min."}, - {2.0, Direction.NEXT, RelativeUnit.MINUTES, "in 2 min."}, - {0.0, Direction.NEXT, RelativeUnit.HOURS, "in 0 hr."}, - {0.5, Direction.NEXT, RelativeUnit.HOURS, "in 0.5 hr."}, - {1.0, Direction.NEXT, RelativeUnit.HOURS, "in 1 hr."}, - {2.0, Direction.NEXT, RelativeUnit.HOURS, "in 2 hr."}, - {0.0, Direction.NEXT, RelativeUnit.DAYS, "in 0 days"}, - {0.5, Direction.NEXT, RelativeUnit.DAYS, "in 0.5 days"}, - {1.0, Direction.NEXT, RelativeUnit.DAYS, "in 1 day"}, - {2.0, Direction.NEXT, RelativeUnit.DAYS, "in 2 days"}, - {0.0, Direction.NEXT, RelativeUnit.WEEKS, "in 0 wk."}, - {0.5, Direction.NEXT, RelativeUnit.WEEKS, "in 0.5 wk."}, - {1.0, Direction.NEXT, RelativeUnit.WEEKS, "in 1 wk."}, - {2.0, Direction.NEXT, RelativeUnit.WEEKS, "in 2 wk."}, - {0.0, Direction.NEXT, RelativeUnit.MONTHS, "in 0 mo."}, - {0.5, Direction.NEXT, RelativeUnit.MONTHS, "in 0.5 mo."}, - {1.0, Direction.NEXT, RelativeUnit.MONTHS, "in 1 mo."}, - {2.0, Direction.NEXT, RelativeUnit.MONTHS, "in 2 mo."}, - {0.0, Direction.NEXT, RelativeUnit.YEARS, "in 0 yr."}, - {0.5, Direction.NEXT, RelativeUnit.YEARS, "in 0.5 yr."}, - {1.0, Direction.NEXT, RelativeUnit.YEARS, "in 1 yr."}, - {2.0, Direction.NEXT, RelativeUnit.YEARS, "in 2 yr."}, - - {0.0, Direction.LAST, RelativeUnit.SECONDS, "0 sec. ago"}, - {0.5, Direction.LAST, RelativeUnit.SECONDS, "0.5 sec. ago"}, - {1.0, Direction.LAST, RelativeUnit.SECONDS, "1 sec. ago"}, - {2.0, Direction.LAST, RelativeUnit.SECONDS, "2 sec. ago"}, - {0.0, Direction.LAST, RelativeUnit.MINUTES, "0 min. ago"}, - {0.5, Direction.LAST, RelativeUnit.MINUTES, "0.5 min. ago"}, - {1.0, Direction.LAST, RelativeUnit.MINUTES, "1 min. ago"}, - {2.0, Direction.LAST, RelativeUnit.MINUTES, "2 min. ago"}, - {0.0, Direction.LAST, RelativeUnit.HOURS, "0 hr. ago"}, - {0.5, Direction.LAST, RelativeUnit.HOURS, "0.5 hr. ago"}, - {1.0, Direction.LAST, RelativeUnit.HOURS, "1 hr. ago"}, - {2.0, Direction.LAST, RelativeUnit.HOURS, "2 hr. ago"}, - {0.0, Direction.LAST, RelativeUnit.DAYS, "0 days ago"}, - {0.5, Direction.LAST, RelativeUnit.DAYS, "0.5 days ago"}, - {1.0, Direction.LAST, RelativeUnit.DAYS, "1 day ago"}, - {2.0, Direction.LAST, RelativeUnit.DAYS, "2 days ago"}, - {0.0, Direction.LAST, RelativeUnit.WEEKS, "0 wk. ago"}, - {0.5, Direction.LAST, RelativeUnit.WEEKS, "0.5 wk. ago"}, - {1.0, Direction.LAST, RelativeUnit.WEEKS, "1 wk. ago"}, - {2.0, Direction.LAST, RelativeUnit.WEEKS, "2 wk. ago"}, - {0.0, Direction.LAST, RelativeUnit.MONTHS, "0 mo. ago"}, - {0.5, Direction.LAST, RelativeUnit.MONTHS, "0.5 mo. ago"}, - {1.0, Direction.LAST, RelativeUnit.MONTHS, "1 mo. ago"}, - {2.0, Direction.LAST, RelativeUnit.MONTHS, "2 mo. ago"}, - {0.0, Direction.LAST, RelativeUnit.YEARS, "0 yr. ago"}, - {0.5, Direction.LAST, RelativeUnit.YEARS, "0.5 yr. ago"}, - {1.0, Direction.LAST, RelativeUnit.YEARS, "1 yr. ago"}, - {2.0, Direction.LAST, RelativeUnit.YEARS, "2 yr. ago"}, + {0.0, Direction.NEXT, RelativeUnit.SECONDS, "in 0s"}, + {0.5, Direction.NEXT, RelativeUnit.SECONDS, "in 0.5s"}, + + {1.0, Direction.NEXT, RelativeUnit.SECONDS, "in 1s"}, + {2.0, Direction.NEXT, RelativeUnit.SECONDS, "in 2s"}, + {0.0, Direction.NEXT, RelativeUnit.MINUTES, "in 0m"}, + {0.5, Direction.NEXT, RelativeUnit.MINUTES, "in 0.5m"}, + {1.0, Direction.NEXT, RelativeUnit.MINUTES, "in 1m"}, + {2.0, Direction.NEXT, RelativeUnit.MINUTES, "in 2m"}, + {0.0, Direction.NEXT, RelativeUnit.HOURS, "in 0h"}, + {0.5, Direction.NEXT, RelativeUnit.HOURS, "in 0.5h"}, + {1.0, Direction.NEXT, RelativeUnit.HOURS, "in 1h"}, + {2.0, Direction.NEXT, RelativeUnit.HOURS, "in 2h"}, + {0.0, Direction.NEXT, RelativeUnit.DAYS, "in 0d"}, + {0.5, Direction.NEXT, RelativeUnit.DAYS, "in 0.5d"}, + {1.0, Direction.NEXT, RelativeUnit.DAYS, "in 1d"}, + {2.0, Direction.NEXT, RelativeUnit.DAYS, "in 2d"}, + {0.0, Direction.NEXT, RelativeUnit.WEEKS, "in 0w"}, + {0.5, Direction.NEXT, RelativeUnit.WEEKS, "in 0.5w"}, + {1.0, Direction.NEXT, RelativeUnit.WEEKS, "in 1w"}, + {2.0, Direction.NEXT, RelativeUnit.WEEKS, "in 2w"}, + {0.0, Direction.NEXT, RelativeUnit.MONTHS, "in 0mo"}, + {0.5, Direction.NEXT, RelativeUnit.MONTHS, "in 0.5mo"}, + {1.0, Direction.NEXT, RelativeUnit.MONTHS, "in 1mo"}, + {2.0, Direction.NEXT, RelativeUnit.MONTHS, "in 2mo"}, + {0.0, Direction.NEXT, RelativeUnit.YEARS, "in 0y"}, + {0.5, Direction.NEXT, RelativeUnit.YEARS, "in 0.5y"}, + {1.0, Direction.NEXT, RelativeUnit.YEARS, "in 1y"}, + {2.0, Direction.NEXT, RelativeUnit.YEARS, "in 2y"}, + + {0.0, Direction.LAST, RelativeUnit.SECONDS, "0s ago"}, + {0.5, Direction.LAST, RelativeUnit.SECONDS, "0.5s ago"}, + {1.0, Direction.LAST, RelativeUnit.SECONDS, "1s ago"}, + {2.0, Direction.LAST, RelativeUnit.SECONDS, "2s ago"}, + {0.0, Direction.LAST, RelativeUnit.MINUTES, "0m ago"}, + {0.5, Direction.LAST, RelativeUnit.MINUTES, "0.5m ago"}, + {1.0, Direction.LAST, RelativeUnit.MINUTES, "1m ago"}, + {2.0, Direction.LAST, RelativeUnit.MINUTES, "2m ago"}, + {0.0, Direction.LAST, RelativeUnit.HOURS, "0h ago"}, + {0.5, Direction.LAST, RelativeUnit.HOURS, "0.5h ago"}, + {1.0, Direction.LAST, RelativeUnit.HOURS, "1h ago"}, + {2.0, Direction.LAST, RelativeUnit.HOURS, "2h ago"}, + {0.0, Direction.LAST, RelativeUnit.DAYS, "0d ago"}, + {0.5, Direction.LAST, RelativeUnit.DAYS, "0.5d ago"}, + {1.0, Direction.LAST, RelativeUnit.DAYS, "1d ago"}, + {2.0, Direction.LAST, RelativeUnit.DAYS, "2d ago"}, + {0.0, Direction.LAST, RelativeUnit.WEEKS, "0w ago"}, + {0.5, Direction.LAST, RelativeUnit.WEEKS, "0.5w ago"}, + {1.0, Direction.LAST, RelativeUnit.WEEKS, "1w ago"}, + {2.0, Direction.LAST, RelativeUnit.WEEKS, "2w ago"}, + {0.0, Direction.LAST, RelativeUnit.MONTHS, "0mo ago"}, + {0.5, Direction.LAST, RelativeUnit.MONTHS, "0.5mo ago"}, + {1.0, Direction.LAST, RelativeUnit.MONTHS, "1mo ago"}, + {2.0, Direction.LAST, RelativeUnit.MONTHS, "2mo ago"}, + {0.0, Direction.LAST, RelativeUnit.YEARS, "0y ago"}, + {0.5, Direction.LAST, RelativeUnit.YEARS, "0.5y ago"}, + {1.0, Direction.LAST, RelativeUnit.YEARS, "1y ago"}, + {2.0, Direction.LAST, RelativeUnit.YEARS, "2y ago"}, }; RelativeDateTimeFormatter fmt = RelativeDateTimeFormatter.getInstance( @@ -634,10 +634,10 @@ public void TestRelativeDateWithoutQuantityNarrow() { {Direction.THIS, AbsoluteUnit.SUNDAY, "this Su"}, {Direction.PLAIN, AbsoluteUnit.DAY, "day"}, - {Direction.PLAIN, AbsoluteUnit.WEEK, "wk."}, - {Direction.PLAIN, AbsoluteUnit.MONTH, "mo."}, - {Direction.PLAIN, AbsoluteUnit.QUARTER, "qtr."}, - {Direction.PLAIN, AbsoluteUnit.YEAR, "yr."}, + {Direction.PLAIN, AbsoluteUnit.WEEK, "wk"}, + {Direction.PLAIN, AbsoluteUnit.MONTH, "mo"}, + {Direction.PLAIN, AbsoluteUnit.QUARTER, "qtr"}, + {Direction.PLAIN, AbsoluteUnit.YEAR, "yr"}, {Direction.PLAIN, AbsoluteUnit.MONDAY, "M"}, {Direction.PLAIN, AbsoluteUnit.TUESDAY, "T"}, {Direction.PLAIN, AbsoluteUnit.WEDNESDAY, "W"}, diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/TestMessageFormat.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/TestMessageFormat.java index 60e1f051e7ff..8b568e1ea1f9 100644 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/TestMessageFormat.java +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/TestMessageFormat.java @@ -187,7 +187,7 @@ public void TestPattern() // aka PatternTest() "Quotes ', {, 'a' 1 {0}", "Quotes ', {, 'a' 1 {0}", "{1,number,'#',##} #34,56", - "There are 3,456 files on Disk at 1/12/70, 5:46 AM.", + "There are 3,456 files on Disk at 1/12/70, 5:46\u202FAM.", "On Disk, there are 3,456 files, with $1.00.", "{1,number,percent}, 345,600%,", "{1,date,full}, Wednesday, December 31, 1969,", @@ -278,7 +278,7 @@ public void TestStaticFormat() }; assertEquals("format", - "At 12:20:00 PM on Aug 8, 1997, there was a disturbance in the Force on planet 7.", + "At 12:20:00\u202FPM on Aug 8, 1997, there was a disturbance in the Force on planet 7.", MessageFormat.format("At {1,time} on {1,date}, there was {2} on planet {0,number,integer}.", arguments)); } @@ -834,7 +834,7 @@ public void TestUnlimitedArgsAndSubformats() { String expected = "On Nov 20, 2286 (aka 11/20/86, aka November 20, 2286) "+ - "at 9:46:40 AM (aka 9:46 AM, aka 9:46:40 AM PST) "+ + "at 9:46:40\u202FAM (aka 9:46\u202FAM, aka 9:46:40\u202FAM PST) "+ "there were 1,303 werjes "+ "(a 8% increase over 1,202) "+ "despite the Glimmung's efforts "+ @@ -1275,7 +1275,7 @@ public void testNumericFormatWithMap() { Map argMap = new HashMap(); argMap.put("1", date); argMap.put("2", date); - target = "X:5:17:00 AM Y:Dec 17, 1990"; + target = "X:5:17:00\u202FAM Y:Dec 17, 1990"; result = mf.format(argMap); if (!target.equals(result)) { errln("expected '" + target + "' but got '" + result + "'"); @@ -1630,8 +1630,8 @@ public void TestFormatToCharacterIterator() { Object[] args = { args0, args1, args2 }; String[] expectedStrings = { - "The 2nd folder 'tmp' contains 15 file(s), created at 9:58:08 AM on Jul 18, 2007.", - "The 2nd folder 'tmp' contains 15 file(s), created at 9:58:08 AM on Jul 18, 2007.", + "The 2nd folder 'tmp' contains 15 file(s), created at 9:58:08\u202FAM on Jul 18, 2007.", + "The 2nd folder 'tmp' contains 15 file(s), created at 9:58:08\u202FAM on Jul 18, 2007.", "The folder contains 34 files." }; AttributedString[] expectedAttributedStrings = { new AttributedString(expectedStrings[0]), @@ -2140,7 +2140,7 @@ public void TestMessageFormatDateSkeleton() { Date date = new GregorianCalendar(2021, Calendar.NOVEMBER, 23, 16, 42, 55).getTime(); doTheRealDateTimeSkeletonTesting(date, "{0,date,::MMMMd}", ULocale.ENGLISH, "November 23"); - doTheRealDateTimeSkeletonTesting(date, "{0,date,::yMMMMdjm}", ULocale.ENGLISH, "November 23, 2021 at 4:42 PM"); + doTheRealDateTimeSkeletonTesting(date, "{0,date,::yMMMMdjm}", ULocale.ENGLISH, "November 23, 2021 at 4:42\u202FPM"); doTheRealDateTimeSkeletonTesting(date, "{0,date, :: yMMMMd }", ULocale.ENGLISH, "November 23, 2021"); doTheRealDateTimeSkeletonTesting(date, "{0,date,::yMMMMd}", ULocale.FRENCH, "23 novembre 2021"); doTheRealDateTimeSkeletonTesting(date, "Expiration: {0,date,::yMMM}!", ULocale.ENGLISH, "Expiration: Nov 2021!"); @@ -2152,7 +2152,7 @@ public void TestMessageFormatTimeSkeleton() { Date date = new GregorianCalendar(2021, Calendar.NOVEMBER, 23, 16, 42, 55).getTime(); doTheRealDateTimeSkeletonTesting(date, "{0,time,::MMMMd}", ULocale.ENGLISH, "November 23"); - doTheRealDateTimeSkeletonTesting(date, "{0,time,::yMMMMdjm}", ULocale.ENGLISH, "November 23, 2021 at 4:42 PM"); + doTheRealDateTimeSkeletonTesting(date, "{0,time,::yMMMMdjm}", ULocale.ENGLISH, "November 23, 2021 at 4:42\u202FPM"); doTheRealDateTimeSkeletonTesting(date, "{0,time, :: yMMMMd }", ULocale.ENGLISH, "November 23, 2021"); doTheRealDateTimeSkeletonTesting(date, "{0,time,::yMMMMd}", ULocale.FRENCH, "23 novembre 2021"); doTheRealDateTimeSkeletonTesting(date, "Expiration: {0,time,::yMMM}!", ULocale.ENGLISH, "Expiration: Nov 2021!"); diff --git a/tools/cldr/cldr-to-icu/build-icu-data.xml b/tools/cldr/cldr-to-icu/build-icu-data.xml index 695f780aa361..dc7271a5c12c 100644 --- a/tools/cldr/cldr-to-icu/build-icu-data.xml +++ b/tools/cldr/cldr-to-icu/build-icu-data.xml @@ -47,10 +47,10 @@ - + - + diff --git a/tools/cldr/cldr-to-icu/pom.xml b/tools/cldr/cldr-to-icu/pom.xml index 1f3b4bc2acc6..68017479e452 100644 --- a/tools/cldr/cldr-to-icu/pom.xml +++ b/tools/cldr/cldr-to-icu/pom.xml @@ -83,7 +83,7 @@ com.ibm.icu icu4j-for-cldr - 71.1-SNAPSHOT-release-71-rc + 72.0.1-SNAPSHOT-cldr-2022-04-11 diff --git a/tools/cldr/cldr-to-icu/src/main/java/org/unicode/icu/tool/cldrtoicu/LdmlConverter.java b/tools/cldr/cldr-to-icu/src/main/java/org/unicode/icu/tool/cldrtoicu/LdmlConverter.java index 75d44de78db5..3ea1a8cbebfd 100644 --- a/tools/cldr/cldr-to-icu/src/main/java/org/unicode/icu/tool/cldrtoicu/LdmlConverter.java +++ b/tools/cldr/cldr-to-icu/src/main/java/org/unicode/icu/tool/cldrtoicu/LdmlConverter.java @@ -99,6 +99,7 @@ public final class LdmlConverter { "languageMatching", "measurementData", "parentLocales", + "personNamesDefaults", "subdivisionContainment", "territoryContainment", "territoryInfo", diff --git a/tools/cldr/cldr-to-icu/src/main/resources/ldml2icu_locale.txt b/tools/cldr/cldr-to-icu/src/main/resources/ldml2icu_locale.txt index e33c3bd14bca..15ff953c0a3a 100644 --- a/tools/cldr/cldr-to-icu/src/main/resources/ldml2icu_locale.txt +++ b/tools/cldr/cldr-to-icu/src/main/resources/ldml2icu_locale.txt @@ -171,9 +171,13 @@ ; /calendar/$1/DateTimePatterns ; values="{value}" $4 ; group # DateTime patterns (4 x values) -//ldml/dates/calendars/calendar[@type="(%A)"]/(dateTimeFormat)s/\2Length[@type="(%A)"]/\2[@type="%A"]/pattern[@type="%A"] +//ldml/dates/calendars/calendar[@type="(%A)"]/(dateTimeFormat)s/\2Length[@type="(%A)"]/\2[@type="standard"]/pattern[@type="%A"] ; /calendar/$1/DateTimePatterns +# DateTime atTime patterns (4 x values) +//ldml/dates/calendars/calendar[@type="(%A)"]/(dateTimeFormat)s/\2Length[@type="(%A)"]/\2[@type="atTime"]/pattern[@type="%A"] + ; /calendar/$1/DateTimePatterns%atTime + # ---- /calendar/xxx/DateTimeSkeletons # This is similar to DateTimePatterns above except that for this we do not have the DateTime patterns (4 x values, plus the duplicate value at index 8). @@ -325,9 +329,13 @@ //ldml/numbers/otherNumberingSystems/(%W) ; /NumberElements/$1 //ldml/numbers/symbols[@numberSystem="(%A)"]/(%W) ; /NumberElements/$1/symbols/$2 +//ldml/numbers/(%GFormat)s[@numberSystem="(%W)"]/\1Length/\1[@type="standard"]/pattern[@type="standard"][@alt="(%W)"] ; /NumberElements/$2/patterns/$1%$3 //ldml/numbers/(%GFormat)s[@numberSystem="(%W)"]/\1Length/\1[@type="standard"]/pattern[@type="standard"] ; /NumberElements/$2/patterns/$1 +//ldml/numbers/currencyFormats[@numberSystem="(%W)"]/currencyFormatLength/currencyFormat[@type="accounting"]/pattern[@type="standard"][@alt="(%W)"] ; /NumberElements/$1/patterns/accountingFormat%$2 //ldml/numbers/currencyFormats[@numberSystem="(%W)"]/currencyFormatLength/currencyFormat[@type="accounting"]/pattern[@type="standard"] ; /NumberElements/$1/patterns/accountingFormat +//ldml/numbers/currencyFormats[@numberSystem="(%W)"]/currencyFormatLength[@type="short"]/currencyFormat[@type="standard"]/pattern[@type="(%N)"][@count="(%W)"][@alt="(%W)"] ; /NumberElements/$1/patternsShort/currencyFormat%$4/$2/$3 //ldml/numbers/currencyFormats[@numberSystem="(%W)"]/currencyFormatLength[@type="short"]/currencyFormat[@type="standard"]/pattern[@type="(%N)"][@count="(%W)"] ; /NumberElements/$1/patternsShort/currencyFormat/$2/$3 +//ldml/numbers/currencyFormats[@numberSystem="(%W)"]/currencyPatternAppendISO ; /NumberElements/$1/patterns/currencyPatternAppendISO //ldml/numbers/decimalFormats[@numberSystem="(%W)"]/decimalFormatLength[@type="short"]/decimalFormat[@type="standard"]/pattern[@type="(%N)"][@count="(%W)"] ; /NumberElements/$1/patternsShort/decimalFormat/$2/$3 //ldml/numbers/decimalFormats[@numberSystem="(%W)"]/decimalFormatLength[@type="long"]/decimalFormat[@type="standard"]/pattern[@type="(%N)"][@count="(%W)"] ; /NumberElements/$1/patternsLong/decimalFormat/$2/$3 diff --git a/tools/cldr/cldr-to-icu/src/main/resources/ldml2icu_supplemental.txt b/tools/cldr/cldr-to-icu/src/main/resources/ldml2icu_supplemental.txt index 4a780f2c4b3d..3eda4f5680a2 100644 --- a/tools/cldr/cldr-to-icu/src/main/resources/ldml2icu_supplemental.txt +++ b/tools/cldr/cldr-to-icu/src/main/resources/ldml2icu_supplemental.txt @@ -260,6 +260,9 @@ # locale info //supplementalData/parentLocales/parentLocale[@parent="(%A)"][@locales="(%A)"] ; /parentLocales/$1 ; values=$2 +# personName formats +//supplementalData/personNamesDefaults/nameOrderLocalesDefault[@order="(%A)"] ; /personNamesDefaults/nameOrderLocalesDefault/$1 ; values={value} + # supplementalMetadata.xml (metadata.txt) //supplementalData/metadata/defaultContent[@locales="(%A)"] ; /defaultContent ; values=$1 //supplementalData/metadata/alias/(language|script|territory|subdivision|variant)Alias[@type="(%A)"][@replacement="(%A)"][@reason="(%A)"]