projects / citadel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 15e8ee2)
* inetconf.c, listsub.c, part of mainmenu.c: i18n
authorArt Cancro <ajc@citadel.org>
Fri, 19 Aug 2005 21:46:49 +0000 (21:46 +0000)
committerArt Cancro <ajc@citadel.org>
Fri, 19 Aug 2005 21:46:49 +0000 (21:46 +0000)
webcit/ChangeLog patch | blob | history
webcit/inetconf.c patch | blob | history
webcit/listsub.c patch | blob | history
webcit/mainmenu.c patch | blob | history

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index c43422aba8f2f6f865c110bf76871299ad1513d1..54961b99b94b3d8e03d545140875749df75fd85c 100644 (file)
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,4 +1,7 @@
 $Log$
+Revision 621.18  2005/08/19 21:46:48  ajc
+* inetconf.c, listsub.c, part of mainmenu.c: i18n
+
 Revision 621.17  2005/08/19 16:56:00  ajc
 * inetconf.c: partial i18n
 
@@ -2853,4 +2856,3 @@ 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 d2b4938eafdb2b9ce4a0e386fc87ec0b5c5a07c8..b5569b796ac0c351751324e5ac654be75835a043 100644 (file)
--- a/webcit/inetconf.c
+++ b/webcit/inetconf.c
@@ -114,10 +114,11 @@ void display_inetconf(void)
                                        "<A HREF=\"/save_inetconf?oper=delete&ename=");
                                escputs(buf);
                                wprintf("&etype=%s\" ", ic_keyword[which]);
