From bc41bc0e4b6eff4750e6b680bebc18ceca94040a Mon Sep 17 00:00:00 2001 From: Robert Richter Date: Sat, 25 Apr 2015 14:06:56 -0500 Subject: [PATCH] Style fixes --- app/controllers/concerns/localized.rb | 4 ++-- config/application.rb | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/app/controllers/concerns/localized.rb b/app/controllers/concerns/localized.rb index 44fe288a..5c3a20ae 100644 --- a/app/controllers/concerns/localized.rb +++ b/app/controllers/concerns/localized.rb @@ -24,8 +24,8 @@ module Localized # 1. a URL paramter called "locale" # 2. the +HTTP_ACCEPT_LANGUAGE+ header property def requested_locale - validate_locale locale_from_url_params || - locale_from_accept_language_header + validate_locale locale_from_url_params || + locale_from_accept_language_header end # Returns the given locale if localizations for it are available. diff --git a/config/application.rb b/config/application.rb index 62f8428b..97543d68 100644 --- a/config/application.rb +++ b/config/application.rb @@ -22,9 +22,7 @@ module PlanCharacters # The default locale is :en and all translations # from config/locales/*.rb,yml are auto loaded. - # - config.i18n.load_path += Dir[Rails.root.join('config', 'locales', '**', '*.{rb,yml}')]