X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fgettext.h;h=002d2bc563e818a58e51eb2394e452fd58fa5548;hb=28168bd4df9a568e79cdc57cb257743b7adb7c2a;hp=121e0428bd8bac87a6df35d0a55e2488cb047637;hpb=b7736f5af357c4ad93459041c26dd3fa838ed5a9;p=lyx.git

diff --git a/src/gettext.h b/src/gettext.h
index 121e0428bd..002d2bc563 100644
--- a/src/gettext.h
+++ b/src/gettext.h
@@ -30,45 +30,29 @@
  *   Panic/fatal (that should not happen) messages need not be translated
  */
 
-#ifdef ENABLE_NLS
-
 #include "LString.h"
 
-#  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
+#ifdef ENABLE_NLS
 
+///
 char const * _(char const *);
-
+///
 string const _(string const &);
 
-//#  define _(str) gettext(str)
-#  define N_(str) (str)              // for detecting static strings
+#else // ENABLE_NLS
 
-#  ifdef HAVE_LC_MESSAGES
-                                // LC_TIME, LC_CTYPE, even LC_ALL
-#    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)
+
+#endif
+
+#  define N_(str) (str)              // for detecting static strings
+
 ///
-#  define N_(str) (str)
-///
-#  define locale_init()
+void locale_init();
 ///
-#  define gettext_init()
-#endif
+void gettext_init(string const & localedir);
 
 #endif