From: Shinjiman <shinjiman@users.mediawiki.org>
Date: Wed, 20 May 2009 15:49:30 +0000 (+0000)
Subject: follow up r50804, adding two further Japanese era names.
X-Git-Tag: 1.31.0-rc.0~41719
X-Git-Url: http://git.cyclocoop.org/%27.%28%24current%20%3E%202?a=commitdiff_plain;h=2f5a335a00e182df274fcb99b9acb8836be0ed7e;p=lhc%2Fweb%2Fwiklou.git

follow up r50804, adding two further Japanese era names.
---

diff --git a/languages/Language.php b/languages/Language.php
index c54b56d33e..20daeb8b88 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -1154,11 +1154,25 @@ class Language {
 			# Months and days are identical
 			$gy_offset = $gy - 1911;
 		} else if (!strcmp($cName,'tenno')) {
-			# Minguo dates up to Showa period
+			# Nengō dates up to Meiji period
 			# Deduct years from the Gregorian calendar
 			# depending on the nengo periods
 			# Months and days are identical
-			if (($gy < 1989) || (($gy == 1989) && ($gm == 1) && ($gd < 8))) {
+			if (($gy < 1912) || (($gy == 1912) && ($gm < 7)) || (($gy == 1912) && ($gm == 7) && ($gd < 31))) {
+				# Meiji period
+				$gy_gannen = $gy - 1868 + 1;
+				$gy_offset = $gy_gannen;
+				if ($gy_gannen == 1)
+					$gy_offset = '元';
+				$gy_offset = '明治'.$gy_offset;
+			} else if ((($gy == 1912) && ($gm == 7) && ($gd == 31)) || (($gy == 1912) && ($gm >= 8)) || (($gy > 1912) && ($gy < 1926)) || (($gy == 1926) && ($gm < 12)) || (($gy == 1926) && ($gm == 12) && ($gd < 26))) {
+				# Taishō period
+				$gy_gannen = $gy - 1912 + 1;
+				$gy_offset = $gy_gannen;
+				if ($gy_gannen == 1)
+					$gy_offset = '元';
+				$gy_offset = '大正'.$gy_offset;
+			} else if ((($gy == 1926) && ($gm == 12) && ($gd >= 26)) || (($gy > 1926) && ($gy < 1989)) || (($gy == 1989) && ($gm == 1) && ($gd < 8))) {
 				# Shōwa period
 				$gy_gannen = $gy - 1926 + 1;
 				$gy_offset = $gy_gannen;