add comment

[lyx.git] / src / gettext.C

diff --git a/src/gettext.C b/src/gettext.C
index a27c579b421797b2421b2814915819c32bf54bec..46053cfc59e5407e4e66316470accbf6ed59e26d 100644 (file)
--- a/src/gettext.C
+++ b/src/gettext.C
@@ -1,5 +1,5 @@
 /**
- * \file gettext.C
+ * \file src/gettext.C
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -11,31 +11,27 @@
 
 #include <config.h>
 
+#include "gettext.h"
 #include "messages.h"
-#include "LString.h"
-#include "support/LAssert.h"
 
-#include <boost/scoped_ptr.hpp>
+#include "support/environment.h"
+#include "support/lstrings.h"
+
+
+namespace lyx {
 
 #ifdef HAVE_LOCALE_H
 #  include <locale.h>
 #endif
 
-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);
 }
 
 
@@ -43,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
@@ -58,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