* messages.c: finished i18n

* webcit.h: minimum required Citadel server version is now 6.55; this is
  required in order to gain access to the new version of the MSGS command
  that includes a header summary.

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index b20f503321db65a8a001f34674565dd7e5836e37..c64e5496c73f705bcd7d03e466c4ec72487b5b59 100644 (file)
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,4 +1,10 @@
 $Log$
+Revision 621.21  2005/08/22 01:02:42  ajc
+* messages.c: finished i18n
+* webcit.h: minimum required Citadel server version is now 6.55; this is
+  required in order to gain access to the new version of the MSGS command
+  that includes a header summary.
+
 Revision 621.20  2005/08/21 05:02:17  ajc
 * messages.c: renamed some elements
 
@@ -2863,3 +2869,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/messages.c b/webcit/messages.c
index 18fae69226de242dcaac4aca66c3e93af2fb5bda..e2af53d32caa56af1a335491f41d9c8d1e6d92f4 100644 (file)
--- a/webcit/messages.c
+++ b/webcit/messages.c
@@ -1581,15 +1581,16 @@ void readloop(char *oper)
                        "<TD align=center><b><i>%s</i></b> %s</TD>"
                        "<TD align=center><b><i>%s</i></b> %s</TD>"
                        "<TD align=center><b><i>%s</i></b> %s</TD>"
-                       "<TD><INPUT TYPE=\"submit\" NAME=\"sc\" "
+                       "<TD><INPUT TYPE=\"submit\" NAME=\"delete_button\" "
                        "STYLE=\"font-family: Bitstream Vera Sans,Arial,Helvetica,sans-serif;"
                        " font-size: 6pt;\" "
-                       "VALUE=\"Delete\"></TD>"
+                       "VALUE=\"%s\"></TD>"
                        "</TR>\n"
                        ,
                        _("Subject"),   subjsort_button,
                        _("Sender"),    sendsort_button,
-                       _("Date"),      datesort_button
+                       _("Date"),      datesort_button,
+                       _("Delete")
                );
        }
 
