From ed55cdcb1639143e306c745a13258dfc163ff37b Mon Sep 17 00:00:00 2001 From: Lukas Fleischer Date: Mon, 18 Jun 2012 10:28:11 +0200 Subject: src/args.c: Fix bugs address in usage message * Point out that bug reports should be sent to the bugs mailing list, not to misc in help and usage messages. * Call more_info() when displaying the help message instead of copy-pasting strings to avoid double translation. Reported-by: rafael ff1 Signed-off-by: Lukas Fleischer --- src/args.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/src/args.c b/src/args.c index 36401bc..c87a970 100644 --- a/src/args.c +++ b/src/args.c @@ -87,6 +87,15 @@ static void version_arg(void) fputs(vtext, stdout); } +static void more_info(void) +{ + fputs(_("\nFor more information, type '?' from within Calcurse, " + "or read the manpage.\n"), stdout); + fputs(_("Mail feature requests and suggestions to .\n"), + stdout); + fputs(_("Mail bug reports to .\n"), stdout); +} + /* * Print the command line options and exit. */ @@ -145,14 +154,12 @@ static void help_arg(void) "\tIf the optional argument format is not given, ical format is\n" "\tselected by default.\n" "\tnote: redirect standard output to export data to a file,\n" - "\tby issuing a command such as: calcurse --export > calcurse.dat\n" - "\nFor more information, type '?' from within Calcurse, " - "or read the manpage.\n" - "Mail bug reports and suggestions to .\n"); + "\tby issuing a command such as: calcurse --export > calcurse.dat\n"); fprintf(stdout, _("Calcurse %s - text-based organizer\n"), VERSION); usage(); fputs(htext, stdout); + more_info(); } /* @@ -401,14 +408,6 @@ app_arg(int add_line, struct date *day, long date, const char *fmt_apt, return app_found; } -static void more_info(void) -{ - fputs(_("\nFor more information, type '?' from within Calcurse, " - "or read the manpage.\n"), stdout); - fputs(_("Mail bug reports and suggestions to " - ".\n"), stdout); -} - /* * For a given date, print appointments for each day * in the chosen interval. app_found and add_line are used -- cgit v1.2.3-70-g09d2