Fixes for/in insettabular/text.

[lyx.git] / src / gettext.h

diff --git a/src/gettext.h b/src/gettext.h
index db7e61e226faeef01880ae966c120fb89fc24a57..121e0428bd8bac87a6df35d0a55e2488cb047637 100644 (file)
--- a/src/gettext.h
+++ b/src/gettext.h
@@ -32,6 +32,8 @@
 
 #ifdef ENABLE_NLS
 
+#include "LString.h"
+
 #  if HAVE_GETTEXT
 #    include <libintl.h>      // use the header already in the system *EK*
 #    ifdef HAVE_LOCALE_H
@@ -41,21 +43,31 @@
 #    include "../intl/libintl.h"
 #  endif
 
-#  define _(str) gettext(str)
+char const * _(char const *);
+
+string const _(string const &);
+
+//#  define _(str) gettext(str)
 #  define N_(str) (str)              // for detecting static strings
 
 #  ifdef HAVE_LC_MESSAGES
                                 // LC_TIME, LC_CTYPE, even LC_ALL
-#    define locale_init() { setlocale (LC_MESSAGES, ""); setlocale (LC_CTYPE, "");}
+#    define locale_init() { setlocale (LC_MESSAGES, ""); setlocale (LC_CTYPE, ""); setlocale(LC_NUMERIC, "C"); }
 #  else
 #    define locale_init()
 #  endif
 #  define gettext_init() { bindtextdomain (PACKAGE, lyx_localedir.c_str()); \
        textdomain (PACKAGE); }
 #else
+///
 #  define _(str) (str)
+///
+#  define S_(str) (str)
+///
 #  define N_(str) (str)
+///
 #  define locale_init()
+///
 #  define gettext_init()
 #endif