From 30551608582d7368cc1ff1b995f04eae87213a1f Mon Sep 17 00:00:00 2001
From: Fomafix <fomafix@googlemail.com>
Date: Thu, 6 Nov 2014 13:22:02 +0000
Subject: [PATCH] Use getHtmlCode() instead of getCode() to set the lang
 attribute

The lang attribute of HTML elements should conform to BCP 47.

Bug: 72939
Change-Id: I9b4a734753af2c9dd7256eec60781553bc76edbf
---
 includes/CategoryViewer.php            | 4 ++--
 includes/EditPage.php                  | 2 +-
 includes/logging/LogEventsList.php     | 2 +-
 includes/specials/SpecialNewimages.php | 2 +-
 includes/specials/SpecialVersion.php   | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/includes/CategoryViewer.php b/includes/CategoryViewer.php
index 7581ae40d4..f68da956e9 100644
--- a/includes/CategoryViewer.php
+++ b/includes/CategoryViewer.php
@@ -136,7 +136,7 @@ class CategoryViewer extends ContextSource {
 		}
 
 		$lang = $this->getLanguage();
-		$langAttribs = array( 'lang' => $lang->getCode(), 'dir' => $lang->getDir() );
+		$langAttribs = array( 'lang' => $lang->getHtmlCode(), 'dir' => $lang->getDir() );
 		# put a div around the headings which are in the user language
 		$r = Html::openElement( 'div', $langAttribs ) . $r . '</div>';
 
@@ -515,7 +515,7 @@ class CategoryViewer extends ContextSource {
 		}
 
 		$pageLang = $this->title->getPageLanguage();
-		$attribs = array( 'lang' => $pageLang->getCode(), 'dir' => $pageLang->getDir(),
+		$attribs = array( 'lang' => $pageLang->getHtmlCode(), 'dir' => $pageLang->getDir(),
 			'class' => 'mw-content-' . $pageLang->getDir() );
 		$list = Html::rawElement( 'div', $attribs, $list );
 
diff --git a/includes/EditPage.php b/includes/EditPage.php
index fa19c78078..d106da24d2 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -2956,7 +2956,7 @@ HTML
 		);
 
 		$pageLang = $this->mTitle->getPageLanguage();
-		$attribs['lang'] = $pageLang->getCode();
+		$attribs['lang'] = $pageLang->getHtmlCode();
 		$attribs['dir'] = $pageLang->getDir();
 
 		$wgOut->addHTML( Html::textarea( $name, $wikitext, $attribs ) );
diff --git a/includes/logging/LogEventsList.php b/includes/logging/LogEventsList.php
index 8421672ebb..5d11f8423c 100644
--- a/includes/logging/LogEventsList.php
+++ b/includes/logging/LogEventsList.php
@@ -557,7 +557,7 @@ class LogEventsList extends ContextSource {
 		if ( $logBody ) {
 			if ( $msgKey[0] ) {
 				$dir = $context->getLanguage()->getDir();
-				$lang = $context->getLanguage()->getCode();
+				$lang = $context->getLanguage()->getHtmlCode();
 
 				$s = Xml::openElement( 'div', array(
 					'class' => "mw-warning-with-logexcerpt mw-content-$dir",
diff --git a/includes/specials/SpecialNewimages.php b/includes/specials/SpecialNewimages.php
index b9d18729c3..bc16925b0a 100644
--- a/includes/specials/SpecialNewimages.php
+++ b/includes/specials/SpecialNewimages.php
@@ -59,7 +59,7 @@ class SpecialNewFiles extends IncludableSpecialPage {
 		if ( !$message->isDisabled() ) {
 			$this->getOutput()->addWikiText(
 				Html::rawElement( 'p',
-					array( 'lang' => $wgContLang->getCode(), 'dir' => $wgContLang->getDir() ),
+					array( 'lang' => $wgContLang->getHtmlCode(), 'dir' => $wgContLang->getDir() ),
 					"\n" . $message->plain() . "\n"
 				),
 				/* $lineStart */ false,
diff --git a/includes/specials/SpecialVersion.php b/includes/specials/SpecialVersion.php
index 6b9173f6fe..5be3bc5367 100644
--- a/includes/specials/SpecialVersion.php
+++ b/includes/specials/SpecialVersion.php
@@ -1203,7 +1203,7 @@ class SpecialVersion extends SpecialPage {
 		$language = $this->getLanguage();
 		$thAttribures = array(
 			'dir' => $language->getDir(),
-			'lang' => $language->getCode()
+			'lang' => $language->getHtmlCode()
 		);
 		$out = Html::element(
 				'h2',
-- 
2.20.1