From 620261ecb31e134ececca9184089b3786667f85b Mon Sep 17 00:00:00 2001 From: Yeechan Lu Date: Fri, 21 Apr 2017 09:28:38 +0800 Subject: [PATCH] Fix Chinese (China) translation availability (#2230) --- app/assets/javascripts/components/containers/mastodon.jsx | 2 ++ app/assets/javascripts/components/locales/index.jsx | 2 ++ 2 files changed, 4 insertions(+) diff --git a/app/assets/javascripts/components/containers/mastodon.jsx b/app/assets/javascripts/components/containers/mastodon.jsx index d96f0b344e..2050d9362b 100644 --- a/app/assets/javascripts/components/containers/mastodon.jsx +++ b/app/assets/javascripts/components/containers/mastodon.jsx @@ -58,6 +58,7 @@ import uk from 'react-intl/locale-data/uk'; import zh from 'react-intl/locale-data/zh'; import bg from 'react-intl/locale-data/bg'; import { localeData as zh_hk } from '../locales/zh-hk'; +import { localeData as zh_cn } from '../locales/zh-cn'; import pt_br from '../locales/pt-br'; import getMessagesForLocale from '../locales'; import { hydrateStore } from '../actions/store'; @@ -89,6 +90,7 @@ addLocaleData([ ...uk, ...zh, ...zh_hk, + ...zh_cn, ...bg, ]); diff --git a/app/assets/javascripts/components/locales/index.jsx b/app/assets/javascripts/components/locales/index.jsx index 35823748a6..a7dfeca73c 100644 --- a/app/assets/javascripts/components/locales/index.jsx +++ b/app/assets/javascripts/components/locales/index.jsx @@ -16,6 +16,7 @@ import eo from './eo'; import ru from './ru'; import ja from './ja'; import zh_hk from './zh-hk'; +import zh_cn from './zh-cn'; import bg from './bg'; const locales = { @@ -36,6 +37,7 @@ const locales = { ru, ja, 'zh-HK': zh_hk, + 'zh-CN': zh_cn, bg, };