i18npool/source/calendar/calendar_gregorian.cxx | 2 +-
i18npool/source/localedata/data/ja_JP.xml | 8 +++-----
svl/source/numbers/zformat.cxx | 2 +-
3 files changed, 5 insertions(+), 7 deletions(-)
New commits:
commit 597c5d75b8e72d429e096535334eaac7973455ef
Author: Takeshi Abe <t...@fixedpoint.jp>
AuthorDate: Mon Apr 1 11:44:32 2019 +0900
Commit: Eike Rathke <er...@redhat.com>
CommitDate: Tue Apr 2 22:54:49 2019 +0200
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/70028
Tested-by: Jenkins
Reviewed-by: Eike Rathke <er...@redhat.com>
diff --git a/i18npool/source/calendar/calendar_gregorian.cxx
b/i18npool/source/calendar/calendar_gregorian.cxx
index 4e4a14dc0079..662c84b897c9 100644
--- a/i18npool/source/calendar/calendar_gregorian.cxx
+++ b/i18npool/source/calendar/calendar_gregorian.cxx
@@ -209,7 +209,7 @@ static const Era gengou_eraArray[] = {
{1912, 7, 30, 0}, // Taisho
{1926, 12, 25, 0}, // Showa
{1989, 1, 8, 0}, // Heisei
- {2019, 5, 1, 0}, //(Naruhito) (TODO: real era name not known yet
(2018-07-26))
+ {2019, 5, 1, 0}, // Reiwa
{0, 0, 0, 0}
};
Calendar_gengou::Calendar_gengou() : Calendar_gregorian(gengou_eraArray)
diff --git a/i18npool/source/localedata/data/ja_JP.xml
b/i18npool/source/localedata/data/ja_JP.xml
index fe4c247485f9..c15c665f2eab 100644
--- a/i18npool/source/localedata/data/ja_JP.xml
+++ b/i18npool/source/localedata/data/ja_JP.xml
@@ -481,11 +481,9 @@
<DefaultFullName>平成</DefaultFullName>
</Era>
<Era>
- <!-- TODO: Naruhito is only the emperor's name, the era name and
- abbreviation and full name are not known yet (2018-07-26) -->
- <EraID>Naruhito</EraID>
- <DefaultAbbrvName>Na</DefaultAbbrvName>
- <DefaultFullName>Naruhito</DefaultFullName>
+ <EraID>Reiwa</EraID>
+ <DefaultAbbrvName>令</DefaultAbbrvName>
+ <DefaultFullName>令和</DefaultFullName>
</Era>
</Eras>
<StartDayOfWeek>
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index db066e136c06..daa9791dba3c 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -3476,7 +3476,7 @@ void SvNumberformat::ImpAppendEraG( OUStringBuffer&
OutString,
cEra = 'H';
break;
case 5:
- cEra = 'N'; /* TODO: the real one letter era name is not known
yet (2018-07-26) */
+ cEra = 'R';
break;
default:
cEra = '?';
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
