Last of the media improvements (Issue #5167)

[thirdparty/cups.git] / locale / checkpo.c

diff --git a/locale/checkpo.c b/locale/checkpo.c
index 75d9255dad06113826c002d1fb7f39d997e8fd3f..4e6052b8e452dac5e45c719ee462c43150786dbe 100644 (file)
--- a/locale/checkpo.c
+++ b/locale/checkpo.c
@@ -68,9 +68,9 @@ main(int  argc,                               /* I - Number of command-line args */
     */
 
     if (strstr(argv[i], ".strings"))
-      po = _cupsMessageLoad(argv[i], _CUPS_MESSAGE_STRINGS | _CUPS_MESSAGE_UNQUOTE);
+      po = _cupsMessageLoad(argv[i], _CUPS_MESSAGE_STRINGS);
     else
-      po = _cupsMessageLoad(argv[i], _CUPS_MESSAGE_UNQUOTE);
+      po = _cupsMessageLoad(argv[i], _CUPS_MESSAGE_PO);
 
     if (!po)
     {
@@ -232,22 +232,27 @@ main(int  argc,                           /* I - Number of command-line args */
       */
 
       for (strfmt = msg->str; *strfmt; strfmt ++)
-        if (*strfmt == '\\' &&
-           strfmt[1] != '\\' && strfmt[1] != 'n' && strfmt[1] != 'r' &&
-           strfmt[1] != 't' && strfmt[1] != '\"' && !isdigit(strfmt[1] & 255))
-       {
-         if (pass)
+      {
+        if (*strfmt == '\\')
+        {
+          strfmt ++;
+
+          if (*strfmt != '\\' && *strfmt != 'n' && *strfmt != 'r' && *strfmt != 't' && *strfmt != '\"' && !isdigit(*strfmt & 255))
          {
-           pass = 0;
-           puts("FAIL");
+           if (pass)
+           {
+             pass = 0;
+             puts("FAIL");
+           }
+
+           printf("    Bad escape \\%c in filter message \"%s\"\n"
+                  "      for \"%s\"\n", strfmt[1],
+                  abbreviate(msg->str, strbuf, sizeof(strbuf)),
+                  abbreviate(msg->msg, idbuf, sizeof(idbuf)));
+           break;
          }
-
-         printf("    Bad escape \\%c in filter message \"%s\"\n"
-                "      for \"%s\"\n", strfmt[1],
-                abbreviate(msg->str, strbuf, sizeof(strbuf)),
-                abbreviate(msg->msg, idbuf, sizeof(idbuf)));
-          break;
-        }
+       }
+      }
     }
 
     if (pass)