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

[Eike Rathke (via logerrit)]

 i18npool/source/calendar/calendar_gregorian.cxx |    9 +++++----
 i18npool/source/localedata/data/ja_JP.xml       |    5 +++++
 svl/source/numbers/zformat.cxx                  |    3 +++
 3 files changed, 13 insertions(+), 4 deletions(-)

New commits:
commit 39de7d73fdab86a1531f19076ab1d07fcff97b55
Author:     Eike Rathke <erack at redhat.com>
AuthorDate: Thu Jul 26 20:46:23 2018 +0200
Commit:     Xisco Faulí <xiscofauli at libreoffice.org>
CommitDate: Wed Apr 3 14:41:20 2019 +0200

    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 at 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 at redhat.com>
    Tested-by: Jenkins
    Reviewed-on: https://gerrit.libreoffice.org/70185

diff --git a/i18npool/source/calendar/calendar_gregorian.cxx b/i18npool/source/calendar/calendar_gregorian.cxx
index a4ac0acfe53d..7abef52e748b 100644
--- a/i18npool/source/calendar/calendar_gregorian.cxx
+++ b/i18npool/source/calendar/calendar_gregorian.cxx
@@ -205,10 +205,11 @@ Calendar_hanja::loadCalendar( const OUString& /*uniqueID*/, const css::lang::Loc
 }
 
 static const Era gengou_eraArray[] = {
-    {1868,  1,  1, 0},
-    {1912,  7, 30, 0},
-    {1926, 12, 25, 0},
-    {1989,  1,  8, 0},
+    {1868,  1,  1, 0},  // Meiji
+    {1912,  7, 30, 0},  // Taisho
+    {1926, 12, 25, 0},  // Showa
+    {1989,  1,  8, 0},  // Heisei
+    {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 7d7526062799..c15c665f2eab 100644
--- a/i18npool/source/localedata/data/ja_JP.xml
+++ b/i18npool/source/localedata/data/ja_JP.xml
@@ -480,6 +480,11 @@
           <DefaultAbbrvName>平</DefaultAbbrvName>
           <DefaultFullName>平成</DefaultFullName>
         </Era>
+        <Era>
+          <EraID>Reiwa</EraID>
+          <DefaultAbbrvName>令</DefaultAbbrvName>
+          <DefaultFullName>令和</DefaultFullName>
+        </Era>
       </Eras>
       <StartDayOfWeek>
         <DayID>sun</DayID>
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index c9bd3d814e90..e14413ce3fa7 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -3409,6 +3409,9 @@ void SvNumberformat::ImpAppendEraG( OUStringBuffer& OutString,
         case 4:
             cEra = 'H';
             break;
+        case 5:
+            cEra = 'R';
+            break;
         default:
             cEra = '?';
             break;