You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ms...@apache.org on 2021/03/05 15:32:43 UTC

[openoffice] branch AOO42X updated: Added startdate Reiwa era to gengou_eraArray

This is an automated email from the ASF dual-hosted git repository.

mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git


The following commit(s) were added to refs/heads/AOO42X by this push:
     new e26a5ab  Added startdate Reiwa era to gengou_eraArray
e26a5ab is described below

commit e26a5ab37a26e0bf736f86289820851d252ec8bb
Author: DiGro <di...@yahoo.co.uk>
AuthorDate: Fri Mar 5 15:28:43 2021 +0100

    Added startdate Reiwa era to gengou_eraArray
    
    The startdate for the era Reiwa, that started May, 1 2019, needs to be added to the gengou_eraArray variable to get it show the correct date in Jp localization
    (cherry picked from commit ca5aee89f915a1c23d6e35736bc5cfe0735a8500)
---
 main/i18npool/source/calendar/calendar_gregorian.cxx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/main/i18npool/source/calendar/calendar_gregorian.cxx b/main/i18npool/source/calendar/calendar_gregorian.cxx
index fcf68ca..36c4245 100644
--- a/main/i18npool/source/calendar/calendar_gregorian.cxx
+++ b/main/i18npool/source/calendar/calendar_gregorian.cxx
@@ -218,6 +218,7 @@ static Era gengou_eraArray[] = {
     {1912,  7, 30},
     {1926, 12, 25},
     {1989,  1,  8},
+    {2019,  5,  1},
     {0, 0,  0}
 };
 Calendar_gengou::Calendar_gengou() : Calendar_gregorian(gengou_eraArray)