* src/tabular.[Ch]: simplify plaintext methods, because there

[lyx.git] / src / gettext.C

diff --git a/src/gettext.C b/src/gettext.C
index 2f08de503833626e30be66e33c614ec3cd3fe1d3..46053cfc59e5407e4e66316470accbf6ed59e26d 100644 (file)
--- a/src/gettext.C
+++ b/src/gettext.C
@@ -14,29 +14,24 @@
 #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 std::string;
-
-
-namespace {
-
-Messages & getLyXMessages()
-{
-       static Messages lyx_messages;
-
-       return lyx_messages;
-}
+using support::setEnv;
 
-} // anon namespace
+using std::string;
 
 
-string const _(string const & str)
+docstring const _(string const & str)
 {
-       return getLyXMessages().get(str);
+       return getGuiMessages().get(str);
 }
 
 
@@ -44,6 +39,8 @@ string const _(string const & str)
 
 void locale_init()
 {
+       // Disable, as otherwise it overrides everything else incl. the doc language
+       setEnv("LANGUAGE", "");
 #  ifdef HAVE_LC_MESSAGES
        setlocale(LC_MESSAGES, "");
 #  endif
@@ -59,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