-                               wprintf("onClick=\"return confirm('Delete ");
-                               jsescputs(buf);
-                               wprintf("?');\">");
-                               wprintf("<font size=-1>(Delete)</font></a></TD></TR>\n");
+                               wprintf("onClick=\"return confirm('%s');\">",
+                                       _("Delete this entry?"));
+                               wprintf("<font size=-1>");
+                               wprintf(_("(Delete)"));
+                               wprintf("</font></a></TD></TR>\n");
                        }
                }
                wprintf("<FORM METHOD=\"POST\" ACTION=\"/save_inetconf\">\n"
@@ -163,7 +164,7 @@ void save_inetconf(void) {
                   &&   (!strcasecmp(etype, bstr("etype")))
                   &&   (!strcasecmp(bstr("oper"), "delete"))
                ) {
-                       sprintf(WC->ImportantMessage, "%s deleted.", ename);
+                       sprintf(WC->ImportantMessage, _("%s has been deleted."), ename);
                }
                else {
                        if (strlen(newconfig) > 0) strcat(newconfig, "\n");
diff --git a/webcit/listsub.c b/webcit/listsub.c
index 0d70d08f9148d6a2f90884bbe38f8ef575b2b486..cbcf5af772d762a18a4e19405e5816b10c7051c2 100644 (file)
--- a/webcit/listsub.c
+++ b/webcit/listsub.c
@@ -14,11 +14,13 @@
  */
 void do_listsub(void)
 {
-       char cmd[SIZ];
-       char room[SIZ];
-       char token[SIZ];
-       char email[SIZ];
-       char subtype[SIZ];
+       char cmd[256];
+       char room[256];
+       char token[256];
+       char email[256];
+       char subtype[256];
+       char escaped_email[256];
+       char escaped_room[256];
 
        char buf[SIZ];
        int self;
@@ -28,7 +30,9 @@ void do_listsub(void)
        strcpy(WC->wc_password, "");
        strcpy(WC->wc_roomname, "");
 
-       wprintf("<HTML><HEAD><TITLE>List subscription</TITLE></HEAD><BODY>\n");
+       wprintf("<HTML><HEAD><TITLE>");
+       wprintf(_("List subscription"));
+       wprintf("</TITLE></HEAD><BODY>\n");
 
        strcpy(cmd, bstr("cmd"));
        strcpy(room, bstr("room"));
@@ -38,9 +42,9 @@ void do_listsub(void)
 
        wprintf("<CENTER>"
                "<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>"
-               "<SPAN CLASS=\"titlebar\">List subscribe/unsubscribe</SPAN>\n"
-               "</TD></TR></TABLE><br />\n"
-       );
+               "<SPAN CLASS=\"titlebar\">");
+       wprintf(_("List subscribe/unsubscribe"));
+       wprintf("</SPAN></TD></TR></TABLE><br />\n");
 
        /*
         * Subscribe command
@@ -54,12 +58,15 @@ void do_listsub(void)
                );
                serv_getln(buf, sizeof buf);
                if (buf[0] == '2') {
-                       wprintf("<CENTER><H1>Confirmation request sent</H1>"
-                               "You are subscribing <TT>");
-                       escputs(email);
-                       wprintf("</TT> to the &quot;");
-                       escputs(room);
-                       wprintf("&quot; mailing list.  The listserver has "
+                       stresc(escaped_email, email, 0, 0);
+                       stresc(escaped_room, room, 0, 0);
+
+                       wprintf("<CENTER><H1>");
+                       wprintf(_("Confirmation request sent"));
+                       wprintf("</H1>");
+                       wprintf(_("You are subscribing <TT>%s"
+                               "</TT> to the <b>%s</b> mailing list.  "
+                               "The listserver has "
                                "sent you an e-mail with one additional "
                                "Web link for you to click on to confirm "
                                "your subscription.  This extra step is for "
@@ -68,9 +75,9 @@ void do_listsub(void)
                                "without your consent.<br /><br />"
                                "Please click on the link which is being "
                                "e-mailed to you and your subscription will "
-                               "be confirmed.<br />\n"
-                               "<A HREF=\"/listsub\">Back...</A></CENTER>\n"
-                       );
+                               "be confirmed.<br />\n"),
+                               escaped_email, escaped_room);
+                       wprintf("<A HREF=\"/listsub\">%s</A></CENTER>\n", _("Go back..."));
                }
                else {
                        wprintf("<FONT SIZE=+1><B>ERROR: %s</B>"
diff --git a/webcit/mainmenu.c b/webcit/mainmenu.c
index c7e15823fa14d8967247a6bfe268d0684f1707be..568e44e6105a63f4d61a3cccfcba32fb032b0502 100644 (file)
--- a/webcit/mainmenu.c
+++ b/webcit/mainmenu.c
@@ -18,7 +18,7 @@ void display_main_menu(void)
                "<TABLE WIDTH=100%%>"
                "<TR><TD COLSPAN=2>\n");
 
-       svprintf("BOXTITLE", WCS_STRING, "Basic commands");
+       svprintf("BOXTITLE", WCS_STRING, _("Basic commands"));
        do_template("beginbox");
 
        wprintf("\n"
@@ -26,85 +26,90 @@ void display_main_menu(void)
                "<TR>"
                "<TD>");        /* start of first column */
 
-       wprintf("<A HREF=\"/knrooms\">"
-               "<span class=\"mainmenu\">"
-               "List known rooms</span></A><br />"
-               "<span class=\"menudesc\">"
-               "Where can I go from here?</span><br />\n"
-       );
+       wprintf("<A HREF=\"/knrooms\"><span class=\"mainmenu\">");
+       wprintf(_("List known rooms"));
+       wprintf("</span></A><br /><span class=\"menudesc\">");
+       wprintf(_("Where can I go from here?"));
+       wprintf("</span><br />\n");
 
        wprintf("<A HREF=\"/gotonext\">"
-               "<span class=\"mainmenu\">"
-               "Goto next room</span></A><br />"
-               "<span class=\"menudesc\">"
-               "...with <EM>unread</EM> messages"
-               "</span><br />\n"
-       );
+               "<span class=\"mainmenu\">");
+       wprintf(_("Goto next room"));
+       wprintf("</span></A><br />"
+               "<span class=\"menudesc\">");
+       wprintf(_("...with <EM>unread</EM> messages"));
+       wprintf("</span><br />\n");
 
        wprintf("<A HREF=\"/skip\">"
-               "<span class=\"mainmenu\">"
-               "Skip to next room</span></a><br />"
-               "<span class=\"menudesc\">"
-               "(come back here later)"
-               "</span>\n"
-       );
+               "<span class=\"mainmenu\">");
+       wprintf(_("Skip to next room"));
+       wprintf("</span></a><br />"
+               "<span class=\"menudesc\">");
+       wprintf(_("(come back here later)"));
+       wprintf("</span>\n");
 
        if ((strlen(WC->ugname) > 0) && (strcasecmp(WC->ugname, WC->wc_roomname))) {
                wprintf("<br />"
                        "<A HREF=\"/ungoto\">"
-                       "<span class=\"mainmenu\">"
-                       "Ungoto</span></A><br />"
-                       "<span class=\"menudesc\">"
-                       "(oops! Back to %s)"
-                       "</span>\n", WC->ugname
-               );
+                       "<span class=\"mainmenu\">");
+               wprintf(_("Ungoto"));
+               wprintf("</span></A><br />"
+                       "<span class=\"menudesc\">");
+               wprintf(_("(oops! Back to %s)"));
+               wprintf("</span>\n", WC->ugname);
        }
 
        wprintf("</TD><TD>\n"); /* start of second column */
 
        wprintf("<A HREF=\"/readnew\">"
-               "<span class=\"mainmenu\">"
-               "Read new messages</span></A><br />"
-               "<span class=\"menudesc\">"
-               "...in this room</span><br />\n"
-       );
+               "<span class=\"mainmenu\">");
+       wprintf(_("Read new messages"));
+       wprintf("</span></A><br />"
+               "<span class=\"menudesc\">");
+       wprintf(_("...in this room"));
+       wprintf("</span><br />\n");
 
        wprintf("<A HREF=\"/readfwd\">"
-               "<span class=\"mainmenu\">"
-               "Read all messages</span></A><br />"
-               "<span class=\"menudesc\">"
-               "...old <EM>and</EM> new</span><br />\n"
-       );
+               "<span class=\"mainmenu\">");
+       wprintf(_("Read all messages"));
+       wprintf("</span></A><br />"
+               "<span class=\"menudesc\">");
+       wprintf(_("...old <EM>and</EM> new"));
+       wprintf("</span><br />\n");
 
        wprintf("<A HREF=\"/display_enter\">"
-               "<span class=\"mainmenu\">"
-               "Enter a message</span></A><br />"
-               "<span class=\"menudesc\">"
-               "(post in this room)</span>\n"
-       );
+               "<span class=\"mainmenu\">");
+       wprintf(_("Enter a message"));
+       wprintf("</span></A><br />"
+               "<span class=\"menudesc\">");
+       wprintf(_("(post in this room)"));
+       wprintf("</span>\n");
 
        wprintf("</TD><TD>");   /* start of third column */
 
        wprintf("<A HREF=\"/summary\">"
-               "<span class=\"mainmenu\">"
-               "Summary page</span></A><br />"
-               "<span class=\"menudesc\">"
-               "Summary of my account</span><br />\n"
-       );
+               "<span class=\"mainmenu\">");
+       wprintf(_("Summary page"));
+       wprintf("</span></A><br />"
+               "<span class=\"menudesc\">");
+       wprintf(_("Summary of my account"));
+       wprintf("</span><br />\n");
 
        wprintf("<A HREF=\"/userlist\">\n"
-               "<span class=\"mainmenu\">"
-               "User list</span></A><br />"
-               "<span class=\"menudesc\">"
-               "(all registered users)</span><br />\n"
-       );
+               "<span class=\"mainmenu\">");
+       wprintf(_("User list"));
+       wprintf("</span></A><br />"
+               "<span class=\"menudesc\">");
+       wprintf(_("(all registered users)"));
+       wprintf("</span><br />\n");
 
        wprintf("<A HREF=\"/termquit\" TARGET=\"_top\">"
-               "<span class=\"mainmenu\">"
-               "Log off</span></A><br />"
-               "<span class=\"menudesc\">"
-               "Bye!</span>\n"
-       );
+               "<span class=\"mainmenu\">");
+       wprintf(_("Log off"));
+       wprintf("</span></A><br />"
+               "<span class=\"menudesc\">");
+       wprintf(_("Bye!"));
+       wprintf("</span>\n");
 
        wprintf("</TD></TR></TABLE>\n");
        do_template("endbox");
