X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fgettext.C;h=46053cfc59e5407e4e66316470accbf6ed59e26d;hb=e7f4618bcce770369cf46335c2c7f0164b4b8857;hp=6401bb616e777e9c813fdc338cd4ee0644672462;hpb=6c300f72a217722652dc27db9108e1050028979c;p=lyx.git

diff --git a/src/gettext.C b/src/gettext.C
index 6401bb616e..46053cfc59 100644
--- a/src/gettext.C
+++ b/src/gettext.C
@@ -13,8 +13,9 @@
 
 #include "gettext.h"
 #include "messages.h"
+
 #include "support/environment.h"
-#include "support/docstring.h"
+#include "support/lstrings.h"
 
 
 namespace lyx {
@@ -28,21 +29,9 @@ using support::setEnv;
 using std::string;
 
 
-namespace {
-
-static Messages & getLyXMessages()
-{
-	static Messages lyx_messages;
-
-	return lyx_messages;
-}
-
-} // anon namespace
-
-
 docstring const _(string const & str)
 {
-	return getLyXMessages().get(str);
+	return getGuiMessages().get(str);
 }
 
 
@@ -69,4 +58,18 @@ void locale_init()
 #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