From 7281649214e40ab3957e854ca35b7c671f95b084 Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Thu, 24 Jan 2019 12:05:21 -0500 Subject: [PATCH] Add _CUPS_MESSAGE_EMPTY flag to allow loading of empty localizations (needed for checkpo program) --- cups/language-private.h | 1 + cups/language.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cups/language-private.h b/cups/language-private.h index dba1d8511..7c304dfca 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 6638ebc78..e06416990 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); } -- 2.39.2