diff options
| author | Jan Provaznik <jprovaznik@gitlab.com> | 2018-11-21 12:17:26 +0100 |
|---|---|---|
| committer | Jan Provaznik <jprovaznik@gitlab.com> | 2018-11-21 12:17:26 +0100 |
| commit | e423096b77f37acb446ac36d2cf79eaf632b2628 (patch) | |
| tree | b5b0cc287688bd43078da7a0718cff4f97718632 | |
| parent | 8edce61654463e20c7265d41263fcf8dd62abfae (diff) | |
| download | gitlab-ce-jprovazn-locale-fix.tar.gz | |
Explicitly set locale fallbacksjprovazn-locale-fix
With a recent change in i18n, default language is not
included in fallbacks by default. This causes that
MissingTranslationData exception is raised both in
development and production mode.
This patch sets explicitly fallbacks language to english
which assures that english is used for missing translations.
| -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 921baa5d617..ca252179a38 100644 --- a/config/application.rb +++ b/config/application.rb @@ -66,6 +66,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 |