From 02b798bfb5d7e7585b1318eef8e0c2afca73329b Mon Sep 17 00:00:00 2001 From: Mattias Bodlund Date: Thu, 1 Aug 2024 15:53:22 +0200 Subject: [PATCH] na --- app/controllers/application_controller.rb | 2 +- config/application.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index ea56a59..1c114bd 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -5,7 +5,7 @@ class ApplicationController < ActionController::Base private def set_locale - I18n.locale = params[:locale]&.to_sym.presence_in(I18n.available_locales) || I18n.default_locale + I18n.locale = params[:locale].presence_in(I18n.available_locales.map(&:to_s)) || I18n.default_locale end diff --git a/config/application.rb b/config/application.rb index e76c2dc..9c1605e 100644 --- a/config/application.rb +++ b/config/application.rb @@ -31,7 +31,7 @@ module Week2024 config.time_zone = "Copenhagen" config.i18n.default_locale = :en - config.i18n.available_locales = [:en, :zh, :hr, :cs, :da, :nl, :fi, :fr, :de, :hu, :it, :ja, :ko, :nb, :pl, :pt, :ro, :sr, :sk, :sl, :es, :sv, :uk] + config.i18n.available_locales = [:en, :zh, :hr, :cs, :da, :nl, :fi, :'fr-CA', :'fr-FR', :de, :hu, :it, :ja, :ko, :nb, :pl, :pt, :ro, :sr, :sk, :sl, :es, :sv, :uk] config.i18n.fallbacks = true config.active_storage.routes_prefix = 'storage' #change /rails/active_storage to /storage