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 <rafael.f.f1@gmail.com>
Signed-off-by: Lukas Fleischer <calcurse@cryptocrack.de>

1 files 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 <misc@calcurse.org>.\n"),
+        stdout);
+  fputs(_("Mail bug reports to <bugs@calcurse.org>.\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 <misc@calcurse.org>.\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 "
-          "<misc@calcurse.org>.\n"), stdout);
-}
-
 /*
  * For a given date, print appointments for each day
  * in the chosen interval. app_found and add_line are used