Merge pull request #25 from mozilla/bug1905520

Android: flag extra parameters as error when reference has none

compare_locales/__init__.py

@@ -1 +1 @@
-version = "9.0.3"
+version = "9.0.4"

compare_locales/checks/android.py

@@ -61,8 +61,8 @@ def check_string(self, refs, l10nEnt):
         params, count, errors = get_params(refs)
         for error, pos in errors:
             yield ("warning", pos, error, "android")
-        if params:
-            yield from check_params(params, count, l10nEnt.val)
+        # Always check parameters, as the translation might have additional ones
+        yield from check_params(params, count, l10nEnt.val)
 
     def not_translatable(self, *nodes):
         return any(

compare_locales/plurals.py

@@ -180,7 +180,6 @@
     "sw": 1,
     "szl": 9,
     "ta": 1,
-    "ta": 1,
     "te": 1,
     "tg": 1,
     "th": 0,

compare_locales/tests/android/test_checks.py

@@ -148,6 +148,26 @@ def test_missing_placeholder(self):
         )
 
 
+class PrintfSTestNoParamsRef(BaseHelper):
+    # Check with a reference that is completely missing parameters
+    file = File("values/strings.xml", "values/strings.xml")
+    refContent = ANDROID_WRAPPER % b""
+
+    def test_extra_param(self):
+        self._test(
+            ANDROID_WRAPPER % b"%1$s",
+            (("error", 0, "Formatter %1$s not found in reference", "android"),),
+        )
+        self._test(
+            ANDROID_WRAPPER % b"%s",
+            (("error", 0, "Formatter %1$s not found in reference", "android"),),
+        )
+        self._test(
+            ANDROID_WRAPPER % b"%2$S",
+            (("error", 0, "Formatter %2$S not found in reference", "android"),),
+        )
+
+
 class PrintfCapSTest(BaseHelper):
     file = File("values/strings.xml", "values/strings.xml")
     refContent = ANDROID_WRAPPER % b"%S"