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

diff --git a/src/gettext.C b/src/gettext.C
index b80792ac22..46053cfc59 100644
--- a/src/gettext.C
+++ b/src/gettext.C
@@ -1,58 +1,46 @@
-/* This file is part of
- * ====================================================== 
- * 
- *           LyX, The Document Processor
- *        
- *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2001 The LyX Team.
+/**
+ * \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 "gettext.h"
+#include "messages.h"
+
+#include "support/environment.h"
+#include "support/lstrings.h"
+
+
+namespace lyx {
+
 #ifdef HAVE_LOCALE_H
 #  include <locale.h>
 #endif
 
-#include "LString.h"
+using support::setEnv;
 
-#ifdef ENABLE_NLS
+using std::string;
 
-#  if HAVE_GETTEXT
-#    include <libintl.h>      // use the header already in the system *EK*
-#  else
-#    include "../intl/libintl.h"
-#  endif
 
-char const * _(char const * str)
+docstring const _(string const & str)
 {
-	// 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 "";
+	return getGuiMessages().get(str);
 }
 
 
-string const _(string const & str) 
-{
-	if (!str.empty()) {
-		int const s = str.length();
-		char * tmp = new char[s + 1];
-		str.copy(tmp, s);
-		tmp[s] = '\0';
-		string const ret(gettext(tmp));
-		delete [] tmp;
-		return ret;
-	} else {
-		return string();
-	}
-}
+#ifdef ENABLE_NLS
 
 void locale_init()
 {
+	// Disable, as otherwise it overrides everything else incl. the doc language
+	setEnv("LANGUAGE", "");
 #  ifdef HAVE_LC_MESSAGES
 	setlocale(LC_MESSAGES, "");
 #  endif
@@ -60,21 +48,28 @@ void locale_init()
 	setlocale(LC_NUMERIC, "C");
 }
 
-void gettext_init(string const & localedir)
-{
-	bindtextdomain(PACKAGE, localedir.c_str()); 
-	textdomain(PACKAGE);
-}
-
-
 #else // ENABLE_NLS
 
 void locale_init()
 {
+	setlocale(LC_NUMERIC, "C");
 }
 
-void gettext_init(string const &)
+#endif
+
+
+docstring const translateIfPossible(docstring const & name)
 {
-	setlocale(LC_NUMERIC, "C");
+	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;
 }
-#endif
+
+
+} // namespace lyx