Fix JSONFilter remove prefix

box · Jun 18, 2024 · 4344a3f · 4344a3f
1 parent 51bc9b2
commit 4344a3f
Show file tree

Hide file tree

Showing 10 changed files with 158 additions and 3 deletions.
diff --git a/cli/src/test/java/com/box/l10n/mojito/cli/command/ImportLocalizedAssetCommandTest.java b/cli/src/test/java/com/box/l10n/mojito/cli/command/ImportLocalizedAssetCommandTest.java
@@ -732,6 +732,58 @@ public void importJsonDefaultFormatJs() throws Exception {
     checkExpectedGeneratedResources();
   }
 
+  @Test
+  public void importJsonDefaultFormatJsCompiled() throws Exception {
+
+    Repository repository = createTestRepoUsingRepoService();
+
+    getL10nJCommander()
+        .run(
+            "push",
+            "-r",
+            repository.getName(),
+            "-s",
+            getInputResourcesTestDir("source").getAbsolutePath(),
+            "-ft",
+            "JSON_NOBASENAME",
+            "-fo",
+            "noteKeyPattern=description",
+            "extractAllPairs=false",
+            "exceptions=defaultMessage",
+            "removeKeySuffix=/defaultMessage");
+
+    getL10nJCommander()
+        .run(
+            "import",
+            "-r",
+            repository.getName(),
+            "-s",
+            getInputResourcesTestDir("source").getAbsolutePath(),
+            "-t",
+            getInputResourcesTestDir("translations").getAbsolutePath(),
+            "-ft",
+            "JSON_NOBASENAME");
+
+    getL10nJCommander()
+        .run(
+            "pull",
+            "-r",
+            repository.getName(),
+            "-s",
+            getInputResourcesTestDir("source").getAbsolutePath(),
+            "-t",
+            getTargetTestDir().getAbsolutePath(),
+            "-ft",
+            "JSON_NOBASENAME",
+            "-fo",
+            "noteKeyPattern=description",
+            "extractAllPairs=false",
+            "exceptions=defaultMessage",
+            "removeKeySuffix=/defaultMessage");
+
+    checkExpectedGeneratedResources();
+  }
+
   @Test
   public void importJsonI18NextParser() throws Exception {
 

diff --git a/.../ImportLocalizedAssetCommandTest_IO/importJsonDefaultFormatJsCompiled/expected/fr-CA.json b/.../ImportLocalizedAssetCommandTest_IO/importJsonDefaultFormatJsCompiled/expected/fr-CA.json
@@ -0,0 +1,21 @@
+{
+  "100_character_description_": {
+    "defaultMessage": "Description de 100 caractères :"
+  },
+  "15_min_duration": {
+    "defaultMessage": "15 min",
+    "description": "File lock dialog duration"
+  },
+  "1_day_duration": {
+    "defaultMessage": "1 jour",
+    "description": "File lock dialog duration"
+  },
+  "1_hour_duration": {
+    "defaultMessage": "1 heure",
+    "description": "File lock dialog duration"
+  },
+  "1_month_duration": {
+    "defaultMessage": "1 mois",
+    "description": "File lock dialog duration"
+  }
+}
diff --git a/.../ImportLocalizedAssetCommandTest_IO/importJsonDefaultFormatJsCompiled/expected/fr-FR.json b/.../ImportLocalizedAssetCommandTest_IO/importJsonDefaultFormatJsCompiled/expected/fr-FR.json
@@ -0,0 +1,21 @@
+{
+  "100_character_description_": {
+    "defaultMessage": "Description de 100 caractères :"
+  },
+  "15_min_duration": {
+    "defaultMessage": "15 min",
+    "description": "File lock dialog duration"
+  },
+  "1_day_duration": {
+    "defaultMessage": "1 jour",
+    "description": "File lock dialog duration"
+  },
+  "1_hour_duration": {
+    "defaultMessage": "1 heure",
+    "description": "File lock dialog duration"
+  },
+  "1_month_duration": {
+    "defaultMessage": "1 mois",
+    "description": "File lock dialog duration"
+  }
+}
diff --git a/.../ImportLocalizedAssetCommandTest_IO/importJsonDefaultFormatJsCompiled/expected/ja-JP.json b/.../ImportLocalizedAssetCommandTest_IO/importJsonDefaultFormatJsCompiled/expected/ja-JP.json
@@ -0,0 +1,21 @@
+{
+  "100_character_description_": {
+    "defaultMessage": "100文字の説明:"
+  },
+  "15_min_duration": {
+    "defaultMessage": "15分",
+    "description": "File lock dialog duration"
+  },
+  "1_day_duration": {
+    "defaultMessage": "1日",
+    "description": "File lock dialog duration"
+  },
+  "1_hour_duration": {
+    "defaultMessage": "1時間",
+    "description": "File lock dialog duration"
+  },
+  "1_month_duration": {
+    "defaultMessage": "1か月",
+    "description": "File lock dialog duration"
+  }
+}
diff --git a/...ImportLocalizedAssetCommandTest_IO/importJsonDefaultFormatJsCompiled/input/source/en.json b/...ImportLocalizedAssetCommandTest_IO/importJsonDefaultFormatJsCompiled/input/source/en.json
@@ -0,0 +1,21 @@
+{
+  "100_character_description_": {
+    "defaultMessage": "100 character description:"
+  },
+  "15_min_duration": {
+    "defaultMessage": "15 min",
+    "description": "File lock dialog duration"
+  },
+  "1_day_duration": {
+    "defaultMessage": "1 day",
+    "description": "File lock dialog duration"
+  },
+  "1_hour_duration": {
+    "defaultMessage": "1 hour",
+    "description": "File lock dialog duration"
+  },
+  "1_month_duration": {
+    "defaultMessage": "1 month",
+    "description": "File lock dialog duration"
+  }
+}
diff --git a/...alizedAssetCommandTest_IO/importJsonDefaultFormatJsCompiled/input/translations/fr-CA.json b/...alizedAssetCommandTest_IO/importJsonDefaultFormatJsCompiled/input/translations/fr-CA.json
@@ -0,0 +1,7 @@
+{
+  "100_character_description_": "Description de 100 caractères :",
+  "15_min_duration": "15 min",
+  "1_day_duration": "1 jour",
+  "1_hour_duration": "1 heure",
+  "1_month_duration": "1 mois"
+}
diff --git a/...alizedAssetCommandTest_IO/importJsonDefaultFormatJsCompiled/input/translations/fr-FR.json b/...alizedAssetCommandTest_IO/importJsonDefaultFormatJsCompiled/input/translations/fr-FR.json
@@ -0,0 +1,7 @@
+{
+  "100_character_description_": "Description de 100 caractères :",
+  "15_min_duration": "15 min",
+  "1_day_duration": "1 jour",
+  "1_hour_duration": "1 heure",
+  "1_month_duration": "1 mois"
+}
diff --git a/...alizedAssetCommandTest_IO/importJsonDefaultFormatJsCompiled/input/translations/ja-JP.json b/...alizedAssetCommandTest_IO/importJsonDefaultFormatJsCompiled/input/translations/ja-JP.json
@@ -0,0 +1,7 @@
+{
+  "100_character_description_": "100文字の説明:",
+  "15_min_duration": "15分",
+  "1_day_duration": "1日",
+  "1_hour_duration": "1時間",
+  "1_month_duration": "1か月"
+}
diff --git a/common/src/main/java/com/box/l10n/mojito/okapi/filters/JSONFilter.java b/common/src/main/java/com/box/l10n/mojito/okapi/filters/JSONFilter.java
@@ -199,8 +199,6 @@ String removeKeySuffixIfMatch(String key) {
     if (removeKeySuffix != null) {
       if (key.endsWith(removeKeySuffix)) {
         key = key.substring(0, key.length() - removeKeySuffix.length());
-        logger.debug("Remove suffix from key: {}", key);
-        getEventTextUnit().setName(key);
       }
     }
     return key;

diff --git a/webapp/src/main/java/com/box/l10n/mojito/okapi/ImportTranslationsFromLocalizedAssetStep.java b/webapp/src/main/java/com/box/l10n/mojito/okapi/ImportTranslationsFromLocalizedAssetStep.java
@@ -160,7 +160,7 @@ protected TMTextUnitVariant importTextUnit(
         tmTextUnitVariantCommentAnnotation.setMessage(integrityCheckException.getMessage());
 
         tmTextUnitVariantCommentAnnotation.setSeverity(
-            TMTextUnitVariantComment.Severity.ERROR); //TODO(ja) dial it down for plural strings?
+            TMTextUnitVariantComment.Severity.ERROR); // TODO(ja) dial it down for plural strings?
 
         new TMTextUnitVariantCommentAnnotations(target)
             .addAnnotation(tmTextUnitVariantCommentAnnotation);