diff options
| author | Kushal Pandya <kushalspandya@gmail.com> | 2019-05-15 16:02:51 +0300 |
|---|---|---|
| committer | Kushal Pandya <kushalspandya@gmail.com> | 2019-05-15 16:02:51 +0300 |
| commit | e5d2e7e677455ed620652e3a641718f6984a0b37 (patch) | |
| tree | 58f4cac7f80f28be682c66b69eec2ad794f854f2 /app/assets/javascripts/main.js | |
| parent | 3ed275536488e10c10d3c341fbd0fcf7abd891bf (diff) | |
| parent | d3e86b4422453d39bf8cde7d7dc7542b174b68fc (diff) | |
Merge branch 'js-i18n-m' into 'master'
i18n JS files starting with m
See merge request gitlab-org/gitlab-ce!28068
Diffstat (limited to 'app/assets/javascripts/main.js')
| -rw-r--r-- | app/assets/javascripts/main.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js index 213d5c6521a..1af21715551 100644 --- a/app/assets/javascripts/main.js +++ b/app/assets/javascripts/main.js @@ -31,6 +31,7 @@ import initPerformanceBar from './performance_bar'; import initSearchAutocomplete from './search_autocomplete'; import GlFieldErrors from './gl_field_errors'; import initUserPopovers from './user_popovers'; +import { __ } from './locale'; // expose jQuery as global (TODO: remove these) window.jQuery = jQuery; @@ -219,9 +220,9 @@ document.addEventListener('DOMContentLoaded', () => { const ref = xhrObj.status; if (ref === 401) { - Flash('You need to be logged in.'); + Flash(__('You need to be logged in.')); } else if (ref === 404 || ref === 500) { - Flash('Something went wrong on our end.'); + Flash(__('Something went wrong on our end.')); } }); |