Download as
Browse Code »

Commit 64ec5b8529cc5ddf689b4d9b606520c8dad1f306

Authored by Antonio Terceiro
Committed by Daniela Feitosa
1 parent 1b0b8860
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

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?
... ...