From 8986b2ffdec389b59df4cb9eb48f2f0a0220b462 Mon Sep 17 00:00:00 2001 From: elijah Date: Tue, 14 Jul 2015 14:54:27 -0700 Subject: fix i18n tests --- app/controllers/application_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/controllers') diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 58e6f83..a4cbfb5 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -58,7 +58,7 @@ class ApplicationController < ActionController::Base end def default_url_options(options={}) - if request_may_have_locale?(request) + if request_may_have_locale?(request) && I18n.locale != I18n.default_locale { :locale => I18n.locale } else { :locale => nil } -- cgit v1.2.3