53 lines
2.0 KiB
Diff
53 lines
2.0 KiB
Diff
From e28ad442e73b00ae2047d89c8cc7f9b2a0de5436 Mon Sep 17 00:00:00 2001
|
|
From: TAMUKI Shoichi <tamuki@linet.gr.jp>
|
|
Date: Sat, 2 Mar 2019 21:00:28 +0900
|
|
Subject: [PATCH 11] ja_JP: Change the offset for Taisho gan-nen from 2 to 1
|
|
[BZ #24162]
|
|
|
|
The offset in era-string format for Taisho gan-nen (1912) is currently
|
|
defined as 2, but it should be 1. So fix it. "Gan-nen" means the 1st
|
|
(origin) year, Taisho started on July 30, 1912.
|
|
|
|
Reported-by: Morimitsu, Junji <junji.morimitsu@hpe.com>
|
|
Reviewed-by: Rafal Luzynski <digitalfreak@lingonborough.com>
|
|
|
|
ChangeLog:
|
|
|
|
[BZ #24162]
|
|
* localedata/locales/ja_JP (LC_TIME): Change the offset for Taisho
|
|
gan-nen from 2 to 1. Problem reported by Morimitsu, Junji.
|
|
|
|
(cherry picked from commit 31effacee2fc1b327bedc9a5fcb4b83f227c6539)
|
|
---
|
|
ChangeLog | 6 ++++++
|
|
localedata/locales/ja_JP | 2 +-
|
|
2 files changed, 7 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/ChangeLog b/ChangeLog
|
|
index 7111aeb149..048ca9644c 100644
|
|
--- a/ChangeLog
|
|
+++ b/ChangeLog
|
|
@@ -1,3 +1,9 @@
|
|
+2019-03-02 TAMUKI Shoichi <tamuki@linet.gr.jp>
|
|
+
|
|
+ [BZ #24162]
|
|
+ * localedata/locales/ja_JP (LC_TIME): Change the offset for Taisho
|
|
+ gan-nen from 2 to 1. Problem reported by Morimitsu, Junji.
|
|
+
|
|
2019-03-21 Stefan Liebler <stli@linux.ibm.com>
|
|
|
|
* sysdeps/s390/dl-procinfo.h (HWCAP_IMPORTANT):
|
|
diff --git a/localedata/locales/ja_JP b/localedata/locales/ja_JP
|
|
index 1fd2fee44b..9bfbb2bb9b 100644
|
|
--- a/localedata/locales/ja_JP
|
|
+++ b/localedata/locales/ja_JP
|
|
@@ -14951,7 +14951,7 @@ era "+:2:1990//01//01:+*:<U5E73><U6210>:%EC%Ey<U5E74>";/
|
|
"+:2:1927//01//01:1989//01//07:<U662D><U548C>:%EC%Ey<U5E74>";/
|
|
"+:1:1926//12//25:1926//12//31:<U662D><U548C>:%EC<U5143><U5E74>";/
|
|
"+:2:1913//01//01:1926//12//24:<U5927><U6B63>:%EC%Ey<U5E74>";/
|
|
- "+:2:1912//07//30:1912//12//31:<U5927><U6B63>:%EC<U5143><U5E74>";/
|
|
+ "+:1:1912//07//30:1912//12//31:<U5927><U6B63>:%EC<U5143><U5E74>";/
|
|
"+:6:1873//01//01:1912//07//29:<U660E><U6CBB>:%EC%Ey<U5E74>";/
|
|
"+:1:0001//01//01:1872//12//31:<U897F><U66A6>:%EC%Ey<U5E74>";/
|
|
"+:1:-0001//12//31:-*:<U7D00><U5143><U524D>:%EC%Ey<U5E74>"
|