]> git.ipfire.org Git - thirdparty/gettext.git/commitdiff
javascript: Fix format type compatibility check
authorDaiki Ueno <ueno@gnu.org>
Mon, 23 May 2016 03:02:31 +0000 (12:02 +0900)
committerDaiki Ueno <ueno@gnu.org>
Mon, 23 May 2016 03:02:31 +0000 (12:02 +0900)
* gettext-tools/src/format-javascript.c (format_check): Check if the two
argument types are the same.

gettext-tools/src/format-javascript.c

index c9c3d3272b40e5b5a2eb39e0bb5883aac02967d8..42f2dce34f8f8792a54dd5e06b0a7d813bbdbdee 100644 (file)
@@ -381,9 +381,10 @@ format_check (void *msgid_descr, void *msgstr_descr, bool equality,
           {
             if (spec1->numbered[i].number == spec2->numbered[j].number)
               {
-                if (!equality
-                    && (spec1->numbered[i].type == FAT_ANY
-                        || spec2->numbered[i].type == FAT_ANY))
+                if (!(spec1->numbered[i].type == spec2->numbered[j].type
+                      || (!equality
+                          && (spec1->numbered[i].type == FAT_ANY
+                              || spec2->numbered[i].type == FAT_ANY))))
                   {
                     if (error_logger)
                       error_logger (_("format specifications in '%s' and '%s' for argument %u are not the same"),