(bug 3926) Introduce {{#language:}} magic word

RELEASE-NOTES

@@ -386,6 +386,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 6106) Update to Indonesian localisation (id) #17
 * (bug 6125) Add links to edit old versions to diff views
 * (bug 5127) Auto edit summary when creating redirect page
+* (bug 3926) Introduce {{#language:}} magic word
 
 == Compatibility ==
 

includes/MagicWord.php

@@ -91,6 +91,7 @@ $magicWords = array(
 	'MAG_URLENCODE',
 	'MAG_CURRENTTIMESTAMP',
 	'MAG_DIRECTIONMARK',
+	'MAG_LANGUAGE',
 );
 if ( ! defined( 'MEDIAWIKI_INSTALL' ) )
 	wfRunHooks( 'MagicWordMagicWords', array( &$magicWords ) );
@@ -144,6 +145,7 @@ $wgVariableIDs = array(
 	MAG_URLENCODE,
 	MAG_CURRENTTIMESTAMP,
 	MAG_DIRECTIONMARK,
+	MAG_LANGUAGE,
 );
 if ( ! defined( 'MEDIAWIKI_INSTALL' ) )
 	wfRunHooks( 'MagicWordwgVariableIDs', array( &$wgVariableIDs ) );

includes/Parser.php

@@ -2713,6 +2713,16 @@ class Parser
 			}
 		}
 
+		# #LANGUAGE:
+		if( !$found ) {
+			$mwLanguage =& MagicWord::get( MAG_LANGUAGE );
+			if( $mwLanguage->matchStartAndRemove( $part1 ) ) {
+				$lang = $wgContLang->getLanguageName( strtolower( $part1 ) );
+				$text = $linestart . ( $lang != '' ? $lang : $part1 );
+				$found = true;
+			}		
+		}
+
 		# Extensions
 		if ( !$found && substr( $part1, 0, 1 ) == '#' ) {
 			$colonPos = strpos( $part1, ':' );

languages/Language.php

@@ -289,6 +289,7 @@ $wgLanguageNamesEn =& $wgLanguageNames;
 	MAG_URLENCODE            => array( 0,    'URLENCODE:'             ),
 	MAG_CURRENTTIMESTAMP     => array( 1,    'CURRENTTIMESTAMP'       ),
 	MAG_DIRECTIONMARK        => array( 1,    'DIRECTIONMARK', 'DIRMARK' ),
+	MAG_LANGUAGE			 => array( 0,	 '#LANGUAGE:' ),
 );
 
 if (!$wgCachedMessageArrays) {