Liangent has uploaded a new change for review.
https://gerrit.wikimedia.org/r/55455
Change subject: Fix language code output for firstHeading (pagetitle)
......................................................................
Fix language code output for firstHeading (pagetitle)
* In new skins, use Language::getHtmlCode() instead of
Language::getCode(), and use SkinTemplate::text() instead of
SkinTemplate::html() per comments above getHtmlCode.
* In legacy skins, add a lang="" attribute to the pagetitle element, to
avoid difference between $wgLang and $wgContLang (this is what new
skins currently do).
Change-Id: I5762fe73a28abf753ddcf95ed848675aa5bba673
---
M includes/SkinLegacy.php
M skins/CologneBlue.php
M skins/Modern.php
M skins/MonoBook.php
M skins/Vector.php
5 files changed, 11 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/55/55455/1
diff --git a/includes/SkinLegacy.php b/includes/SkinLegacy.php
index b9766a9..bb20ed9 100644
--- a/includes/SkinLegacy.php
+++ b/includes/SkinLegacy.php
@@ -504,7 +504,9 @@
*/
function pageTitle() {
global $wgOut;
- $s = '<h1 class="pagetitle"><span dir="auto">' .
$wgOut->getPageTitle() . '</span></h1>';
+ $s = '<h1 class="pagetitle" lang="' . htmlspecialchars(
+
$this->getSkin()->getTitle()->getPageViewLanguage()->getHtmlCode()
+ ) . '"><span dir="auto">' . $wgOut->getPageTitle() .
'</span></h1>';
return $s;
}
diff --git a/skins/CologneBlue.php b/skins/CologneBlue.php
index 21b07f7..f9e0328 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 9dbefb1..20c7dda 100644
--- a/skins/Modern.php
+++ b/skins/Modern.php
@@ -66,8 +66,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 f03d31b..f2e9df8 100644
--- a/skins/MonoBook.php
+++ b/skins/MonoBook.php
@@ -85,8 +85,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 d0f9995..5d39185 100644
--- a/skins/Vector.php
+++ b/skins/Vector.php
@@ -166,8 +166,8 @@
<?php endif; ?>
<!-- firstHeading -->
<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>
<!-- /firstHeading -->
<!-- bodyContent -->
--
To view, visit https://gerrit.wikimedia.org/r/55455
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5762fe73a28abf753ddcf95ed848675aa5bba673
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Liangent <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
