jenkins-bot has submitted this change and it was merged.
Change subject: Allow hiding the language button
......................................................................
Allow hiding the language button
The language button at the top of the page is always displayed
even when the page is not available in other languages. This change
allows hiding the button. By default the language is button will
be showed, and it maybe disabled if the page is not availabe in
different languages/variants.
Bug: T130225
Change-Id: I38bf8695e5f764cb2fd66758694018edec854849
---
M extension.json
M includes/skins/SkinMinervaBeta.php
M tests/browser/LocalSettings.php
3 files changed, 15 insertions(+), 7 deletions(-)
Approvals:
Jdlrobson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/extension.json b/extension.json
index 493aefc..1843319 100644
--- a/extension.json
+++ b/extension.json
@@ -2037,7 +2037,9 @@
"stable": 0
},
"MFSchemaEditSampleRate": 0.0625,
- "MFAllowNonJavaScriptEditing": false
+ "MFAllowNonJavaScriptEditing": false,
+ "@MinervaAlwaysShowLanguageButton": "Whether to show the
language switcher button even if no languages are available for the page.",
+ "MinervaAlwaysShowLanguageButton": true
},
"manifest_version": 1
}
diff --git a/includes/skins/SkinMinervaBeta.php
b/includes/skins/SkinMinervaBeta.php
index 845482a..2808939 100644
--- a/includes/skins/SkinMinervaBeta.php
+++ b/includes/skins/SkinMinervaBeta.php
@@ -57,12 +57,15 @@
);
$languageSwitcherClasses = '';
}
- $menu['language-switcher'] = array( 'id' =>
'language-switcher', 'text' => '',
- 'itemtitle' => $this->msg(
'mobile-frontend-language-article-heading' ),
- 'class' => MobileUI::iconClass(
'language-switcher', 'element', $languageSwitcherClasses ),
- 'links' => $languageSwitcherLinks
- );
- $tpl->set( 'page_actions', $menu );
+ if ( $this->getMFConfig()->get(
'MinervaAlwaysShowLanguageButton' ) ||
+ $this->doesPageHaveLanguages ) {
+ $menu['language-switcher'] = array( 'id' =>
'language-switcher', 'text' => '',
+ 'itemtitle' => $this->msg(
'mobile-frontend-language-article-heading' ),
+ 'class' => MobileUI::iconClass(
'language-switcher', 'element', $languageSwitcherClasses ),
+ 'links' => $languageSwitcherLinks
+ );
+ $tpl->set( 'page_actions', $menu );
+ }
} else {
$tpl->set( 'page_actions', array() );
}
diff --git a/tests/browser/LocalSettings.php b/tests/browser/LocalSettings.php
index 058a7ab..39680d7 100644
--- a/tests/browser/LocalSettings.php
+++ b/tests/browser/LocalSettings.php
@@ -21,3 +21,6 @@
$wgInterwikiCache = false;
$wgMFEnableBeta = true;
+
+// needed for testing whether the language button is displayed and disabled
+$wgMinervaAlwaysShowLanguageButton = true;
--
To view, visit https://gerrit.wikimedia.org/r/280498
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I38bf8695e5f764cb2fd66758694018edec854849
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Bmansurov <[email protected]>
Gerrit-Reviewer: Bmansurov <[email protected]>
Gerrit-Reviewer: Jdlrobson <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
