Add _CUPS_MESSAGE_EMPTY flag to allow loading of empty localizations …

…(needed for checkpo program)
neonkore · Jan 24, 2019 · 7281649 · 7281649
1 parent 7cc7148
commit 7281649
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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);
       }