diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2017-03-26 13:13:57 +0200 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-03-26 13:13:57 +0200 |
| commit | ebe53cb38c73714b267c0cffb38f1d9dbdf805d9 (patch) | |
| tree | b73900d48cbf1497f2c5c6cf84ad3f1229df2741 /config/application.rb | |
| parent | 6ec6fe259a8c7fadf7fd308f48f6116b2bd0e73b (diff) | |
| parent | efbbd422163b44322691b97acacc87f3461e0ff9 (diff) | |
Merge branch 'leopku-feature/language_zh-cn'
Diffstat (limited to 'config/application.rb')
| -rw-r--r-- | config/application.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/application.rb b/config/application.rb index cb009b24c..9d32f30cb 100644 --- a/config/application.rb +++ b/config/application.rb @@ -24,7 +24,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] + config.i18n.available_locales = [:en, :de, :es, :pt, :fr, :hu, :uk, 'zh-CN'] config.i18n.default_locale = :en # config.paths.add File.join('app', 'api'), glob: File.join('**', '*.rb') |