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 /lib/api/api.rb | |
| 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 'lib/api/api.rb')
| -rw-r--r-- | lib/api/api.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/api/api.rb b/lib/api/api.rb index 52cd7cbe3db..ac113c5200d 100644 --- a/lib/api/api.rb +++ b/lib/api/api.rb @@ -45,9 +45,9 @@ module API end before { allow_access_with_scope :api } - before { Gitlab::I18n.set_locale(current_user) } + before { Gitlab::I18n.locale = current_user&.preferred_language } - after { Gitlab::I18n.reset_locale } + after { Gitlab::I18n.use_default_locale } rescue_from Gitlab::Access::AccessDeniedError do rack_response({ 'message' => '403 Forbidden' }.to_json, 403) |