make --help print "Report PROGRAM translation bugs to <...>."

for all but the C/POSIX locale.
* src/system.h: Include "hard-locale.h".
(emit_bug_reporting_address): Tell where to report translation bugs.

don't include "hard-locale.h", now that system.h does
* src/comm.c: Likewise.
* src/join.c: Likewise.
* src/ls.c: Likewise.
* src/pinky.c: Likewise.
* src/pr.c: Likewise.
* src/sort.c: Likewise.
* src/uniq.c: Likewise.
* src/who.c: Likewise.

diff --git a/src/comm.c b/src/comm.c
index 9e70253f920296542799b61cd3be2671045f9805..4ec7e4a07cb31a734217c5ddf58912205d293e1e 100644 (file)
--- a/src/comm.c
+++ b/src/comm.c
@@ -23,7 +23,6 @@
 #include "system.h"
 #include "linebuffer.h"
 #include "error.h"
-#include "hard-locale.h"
 #include "quote.h"
 #include "stdio--.h"
 #include "xmemcoll.h"

diff --git a/src/join.c b/src/join.c
index 041e2eb536568d3a765cc558ae8567fd43054c8f..992a357b1775a1838ae5aa7f13169acb2e9cc630 100644 (file)
--- a/src/join.c
+++ b/src/join.c
@@ -24,7 +24,6 @@
 
 #include "system.h"
 #include "error.h"
-#include "hard-locale.h"
 #include "linebuffer.h"
 #include "memcasecmp.h"
 #include "quote.h"

diff --git a/src/ls.c b/src/ls.c
index 460e161d13d6a258a0c5b588c8efe6d2a73ec275..7619cebc1aff7a85926529331dae96703075dcc9 100644 (file)
--- a/src/ls.c
+++ b/src/ls.c
@@ -89,7 +89,6 @@
 #include "dev-ino.h"
 #include "error.h"
 #include "filenamecat.h"
-#include "hard-locale.h"
 #include "hash.h"
 #include "human.h"
 #include "filemode.h"

diff --git a/src/pinky.c b/src/pinky.c
index d6bc65482a0e713710e8b60682458fa07a407572..136abc5c2d67f51222131fb8d72ae4a72039444e 100644 (file)
--- a/src/pinky.c
+++ b/src/pinky.c
@@ -26,7 +26,6 @@
 
 #include "canon-host.h"
 #include "error.h"
-#include "hard-locale.h"
 #include "readutmp.h"
 
 /* The official name of this program (e.g., no `g' prefix).  */

diff --git a/src/pr.c b/src/pr.c
index 044bb5609a9ac9d9f1d853dde0f7d3ab75e86b27..d2b6714e0f3232a1cc36c5ef0db69c5dfdcdef4d 100644 (file)
--- a/src/pr.c
+++ b/src/pr.c
@@ -314,7 +314,6 @@
 #include <sys/types.h>
 #include "system.h"
 #include "error.h"
-#include "hard-locale.h"
 #include "mbswidth.h"
 #include "quote.h"
 #include "stat-time.h"

diff --git a/src/sort.c b/src/sort.c
index fe58908b92000985ba4c3854e6c3d30206659f8a..df51d8b330956412e89d25d7b15934acbe64e43e 100644 (file)
--- a/src/sort.c
+++ b/src/sort.c
@@ -30,7 +30,6 @@
 #include "argmatch.h"
 #include "error.h"
 #include "filevercmp.h"
-#include "hard-locale.h"
 #include "hash.h"
 #include "md5.h"
 #include "physmem.h"

diff --git a/src/system.h b/src/system.h
index ee0d25cd902923e60702ffe71c7dc1d5c83f73d2..d51caedf118ee411a7e41f61f044e4235c860448 100644 (file)
--- a/src/system.h
+++ b/src/system.h
@@ -611,15 +611,20 @@ ptr_align (void const *ptr, size_t alignment)
     ? false : (((Accum) = (Accum) * 10 + (Digit_val)), true))          \
   )
 
+#include "hard-locale.h"
 static inline void
 emit_bug_reporting_address (void)
 {
-  /* TRANSLATORS: The second placeholder indicates the bug-reporting
-     address for this package.  Please add _another line_ saying
-     "Report %s translation bugs to <...>\n" with the address for translation
-     bugs (typically your translation team's web or email address).  */
   printf (_("\nReport %s bugs to <%s>.\n"), last_component (program_name),
          PACKAGE_BUGREPORT);
+  /* TRANSLATORS: Replace LANG_CODE in this URL with your language code
+     <http://translationproject.org/team/LANG_CODE.html> to form one of
+     the URLs at http://translationproject.org/team/.  Otherwise, replace
+     the entire URL with your translation team's email address.  */
+  if (hard_locale (LC_MESSAGES))
+    printf (_("Report %s translation bugs to "
+             "<http://translationproject.org/team/>\n"),
+           last_component (program_name));
 }
 
 #include "inttostr.h"

diff --git a/src/uniq.c b/src/uniq.c
index f2aeb77d9b62b2b2142cfea005a1d5e0f0646dbd..a3e0fb7b5ec1bffee2969e0618fd2c57491fa36a 100644 (file)
--- a/src/uniq.c
+++ b/src/uniq.c
@@ -26,7 +26,6 @@
 #include "argmatch.h"
 #include "linebuffer.h"
 #include "error.h"
-#include "hard-locale.h"
 #include "posixver.h"
 #include "quote.h"
 #include "xmemcoll.h"

diff --git a/src/who.c b/src/who.c
index 5b17ef15ba944ee87e13ab9d3850253cdcc785be..3bc680bc0a63c56a539c35a7109758a5270ca39f 100644 (file)
--- a/src/who.c
+++ b/src/who.c
@@ -34,7 +34,6 @@
 #include "canon-host.h"
 #include "readutmp.h"
 #include "error.h"
-#include "hard-locale.h"
 #include "quote.h"
 
 /* The official name of this program (e.g., no `g' prefix).  */