diff --git a/config/application.rb b/config/application.rb index 98bdb1e336..f93d224129 100644 --- a/config/application.rb +++ b/config/application.rb @@ -1,6 +1,7 @@ require_relative 'boot' require 'rails/all' +require_relative "../lib/open_food_network/i18n_config" if defined?(Bundler) # If you precompile assets before deploying to production, use this line @@ -104,9 +105,8 @@ module Openfoodnetwork # 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.default_locale = ENV["LOCALE"] || ENV["I18N_LOCALE"] || "en" - config.i18n.available_locales = ENV["AVAILABLE_LOCALES"].andand.split(/[\s,]/).andand.map(&:strip) || [] - config.i18n.available_locales = (config.i18n.available_locales + [config.i18n.default_locale, 'en']).uniq + config.i18n.default_locale = OpenFoodNetwork::I18nConfig.default_locale + config.i18n.available_locales = OpenFoodNetwork::I18nConfig.available_locales I18n.locale = config.i18n.locale = config.i18n.default_locale # Setting this to true causes a performance regression in Rails 3.2.17