[w3m-dev 04095] build fix when configure with --enable-messagel10n

* main.c (main): locale and textdomain initialization if ENABLE_NLS
* menu.c (initMenu): use _() instead of gettext()
* rc.c (show_params): use _() instead of gettext()
From: WATANABE Katsuyuki <knabe@sannet.ne.jp>

4 files changed, 16 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 62f25fd..cfc757b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-08-03  WATANABE Katsuyuki <knabe@sannet.ne.jp>
+
+	* [w3m-dev 04095] build fix when configure with --enable-messagel10n
+	* main.c (main): locale and textdomain initialization if ENABLE_NLS
+	* menu.c (initMenu): use _() instead of gettext()
+	* rc.c (show_params): use _() instead of gettext()
+
 2004-07-18  WATANABE Katsuyuki <knabe@sannet.ne.jp>
 
 	* [w3m-dev 04094] Re: option panel: gettextize select list
@@ -8533,4 +8540,4 @@ a	* [w3m-dev 03276] compile error on EWS4800
 	* release-0-2-1
 	* import w3m-0.2.1
 
-$Id: ChangeLog,v 1.932 2004/07/17 15:28:58 ukai Exp $
+$Id: ChangeLog,v 1.933 2004/08/02 15:40:50 ukai Exp $
diff --git a/main.c b/main.c
index 4ceb538..c244c92 100644
--- a/main.c
+++ b/main.c
@@ -1,4 +1,4 @@
-/* $Id: main.c,v 1.244 2004/07/15 16:44:37 ukai Exp $ */
+/* $Id: main.c,v 1.245 2004/08/02 15:40:50 ukai Exp $ */
 #define MAINPROGRAM
 #include "fm.h"
 #include <signal.h>
@@ -384,9 +384,11 @@ main(int argc, char **argv, char **envp)
 #endif
 #endif
     GC_init();
+#if ENABLE_NLS
     setlocale(LC_ALL, "");
     bindtextdomain(PACKAGE, LOCALEDIR);
     textdomain(PACKAGE);
+#endif
 
 #ifndef HAVE_SYS_ERRLIST
     prepare_sys_errlist();
diff --git a/menu.c b/menu.c
index 6fbe68e..1a156e0 100644
--- a/menu.c
+++ b/menu.c
@@ -1,4 +1,4 @@
-/* $Id: menu.c,v 1.42 2004/07/15 16:32:38 ukai Exp $ */
+/* $Id: menu.c,v 1.43 2004/08/02 15:40:50 ukai Exp $ */
 /* 
  * w3m menu.c
  */
@@ -1717,7 +1717,7 @@ initMenu(void)
 #endif
 	for (item = MainMenuItem; item->type != MENU_END; item++)
 	    item->label =
-		wc_conv(gettext(item->label), MainMenuCharset,
+		wc_conv(_(item->label), MainMenuCharset,
 			InnerCharset)->ptr;
 	MainMenuEncode = TRUE;
     }
diff --git a/rc.c b/rc.c
index b26faad..1b3e496 100644
--- a/rc.c
+++ b/rc.c
@@ -1,4 +1,4 @@
-/* $Id: rc.c,v 1.98 2004/07/17 15:29:00 ukai Exp $ */
+/* $Id: rc.c,v 1.99 2004/08/02 15:40:50 ukai Exp $ */
 /* 
  * Initialization file etc.
  */
@@ -793,7 +793,7 @@ show_params(FILE * fp)
 #ifdef USE_M17N
 	if (!OptionEncode)
 	    cmt =
-		wc_conv(gettext(sections[j].name), OptionCharset,
+		wc_conv(_(sections[j].name), OptionCharset,
 			InnerCharset)->ptr;
 	else
 #endif
@@ -839,7 +839,7 @@ show_params(FILE * fp)
 	    }
 #ifdef USE_M17N
 	    if (!OptionEncode)
-		cmt = wc_conv(gettext(sections[j].params[i].comment),
+		cmt = wc_conv(_(sections[j].params[i].comment),
 			      OptionCharset, InnerCharset)->ptr;
 	    else
 #endif