[MediaWiki-commits] [Gerrit] Card 703: Promote lazy languages to stable - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged.
Change subject: Card 703: Promote lazy languages to stable
..
Card 703: Promote lazy languages to stable
Bug: 40678
Change-Id: I035c07ebc4ca17153e8480690762c73cc5d89f8d
---
M includes/Resources.php
M includes/skins/MinervaTemplate.php
M includes/skins/MinervaTemplateBeta.php
M includes/skins/SkinMinervaBeta.php
M includes/specials/SpecialMobileLanguages.php
R javascripts/modules/languages/languages.js
D javascripts/modules/languages/languagesStable.js
D templates/languageSection.html
8 files changed, 28 insertions(+), 153 deletions(-)
Approvals:
Jdlrobson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Resources.php b/includes/Resources.php
index 785fde9..8a8e834 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -244,8 +244,6 @@
'templates' = array(
'page',
'section',
- // FIXME: Remove when lazy loaded languages go to stable
- 'languageSection',
),
'scripts' = array(
'javascripts/common/Router.js',
@@ -862,12 +860,13 @@
),
),
- 'mobile.languages.common' = $wgMFMobileResourceBoilerplate + array(
+ 'mobile.languages' = $wgMFMobileResourceBoilerplate + array(
'dependencies' = array(
'mobile.overlays',
),
'scripts' = array(
'javascripts/modules/languages/LanguageOverlay.js',
+ 'javascripts/modules/languages/languages.js',
),
'templates' = array(
'modules/languages/LanguageOverlay',
@@ -877,24 +876,6 @@
'mobile-frontend-language-header',
'mobile-frontend-language-variant-header' = array(
'parse' ),
'mobile-frontend-language-site-choose',
- ),
- ),
-
- 'mobile.languages' = $wgMFMobileResourceBoilerplate + array(
- 'dependencies' = array(
- 'mobile.languages.common',
- ),
- 'scripts' = array(
- 'javascripts/modules/languages/languagesStable.js',
- ),
- ),
-
- 'mobile.languages.beta' = $wgMFMobileResourceBoilerplate + array(
- 'dependencies' = array(
- 'mobile.languages.common',
- ),
- 'scripts' = array(
- 'javascripts/modules/languages/languagesBeta.js',
),
),
diff --git a/includes/skins/MinervaTemplate.php
b/includes/skins/MinervaTemplate.php
index 39e1369..3ba7189 100644
--- a/includes/skins/MinervaTemplate.php
+++ b/includes/skins/MinervaTemplate.php
@@ -39,50 +39,6 @@
return $this-data['footerlinks'];
}
- protected function renderLanguages() {
- $languages = $this-getLanguages();
- $variants = $this-getLanguageVariants();
- // stupid php: count( false ) returns 1
- $languagesCount = is_array( $languages ) ? count( $languages )
: 0;
- $variantsCount = is_array( $variants ) ? count( $variants ) : 0;
-
- if ( $languagesCount 0 || $variantsCount 1 ) {
- $heading = wfMessage(
'mobile-frontend-language-article-heading' )-text();
- $languageSummary = wfMessage(
'mobile-frontend-language-header', $languagesCount )-text();
- $variantSummary = $variantsCount 1 ? wfMessage(
'mobile-frontend-language-variant-header' )-text() : '';
- ?
- div class=section id=mw-mf-language-section
- h2 id=section_language
class=section_heading?php echo $heading; ?/h2
- div id=content_language
class=content_block
-
- ?php if ( $variantsCount 1 ) { ?
- p
id=mw-mf-language-variant-header?php echo $variantSummary; ?/p
- ul
id=mw-mf-language-variant-selection
- ?php
- foreach( $variants as $key = $val ):
- echo $this-makeListItem( $key,
$val );
- endforeach;
- ?
- /ul
- ?php } ?
-
- ?php if ( $languagesCount 0 ) { ?
- p id=mw-mf-language-header?php
echo $languageSummary; ?/p
- ul
[MediaWiki-commits] [Gerrit] [Card 703] Promote lazy languages to stable - change (mediawiki...MobileFrontend)
MaxSem has uploaded a new change for review.
https://gerrit.wikimedia.org/r/115978
Change subject: [Card 703] Promote lazy languages to stable
..
[Card 703] Promote lazy languages to stable
Change-Id: I035c07ebc4ca17153e8480690762c73cc5d89f8d
---
M includes/Resources.php
M includes/skins/MinervaTemplate.php
M includes/skins/MinervaTemplateBeta.php
M includes/skins/SkinMinervaBeta.php
M includes/specials/SpecialMobileLanguages.php
R javascripts/modules/languages/languages.js
D javascripts/modules/languages/languagesStable.js
D templates/languageSection.html
8 files changed, 16 insertions(+), 152 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/78/115978/1
diff --git a/includes/Resources.php b/includes/Resources.php
index 785fde9..8a8e834 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -244,8 +244,6 @@
'templates' = array(
'page',
'section',
- // FIXME: Remove when lazy loaded languages go to stable
- 'languageSection',
),
'scripts' = array(
'javascripts/common/Router.js',
@@ -862,12 +860,13 @@
),
),
- 'mobile.languages.common' = $wgMFMobileResourceBoilerplate + array(
+ 'mobile.languages' = $wgMFMobileResourceBoilerplate + array(
'dependencies' = array(
'mobile.overlays',
),
'scripts' = array(
'javascripts/modules/languages/LanguageOverlay.js',
+ 'javascripts/modules/languages/languages.js',
),
'templates' = array(
'modules/languages/LanguageOverlay',
@@ -877,24 +876,6 @@
'mobile-frontend-language-header',
'mobile-frontend-language-variant-header' = array(
'parse' ),
'mobile-frontend-language-site-choose',
- ),
- ),
-
- 'mobile.languages' = $wgMFMobileResourceBoilerplate + array(
- 'dependencies' = array(
- 'mobile.languages.common',
- ),
- 'scripts' = array(
- 'javascripts/modules/languages/languagesStable.js',
- ),
- ),
-
- 'mobile.languages.beta' = $wgMFMobileResourceBoilerplate + array(
- 'dependencies' = array(
- 'mobile.languages.common',
- ),
- 'scripts' = array(
- 'javascripts/modules/languages/languagesBeta.js',
),
),
diff --git a/includes/skins/MinervaTemplate.php
b/includes/skins/MinervaTemplate.php
index 39e1369..3ba7189 100644
--- a/includes/skins/MinervaTemplate.php
+++ b/includes/skins/MinervaTemplate.php
@@ -39,50 +39,6 @@
return $this-data['footerlinks'];
}
- protected function renderLanguages() {
- $languages = $this-getLanguages();
- $variants = $this-getLanguageVariants();
- // stupid php: count( false ) returns 1
- $languagesCount = is_array( $languages ) ? count( $languages )
: 0;
- $variantsCount = is_array( $variants ) ? count( $variants ) : 0;
-
- if ( $languagesCount 0 || $variantsCount 1 ) {
- $heading = wfMessage(
'mobile-frontend-language-article-heading' )-text();
- $languageSummary = wfMessage(
'mobile-frontend-language-header', $languagesCount )-text();
- $variantSummary = $variantsCount 1 ? wfMessage(
'mobile-frontend-language-variant-header' )-text() : '';
- ?
- div class=section id=mw-mf-language-section
- h2 id=section_language
class=section_heading?php echo $heading; ?/h2
- div id=content_language
class=content_block
-
- ?php if ( $variantsCount 1 ) { ?
- p
id=mw-mf-language-variant-header?php echo $variantSummary; ?/p
- ul
id=mw-mf-language-variant-selection
- ?php
- foreach( $variants as $key = $val ):
- echo $this-makeListItem( $key,
$val );
- endforeach;
- ?
- /ul
- ?php } ?
-
- ?php if ( $languagesCount 0 ) { ?
- p id=mw-mf-language-header?php
echo $languageSummary; ?/p
-
