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

diff --git a/src/gettext.C b/src/gettext.C
index ea38cc88e9..46053cfc59 100644
--- a/src/gettext.C
+++ b/src/gettext.C
@@ -13,32 +13,25 @@
 
 #include "gettext.h"
 #include "messages.h"
+
 #include "support/environment.h"
-#include "support/docstring.h"
+#include "support/lstrings.h"
+
+
+namespace lyx {
 
 #ifdef HAVE_LOCALE_H
 #  include <locale.h>
 #endif
 
-using std::string;
-using lyx::support::setEnv;
-
+using support::setEnv;
 
-namespace {
-
-Messages & getLyXMessages()
-{
-	static Messages lyx_messages;
-
-	return lyx_messages;
-}
-
-} // anon namespace
+using std::string;
 
 
-string const _(string const & str)
+docstring const _(string const & str)
 {
-	return lyx::to_utf8(getLyXMessages().get(str));
+	return getGuiMessages().get(str);
 }
 
 
@@ -63,3 +56,20 @@ 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