summaryrefslogtreecommitdiff
path: root/include/svl
diff options
context:
space:
mode:
authorLászló Németh <nemeth@numbertext.org>2018-06-07 14:26:42 +0200
committerLászló Németh <nemeth@numbertext.org>2018-06-13 19:49:47 +0200
commit958c23246a3606f2cb33ad5c136127f951bbbc69 (patch)
tree425bfaa265d3e7700ffa22703b1a12b15cc94e85 /include/svl
parentcc46e7b9c75ddbcaaefde5f396ba76b0b866fa58 (diff)
tdf#115007 NatNum12 "spell out" formats in dates
to support variants of preposition, suffixation, article or their combination. For example, Catalan "de març"/"d'abril", English "1st of May"/"First of May" or Hungarian "május 1-je/május 2-a". When the date format contains more than a date keyword, it needs to specify in NatNum12 argument which date element needs special formatting by using libnumbertext: '[NatNum12 ordinal-number]D' -> "1st" '[NatNum12 D=ordinal-number]D" of "MMMM' -> "1st of April" '[NatNum12 D=ordinal]D" of "MMMM' -> "first of April" '[NatNum12 YYYY=year,D=ordinal]D" of "MMMM", "YYYY' -> "first of April, nineteen ninety" Note: set only for YYYY, MMMM, M, DDDD, D and NNN/AAAA in date formats. It's possible to extend this for other keywords and date + time combinations, as required. Note 2: default l10n date formats can use the new NatNum12 date formats, see FormatElement in i18npool/source/localedata/ XML files and FormatElement specification: https://opengrok.libreoffice.org/xref/core/i18npool/source/localedata/data/locale.dtd#223 Change-Id: I598849f1492f4012e83cef9293773badbff16206 Reviewed-on: https://gerrit.libreoffice.org/55613 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'include/svl')
-rw-r--r--include/svl/zformat.hxx7
1 files changed, 7 insertions, 0 deletions
diff --git a/include/svl/zformat.hxx b/include/svl/zformat.hxx
index 6357be2cea9d..dfab60c4beb3 100644
--- a/include/svl/zformat.hxx
+++ b/include/svl/zformat.hxx
@@ -699,6 +699,7 @@ private:
// transliterate according to NativeNumber
SVL_DLLPRIVATE OUString impTransliterateImpl(const OUString& rStr, const SvNumberNatNum& rNum) const;
SVL_DLLPRIVATE void impTransliterateImpl(OUStringBuffer& rStr, const SvNumberNatNum& rNum) const;
+ SVL_DLLPRIVATE OUString impTransliterateImpl(const OUString& rStr, const SvNumberNatNum& rNum, sal_uInt16 nDateKey) const;
OUString impTransliterate(const OUString& rStr, const SvNumberNatNum& rNum) const
{
@@ -712,6 +713,12 @@ private:
impTransliterateImpl(rStr, rNum);
}
}
+
+ OUString impTransliterate(const OUString& rStr, const SvNumberNatNum& rNum, sal_uInt16 nDateKey) const
+ {
+ return rNum.IsComplete() ? impTransliterateImpl(rStr, rNum, nDateKey) : rStr;
+ }
+
};
#endif // INCLUDED_SVL_ZFORMAT_HXX