diff options
| author | Eike Rathke <erack@redhat.com> | 2021-05-14 22:58:24 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2021-05-15 00:35:24 +0200 |
| commit | 84df9a567aa35ff84b2bd6f53432cf8ea9f4b218 (patch) | |
| tree | c40d3c99ae7d6084fd640901a5380293ef232f4f /svl | |
| parent | 141f3e101508e7d0a83bd34a5cf48673fe91e44c (diff) | |
Related: tdf#128314 tdf#137349 Support NatNum12 for all day and month names
Specifically capitalize, upper, lower, title.
(Of which lower is still to be added).
Change-Id: Ic3c44606b0fa6a39c332ab6a448c8d2280df877e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115638
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Jenkins
Diffstat (limited to 'svl')
| -rw-r--r-- | svl/source/numbers/zformat.cxx | 35 |
1 files changed, 21 insertions, 14 deletions
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx index de73817ff474..fd1776bb1cd9 100644 --- a/svl/source/numbers/zformat.cxx +++ b/svl/source/numbers/zformat.cxx @@ -3666,6 +3666,8 @@ bool SvNumberformat::ImpGetDateOutput(double fNumber, // '[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. + // Additionally for MMMMM, MMM, DDD and NN/AA to support at least + // capitalize, upper, lower, title. // XXX It's possible to extend this for other keywords and date + time // combinations, as required. @@ -3717,30 +3719,23 @@ bool SvNumberformat::ImpGetDateOutput(double fNumber, sBuff.append(rCal.getDisplayString( CalendarDisplayCode::LONG_MONTH, nNatNum )); break; case NF_KEY_MMM: // MMM - sBuff.append(rCal.getDisplayString( ImpUseMonthCase( nUseMonthCase, NumFor[nIx], - static_cast<NfKeywordIndex>(rInfo.nTypeArray[i])), - nNatNum)); - break; case NF_KEY_MMMM: // MMMM - // NatNum12: support variants of preposition, suffixation or article + case NF_KEY_MMMMM: // MMMMM + // NatNum12: support variants of preposition, suffixation or + // article, or capitalize, upper, lower, title. // Note: result of the "spell out" conversion can depend from the optional // PartitiveMonths or GenitiveMonths defined in the locale data, // see description of ImpUseMonthCase(), and locale data in // i18npool/source/localedata/data/ and libnumbertext aStr = rCal.getDisplayString( ImpUseMonthCase( nUseMonthCase, NumFor[nIx], - static_cast<NfKeywordIndex>(rInfo.nTypeArray[i])), - nNatNum); + static_cast<NfKeywordIndex>(rInfo.nTypeArray[i])), + nNatNum); if ( bUseSpellout ) { aStr = impTransliterate(aStr, NumFor[nIx].GetNatNum(), rInfo.nTypeArray[i]); } sBuff.append(aStr); break; - case NF_KEY_MMMMM: // MMMMM - sBuff.append(rCal.getDisplayString( ImpUseMonthCase( nUseMonthCase, NumFor[nIx], - static_cast<NfKeywordIndex>(rInfo.nTypeArray[i])), - nNatNum)); - break; case NF_KEY_Q: // Q sBuff.append(rCal.getDisplayString( CalendarDisplayCode::SHORT_QUARTER, nNatNum )); break; @@ -3764,7 +3759,13 @@ bool SvNumberformat::ImpGetDateOutput(double fNumber, { SwitchToGregorianCalendar( aOrgCalendar, fOrgDateTime ); } - sBuff.append(rCal.getDisplayString( CalendarDisplayCode::SHORT_DAY_NAME, nNatNum )); + aStr = rCal.getDisplayString( CalendarDisplayCode::SHORT_DAY_NAME, nNatNum ); + // NatNum12: support at least capitalize, upper, lower, title + if ( bUseSpellout ) + { + aStr = impTransliterate(aStr, NumFor[nIx].GetNatNum(), rInfo.nTypeArray[i]); + } + sBuff.append(aStr); if ( bOtherCalendar ) { SwitchToOtherCalendar( aOrgCalendar, fOrgDateTime ); @@ -3846,7 +3847,13 @@ bool SvNumberformat::ImpGetDateOutput(double fNumber, break; case NF_KEY_NN: // NN case NF_KEY_AAA: // AAA - sBuff.append(rCal.getDisplayString( CalendarDisplayCode::SHORT_DAY_NAME, nNatNum )); + aStr = rCal.getDisplayString( CalendarDisplayCode::SHORT_DAY_NAME, nNatNum ); + // NatNum12: support at least capitalize, upper, lower, title + if ( bUseSpellout ) + { + aStr = impTransliterate(aStr, NumFor[nIx].GetNatNum(), rInfo.nTypeArray[i]); + } + sBuff.append(aStr); break; case NF_KEY_NNN: // NNN case NF_KEY_AAAA: // AAAA |