Add _CUPS_MESSAGE_EMPTY flag to allow loading of empty localizations (needed

for checkpo program)

diff --git a/cups/language-private.h b/cups/language-private.h
index dba1d8511f4c8eac384e42ba97530a1e36154c88..7c304dfca7369fa7dd57d7063fb34ace43e2d580 100644 (file)
--- a/cups/language-private.h
+++ b/cups/language-private.h
@@ -41,6 +41,7 @@ extern "C" {
 #  define _CUPS_MESSAGE_PO     0       /* Message file is in GNU .po format */
 #  define _CUPS_MESSAGE_UNQUOTE        1       /* Unescape \foo in strings? */
 #  define _CUPS_MESSAGE_STRINGS        2       /* Message file is in Apple .strings format */
+#  define _CUPS_MESSAGE_EMPTY  4       /* Allow empty localized strings */
 
 
 /*

diff --git a/cups/language.c b/cups/language.c
index 6638ebc7832d2b8fd581306d7fa8b26990529b8c..e0641699035d7d7bb3be705d92273bf900e6a2c4 100644 (file)
--- a/cups/language.c
+++ b/cups/language.c
@@ -1017,7 +1017,7 @@ _cupsMessageLoad(const char *filename,    /* I - Message catalog to load */
 
        if (m)
        {
-         if (m->str && m->str[0])
+         if (m->str && (m->str[0] || (flags & _CUPS_MESSAGE_EMPTY)))
          {
            cupsArrayAdd(a, m);
          }
@@ -1114,7 +1114,7 @@ _cupsMessageLoad(const char *filename,    /* I - Message catalog to load */
 
     if (m)
     {
-      if (m->str && m->str[0])
+      if (m->str && (m->str[0] || (flags & _CUPS_MESSAGE_EMPTY)))
       {
        cupsArrayAdd(a, m);
       }