Kaydet (Commit) 597c5d75 authored tarafından Takeshi Abe's avatar Takeshi Abe Kaydeden (comit) Eike Rathke

Introduce next Japanese gengou era 'Reiwa'

starting from 2019-05-01, which has been announced officially.

This fills the provisional slot acknowledged at
cacbb0fa.

Change-Id: Ifb12e6afaad4c66d455f664b46ec946e80324e87
Reviewed-on: https://gerrit.libreoffice.org/70028
Tested-by: Jenkins
Reviewed-by: 's avatarEike Rathke <erack@redhat.com>
üst 66c08a0d
...@@ -209,7 +209,7 @@ static const Era gengou_eraArray[] = { ...@@ -209,7 +209,7 @@ static const Era gengou_eraArray[] = {
{1912, 7, 30, 0}, // Taisho {1912, 7, 30, 0}, // Taisho
{1926, 12, 25, 0}, // Showa {1926, 12, 25, 0}, // Showa
{1989, 1, 8, 0}, // Heisei {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} {0, 0, 0, 0}
}; };
Calendar_gengou::Calendar_gengou() : Calendar_gregorian(gengou_eraArray) Calendar_gengou::Calendar_gengou() : Calendar_gregorian(gengou_eraArray)
......
...@@ -481,11 +481,9 @@ ...@@ -481,11 +481,9 @@
<DefaultFullName>平成</DefaultFullName> <DefaultFullName>平成</DefaultFullName>
</Era> </Era>
<Era> <Era>
<!-- TODO: Naruhito is only the emperor's name, the era name and <EraID>Reiwa</EraID>
abbreviation and full name are not known yet (2018-07-26) --> <DefaultAbbrvName></DefaultAbbrvName>
<EraID>Naruhito</EraID> <DefaultFullName>令和</DefaultFullName>
<DefaultAbbrvName>Na</DefaultAbbrvName>
<DefaultFullName>Naruhito</DefaultFullName>
</Era> </Era>
</Eras> </Eras>
<StartDayOfWeek> <StartDayOfWeek>
......
...@@ -3476,7 +3476,7 @@ void SvNumberformat::ImpAppendEraG( OUStringBuffer& OutString, ...@@ -3476,7 +3476,7 @@ void SvNumberformat::ImpAppendEraG( OUStringBuffer& OutString,
cEra = 'H'; cEra = 'H';
break; break;
case 5: case 5:
cEra = 'N'; /* TODO: the real one letter era name is not known yet (2018-07-26) */ cEra = 'R';
break; break;
default: default:
cEra = '?'; cEra = '?';
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment