summaryrefslogtreecommitdiff
path: root/i18npool/source/calendar
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2018-07-26 20:46:23 +0200
committerEike Rathke <erack@redhat.com>2018-07-27 10:50:15 +0200
commitcacbb0faef77ae8462de9ff5c7307a6a2e28b2bb (patch)
tree4eb77b9ccacc944030dfa32f0c179aaef27376a5 /i18npool/source/calendar
parenta0a8c958e358d93bb84e26e307d95df05be7f31a (diff)
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
Diffstat (limited to 'i18npool/source/calendar')
-rw-r--r--i18npool/source/calendar/calendar_gregorian.cxx9
1 files changed, 5 insertions, 4 deletions
diff --git a/i18npool/source/calendar/calendar_gregorian.cxx b/i18npool/source/calendar/calendar_gregorian.cxx
index a4ac0acfe53d..056d25dd2823 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}, //(Naruhito) (TODO: real era name not known yet (2018-07-26))
{0, 0, 0, 0}
};
Calendar_gengou::Calendar_gengou() : Calendar_gregorian(gengou_eraArray)