Download as
Browse Code »

Commit c0ad93d2fd698a17d3d14c1b0f52f2e2f5d71f50

Authored by Antonio Terceiro
1 parent 5c2c22bf
Exists in master and in 22 other branches angular_poc, api-article-archived, article-readonly, backup-7-jan-2016, captcha_serpro_plugin, content-manager-hostspot, export-comment-paragraph, fix_event_date_issue, login-captcha, master_rails3, new_video_plugin, pg_search_rank, production, refactor_with_role, refactor_with_role_scope, remove_profile_cat_icons, resend_confirmation_email, staging, staging_rails3, tasks_keep_filter_params, theme-brasil-digital-from-staging, travis

ActionItem830: rewriting forced default locale handling

Showing 2 changed files with 3 additions and 7 deletions   Show diff stats
app/controllers/application.rb
  Diff comments   View file @c0ad93d
@@ -78,12 +78,8 @@ class ApplicationController < ActionController::Base @@ -78,12 +78,8 @@ class ApplicationController < ActionController::Base
78 end 78 end
79 end 79 end
80 def default_locale 80 def default_locale
81 - if Noosfero.default_locale  
82 - if cookies[:lang].blank?  
83 - set_locale Noosfero.default_locale  
84 - else  
85 - set_locale cookies[:lang]  
86 - end 81 + if Noosfero.default_locale && cookies[:lang].blank?
  82 + cookies[:lang] = params[:lang] = Noosfero.default_locale
87 end 83 end
88 end 84 end
89 protected :maybe_save_locale, :default_locale 85 protected :maybe_save_locale, :default_locale
config/environment.rb
  Diff comments   View file @c0ad93d
@@ -128,7 +128,7 @@ require 'noosfero' @@ -128,7 +128,7 @@ require 'noosfero'
128 require 'sqlite_extension' 128 require 'sqlite_extension'
129 129
130 # load a local configuration if present, but not under test environment. 130 # load a local configuration if present, but not under test environment.
131 -if ENV['RAILS_ENV'] != 'test' 131 +if !['test', 'cucumber'].include?(ENV['RAILS_ENV'])
132 localconfigfile = File.join(RAILS_ROOT, 'config', 'local.rb') 132 localconfigfile = File.join(RAILS_ROOT, 'config', 'local.rb')
133 if File.exists?(localconfigfile) 133 if File.exists?(localconfigfile)
134 require localconfigfile 134 require localconfigfile