summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.eslintrc.json2
-rw-r--r--CHANGELOG.md1
-rw-r--r--client/lib/i18n.js1
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;