Download as
Browse Code »

Commit 6ae357043b91f48a1eca88e1a4edac63b88b4daf

Authored by Antonio Terceiro
1 parent 28b264c7
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

ActionItem830: forcing single-supported locale

Showing 3 changed files with 13 additions and 7 deletions   Show diff stats
app/controllers/application.rb
  Diff comments   View file @6ae3570
@@ -62,6 +62,9 @@ class ApplicationController < ActionController::Base @@ -62,6 +62,9 @@ class ApplicationController < ActionController::Base
62 62
63 before_init_gettext :maybe_save_locale 63 before_init_gettext :maybe_save_locale
64 after_init_gettext :check_locale 64 after_init_gettext :check_locale
  65 + if Noosfero.available_locales.size == 1
  66 + GetText.locale = Noosfero.available_locales.first
  67 + end
65 init_gettext 'noosfero' 68 init_gettext 'noosfero'
66 69
67 include NeedsProfile 70 include NeedsProfile
@@ -117,16 +120,19 @@ class ApplicationController < ActionController::Base @@ -117,16 +120,19 @@ class ApplicationController < ActionController::Base
117 end 120 end
118 121
119 def maybe_save_locale 122 def maybe_save_locale
120 - # save locale if forced  
121 - if params[:lang]  
122 - cookies[:lang] = params[:lang] 123 + if Noosfero.available_locales.size > 1
  124 + # save locale if forced
  125 + if params[:lang]
  126 + cookies[:lang] = params[:lang]
  127 + end
  128 + # force GetText to load a matching locale
  129 + GetText.locale = nil
123 end 130 end
124 - # force GetText to load a matching locale  
125 - GetText.locale = nil  
126 end 131 end
127 132
128 def check_locale 133 def check_locale
129 available_locales = Noosfero.available_locales 134 available_locales = Noosfero.available_locales
  135 + return if available_locales.size == 1
130 136
131 # do not accept unsupported locales 137 # do not accept unsupported locales
132 if !available_locales.include?(locale.to_s) 138 if !available_locales.include?(locale.to_s)
lib/noosfero.rb
  Diff comments   View file @6ae3570
@@ -13,7 +13,7 @@ module Noosfero @@ -13,7 +13,7 @@ module Noosfero
13 attr_accessor :locales 13 attr_accessor :locales
14 attr_accessor :default_locale 14 attr_accessor :default_locale
15 def available_locales 15 def available_locales
16 - Dir.glob(File.join(RAILS_ROOT, 'locale', '*')).map { |f| File.basename(f) }.select {|item| locales.include?(item) } 16 + @available_locales ||= (Dir.glob(File.join(RAILS_ROOT, 'locale', '*')).map { |f| File.basename(f) }.select {|item| locales.include?(item) })
17 end 17 end
18 end 18 end
19 19
test/integration/locale_setting_test.rb
  Diff comments   View file @6ae3570
@@ -6,7 +6,7 @@ class LocaleSettingTest < ActionController::IntegrationTest @@ -6,7 +6,7 @@ class LocaleSettingTest < ActionController::IntegrationTest
6 # reset GetText before every test 6 # reset GetText before every test
7 GetText.locale = nil 7 GetText.locale = nil
8 Noosfero.stubs(:default_locale).returns('en') 8 Noosfero.stubs(:default_locale).returns('en')
9 - Noosfero.stubs(:available_locales).returns(['pt_BR']) 9 + Noosfero.stubs(:available_locales).returns(['pt_BR', 'ja_JP'])
10 end 10 end
11 11
12 should 'be able to set a default language' do 12 should 'be able to set a default language' do