diff options
| author | Eike Rathke <erack@redhat.com> | 2018-07-26 20:46:23 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2019-04-07 11:20:13 +0200 |
| commit | 585390e244b9d4fa5e0bd2afbee5ec27e223ac4d (patch) | |
| tree | 726cda30e45e327aa24b5db02d09ceb32b056047 /svl | |
| parent | 7de7cbfe6df37eb7d957b86f1d02a43e8306b5bf (diff) | |
Introduce next Japanese gengou era 'Reiwa'
Prepare for "Japan's Y2K" Gengou calendar era switch after 2019-04-30
The emperor Akihito will abdicate on 2019-04-30. The next emperor
will be Naruhito, but so far neither the new era name (Heisei for
Akihito) nor its abbreviation or a Unicode character are
determined. At least introduce the new era with some dummy names
(Naruhito,Na,N).
Change-Id: I8c0af390ca0408ac259e47e7eaf2e49b5889c9ba
Reviewed-on: https://gerrit.libreoffice.org/58142
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Jenkins
Introduce next Japanese gengou era 'Reiwa'
starting from 2019-05-01, which has been announced officially.
This fills the provisional slot acknowledged at
cacbb0faef77ae8462de9ff5c7307a6a2e28b2bb.
Change-Id: Ifb12e6afaad4c66d455f664b46ec946e80324e87
Reviewed-on: https://gerrit.libreoffice.org/70157
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Jenkins
Reviewed-on: https://gerrit.libreoffice.org/70185
Diffstat (limited to 'svl')
| -rw-r--r-- | svl/source/numbers/zformat.cxx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx index c42765160494..0284d1117736 100644 --- a/svl/source/numbers/zformat.cxx +++ b/svl/source/numbers/zformat.cxx @@ -3380,6 +3380,9 @@ void SvNumberformat::ImpAppendEraG( OUStringBuffer& OutString, case 4: cEra = 'H'; break; + case 5: + cEra = 'R'; + break; default: cEra = '?'; break; |