diff options
| author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 23:05:08 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-07 23:05:08 -0400 |
| commit | 63686fd36f9dead2bc0d4b3cb53d841a9b320da2 (patch) | |
| tree | cf24925ee083396659048373096e8907de458341 /config/application.rb | |
| parent | 4c751d25e5f0a2a211115b069651f0747c162d7a (diff) | |
| parent | a25a384af3d08a05bc0907261f76410da36cbb10 (diff) | |
Merge branch 'master' into patch-2
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') |