X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=languages%2FLanguage.php;h=fb04255047c7f79b27afa31e79e6538a916f294f;hb=566635008a4ccd11dfdaac1a6ef9ff428f75251c;hp=9bbccf12efb8640c319af42caa234c28dedd0fbe;hpb=0ffba1f4a3f27ae7bab373909f32603250f1bf10;p=lhc%2Fweb%2Fwiklou.git

diff --git a/languages/Language.php b/languages/Language.php
index 9bbccf12ef..fb04255047 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -143,6 +143,12 @@ class Language {
 	 */
 	static private $fallbackLanguageCache = array();
 
+	/**
+	 * Cache for language names
+	 * @var MapCacheLRU|null
+	 */
+	static private $languageNameCache;
+
 	/**
 	 * Get a cached or new language object for a given language code
 	 * @param string $code
@@ -731,6 +737,8 @@ class Language {
 	}
 
 	/**
+	 * @deprecated since 1.24, doesn't handle conflicting aliases. Use
+	 *   SpecialPageFactory::getLocalNameFor instead.
 	 * @param string $name
 	 * @return string
 	 */
@@ -784,6 +792,14 @@ class Language {
 		return self::$dataCache->getSubitem( $this->mCode, 'imageFiles', $image );
 	}
 
+	/**
+	 * @return array
+	 * @since 1.24
+	 */
+	function getImageFiles() {
+		return self::$dataCache->getItem( $this->mCode, 'imageFiles' );
+	}
+
 	/**
 	 * @return array
 	 */
@@ -838,6 +854,33 @@ class Language {
 	 * @since 1.20
 	 */
 	public static function fetchLanguageNames( $inLanguage = null, $include = 'mw' ) {
+		wfProfileIn( __METHOD__ );
+		$cacheKey = $inLanguage === null ? 'null' : $inLanguage;
+		$cacheKey .= ":$include";
+		if ( self::$languageNameCache === null ) {
+			self::$languageNameCache = new MapCacheLRU( 20 );
+		}
+		if ( self::$languageNameCache->has( $cacheKey ) ) {
+			$ret = self::$languageNameCache->get( $cacheKey );
+		} else {
+			$ret = self::fetchLanguageNamesUncached( $inLanguage, $include );
+			self::$languageNameCache->set( $cacheKey, $ret );
+		}
+		wfProfileOut( __METHOD__ );
+		return $ret;
+	}
+
+	/**
+	 * Uncached helper for fetchLanguageNames
+	 * @param null|string $inLanguage Code of language in which to return the names
+	 *		Use null for autonyms (native names)
+	 * @param string $include One of:
+	 *		'all' all available languages
+	 *		'mw' only if the language is defined in MediaWiki or wgExtraLanguageNames (default)
+	 *		'mwfile' only if the language is in 'mw' *and* has a message file
+	 * @return array Language code => language name
+	 */
+	private static function fetchLanguageNamesUncached( $inLanguage = null, $include = 'mw' ) {
 		global $wgExtraLanguageNames;
 		static $coreLanguageNames;
 
@@ -3166,7 +3209,7 @@ class Language {
 
 	/**
 	 * Get special page names, as an associative array
-	 *   case folded alias => real name
+	 *   canonical name => array of valid names, including aliases
 	 * @return array
 	 */
 	function getSpecialPageAliases() {