@@ -1923,14 +1924,14 @@ void post_message(void)
 
        if (strlen(bstr("cancel_button")) > 0) {
                sprintf(WC->ImportantMessage, 
-                       "Cancelled.  Message was not posted.");
+                       _("Cancelled.  Message was not posted."));
        } else if (strlen(bstr("attach_button")) > 0) {
                display_enter();
                return;
        } else if (atol(bstr("postseq")) == dont_post) {
                sprintf(WC->ImportantMessage, 
-                       "Automatically cancelled because you have already "
-                       "saved this message.");
+                       _("Automatically cancelled because you have already "
+                       "saved this message."));
        } else {
                sprintf(buf, "ENT0 1|%s|0|4|%s",
                        bstr("recp"),
@@ -1940,10 +1941,10 @@ void post_message(void)
                if (buf[0] == '4') {
                        post_mime_to_server();
                        if (strlen(bstr("recp")) > 0) {
-                               sprintf(WC->ImportantMessage, "Message has been sent.\n");
+                               sprintf(WC->ImportantMessage, _("Message has been sent.\n"));
                        }
                        else {
-                               sprintf(WC->ImportantMessage, "Message has been posted.\n");
+                               sprintf(WC->ImportantMessage, _("Message has been posted.\n"));
                        }
                        dont_post = atol(bstr("postseq"));
                } else {
@@ -2031,13 +2032,13 @@ void display_enter(void)
 
        now = time(NULL);
        fmt_date(buf, now, 0);
-       strcat(&buf[strlen(buf)], " <I>from</I> ");
+       strcat(&buf[strlen(buf)], _(" <I>from</I> "));
        stresc(&buf[strlen(buf)], WC->wc_username, 1, 1);
        if (strlen(bstr("recp")) > 0) {
-               strcat(&buf[strlen(buf)], " <I>to</I> ");
+               strcat(&buf[strlen(buf)], _(" <I>to</I> "));
                stresc(&buf[strlen(buf)], bstr("recp"), 1, 1);
        }
-       strcat(&buf[strlen(buf)], " <I>in</I> ");
+       strcat(&buf[strlen(buf)], _(" <I>in</I> "));
        stresc(&buf[strlen(buf)], WC->wc_roomname, 1, 1);
 
        /* begin message entry screen */
@@ -2056,7 +2057,9 @@ void display_enter(void)
        wprintf("%s<br>\n", buf);       /* header bar */
        wprintf("<img src=\"static/newmess3_24x.gif\" align=middle alt=\" \">");
                /* "onLoad=\"document.enterform.msgtext.focus();\" " */
-       wprintf("<font size=-1>Subject (optional):</font>"
+       wprintf("<font size=-1>");
+       wprintf(_("Subject (optional):"));
+       wprintf("</font>"
                "<input type=\"text\" name=\"subject\" value=\"");
        escputs(bstr("subject"));
        wprintf("\" size=40 maxlength=70>"
@@ -2065,12 +2068,12 @@ void display_enter(void)
 
        wprintf("<input type=\"submit\" name=\"send_button\" value=\"");
        if (strlen(bstr("recp")) > 0) {
-               wprintf("Send message");
+               wprintf(_("Send message"));
        } else {
-               wprintf("Post message");
+               wprintf(_("Post message"));
        }
        wprintf("\">&nbsp;"
-               "<input type=\"submit\" name=\"cancel_button\" value=\"Cancel\">\n");
+               "<input type=\"submit\" name=\"cancel_button\" value=\"%s\">\n", _("Cancel"));
 
        wprintf("<center><script type=\"text/javascript\" "
                "src=\"static/richtext.js\"></script>\n"
@@ -2107,7 +2110,7 @@ void display_enter(void)
        wprintf("&nbsp;&nbsp;&nbsp;"
                "Attach file: <input NAME=\"attachfile\" "
                "SIZE=16 TYPE=\"file\">\n&nbsp;&nbsp;"
-               "<input type=\"submit\" name=\"attach_button\" value=\"Add\">\n");
+               "<input type=\"submit\" name=\"attach_button\" value=\"%s\">\n", _("Add"));
 
        wprintf("</form>\n");
 
@@ -2158,12 +2161,15 @@ void confirm_move_msg(void)
        wprintf("<div id=\"fix_scrollbar_bug\">"
                "<table width=100%% border=0 bgcolor=\"#444455\"><tr><td>");
        wprintf("<font size=+1 color=\"#ffffff\"");
-       wprintf("<b>Confirm move of message</b>\n");
+       wprintf("<b>");
+       wprintf(_("Confirm move of message"));
+       wprintf("</b>\n");
        wprintf("</font></td></tr></table></div>\n");
 
        wprintf("<CENTER>");
 
-       wprintf("Move this message to:<br />\n");
+       wprintf(_("Move this message to:"));
+       wprintf("<br />\n");
 
        wprintf("<form METHOD=\"POST\" ACTION=\"/move_msg\">\n");
        wprintf("<INPUT TYPE=\"hidden\" NAME=\"msgid\" VALUE=\"%s\">\n",
@@ -2184,9 +2190,9 @@ void confirm_move_msg(void)
        wprintf("</SELECT>\n");
        wprintf("<br />\n");
 
-       wprintf("<INPUT TYPE=\"submit\" NAME=\"move_button\" VALUE=\"Move\">");
+       wprintf("<INPUT TYPE=\"submit\" NAME=\"move_button\" VALUE=\"%s\">", _("Move"));
        wprintf("&nbsp;");
-       wprintf("<INPUT TYPE=\"submit\" NAME=\"cancel_button\" VALUE=\"Cancel\">");
+       wprintf("<INPUT TYPE=\"submit\" NAME=\"cancel_button\" VALUE=\"%s\">", _("Cancel"));
        wprintf("</form></CENTER>\n");
 
        wprintf("</CENTER>\n");
@@ -2210,7 +2216,9 @@ void move_msg(void)
                serv_getln(buf, sizeof buf);
                wprintf("<EM>%s</EM><br />\n", &buf[4]);
        } else {
-               wprintf("<EM>Message not moved.</EM><br />\n");
+               wprintf("<EM>");
+               wprintf(_("The message was not moved."));
+               wprintf("</EM><br />\n");
        }
 
        wDumpContent(1);
@@ -2222,8 +2230,7 @@ void move_msg(void)
  * (such as deleting them).
  */
 void do_stuff_to_msgs(void) {
-       char buf[SIZ];
-       char sc[SIZ];
+       char buf[256];
 
        struct stuff_t {
                struct stuff_t *next;
@@ -2232,6 +2239,7 @@ void do_stuff_to_msgs(void) {
 
        struct stuff_t *stuff = NULL;
        struct stuff_t *ptr;
+       int delete_button_pressed = 0;
 
 
        serv_puts("MSGS ALL");
@@ -2244,14 +2252,16 @@ void do_stuff_to_msgs(void) {
                stuff = ptr;
        }
 
-       strcpy(sc, bstr("sc"));
+       if (strlen(bstr("delete_button")) > 0) {
+               delete_button_pressed = 1;
+       }
 
        while (stuff != NULL) {
 
                sprintf(buf, "msg_%ld", stuff->msgnum);
                if (!strcasecmp(bstr(buf), "yes")) {
 
-                       if (!strcasecmp(sc, "Delete")) {
+                       if (delete_button_pressed) {
                                serv_printf("DELE %ld", stuff->msgnum);
                                serv_getln(buf, sizeof buf);
                        }

diff --git a/webcit/webcit.h b/webcit/webcit.h
index 23d5574b5d32509f604463caf36e051c33ede22d..21afcc042f153ed7add3680f273c5a1680069e4c 100644 (file)
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -92,7 +92,7 @@
 #define DEVELOPER_ID           0
 #define CLIENT_ID              4
 #define CLIENT_VERSION         621             /* This version of WebCit */
-#define MINIMUM_CIT_VERSION    654             /* min required Citadel vers */
+#define MINIMUM_CIT_VERSION    655             /* min required Citadel vers */
 #define DEFAULT_HOST           "localhost"     /* Default Citadel server */
 #define DEFAULT_PORT           "504"
 #define LB                     (1)             /* Internal escape chars */