Updated some JS translate methods to correctly take in context

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); },
     },
   });
 };