* calendar_view.c event.c floors.c graphics.c html2html.c iconbar.c: i18n
authorArt Cancro <ajc@citadel.org>
Thu, 18 Aug 2005 18:33:34 +0000 (18:33 +0000)
committerArt Cancro <ajc@citadel.org>
Thu, 18 Aug 2005 18:33:34 +0000 (18:33 +0000)
webcit/ChangeLog
webcit/calendar_view.c
webcit/event.c
webcit/floors.c
webcit/graphics.c
webcit/html2html.c

index a178772ddf3c5feda14aaa6869351209aee47e9a..bc32369b9c1d8debd52c2600a3cca9f5645f3e4c 100644 (file)
@@ -1,4 +1,7 @@
 $Log$
+Revision 621.15  2005/08/18 18:33:34  ajc
+* calendar_view.c event.c floors.c graphics.c html2html.c iconbar.c: i18n
+
 Revision 621.14  2005/08/18 16:17:25  ajc
 * calendar_tools.c: i18n
 
@@ -2844,3 +2847,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
+
index c43cb5b979f92abc36022bd9292cbba077657f47..062df0c4dbbe5dbfa831affb074d843cab1943a8 100644 (file)
 #ifndef WEBCIT_WITH_CALENDAR_SERVICE
 
 void do_calendar_view(void) {  /* stub for non-libical builds */
-       wprintf("<CENTER><I>Calendar view not available</I></CENTER><br />\n");
+       wprintf("<CENTER><I>");
+       wprintf(_("The calendar view is not available."));
+       wprintf("</I></CENTER><br />\n");
 }
 
 void do_tasks_view(void) {     /* stub for non-libical builds */
-       wprintf("<CENTER><I>Tasks view not available</I></CENTER><br />\n");
+       wprintf("<CENTER><I>");
+       wprintf(_("The tasks view is not available."));
+       wprintf("</I></CENTER><br />\n");
 }
 
 #else  /* WEBCIT_WITH_CALENDAR_SERVICE */
@@ -606,8 +610,11 @@ void do_tasks_view(void) {
 
        wprintf("<div id=\"fix_scrollbar_bug\">"
                "<table border=0 cellspacing=0 width=100%% bgcolor=\"#FFFFFF\">\n<tr>\n"
-               "<TH>Name of task</TH>\n"
-               "<TH>Date due</TH></TR>\n"
+               "<TH>");
+       wprintf(_("Name of task"));
+       wprintf("</TH><TH>");
+       wprintf(_("Date due"));
+       wprintf("</TH></TR>\n"
        );
 
        /* Sort them if necessary */
index 7211a2c7b9e012c8e962849884b477d909fa4b7f..dfd3478d4b9f9542d17fc119305d48ac19b89de2 100644 (file)
@@ -68,7 +68,9 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum)
        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\">Add or edit an event</SPAN>"
+               "<SPAN CLASS=\"titlebar\">");
+       wprintf(_("Add or edit an event"));
+       wprintf("</SPAN>"
                "</TD></TR></TABLE>\n"
                "</div>\n<div id=\"content\">\n"
        );
@@ -132,7 +134,9 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum)
        /* Put it in a borderless table so it lines up nicely */
        wprintf("<TABLE border=0 width=100%%>\n");
 
-       wprintf("<TR><TD><B>Summary</B></TD><TD>\n"
+       wprintf("<TR><TD><B>");
+       wprintf(_("Summary"));
+       wprintf("</B></TD><TD>\n"
                "<INPUT TYPE=\"text\" NAME=\"summary\" "
                "MAXLENGTH=\"64\" SIZE=\"64\" VALUE=\"");
        p = icalcomponent_get_first_property(vevent, ICAL_SUMMARY_PROPERTY);
@@ -141,7 +145,9 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum)
        }
        wprintf("\"></TD></TR>\n");
 
-       wprintf("<TR><TD><B>Location</B></TD><TD>\n"
+       wprintf("<TR><TD><B>");
+       wprintf(_("Location"));
+       wprintf("</B></TD><TD>\n"
                "<INPUT TYPE=\"text\" NAME=\"location\" "
                "MAXLENGTH=\"64\" SIZE=\"64\" VALUE=\"");
        p = icalcomponent_get_first_property(vevent, ICAL_LOCATION_PROPERTY);
@@ -150,7 +156,9 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum)
        }
        wprintf("\"></TD></TR>\n");
 
