X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=languages%2FLanguage.php;h=42de91ed5fa3e7bf298c2a667e1779afecb4489f;hb=94832cdc7bfbd823a0b8ecff8035088dbfb11644;hp=b71defa46fe8b81162384fae9bd1e1fa22a5c41b;hpb=52338150c8c2798af904c429a3620d0ec9713889;p=lhc%2Fweb%2Fwiklou.git

diff --git a/languages/Language.php b/languages/Language.php
index b71defa46f..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;
@@ -4148,6 +4160,18 @@ class Language {
 		return $this->mConverter;
 	}
 
+	/**
+	 * convert text to a variant
+	 *
+	 * @param string $text text to convert
+	 * @param string|bool $variant variant to convert to, or false to use the user's preferred
+	 *      variant (if logged in), or the project default variant
+	 * @return string the converted string
+	 */
+	public function autoConvert( $text, $variant = false ) {
+		return $this->mConverter->autoConvert( $text, $variant );
+	}
+
 	/**
 	 * convert text to all supported variants
 	 *
@@ -4181,11 +4205,13 @@ class Language {
 	/**
 	 * Convert a namespace index to a string in the preferred variant
 	 *
-	 * @param int $ns
-	 * @return string
+	 * @param int $ns namespace index (https://www.mediawiki.org/wiki/Manual:Namespace)
+	 * @param string|null $variant variant to convert to, or null to use the user's preferred
+	 *      variant (if logged in), or the project default variant
+	 * @return string a string representation of the namespace
 	 */
-	public function convertNamespace( $ns ) {
-		return $this->mConverter->convertNamespace( $ns );
+	public function convertNamespace( $ns, $variant = null ) {
+		return $this->mConverter->convertNamespace( $ns, $variant );
 	}
 
 	/**