diff options
| author | elijah <elijah@riseup.net> | 2015-07-14 14:54:27 -0700 |
|---|---|---|
| committer | elijah <elijah@riseup.net> | 2015-07-14 14:54:27 -0700 |
| commit | 8986b2ffdec389b59df4cb9eb48f2f0a0220b462 (patch) | |
| tree | bbafabf606929a8b6eff1d4b3ed17d48b65cee5b /app/controllers | |
| parent | b08d4871dfa77f6fd41a53b51377033d96f47332 (diff) | |
fix i18n tests
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/application_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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 } |