summaryrefslogtreecommitdiff
path: root/config/application.rb
diff options
context:
space:
mode:
authorJan Provaznik <jprovaznik@gitlab.com>2018-11-21 12:17:26 +0100
committerJan Provaznik <jprovaznik@gitlab.com>2018-11-21 12:17:26 +0100
commite423096b77f37acb446ac36d2cf79eaf632b2628 (patch)
treeb5b0cc287688bd43078da7a0718cff4f97718632 /config/application.rb
parent8edce61654463e20c7265d41263fcf8dd62abfae (diff)
downloadgitlab-ce-e423096b77f37acb446ac36d2cf79eaf632b2628.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.
Diffstat (limited to 'config/application.rb')
-rw-r--r--config/application.rb6
1 files changed, 6 insertions, 0 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