X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsupport%2Fgettext.cpp;h=44dd5da57a71502c29544d45bcd5cd5725776cc2;hb=b96ce9a9c101a711ef8a1cdd5d6fe812a18966da;hp=a129854e8219492cd2cec496b94041b1410da350;hpb=e0acb978ff34c174dcfaddae08caa70eed11ef35;p=lyx.git

diff --git a/src/support/gettext.cpp b/src/support/gettext.cpp
index a129854e82..44dd5da57a 100644
--- a/src/support/gettext.cpp
+++ b/src/support/gettext.cpp
@@ -15,10 +15,7 @@
 
 #include "support/lstrings.h"
 #include "support/Messages.h"
-
-#ifdef HAVE_LOCALE_H
-#  include <locale.h>
-#endif
+#include "support/Package.h"
 
 using namespace std;
 
@@ -30,22 +27,9 @@ docstring const _(string const & str)
 }
 
 
-void locale_init()
-{
-#ifdef ENABLE_NLS
-#  ifdef HAVE_LC_MESSAGES
-	setlocale(LC_MESSAGES, "");
-#  endif
-	setlocale(LC_CTYPE, "");
-	Messages::init();
-#endif
-	setlocale(LC_NUMERIC, "C");
-}
-
-
 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 +43,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));