Use a string comparsion for locale parameters

Conflicts: core/lib/spree/core/controller_helpers.rb
huoxito · Feb 6, 2013 · 700ba4f · 700ba4f
1 parent 137d58b
commit 700ba4f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/core/app/controllers/spree/locale_controller.rb b/core/app/controllers/spree/locale_controller.rb
@@ -4,8 +4,8 @@ def set
       if request.referer && request.referer.starts_with?('http://' + request.host)
         session['user_return_to'] = request.referer
       end
-      if params[:locale] && I18n.available_locales.include?(params[:locale].to_sym)
-        session[:locale] = I18n.locale = params[:locale].to_sym
+      if params[:locale] && I18n.available_locales.map(&:to_s).include?(params[:locale])
+        session[:locale] = I18n.locale = params[:locale]
         flash.notice = t(:locale_changed)
       else
         flash[:error] = t(:locale_not_changed)

diff --git a/core/lib/spree/core/controller_helpers.rb b/core/lib/spree/core/controller_helpers.rb
@@ -162,10 +162,8 @@ def redirect_back_or_default(default)
       def set_user_language
         locale = session[:locale]
         locale ||= Rails.application.config.i18n.default_locale
-        if locale.blank? || !I18n.available_locales.include?(locale.to_sym)
-          locale ||= I18n.default_locale
-        end
-        I18n.locale = locale.to_sym
+        locale ||= I18n.default_locale unless I18n.available_locales.map(&:to_s).include?(locale)
+        I18n.locale = locale
       end
 
       # Returns which layout to render.