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 901c83a..621580a 100644 (file)
--- 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.
   $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 ==
 
 
 == MediaWiki 1.31.1 ==
 

diff --git a/languages/Language.php b/languages/Language.php
index d750f7d..42de91e 100644 (file)
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -1931,7 +1931,11 @@ class Language {
                                        $gy_offset = '元';
                                }
                                $gy_offset = '昭和' . $gy_offset;
                                        $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;
                                # Heisei period
                                $gy_gannen = $gy - 1989 + 1;
                                $gy_offset = $gy_gannen;


@@ -1939,6 +1943,14 @@ class Language {
                                        $gy_offset = '元';
                                }
                                $gy_offset = '平成' . $gy_offset;
                                        $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;
                        }
                } else {
                        $gy_offset = $gy;

diff --git a/tests/phpunit/languages/LanguageTest.php b/tests/phpunit/languages/LanguageTest.php
index 050ed83..66bd76d 100644 (file)
--- a/tests/phpunit/languages/LanguageTest.php
+++ b/tests/phpunit/languages/LanguageTest.php
@@ -1043,6 +1043,27 @@ class LanguageTest extends LanguageClassesTestCase {
                                '平成24',
                                'nengo'
                        ],
                                '平成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',
                        [
                                'xrxkYY',
                                '20120102090705',