diff options
| author | Kurtis Rainbolt-Greene <kurtis@rainbolt-greene.online> | 2017-04-07 20:48:27 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-07 20:48:27 -0700 |
| commit | 1e4453405be08be5f1aa8e650780b273d2e36787 (patch) | |
| tree | 20b43ecfc11d61eac0c2d95a63b8b4bd952b80d3 /config/application.rb | |
| parent | 485d75a80500f12fcb59191a79a514fb5ad1c4e3 (diff) | |
| parent | 541c538f9bbd00028b388468b2753b1136f3d5b3 (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') |