w3m

commit 91ec788120654121ff2193610af03ce28a8b71eb
parent 09210ce392bfd987b20303a75a7090286c58b1ba
Author: ukai <ukai>
Date:   Mon,  2 Aug 2004 15:40:50 +0000

[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>

Diffstat:
M
ChangeLog
 | 
7
+++++++
M
main.c
 | 
2
++
M
menu.c
 | 
2
+-
M
rc.c
 | 
4
++--

4 files changed, 12 insertions(+), 3 deletions(-)
diff --git 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
diff --git a/main.c b/main.c
@@ -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
@@ -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
@@ -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