diff options
author | halna_Tanaguru <fhalna@oceaneconsulting.com> | 2017-04-04 12:06:53 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-04 12:06:53 +0200 |
commit | 3abb0f7bc708ae8ca387aee8560b9558f8b209ba (patch) | |
tree | 6014fdec3201d9e40fa244b821bdaffc83bfa131 /config/application.rb | |
parent | 3f30ae1f97717177f29711d5b99d7970c6b75b3e (diff) | |
parent | eb023beb4975a019d6a3b3091483c91c2c837bbd (diff) |
Merge branch 'master' into development
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 9d32f30cb..17b7a19cc 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'] + config.i18n.available_locales = [:en, :de, :es, :pt, :fr, :hu, :uk, 'zh-CN', :fi] config.i18n.default_locale = :en # config.paths.add File.join('app', 'api'), glob: File.join('**', '*.rb') |