diff options
| author | Eric S. Raymond <esr@thyrsus.com> | 2000-09-26 08:06:45 +0000 |
|---|---|---|
| committer | Eric S. Raymond <esr@thyrsus.com> | 2000-09-26 08:06:45 +0000 |
| commit | 1c7ab650bf7acfdd94ee386c84dccc8d5cb157b6 (patch) | |
| tree | 35251d5737ab8cd2ab59721186c926f512b07bed /sink.c | |
| parent | b64751301fa6367b81ce382b4c4dbca5c17a030b (diff) | |
| download | fetchmail-1c7ab650bf7acfdd94ee386c84dccc8d5cb157b6.tar.gz fetchmail-1c7ab650bf7acfdd94ee386c84dccc8d5cb157b6.tar.bz2 fetchmail-1c7ab650bf7acfdd94ee386c84dccc8d5cb157b6.zip | |
Bug fixes and internationalization improvements.
svn path=/trunk/; revision=2967
Diffstat (limited to 'sink.c')
| -rw-r--r-- | sink.c | 14 |
1 files changed, 6 insertions, 8 deletions
@@ -264,7 +264,7 @@ static int send_bouncemail(struct query *ctl, struct msgblk *msg, /* bounce back an error report a la RFC 1892 */ { char daemon_name[18 + HOSTLEN] = "FETCHMAIL-DAEMON@"; - char boundary[BUFSIZ], *ts, *bounce_to; + char boundary[BUFSIZ], *bounce_to; int sock; /* don't bounce in reply to undeliverable bounces */ @@ -291,13 +291,11 @@ static int send_bouncemail(struct query *ctl, struct msgblk *msg, "foo-mani-padme-hum-%d-%d-%ld", (int)getpid(), (int)getppid(), time((time_t *)NULL)); - ts = rfc822timestamp(); - if (outlevel >= O_VERBOSE) - report(stdout, "SMTP: (bounce-message body)\n"); + report(stdout, _("SMTP: (bounce-message body)\n")); else /* this will usually go to sylog... */ - report(stderr, "mail from %s bounced to %s\n", + report(stderr, _("mail from %s bounced to %s\n"), daemon_name, bounce_to); /* bouncemail headers */ @@ -335,7 +333,7 @@ static int send_bouncemail(struct query *ctl, struct msgblk *msg, /* Minimum RFC1894 compliance + Diagnostic-Code field */ SockPrintf(sock, "\r\n"); SockPrintf(sock, "Final-Recipient: rfc822; %s\r\n", idp->id); - SockPrintf(sock, "Last-Attempt-Date: %s\r\n", ts); + SockPrintf(sock, "Last-Attempt-Date: %s\r\n", rfc822timestamp()); SockPrintf(sock, "Action: failed\r\n"); if (nerrors == 1) @@ -392,7 +390,7 @@ static int handle_smtp_report(struct query *ctl, struct msgblk *msg) SMTP_rset(ctl->smtp_socket); /* stay on the safe site */ if (outlevel >= O_DEBUG) - report(stdout, "Saved error is still %d\n", smtperr); + report(stdout, _("Saved error is still %d\n"), smtperr); /* * Note: send_bouncemail message strings are not made subject @@ -1113,7 +1111,7 @@ va_dcl void close_warning_by_mail(struct query *ctl, struct msgblk *msg) /* sign and send mailed warnings */ { - stuff_warning(ctl, "--\r\n\t\t\t\tThe Fetchmail Daemon\r\n"); + stuff_warning(ctl, _("--\r\n\t\t\t\tThe Fetchmail Daemon\r\n")); close_sink(ctl, msg, TRUE); } |