diff options
| author | Lauri Ojansivu <x@xet7.org> | 2017-06-26 12:40:24 +0300 |
|---|---|---|
| committer | Lauri Ojansivu <x@xet7.org> | 2017-06-26 12:40:24 +0300 |
| commit | 2356ad8fec44f48d3cc6e07d5a735b54365dfbea (patch) | |
| tree | e9d68d40c8d56a04d5d7791eb26dc8aec15ce744 | |
| parent | 6c9725a8c9c1ca9fc0536a1f8cb6a98f3f0d3676 (diff) | |
| parent | 1f80f9673542f2386376f74d1bf74becd46d357a (diff) | |
| download | wekan-2356ad8fec44f48d3cc6e07d5a735b54365dfbea.tar.gz wekan-2356ad8fec44f48d3cc6e07d5a735b54365dfbea.tar.bz2 wekan-2356ad8fec44f48d3cc6e07d5a735b54365dfbea.zip | |
Merge branch 'nztqa-fix-i18n-subfolder' into devel
Fix i18n route for subfolder. Thanks to nztqa ! Related: #973
| -rw-r--r-- | .eslintrc.json | 2 | ||||
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | client/lib/i18n.js | 1 |
3 files changed, 3 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/CHANGELOG.md b/CHANGELOG.md index f97e1db8..053b7a2d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ This release fixes the following bugs: * [Fix admin panel route for subfolder](https://github.com/wekan/wekan/pull/1084); +* [Fix i18n route for subfolder](https://github.com/wekan/wekan/pull/1085). Thanks to GitHub user nztqa for contributions. 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; |