[Libreoffice-commits] core.git: Branch 'libreoffice-6-2-3' - i18npool/source svl/source

[Takeshi Abe (via logerrit)]

 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 970b34a83fcec4feed79418cfb4a9246acb1648a
Author:     Takeshi Abe <tabe at fixedpoint.jp>
AuthorDate: Mon Apr 1 11:44:32 2019 +0900
Commit:     Adolfo Jayme Barrientos <fitojb at ubuntu.com>
CommitDate: Wed Apr 3 16:28:06 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/70157
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Jenkins
    (cherry picked from commit 70bfc2174cd5ac6678ecd43b0d325398e0320a03)
    Reviewed-on: https://gerrit.libreoffice.org/70184
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
    Tested-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

diff --git a/i18npool/source/calendar/calendar_gregorian.cxx b/i18npool/source/calendar/calendar_gregorian.cxx
index b8f1d15ee66f..cc15c9c40f6e 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 bad3b224089c..eb96820c9892 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -3454,7 +3454,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 = '?';