Download as
Browse Code »

Commit 5768c140546c322b386769cdb0b8b2e473a837a8

Authored by Rodrigo Souto
2 parents f137d4f6 6e7e44d5
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

Merge branch 'ai3085' into 'stable' 

Use I18n fallbacks and default_locale as in FastGettext

http://noosfero.org/Development/ActionItem3085
Showing 2 changed files with 5 additions and 0 deletions   Show diff stats
app/controllers/application_controller.rb
  Diff comments   View file @5768c14
... ... @@ -65,6 +65,7 @@ class ApplicationController < ActionController::Base
65 65 FastGettext.default_locale = environment.default_locale
66 66 FastGettext.locale = (params[:lang] || session[:lang] || environment.default_locale || request.env['HTTP_ACCEPT_LANGUAGE'] || 'en')
67 67 I18n.locale = FastGettext.locale
  68 + I18n.default_locale = FastGettext.default_locale
68 69 if params[:lang]
69 70 session[:lang] = params[:lang]
70 71 end
... ...
config/initializers/i18n.rb 0 → 100644
  Diff comments   View file @5768c14
... ... @@ -0,0 +1,4 @@
  1 +# necessary for I18n.default_locale to work
  2 +require 'i18n/backend/fallbacks'
  3 +I18n.backend.class.send :include, I18n::Backend::Fallbacks
  4 +
... ...