diff options
| author | László Németh <nemeth@numbertext.org> | 2018-06-07 14:26:42 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2018-06-27 17:29:19 +0200 |
| commit | b435767f8953702bb5fe01edae3ad0abfbd2cacc (patch) | |
| tree | 9c80662e4c3a096b0d48d2c0a26f56939ffaa7cc /include | |
| parent | b491bb4b1e2eb6745ced3e958550ea8526cd2f2a (diff) | |
tdf#115007 add NatNum12 formatting to dates
to support variants of preposition, suffixation,
article or their combinations. For example, Catalan
"de març"/"d'abril", English "1st of May"/"First of
May", Hungarian "május 1-je/május 2-a" (May 1/2) or
Turkish "2018'de/2019'da" (in 2018/2019) usage can
be automatic in templates and mail merge.
When the date format contains more than a date keyword,
it needs to specify in the NatNum12 argument which date
element has got special formatting (described by
libnumbertext formatting codes, and an optional
initial capitalize/upper/title argument):
'[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=title year,D=capitalize 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, according to
the possible language requirements.
Note 2: l10n date formats can use the new NatNum12 date
formats from formatindex=60, 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>
Reviewed-on: https://gerrit.libreoffice.org/55767
Tested-by: Jenkins
Reviewed-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/svl/zformat.hxx | 7 |
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 |