[Libreoffice-commits] core.git: wizards/com

Caolán McNamara caolanm at redhat.com
Sun Jan 7 16:34:07 UTC 2018


 wizards/com/sun/star/wizards/common/strings.hrc |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 150267f9d1b17b1f4e1443e92dc5247632755e5f
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Jan 7 16:32:58 2018 +0000

    Related: tdf#114873 if fallback returned as result, drop context
    
    Change-Id: I82676e4a0b3dee33e248b3ba81e99f949ee9227a

diff --git a/wizards/com/sun/star/wizards/common/strings.hrc b/wizards/com/sun/star/wizards/common/strings.hrc
index 21110de96fed..46a2097c25cd 100644
--- a/wizards/com/sun/star/wizards/common/strings.hrc
+++ b/wizards/com/sun/star/wizards/common/strings.hrc
@@ -23,7 +23,10 @@ def NC_(context, string):
     # Contextual strings are stored with the concatenation of
     # the context, a EOT byte, and the original string, instead of the original string
     # see https://www.gnu.org/software/gettext/manual/html_node/MO-Files.html
-    return gettext.gettext(context + chr(4) + string)
+    ret = gettext.gettext(context + chr(4) + string)
+    if ret.find(chr(4)) == -1:
+        return ret
+    return string
 
 # common section
 RID_COMMON_START_0                      = NC_("RID_COMMON_START_0", "The directory '%1' could not be created.<BR>There may not be enough space left on your hard disk.")


More information about the Libreoffice-commits mailing list