diff options
| author | Lauri Ojansivu <x@xet7.org> | 2017-06-26 12:34:36 +0300 |
|---|---|---|
| committer | Lauri Ojansivu <x@xet7.org> | 2017-06-26 12:34:36 +0300 |
| commit | 974825bbcf8f6bde426b0bd04c12bb9430d22182 (patch) | |
| tree | ff3e80d037e6df6c45b9c5ab2e495da05e4332ca | |
| parent | 6c9725a8c9c1ca9fc0536a1f8cb6a98f3f0d3676 (diff) | |
| parent | 06bcb7adaafb16eb57150844f43dd8c0b548f650 (diff) | |
| download | wekan-974825bbcf8f6bde426b0bd04c12bb9430d22182.tar.gz wekan-974825bbcf8f6bde426b0bd04c12bb9430d22182.tar.bz2 wekan-974825bbcf8f6bde426b0bd04c12bb9430d22182.zip | |
Merge branch 'fix-i18n-subfolder' of https://github.com/nztqa/wekan into nztqa-fix-i18n-subfolder
| -rw-r--r-- | .eslintrc.json | 2 | ||||
| -rw-r--r-- | client/lib/i18n.js | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/.eslintrc.json b/.eslintrc.json index 5fa05a38..64e2b702 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -28,7 +28,7 @@ "no-unneeded-ternary": 2, "radix": 2, "semi": [2, "always"], - "camelcase": 2, + "camelcase": [2, {"properties": "never"}], "comma-spacing": 2, "comma-style": 2, "eol-last": 2, diff --git a/client/lib/i18n.js b/client/lib/i18n.js index 4c02211a..97a91375 100644 --- a/client/lib/i18n.js +++ b/client/lib/i18n.js @@ -3,6 +3,7 @@ // information provided by the browser, and default to english. Meteor.startup(() => { + TAPi18n.conf.i18n_files_route = Meteor._relativeToSiteRootUrl('/tap-i18n'); Tracker.autorun(() => { const currentUser = Meteor.user(); let language; |