diff options
| author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 22:38:37 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-07 22:38:37 -0400 |
| commit | 7826b5e93d1937ac409c6499940fd83af2c12cd1 (patch) | |
| tree | 1eaf1cc62022ca9fd46a057b8f76c00d3e099939 /config/application.rb | |
| parent | 0209b7d1b52a2c44cf055c7d7a5209e98ffe04f8 (diff) | |
| parent | fc7b8307190b8f472b526d99bc10db58153850d5 (diff) | |
Merge branch 'master' into patch-1
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 17b7a19cc..9a5c0d0d3 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, 'zh-CN', :fi] + config.i18n.available_locales = [:en, :de, :es, :pt, :fr, :hu, :uk, 'zh-CN', :fi, :eo] config.i18n.default_locale = :en # config.paths.add File.join('app', 'api'), glob: File.join('**', '*.rb') |