-       wprintf("<TR><TD><B>Start</B></TD><TD>\n");
+       wprintf("<TR><TD><B>");
+       wprintf(_("Start"));
+       wprintf("</B></TD><TD>\n");
        p = icalcomponent_get_first_property(vevent, ICAL_DTSTART_PROPERTY);
        if (p != NULL) {
                t_start = icalproperty_get_dtstart(p);
@@ -190,8 +198,9 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum)
 
        wprintf("<INPUT TYPE=\"checkbox\" NAME=\"alldayevent\" "
                "VALUE=\"yes\" onClick=\"grey_all_day();\""
-               " %s >All day event",
-               (t_start.is_date ? "CHECKED" : "" )
+               " %s >%s",
+               (t_start.is_date ? "CHECKED" : "" ),
+               _("All day event")
        );
 
        wprintf("</TD></TR>\n");
@@ -200,7 +209,9 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum)
         * the start time (the hour/minute/second will be set to midnight).
         * Otherwise extract or create it.
         */
-       wprintf("<TR><TD><B>End</B></TD><TD>\n");
+       wprintf("<TR><TD><B>");
+       wprintf(_("End"));
+       wprintf("</B></TD><TD>\n");
        if (t_start.is_date) {
                t_end = t_start;
        }
@@ -225,7 +236,9 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum)
        display_icaltimetype_as_webform(&t_end, "dtend");
        wprintf("</TD></TR>\n");
 
-       wprintf("<TR><TD><B>Notes</B></TD><TD>\n"
+       wprintf("<TR><TD><B>");
+       wprintf(_("Notes"));
+       wprintf("</B></TD><TD>\n"
                "<TEXTAREA NAME=\"description\" wrap=soft "
                "ROWS=5 COLS=80 WIDTH=80>\n"
        );
@@ -266,11 +279,14 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum)
                }
        }
 
-       wprintf("<TR><TD><B>Organizer</B></TD><TD>");
+       wprintf("<TR><TD><B>");
+       wprintf(_("Organizer"));
+       wprintf("</B></TD><TD>");
        escputs(organizer_string);
        if (organizer_is_me) {
-               wprintf(" <FONT SIZE=-1><I>"
-                       "(you are the organizer)</I></FONT>\n");
+               wprintf(" <FONT SIZE=-1><I>");
+               wprintf(_("(you are the organizer)"));
+               wprintf("</I></FONT>\n");
        }
 
        /*
@@ -286,7 +302,9 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum)
        wprintf("</TD></TR>\n");
 
        /* Transparency */
-       wprintf("<TR><TD><B>Show time as:</B></TD><TD>");
+       wprintf("<TR><TD><B>");
+       wprintf(_("Show time as:"));
+       wprintf("</B></TD><TD>");
 
        p = icalcomponent_get_first_property(vevent, ICAL_TRANSP_PROPERTY);
        if (p == NULL) {
@@ -306,19 +324,25 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum)
        wprintf("<INPUT TYPE=\"radio\" NAME=\"transp\" VALUE=\"transparent\"");
        if (v != NULL) if (icalvalue_get_transp(v) == ICAL_TRANSP_TRANSPARENT)
                wprintf(" CHECKED");
-       wprintf(">Free&nbsp;&nbsp;");
+       wprintf(">");
+       wprintf(_("Free"));
+       wprintf("&nbsp;&nbsp;");
 
        wprintf("<INPUT TYPE=\"radio\" NAME=\"transp\" VALUE=\"opaque\"");
        if (v != NULL) if (icalvalue_get_transp(v) == ICAL_TRANSP_OPAQUE)
                wprintf(" CHECKED");
-       wprintf(">Busy");
+       wprintf(">");
+       wprintf(_("Busy"));
 
        wprintf("</TD></TR>\n");
 
        /* Attendees */
