diff options
| author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 22:41:07 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-07 22:41:07 -0400 |
| commit | 9edee2e64f30667e6f848bb7e27adb82cf1f91cd (patch) | |
| tree | 1eb422e98bd7aefb687fd9d0938c669e7e6783f8 /config/application.rb | |
| parent | 30619a67168c0f021d37daa5d717e7a508cafd49 (diff) | |
| parent | d7e1a282fe95fe04e918f52bdd476dedc6e97d01 (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') |