JS/TS filter updated to support template strings in backquotes (#480)

* JS/TS filter updated to support template strings in backquotes * fix to handle empty line in the template string
box · Aug 22, 2019 · 32d9182 · 32d9182
1 parent 3f42d5c
commit 32d9182
Show file tree

Hide file tree

Showing 14 changed files with 471 additions and 64 deletions.
diff --git a/...st/resources/com/box/l10n/mojito/cli/command/PullCommandTest/pullTS/expected/target/fr.ts b/...st/resources/com/box/l10n/mojito/cli/command/PullCommandTest/pullTS/expected/target/fr.ts
@@ -1,5 +1,6 @@
 namespace Translations {
-  "100_character_description_": "Description de 100 caractères :",
+  "100_character_description_": `Description de
+100 caractères : \`command\``,
   // File lock dialog duration
   "15_min_duration": "15 min",
   // File lock dialog duration

diff --git a/...st/resources/com/box/l10n/mojito/cli/command/PullCommandTest/pullTS/expected/target/ja.ts b/...st/resources/com/box/l10n/mojito/cli/command/PullCommandTest/pullTS/expected/target/ja.ts
@@ -1,5 +1,6 @@
 namespace Translations {
-  "100_character_description_": "Description de 100 caractères :",
+  "100_character_description_": `100文字
+の説明: \`command\``,
   // File lock dialog duration
   "15_min_duration": "15分",
   // File lock dialog duration

diff --git a/...ces/com/box/l10n/mojito/cli/command/PullCommandTest/pullTS/expected/target_modified/fr.ts b/...ces/com/box/l10n/mojito/cli/command/PullCommandTest/pullTS/expected/target_modified/fr.ts
@@ -1,5 +1,6 @@
 namespace Translations {
-  "100_character_description_": "Description de 100 caractères :",
+  "100_character_description_": `Description de
+100 caractères : \`command\``,
   // File lock dialog duration
   "15_min_duration": "15 min",
   // File lock dialog duration

diff --git a/...ces/com/box/l10n/mojito/cli/command/PullCommandTest/pullTS/expected/target_modified/ja.ts b/...ces/com/box/l10n/mojito/cli/command/PullCommandTest/pullTS/expected/target_modified/ja.ts
@@ -1,5 +1,6 @@
 namespace Translations {
-  "100_character_description_": "Description de 100 caractères :",
+  "100_character_description_": `100文字
+の説明: \`command\``,
   // File lock dialog duration
   "15_min_duration": "15分",
   // File lock dialog duration

diff --git a/.../test/resources/com/box/l10n/mojito/cli/command/PullCommandTest/pullTS/input/source/en.ts b/.../test/resources/com/box/l10n/mojito/cli/command/PullCommandTest/pullTS/input/source/en.ts
@@ -1,5 +1,6 @@
 namespace Translations {
-  "100_character_description_": "100 character description:",
+  "100_character_description_": `100 character
+description: \`command\``,
   // File lock dialog duration
   "15_min_duration": "15 min",
   // File lock dialog duration

diff --git a/...ources/com/box/l10n/mojito/cli/command/PullCommandTest/pullTS/input/source_modified/en.ts b/...ources/com/box/l10n/mojito/cli/command/PullCommandTest/pullTS/input/source_modified/en.ts
@@ -1,5 +1,6 @@
 namespace Translations {
-  "100_character_description_": "100 character description:",
+  "100_character_description_": `100 character
+description: \`command\``,
   // File lock dialog duration
   "15_min_duration": "15 min",
   // File lock dialog duration

diff --git a/...10n/mojito/cli/command/PullCommandTest/pullTS/input/translations/source-xliff_fr-FR.xliff b/...10n/mojito/cli/command/PullCommandTest/pullTS/input/translations/source-xliff_fr-FR.xliff
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:2.0" version="2.0">
-    <file original=""  source-language="en" target-language="fr-FR" datatype="x-undefined">
+    <file original=""  source-language="en" target-language="fr-FR" datatype="x-undefined" xml:space="preserve">
         <body>
             <trans-unit id="" resname="100_character_description_" datatype="php">
-                <source>100 character description:</source>
-                <target>Description de 100 caractères :</target>
+                <source>100 character
+description: `command`</source>
+                <target>Description de
+100 caractères : `command`</target>
             </trans-unit>
             <trans-unit id="" resname="15_min_duration" datatype="x-javascript+php">
                 <source>15 min</source>

diff --git a/...10n/mojito/cli/command/PullCommandTest/pullTS/input/translations/source-xliff_ja-JP.xliff b/...10n/mojito/cli/command/PullCommandTest/pullTS/input/translations/source-xliff_ja-JP.xliff
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:2.0" version="2.0">
-    <file original=""  source-language="en" target-language="ja-JP" datatype="x-undefined">
+    <file original=""  source-language="en" target-language="ja-JP" datatype="x-undefined" xml:space="preserve">
         <body>
             <trans-unit id="" resname="100_character_description_" datatype="php">
-                <source>100 character description:</source>
-                <target>Description de 100 caractères :</target>
+                <source>100 character
+description: `command`</source>
+                <target>100文字
+の説明: `command`</target>
             </trans-unit>
             <trans-unit id="" resname="15_min_duration" datatype="x-javascript+php">
                 <source>15 min</source>

diff --git a/webapp/src/main/java/com/box/l10n/mojito/okapi/filters/JSEncoder.java b/webapp/src/main/java/com/box/l10n/mojito/okapi/filters/JSEncoder.java
@@ -0,0 +1,35 @@
+package com.box.l10n.mojito.okapi.filters;
+
+import net.sf.okapi.common.encoder.EncoderContext;
+
+/**
+ *
+ * @author jyi
+ */
+public class JSEncoder extends SimpleEncoder {
+
+    @Override
+    public String encode(char value, EncoderContext context) {
+        String res;
+
+        switch (value) {
+            case '\n':
+                res = "\\n";
+                break;
+            case '\r':
+                res = "\\r";
+                break;
+            case '"':
+                res = "\\\"";
+                break;
+            case '`':
+                res = "\\`";
+                break;
+            default:
+                res = String.valueOf(value);
+                break;
+        }
+
+        return res;
+    }
+}