From: Michael R Sweet <michael.r.sweet@gmail.com>
Date: Thu, 24 Jan 2019 17:05:21 +0000 (-0500)
Subject: Add _CUPS_MESSAGE_EMPTY flag to allow loading of empty localizations (needed
X-Git-Tag: v2.3b8~129
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7281649214e40ab3957e854ca35b7c671f95b084;p=thirdparty%2Fcups.git

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 dba1d8511f..7c304dfca7 100644
--- 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 6638ebc783..e064169903 100644
--- 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);
       }