* inetconf.c: partial i18n

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index 38109da56f67090d86d6f8e4cbd48eedc2f1dda0..c43422aba8f2f6f865c110bf76871299ad1513d1 100644 (file)
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,4 +1,7 @@
 $Log$
+Revision 621.17  2005/08/19 16:56:00  ajc
+* inetconf.c: partial i18n
+
 Revision 621.16  2005/08/18 22:08:26  ajc
 * iconbar.c: i18n
 
@@ -2850,3 +2853,4 @@ Sun Dec  6 19:50:55 EST 1998 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
 
 1998-12-03 Nathan Bryant <bryant@cs.usm.maine.edu>
        * webserver.c: warning fix
+

diff --git a/webcit/inetconf.c b/webcit/inetconf.c
index 6bb3272ac002395edc7ea9dc3cec391c9a3d9900..d2b4938eafdb2b9ce4a0e386fc87ec0b5c5a07c8 100644 (file)
--- a/webcit/inetconf.c
+++ b/webcit/inetconf.c
@@ -28,33 +28,30 @@ void display_inetconf(void)
        };
        char *ic_spec[ic_max];
        char *ic_misc;
-
-       char *ic_keyword[] = {
-               "localhost",
-               "directory",
-               "gatewaydomain",
-               "smarthost",
-               "rbl",
-               "spamassassin",
-       };
-
-       char *ic_boxtitle[] = {
-               "Local host aliases",
-               "Directory domains",
-               "Gateway domains",
-               "Smart hosts",
-               "RBL hosts",
-               "SpamAssassin hosts",
-       };
-
-       char *ic_desc[] = {
-               "(domains for which this host receives mail)",
-               "(domains mapped with the Global Address Book)",
-               "(domains whose subdomains match Citadel hosts)",
-               "(if present, forward all outbound mail to one of these hosts)",
-               "(hosts running a Realtime Blackhole List)",
-               "(hosts running the SpamAssassin service)",
-       };
+       char *ic_keyword[ic_max];
+       char *ic_boxtitle[ic_max];
+       char *ic_desc[ic_max];
+
+       ic_keyword[0] = _("localhost");
+       ic_keyword[1] = _("directory");
+       ic_keyword[2] = _("gatewaydomain");
+       ic_keyword[3] = _("smarthost");
+       ic_keyword[4] = _("rbl");
+       ic_keyword[5] = _("spamassassin");
+
+       ic_boxtitle[0] = _("Local host aliases");
+       ic_boxtitle[1] = _("Directory domains");
+       ic_boxtitle[2] = _("Gateway domains");
+       ic_boxtitle[3] = _("Smart hosts");
+       ic_boxtitle[4] = _("RBL hosts");
+       ic_boxtitle[5] = _("SpamAssassin hosts");
+
+       ic_desc[0] = _("(domains for which this host receives mail)");
+       ic_desc[1] = _("(domains mapped with the Global Address Book)");
+       ic_desc[2] = _("(domains whose subdomains match Citadel hosts)");
+       ic_desc[3] = _("(if present, forward all outbound mail to one of these hosts)");
+       ic_desc[4] = _("(hosts running a Realtime Blackhole List)");
+       ic_desc[5] = _("(hosts running the SpamAssassin service)");
 
        for (i=0; i<ic_max; ++i) {
                ic_spec[i] = strdup("");
@@ -90,7 +87,9 @@ void display_inetconf(void)
        output_headers(1, 1, 2, 0, 0, 0, 0);
        wprintf("<div id=\"banner\">\n");
        wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>");
-       wprintf("<SPAN CLASS=\"titlebar\">Internet configuration</SPAN>\n");
+       wprintf("<SPAN CLASS=\"titlebar\">");
+       wprintf(_("Internet configuration"));
+       wprintf("</SPAN>\n");
        wprintf("</TD></TR></TABLE>\n");
        wprintf("</div>\n<div id=\"content\">\n");
 

diff --git a/webcit/intl/Makefile b/webcit/intl/Makefile
index 24f69500afa30bc5e29099fdacbe34ad7d78d7d4..862e30c914d05681a49ab207e0e4f4033b75a390 100644 (file)
--- a/webcit/intl/Makefile
+++ b/webcit/intl/Makefile
@@ -26,7 +26,7 @@ top_srcdir = ..
 top_builddir = ..
 
 
-prefix = /usr/local/webcit
+prefix = /appl/webcit
 exec_prefix = ${prefix}
 transform = s,x,x,
 libdir = ${exec_prefix}/lib
@@ -57,9 +57,9 @@ DEFS = -DLOCALEDIR=\"$(localedir)\" -DLOCALE_ALIAS_PATH=\"$(aliaspath)\" \
 -Dset_relocation_prefix=libintl_set_relocation_prefix \
 -Drelocate=libintl_relocate \
 -DDEPENDS_ON_LIBICONV=1 -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE=\"webcit\" -DVERSION=\"6.21\" -DHAVE_LIBPTHREAD=1 -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_FCNTL_H=1 -DHAVE_LIMITS_H=1 -DHAVE_SYS_TIME_H=1 -DHAVE_UNISTD_H=1 -DRETSIGTYPE=void -DHAVE_SNPRINTF=1 -DHAVE_ICAL_H=1 -DHAVE_LIBICAL=1 -DHAVE_ZLIB_H=1 -DHAVE_ZLIB=1 -DHAVE_NEWT_H=1 -DHAVE_NEWT=1 -DHAVE_OPENSSL=1 -DHAVE_LONG_LONG=1 -DHAVE_LONG_DOUBLE=1 -DHAVE_WCHAR_T=1 -DHAVE_WINT_T=1 -DHAVE_INTTYPES_H_WITH_UINTMAX=1 -DHAVE_STDINT_H_WITH_UINTMAX=1 -DHAVE_INTMAX_T=1 -DHAVE_POSIX_PRINTF=1 -DHAVE_ALLOCA_H=1 -DHAVE_ALLOCA=1 -DHAVE_STDLIB_H=1 -DHAVE_UNISTD_H=1 -DHAVE_GETPAGESIZE=1 -DHAVE_MMAP=1 -DINTDIV0_RAISES_SIGFPE=1 -DHAVE_UNSIGNED_LONG_LONG=1 -DHAVE_UINTMAX_T=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_STDINT_H=1 -DHAVE_ARGZ_H=1 -DHAVE_LIMITS_H=1 -DHAVE_LOCALE_H=1 -DHAVE_NL_TYPES_H=1 -DHAVE_MALLOC_H=1 -DHAVE_STDDEF_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_UNISTD_H=1 -DHAVE_SYS_PARAM_H=1 -DHAVE_ASPRINTF=1 -DHAVE_FWPRINTF=1 -DHAVE_GETCWD=1 -DHAVE_GETEGID=1 -DHAVE_GETEUID=1 -DHAVE_GETGID=1 -DHAVE_GETUID=1 -DHAVE_MEMPCPY=1 -DHAVE_MUNMAP=1 -DHAVE_PUTENV=1 -DHAVE_SETENV=1 -DHAVE_SETLOCALE=1 -DHAVE_SNPRINTF=1 -DHAVE_STPCPY=1 -DHAVE_STRCASECMP=1 -DHAVE_STRDUP=1 -DHAVE_STRTOUL=1 -DHAVE_TSEARCH=1 -DHAVE_WCSLEN=1 -DHAVE___ARGZ_COUNT=1 -DHAVE___ARGZ_STRINGIFY=1 -DHAVE___ARGZ_NEXT=1 -DHAVE___FSETLOCKING=1 -DHAVE_DECL__SNPRINTF=0 -DHAVE_DECL__SNWPRINTF=0 -DHAVE_DECL_FEOF_UNLOCKED=1 -DHAVE_DECL_FGETS_UNLOCKED=0 -DHAVE_DECL_GETC_UNLOCKED=1 -DHAVE_ICONV=1 -DICONV_CONST= -DHAVE_LANGINFO_CODESET=1 -DHAVE_LC_MESSAGES=1 -DENABLE_NLS=1 -DHAVE_GETTEXT=1 -DHAVE_DCGETTEXT=1 
-CPPFLAGS = -I/usr/local/ctdlsupport/include
-CFLAGS = -I/usr/local/webcit -I/usr/local/ctdlsupport/include -Wall
-LDFLAGS = -L/usr/local/webcit -L/usr/local/ctdlsupport/lib -Wl,--rpath -Wl,/usr/local/ctdlsupport/lib
+CPPFLAGS = 
+CFLAGS = -I/appl/webcit -g -O2 -Wall
+LDFLAGS = -L/appl/webcit 
 LIBS = -lssl -lcrypto -lz -lical -lpthread 
 
 COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)

diff --git a/webcit/po/Makefile.in b/webcit/po/Makefile.in
index b417fed3c00449865a20ad1d4242f7c77483d8f3..6e7671351b7bf30b6a4347fcf4bd3bdb5e535261 100644 (file)
--- a/webcit/po/Makefile.in
+++ b/webcit/po/Makefile.in
@@ -20,7 +20,7 @@ srcdir = .
 top_srcdir = ..
 
 
-prefix = /usr/local/webcit
+prefix = /appl/webcit
 exec_prefix = ${prefix}
 datadir = ${prefix}/share
 localedir = $(datadir)/locale