diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-05-25 18:05:06 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-05-25 18:05:06 +0000 |
| commit | b3b6c78112c97df32c406f7dd18031e540df3297 (patch) | |
| tree | 4abd36a4157b40fd3a6bdab227ca00b415a2f801 /config | |
| parent | 43c3614ebfd3a224b9db5718f19aa1e1eb7e7e61 (diff) | |
| parent | 5c921809cd86e1031a6a5075da142fef3bb01d6d (diff) | |
| download | gitlab-ce-b3b6c78112c97df32c406f7dd18031e540df3297.tar.gz | |
Merge branch '32748-emails-are-being-sent-with-the-wrong-language' into 'master'
Bugfix: Always use the default language when generating emails.
Closes #32748
See merge request !11662
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/fast_gettext.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/initializers/fast_gettext.rb b/config/initializers/fast_gettext.rb index a69fe0c902e..eb589ecdb52 100644 --- a/config/initializers/fast_gettext.rb +++ b/config/initializers/fast_gettext.rb @@ -1,5 +1,6 @@ FastGettext.add_text_domain 'gitlab', path: File.join(Rails.root, 'locale'), type: :po FastGettext.default_text_domain = 'gitlab' FastGettext.default_available_locales = Gitlab::I18n.available_locales +FastGettext.default_locale = :en I18n.available_locales = Gitlab::I18n.available_locales |