kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'jprovazn-locale-fix' into 'master'

Browse source 
Explicitly set locale fallbacks

Closes #54274

See merge request gitlab-org/gitlab-ce!23271
This commit is contained in:
Grzegorz Bizon 2018-11-23 12:50:51 +00:00
commit 3b601b8299
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
config/application.rb
View file

@ -69,6 +69,12 @@ module Gitlab
# config.i18n.default_locale = :de # config.i18n.default_locale = :de
config.i18n.enforce_available_locales = false config.i18n.enforce_available_locales = false
# Enable locale fallbacks for I18n (makes lookups for any locale fall back to
# the I18n.default_locale when a translation can not be found).
# We have to explicitly set default locale since 1.1.0 - see:
# https://github.com/svenfuchs/i18n/pull/415
config.i18n.fallbacks = [:en]
# Translation for AR attrs is not working well for POROs like WikiPage # Translation for AR attrs is not working well for POROs like WikiPage
config.gettext_i18n_rails.use_for_active_record_attributes = false config.gettext_i18n_rails.use_for_active_record_attributes = false

4
config/environments/production.rb
View file

@ -65,10 +65,6 @@ Rails.application.configure do
# Enable threaded mode # Enable threaded mode
# config.threadsafe! unless $rails_rake_task # config.threadsafe! unless $rails_rake_task
# Enable locale fallbacks for I18n (makes lookups for any locale fall back to
# the I18n.default_locale when a translation can not be found)
config.i18n.fallbacks = true
# Send deprecation notices to registered listeners # Send deprecation notices to registered listeners
config.active_support.deprecation = :notify config.active_support.deprecation = :notify