From: rxy <wikitech.rxy@rxy.jp>
Date: Mon, 1 Apr 2019 07:04:40 +0000 (+0900)
Subject: Add support for new Japanese era name "Reiwa"
X-Git-Tag: 1.31.2~20
X-Git-Url: http://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=32fc919220e83872ada63e5e4954d9b7402a66ce

Add support for new Japanese era name "Reiwa"

Bug: T219728
Change-Id: I28c26291c38e7e6c167011472236fb81a8adf032
---

diff --git a/RELEASE-NOTES-1.31 b/RELEASE-NOTES-1.31
index 901c83a5fc..621580a357 100644
--- a/RELEASE-NOTES-1.31
+++ b/RELEASE-NOTES-1.31
@@ -64,6 +64,7 @@ THIS IS NOT A RELEASE YET
   $wgBlockDisablesLogin is true.
 * (T216029) Chrome redirects to Special:BadTitle after editing a section with
   a non-Latin name on a page with non-Latin characters in title.
+* (T219728) Added support for new Japanese era name "Reiwa"
 
 == MediaWiki 1.31.1 ==
 
diff --git a/languages/Language.php b/languages/Language.php
index d750f7d519..42de91ed5f 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -1931,7 +1931,11 @@ class Language {
 					$gy_offset = '元';
 				}
 				$gy_offset = '昭和' . $gy_offset;
-			} else {
+			} elseif (
+				( ( $gy == 1989 ) && ( $gm == 1 ) && ( $gd >= 8 ) ) ||
+				( ( $gy > 1989 ) && ( $gy < 2019 ) ) ||
+				( ( $gy == 2019 ) && ( $gm < 5 ) )
+			) {
 				# Heisei period
 				$gy_gannen = $gy - 1989 + 1;
 				$gy_offset = $gy_gannen;
@@ -1939,6 +1943,14 @@ class Language {
 					$gy_offset = '元';
 				}
 				$gy_offset = '平成' . $gy_offset;
+			} else {
+				# Reiwa period
+				$gy_gannen = $gy - 2019 + 1;
+				$gy_offset = $gy_gannen;
+				if ( $gy_gannen == 1 ) {
+					$gy_offset = '元';
+				}
+				$gy_offset = '令和' . $gy_offset;
 			}
 		} else {
 			$gy_offset = $gy;
diff --git a/tests/phpunit/languages/LanguageTest.php b/tests/phpunit/languages/LanguageTest.php
index 050ed83bed..66bd76dfb5 100644
--- a/tests/phpunit/languages/LanguageTest.php
+++ b/tests/phpunit/languages/LanguageTest.php
@@ -1043,6 +1043,27 @@ class LanguageTest extends LanguageClassesTestCase {
 				'平成24',
 				'nengo'
 			],
+			[
+				'xtY',
+				'20190430235959',
+				'平成31',
+				'平成31',
+				'nengo - last day of heisei'
+			],
+			[
+				'xtY',
+				'20190501000000',
+				'令和元',
+				'令和元',
+				'nengo - first day of reiwa'
+			],
+			[
+				'xtY',
+				'20200501000000',
+				'令和2',
+				'令和2',
+				'nengo - second year of reiwa'
+			],
 			[
 				'xrxkYY',
 				'20120102090705',