aboutsummaryrefslogtreecommitdiff
path: root/time
diff options
context:
space:
mode:
authorTAMUKI Shoichi <tamuki@linet.gr.jp>2019-04-02 16:46:55 +0900
committerTAMUKI Shoichi <tamuki@linet.gr.jp>2019-04-02 16:46:55 +0900
commit466afec30896585b60c2106df7a722a86247c9f3 (patch)
tree30e2ea30761f5bc47ca6324210e9a5b66fd93670 /time
parent84aea16929f310625a52bf9c3db3341f56970ab0 (diff)
downloadglibc-466afec30896585b60c2106df7a722a86247c9f3.tar
glibc-466afec30896585b60c2106df7a722a86247c9f3.tar.gz
glibc-466afec30896585b60c2106df7a722a86247c9f3.tar.bz2
glibc-466afec30896585b60c2106df7a722a86247c9f3.zip
ja_JP locale: Add entry for the new Japanese era [BZ #22964]
The Japanese era name will be changed on May 1, 2019. The Japanese government made a preliminary announcement on April 1, 2019. The glibc ja_JP locale must be updated to include the new era name for strftime's alternative year format support. Checked on x86_64-linux-gnu. Reviewed-by: Carlos O'Donell <carlos@redhat.com> ChangeLog: [BZ #22964] * localedata/locales/ja_JP (LC_TIME): Add entry for the new Japanese era. * time/tst-strftime2.c (dates): Add 2019-04-30 and 2019-05-01. (mkreftable): Add rules for the new Japanese era and the new dates.
Diffstat (limited to 'time')
-rw-r--r--time/tst-strftime2.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/time/tst-strftime2.c b/time/tst-strftime2.c
index 0f371d972b..18dbf1b32f 100644
--- a/time/tst-strftime2.c
+++ b/time/tst-strftime2.c
@@ -61,7 +61,9 @@ static const date_t dates[] =
{ 1, 4, 1997 },
{ 1, 4, 1998 },
{ 1, 4, 2010 },
- { 1, 4, 2011 }
+ { 1, 4, 2011 },
+ { 30, 4, 2019 },
+ { 1, 5, 2019 }
};
static char ref[array_length (locales)][array_length (formats)]
@@ -91,20 +93,20 @@ mkreftable (void)
static const int yrj[] =
{
43, 44, 45, 2,
- 63, 64, 1, 2, 9, 10, 22, 23
+ 63, 64, 1, 2, 9, 10, 22, 23, 31, 1
};
/* Buddhist calendar year to be checked. */
static const int yrb[] =
{
2453, 2454, 2455, 2456,
- 2531, 2532, 2532, 2533, 2540, 2541, 2553, 2554
+ 2531, 2532, 2532, 2533, 2540, 2541, 2553, 2554, 2562, 2562
};
/* R.O.C. calendar year to be checked. Negative number is prior to
Minguo counting up. */
static const int yrc[] =
{
-2, -1, 1, 2,
- 77, 78, 78, 79, 86, 87, 99, 100
+ 77, 78, 78, 79, 86, 87, 99, 100, 108, 108
};
for (i = 0; i < array_length (locales); i++)
@@ -116,7 +118,8 @@ mkreftable (void)
era = (is_before (k, 30, 7, 1912)) ? "\u660e\u6cbb"
: (is_before (k, 25, 12, 1926)) ? "\u5927\u6b63"
: (is_before (k, 8, 1, 1989)) ? "\u662d\u548c"
- : "\u5e73\u6210";
+ : (is_before (k, 1, 5, 2019)) ? "\u5e73\u6210"
+ : "\u4ee4\u548c";
yr = yrj[k], sfx = "\u5e74";
}
else if (i == lo_LA)