X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fgettext.C;h=46053cfc59e5407e4e66316470accbf6ed59e26d;hb=c68f3da771a54ef78bd309b8f1a81c374d2fea4c;hp=9d17c623c5e9ed392b07c3212d29a557c4a08582;hpb=efa42293bc4e1be7522351ee8eb1d0d7e78c8e2a;p=lyx.git

diff --git a/src/gettext.C b/src/gettext.C
index 9d17c623c5..46053cfc59 100644
--- a/src/gettext.C
+++ b/src/gettext.C
@@ -1,25 +1,75 @@
+/**
+ * \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"
+#include "support/lstrings.h"
+
+
+namespace lyx {
+
+#ifdef HAVE_LOCALE_H
+#  include <locale.h>
+#endif
+
+using support::setEnv;
+
+using std::string;
+
+
+docstring const _(string const & str)
+{
+	return getGuiMessages().get(str);
+}
+
 
 #ifdef ENABLE_NLS
 
-char const * _(char const * str)
+void locale_init()
 {
-	return gettext(str);
+	// 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()
 {
-	int const s = str.length();
-	char * tmp = new char[s + 1];
-	str.copy(tmp, s);
-	tmp[s] = '\0';
-	string ret(_(tmp));
-	delete [] tmp;
-	return ret;
+	setlocale(LC_NUMERIC, "C");
 }
 
 #endif
+
+
+docstring const translateIfPossible(docstring const & name)
+{
+	if (support::isAscii(name))
+		// Probably from a standard configuration file, try to
+		// translate
+		return _(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