Merge branch 'umbertooo-navigator-preferred-language' into devel

This commit is contained in:
Lauri Ojansivu 2017-03-30 08:14:05 +03:00
commit ee06948074

View file

@ -6,10 +6,16 @@ Meteor.startup(() => {
Tracker.autorun(() => {
const currentUser = Meteor.user();
let language;
if (currentUser && currentUser.profile && currentUser.profile.language) {
language = currentUser.profile.language;
} else {
language = navigator.language || navigator.userLanguage;
if (currentUser) {
language = currentUser.profile && currentUser.profile.language;
}
if (!language) {
if(navigator.languages) {
language = navigator.languages[0];
} else {
language = navigator.language || navigator.userLanguage;
}
}
if (language) {