@@ -116,56 +121,63 @@ void display_main_menu(void)
        do_template("beginbox");
 
        wprintf("<A HREF=\"/display_preferences\">"
-               "<span class=\"mainmenu\">"
-               "Change your preferences and settings"
-               "</span><br />\n");
+               "<span class=\"mainmenu\">");
+       wprintf(_("Change your preferences and settings"));
+       wprintf("</span><br />\n");
 
        wprintf("<A HREF=\"/display_reg\">"
-               "<span class=\"mainmenu\">"
-               "Update your contact information"
-               "</span><br />\n");
+               "<span class=\"mainmenu\">");
+       wprintf(_("Update your contact information"));
+       wprintf("</span><br />\n");
 
        wprintf("<A HREF=\"/display_changepw\">"
-               "<span class=\"mainmenu\">"
-               "Change your password</span></A><br />\n");
+               "<span class=\"mainmenu\">");
+       wprintf(_("Change your password"));
+       wprintf("</span></A><br />\n");
 
        wprintf("<A HREF=\"/display_editbio\">"
-               "<span class=\"mainmenu\">"
-               "Enter your 'bio'</span></a><br />\n");
+               "<span class=\"mainmenu\">");
+       wprintf(_("Enter your 'bio'"));
+       wprintf("</span></a><br />\n");
 
        wprintf("<A HREF=\"/display_editpic\">"
-               "<span class=\"mainmenu\">"
-               "Edit your online photo</span></a>\n");
+               "<span class=\"mainmenu\">");
+       wprintf(_("Edit your online photo"));
+       wprintf("</span></a>\n");
 
        do_template("endbox");
 
        wprintf("</TD><TD>");
 
