浏览代码

Merge branch 'nztqa-fix-i18n-subfolder' into devel

Fix i18n route for subfolder. Thanks to nztqa ! Related: #973
Lauri Ojansivu 8 年之前
父节点
当前提交
2356ad8fec
共有 3 个文件被更改,包括 3 次插入1 次删除
  1. 1 1
      .eslintrc.json
  2. 1 0
      CHANGELOG.md
  3. 1 0
      client/lib/i18n.js

+ 1 - 1
.eslintrc.json

@@ -28,7 +28,7 @@
     "no-unneeded-ternary": 2,
     "no-unneeded-ternary": 2,
     "radix": 2,
     "radix": 2,
     "semi": [2, "always"],
     "semi": [2, "always"],
-    "camelcase": 2,
+    "camelcase": [2, {"properties": "never"}],
     "comma-spacing": 2,
     "comma-spacing": 2,
     "comma-style": 2,
     "comma-style": 2,
     "eol-last": 2,
     "eol-last": 2,

+ 1 - 0
CHANGELOG.md

@@ -3,6 +3,7 @@
 This release fixes the following bugs:
 This release fixes the following bugs:
 
 
 * [Fix admin panel route for subfolder](https://github.com/wekan/wekan/pull/1084);
 * [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.
 Thanks to GitHub user nztqa for contributions.
 
 

+ 1 - 0
client/lib/i18n.js

@@ -3,6 +3,7 @@
 // information provided by the browser, and default to english.
 // information provided by the browser, and default to english.
 
 
 Meteor.startup(() => {
 Meteor.startup(() => {
+  TAPi18n.conf.i18n_files_route = Meteor._relativeToSiteRootUrl('/tap-i18n');
   Tracker.autorun(() => {
   Tracker.autorun(() => {
     const currentUser = Meteor.user();
     const currentUser = Meteor.user();
     let language;
     let language;