diff options
| author | enahum <nahumhbl@gmail.com> | 2017-03-09 06:14:26 -0300 |
|---|---|---|
| committer | George Goldberg <george@gberg.me> | 2017-03-09 09:14:26 +0000 |
| commit | 609a1148c73f6ddf52a1c3e54e20af88753e6d45 (patch) | |
| tree | d2d6a1bbd551056930c683d48c018424ebe2ab88 | |
| parent | afbe5bab1182af8f58da2c33970b7c88f9a55927 (diff) | |
| download | chat-609a1148c73f6ddf52a1c3e54e20af88753e6d45.tar.gz chat-609a1148c73f6ddf52a1c3e54e20af88753e6d45.tar.bz2 chat-609a1148c73f6ddf52a1c3e54e20af88753e6d45.zip | |
PLT-5769 Translations filenames and values consistent (#5689)
| -rw-r--r-- | i18n/zh-CN.json (renamed from i18n/zh_CN.json) | 0 | ||||
| -rw-r--r-- | i18n/zh-TW.json (renamed from i18n/zh_TW.json) | 0 | ||||
| -rw-r--r-- | webapp/i18n/i18n.jsx | 4 | ||||
| -rw-r--r-- | webapp/i18n/zh-CN.json (renamed from webapp/i18n/zh_CN.json) | 0 | ||||
| -rw-r--r-- | webapp/i18n/zh-TW.json (renamed from webapp/i18n/zh_TW.json) | 0 |
5 files changed, 2 insertions, 2 deletions
diff --git a/i18n/zh_CN.json b/i18n/zh-CN.json index cef1f7e9d..cef1f7e9d 100644 --- a/i18n/zh_CN.json +++ b/i18n/zh-CN.json diff --git a/i18n/zh_TW.json b/i18n/zh-TW.json index 7eeb068c3..7eeb068c3 100644 --- a/i18n/zh_TW.json +++ b/i18n/zh-TW.json diff --git a/webapp/i18n/i18n.jsx b/webapp/i18n/i18n.jsx index 4eda91198..fd4e42a32 100644 --- a/webapp/i18n/i18n.jsx +++ b/webapp/i18n/i18n.jsx @@ -9,8 +9,8 @@ const ko = require('!!file-loader?name=i18n/[name].[hash].[ext]!./ko.json'); const nl = require('!!file-loader?name=i18n/[name].[hash].[ext]!./nl.json'); const pt_BR = require('!!file-loader?name=i18n/[name].[hash].[ext]!./pt-BR.json'); //eslint-disable-line camelcase const ru = require('!!file-loader?name=i18n/[name].[hash].[ext]!./ru.json'); -const zh_TW = require('!!file-loader?name=i18n/[name].[hash].[ext]!./zh_TW.json'); //eslint-disable-line camelcase -const zh_CN = require('!!file-loader?name=i18n/[name].[hash].[ext]!./zh_CN.json'); //eslint-disable-line camelcase +const zh_TW = require('!!file-loader?name=i18n/[name].[hash].[ext]!./zh-TW.json'); //eslint-disable-line camelcase +const zh_CN = require('!!file-loader?name=i18n/[name].[hash].[ext]!./zh-CN.json'); //eslint-disable-line camelcase import {addLocaleData} from 'react-intl'; import deLocaleData from 'react-intl/locale-data/de'; diff --git a/webapp/i18n/zh_CN.json b/webapp/i18n/zh-CN.json index ad35efe10..ad35efe10 100644 --- a/webapp/i18n/zh_CN.json +++ b/webapp/i18n/zh-CN.json diff --git a/webapp/i18n/zh_TW.json b/webapp/i18n/zh-TW.json index 320af58c5..320af58c5 100644 --- a/webapp/i18n/zh_TW.json +++ b/webapp/i18n/zh-TW.json |