diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-11-23 12:50:51 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-11-23 12:50:51 +0000 |
| commit | 3b601b82997a9bde956aff8e2628b012fcaa539e (patch) | |
| tree | fe1c814dfd065952db6abd1f417898b809b1234c | |
| parent | 3a12a848593ebfa3adc2ecec2728413e744e6646 (diff) | |
| parent | e423096b77f37acb446ac36d2cf79eaf632b2628 (diff) | |
| download | gitlab-ce-3b601b82997a9bde956aff8e2628b012fcaa539e.tar.gz | |
Merge branch 'jprovazn-locale-fix' into 'master'
Explicitly set locale fallbacks
Closes #54274
See merge request gitlab-org/gitlab-ce!23271
| -rw-r--r-- | config/application.rb | 6 | ||||
| -rw-r--r-- | config/environments/production.rb | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/config/application.rb b/config/application.rb index 796aa85e113..5804d8fd27b 100644 --- a/config/application.rb +++ b/config/application.rb @@ -69,6 +69,12 @@ module Gitlab # config.i18n.default_locale = :de 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 config.gettext_i18n_rails.use_for_active_record_attributes = false diff --git a/config/environments/production.rb b/config/environments/production.rb index 71195164e7a..49a4e873093 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -65,10 +65,6 @@ Rails.application.configure do # Enable threaded mode # 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 config.active_support.deprecation = :notify |