-       svprintf("BOXTITLE", WCS_STRING, "Advanced room commands");
+       svprintf("BOXTITLE", WCS_STRING, _("Advanced room commands"));
        do_template("beginbox");
 
        if ((WC->axlevel >= 6) || (WC->is_room_aide)) {
                wprintf("<A HREF=\"/display_editroom\">"
-                       "<span class=\"mainmenu\">"
-                       "Edit or delete this room</span></A><br />\n");
+                       "<span class=\"mainmenu\">");
+               wprintf(_("Edit or delete this room"));
+               wprintf("</span></A><br />\n");
        }
 
        wprintf("<A HREF=\"/display_private\">"
-               "<span class=\"mainmenu\">"
-               "Go to a &quot;hidden&quot; room</span></A><br />\n");
+               "<span class=\"mainmenu\">");
+       wprintf(_("Go to a 'hidden' room"));
+       wprintf("</span></A><br />\n");
 
        wprintf("<A HREF=\"/display_entroom\">"
-               "<span class=\"mainmenu\">"
-               "Create a new room</span></A><br />\n");
+               "<span class=\"mainmenu\">");
+       wprintf(_("Create a new room"));
+       wprintf("</span></A><br />\n");
 
        wprintf("<A HREF=\"/display_zap\">"
-               "<span class=\"mainmenu\">"
-               "Zap (forget) this room (%s)</span></A><br />\n",
-               WC->wc_roomname);
+               "<span class=\"mainmenu\">");
+       wprintf(_("Zap (forget) this room (%s)"), WC->wc_roomname);
+       wprintf("</span></A><br />\n");
 
        wprintf("<A HREF=\"/zapped_list\">"
-               "<span class=\"mainmenu\">"
-               "List all forgotten rooms</span></A>\n");
+               "<span class=\"mainmenu\">");
+       wprintf(_("List all forgotten rooms"));
+       wprintf("</span></A>\n");
 
        do_template("endbox");
 
@@ -182,7 +194,9 @@ void display_aide_menu(void)
        output_headers(1, 1, 2, 0, 0, 0, 0);
        wprintf("<div id=\"banner\">\n"
                "<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>"
-               "<SPAN CLASS=\"titlebar\">System Administration Menu</SPAN>"
+               "<SPAN CLASS=\"titlebar\">");
+       wprintf(_("System Administration Menu"));
+       wprintf("</SPAN>"
                "</TD></TR></TABLE>\n"
                "</div>\n<div id=\"content\">\n"
        );
@@ -190,47 +204,50 @@ void display_aide_menu(void)
        wprintf("<div id=\"fix_scrollbar_bug\">"
                "<table border=0 width=100%%><tr valign=top><td>");
 
-       svprintf("BOXTITLE", WCS_STRING, "Global Configuration");
+       svprintf("BOXTITLE", WCS_STRING, _("Global Configuration"));
        do_template("beginbox");
 
        wprintf("<A HREF=\"/display_siteconfig\">"
-               "<span class=\"mainmenu\">"
-               "Edit site-wide configuration</span></A><br />\n");
+               "<span class=\"mainmenu\">");
+       wprintf(_("Edit site-wide configuration"));
+       wprintf("</span></A><br />\n");
 
        wprintf("<A HREF=\"/display_inetconf\">"
-               "<span class=\"mainmenu\">"
-               "Domain names and Internet mail configuration</span></a><br />\n");
+               "<span class=\"mainmenu\">");
+       wprintf(_("Domain names and Internet mail configuration"));
+       wprintf("</span></a><br />\n");
 
        wprintf("<A HREF=\"/display_netconf\">"
-               "<span class=\"mainmenu\">"
-               "Configure replication with other Citadel servers"
-               "</span></A>\n");
+               "<span class=\"mainmenu\">");
+       wprintf(_("Configure replication with other Citadel servers"));
+       wprintf("</span></A>\n");
 
        do_template("endbox");
 
        wprintf("</td><td>");
 
