reverse last change

[lyx.git] / src / gettext.h

diff --git a/src/gettext.h b/src/gettext.h
index a8908d1a2ee535f7cedc043fb2739ecc05e1de7a..002d2bc563e818a58e51eb2394e452fd58fa5548 100644 (file)
--- a/src/gettext.h
+++ b/src/gettext.h
@@ -30,37 +30,29 @@
  *   Panic/fatal (that should not happen) messages need not be translated
  */
 
+#include "LString.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 *);
+///
+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, "");}
-#  else
-#    define locale_init()
-#  endif
-#  define gettext_init() { bindtextdomain (PACKAGE, lyx_localedir.c_str()); \
-       textdomain (PACKAGE); }
-#else
 ///
 #  define _(str) (str)
 ///
-#  define N_(str) (str)
+#  define S_(str) (str)
+
+#endif
+
+#  define N_(str) (str)              // for detecting static strings
+
 ///
-#  define locale_init()
+void locale_init();
 ///
-#  define gettext_init()
-#endif
+void gettext_init(string const & localedir);
 
 #endif