Add latest changes from gitlab-org/gitlab@master

1 files changed, 4 insertions, 6 deletions

diff --git a/scripts/frontend/extract_gettext_all.js b/scripts/frontend/extract_gettext_all.js
index 922aa85241f..0cd6ab99a3a 100644
--- a/scripts/frontend/extract_gettext_all.js
+++ b/scripts/frontend/extract_gettext_all.js
@@ -19,7 +19,7 @@ extractor.addMessageTransformFunction(ensureSingleLine);
 
 const jsParser = extractor.createJsParser([
   // Place all the possible expressions to extract here:
-  JsExtractors.callExpression('__', {
+  JsExtractors.callExpression(['__', 's__'], {
     arguments: {
       text: 0,
     },
@@ -30,15 +30,13 @@ const jsParser = extractor.createJsParser([
       textPlural: 1,
     },
   }),
-  JsExtractors.callExpression('s__', {
-    arguments: {
-      text: 0,
-    },
-  }),
 ]);
 
 const vueParser = decorateJSParserWithVueSupport(jsParser, {
   vue2TemplateCompiler,
+  // All of our expressions contain `__`.
+  // So we can safely ignore parsing files _not_ containing it.
+  guard: '__',
 });
 
 function printJson() {