-       svprintf("BOXTITLE", WCS_STRING, "User account management");
+       svprintf("BOXTITLE", WCS_STRING, _("User account management"));
        do_template("beginbox");
 
        wprintf("<A HREF=\"/select_user_to_edit\">"
-               "<span class=\"mainmenu\">"
-               "Add, change, delete user accounts"
-               "</span></A><br />\n");
+               "<span class=\"mainmenu\">");
+       wprintf(_("Add, change, delete user accounts"));
+       wprintf("</span></A><br />\n");
 
        wprintf("<A HREF=\"/validate\">"
-               "<span class=\"mainmenu\">"
-               "Validate new users</span></A><br />\n");
+               "<span class=\"mainmenu\">");
+       wprintf(_("Validate new users"));
+       wprintf("</span></A><br />\n");
 
        do_template("endbox");
 
-       svprintf("BOXTITLE", WCS_STRING, "Rooms and Floors");
+       svprintf("BOXTITLE", WCS_STRING, _("Rooms and Floors"));
        do_template("beginbox");
 
        wprintf("<A HREF=\"/display_floorconfig\">"
-               "<span class=\"mainmenu\">"
-               "Add, change, or delete floors"
-               "</span></A>\n");
+               "<span class=\"mainmenu\">");
+       wprintf(_("Add, change, or delete floors"));
+       wprintf("</span></A>\n");
 
        do_template("endbox");
 
@@ -250,8 +267,9 @@ void display_generic(void)
        output_headers(1, 1, 2, 0, 0, 0, 0);
        wprintf("<div id=\"banner\">\n"
                "<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>"
-               "<SPAN CLASS=\"titlebar\">Enter a server command</SPAN>"
-               "</TD></TR></TABLE>\n"
+               "<SPAN CLASS=\"titlebar\">");
+       wprintf(_("Enter a server command"));
+       wprintf("</SPAN></TD></TR></TABLE>\n"
                "</div>\n<div id=\"content\">\n"
        );
 
@@ -259,20 +277,22 @@ void display_generic(void)
                "<table border=0 width=100%% bgcolor=\"#ffffff\"><tr><td>\n");
 
        wprintf("<CENTER>");
-       wprintf("This screen allows you to enter Citadel server commands which are\n");
-       wprintf("not supported by WebCit.  If you do not know what that means,\n");
-       wprintf("then this screen will not be of much use to you.<br />\n");
+       wprintf(_("This screen allows you to enter Citadel server commands which are "
+               "not supported by WebCit.  If you do not know what that means, "
+               "then this screen will not be of much use to you."));
+       wprintf("<br />\n");
 
        wprintf("<FORM METHOD=\"POST\" ACTION=\"/do_generic\">\n");
 
-       wprintf("Enter command:<br />\n");
-       wprintf("<INPUT TYPE=\"text\" NAME=\"g_cmd\" SIZE=80 MAXLENGTH=\"250\"><br />\n");
+       wprintf(_("Enter command:"));
+       wprintf("<br /><INPUT TYPE=\"text\" NAME=\"g_cmd\" SIZE=80 MAXLENGTH=\"250\"><br />\n");
 
-       wprintf("Command input (if requesting SEND_LISTING transfer mode):<br />\n");
-       wprintf("<TEXTAREA NAME=\"g_input\" ROWS=10 COLS=80 WIDTH=80></TEXTAREA><br />\n");
+       wprintf(_("Command input (if requesting SEND_LISTING transfer mode):"));
+       wprintf("<br /><TEXTAREA NAME=\"g_input\" ROWS=10 COLS=80 WIDTH=80></TEXTAREA><br />\n");
 
-       wprintf("<FONT SIZE=-2>Detected host header is http://%s</FONT>\n",
-               WC->http_host);
+       wprintf("<FONT SIZE=-2>");
+       wprintf(_("Detected host header is %s://%s"), (is_https ? "https" : "http"), WC->http_host);
+       wprintf("</FONT>\n");
        wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Send command\">");
        wprintf("&nbsp;");
        wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Cancel\"><br />\n");
Citadel server, clients, utilities