doc: remove redundant "Report translation bugs to" in --help

* configure.ac: Define PACKAGE_L10N_BUGREPORT.
* man/local.mk (run_help2man): Set the IN_HELP2MAN environment variable.
* src/system.h (emit_ancillary_info): Don't emit "Report any translation
bugs to" line; this is already done by emit_bug_reporting_address() in
version-etc.c.
Fixes https://bugs.gnu.org/80886

diff --git a/configure.ac b/configure.ac
index f60db9915b6d976ad77beb672d9b28ce6489224c..4745576629bed9bc2777c323c68a446dbc81848b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -153,6 +153,10 @@ if test "$gl_bold_manpages" != no; then
 fi
 AM_CONDITIONAL([BOLD_MAN_REFS], [test "$gl_bold_manpages" != no])
 
+# When generating manual pages, include a "Report any translation bugs" line.
+AC_DEFINE([PACKAGE_L10N_BUGREPORT], ["https://translationproject.org/team/"],
+  [Define to the URL of your translation project.])
+
 AC_ARG_ENABLE([manual-url],
   [AS_HELP_STRING([--enable-manual-url@<:@=<url>@:>@],
      [When generating man pages, or displaying --help, generate hyperlinks

diff --git a/man/local.mk b/man/local.mk
index 92cfebadd8caa0185511059ad2762d08ff05ef5a..156b0e18c4b6f633ed653b503b3a03eab06d26b9 100644 (file)
--- a/man/local.mk
+++ b/man/local.mk
@@ -27,7 +27,7 @@ if HAVE_PERL
 if BOLD_MAN_REFS
 help2man_OPTS=--bold-refs
 endif
-run_help2man = env TERM=not_dumb $(PERL) -- \
+run_help2man = env IN_HELP2MAN=1 TERM=not_dumb $(PERL) -- \
               $(srcdir)/man/help2man --loose-indent $(help2man_OPTS)
 else
 run_help2man = $(SHELL) $(srcdir)/man/dummy-man

diff --git a/src/system.h b/src/system.h
index d3c5f08a78696707f1dac27dde3ac55a943b3bc5..545377335f29ff43409d41294ffd920bbf9aee12 100644 (file)
--- a/src/system.h
+++ b/src/system.h
@@ -870,18 +870,6 @@ emit_ancillary_info (char const *program)
 
   emit_bug_reporting_address ();
 
-  /* Don't output this redundant message for English locales.
-     Note we still output for 'C' so that it gets included in the man page.  */
-  char const *lc_messages = setlocale (LC_MESSAGES, NULL);
-  if (lc_messages && STRNCMP_LIT (lc_messages, "en_"))
-    {
-      /* TRANSLATORS: Replace LANG_CODE in this URL with your language code
-         <https://translationproject.org/team/LANG_CODE.html> to form one of
-         the URLs at https://translationproject.org/team/.  Otherwise, replace
-         the entire URL with your translation team's email address.  */
-      fputs (_("Report any translation bugs to "
-               "<https://translationproject.org/team/>\n"), stdout);
-    }
   /* .htaccess on the coreutils web site maps programs to the appropriate page,
      however we explicitly handle "[" -> "test" here as the "[" is not
      recognized as part of a URL by default in terminals.  */