diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2018-02-01 08:47:25 +0000 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2018-02-01 08:47:25 +0000 |
commit | ab0d41e2da736a431681475f3dab43519186e05e (patch) | |
tree | 60a466b823ce7d5707538e8b999fb93cfcadcf99 | |
parent | dbcd43db16a7222293cea9b2f2bdf35570ddbc9d (diff) | |
parent | 10a2d95a7b9627a47a338d68c24eb936bc9da01b (diff) | |
download | gitlab-ce-ab0d41e2da736a431681475f3dab43519186e05e.tar.gz |
Merge branch 'fix-internationalization-namespace' into 'master'
Remove namespaced internationalization import
See merge request gitlab-org/gitlab-ce!16838
-rw-r--r-- | app/assets/javascripts/awards_handler.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/awards_handler.js b/app/assets/javascripts/awards_handler.js index d9341837149..87109a802e5 100644 --- a/app/assets/javascripts/awards_handler.js +++ b/app/assets/javascripts/awards_handler.js @@ -1,7 +1,7 @@ /* eslint-disable class-methods-use-this */ import _ from 'underscore'; import Cookies from 'js-cookie'; -import { s__ } from './locale'; +import { __ } from './locale'; import { isInIssuePage, updateTooltipTitle } from './lib/utils/common_utils'; import flash from './flash'; import axios from './lib/utils/axios_utils'; @@ -451,7 +451,7 @@ class AwardsHandler { callback(); } }) - .catch(() => flash(s__('Something went wrong on our end.'))); + .catch(() => flash(__('Something went wrong on our end.'))); } } |