-       wprintf("<TR><TD><B>Attendees</B><br />"
-               "<FONT SIZE=-2>(One per line)"
-               "</FONT></TD><TD>"
+       wprintf("<TR><TD><B>");
+       wprintf(_("Attendees"));
+       wprintf("</B><br />"
+               "<FONT SIZE=-2>");
+       wprintf(_("(One per line)"));
+       wprintf("</FONT></TD><TD>"
                "<TEXTAREA %s NAME=\"attendees\" wrap=soft "
                "ROWS=3 COLS=80 WIDTH=80>\n",
                (organizer_is_me ? "" : "DISABLED ")
@@ -346,15 +370,19 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum)
 
        /* Done with properties. */
        wprintf("</TABLE>\n<CENTER>"
-               "<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Save\">"
+               "<INPUT TYPE=\"submit\" NAME=\"save_button\" VALUE=\"%s\">"
                "&nbsp;&nbsp;"
-               "<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Delete\">\n"
+               "<INPUT TYPE=\"submit\" NAME=\"delete_button\" VALUE=\"%s\">\n"
                "&nbsp;&nbsp;"
-               "<INPUT TYPE=\"submit\" NAME=\"sc\" "
-                               "VALUE=\"Check attendee availability\">\n"
+               "<INPUT TYPE=\"submit\" NAME=\"check_button\" "
+                               "VALUE=\"%s\">\n"
                "&nbsp;&nbsp;"
-               "<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Cancel\">\n"
-               "</CENTER>\n"
+               "<INPUT TYPE=\"submit\" NAME=\"cancel_button\" VALUE=\"%s\">\n"
+               "</CENTER>\n",
+               _("Save"),
+               _("Delete"),
+               _("Check attendee availability"),
+               _("Cancel")
        );
 
        wprintf("</FORM>\n");
@@ -414,8 +442,8 @@ void save_individual_event(icalcomponent *supplied_vevent, long msgnum) {
                created_new_vevent = 1;
        }
 
-       if ( (!strcasecmp(bstr("sc"), "Save"))
-          || (!strcasecmp(bstr("sc"), "Check attendee availability")) ) {
+       if ( (strlen(bstr("save_button")) > 0)
+          || (strlen(bstr("check_button")) > 0) ) {
 
                /* Replace values in the component with ones from the form */
 
@@ -630,7 +658,7 @@ STARTOVER:  lprintf(9, "Remove unlisted attendees\n");
 
                /* If the user clicked 'Save' then save it to the server. */
                lprintf(9, "Serializing it for saving\n");
-               if ( (encaps != NULL) && (!strcasecmp(bstr("sc"), "Save")) ) {
+               if ( (encaps != NULL) && (strlen(bstr("save_button")) > 0) ) {
                        serv_puts("ENT0 1|||4|||1|");
                        serv_getln(buf, sizeof buf);
                        if (buf[0] == '8') {
@@ -646,7 +674,7 @@ STARTOVER:  lprintf(9, "Remove unlisted attendees\n");
                }
 
                /* Or, check attendee availability if the user asked for that. */
-               if ( (encaps != NULL) && (!strcasecmp(bstr("sc"), "Check attendee availability")) ) {
+               if ( (encaps != NULL) && (strlen(bstr("check_button")) > 0) ) {
 
                        /* Call this function, which does the real work */
                        check_attendee_availability(encaps);
@@ -663,7 +691,7 @@ STARTOVER:  lprintf(9, "Remove unlisted attendees\n");
         * If the user clicked 'Delete' then delete it.
         */
        lprintf(9, "Checking to see if we have to delete an old event\n");
-       if ( (!strcasecmp(bstr("sc"), "Delete")) && (msgnum > 0L) ) {
+       if ( (strlen(bstr("delete_button")) > 0) && (msgnum > 0L) ) {
                serv_printf("DELE %ld", atol(bstr("msgnum")));
                serv_getln(buf, sizeof buf);
        }
@@ -673,7 +701,7 @@ STARTOVER:  lprintf(9, "Remove unlisted attendees\n");
        }
 
        /* If this was a save or deelete, go back to the calendar view. */
-       if (strcasecmp(bstr("sc"), "Check attendee availability")) {
+       if (strlen(bstr("check_button")) == 0) {
                readloop("readfwd");
        }
 }
index b4dceb6a0a2d4cb093908bb081e1d75b1207e913..5d1ba0ce42278554ff4a5029107cd4ea93c3e838 100644 (file)
@@ -27,7 +27,9 @@ void display_floorconfig(char *prepend_html)
         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\">Add/change/delete floors</SPAN>"
+                "<SPAN CLASS=\"titlebar\">");
+       wprintf(_("Add/change/delete floors"));
+       wprintf("</SPAN>"
                 "</TD></TR></TABLE>\n"
                 "</div>\n<div id=\"content\">\n"
         );
@@ -42,7 +44,9 @@ void display_floorconfig(char *prepend_html)
        serv_getln(buf, sizeof buf);
        if (buf[0] != '1') {
                wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#770000\"><TR><TD>");
-               wprintf("<SPAN CLASS=\"titlebar\">Error</SPAN>\n");
+               wprintf("<SPAN CLASS=\"titlebar\">");
+               wprintf(_("Error"));
+               wprintf("</SPAN>\n");
                wprintf("</TD></TR></TABLE>\n");
                wprintf("%s<br />\n", &buf[4]);
                wDumpContent(1);
@@ -51,10 +55,13 @@ void display_floorconfig(char *prepend_html)
 
        wprintf("<div id=\"fix_scrollbar_bug\">"
                "<TABLE BORDER=1 WIDTH=100%% bgcolor=\"#ffffff\">\n"
-               "<TR><TH>Floor number</TH>"
-               "<TH>Floor name</TH>"
-               "<TH>Number of rooms</TH></TR>\n"
-       );
+               "<TR><TH>");
+       wprintf(_("Floor number"));
+       wprintf("</TH><TH>");
+       wprintf(_("Floor name"));
+       wprintf("</TH><TH>");
+       wprintf(_("Number of rooms"));
+       wprintf("</TH></TR>\n");
 
        while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
                floornum = extract_int(buf, 0);
@@ -65,15 +72,15 @@ void display_floorconfig(char *prepend_html)
                if (refcount == 0) {
                        wprintf("</TD><TD>"
                                "<A HREF=\"/delete_floor?floornum=%d\">"
-                               "<FONT SIZE=-1>(delete floor)</A>"
-                               "</FONT><br />", floornum
-                       );
+                               "<FONT SIZE=-1>", floornum);
+                       wprintf(_("(delete floor)"));
+                       wprintf("</A></FONT><br />");
                }
                wprintf("<FONT SIZE=-1>"
                        "<A HREF=\"/display_editfloorpic&"
-                       "which_floor=%d\">(edit graphic)</A>",
-                       floornum);
-               wprintf("</TD></TR></TABLE>");
+                       "which_floor=%d\">", floornum);
+               wprintf(_("(edit graphic)"));
+               wprintf("</A></TD></TR></TABLE>");
                wprintf("</TD>");
 
                wprintf("<TD>"
@@ -84,8 +91,8 @@ void display_floorconfig(char *prepend_html)
                        "VALUE=\"%s\" MAXLENGTH=\"250\">\n",
                        floornum, floorname);
                wprintf("<INPUT TYPE=\"SUBMIT\" NAME=\"sc\" "
-                       "VALUE=\"Change name\">"
-                       "</FORM></TD>");
+                       "VALUE=\"%s\">"
+                       "</FORM></TD>", _("Change name"));
 
                wprintf("<TD>%d</TD></TR>\n", refcount);
        }
@@ -95,9 +102,9 @@ void display_floorconfig(char *prepend_html)
                "<INPUT TYPE=\"text\" NAME=\"floorname\" "
                "MAXLENGTH=\"250\">\n"
                "<INPUT TYPE=\"SUBMIT\" NAME=\"sc\" "
-               "VALUE=\"Create new floor\">"
+               "VALUE=\"%s\">"
                "</FORM></TD>"
-               "<TD>&nbsp;</TD></TR>\n");
+               "<TD>&nbsp;</TD></TR>\n", _("Create new floor"));
 
        wprintf("</table></div>\n");
        wDumpContent(1);
