diff options
| author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 22:33:40 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-07 22:33:40 -0400 |
| commit | d7d165db5b1b7b1959a36e1f0e3da875befc2574 (patch) | |
| tree | 5be0ded23cf8a3190a3173bd5b16f4c4af77207f /config/application.rb | |
| parent | 73b8e67f4b103fc3400064d153807d6d88f758d4 (diff) | |
| parent | d7f4300ee3ff44a42453ea8042034d651a9789da (diff) | |
Merge branch 'master' into add-infinimatix.net-instance
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') |