diff options
| -rw-r--r-- | README.md | 3 | ||||
| -rw-r--r-- | client/lib/i18n.js | 29 | ||||
| -rw-r--r-- | sandstorm-pkgdef.capnp | 6 | ||||
| -rw-r--r-- | sandstorm.js | 5 |
4 files changed, 23 insertions, 20 deletions
@@ -1,6 +1,7 @@ # Wekan fork [![Join the chat][rocket_badge]][rocket_chat] +[![Build Status][travis_badge]][travis_status] [Wekan fork announcement][fork_announcement] @@ -59,3 +60,5 @@ with [Meteor](https://www.meteor.com). [cloudron_button]: https://cloudron.io/img/button.svg [cloudron_install]: https://cloudron.io/button.html?app=io.wekan.cloudronapp [debian_wheezy]: https://github.com/soohwa/sps/blob/master/example/docs/1/wekan.md +[travis_badge]: https://travis-ci.org/wefork/wekan.svg?branch=master +[travis_status]: https://travis-ci.org/wefork/wekan 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); + } + }); }); diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp index 0aaaed56..5c0961f8 100644 --- a/sandstorm-pkgdef.capnp +++ b/sandstorm-pkgdef.capnp @@ -22,10 +22,10 @@ const pkgdef :Spk.PackageDefinition = ( appTitle = (defaultText = "Wekan"), # The name of the app as it is displayed to the user. - appVersion = 14, + appVersion = 16, # Increment this for every release. - appMarketingVersion = (defaultText = "0.11.0~2016-11-08"), + appMarketingVersion = (defaultText = "0.11.0~2016-11-15"), # Human-readable presentation of the app version. minUpgradableAppVersion = 0, @@ -58,7 +58,7 @@ const pkgdef :Spk.PackageDefinition = ( ), website = "https://wekan.io", - codeUrl = "https://github.com/wekan/wekan", + codeUrl = "https://github.com/wefork/wekan", license = (openSource = mit), categories = [productivity, office], diff --git a/sandstorm.js b/sandstorm.js index 07007be1..dc5b10d6 100644 --- a/sandstorm.js +++ b/sandstorm.js @@ -116,9 +116,10 @@ if (isSandstorm && Meteor.isServer) { mentioned: !!user.mentioned, subscribed: !!user.subscribed, }; - }).catch(() => { - // Ignore identities that fail to resolve. Probably they have lost access to the board. }); + }).catch(() => { + // Ignore identities that fail to restore. Either they were added before we set + // `saveIdentityCaps` to true, or they have lost access to the board. }); })).then((maybeUsers) => { const users = maybeUsers.filter((u) => !!u); |