TheDJ has submitted this change and it was merged.
Change subject: Fix language code output for firstHeading
......................................................................
Fix language code output for firstHeading
Language::getHtmlCode() is used instead of Language::getCode(), and
use SkinTemplate::text() instead of SkinTemplate::html() per comments
above Language::getHtmlCode().
Change-Id: I5762fe73a28abf753ddcf95ed848675aa5bba673
---
M skins/CologneBlue.php
M skins/Modern.php
M skins/MonoBook.php
M skins/Vector.php
4 files changed, 8 insertions(+), 8 deletions(-)
Approvals:
TheDJ: Looks good to me, approved
jenkins-bot: Verified
diff --git a/skins/CologneBlue.php b/skins/CologneBlue.php
index 5ae8843..0370e05 100644
--- a/skins/CologneBlue.php
+++ b/skins/CologneBlue.php
@@ -290,8 +290,8 @@
<div id="siteNotice"><?php echo
$this->getSkin()->getSiteNotice() ?></div>
<?php } ?>
<h1 id="firstHeading" lang="<?php
- $this->data['pageLanguage'] =
$this->getSkin()->getTitle()->getPageViewLanguage()->getCode();
- $this->html( 'pageLanguage' );
+ $this->data['pageLanguage'] =
$this->getSkin()->getTitle()->getPageViewLanguage()->getHtmlCode();
+ $this->text( 'pageLanguage' );
?>"><span dir="auto"><?php echo $this->data['title']
?></span></h1>
<?php if ( $this->translator->translate( 'tagline' ) ) { ?>
<p class="tagline"><?php echo htmlspecialchars(
$this->translator->translate( 'tagline' ) ) ?></p>
diff --git a/skins/Modern.php b/skins/Modern.php
index 52f9fa2..10f1a60 100644
--- a/skins/Modern.php
+++ b/skins/Modern.php
@@ -67,8 +67,8 @@
<!-- heading -->
<div id="mw_header"><h1 id="firstHeading" lang="<?php
- $this->data['pageLanguage'] =
$this->getSkin()->getTitle()->getPageViewLanguage()->getCode();
- $this->html( 'pageLanguage' );
+ $this->data['pageLanguage'] =
$this->getSkin()->getTitle()->getPageViewLanguage()->getHtmlCode();
+ $this->text( 'pageLanguage' );
?>"><span dir="auto"><?php $this->html( 'title' ) ?></span></h1></div>
<div id="mw_main">
diff --git a/skins/MonoBook.php b/skins/MonoBook.php
index e805aca..dad26e4 100644
--- a/skins/MonoBook.php
+++ b/skins/MonoBook.php
@@ -79,8 +79,8 @@
<?php if ( $this->data['sitenotice'] ) { ?><div id="siteNotice"><?php
$this->html( 'sitenotice' ) ?></div><?php } ?>
<h1 id="firstHeading" class="firstHeading" lang="<?php
- $this->data['pageLanguage'] =
$this->getSkin()->getTitle()->getPageViewLanguage()->getCode();
- $this->html( 'pageLanguage' );
+ $this->data['pageLanguage'] =
$this->getSkin()->getTitle()->getPageViewLanguage()->getHtmlCode();
+ $this->text( 'pageLanguage' );
?>"><span dir="auto"><?php $this->html( 'title' ) ?></span></h1>
<div id="bodyContent" class="mw-body">
<div id="siteSub"><?php $this->msg( 'tagline' ) ?></div>
diff --git a/skins/Vector.php b/skins/Vector.php
index d0305f0..ee198fe 100644
--- a/skins/Vector.php
+++ b/skins/Vector.php
@@ -161,8 +161,8 @@
<div id="siteNotice"><?php $this->html( 'sitenotice' )
?></div>
<?php } ?>
<h1 id="firstHeading" class="firstHeading" lang="<?php
- $this->data['pageLanguage'] =
$this->getSkin()->getTitle()->getPageViewLanguage()->getCode();
- $this->html( 'pageLanguage' );
+ $this->data['pageLanguage'] =
$this->getSkin()->getTitle()->getPageViewLanguage()->getHtmlCode();
+ $this->text( 'pageLanguage' );
?>"><span dir="auto"><?php $this->html( 'title' )
?></span></h1>
<div id="bodyContent">
<?php if ( $this->data['isarticle'] ) { ?>
--
To view, visit https://gerrit.wikimedia.org/r/55455
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5762fe73a28abf753ddcf95ed848675aa5bba673
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Liangent <[email protected]>
Gerrit-Reviewer: Daniel Friesen <[email protected]>
Gerrit-Reviewer: Liangent <[email protected]>
Gerrit-Reviewer: Matmarex <[email protected]>
Gerrit-Reviewer: Nikerabbit <[email protected]>
Gerrit-Reviewer: TheDJ <[email protected]>
Gerrit-Reviewer: Waldir <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
