Fix working of the spellchecker dialog with ispell when there are no

[lyx.git] / src / gettext.C

diff --git a/src/gettext.C b/src/gettext.C
index 3c3c0e253f603feb292f528fd5d1049f359320b8..77b1a672755bca096a9f6e2d725c9d8474288418 100644 (file)
--- a/src/gettext.C
+++ b/src/gettext.C
@@ -1,12 +1,33 @@
+/* This file is part of
+ * ====================================================== 
+ * 
+ *           LyX, The Document Processor
+ *        
+ *           Copyright 1995 Matthias Ettrich
+ *           Copyright 1995-2001 The LyX Team.
+ *
+ * ====================================================== */
+
 #include <config.h>
 
 #include "LString.h"
-#include "gettext.h"
 
 #ifdef ENABLE_NLS
 
+#  if HAVE_GETTEXT
+#    include <libintl.h>      // use the header already in the system *EK*
+#    ifdef HAVE_LOCALE_H
+#      include <locale.h>        // for LC_MESSAGES
+#    endif
+#  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
@@ -21,12 +42,37 @@ string const _(string const & str)
                char * tmp = new char[s + 1];
                str.copy(tmp, s);
                tmp[s] = '\0';
-               string ret(gettext(tmp));
+               string const ret(gettext(tmp));
                delete [] tmp;
                return ret;
-       }
-       else
+       } else {
                return string();
+       }
+}
+
+void locale_init()
+{
+#  ifdef HAVE_LC_MESSAGES
+       setlocale(LC_MESSAGES, "");
+       setlocale(LC_CTYPE, "");
+       setlocale(LC_NUMERIC, "C");
+#  endif
+}
+
+void gettext_init(string const & localedir)
+{
+       bindtextdomain(PACKAGE, localedir.c_str()); 
+       textdomain(PACKAGE);
 }
 
+
+#else // ENABLE_NLS
+
+void locale_init()
+{
+}
+
+void gettext_init(string const &)
+{
+}
 #endif