diff options
| author | André Lewin <andre.charles.lewin@gmail.com> | 2017-04-05 20:28:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-05 20:28:58 +0200 |
| commit | bf7cefa516075b480fd5da5ea4b1385d7d17bdd5 (patch) | |
| tree | 45bc6b379f5d06553d0a3e5bf4c0e2b452b7552f /config/application.rb | |
| parent | 8736ef50ad13d5506bd6a673d4fcb96c33b609a3 (diff) | |
| parent | d13d169922c7efeb6e6c20ef6a271eeda552275f (diff) | |
Merge branch 'master' into master
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 77cd254af..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', :eo] + 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') |