summaryrefslogtreecommitdiff
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
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
-rw-r--r--i18npool/source/calendar/calendar_gregorian.cxx9
-rw-r--r--i18npool/source/localedata/data/ja_JP.xml7
-rw-r--r--svl/source/numbers/zformat.cxx3
3 files changed, 15 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)
diff --git a/i18npool/source/localedata/data/ja_JP.xml b/i18npool/source/localedata/data/ja_JP.xml
index 7d7526062799..fe4c247485f9 100644
--- a/i18npool/source/localedata/data/ja_JP.xml
+++ b/i18npool/source/localedata/data/ja_JP.xml
@@ -480,6 +480,13 @@
<DefaultAbbrvName>平</DefaultAbbrvName>
<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>
+ </Era>
</Eras>
<StartDayOfWeek>
<DayID>sun</DayID>
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index 53e7a02e9acf..213e83a60a8c 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 = 'N'; /* TODO: the real one letter era name is not known yet (2018-07-26) */
+ break;
default:
cEra = '?';
break;