Download as
Browse Code »

Commit 64ec5b8529cc5ddf689b4d9b606520c8dad1f306

Authored by Antonio Terceiro
Committed by Daniela Feitosa
1 parent 1b0b8860
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Fix browser language detection 

FastGettext.locale= returns its argument instead of returning the locale
that was actually detected.

(ActionItem2297)
Showing 2 changed files with 8 additions and 1 deletions   Show diff stats
app/controllers/application_controller.rb
  Diff comments   View file @64ec5b8
... ... @@ -42,7 +42,8 @@ class ApplicationController < ActionController::Base
42 42 def set_locale
43 43 FastGettext.available_locales = Noosfero.available_locales
44 44 FastGettext.default_locale = Noosfero.default_locale
45   - I18n.locale = FastGettext.locale = (params[:lang] || session[:lang] || Noosfero.default_locale || request.env['HTTP_ACCEPT_LANGUAGE'] || 'en')
  45 + FastGettext.locale = (params[:lang] || session[:lang] || Noosfero.default_locale || request.env['HTTP_ACCEPT_LANGUAGE'] || 'en')
  46 + I18n.locale = FastGettext.locale
46 47 if params[:lang]
47 48 session[:lang] = params[:lang]
48 49 end
... ...
test/functional/application_controller_test.rb
  Diff comments   View file @64ec5b8
... ... @@ -334,6 +334,12 @@ class ApplicationControllerTest < ActionController::TestCase
334 334 assert_tag :html, :attributes => { :lang => 'es' }
335 335 end
336 336  
  337 + should 'set Rails locale correctly' do
  338 + @request.env['HTTP_ACCEPT_LANGUAGE'] = 'pt-BR,pt;q=0.8,en;q=0.6,en-US;q=0.4'
  339 + get :index
  340 + assert_equal 'pt', I18n.locale.to_s
  341 + end
  342 +
337 343 should 'include stylesheets supplied by plugins' do
338 344 class Plugin1 < Noosfero::Plugin
339 345 def stylesheet?
... ...