@@ -116,7 +123,7 @@ void delete_floor(void) {
        serv_getln(buf, sizeof buf);
 
        if (buf[0] == '2') {
-               sprintf(message, "Floor has been deleted.");
+               sprintf(message, _("Floor has been deleted."));
        }
        else {
                sprintf(message, "%s", &buf[4]);
@@ -137,7 +144,7 @@ void create_floor(void) {
        serv_getln(buf, sizeof buf);
 
        if (buf[0] == '2') {
-               sprintf(message, "New floor has been created.");
+               sprintf(message, _("New floor has been created."));
        } else {
                sprintf(message, "%s", &buf[4]);
        }
index 6a1fdcab79b20dd357aac9023272815fa8d10cdc..5a0fa4e55b2b25694e0a9565c04ce0da3fe323e9 100644 (file)
@@ -22,7 +22,9 @@ void display_graphics_upload(char *description, char *check_cmd, char *uplurl)
        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\">Image upload</SPAN>"
+               "<SPAN CLASS=\"titlebar\">");
+       wprintf(_("Image upload"));
+       wprintf("</SPAN>"
                "</TD></TR></TABLE>\n"
                "</div>\n<div id=\"content\">\n"
        );
@@ -39,18 +41,20 @@ void display_graphics_upload(char *description, char *check_cmd, char *uplurl)
        urlescputs(bstr("which_room"));
        wprintf("\">\n");
 
-       wprintf("You can upload any image directly from your computer,\n");
-       wprintf("as long as it is in GIF format (JPEG, PNG, etc. won't\n");
-       wprintf("work).<br /><br />\n");
+       wprintf(_("You can upload any image directly from your computer, "
+               "as long as it is in GIF format (JPEG, PNG, etc. won't "
+               "work)."));
+       wprintf("<br /><br />\n");
 
-       wprintf("Please select a file to upload:<br /><br />\n");
+       wprintf(_("Please select a file to upload:"));
+       wprintf("<br /><br />\n");
        wprintf("<INPUT TYPE=\"FILE\" NAME=\"filename\" SIZE=\"35\">\n");
        wprintf("<br /><br />");
-       wprintf("<INPUT TYPE=\"SUBMIT\" NAME=\"sc\" VALUE=\"Upload\">\n");
+       wprintf("<INPUT TYPE=\"SUBMIT\" NAME=\"upload_button\" VALUE=\"%s\">\n", _("Upload"));
        wprintf("&nbsp;");
-       wprintf("<INPUT TYPE=\"RESET\" VALUE=\"Reset Form\">\n");
+       wprintf("<INPUT TYPE=\"RESET\" VALUE=\"%s\">\n", _("Reset form"));
        wprintf("&nbsp;");
-       wprintf("<INPUT TYPE=\"SUBMIT\" NAME=\"sc\" VALUE=\"Cancel\">\n");
+       wprintf("<INPUT TYPE=\"SUBMIT\" NAME=\"cancel_button\" VALUE=\"%s\">\n", _("Cancel"));
        wprintf("</FORM>\n");
        wprintf("</CENTER>\n");
        wprintf("</td></tr></table></div>\n");
@@ -64,16 +68,16 @@ void do_graphics_upload(char *upl_cmd)
        int pos = 0;
        int thisblock;
 
-       if (!strcasecmp(bstr("sc"), "Cancel")) {
+       if (strlen(bstr("cancel_button")) > 0) {
                strcpy(WC->ImportantMessage,
-                       "Graphics upload cancelled.");
+                       _("Graphics upload has been cancelled."));
                display_main_menu();
                return;
        }
 
        if (WC->upload_length == 0) {
                strcpy(WC->ImportantMessage,
-                       "You didn't upload a file.");
+                       _("You didn't upload a file."));
                display_main_menu();
                return;
        }
index 8a2b5c9bd6db1623e2c57f4f7d5ba5c1761d6329..32f76777f561bae82db7431c205951a2d25efe53 100644 (file)
@@ -48,10 +48,11 @@ void output_html(char *charset) {
                buffer_length = content_length + line_length + 2;
                msg = realloc(msg, buffer_length);
                if (msg == NULL) {
-                       wprintf("<B>realloc() error!  "
-                               "couldn't get %d bytes: %s</B><br /><br />\n",
+                       wprintf("<B>");
+                       wprintf(_("realloc() error! couldn't get %d bytes: %s"),
                                buffer_length + 1,
                                strerror(errno));
+                       wprintf("</B><br /><br />\n");
                        return;
                }
                strcpy(&msg[content_length], buf);