[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Apply platform language to SA target

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Apply platform language to SA target
......................................................................


Apply platform language to SA target

Change-Id: I1d4eac0ee55148033b4eb0223fc4781e9faecf07
---
M demos/ve/ve.demo.init.js
M src/init/sa/ve.init.sa.Target.js
2 files changed, 4 insertions(+), 3 deletions(-)

Approvals:
  Jforrester: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/demos/ve/ve.demo.init.js b/demos/ve/ve.demo.init.js
index 0650075..8c86aca 100644
--- a/demos/ve/ve.demo.init.js
+++ b/demos/ve/ve.demo.init.js
@@ -11,7 +11,7 @@
                target = new ve.demo.target(),
                hashChanging = false,
 
-               currentLang = $.i18n().locale,
+               currentLang = ve.init.platform.getUserLanguages()[ 0 ],
                currentDir = target.$element.css( 'direction' ) || 'ltr',
                device = ve.demo.target === ve.init.sa.DesktopTarget ? 
'desktop' : 'mobile',
 
@@ -69,7 +69,6 @@
        languageInput.setLangAndDir( currentLang, currentDir );
        // Dir doesn't change on init but styles need to be set
        updateStylesFromDir();
-       target.$element.attr( 'lang', currentLang );
 
        languageInput.on( 'change', function ( lang, dir ) {
                if ( dir === currentDir && lang !== 'qqx' && 
ve.availableLanguages.indexOf( lang ) === -1 ) {
diff --git a/src/init/sa/ve.init.sa.Target.js b/src/init/sa/ve.init.sa.Target.js
index d6f2de0..9f2e67b 100644
--- a/src/init/sa/ve.init.sa.Target.js
+++ b/src/init/sa/ve.init.sa.Target.js
@@ -35,7 +35,9 @@
        // Parent constructor
        ve.init.sa.Target.super.call( this, config );
 
-       this.$element.addClass( 've-init-sa-target' );
+       this.$element
+               .addClass( 've-init-sa-target' )
+               .attr( 'lang', ve.init.platform.getUserLanguages()[ 0 ] );
 };
 
 /* Inheritance */

-- 
To view, visit https://gerrit.wikimedia.org/r/317464
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I1d4eac0ee55148033b4eb0223fc4781e9faecf07
Gerrit-PatchSet: 5
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <esand...@wikimedia.org>
Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits