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/data/fa_IR.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'i18npool/source/localedata/data/fa_IR.xml') 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 + -- cgit v1.2.3