From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 34918 invoked by alias); 23 Mar 2019 05:53:39 -0000 Mailing-List: contact libc-stable-help@sourceware.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Subscribe: List-Archive: Sender: libc-stable-owner@sourceware.org Received: (qmail 34908 invoked by uid 89); 23 Mar 2019 05:53:39 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Checked: by ClamAV 0.100.2 on sourceware.org X-Virus-Found: No X-Spam-SWARE-Status: No, score=-21.1 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 spammy=HX-Languages-Length:1902 X-Spam-Status: No, score=-21.1 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on sourceware.org X-Spam-Level: X-HELO: mail.linet.jp Received: from annex.linet.gr.jp (HELO mail.linet.jp) (182.163.76.19) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sat, 23 Mar 2019 05:53:37 +0000 Received: from tamuki.linet.gr.jp (KD111239253047.au-net.ne.jp [111.239.253.47]) by mail.linet.jp (Postfix) with ESMTP id 91A061E7876F; Sat, 23 Mar 2019 14:53:26 +0900 (JST) Message-Id: <201903230552.AA04298@tamuki.linet.gr.jp> From: TAMUKI Shoichi Date: Tue, 01 Jan 2019 00:00:00 -0000 To: libc-stable@sourceware.org Subject: [2.29 COMMITTED] ja_JP: Change the offset for Taisho gan-nen from 2 to 1 [BZ #24162] MIME-Version: 1.0 X-Mailer: AL-Mail32 Version 1.13 Content-Type: text/plain; charset=us-ascii X-SW-Source: 2019-03/txt/msg00014.txt.bz2 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 Reviewed-by: Rafal Luzynski 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 + + [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 * 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:+*::%EC%Ey";/ "+:2:1927//01//01:1989//01//07::%EC%Ey";/ "+:1:1926//12//25:1926//12//31::%EC";/ "+:2:1913//01//01:1926//12//24::%EC%Ey";/ - "+:2:1912//07//30:1912//12//31::%EC";/ + "+:1:1912//07//30:1912//12//31::%EC";/ "+:6:1873//01//01:1912//07//29::%EC%Ey";/ "+:1:0001//01//01:1872//12//31::%EC%Ey";/ "+:1:-0001//12//31:-*::%EC%Ey" -- 2.12.2