jenkins-bot has submitted this change and it was merged.
Change subject: mw.Platform: Use 'mediawiki.language' for language fallback
chain
......................................................................
mw.Platform: Use 'mediawiki.language' for language fallback chain
Bonus:
* Remove doubled dependency on mediawiki.Uri
* Add missing dependency on mediawiki.language
Change-Id: Ide716aad7b9f08ae9a24f99812f07273d89da33a
---
M VisualEditor.php
M modules/ve-mw/init/ve.init.mw.Platform.js
2 files changed, 2 insertions(+), 10 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/VisualEditor.php b/VisualEditor.php
index f15c32c..182a617 100644
--- a/VisualEditor.php
+++ b/VisualEditor.php
@@ -280,8 +280,8 @@
'jquery.visibleText',
'jquery.byteLength',
'jquery.client',
- 'mediawiki.Uri',
'mediawiki.api',
+ 'mediawiki.language',
'mediawiki.Title',
'mediawiki.Uri',
'mediawiki.user',
diff --git a/modules/ve-mw/init/ve.init.mw.Platform.js
b/modules/ve-mw/init/ve.init.mw.Platform.js
index f5cdfb0..0f5be8f 100644
--- a/modules/ve-mw/init/ve.init.mw.Platform.js
+++ b/modules/ve-mw/init/ve.init.mw.Platform.js
@@ -105,15 +105,7 @@
/** @inheritdoc */
ve.init.mw.Platform.prototype.getUserLanguages = function () {
- var lang = mw.config.get( 'wgUserLanguage' ),
- langParts = lang.split( '-' ),
- langs = [ lang ];
-
- if ( langParts.length > 1 ) {
- langs.push( langParts[0] );
- }
-
- return langs;
+ return mw.language.getFallbackLanguageChain();
};
/* Initialization */
--
To view, visit https://gerrit.wikimedia.org/r/164783
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ide716aad7b9f08ae9a24f99812f07273d89da33a
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński <matma....@gmail.com>
Gerrit-Reviewer: Bartosz Dziewoński <matma....@gmail.com>
Gerrit-Reviewer: Catrope <roan.katt...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
