From 6a7c935d43e8de4e818ff9435f4adb420cd1aa79 Mon Sep 17 00:00:00 2001 From: Taylor Griffin Date: Thu, 16 Oct 2014 06:37:02 +1100 Subject: [PATCH] try setting locale from query parameter first --- app/controllers/application_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 1b27f01fc..e417984fa 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -35,10 +35,10 @@ class ApplicationController < ActionController::Base end def set_locale - I18n.locale = extract_locale_tld || I18n.default_locale + I18n.locale = params[:locale] || extract_locale_from_subdomain || I18n.default_locale end - def extract_locale_tld + def extract_locale_from_subdomain parsed_locale = request.subdomains.first I18n.available_locales.map(&:to_s).include?(parsed_locale) ? parsed_locale : nil end