fix locale problem with --disable-nls

[lyx.git] / src / gettext.C

diff --git a/src/gettext.C b/src/gettext.C
index 49158949ce3a10148bbcccefc77478799881b80b..b80792ac22e2936744bc5a99bf3f0d485a9c91d4 100644 (file)
--- a/src/gettext.C
+++ b/src/gettext.C
@@ -1,10 +1,29 @@
+/* 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"
 
 #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
@@ -24,12 +43,38 @@ 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, "");
+#  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()
+{
+}
+
+void gettext_init(string const &)
+{
+       setlocale(LC_NUMERIC, "C");
+}
 #endif