From 3884ae370fba72d7bdeaf30343638a796b08187d Mon Sep 17 00:00:00 2001 From: Katharina Fey Date: Mon, 25 Jun 2018 17:19:17 +0200 Subject: [PATCH 1/2] Switching the default locale to :en --- config/application.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/application.rb b/config/application.rb index 480a47b51..ba1b20124 100644 --- a/config/application.rb +++ b/config/application.rb @@ -29,10 +29,10 @@ class Application < Rails::Application config.middleware.use(Rack::I18nLocaleSwitcher) config.i18n.fallbacks = true config.i18n.load_path += Dir[Rails.root.join('config', 'locales', '**', '*.{rb,yml}')] - config.i18n.default_locale = :de - config.i18n.enforce_available_locales = false + config.i18n.default_locale = :en # We changed the default locale to english because #681 + config.i18n.enforce_available_locales = true - config.i18n.available_locales = [:de] + config.i18n.available_locales = [:en] # Use all locales that we have translations when not in production Dir.glob(Rails.root.join('config', 'locales', '*')).each do |directory| locale = File.basename(directory).to_sym From ba188ecbf6a6aed53a25027278e58fea5b5189c0 Mon Sep 17 00:00:00 2001 From: Katharina Fey Date: Mon, 25 Jun 2018 17:31:23 +0200 Subject: [PATCH 2/2] Not enforcing locales --- config/application.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/application.rb b/config/application.rb index ba1b20124..99af7f335 100644 --- a/config/application.rb +++ b/config/application.rb @@ -30,9 +30,9 @@ class Application < Rails::Application config.i18n.fallbacks = true config.i18n.load_path += Dir[Rails.root.join('config', 'locales', '**', '*.{rb,yml}')] config.i18n.default_locale = :en # We changed the default locale to english because #681 - config.i18n.enforce_available_locales = true + config.i18n.enforce_available_locales = false - config.i18n.available_locales = [:en] + config.i18n.available_locales = [:de] # Use all locales that we have translations when not in production Dir.glob(Rails.root.join('config', 'locales', '*')).each do |directory| locale = File.basename(directory).to_sym