From 8453f6e5d1fd98700a37e30346a1af0daf8fb753 Mon Sep 17 00:00:00 2001 From: Eike Rathke Date: Sat, 22 Feb 2020 18:52:06 +0100 Subject: Resolves: tdf#130563 Add predefined 4-digit year date+time format Add a predefined NF_DATETIME_SYS_DDMMYYYY_HHMM format code with formatindex="50" to all locale data files, which shifts all reserved area internally generated built-in formats up by one. Reserved area was filled already so that boundary has to be increased as well. Add some flexibility for future additions by setting the new boundary to 65, free first format index to be used by additional locale data formats is 66 now. Adapt all locales to the new boundary. The existing predefined NF_DATETIME_SYSTEM_SHORT_HHMM format code with formatindex="46" mostly was and is used with 2-digit years (stemming back from the old binary format and Excel compatibility), some locales that don't use 2-digit years at all already defined it to 4-digit years. Keep those but move the default="true" attribute (if so) to the new "50" format. Modify populating the format list such that resulting duplicates will be suppressed there as well. Also try to match the new format in ODF import if a long year was requested with date+time. Finally set the new format as default for all *_IT locales. In future changing the default date+time format to 4-digit year is just a matter of moving the default="true" attribute to the new format. Change-Id: Ib16aa9fda0e71b2d03f78e3dd013785de03cd288 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89265 Reviewed-by: Eike Rathke Tested-by: Jenkins --- i18npool/source/localedata/LocaleNode.cxx | 19 ++++-- i18npool/source/localedata/data/ak_GH.xml | 3 + i18npool/source/localedata/data/an_ES.xml | 3 + i18npool/source/localedata/data/ar_DZ.xml | 15 +++-- i18npool/source/localedata/data/ar_EG.xml | 15 +++-- i18npool/source/localedata/data/ar_OM.xml | 5 +- i18npool/source/localedata/data/ast_ES.xml | 3 + i18npool/source/localedata/data/az_AZ.xml | 3 + i18npool/source/localedata/data/be_BY.xml | 3 + i18npool/source/localedata/data/bg_BG.xml | 7 +- i18npool/source/localedata/data/bm_ML.xml | 3 + i18npool/source/localedata/data/bn_IN.xml | 3 + i18npool/source/localedata/data/bo_CN.xml | 7 +- i18npool/source/localedata/data/bo_IN.xml | 7 +- i18npool/source/localedata/data/br_FR.xml | 3 + i18npool/source/localedata/data/bs_BA.xml | 3 + i18npool/source/localedata/data/ca_ES.xml | 3 + i18npool/source/localedata/data/cs_CZ.xml | 3 + i18npool/source/localedata/data/cu_RU.xml | 3 + i18npool/source/localedata/data/cv_RU.xml | 3 + i18npool/source/localedata/data/da_DK.xml | 3 + i18npool/source/localedata/data/de_AT.xml | 3 + i18npool/source/localedata/data/de_CH.xml | 3 + i18npool/source/localedata/data/de_DE.xml | 3 + i18npool/source/localedata/data/de_LI.xml | 3 + i18npool/source/localedata/data/de_LU.xml | 3 + i18npool/source/localedata/data/dsb_DE.xml | 13 ++-- i18npool/source/localedata/data/dz_BT.xml | 37 ++++++----- i18npool/source/localedata/data/ee_GH.xml | 3 + i18npool/source/localedata/data/el_GR.xml | 3 + i18npool/source/localedata/data/en_AU.xml | 3 + i18npool/source/localedata/data/en_CA.xml | 5 +- i18npool/source/localedata/data/en_GB.xml | 3 + i18npool/source/localedata/data/en_GH.xml | 3 + i18npool/source/localedata/data/en_JM.xml | 3 + i18npool/source/localedata/data/en_NA.xml | 3 + i18npool/source/localedata/data/en_US.xml | 23 ++++--- i18npool/source/localedata/data/en_ZA.xml | 11 ++-- i18npool/source/localedata/data/eo.xml | 3 + i18npool/source/localedata/data/es_AR.xml | 3 + i18npool/source/localedata/data/es_BO.xml | 3 + i18npool/source/localedata/data/es_CL.xml | 3 + i18npool/source/localedata/data/es_CO.xml | 3 + i18npool/source/localedata/data/es_CR.xml | 7 +- i18npool/source/localedata/data/es_DO.xml | 3 + i18npool/source/localedata/data/es_EC.xml | 3 + i18npool/source/localedata/data/es_ES.xml | 3 + i18npool/source/localedata/data/es_GT.xml | 3 + i18npool/source/localedata/data/es_PE.xml | 3 + i18npool/source/localedata/data/es_SV.xml | 3 + i18npool/source/localedata/data/et_EE.xml | 3 + i18npool/source/localedata/data/eu_ES.xml | 3 + i18npool/source/localedata/data/fa_IR.xml | 5 +- i18npool/source/localedata/data/fi_FI.xml | 3 + i18npool/source/localedata/data/fo_FO.xml | 3 + i18npool/source/localedata/data/fr_BE.xml | 3 + i18npool/source/localedata/data/fr_BF.xml | 3 + i18npool/source/localedata/data/fr_CA.xml | 5 +- i18npool/source/localedata/data/fr_CH.xml | 3 + i18npool/source/localedata/data/fr_FR.xml | 3 + i18npool/source/localedata/data/fr_LU.xml | 3 + i18npool/source/localedata/data/fur_IT.xml | 5 +- i18npool/source/localedata/data/fy_NL.xml | 3 + i18npool/source/localedata/data/gd_GB.xml | 3 + i18npool/source/localedata/data/gl_ES.xml | 3 + i18npool/source/localedata/data/gsc_FR.xml | 3 + i18npool/source/localedata/data/gug_PY.xml | 3 + i18npool/source/localedata/data/ha_Latn_GH.xml | 3 + i18npool/source/localedata/data/ha_Latn_NG.xml | 3 + i18npool/source/localedata/data/haw_US.xml | 3 + i18npool/source/localedata/data/he_IL.xml | 13 ++-- i18npool/source/localedata/data/hi_IN.xml | 3 + i18npool/source/localedata/data/hil_PH.xml | 3 + i18npool/source/localedata/data/hr_HR.xml | 11 ++-- i18npool/source/localedata/data/hsb_DE.xml | 3 + i18npool/source/localedata/data/ht_HT.xml | 3 + i18npool/source/localedata/data/hu_HU.xml | 73 +++++++++++---------- i18npool/source/localedata/data/hy_AM.xml | 3 + i18npool/source/localedata/data/ia.xml | 3 + i18npool/source/localedata/data/id_ID.xml | 3 + i18npool/source/localedata/data/ilo_PH.xml | 3 + i18npool/source/localedata/data/is_IS.xml | 3 + i18npool/source/localedata/data/it_CH.xml | 3 + i18npool/source/localedata/data/it_IT.xml | 5 +- i18npool/source/localedata/data/ja_JP.xml | 12 ++-- i18npool/source/localedata/data/jbo.xml | 3 + i18npool/source/localedata/data/ka_GE.xml | 3 + i18npool/source/localedata/data/kab_DZ.xml | 3 + i18npool/source/localedata/data/kk_KZ.xml | 3 + i18npool/source/localedata/data/kl_GL.xml | 3 + i18npool/source/localedata/data/km_KH.xml | 19 +++--- i18npool/source/localedata/data/kmr_Latn_TR.xml | 3 + i18npool/source/localedata/data/kng_CG.xml | 3 + i18npool/source/localedata/data/ko_KR.xml | 87 +++++++++++++------------ i18npool/source/localedata/data/ky_KG.xml | 3 + i18npool/source/localedata/data/la_VA.xml | 3 + i18npool/source/localedata/data/lb_LU.xml | 3 + i18npool/source/localedata/data/lg_UG.xml | 3 + i18npool/source/localedata/data/lgr_SB.xml | 3 + i18npool/source/localedata/data/lif_NP.xml | 3 + i18npool/source/localedata/data/lij_IT.xml | 5 +- i18npool/source/localedata/data/lld_IT.xml | 5 +- i18npool/source/localedata/data/ln_CD.xml | 3 + i18npool/source/localedata/data/lo_LA.xml | 5 +- i18npool/source/localedata/data/locale.dtd | 20 ++++-- i18npool/source/localedata/data/lt_LT.xml | 15 +++-- i18npool/source/localedata/data/ltg_LV.xml | 3 + i18npool/source/localedata/data/lv_LV.xml | 3 + i18npool/source/localedata/data/mai_IN.xml | 3 + i18npool/source/localedata/data/mk_MK.xml | 3 + i18npool/source/localedata/data/ml_IN.xml | 3 + i18npool/source/localedata/data/mn_Cyrl_MN.xml | 3 + i18npool/source/localedata/data/mos_BF.xml | 3 + i18npool/source/localedata/data/mt_MT.xml | 3 + i18npool/source/localedata/data/my_MM.xml | 51 ++++++++------- i18npool/source/localedata/data/myv_RU.xml | 3 + i18npool/source/localedata/data/nds_DE.xml | 3 + i18npool/source/localedata/data/ne_NP.xml | 3 + i18npool/source/localedata/data/nl_BE.xml | 3 + i18npool/source/localedata/data/nl_NL.xml | 3 + i18npool/source/localedata/data/no_NO.xml | 3 + i18npool/source/localedata/data/ny_MW.xml | 3 + i18npool/source/localedata/data/oc_FR.xml | 3 + i18npool/source/localedata/data/om_ET.xml | 3 + i18npool/source/localedata/data/or_IN.xml | 3 + i18npool/source/localedata/data/pap_CW.xml | 3 + i18npool/source/localedata/data/pjt_AU.xml | 3 + i18npool/source/localedata/data/pl_PL.xml | 2 +- i18npool/source/localedata/data/plt_MG.xml | 3 + i18npool/source/localedata/data/pt_AO.xml | 3 + i18npool/source/localedata/data/pt_BR.xml | 3 + i18npool/source/localedata/data/pt_PT.xml | 33 +++++----- i18npool/source/localedata/data/pui_CO.xml | 3 + i18npool/source/localedata/data/ro_RO.xml | 3 + i18npool/source/localedata/data/ru_RU.xml | 3 + i18npool/source/localedata/data/rue_SK.xml | 3 + i18npool/source/localedata/data/rw_RW.xml | 3 + i18npool/source/localedata/data/sc_IT.xml | 5 +- i18npool/source/localedata/data/sg_CF.xml | 3 + i18npool/source/localedata/data/shs_CA.xml | 5 +- i18npool/source/localedata/data/sid_ET.xml | 3 + i18npool/source/localedata/data/sk_SK.xml | 3 + i18npool/source/localedata/data/sl_SI.xml | 3 + i18npool/source/localedata/data/so_SO.xml | 3 + i18npool/source/localedata/data/sr_RS.xml | 3 + i18npool/source/localedata/data/sv_FI.xml | 3 + i18npool/source/localedata/data/sv_SE.xml | 3 + i18npool/source/localedata/data/sw_TZ.xml | 3 + i18npool/source/localedata/data/tg_TJ.xml | 3 + i18npool/source/localedata/data/th_TH.xml | 77 +++++++++++----------- i18npool/source/localedata/data/ti_ER.xml | 3 + i18npool/source/localedata/data/ti_ET.xml | 3 + i18npool/source/localedata/data/tk_TM.xml | 3 + i18npool/source/localedata/data/tpi_PG.xml | 3 + i18npool/source/localedata/data/tr_TR.xml | 11 ++-- i18npool/source/localedata/data/tt_RU.xml | 3 + i18npool/source/localedata/data/ug_CN.xml | 3 + i18npool/source/localedata/data/uk_UA.xml | 3 + i18npool/source/localedata/data/ur_PK.xml | 3 + i18npool/source/localedata/data/uz_UZ.xml | 3 + i18npool/source/localedata/data/vec_IT.xml | 5 +- i18npool/source/localedata/data/vi_VN.xml | 3 + i18npool/source/localedata/data/wa_BE.xml | 3 + i18npool/source/localedata/data/zh_CN.xml | 21 +++--- i18npool/source/localedata/data/zh_HK.xml | 19 +++--- i18npool/source/localedata/data/zh_MO.xml | 21 +++--- i18npool/source/localedata/data/zh_SG.xml | 21 +++--- i18npool/source/localedata/data/zh_TW.xml | 65 +++++++++--------- include/i18npool/reservedconstants.hxx | 12 +++- include/svl/zforlist.hxx | 18 +++-- include/svx/numfmtsh.hxx | 2 + sc/source/core/tool/interpr1.cxx | 1 + svl/qa/unit/svl.cxx | 21 +++++- svl/source/numbers/zforlist.cxx | 23 +++++-- svx/source/items/numfmtsh.cxx | 72 +++++++++++--------- xmloff/source/style/xmlnumfe.cxx | 3 +- xmloff/source/style/xmlnumfi.cxx | 3 +- 177 files changed, 944 insertions(+), 384 deletions(-) diff --git a/i18npool/source/localedata/LocaleNode.cxx b/i18npool/source/localedata/LocaleNode.cxx index fe627d343767..f056eefd9252 100644 --- a/i18npool/source/localedata/LocaleNode.cxx +++ b/i18npool/source/localedata/LocaleNode.cxx @@ -620,8 +620,8 @@ void LCFormatNode::generateCode (const OFileWriter &of) const aFormatIndex = currNodeAttr.getValueByName("formatindex"); sal_Int16 formatindex = static_cast(aFormatIndex.toInt32()); // Ensure the new reserved range is not used anymore, free usage start - // was up'ed from 50 to 60. - if (50 <= formatindex && formatindex < i18npool::nFirstFreeFormatIndex) + // was up'ed from 50 to 60 (and more later). + if (i18npool::nStopPredefinedFormatIndex <= formatindex && formatindex < i18npool::nFirstFreeFormatIndex) { incErrorInt( "Error: Reserved formatindex=\"%d\" in FormatElement.\n", formatindex); bShowNextFreeFormatIndex = true; @@ -862,14 +862,15 @@ void LCFormatNode::generateCode (const OFileWriter &of) const incError( "No abbreviated DateAcceptancePattern present. For example M/D or D.M.\n"); } - // 0..47 MUST be present, 48,49 MUST NOT be present + // 0..9 MUST be present, 10,11 MUST NOT be present, 12..47 MUST be + // present, 48,49 MUST NOT be present, 50 MUST be present. ValueSet::const_iterator aIter( aFormatIndexSet.begin()); for (sal_Int16 nNext = cssi::NumberFormatIndex::NUMBER_START; - nNext < cssi::NumberFormatIndex::INDEX_TABLE_ENTRIES; ++nNext) + nNext < i18npool::nStopPredefinedFormatIndex; ++nNext) { sal_Int16 nHere = ::std::min( (aIter != aFormatIndexSet.end() ? *aIter : - cssi::NumberFormatIndex::INDEX_TABLE_ENTRIES), - cssi::NumberFormatIndex::INDEX_TABLE_ENTRIES); + i18npool::nStopPredefinedFormatIndex), + i18npool::nStopPredefinedFormatIndex); if (aIter != aFormatIndexSet.end()) ++aIter; for ( ; nNext < nHere; ++nNext) { @@ -887,6 +888,12 @@ void LCFormatNode::generateCode (const OFileWriter &of) const } switch (nHere) { + case cssi::NumberFormatIndex::FRACTION_1 : + incErrorInt( "Error: FormatElement formatindex=\"%d\" reserved for internal ``# ?/?''.\n", nNext); + break; + case cssi::NumberFormatIndex::FRACTION_2 : + incErrorInt( "Error: FormatElement formatindex=\"%d\" reserved for internal ``# ?\?/?\?''.\n", nNext); + break; case cssi::NumberFormatIndex::BOOLEAN : incErrorInt( "Error: FormatElement formatindex=\"%d\" reserved for internal ``BOOLEAN''.\n", nNext); break; diff --git a/i18npool/source/localedata/data/ak_GH.xml b/i18npool/source/localedata/data/ak_GH.xml index 41d7eab145de..8a380241adf3 100644 --- a/i18npool/source/localedata/data/ak_GH.xml +++ b/i18npool/source/localedata/data/ak_GH.xml @@ -195,6 +195,9 @@ MM/DD/YYYY HH:MM:SS AM/PM + + MM/DD/YYYY HH:MM + diff --git a/i18npool/source/localedata/data/an_ES.xml b/i18npool/source/localedata/data/an_ES.xml index d943edbfc25f..f6063c06e206 100644 --- a/i18npool/source/localedata/data/an_ES.xml +++ b/i18npool/source/localedata/data/an_ES.xml @@ -195,6 +195,9 @@ DD/MM/YYYY HH:MM:SS AM/PM + + DD/MM/YYYY HH:MM + diff --git a/i18npool/source/localedata/data/ar_DZ.xml b/i18npool/source/localedata/data/ar_DZ.xml index 4cb4d155018b..c04ff8bc31a8 100644 --- a/i18npool/source/localedata/data/ar_DZ.xml +++ b/i18npool/source/localedata/data/ar_DZ.xml @@ -190,22 +190,25 @@ [HH]:MM:SS٫00 - + [~hijri]AM/PMHH:MM YYYY/MM/D - [NatNum1][~hijri]AM/PMHH:MM YYYY/MM/D + [NatNum1][~hijri]AM/PMHH:MM:SS YYYY/MM/D - + + [~hijri]AM/PMHH:MM YYYY/MM/D + + AM/PMHH:MM YYYY/MM/D - + [NatNum1]AM/PMHH:MM YYYY/MM/D - + [NatNum1]YYYY/MM/DD - + [NatNum1]General diff --git a/i18npool/source/localedata/data/ar_EG.xml b/i18npool/source/localedata/data/ar_EG.xml index 5bcb4b689c30..260fc27a76b6 100644 --- a/i18npool/source/localedata/data/ar_EG.xml +++ b/i18npool/source/localedata/data/ar_EG.xml @@ -190,22 +190,25 @@ [HH]:MM:SS.00 - + [~hijri]AM/PMHH:MM YYYY/MM/D - [NatNum1][~hijri]AM/PMHH:MM YYYY/MM/D + [NatNum1][~hijri]AM/PMHH:MM:SS YYYY/MM/D - + + [~hijri]AM/PMHH:MM YYYY/MM/D + + AM/PMHH:MM YYYY/MM/D - + [NatNum1]AM/PMHH:MM YYYY/MM/D - + [NatNum1]YYYY/MM/DD - + [NatNum1]General diff --git a/i18npool/source/localedata/data/ar_OM.xml b/i18npool/source/localedata/data/ar_OM.xml index 51a9eceb1a3d..66ca11d818ed 100644 --- a/i18npool/source/localedata/data/ar_OM.xml +++ b/i18npool/source/localedata/data/ar_OM.xml @@ -195,7 +195,10 @@ DD/MM/YYYY HH:MM:SS AM/PM - + + DD/MM/YYYY HH:MM + + [NatNum1]General diff --git a/i18npool/source/localedata/data/ast_ES.xml b/i18npool/source/localedata/data/ast_ES.xml index 4fcde3a3096e..2cfaf1594ea8 100644 --- a/i18npool/source/localedata/data/ast_ES.xml +++ b/i18npool/source/localedata/data/ast_ES.xml @@ -195,6 +195,9 @@ DD/MM/YYYY HH:MM:SS AM/PM + + DD/MM/YYYY HH:MM + diff --git a/i18npool/source/localedata/data/az_AZ.xml b/i18npool/source/localedata/data/az_AZ.xml index 1bb700bca928..33bacc538ef5 100644 --- a/i18npool/source/localedata/data/az_AZ.xml +++ b/i18npool/source/localedata/data/az_AZ.xml @@ -195,6 +195,9 @@ DD.MM.YYYY HH:MM:SS + + DD.MM.YYYY HH:MM + diff --git a/i18npool/source/localedata/data/be_BY.xml b/i18npool/source/localedata/data/be_BY.xml index 68f964219942..8b9974ead19a 100644 --- a/i18npool/source/localedata/data/be_BY.xml +++ b/i18npool/source/localedata/data/be_BY.xml @@ -196,6 +196,9 @@ DD.MM.YYYY HH:MM:SS + + DD.MM.YYYY HH:MM + diff --git a/i18npool/source/localedata/data/bg_BG.xml b/i18npool/source/localedata/data/bg_BG.xml index fa6b8afc8261..a4569ccfac36 100644 --- a/i18npool/source/localedata/data/bg_BG.xml +++ b/i18npool/source/localedata/data/bg_BG.xml @@ -193,12 +193,15 @@ [HH]:MM:SS,00 - - D.MM.YYYY" г.", H:MM" ч." + + D.MM.YY" г.", H:MM" ч." D.MM.YYYY" г.", H:MM:SS + + D.MM.YYYY" г.", H:MM" ч." + diff --git a/i18npool/source/localedata/data/bm_ML.xml b/i18npool/source/localedata/data/bm_ML.xml index e958bf9a9df6..63e68f2dd6a2 100644 --- a/i18npool/source/localedata/data/bm_ML.xml +++ b/i18npool/source/localedata/data/bm_ML.xml @@ -187,6 +187,9 @@ DD/MM/YYYY HH:MM:SS AM/PM + + DD/MM/YYYY HH:MM + diff --git a/i18npool/source/localedata/data/bn_IN.xml b/i18npool/source/localedata/data/bn_IN.xml index f443511822c9..081a87cb79ad 100644 --- a/i18npool/source/localedata/data/bn_IN.xml +++ b/i18npool/source/localedata/data/bn_IN.xml @@ -197,6 +197,9 @@ MM-DD-YYYY HH:MM:SS + + MM-DD-YYYY HH:MM + diff --git a/i18npool/source/localedata/data/bo_CN.xml b/i18npool/source/localedata/data/bo_CN.xml index ba01d817d226..f72031999208 100644 --- a/i18npool/source/localedata/data/bo_CN.xml +++ b/i18npool/source/localedata/data/bo_CN.xml @@ -140,12 +140,15 @@ [HH]:MM:SS.00 - - [NatNum1]"སྤྱི་ལོ" YYYY "ཟླ་" M "ཚེས་" DD HH:MM AM/PM + + [NatNum1]"སྤྱི་ལོ" YY "ཟླ་" M "ཚེས་" DD HH:MM AM/PM [NatNum1]DD-MM-YYYY HH:MM:SS + + [NatNum1]"སྤྱི་ལོ" YYYY "ཟླ་" M "ཚེས་" DD HH:MM AM/PM + General diff --git a/i18npool/source/localedata/data/bo_IN.xml b/i18npool/source/localedata/data/bo_IN.xml index b1dd81824776..8d9133ae988d 100644 --- a/i18npool/source/localedata/data/bo_IN.xml +++ b/i18npool/source/localedata/data/bo_IN.xml @@ -140,12 +140,15 @@ [HH]:MM:SS.00 - - [NatNum1]"སྤྱི་ལོ" YYYY "ཟླ་" M "ཚེས་" DD HH:MM AM/PM + + [NatNum1]"སྤྱི་ལོ" YY "ཟླ་" M "ཚེས་" DD HH:MM AM/PM [NatNum1]DD-MM-YYYY HH:MM:SS + + [NatNum1]"སྤྱི་ལོ" YYYY "ཟླ་" M "ཚེས་" DD HH:MM AM/PM + General diff --git a/i18npool/source/localedata/data/br_FR.xml b/i18npool/source/localedata/data/br_FR.xml index 9c60659ad2de..cd66941ea6a6 100644 --- a/i18npool/source/localedata/data/br_FR.xml +++ b/i18npool/source/localedata/data/br_FR.xml @@ -197,6 +197,9 @@ DD/MM/YYYY HH:MM:SS + + DD/MM/YYYY HH:MM + diff --git a/i18npool/source/localedata/data/bs_BA.xml b/i18npool/source/localedata/data/bs_BA.xml index 8084ebf55353..fd80e6a21d80 100644 --- a/i18npool/source/localedata/data/bs_BA.xml +++ b/i18npool/source/localedata/data/bs_BA.xml @@ -144,6 +144,9 @@ DD.MM.YYYY HH:MM:SS + + DD.MM.YYYY HH:MM AM/PM + General diff --git a/i18npool/source/localedata/data/ca_ES.xml b/i18npool/source/localedata/data/ca_ES.xml index c8d8de2d9632..41ba34851c30 100644 --- a/i18npool/source/localedata/data/ca_ES.xml +++ b/i18npool/source/localedata/data/ca_ES.xml @@ -195,6 +195,9 @@ DD/MM/YYYY HH:MM:SS + + DD/MM/YYYY HH:MM + diff --git a/i18npool/source/localedata/data/cs_CZ.xml b/i18npool/source/localedata/data/cs_CZ.xml index a67a9f55baba..52d98cb4f10e 100644 --- a/i18npool/source/localedata/data/cs_CZ.xml +++ b/i18npool/source/localedata/data/cs_CZ.xml @@ -148,6 +148,9 @@ DD.MM.YYYY HH:MM:SS + + DD.MM.YYYY HH:MM + Standard diff --git a/i18npool/source/localedata/data/cu_RU.xml b/i18npool/source/localedata/data/cu_RU.xml index 5dcfe38feecf..0b84d287ce26 100644 --- a/i18npool/source/localedata/data/cu_RU.xml +++ b/i18npool/source/localedata/data/cu_RU.xml @@ -200,6 +200,9 @@ DD.MM.YYYY HH:MM:SS + + DD.MM.YYYY HH:MM + diff --git a/i18npool/source/localedata/data/cv_RU.xml b/i18npool/source/localedata/data/cv_RU.xml index 7b09492fd816..68973a292757 100644 --- a/i18npool/source/localedata/data/cv_RU.xml +++ b/i18npool/source/localedata/data/cv_RU.xml @@ -195,6 +195,9 @@ DD.MM.YYYY HH:MM:SS + + DD.MM.YYYY HH:MM + diff --git a/i18npool/source/localedata/data/da_DK.xml b/i18npool/source/localedata/data/da_DK.xml index 8a9b9bff1cdf..540e2ca7365d 100644 --- a/i18npool/source/localedata/data/da_DK.xml +++ b/i18npool/source/localedata/data/da_DK.xml @@ -195,6 +195,9 @@ DD-MM-YYYY TT:MM:SS + + DD-MM-YYYY TT:MM + diff --git a/i18npool/source/localedata/data/de_AT.xml b/i18npool/source/localedata/data/de_AT.xml index 9d0b8670414d..ebb90a77781a 100644 --- a/i18npool/source/localedata/data/de_AT.xml +++ b/i18npool/source/localedata/data/de_AT.xml @@ -195,6 +195,9 @@ TT.MM.JJJJ HH:MM:SS + + TT.MM.JJJJ HH:MM + diff --git a/i18npool/source/localedata/data/de_CH.xml b/i18npool/source/localedata/data/de_CH.xml index 1c0d6454f6ad..7be0d6c3a1c1 100644 --- a/i18npool/source/localedata/data/de_CH.xml +++ b/i18npool/source/localedata/data/de_CH.xml @@ -195,6 +195,9 @@ TT.MM.JJJJ HH:MM:SS + + TT.MM.JJJJ HH:MM + diff --git a/i18npool/source/localedata/data/de_DE.xml b/i18npool/source/localedata/data/de_DE.xml index 46f89a2a3be4..6eb8307d3c13 100644 --- a/i18npool/source/localedata/data/de_DE.xml +++ b/i18npool/source/localedata/data/de_DE.xml @@ -195,6 +195,9 @@ TT.MM.JJJJ HH:MM:SS + + TT.MM.JJJJ HH:MM + diff --git a/i18npool/source/localedata/data/de_LI.xml b/i18npool/source/localedata/data/de_LI.xml index d368c0589bcd..7274462cea1a 100644 --- a/i18npool/source/localedata/data/de_LI.xml +++ b/i18npool/source/localedata/data/de_LI.xml @@ -195,6 +195,9 @@ TT.MM.JJJJ HH:MM:SS + + TT.MM.JJJJ HH:MM + diff --git a/i18npool/source/localedata/data/de_LU.xml b/i18npool/source/localedata/data/de_LU.xml index 9d12a26885cf..3dcf21c6b616 100644 --- a/i18npool/source/localedata/data/de_LU.xml +++ b/i18npool/source/localedata/data/de_LU.xml @@ -195,6 +195,9 @@ TT.MM.JJJJ HH:MM:SS + + TT.MM.JJJJ HH:MM + diff --git a/i18npool/source/localedata/data/dsb_DE.xml b/i18npool/source/localedata/data/dsb_DE.xml index 4bad6889ef56..bd96a17d8ab5 100644 --- a/i18npool/source/localedata/data/dsb_DE.xml +++ b/i18npool/source/localedata/data/dsb_DE.xml @@ -168,16 +168,16 @@ WW - + H:MM - + H:MM:SS - + H:MM AM/PM - + H:MM:SS AM/PM @@ -193,7 +193,10 @@ DD.MM.YY H:MM - DD.MM.YYYY H:MM:SS AM/PM + DD.MM.YYYY H:MM:SS + + + DD.MM.YYYY H:MM diff --git a/i18npool/source/localedata/data/dz_BT.xml b/i18npool/source/localedata/data/dz_BT.xml index 0f6a0673746b..d2a926d95254 100644 --- a/i18npool/source/localedata/data/dz_BT.xml +++ b/i18npool/source/localedata/data/dz_BT.xml @@ -140,12 +140,15 @@ [HH]:MM:SS.00 - - [NatNum1]"སྤྱི་ལོ" YYYY "ཟླ་" M "ཚེས་" DD HH:MM AM/PM + + [NatNum1]"སྤྱི་ལོ" YY "ཟླ་" M "ཚེས་" DD HH:MM AM/PM [NatNum1]DD-MM-YYYY HH:MM:SS + + [NatNum1]"སྤྱི་ལོ" YYYY "ཟླ་" M "ཚེས་" DD HH:MM AM/PM + General @@ -164,19 +167,19 @@ [NatNum1]#,###.00 - + 0 - + 0.00 - + #,##0 - + #,##0.00 - + #,###.00 @@ -197,22 +200,22 @@ [NatNum1][CURRENCY]#,##0.--;[NatNum1][RED]-[CURRENCY]#,##0.-- - + [CURRENCY]#,##0;-[CURRENCY]#,##0 - + [CURRENCY]#,##0.00;-[CURRENCY]#,##0.00 - + [CURRENCY]#,##0;[RED]-[CURRENCY]#,##0 - + [CURRENCY]#,##0.00;[RED]-[CURRENCY]#,##0.00 - + #,##0.00 CCC - + [CURRENCY]#,##0.--;[RED]-[CURRENCY]#,##0.-- @@ -222,10 +225,10 @@ [NatNum1]0.00% - + 0% - + 0.00% @@ -234,10 +237,10 @@ 0.00E+00 - + [NatNum1]0.00E+00 - + ##0.00E+00 diff --git a/i18npool/source/localedata/data/ee_GH.xml b/i18npool/source/localedata/data/ee_GH.xml index 3c0d8df74402..26ecfedf322c 100644 --- a/i18npool/source/localedata/data/ee_GH.xml +++ b/i18npool/source/localedata/data/ee_GH.xml @@ -195,6 +195,9 @@ MM/DD/YYYY HH:MM:SS AM/PM + + MM/DD/YYYY HH:MM + diff --git a/i18npool/source/localedata/data/el_GR.xml b/i18npool/source/localedata/data/el_GR.xml index 9867a1bf2e94..2316e67c8593 100644 --- a/i18npool/source/localedata/data/el_GR.xml +++ b/i18npool/source/localedata/data/el_GR.xml @@ -195,6 +195,9 @@ DD/MM/YYYY HH:MM:SS + + DD/MM/YYYY HH:MM + diff --git a/i18npool/source/localedata/data/en_AU.xml b/i18npool/source/localedata/data/en_AU.xml index 4d21aa4ca438..e0122b128dda 100644 --- a/i18npool/source/localedata/data/en_AU.xml +++ b/i18npool/source/localedata/data/en_AU.xml @@ -201,6 +201,9 @@ DD/MM/YYYY HH:MM:SS + + DD/MM/YYYY HH:MM + diff --git a/i18npool/source/localedata/data/en_CA.xml b/i18npool/source/localedata/data/en_CA.xml index de8ff1f81d37..9e637a7530d0 100644 --- a/i18npool/source/localedata/data/en_CA.xml +++ b/i18npool/source/localedata/data/en_CA.xml @@ -197,12 +197,15 @@ [HH]:MM:SS.00 - + YYYY-MM-DD HH:MM YYYY-MM-DD HH:MM:SS + + YYYY-MM-DD HH:MM + diff --git a/i18npool/source/localedata/data/en_GB.xml b/i18npool/source/localedata/data/en_GB.xml index e81cfedf433f..f12fad0dc56e 100644 --- a/i18npool/source/localedata/data/en_GB.xml +++ b/i18npool/source/localedata/data/en_GB.xml @@ -145,6 +145,9 @@ DD/MM/YYYY HH:MM:SS + + DD/MM/YYYY HH:MM + General diff --git a/i18npool/source/localedata/data/en_GH.xml b/i18npool/source/localedata/data/en_GH.xml index 888fae7738a5..ccda3d203d24 100644 --- a/i18npool/source/localedata/data/en_GH.xml +++ b/i18npool/source/localedata/data/en_GH.xml @@ -201,6 +201,9 @@ YYYY/MM/DD HH:MM:SS + + YYYY/MM/DD HH:MM + diff --git a/i18npool/source/localedata/data/en_JM.xml b/i18npool/source/localedata/data/en_JM.xml index c7ba05ea69b2..51dc9fb80f5c 100644 --- a/i18npool/source/localedata/data/en_JM.xml +++ b/i18npool/source/localedata/data/en_JM.xml @@ -201,6 +201,9 @@ DD/MM/YYYY HH:MM:SS + + DD/MM/YYYY HH:MM + diff --git a/i18npool/source/localedata/data/en_NA.xml b/i18npool/source/localedata/data/en_NA.xml index 0cae87b734fd..4322f2bb5afa 100644 --- a/i18npool/source/localedata/data/en_NA.xml +++ b/i18npool/source/localedata/data/en_NA.xml @@ -201,6 +201,9 @@ YYYY/MM/DD HH:MM:SS + + YYYY/MM/DD HH:MM + diff --git a/i18npool/source/localedata/data/en_US.xml b/i18npool/source/localedata/data/en_US.xml index f10f4e66dfb7..bed196f3cee7 100644 --- a/i18npool/source/localedata/data/en_US.xml +++ b/i18npool/source/localedata/data/en_US.xml @@ -207,36 +207,39 @@ MM/DD/YYYY HH:MM:SS + + MM/DD/YYYY HH:MM AM/PM + - + [~jewish]NNNND MMMM YYYY - + [~jewish]NNNNMMMM D YYYY - + [~jewish]NN MMMM D YYYY - + [~jewish]NN D MMMM YYYY - + [~jewish]D MMMM YYYY - + [~jewish]MMMM D YYYY - + [~jewish]D MMMM - + [~jewish]MMMM D - + [~jewish]MMMM YYYY - + [~jewish]MMMM diff --git a/i18npool/source/localedata/data/en_ZA.xml b/i18npool/source/localedata/data/en_ZA.xml index 3807110cda43..ec3990a72135 100644 --- a/i18npool/source/localedata/data/en_ZA.xml +++ b/i18npool/source/localedata/data/en_ZA.xml @@ -176,10 +176,10 @@ WW - + YY/MM/DD - + YYYY/MM/DD @@ -209,10 +209,13 @@ YYYY-MM-DD HH:MM:SS - + + YYYY-MM-DD HH:MM + + YY/MM/DD HH:MM - + YYYY/MM/DD HH:MM:SS diff --git a/i18npool/source/localedata/data/eo.xml b/i18npool/source/localedata/data/eo.xml index 24463821429f..4fb04f908328 100644 --- a/i18npool/source/localedata/data/eo.xml +++ b/i18npool/source/localedata/data/eo.xml @@ -144,6 +144,9 @@ YYYY-MM-DD HH:MM:SS + + YYYY-MM-DD HH:MM + Standard diff --git a/i18npool/source/localedata/data/es_AR.xml b/i18npool/source/localedata/data/es_AR.xml index 9dfcf760d6e1..84cc34e3bb70 100644 --- a/i18npool/source/localedata/data/es_AR.xml +++ b/i18npool/source/localedata/data/es_AR.xml @@ -195,6 +195,9 @@ DD/MM/AAAA HH:MM:SS + + DD/MM/AAAA HH:MM + diff --git a/i18npool/source/localedata/data/es_BO.xml b/i18npool/source/localedata/data/es_BO.xml index f45676480292..317ab9406abc 100644 --- a/i18npool/source/localedata/data/es_BO.xml +++ b/i18npool/source/localedata/data/es_BO.xml @@ -195,6 +195,9 @@ DD/MM/AAAA HH:MM:SS + + DD/MM/AAAA HH:MM + diff --git a/i18npool/source/localedata/data/es_CL.xml b/i18npool/source/localedata/data/es_CL.xml index 18d21394a528..3b1605b98ed3 100644 --- a/i18npool/source/localedata/data/es_CL.xml +++ b/i18npool/source/localedata/data/es_CL.xml @@ -195,6 +195,9 @@ DD/MM/AAAA HH:MM:SS + + DD/MM/AAAA HH:MM + diff --git a/i18npool/source/localedata/data/es_CO.xml b/i18npool/source/localedata/data/es_CO.xml index 5a1212f02a15..f7962ec6f169 100644 --- a/i18npool/source/localedata/data/es_CO.xml +++ b/i18npool/source/localedata/data/es_CO.xml @@ -195,6 +195,9 @@ DD/MM/AAAA HH:MM:SS + + DD/MM/AAAA HH:MM + diff --git a/i18npool/source/localedata/data/es_CR.xml b/i18npool/source/localedata/data/es_CR.xml index 0fcd25ad3675..23c204fac6c8 100644 --- a/i18npool/source/localedata/data/es_CR.xml +++ b/i18npool/source/localedata/data/es_CR.xml @@ -139,12 +139,15 @@ [HH]:MM:SS,00 - - D/MM/AAAA HH:MM + + D/MM/AA HH:MM DD/MM/AAAA HH:MM:SS + + D/MM/AAAA HH:MM + Estandar Estandar diff --git a/i18npool/source/localedata/data/es_DO.xml b/i18npool/source/localedata/data/es_DO.xml index e4f792cf4ee1..446219719b8a 100644 --- a/i18npool/source/localedata/data/es_DO.xml +++ b/i18npool/source/localedata/data/es_DO.xml @@ -144,6 +144,9 @@ DD/MM/AAAA HH:MM:SS + + DD/MM/AAAA HH:MM + Estandar diff --git a/i18npool/source/localedata/data/es_EC.xml b/i18npool/source/localedata/data/es_EC.xml index adec918e9ec1..eea5b1b73173 100644 --- a/i18npool/source/localedata/data/es_EC.xml +++ b/i18npool/source/localedata/data/es_EC.xml @@ -195,6 +195,9 @@ DD/MM/AAAA HH:MM:SS + + DD/MM/AAAA HH:MM + diff --git a/i18npool/source/localedata/data/es_ES.xml b/i18npool/source/localedata/data/es_ES.xml index ebbbcae1015e..15b25d937aab 100644 --- a/i18npool/source/localedata/data/es_ES.xml +++ b/i18npool/source/localedata/data/es_ES.xml @@ -195,6 +195,9 @@ DD/MM/AAAA HH:MM:SS + + DD/MM/AAAA HH:MM + diff --git a/i18npool/source/localedata/data/es_GT.xml b/i18npool/source/localedata/data/es_GT.xml index 935ea69710d2..5ef3985d0d30 100644 --- a/i18npool/source/localedata/data/es_GT.xml +++ b/i18npool/source/localedata/data/es_GT.xml @@ -144,6 +144,9 @@ DD/MM/AAAA HH:MM:SS + + DD/MM/AAAA HH:MM + Estandar diff --git a/i18npool/source/localedata/data/es_PE.xml b/i18npool/source/localedata/data/es_PE.xml index 2a2f0bd9e631..cf50595b913f 100644 --- a/i18npool/source/localedata/data/es_PE.xml +++ b/i18npool/source/localedata/data/es_PE.xml @@ -144,6 +144,9 @@ DD/MM/AAAA HH:MM:SS + + DD/MM/AAAA HH:MM + Estandar diff --git a/i18npool/source/localedata/data/es_SV.xml b/i18npool/source/localedata/data/es_SV.xml index 472e754cf007..af6a52c96e22 100644 --- a/i18npool/source/localedata/data/es_SV.xml +++ b/i18npool/source/localedata/data/es_SV.xml @@ -195,6 +195,9 @@ DD/MM/AAAA HH:MM:SS + + DD/MM/AAAA HH:MM + diff --git a/i18npool/source/localedata/data/et_EE.xml b/i18npool/source/localedata/data/et_EE.xml index 22a3403eae8f..219faf3990f4 100644 --- a/i18npool/source/localedata/data/et_EE.xml +++ b/i18npool/source/localedata/data/et_EE.xml @@ -198,6 +198,9 @@ DD.MM.YYYY HH:MM:SS + + DD.MM.YYYY HH:MM + &[before 1]T<š<<<Š<z<<<Z<ž<<<Ž&v<<<V<w<<<W&[before 1]X<õ<<<Õ<ä<<<Ä<ö<<<Ö<ü<<<Ü diff --git a/i18npool/source/localedata/data/eu_ES.xml b/i18npool/source/localedata/data/eu_ES.xml index d445a352be64..d10f385e04ef 100644 --- a/i18npool/source/localedata/data/eu_ES.xml +++ b/i18npool/source/localedata/data/eu_ES.xml @@ -195,6 +195,9 @@ YYYY/MM/DD HH:MM:SS + + YYYY/MM/DD HH:MM + diff --git a/i18npool/source/localedata/data/fa_IR.xml b/i18npool/source/localedata/data/fa_IR.xml index 10157072450e..5199c1efdaf3 100644 --- a/i18npool/source/localedata/data/fa_IR.xml +++ b/i18npool/source/localedata/data/fa_IR.xml @@ -190,12 +190,15 @@ [NatNum1][HH]:MM:SS٫00 - + [NatNum1][~persian]D MMM YYYY، ساعت HH:MM [NatNum1][~persian]D MMM YYYY، ساعت HH:MM:SS + + [NatNum1][~persian]D MMM YYYY، ساعت HH:MM + diff --git a/i18npool/source/localedata/data/fi_FI.xml b/i18npool/source/localedata/data/fi_FI.xml index a1fd1a40c834..cace5bcba575 100644 --- a/i18npool/source/localedata/data/fi_FI.xml +++ b/i18npool/source/localedata/data/fi_FI.xml @@ -195,6 +195,9 @@ PP.KK.VVVV TT:MM:SS + + PP.KK.VVVV TT:MM + diff --git a/i18npool/source/localedata/data/fo_FO.xml b/i18npool/source/localedata/data/fo_FO.xml index 69492ed7b88d..3b43a6a93099 100644 --- a/i18npool/source/localedata/data/fo_FO.xml +++ b/i18npool/source/localedata/data/fo_FO.xml @@ -144,6 +144,9 @@ DD-MM-YYYY HH:MM:SS + + DD-MM-YYYY HH:MM + Standard diff --git a/i18npool/source/localedata/data/fr_BE.xml b/i18npool/source/localedata/data/fr_BE.xml index ab44284a7494..d71c2410e3c9 100644 --- a/i18npool/source/localedata/data/fr_BE.xml +++ b/i18npool/source/localedata/data/fr_BE.xml @@ -195,6 +195,9 @@ JJ/MM/AAAA HH:MM:SS + + JJ/MM/AAAA HH:MM + diff --git a/i18npool/source/localedata/data/fr_BF.xml b/i18npool/source/localedata/data/fr_BF.xml index c442a93ceea7..72ccc852f0da 100644 --- a/i18npool/source/localedata/data/fr_BF.xml +++ b/i18npool/source/localedata/data/fr_BF.xml @@ -189,6 +189,9 @@ DD/MM/YYYY HH:MM:SS AM/PM + + DD/MM/YYYY HH:MM + diff --git a/i18npool/source/localedata/data/fr_CA.xml b/i18npool/source/localedata/data/fr_CA.xml index ece903391d59..25e81ab7462b 100644 --- a/i18npool/source/localedata/data/fr_CA.xml +++ b/i18npool/source/localedata/data/fr_CA.xml @@ -191,12 +191,15 @@ [HH]:MM:SS,00 - + AAAA-MM-JJ HH:MM AAAA-MM-JJ HH:MM:SS + + AAAA-MM-JJ HH:MM + diff --git a/i18npool/source/localedata/data/fr_CH.xml b/i18npool/source/localedata/data/fr_CH.xml index 09e2656ae525..d6c0ac34b024 100644 --- a/i18npool/source/localedata/data/fr_CH.xml +++ b/i18npool/source/localedata/data/fr_CH.xml @@ -196,6 +196,9 @@ JJ.MM.AAAA HH:MM:SS + + JJ.MM.AAAA HH:MM + diff --git a/i18npool/source/localedata/data/fr_FR.xml b/i18npool/source/localedata/data/fr_FR.xml index 9720eac24300..ac7e17710cf9 100644 --- a/i18npool/source/localedata/data/fr_FR.xml +++ b/i18npool/source/localedata/data/fr_FR.xml @@ -197,6 +197,9 @@ JJ/MM/AAAA HH:MM:SS + + JJ/MM/AAAA HH:MM + diff --git a/i18npool/source/localedata/data/fr_LU.xml b/i18npool/source/localedata/data/fr_LU.xml index 63118c3e425f..d470fc64a930 100644 --- a/i18npool/source/localedata/data/fr_LU.xml +++ b/i18npool/source/localedata/data/fr_LU.xml @@ -195,6 +195,9 @@ JJ/MM/AAAA HH:MM:SS + + JJ/MM/AAAA HH:MM + diff --git a/i18npool/source/localedata/data/fur_IT.xml b/i18npool/source/localedata/data/fur_IT.xml index 58aee59db349..24d92f5d1f87 100644 --- a/i18npool/source/localedata/data/fur_IT.xml +++ b/i18npool/source/localedata/data/fur_IT.xml @@ -189,12 +189,15 @@ [HH]:MM:SS,00 - + DD/MM/YY HH:MM DD/MM/YYYY HH:MM:SS AM/PM + + DD/MM/YYYY HH:MM + diff --git a/i18npool/source/localedata/data/fy_NL.xml b/i18npool/source/localedata/data/fy_NL.xml index 801edbd15190..8e144eb4f9ae 100644 --- a/i18npool/source/localedata/data/fy_NL.xml +++ b/i18npool/source/localedata/data/fy_NL.xml @@ -195,6 +195,9 @@ DD-MM-YYYY HH:MM:SS AM/PM + + DD-MM-YYYY HH:MM + diff --git a/i18npool/source/localedata/data/gd_GB.xml b/i18npool/source/localedata/data/gd_GB.xml index f0f95fc3263e..13c07a017ca3 100644 --- a/i18npool/source/localedata/data/gd_GB.xml +++ b/i18npool/source/localedata/data/gd_GB.xml @@ -203,6 +203,9 @@ DD/MM/YYYY HH:MM:SS + + DD/MM/YYYY HH:MM + diff --git a/i18npool/source/localedata/data/gl_ES.xml b/i18npool/source/localedata/data/gl_ES.xml index f3b4671a4af9..8693ae6e36ce 100644 --- a/i18npool/source/localedata/data/gl_ES.xml +++ b/i18npool/source/localedata/data/gl_ES.xml @@ -195,6 +195,9 @@ DD/MM/YYYY HH:MM:SS + + DD/MM/YYYY HH:MM + diff --git a/i18npool/source/localedata/data/gsc_FR.xml b/i18npool/source/localedata/data/gsc_FR.xml index bf8ba5dccb7e..795a1bba4df4 100644 --- a/i18npool/source/localedata/data/gsc_FR.xml +++ b/i18npool/source/localedata/data/gsc_FR.xml @@ -197,6 +197,9 @@ DD/MM/YYYY HH:MM:SS AM/PM + + DD/MM/YYYY HH:MM + diff --git a/i18npool/source/localedata/data/gug_PY.xml b/i18npool/source/localedata/data/gug_PY.xml index 4b78649d06bb..4734ac522a47 100644 --- a/i18npool/source/localedata/data/gug_PY.xml +++ b/i18npool/source/localedata/data/gug_PY.xml @@ -195,6 +195,9 @@ DD/MM/YYYY HH:MM:SS AM/PM + + DD/MM/YYYY HH:MM + diff --git a/i18npool/source/localedata/data/ha_Latn_GH.xml b/i18npool/source/localedata/data/ha_Latn_GH.xml index be2dff3095ac..3cbffc23b017 100644 --- a/i18npool/source/localedata/data/ha_Latn_GH.xml +++ b/i18npool/source/localedata/data/ha_Latn_GH.xml @@ -196,6 +196,9 @@ MM/DD/YYYY HH:MM:SS AM/PM + + MM/DD/YYYY HH:MM + diff --git a/i18npool/source/localedata/data/ha_Latn_NG.xml b/i18npool/source/localedata/data/ha_Latn_NG.xml index cfb635b756d7..b2bf24b164ce 100644 --- a/i18npool/source/localedata/data/ha_Latn_NG.xml +++ b/i18npool/source/localedata/data/ha_Latn_NG.xml @@ -196,6 +196,9 @@ DD/MM/YYYY HH:MM:SS + + DD/MM/YYYY HH:MM + diff --git a/i18npool/source/localedata/data/haw_US.xml b/i18npool/source/localedata/data/haw_US.xml index 97d1558257a5..2fb5d01c0ed0 100644 --- a/i18npool/source/localedata/data/haw_US.xml +++ b/i18npool/source/localedata/data/haw_US.xml @@ -195,6 +195,9 @@ YYYY/MM/DD HH:MM:SS AM/PM + + YYYY/MM/DD HH:MM + diff --git a/i18npool/source/localedata/data/he_IL.xml b/i18npool/source/localedata/data/he_IL.xml index 3793796327f6..277485badef4 100644 --- a/i18npool/source/localedata/data/he_IL.xml +++ b/i18npool/source/localedata/data/he_IL.xml @@ -117,13 +117,13 @@ WW - + [NatNum2][~jewish]YY - + [NatNum2][~jewish]NNN DD MMMM YY - + [NatNum2][~jewish]"יום "NN"׳ "DD MMMM YY @@ -153,6 +153,9 @@ DD/MM/YYYY HH:MM:SS + + DD/MM/YYYY HH:MM + General @@ -171,10 +174,10 @@ #,###.00 - + [natnum1]0 - + [natnum2]0 diff --git a/i18npool/source/localedata/data/hi_IN.xml b/i18npool/source/localedata/data/hi_IN.xml index 6a6d89e88fdb..eaf88ca57364 100644 --- a/i18npool/source/localedata/data/hi_IN.xml +++ b/i18npool/source/localedata/data/hi_IN.xml @@ -144,6 +144,9 @@ MM-DD-YYYY HH:MM:SS + + MM-DD-YYYY HH:MM + Standard diff --git a/i18npool/source/localedata/data/hil_PH.xml b/i18npool/source/localedata/data/hil_PH.xml index 3c11f9c29119..acd73bc1aea8 100644 --- a/i18npool/source/localedata/data/hil_PH.xml +++ b/i18npool/source/localedata/data/hil_PH.xml @@ -195,6 +195,9 @@ MM/DD/YYYY HH:MM:SS AM/PM + + MM/DD/YYYY HH:MM + diff --git a/i18npool/source/localedata/data/hr_HR.xml b/i18npool/source/localedata/data/hr_HR.xml index cc121dd90400..0c493131e16b 100644 --- a/i18npool/source/localedata/data/hr_HR.xml +++ b/i18npool/source/localedata/data/hr_HR.xml @@ -198,16 +198,19 @@ DD.MM.YYYY HH:MM:SS AM/PM - + + DD.MM.YYYY HH:MM + + #.##0,00;[RED]-#.##0,00 - + #.###,00;[RED]-#.###,00 - + DD. MM. YYYY. - + MM/YY diff --git a/i18npool/source/localedata/data/hsb_DE.xml b/i18npool/source/localedata/data/hsb_DE.xml index 92e4eaeb01d7..3e150e96096a 100644 --- a/i18npool/source/localedata/data/hsb_DE.xml +++ b/i18npool/source/localedata/data/hsb_DE.xml @@ -195,6 +195,9 @@ DD.MM.YYYY HH:MM:SS AM/PM + + DD.MM.YYYY HH:MM + diff --git a/i18npool/source/localedata/data/ht_HT.xml b/i18npool/source/localedata/data/ht_HT.xml index af400152a813..5a5e1464c4bf 100644 --- a/i18npool/source/localedata/data/ht_HT.xml +++ b/i18npool/source/localedata/data/ht_HT.xml @@ -195,6 +195,9 @@ DD/MM/YYYY HH:MM:SS AM/PM + + DD/MM/YYYY HH:MM + diff --git a/i18npool/source/localedata/data/hu_HU.xml b/i18npool/source/localedata/data/hu_HU.xml index e494c6404566..fcab23dd3646 100644 --- a/i18npool/source/localedata/data/hu_HU.xml +++ b/i18npool/source/localedata/data/hu_HU.xml @@ -83,7 +83,7 @@ 0,00E+00 - + ##0,00E+00 @@ -174,106 +174,106 @@ WW. - + [NatNum12 MMMM=abbreviation]YYYY". "MMMM D. - + [NatNum12 D=possessive]YYYY". "MMMM D - + [NatNum12 D=possessive-superessive]YYYY". "MMMM D - + [NatNum12 D=possessive-ablative]YYYY". "MMMM D - + [NatNum12 D=possessive-terminative]YYYY". "MMMM D - + [NatNum12 D=possessive-adjective]YYYY". "MMMM D - + [NatNum12 D=possessive-superessive,NNN=superessive]YYYY". "MMMM D, NNN - + [NatNum12 D=possessive]MMMM" "D - + [NatNum12 D=possessive-superessive]MMMM" "D - + [NatNum12 D=possessive-ablative]MMMM" "D - + [NatNum12 D=possessive-terminative]MMMM" "D - + [NatNum12 MMMM=article,D=possessive-adjective]MMMM" "D - + [NatNum12 MMMM=capitalize article,D=possessive-adjective]MMMM" "D - + [NatNum12 MMMM=article,D=adjective]MMMM" "D - + [NatNum12 MMMM=capitalize article,D=adjective]MMMM" "D - + [NatNum12 MMMM=article]MMMM"i" - + [NatNum12 MMMM=capitalize article]MMMM"i" - + [NatNum12 superessive]NNN - + [NatNum12 ablative]NNN - + [NatNum12 terminative]NNN - + [NatNum12 inessive]YYYY - + [NatNum12 ablative]YYYY - + [NatNum12 article]MMMM - + [NatNum12 capitalize article]MMMM - + [NatNum12 inessive]MMMM - + [NatNum12 article inessive]MMMM - + [NatNum12 capitalize article inessive]MMMM - + [NatNum12 ablative]MMMM - + [NatNum12 article ablative]MMMM - + [NatNum12 capitalize article ablative]MMMM - + [NatNum12 MMMM=possessive-inessive]YYYY" "MMMM - + [NatNum12 MMMM=possessive-ablative]YYYY" "MMMM - + [NatNum12 MMMM=possessive-terminative]YYYY" "MMMM - + [NatNum12 ordinal year]YYYY @@ -303,6 +303,9 @@ YYYY.MM.DD. HH:MM:SS + + YYYY.MM.DD. HH:MM + diff --git a/i18npool/source/localedata/data/hy_AM.xml b/i18npool/source/localedata/data/hy_AM.xml index 7329a8b3aeb9..48a45026e424 100644 --- a/i18npool/source/localedata/data/hy_AM.xml +++ b/i18npool/source/localedata/data/hy_AM.xml @@ -195,6 +195,9 @@ DD/MM/YYYY HH:MM:SS + + DD/MM/YYYY HH:MM + diff --git a/i18npool/source/localedata/data/ia.xml b/i18npool/source/localedata/data/ia.xml index fdd9d682cd6a..877d6f2f9cb2 100644 --- a/i18npool/source/localedata/data/ia.xml +++ b/i18npool/source/localedata/data/ia.xml @@ -144,6 +144,9 @@ DD/MM/YYYY HH:MM:SS + + DD/MM/YYYY HH:MM + Standard diff --git a/i18npool/source/localedata/data/id_ID.xml b/i18npool/source/localedata/data/id_ID.xml index c1a555530a4c..e4024cbf4c13 100644 --- a/i18npool/source/localedata/data/id_ID.xml +++ b/i18npool/source/localedata/data/id_ID.xml @@ -195,6 +195,9 @@ DD/MM/YYYY HH:MM:SS + + DD/MM/YYYY HH:MM + diff --git a/i18npool/source/localedata/data/ilo_PH.xml b/i18npool/source/localedata/data/ilo_PH.xml index 0c8a96c6c633..109a3be61bf0 100644 --- a/i18npool/source/localedata/data/ilo_PH.xml +++ b/i18npool/source/localedata/data/ilo_PH.xml @@ -208,6 +208,9 @@ MM/DD/YYYY HH:MM:SS + + MM/DD/YYYY HH:MM AM/PM + diff --git a/i18npool/source/localedata/data/is_IS.xml b/i18npool/source/localedata/data/is_IS.xml index 98201f4b1dda..301799d4a5e9 100644 --- a/i18npool/source/localedata/data/is_IS.xml +++ b/i18npool/source/localedata/data/is_IS.xml @@ -181,6 +181,9 @@ DD.MM.YYYY HH:MM:SS + + DD.MM.YYYY HH:MM + diff --git a/i18npool/source/localedata/data/it_CH.xml b/i18npool/source/localedata/data/it_CH.xml index 6447d3c6eefb..2da786dd4201 100644 --- a/i18npool/source/localedata/data/it_CH.xml +++ b/i18npool/source/localedata/data/it_CH.xml @@ -195,6 +195,9 @@ GG.MM.AAAA HH:MM:SS + + GG.MM.AAAA HH:MM + diff --git a/i18npool/source/localedata/data/it_IT.xml b/i18npool/source/localedata/data/it_IT.xml index 4b1bd5567f7f..ab6822db85c5 100644 --- a/i18npool/source/localedata/data/it_IT.xml +++ b/i18npool/source/localedata/data/it_IT.xml @@ -189,12 +189,15 @@ [HH]:MM:SS,00 - + GG/MM/AA HH:MM GG/MM/AAAA HH:MM:SS + + GG/MM/AAAA HH:MM + diff --git a/i18npool/source/localedata/data/ja_JP.xml b/i18npool/source/localedata/data/ja_JP.xml index c15c665f2eab..280094564bd2 100644 --- a/i18npool/source/localedata/data/ja_JP.xml +++ b/i18npool/source/localedata/data/ja_JP.xml @@ -195,22 +195,22 @@ [HH]:MM:SS.00 - + H時MM分 - + H時MM分SS秒 - + YY/MM/DD HH:MM - + YYYY/M/D H:MM:SS - + YYYY/M/D H:MM - + GE.MM.DD diff --git a/i18npool/source/localedata/data/jbo.xml b/i18npool/source/localedata/data/jbo.xml index 4ba9aa2c3c31..c95304eb7381 100644 --- a/i18npool/source/localedata/data/jbo.xml +++ b/i18npool/source/localedata/data/jbo.xml @@ -195,6 +195,9 @@ DD/MM/YYYY HH:MM:SS AM/PM + + DD/MM/YYYY HH:MM + diff --git a/i18npool/source/localedata/data/ka_GE.xml b/i18npool/source/localedata/data/ka_GE.xml index 1d07b7a59eb5..777936160223 100644 --- a/i18npool/source/localedata/data/ka_GE.xml +++ b/i18npool/source/localedata/data/ka_GE.xml @@ -195,6 +195,9 @@ DD/MM/YYYY HH:MM:SS + + DD/MM/YYYY HH:MM + diff --git a/i18npool/source/localedata/data/kab_DZ.xml b/i18npool/source/localedata/data/kab_DZ.xml index b61fe80eb847..2c9f6b45bfdd 100644 --- a/i18npool/source/localedata/data/kab_DZ.xml +++ b/i18npool/source/localedata/data/kab_DZ.xml @@ -195,6 +195,9 @@ DD/MM/YYYY HH:MM:SS AM/PM + + DD/MM/YYYY HH:MM + diff --git a/i18npool/source/localedata/data/kk_KZ.xml b/i18npool/source/localedata/data/kk_KZ.xml index 88a6bd9fd63d..121ab7ac887e 100644 --- a/i18npool/source/localedata/data/kk_KZ.xml +++ b/i18npool/source/localedata/data/kk_KZ.xml @@ -195,6 +195,9 @@ DD.MM.YYYY HH:MM:SS AM/PM + + DD.MM.YYYY HH:MM + diff --git a/i18npool/source/localedata/data/kl_GL.xml b/i18npool/source/localedata/data/kl_GL.xml index e2053807a9b8..4789e090356f 100644 --- a/i18npool/source/localedata/data/kl_GL.xml +++ b/i18npool/source/localedata/data/kl_GL.xml @@ -195,6 +195,9 @@ DD-MM-YYYY HH:MM:SS + + DD-MM-YYYY HH:MM + diff --git a/i18npool/source/localedata/data/km_KH.xml b/i18npool/source/localedata/data/km_KH.xml index d532fc3ba34d..85d54607a22b 100644 --- a/i18npool/source/localedata/data/km_KH.xml +++ b/i18npool/source/localedata/data/km_KH.xml @@ -71,13 +71,13 @@ #.###,00 - + [NatNum1]0 - + [NatNum1]0,00 - + [NatNum1]#.###,00 @@ -89,10 +89,10 @@ ##0,00E+00 - + [NatNum1]0% - + [NatNum1]0,00% @@ -119,13 +119,13 @@ #.##0[CURRENCY].--;[RED]-#.##0[CURRENCY].-- - + [NatNum1]#.##0[CURRENCY];-#.##0[CURRENCY] - + [NatNum1]#.##0[CURRENCY].--;[RED]-#.##0[CURRENCY].-- - + [NatNum1]#.##0,00[CURRENCY];[RED]-#.##0,00[CURRENCY] @@ -219,6 +219,9 @@ DD/MM/YYYY HH:MM:SS + + DD/MM/YYYY HH:MM AM/PM + &ោ<ៅ<ុំ<ំ<ាំ<ះ<ាះ<ិះ<ីះ<ឹះ<ឺះ<ុះ<ូះ<ួះ<ើះ<ឿះ<ៀះ<េះ<ែះ<ៃះ<ោះ<ៅះ diff --git a/i18npool/source/localedata/data/kmr_Latn_TR.xml b/i18npool/source/localedata/data/kmr_Latn_TR.xml index a566c67170b9..6ac8d1e84d5a 100644 --- a/i18npool/source/localedata/data/kmr_Latn_TR.xml +++ b/i18npool/source/localedata/data/kmr_Latn_TR.xml @@ -196,6 +196,9 @@ DD-MM-YYYY HH:MM:SS + + MM/DD/YYYY HH:MM AM/PM + diff --git a/i18npool/source/localedata/data/kng_CG.xml b/i18npool/source/localedata/data/kng_CG.xml index e77af6924c4d..a897a11f050e 100644 --- a/i18npool/source/localedata/data/kng_CG.xml +++ b/i18npool/source/localedata/data/kng_CG.xml @@ -195,6 +195,9 @@ DD/MM/YYYY HH:MM:SS AM/PM + + DD/MM/YYYY HH:MM + diff --git a/i18npool/source/localedata/data/ko_KR.xml b/i18npool/source/localedata/data/ko_KR.xml index 9d5e397ee43b..a3e6121ba832 100644 --- a/i18npool/source/localedata/data/ko_KR.xml +++ b/i18npool/source/localedata/data/ko_KR.xml @@ -77,7 +77,7 @@ 0.00E+00 - + ##0.00E+00 @@ -168,88 +168,88 @@ "제"WW"주" - + YYYY"년" M"월" - + YYYY"년도 제"Q"사분기" - + YY"年" M"月" - + YYYY"年" M"月" - + [NatNum1]YYYY"年度 第"QQ"四分期" - + [NatNum1]YY"年度 第"QQ"四分期" - + M"月" - + "第"WW"週" - + YY-M - + YYYY-M - + YY/M/D NNNN - + YYYY/M/D NNNN - + YY/M - + M/D - + YYYY. M. D. - + YYYY. M. D. (NN) - + YYYY. M. D. NNNN - + [~hanja]YYYY. M. D. (NN) - + [~hanja]YYYY. M. D. NNNN - + YY. M. D. - + YY. M. D. (NN) - + YY. M. D. NNNN - + [~hanja]YY. M. D. (NN) - + [~hanja]YY. M. D. NNNN - + YY"년" M"월" D"일" (NN) - + YYYY"년" M"월" D"일" (NN) - + [~hanja]YYYY"年" M"月" D"日" (NN) - + [~hanja]YY"年" M"月" D"日" (NN) @@ -273,28 +273,28 @@ [H]:M:S.00 - + H"時" M"分" - + H:M - + H"時" M"分" S"秒" - + H:M:S - + [~hanja]AM/PM H"時" M"分" S"秒" - + AM/PM H:M:S - + [~hanja]AM/PM H"時" M"分" - + AM/PM H:M @@ -303,19 +303,22 @@ YYYY. M. D. H:M:S - + + YYYY"년" M"월" D"일" H"시" M"분" + + YYYY"년" M"월" D"일" H"시" M"분" S"초" - + YY"年" M"月" D"日" H"時" M"分" S"秒" - + YY/M/D H:M - + YY. M. D. H:M - + YYYY"年" M"月" D"日" H"時" M"分" S"秒" diff --git a/i18npool/source/localedata/data/ky_KG.xml b/i18npool/source/localedata/data/ky_KG.xml index 222e0e3a7ba0..6198c30478ec 100644 --- a/i18npool/source/localedata/data/ky_KG.xml +++ b/i18npool/source/localedata/data/ky_KG.xml @@ -195,6 +195,9 @@ DD.MM.YYYY HH:MM:SS + + DD.MM.YYYY HH:MM + diff --git a/i18npool/source/localedata/data/la_VA.xml b/i18npool/source/localedata/data/la_VA.xml index ee71bf2666e3..920dfb6df671 100644 --- a/i18npool/source/localedata/data/la_VA.xml +++ b/i18npool/source/localedata/data/la_VA.xml @@ -195,6 +195,9 @@ DD/MM/YYYY HH:MM:SS + + DD/MM/YYYY HH:MM + diff --git a/i18npool/source/localedata/data/lb_LU.xml b/i18npool/source/localedata/data/lb_LU.xml index 753beb8f0200..7f44bad128d7 100644 --- a/i18npool/source/localedata/data/lb_LU.xml +++ b/i18npool/source/localedata/data/lb_LU.xml @@ -195,6 +195,9 @@ DD.MM.YYYY HH:MM:SS + + DD.MM.YYYY HH:MM + diff --git a/i18npool/source/localedata/data/lg_UG.xml b/i18npool/source/localedata/data/lg_UG.xml index dab014cbedff..9108f9230468 100644 --- a/i18npool/source/localedata/data/lg_UG.xml +++ b/i18npool/source/localedata/data/lg_UG.xml @@ -195,6 +195,9 @@ YYYY/MM/DD HH:MM:SS + + YYYY/MM/DD HH:MM + diff --git a/i18npool/source/localedata/data/lgr_SB.xml b/i18npool/source/localedata/data/lgr_SB.xml index f1803479131f..30696798d362 100644 --- a/i18npool/source/localedata/data/lgr_SB.xml +++ b/i18npool/source/localedata/data/lgr_SB.xml @@ -179,6 +179,9 @@ YYYY-MM-DD HH:MM:SS AM/PM + + YYYY-MM-DD HH:MM + diff --git a/i18npool/source/localedata/data/lif_NP.xml b/i18npool/source/localedata/data/lif_NP.xml index b48ec7855c85..fb73e3586006 100644 --- a/i18npool/source/localedata/data/lif_NP.xml +++ b/i18npool/source/localedata/data/lif_NP.xml @@ -195,6 +195,9 @@ YYYY/MM/DD HH:MM:SS AM/PM + + YYYY/MM/DD HH:MM + diff --git a/i18npool/source/localedata/data/lij_IT.xml b/i18npool/source/localedata/data/lij_IT.xml index 0744e808031e..3eb20e9f14fb 100644 --- a/i18npool/source/localedata/data/lij_IT.xml +++ b/i18npool/source/localedata/data/lij_IT.xml @@ -189,12 +189,15 @@ [HH]:MM:SS,00 - + DD/MM/YY HH:MM DD/MM/YYYY HH:MM:SS + + DD/MM/YYYY HH:MM + diff --git a/i18npool/source/localedata/data/lld_IT.xml b/i18npool/source/localedata/data/lld_IT.xml index d6be649f9591..361d72367425 100644 --- a/i18npool/source/localedata/data/lld_IT.xml +++ b/i18npool/source/localedata/data/lld_IT.xml @@ -190,12 +190,15 @@ [HH]:MM:SS,00 - + DD/MM/YY HH:MM DD/MM/YYYY HH:MM:SS AM/PM + + DD/MM/YYYY HH:MM + diff --git a/i18npool/source/localedata/data/ln_CD.xml b/i18npool/source/localedata/data/ln_CD.xml index 70480cbae6ad..375d781a61af 100644 --- a/i18npool/source/localedata/data/ln_CD.xml +++ b/i18npool/source/localedata/data/ln_CD.xml @@ -195,6 +195,9 @@ DD-MM-YYYY HH:MM:SS AM/PM + + DD-MM-YYYY HH:MM + diff --git a/i18npool/source/localedata/data/lo_LA.xml b/i18npool/source/localedata/data/lo_LA.xml index 698e34c35820..a449a87605f3 100644 --- a/i18npool/source/localedata/data/lo_LA.xml +++ b/i18npool/source/localedata/data/lo_LA.xml @@ -168,7 +168,7 @@ WW - + NNNN"ວັນທີ" DD "ເດືອນ" MMMM "ປີ" YYYY @@ -198,6 +198,9 @@ MM/DD/YYYY HH:MM:SS + + DD/MM/YYYY "ວັນທີ" "ເດືອນ" "ປີ" HH"ໂມງ":MM"ນາທີ" + diff --git a/i18npool/source/localedata/data/locale.dtd b/i18npool/source/localedata/data/locale.dtd index e348fdc1905a..103ab1721c4e 100644 --- a/i18npool/source/localedata/data/locale.dtd +++ b/i18npool/source/localedata/data/locale.dtd @@ -156,8 +156,9 @@ - + HH"时"MM"分" - + HH"时"MM"分"SS"秒" - + AM/PM HH"时"MM"分" - + AM/PM HH"时"MM"分"SS"秒" - + [HH]"时"MM"分"SS"秒" - + MM"分"SS"秒"00 - + [HH]"时"MM"分"SS"秒"00 @@ -230,10 +230,13 @@ YYYY/MM/DD HH:MM:SS - + + YYYY"年"MM"月"D"日" HH"时"MM"分" + + M/D/YY HH:MM - + MM/DD/YYYY HH:MM:SS diff --git a/i18npool/source/localedata/data/zh_HK.xml b/i18npool/source/localedata/data/zh_HK.xml index ade663f6b3de..9b183028d00c 100644 --- a/i18npool/source/localedata/data/zh_HK.xml +++ b/i18npool/source/localedata/data/zh_HK.xml @@ -174,22 +174,22 @@ [HH]:MM:SS.00 - + HH"時"MM"分" - + HH"時"MM"分"SS"秒" - + AM/PM HH"時"MM"分" - + AM/PM HH"時"MM"分"SS"秒" - + [HH] "時"MM"分"SS"秒" - + MM"分"SS"秒"00 @@ -200,10 +200,13 @@ DD/MM/YYYY HH:MM:SS - + + YYYY"年"M"月"D"日" HH"時"MM"分" + + YY"年"M"月"D"日" HH"時"MM"分"SS"秒" - + D/M/YY HH:MM diff --git a/i18npool/source/localedata/data/zh_MO.xml b/i18npool/source/localedata/data/zh_MO.xml index 055136725050..92b7ff15eb88 100644 --- a/i18npool/source/localedata/data/zh_MO.xml +++ b/i18npool/source/localedata/data/zh_MO.xml @@ -173,22 +173,22 @@ [HH]:MM:SS.00 - + HH"時"MM"分" - + HH"時"MM"分"SS"秒" - + AM/PM HH"時"MM"分" - + AM/PM HH"時"MM"分"SS"秒" - + [HH] "時"MM"分"SS"秒" - + MM"分"SS"秒"00 @@ -198,13 +198,16 @@ DD/MM/YYYY HH:MM:SS - + + DD/MM/YYYY HH:MM + + YYYY"年"M"月"D"日" HH"時"MM"分"SS"秒" - + YY"年"M"月"D"日" HH"時"MM"分"SS"秒" - + D-M-YYYY diff --git a/i18npool/source/localedata/data/zh_SG.xml b/i18npool/source/localedata/data/zh_SG.xml index 6e51e2b029e0..646d1d35dee3 100644 --- a/i18npool/source/localedata/data/zh_SG.xml +++ b/i18npool/source/localedata/data/zh_SG.xml @@ -173,25 +173,25 @@ [HH]:MM:SS.00 - + HH"时"MM"分" - + HH"时"MM"分"SS"秒" - + AM/PM HH"时"MM"分" - + AM/PM HH"时"MM"分"SS"秒" - + [HH]"时"MM"分"SS"秒" - + MM"分"SS"秒"00 - + [HH]"时"MM"分"SS"秒"00 @@ -201,10 +201,13 @@ YYYY"年"MM"月"D"日"HH"时"MM"分"SS"秒" - + + YYYY"年"M"月"D"日"HH"时"MM"分" + + M/D/YY HH:MM - + MM/DD/YYYY HH:MM:SS diff --git a/i18npool/source/localedata/data/zh_TW.xml b/i18npool/source/localedata/data/zh_TW.xml index 164a664850a5..ae790e516f3f 100644 --- a/i18npool/source/localedata/data/zh_TW.xml +++ b/i18npool/source/localedata/data/zh_TW.xml @@ -83,7 +83,7 @@ 0.00E+00 - + ##0.00E+00 @@ -177,61 +177,61 @@ "第"WW"週" - + E/M/D - + GGEE"年"M"月"D"日" - + [NatNum1]GGEE"年"M"月"D"日" - + GGGEE"年"M"月"D"日" - + [NatNum1]GGGEE"年"M"月"D"日" - + GGEE"年"M"月"D"日 ("DDD")" - + GGGEE"年"M"月"D"日 ("DDD")" - + YYYY"年"M"月"D"日 ("DDD")" - + YYYY"年"M"月"D"日 "NNNN - + GGEE"年"M"月"D"日 "NNNN - + [NatNum1]GGEE"年"M"月"D"日 "NNNN - + GGGEE"年"M"月"D"日 "NNNN - + [NatNum1]GGGEE"年"M"月"D"日 "NNNN - + [NatNum1]EE"年"M"月" - + [NatNum1]GGEE"年"M"月" - + [NatNum1]GGGEE"年"M"月" - + YYYY"年"MM"月" - + [NatNum1]YYYY"年"MM"月" - + M"."D @@ -256,22 +256,22 @@ [HH]:MM:SS.00 - + HH"時"MM"分" - + HH"時"MM"分"SS"秒" - + AM/PM HH"時"MM"分" - + AM/PM HH"時"MM"分"SS"秒" - + [HH] "時"MM"分"SS"秒" - + MM"分"SS"秒"00 @@ -281,19 +281,22 @@ YYYY/MM/DD HH:MM:SS - + + YYYY/M/D HH:MM + + YYYY"年"M"月"D"日" HH"時"MM"分" - + YYYY"年"M"月"D"日" HH"時"MM"分"SS"秒" - + EE"年"M"月"D"日" HH"時"MM"分" - + GGEE"年"M"月"D"日" HH"時"MM"分" - + GGGEE"年"M"月"D"日" HH"時"MM"分" diff --git a/include/i18npool/reservedconstants.hxx b/include/i18npool/reservedconstants.hxx index 400344ce5a8d..6f707f83ac3d 100644 --- a/include/i18npool/reservedconstants.hxx +++ b/include/i18npool/reservedconstants.hxx @@ -12,10 +12,18 @@ /** Constant values shared between i18npool and, for example, the number formatter. */ namespace i18npool { +/** The number of predefined format code indices that must be defined by + locale data, except BOOLEAN and TEXT, exclusive. + This later in the build is static asserted to be equal to + NfIndexTableOffset::NF_INDEX_TABLE_RESERVED_START. */ +constexpr sal_Int16 nStopPredefinedFormatIndex = 51; + /** The number of reserved (with defined meaning) built-in format code indices, additional locale data format codes can be defined starting at this index - value. */ -constexpr sal_Int16 nFirstFreeFormatIndex = 60; + value. + This later in the build is static asserted to be greater or equal to + NfIndexTableOffset::NF_INDEX_TABLE_ENTRIES */ +constexpr sal_Int16 nFirstFreeFormatIndex = 66; } /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/include/svl/zforlist.hxx b/include/svl/zforlist.hxx index adbde81c9315..22689aa88c3d 100644 --- a/include/svl/zforlist.hxx +++ b/include/svl/zforlist.hxx @@ -136,7 +136,7 @@ namespace o3tl { Do NOT insert any new values! The values here correspond with those in offapi/com/sun/star/i18n/NumberFormatIndex.idl - You may append values though. + You may append values though after NF_INDEX_TABLE_LOCALE_DATA_DEFAULTS. */ enum NfIndexTableOffset { @@ -222,8 +222,8 @@ enum NfIndexTableOffset NF_INDEX_TABLE_LOCALE_DATA_DEFAULTS, // == 50, old number of predefined entries, i18npool locale data additions start after this - // From here on are values of new built-in formats that are not in the - // original NumberFormatIndex.idl + // From here on are values of new predefined and built-in formats that are + // not in the original NumberFormatIndex.idl // XXX Values appended here must also get a corresponding entry in // svl/source/numbers/zforlist.cxx indexTable[] in the same order. @@ -233,8 +233,16 @@ enum NfIndexTableOffset // formats, make new formats known to svx/source/items/numfmtsh.cxx // SvxNumberFormatShell::FillEListWithStd_Impl(), otherwise they will not // be listed at all. Yes that is ugly. + // DATETIME formats need to be added to + // SvxNumberFormatShell::FillEListWithDateTime_Impl(). - NF_FRACTION_3D = NF_INDEX_TABLE_LOCALE_DATA_DEFAULTS, // # ???/??? + // New predefined format added to i18npool locale data. + NF_DATETIME_SYS_DDMMYYYY_HHMM = NF_INDEX_TABLE_LOCALE_DATA_DEFAULTS, // 08.10.1997 01:23 formatindex="50" + + // No i18npool defined locale data between here and NF_INDEX_TABLE_ENTRIES. + NF_INDEX_TABLE_RESERVED_START, + + NF_FRACTION_3D = NF_INDEX_TABLE_RESERVED_START, // # ???/??? NF_FRACTION_2, // # ?/2 NF_FRACTION_4, // # ?/4 NF_FRACTION_8, // # ?/8 @@ -248,7 +256,7 @@ enum NfIndexTableOffset // XXX When adding values here, follow the comment above about // svx/source/items/numfmtsh.cxx - NF_INDEX_TABLE_ENTRIES // == 59, reserved up to #59 to not be used in i18npool locale data. + NF_INDEX_TABLE_ENTRIES // == 60, reserved to not be used in i18npool locale data. // XXX Adding values above may increment the reserved area that can't be // used by i18npool's locale data FormatCode definitions, see the diff --git a/include/svx/numfmtsh.hxx b/include/svx/numfmtsh.hxx index 9dc0b2b5c598..fe1193aee5a3 100644 --- a/include/svx/numfmtsh.hxx +++ b/include/svx/numfmtsh.hxx @@ -203,6 +203,8 @@ private: bool bSuppressDuplicates ); SVX_DLLPRIVATE short FillEListWithDateTime_Impl( std::vector& rList,short nSelPos, bool bSuppressDuplicates ); + SVX_DLLPRIVATE void FillEListWithOneDateTime_Impl( std::vector& rList, short & nSelPos, + bool bSuppressDuplicates, NfIndexTableOffset nOffset ); SVX_DLLPRIVATE short FillEListWithCurrency_Impl( std::vector& rList,short nSelPos); SVX_DLLPRIVATE short FillEListWithSysCurrencys( std::vector& rList,short nSelPos); SVX_DLLPRIVATE short FillEListWithUserCurrencys( std::vector& rList,short nSelPos); diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx index df67f6cde921..dd03b0c9084e 100644 --- a/sc/source/core/tool/interpr1.cxx +++ b/sc/source/core/tool/interpr1.cxx @@ -2237,6 +2237,7 @@ void getFormatString(SvNumberFormatter* pFormatter, sal_uLong nFormat, OUString& case NF_DATE_SYS_DDMMM: rFmtStr = "D2"; break; case NF_DATE_SYS_MMYY: rFmtStr = "D3"; break; case NF_DATETIME_SYSTEM_SHORT_HHMM: + case NF_DATETIME_SYS_DDMMYYYY_HHMM: case NF_DATETIME_SYS_DDMMYYYY_HHMMSS: rFmtStr = "D4"; break; case NF_DATE_DIN_MMDD: rFmtStr = "D5"; break; diff --git a/svl/qa/unit/svl.cxx b/svl/qa/unit/svl.cxx index 8eb3cf4b6dfa..707754ac920f 100644 --- a/svl/qa/unit/svl.cxx +++ b/svl/qa/unit/svl.cxx @@ -220,6 +220,19 @@ void Test::testNumberFormat() nullptr }; +// Following aren't in range of NF_DATETIME_START and NF_DATETIME_END +// see enum NfIndexTableOffset in svl/inc/svl/zforlist.hxx + const char* pDateTimeExt1[] = { + "MM/DD/YYYY HH:MM AM/PM", + nullptr + }; + + const char* pDateTimeExt2[] = { + "YYYY-MM-DD HH:MM:SS", + "YYYY-MM-DD\"T\"HH:MM:SS", + nullptr + }; + const char* pBoolean[] = { "BOOLEAN", nullptr @@ -240,13 +253,15 @@ void Test::testNumberFormat() { NF_SCIENTIFIC_START, NF_SCIENTIFIC_END, 2, pScientific }, { NF_PERCENT_START, NF_PERCENT_END, 2, pPercent }, { NF_FRACTION_START, NF_FRACTION_END, 2, pFraction }, - { NF_FRACTION_3D, NF_FRACTION_100, 7, pFractionExt }, { NF_CURRENCY_START, NF_CURRENCY_END, 6, pCurrency }, { NF_DATE_START, NF_DATE_END, 21, pDate }, { NF_TIME_START, NF_TIME_END, 7, pTime }, { NF_DATETIME_START, NF_DATETIME_END, 2, pDateTime }, { NF_BOOLEAN, NF_BOOLEAN, 1, pBoolean }, - { NF_TEXT, NF_TEXT, 1, pText } + { NF_TEXT, NF_TEXT, 1, pText }, + { NF_DATETIME_SYS_DDMMYYYY_HHMM, NF_DATETIME_SYS_DDMMYYYY_HHMM, 1, pDateTimeExt1 }, + { NF_FRACTION_3D, NF_FRACTION_100, 7, pFractionExt }, + { NF_DATETIME_ISO_YYYYMMDD_HHMMSS, NF_DATETIME_ISO_YYYYMMDDTHHMMSS, 2, pDateTimeExt2 } }; SvNumberFormatter aFormatter(m_xContext, eLang); @@ -267,7 +282,7 @@ void Test::testNumberFormat() CPPUNIT_ASSERT_MESSAGE("Number format entry is expected, but doesn't exist.", p); OUString aCode = p->GetFormatstring(); - CPPUNIT_ASSERT_EQUAL( aCode.toUtf8() , OString( aTests[i].pCodes[j-nStart] ) ); + CPPUNIT_ASSERT_EQUAL( OString( aTests[i].pCodes[j-nStart] ), aCode.toUtf8()); } } diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx index 7243d0f7105c..1e7738caaf20 100644 --- a/svl/source/numbers/zforlist.cxx +++ b/svl/source/numbers/zforlist.cxx @@ -93,11 +93,14 @@ using namespace ::std; static_assert( ZF_STANDARD_TEXT == NF_STANDARD_FORMAT_TEXT, "definition mismatch" ); +static_assert( NF_INDEX_TABLE_RESERVED_START == i18npool::nStopPredefinedFormatIndex, + "NfIndexTableOffset does not match i18npool's locale data predefined format code index bounds."); + static_assert( NF_INDEX_TABLE_ENTRIES <= i18npool::nFirstFreeFormatIndex, "NfIndexTableOffset crosses i18npool's locale data reserved format code index bounds.\n" "You will need to adapt all locale data files defining index values " "(formatIndex=\"...\") in that range and increment those and when done " - "adjust nFirstFreeFormatIndex in i18npool/reservedconstants.hxx"); + "adjust nFirstFreeFormatIndex in include/i18npool/reservedconstants.hxx"); /* Locale that is set if an unknown locale (from another system) is loaded of * legacy documents. Can not be SYSTEM because else, for example, a German "DM" @@ -156,6 +159,7 @@ static sal_uInt32 const indexTable[NF_INDEX_TABLE_ENTRIES] = { ZF_STANDARD_DATETIME + 1, // NF_DATETIME_SYS_DDMMYYYY_HHMMSS ZF_STANDARD_LOGICAL, // NF_BOOLEAN ZF_STANDARD_TEXT, // NF_TEXT + ZF_STANDARD_DATETIME + 4, // NF_DATETIME_SYS_DDMMYYYY_HHMM ZF_STANDARD_FRACTION + 2, // NF_FRACTION_3D ZF_STANDARD_FRACTION + 3, // NF_FRACTION_2 ZF_STANDARD_FRACTION + 4, // NF_FRACTION_4 @@ -1954,15 +1958,15 @@ SvNumberformat* SvNumberFormatter::ImpInsertFormat( const css::i18n::NumberForma sal_uInt32 nPos, bool bAfterChangingSystemCL, sal_Int16 nOrgIndex ) { - SAL_WARN_IF( NF_INDEX_TABLE_LOCALE_DATA_DEFAULTS <= rCode.Index && rCode.Index < NF_INDEX_TABLE_ENTRIES, + SAL_WARN_IF( NF_INDEX_TABLE_RESERVED_START <= rCode.Index && rCode.Index < NF_INDEX_TABLE_ENTRIES, "svl.numbers", "i18npool locale '" << maLanguageTag.getBcp47() << "' uses reserved formatIndex value " << rCode.Index << ", next free: " << NF_INDEX_TABLE_ENTRIES << " Please see description in include/svl/zforlist.hxx at end of enum NfIndexTableOffset"); - assert( (rCode.Index < NF_INDEX_TABLE_LOCALE_DATA_DEFAULTS || NF_INDEX_TABLE_ENTRIES <= rCode.Index) && + assert( (rCode.Index < NF_INDEX_TABLE_RESERVED_START || NF_INDEX_TABLE_ENTRIES <= rCode.Index) && "reserved formatIndex, see warning above"); OUString aCodeStr( rCode.Code ); - if ( rCode.Index < NF_INDEX_TABLE_LOCALE_DATA_DEFAULTS && + if ( rCode.Index < NF_INDEX_TABLE_RESERVED_START && rCode.Usage == css::i18n::KNumberFormatUsage::CURRENCY && rCode.Index != NF_CURRENCY_1000DEC2_CCC ) { // strip surrounding [$...] on automatic currency @@ -1999,7 +2003,7 @@ SvNumberformat* SvNumberFormatter::ImpInsertFormat( const css::i18n::NumberForma } return nullptr; } - if ( rCode.Index >= NF_INDEX_TABLE_LOCALE_DATA_DEFAULTS ) + if ( rCode.Index >= NF_INDEX_TABLE_RESERVED_START ) { sal_uInt32 nCLOffset = nPos - (nPos % SV_COUNTRY_LANGUAGE_OFFSET); sal_uInt32 nKey = ImpIsEntry( aCodeStr, nCLOffset, ActLnge ); @@ -2717,6 +2721,11 @@ void SvNumberFormatter::ImpGenerateFormats( sal_uInt32 CLOffset, bool bNoAdditio ImpInsertFormat( aFormatSeq[nIdx], CLOffset + ZF_STANDARD_DATETIME+1 /* NF_DATETIME_SYS_DDMMYYYY_HHMMSS */ ); + // DD.MM.YYYY HH:MM System + nIdx = ImpGetFormatCodeIndex( aFormatSeq, NF_DATETIME_SYS_DDMMYYYY_HHMM ); + ImpInsertFormat( aFormatSeq[nIdx], + CLOffset + ZF_STANDARD_DATETIME+4 /* NF_DATETIME_SYS_DDMMYYYY_HHMM */ ); + const NfKeywordTable & rKeyword = pFormatScanner->GetKeywords(); i18n::NumberFormatCode aSingleFormatCode; aSingleFormatCode.Usage = i18n::KNumberFormatUsage::DATE_TIME; @@ -2855,7 +2864,7 @@ void SvNumberFormatter::ImpGenerateAdditionalFormats( sal_uInt32 CLOffset, SAL_WARN( "svl.numbers", "ImpGenerateAdditionalFormats: too many formats" ); break; // for } - if ( rFormat.Index < NF_INDEX_TABLE_LOCALE_DATA_DEFAULTS && + if ( rFormat.Index < NF_INDEX_TABLE_RESERVED_START && rFormat.Index != NF_CURRENCY_1000DEC2_CCC ) { // Insert only if not already inserted, but internal index must be // above so ImpInsertFormat can distinguish it. @@ -2890,7 +2899,7 @@ void SvNumberFormatter::ImpGenerateAdditionalFormats( sal_uInt32 CLOffset, SAL_WARN( "svl.numbers", "ImpGenerateAdditionalFormats: too many formats" ); break; // for } - if ( rFormat.Index >= NF_INDEX_TABLE_LOCALE_DATA_DEFAULTS ) + if ( rFormat.Index >= NF_INDEX_TABLE_RESERVED_START ) { if ( SvNumberformat* pNewFormat = ImpInsertFormat( rFormat, nPos+1, bAfterChangingSystemCL ) ) diff --git a/svx/source/items/numfmtsh.cxx b/svx/source/items/numfmtsh.cxx index 3a329b7181a4..e169319df799 100644 --- a/svx/source/items/numfmtsh.cxx +++ b/svx/source/items/numfmtsh.cxx @@ -661,41 +661,14 @@ short SvxNumberFormatShell::FillEListWithFormats_Impl(std::vector& rLi short SvxNumberFormatShell::FillEListWithDateTime_Impl(std::vector& rList, short nSelPos, bool bSuppressDuplicates) { - sal_uInt16 nMyType; - - sal_uInt32 nNFEntry; - OUString aNewFormNInfo; + // Add first, so a NF_DATETIME_SYSTEM_SHORT_HHMM may be suppressed in + // locales that do not use 2-digit years there and this here is the + // default. + FillEListWithOneDateTime_Impl( rList, nSelPos, bSuppressDuplicates, NF_DATETIME_SYS_DDMMYYYY_HHMM); for (long nIndex = NF_DATETIME_START; nIndex <= NF_DATETIME_END; ++nIndex) { - nNFEntry = pFormatter->GetFormatIndex(static_cast(nIndex), eCurLanguage); - - const SvNumberformat* pNumEntry = pFormatter->GetEntry(nNFEntry); - if (pNumEntry != nullptr) - { - SvNumFormatType nMyCat = pNumEntry->GetMaskedType(); - CategoryToPos_Impl(nMyCat, nMyType); - aNewFormNInfo = pNumEntry->GetFormatstring(); - - if (nNFEntry == nCurFormatKey) - { - nSelPos = (!IsRemoved_Impl(nNFEntry)) ? aCurEntryList.size() : SELPOS_NONE; - } - - if (!bSuppressDuplicates || IsEssentialFormat_Impl(nMyCat, nNFEntry) - || std::find(rList.begin(), rList.end(), aNewFormNInfo) == rList.end()) - { - // Ugly hack to suppress an ISO date+time format that is the - // default date+time format of the locale and identical to the - // internally generated one to be added below. - if (!bSuppressDuplicates || (aNewFormNInfo != "YYYY-MM-DD HH:MM:SS" - && aNewFormNInfo != "YYYY-MM-DD\"T\"HH:MM:SS")) - { - rList.push_back(aNewFormNInfo); - aCurEntryList.push_back(nNFEntry); - } - } - } + FillEListWithOneDateTime_Impl( rList, nSelPos, bSuppressDuplicates, static_cast(nIndex)); } // Always add the internally generated ISO formats. @@ -705,6 +678,40 @@ short SvxNumberFormatShell::FillEListWithDateTime_Impl(std::vector& rL return nSelPos; } +void SvxNumberFormatShell::FillEListWithOneDateTime_Impl(std::vector& rList, short & nSelPos, + bool bSuppressDuplicates, NfIndexTableOffset nOffset) +{ + sal_uInt32 nNFEntry = pFormatter->GetFormatIndex(nOffset, eCurLanguage); + + const SvNumberformat* pNumEntry = pFormatter->GetEntry(nNFEntry); + if (pNumEntry == nullptr) + return; + + SvNumFormatType nMyCat = pNumEntry->GetMaskedType(); + sal_uInt16 nMyType; + CategoryToPos_Impl(nMyCat, nMyType); + OUString aNewFormNInfo = pNumEntry->GetFormatstring(); + + if (nNFEntry == nCurFormatKey) + { + nSelPos = (!IsRemoved_Impl(nNFEntry)) ? aCurEntryList.size() : SELPOS_NONE; + } + + if (!bSuppressDuplicates || IsEssentialFormat_Impl(nMyCat, nNFEntry) + || std::find(rList.begin(), rList.end(), aNewFormNInfo) == rList.end()) + { + // Ugly hack to suppress an ISO date+time format that is the + // default date+time format of the locale and identical to the + // internally generated one to be added after/below. + if (!bSuppressDuplicates || (aNewFormNInfo != "YYYY-MM-DD HH:MM:SS" + && aNewFormNInfo != "YYYY-MM-DD\"T\"HH:MM:SS")) + { + rList.push_back(aNewFormNInfo); + aCurEntryList.push_back(nNFEntry); + } + } +} + bool SvxNumberFormatShell::IsEssentialFormat_Impl(SvNumFormatType eType, sal_uInt32 nKey) { if (nKey == nCurFormatKey) @@ -719,6 +726,7 @@ bool SvxNumberFormatShell::IsEssentialFormat_Impl(SvNumFormatType eType, sal_uIn case NF_TIME_HH_MMSS: case NF_TIME_MMSS00: case NF_TIME_HH_MMSS00: + case NF_DATETIME_SYS_DDMMYYYY_HHMM: case NF_DATETIME_SYS_DDMMYYYY_HHMMSS: case NF_DATETIME_ISO_YYYYMMDD_HHMMSS: case NF_DATETIME_ISO_YYYYMMDDTHHMMSS: diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx index 7fc07dbb8120..569cc072231c 100644 --- a/xmloff/source/style/xmlnumfe.cxx +++ b/xmloff/source/style/xmlnumfe.cxx @@ -1125,7 +1125,8 @@ void SvXMLNumFmtExport::ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt eBuiltIn == NF_DATE_SYS_DMMMYY || eBuiltIn == NF_DATE_SYS_DMMMYYYY || eBuiltIn == NF_DATE_SYS_DMMMMYYYY || eBuiltIn == NF_DATE_SYS_NNDMMMYY || eBuiltIn == NF_DATE_SYS_NNDMMMMYYYY || eBuiltIn == NF_DATE_SYS_NNNNDMMMMYYYY || - eBuiltIn == NF_DATETIME_SYSTEM_SHORT_HHMM || eBuiltIn == NF_DATETIME_SYS_DDMMYYYY_HHMMSS ); + eBuiltIn == NF_DATETIME_SYSTEM_SHORT_HHMM || eBuiltIn == NF_DATETIME_SYS_DDMMYYYY_HHMM || + eBuiltIn == NF_DATETIME_SYS_DDMMYYYY_HHMMSS ); // format source (for date and time formats) // only used for some built-in formats diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx index d0b6a053aff6..5edbb3055201 100644 --- a/xmloff/source/style/xmlnumfi.cxx +++ b/xmloff/source/style/xmlnumfi.cxx @@ -338,6 +338,7 @@ static const SvXMLDefaultDateFormat aDefaultDateFormats[] = { NF_DATE_SYS_NNDMMMYY, XML_DEA_SHORT, XML_DEA_SHORT, XML_DEA_TEXTSHORT, XML_DEA_SHORT, XML_DEA_NONE, XML_DEA_NONE, XML_DEA_NONE, false }, { NF_DATE_SYS_NNDMMMMYYYY, XML_DEA_SHORT, XML_DEA_SHORT, XML_DEA_TEXTLONG, XML_DEA_LONG, XML_DEA_NONE, XML_DEA_NONE, XML_DEA_NONE, false }, { NF_DATE_SYS_NNNNDMMMMYYYY, XML_DEA_LONG, XML_DEA_SHORT, XML_DEA_TEXTLONG, XML_DEA_LONG, XML_DEA_NONE, XML_DEA_NONE, XML_DEA_NONE, false }, + { NF_DATETIME_SYS_DDMMYYYY_HHMM, XML_DEA_NONE, XML_DEA_ANY, XML_DEA_ANY, XML_DEA_LONG, XML_DEA_ANY, XML_DEA_ANY, XML_DEA_NONE, false }, { NF_DATETIME_SYSTEM_SHORT_HHMM, XML_DEA_NONE, XML_DEA_ANY, XML_DEA_ANY, XML_DEA_ANY, XML_DEA_ANY, XML_DEA_ANY, XML_DEA_NONE, true }, { NF_DATETIME_SYS_DDMMYYYY_HHMMSS, XML_DEA_NONE, XML_DEA_ANY, XML_DEA_ANY, XML_DEA_ANY, XML_DEA_ANY, XML_DEA_ANY, XML_DEA_ANY, false } }; @@ -1690,7 +1691,7 @@ sal_Int32 SvXMLNumFormatContext::CreateAndInsert(SvNumberFormatter* pFormatter) NfIndexTableOffset eFormat = static_cast(SvXMLNumFmtDefaults::GetDefaultDateFormat( eDateDOW, eDateDay, eDateMonth, eDateYear, eDateHours, eDateMins, eDateSecs, bFromSystem )); - if ( eFormat < NF_INDEX_TABLE_LOCALE_DATA_DEFAULTS ) + if ( eFormat < NF_INDEX_TABLE_RESERVED_START ) { // #109651# if a date format has the automatic-order attribute and // contains exactly the elements of one of the default date formats, -- cgit