mirror of
https://github.com/wekan/wekan.git
synced 2026-02-02 22:51:47 +01:00
Merge pull request #4 from dwrensha/t9n-set-language
Fix failure to load when navigator.language is Chinese or Finnish.
This commit is contained in:
commit
0733fd64ee
1 changed files with 14 additions and 15 deletions
|
|
@ -2,20 +2,19 @@
|
|||
// the language reactively. If the user is not connected we use the language
|
||||
// information provided by the browser, and default to english.
|
||||
|
||||
Tracker.autorun(() => {
|
||||
const currentUser = Meteor.user();
|
||||
let language;
|
||||
if (currentUser) {
|
||||
language = currentUser.profile && currentUser.profile.language;
|
||||
} else {
|
||||
language = navigator.language || navigator.userLanguage;
|
||||
}
|
||||
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 (language) {
|
||||
TAPi18n.setLanguage(language);
|
||||
|
||||
// XXX
|
||||
const shortLanguage = language.split('-')[0];
|
||||
T9n.setLanguage(shortLanguage);
|
||||
}
|
||||
if (language) {
|
||||
TAPi18n.setLanguage(language);
|
||||
T9n.setLanguage(language);
|
||||
}
|
||||
});
|
||||
});
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue