Merge pull request #4 from NeetShin/master

Added japanese translate locales
This commit is contained in:
pinfort 2017-04-12 00:11:27 +09:00 committed by GitHub
commit 4aa8158f2f
4 changed files with 7 additions and 3 deletions

View File

@ -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({

View File

@ -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
};

View File

@ -13,6 +13,7 @@ module SettingsHelper
'zh-CN': '简体中文',
fi: 'Suomi',
ru: 'Русский',
ja: '日本語',
}.freeze

View File

@ -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