Bmansurov has uploaded a new change for review.
https://gerrit.wikimedia.org/r/268114
Change subject: Add a util function that detects the device language
......................................................................
Add a util function that detects the device language
Change-Id: If15ddf027d3a57983b4eda5d6deff37b3c0a380d
---
M resources/mobile.startup/util.js
M resources/skins.minerva.scripts/init.js
2 files changed, 14 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/14/268114/1
diff --git a/resources/mobile.startup/util.js b/resources/mobile.startup/util.js
index 2db21ba..78fd941 100644
--- a/resources/mobile.startup/util.js
+++ b/resources/mobile.startup/util.js
@@ -40,6 +40,19 @@
},
/**
+ * Return the language code of the device in lowercase
+ * @returns {String|undefined}
+ */
+ getDeviceLanguage: function () {
+ var lang = navigator && navigator.languages ?
+ navigator.languages[0] :
+ navigator.language ||
navigator.userLanguage ||
+
navigator.browserLanguage || navigator.systemLanguage;
+
+ return lang ? lang.toLowerCase() : undefined;
+ },
+
+ /**
* Check if at least half of the element's height and half of
its width are in viewport
*
* @method
diff --git a/resources/skins.minerva.scripts/init.js
b/resources/skins.minerva.scripts/init.js
index 08b8fab..af92baf 100644
--- a/resources/skins.minerva.scripts/init.js
+++ b/resources/skins.minerva.scripts/init.js
@@ -124,13 +124,7 @@
event: 'languageButtonTap',
languageButtonVersion:
'bottom-of-article',
languageButtonTappedBucket:
tapCountBucket,
- primaryLanguageOfUser: (
- navigator &&
navigator.languages ?
- navigator.languages[0] :
- navigator.language ||
navigator.userLanguage ||
-
navigator.browserLanguage || navigator.systemLanguage ||
- 'unknown'
- ).toLowerCase()
+ primaryLanguageOfUser:
util.getDeviceLanguage() || 'unknown'
} );
} );
}
--
To view, visit https://gerrit.wikimedia.org/r/268114
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If15ddf027d3a57983b4eda5d6deff37b3c0a380d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Bmansurov <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
