diff options
| author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-03-09 00:17:17 +0000 |
|---|---|---|
| committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-03-09 00:17:17 +0000 |
| commit | 447d7e612753d69f043e08ebb228b21e411c8b4a (patch) | |
| tree | 80caebcff2b131898f620f89ad0858d44530d30f /config/application.rb | |
| parent | 43a9a781a443a6b9296431fbcc4285b3ca6a1a57 (diff) | |
| parent | ff44b2e92d496c6027b20157fea6ebd885906bea (diff) | |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'config/application.rb')
| -rw-r--r-- | config/application.rb | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/config/application.rb b/config/application.rb index 88d0eccf2..f63746e34 100644 --- a/config/application.rb +++ b/config/application.rb @@ -32,7 +32,7 @@ module Mastodon # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC. # config.time_zone = 'Central Time (US & Canada)' - # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded. + # 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, @@ -74,7 +74,12 @@ module Mastodon :'zh-TW', ] - config.i18n.default_locale = :en + config.i18n.default_locale = ENV['DEFAULT_LOCALE']&.to_sym + if config.i18n.available_locales.include?(config.i18n.default_locale) + config.i18n.fallbacks = [:en] + else + config.i18n.default_locale = :en + end # config.paths.add File.join('app', 'api'), glob: File.join('**', '*.rb') # config.autoload_paths += Dir[Rails.root.join('app', 'api', '*')] |