CMake: fix merged build, seems GCC could not handle the namespaces correctly

[lyx.git] / src / support / gettext.cpp

diff --git a/src/support/gettext.cpp b/src/support/gettext.cpp
index 37a50ce11c60c32b771b0b847965294a8f82e2d1..119c67b8ba129b6dfdf4a1b3cf6b653ea7f9711d 100644 (file)
--- a/src/support/gettext.cpp
+++ b/src/support/gettext.cpp
@@ -45,7 +45,7 @@ void locale_init()
 
 docstring const translateIfPossible(docstring const & name)
 {
-       if (support::isAscii(name))
+       if (support::isAscii(name) && !name.empty())
                // Probably from a standard configuration file, try to
                // translate
                return _(to_ascii(name));
@@ -57,4 +57,18 @@ docstring const translateIfPossible(docstring const & name)
 }
 
 
+docstring const translateIfPossible(docstring const & name, std::string const & language)
+{
+       if (support::isAscii(name) && !name.empty())
+               // Probably from a standard configuration file, try to
+               // translate
+               return getMessages(language).get(to_ascii(name));
+       else
+               // This must be from a user defined configuration file. We
+               // cannot translate this, since gettext accepts only ascii
+               // keys.
+               return name;
+}
+
+
 } // namespace lyx