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

[lyx.git] / src / gettext.C

diff --git a/src/gettext.C b/src/gettext.C
index 49158949ce3a10148bbcccefc77478799881b80b..46053cfc59e5407e4e66316470accbf6ed59e26d 100644 (file)
--- a/src/gettext.C
+++ b/src/gettext.C
@@ -1,35 +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()
 {
-       // I'd rather have an Assert on str, we should not allow
-       // null pointers here. Lgb
-       // Assert(str);
-       if (str && str[0])
-               return gettext(str);
-       else
-               return "";
+       // 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()
 {
-       if (!str.empty()) {
-               int const s = str.length();
-               char * tmp = new char[s + 1];
-               str.copy(tmp, s);
-               tmp[s] = '\0';
-               string ret(gettext(tmp));
-               delete [] tmp;
-               return ret;
-       }
-       else
-               return string();
+       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