add debug function which prints the callstack to stderr, disabled by default

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

diff --git a/src/support/gettext.cpp b/src/support/gettext.cpp
index a129854e8219492cd2cec496b94041b1410da350..1414fa58121b9832626cc56d40a5f78b029c45c0 100644 (file)
--- a/src/support/gettext.cpp
+++ b/src/support/gettext.cpp
@@ -15,6 +15,7 @@
 
 #include "support/lstrings.h"
 #include "support/Messages.h"
+#include "support/Package.h"
 
 #ifdef HAVE_LOCALE_H
 #  include <locale.h>
@@ -37,7 +38,9 @@ void locale_init()
        setlocale(LC_MESSAGES, "");
 #  endif
        setlocale(LC_CTYPE, "");
-       Messages::init();
+       if (support::packageInitialized()) {
+               Messages::init();
+       }
 #endif
        setlocale(LC_NUMERIC, "C");
 }
@@ -45,7 +48,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));
@@ -59,7 +62,7 @@ docstring const translateIfPossible(docstring const & name)
 
 docstring const translateIfPossible(docstring const & name, std::string const & language)
 {
-       if (support::isAscii(name))
+       if (support::isAscii(name) && !name.empty())
                // Probably from a standard configuration file, try to
                // translate
                return getMessages(language).get(to_ascii(name));