diff options
author | Phil Hughes <me@iamphill.com> | 2017-05-03 12:02:26 +0100 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2017-05-03 12:02:26 +0100 |
commit | 93f27958d02389b3550d25470ccd29b304005e96 (patch) | |
tree | 83deff34c5347dfdb38c6298c5ba677cbe330be9 /app/assets/javascripts/vue_shared/translate.js | |
parent | 6d5364cfb0e39f49afac9b465f37bd19185c3755 (diff) | |
download | gitlab-ce-93f27958d02389b3550d25470ccd29b304005e96.tar.gz |
Updated some JS translate methods to correctly take in context
Diffstat (limited to 'app/assets/javascripts/vue_shared/translate.js')
-rw-r--r-- | app/assets/javascripts/vue_shared/translate.js | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/app/assets/javascripts/vue_shared/translate.js b/app/assets/javascripts/vue_shared/translate.js index c2c20ea0853..07ef00c10d0 100644 --- a/app/assets/javascripts/vue_shared/translate.js +++ b/app/assets/javascripts/vue_shared/translate.js @@ -1,7 +1,6 @@ import { __, n__, - s__, } from '../locale'; export default (Vue) => { @@ -9,9 +8,16 @@ export default (Vue) => { methods: { __(text) { return __(text); }, n__(text, pluralText, count) { - return n__(text, pluralText, count).replace(/%d/g, count); + const translated = n__(text, pluralText, count).replace(/%d/g, count).split('|'); + return translated[translated.length - 1]; + }, + s__(keyOrContext, key) { + const normalizedKey = key ? `${keyOrContext}|${key}` : keyOrContext; + // eslint-disable-next-line no-underscore-dangle + const translated = this.__(normalizedKey).split('|'); + + return translated[translated.length - 1]; }, - s__(context, key) { return s__(context, key); }, }, }); }; |