From 13f68f0d195d6bde3934a69fa6d0fcad7007ce68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=96=B0=E9=83=BD=E5=BF=83=28Neet=20Shin=29?= Date: Tue, 11 Apr 2017 14:33:55 +0530 Subject: [PATCH 1/4] Added japanese translate locales --- app/assets/javascripts/components/locales/index.jsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/components/locales/index.jsx b/app/assets/javascripts/components/locales/index.jsx index f9e1fe5bd4..da85240b7e 100644 --- a/app/assets/javascripts/components/locales/index.jsx +++ b/app/assets/javascripts/components/locales/index.jsx @@ -8,6 +8,7 @@ import uk from './uk'; import fi from './fi'; import eo from './eo'; import ru from './ru'; +import ja from './ja'; const locales = { @@ -20,7 +21,8 @@ const locales = { uk, fi, eo, - ru + ru, + ja }; From d6407713e35ff993be89be43ef778d034a6a455a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=96=B0=E9=83=BD=E5=BF=83=28Neet=20Shin=29?= Date: Tue, 11 Apr 2017 14:46:15 +0530 Subject: [PATCH 2/4] Added :ja to available_locales MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit こっちも --- config/application.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/application.rb b/config/application.rb index dc937ca0eb..a3991639c5 100644 --- a/config/application.rb +++ b/config/application.rb @@ -25,7 +25,7 @@ module Mastodon # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded. # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s] - config.i18n.available_locales = [:en, :de, :es, :pt, :fr, :hu, :uk, 'zh-CN', :fi, :eo, :ru] + config.i18n.available_locales = [:en, :de, :es, :pt, :fr, :hu, :uk, 'zh-CN', :fi, :eo, :ru, :ja] config.i18n.default_locale = :en From e9b8b86b2b3356bc9533433129f1d560c2cbaf4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=96=B0=E9=83=BD=E5=BF=83=28Neet=20Shin=29?= Date: Tue, 11 Apr 2017 14:47:34 +0530 Subject: [PATCH 3/4] =?UTF-8?q?Added=20"=E6=97=A5=E6=9C=AC=E8=AA=9E"=20to?= =?UTF-8?q?=20HUMAN=5FLOCALES?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/settings_helper.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/helpers/settings_helper.rb b/app/helpers/settings_helper.rb index 327ca4e989..8a94df5f4d 100644 --- a/app/helpers/settings_helper.rb +++ b/app/helpers/settings_helper.rb @@ -13,6 +13,7 @@ module SettingsHelper 'zh-CN': '简体中文', fi: 'Suomi', ru: 'Русский', + ja: '日本語', }.freeze From cedde04e7b09d8b8b4e701dda1c2585c590e881b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=96=B0=E9=83=BD=E5=BF=83=28Neet=20Shin=29?= Date: Tue, 11 Apr 2017 15:29:26 +0530 Subject: [PATCH 4/4] Imported/Added ja to addLocaleData --- app/assets/javascripts/components/containers/mastodon.jsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/components/containers/mastodon.jsx b/app/assets/javascripts/components/containers/mastodon.jsx index fea8b15949..d48bb2ba98 100644 --- a/app/assets/javascripts/components/containers/mastodon.jsx +++ b/app/assets/javascripts/components/containers/mastodon.jsx @@ -49,6 +49,7 @@ import uk from 'react-intl/locale-data/uk'; import fi from 'react-intl/locale-data/fi'; import eo from 'react-intl/locale-data/eo'; import ru from 'react-intl/locale-data/ru'; +import ja from 'react-intl/locale-data/ja'; import getMessagesForLocale from '../locales'; import { hydrateStore } from '../actions/store'; @@ -63,7 +64,7 @@ const browserHistory = useRouterHistory(createBrowserHistory)({ }); -addLocaleData([...en, ...de, ...es, ...fr, ...pt, ...hu, ...uk, ...fi, ...eo, ...ru]); +addLocaleData([...en, ...de, ...es, ...fr, ...pt, ...hu, ...uk, ...fi, ...eo, ...ru, ...ja]); const Mastodon = React.createClass({