fix typo that put too many include paths for most people

[lyx.git] / src / gettext.C

diff --git a/src/gettext.C b/src/gettext.C
index 3c3c0e253f603feb292f528fd5d1049f359320b8..e65081c71cd10a286db1ce4881e7e0006d27825f 100644 (file)
--- a/src/gettext.C
+++ b/src/gettext.C
@@ -1,12 +1,36 @@
+/* This file is part of
+ * ======================================================
+ *
+ *           LyX, The Document Processor
+ *
+ *           Copyright 1995 Matthias Ettrich
+ *           Copyright 1995-2001 The LyX Team.
+ *
+ * ====================================================== */
+
 #include <config.h>
 
+#ifdef HAVE_LOCALE_H
+#  include <locale.h>
+#endif
+
 #include "LString.h"
-#include "gettext.h"
+
+#include <boost/smart_ptr.hpp>
 
 #ifdef ENABLE_NLS
 
+#  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)
 {
+       // 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
@@ -14,19 +38,47 @@ char const * _(char const * str)
 }
 
 
-string const _(string const & str) 
+string const _(string const & str)
 {
        if (!str.empty()) {
                int const s = str.length();
-               char * tmp = new char[s + 1];
-               str.copy(tmp, s);
+               boost::scoped_array<char> tmp(new char[s + 1]);
+               str.copy(tmp.get(), s);
                tmp[s] = '\0';
-               string ret(gettext(tmp));
-               delete [] tmp;
+               string const ret(gettext(tmp.get()));
                return ret;
-       }
-       else
+       } else {
                return string();
+       }
+}
+
+
+void locale_init()
+{
+#  ifdef HAVE_LC_MESSAGES
+       setlocale(LC_MESSAGES, "");
+#  endif
+       setlocale(LC_CTYPE, "");
+       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