X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fgettext.C;h=aae9bc7f5c12b91b6e989775e99fda66c2b7484b;hb=b9963e1a57135c3e2ab128a9ec4300f0e4886992;hp=3c3c0e253f603feb292f528fd5d1049f359320b8;hpb=1e6f221aa50ade6c9807dccda2d14f3853f5517b;p=lyx.git

diff --git a/src/gettext.C b/src/gettext.C
index 3c3c0e253f..aae9bc7f5c 100644
--- a/src/gettext.C
+++ b/src/gettext.C
@@ -1,32 +1,64 @@
+/**
+ * \file src/gettext.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author Lars Gullik Bjønnes
+ * \author Jean-Marc Lasgouttes
+ *
+ * Full author contact details are available in file CREDITS.
+ */
+
 #include <config.h>
 
-#include "LString.h"
 #include "gettext.h"
+#include "messages.h"
+#include "support/environment.h"
+
+#ifdef HAVE_LOCALE_H
+#  include <locale.h>
+#endif
+
+using std::string;
+using lyx::support::setEnv;
+
+
+namespace {
+
+Messages & getLyXMessages()
+{
+	static Messages lyx_messages;
+
+	return lyx_messages;
+}
+
+} // anon namespace
+
+
+string const _(string const & str)
+{
+	return getLyXMessages().get(str);
+}
+
 
 #ifdef ENABLE_NLS
 
-char const * _(char const * str)
+void locale_init()
 {
-	if (str && str[0])
-		return gettext(str);
-	else
-		return "";
+	// Disable, as otherwise it overrides everything else incl. the doc language
+	setEnv("LANGUAGE", "");
+#  ifdef HAVE_LC_MESSAGES
+	setlocale(LC_MESSAGES, "");
+#  endif
+	setlocale(LC_CTYPE, "");
+	setlocale(LC_NUMERIC, "C");
 }
 
+#else // ENABLE_NLS
 
-string const _(string const & str) 
+void locale_init()
 {
-	if (!str.empty()) {
-		int const s = str.length();
-		char * tmp = new char[s + 1];
-		str.copy(tmp, s);
-		tmp[s] = '\0';
-		string ret(gettext(tmp));
-		delete [] tmp;
-		return ret;
-	}
-	else
-		return string();
+	setlocale(LC_NUMERIC, "C");
 }
 
 #endif