diff options
Diffstat (limited to 'client')
| -rw-r--r-- | client/lib/filter.js | 6 | ||||
| -rw-r--r-- | client/lib/i18n.js | 29 |
2 files changed, 17 insertions, 18 deletions
diff --git a/client/lib/filter.js b/client/lib/filter.js index afa992ab..8129776b 100644 --- a/client/lib/filter.js +++ b/client/lib/filter.js @@ -66,9 +66,9 @@ class SetFilter { _getEmptySelector() { this._dep.depend(); - let includeEmpty = false + let includeEmpty = false; this._selectedElements.forEach((el) => { - if (el == undefined) { + if (el === undefined) { includeEmpty = true; } }); @@ -113,7 +113,7 @@ Filter = { if (filter._isActive()) { filterSelector[fieldName] = filter._getMongoSelector(); emptySelector[fieldName] = filter._getEmptySelector(); - if (emptySelector[fieldName] != null) { + if (emptySelector[fieldName] !== null) { includeEmptySelectors = true; } } diff --git a/client/lib/i18n.js b/client/lib/i18n.js index a03fb398..34a789e1 100644 --- a/client/lib/i18n.js +++ b/client/lib/i18n.js @@ -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); + } + }); }); |