jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/196203 )
Change subject: Move lang attribute from wikibase-sitelinkview to
wikibase-sitelinkview-pagename
......................................................................
Move lang attribute from wikibase-sitelinkview to wikibase-sitelinkview-pagename
The outer wikibase-sitelinkview container contains the page name and the badges.
The page name is always in it's own language, but the whitespace around and the
badges are in the interface language. Currently the order of page name and
badges
switches in RTL languages.
Change-Id: Ic54101a6adb10ee1a9cde41e7d9409e8efb4e973
---
M phpcs.xml
M view/resources/jquery/wikibase/jquery.wikibase.sitelinkview.js
M view/resources/templates.php
M view/src/SiteLinksView.php
M view/tests/phpunit/SiteLinksViewTest.php
5 files changed, 10 insertions(+), 15 deletions(-)
Approvals:
WMDE-leszek: Looks good to me, approved
Aleksey Bekh-Ivanov (WMDE): Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/phpcs.xml b/phpcs.xml
index 5ffc2cc..dc9ff48 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -22,6 +22,7 @@
</properties>
<!-- Exclude auto-generated files from the Translate extension,
see magic-export.php. -->
<exclude-pattern>\.i18n\.magic\.php</exclude-pattern>
+ <exclude-pattern>view.resources.templates\.php</exclude-pattern>
</rule>
<rule ref="Generic.Files.OneInterfacePerFile" />
<rule ref="Generic.Files.OneTraitPerFile" />
diff --git a/view/resources/jquery/wikibase/jquery.wikibase.sitelinkview.js
b/view/resources/jquery/wikibase/jquery.wikibase.sitelinkview.js
index e739c3a..4a56e47 100644
--- a/view/resources/jquery/wikibase/jquery.wikibase.sitelinkview.js
+++ b/view/resources/jquery/wikibase/jquery.wikibase.sitelinkview.js
@@ -43,14 +43,8 @@
var site = this._getSite();
return site ? site.getId() : 'new';
},
- function() {
- var site = this._getSite();
- return site ? site.getLanguageCode() : '';
- },
- function() {
- var site = this._getSite();
- return site ? site.getLanguageDirection() : '';
- },
+ '', // FIXME: Unused, drop.
+ '', // FIXME: Unused, drop.
function() {
var site = this._getSite();
return site ? site.getId() : '';
diff --git a/view/resources/templates.php b/view/resources/templates.php
index 2b1fd34..fc2da45 100644
--- a/view/resources/templates.php
+++ b/view/resources/templates.php
@@ -252,13 +252,13 @@
<li class="wikibase-sitelinkview wikibase-sitelinkview-$1" data-wb-siteid="$1">
<span class="wikibase-sitelinkview-siteid-container">
<span class="wikibase-sitelinkview-siteid
wikibase-sitelinkview-siteid-$1" title="$5">$4</span>
- </span><span class="wikibase-sitelinkview-link
wikibase-sitelinkview-link-$1" lang="$2"><!-- wikibase-sitelinkview-pagename
-->$6</span>
+ </span><span class="wikibase-sitelinkview-link
wikibase-sitelinkview-link-$1"><!-- wikibase-sitelinkview-pagename -->$6</span>
</li>
HTML;
$templates['wikibase-sitelinkview-pagename'] =
<<<HTML
-<span class="wikibase-sitelinkview-page" dir="$5"><a href="$1" hreflang="$4"
title="$2">$2</a></span><!-- wikibase-badgeselector -->$3
+<span class="wikibase-sitelinkview-page" dir="$5" lang="$4"><a href="$1"
hreflang="$4" title="$2">$2</a></span><!-- wikibase-badgeselector -->$3
HTML;
$templates['wikibase-sitelinkview-unknown'] =
diff --git a/view/src/SiteLinksView.php b/view/src/SiteLinksView.php
index 33cd322..01d9924 100644
--- a/view/src/SiteLinksView.php
+++ b/view/src/SiteLinksView.php
@@ -312,8 +312,8 @@
// and will fail when having too much site links
return $this->templateFactory->render( 'wikibase-sitelinkview',
htmlspecialchars( $siteId ), // ID used in classes
- $languageCode,
- 'auto',
+ '', // FIXME: Unused, drop.
+ '', // FIXME: Unused, drop.
htmlspecialchars( $siteId ), // displayed site ID
htmlspecialchars( $siteName ),
$this->getHtmlForPage( $siteLink, $site )
diff --git a/view/tests/phpunit/SiteLinksViewTest.php
b/view/tests/phpunit/SiteLinksViewTest.php
index 20351e1..e4d63a6 100644
--- a/view/tests/phpunit/SiteLinksViewTest.php
+++ b/view/tests/phpunit/SiteLinksViewTest.php
@@ -64,7 +64,7 @@
. '<GROUP data="wikipedia" class="">'
. '<h3
id="sitelinks-wikipedia">(wikibase-sitelinks-wikipedia)'
. '(parentheses: (wikibase-sitelinks-counter: 1, 0, ,
))</h3>'
- . '<LINK id="enwiki" lang="en" title="<LANG>">'
+ . '<LINK id="enwiki" title="<LANG>">'
. 'enwiki: <PAGE href="#enwiki" lang="en"
dir="auto">Title</PAGE>'
. '</LINK>'
. '</GROUP>',
@@ -83,7 +83,7 @@
. '<GROUP data="special" class="">'
. '<h3
id="sitelinks-special">(wikibase-sitelinks-special)'
. '(parentheses: (wikibase-sitelinks-counter: 1, 0, ,
))</h3>'
- . '<LINK id="specialwiki" lang="en"
title="(wikibase-sitelinks-sitename-specialwiki)">'
+ . '<LINK id="specialwiki"
title="(wikibase-sitelinks-sitename-specialwiki)">'
. 'specialwiki: <PAGE href="#specialwiki" lang="en"
dir="auto">Title</PAGE>'
. '</LINK>'
. '</GROUP>',
@@ -132,7 +132,7 @@
'wikibase-listview' => '$1',
'wikibase-sitelinkgroupview' => '<GROUP data="$5"
class="$7"><h3 id="$1">$2$3</h3>$6$4</GROUP>',
'wikibase-sitelinklistview' => '$1',
- 'wikibase-sitelinkview' => '<LINK id="$1" lang="$2"
title="$5">$4: $6</LINK>',
+ 'wikibase-sitelinkview' => '<LINK id="$1"
title="$5">$4: $6</LINK>',
'wikibase-sitelinkview-pagename' => '<PAGE href="$1"
lang="$4" dir="$5">$2</PAGE>$3',
'wikibase-badgeselector' => '$1',
'wb-badge' => '<BADGE class="$1" id="$3">$2</BADGE>',
--
To view, visit https://gerrit.wikimedia.org/r/196203
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic54101a6adb10ee1a9cde41e7d9409e8efb4e973
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) <thiemo.maet...@wikimedia.de>
Gerrit-Reviewer: Addshore <addshorew...@gmail.com>
Gerrit-Reviewer: Adrian Heine <m...@adrianheine.de>
Gerrit-Reviewer: Aleksey Bekh-Ivanov (WMDE) <aleksey.bekh-iva...@wikimedia.de>
Gerrit-Reviewer: Aude <aude.w...@gmail.com>
Gerrit-Reviewer: Bene <benestar.wikime...@gmail.com>
Gerrit-Reviewer: Ebrahim <ebra...@gnu.org>
Gerrit-Reviewer: Henning Snater <henning.sna...@wikimedia.de>
Gerrit-Reviewer: Hoo man <h...@online.de>
Gerrit-Reviewer: Thiemo Mättig (WMDE) <thiemo.maet...@wikimedia.de>
Gerrit-Reviewer: WMDE-leszek <leszek.mani...@wikimedia.de>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
