From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS22989 209.51.188.0/24 X-Spam-Status: No, score=-3.7 required=3.0 tests=AWL,BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by dcvr.yhbt.net (Postfix) with ESMTPS id 39C761F45F for ; Mon, 6 May 2019 18:22:07 +0000 (UTC) Received: from localhost ([127.0.0.1]:60521 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hNiFW-00064g-3Q for normalperson@yhbt.net; Mon, 06 May 2019 14:22:02 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54054) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hNiFR-00064A-Hj for bug-gnulib@gnu.org; Mon, 06 May 2019 14:21:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hNiFQ-0002Mx-8x for bug-gnulib@gnu.org; Mon, 06 May 2019 14:21:57 -0400 Received: from de.cellform.com ([88.217.224.109]:35860 helo=jocasta.intra) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hNiFO-0002BK-QB for bug-gnulib@gnu.org; Mon, 06 May 2019 14:21:56 -0400 Received: from jocasta.intra (localhost [127.0.0.1]) by jocasta.intra (8.15.2/8.15.2/Debian-8) with ESMTPS id x46ILdiY004394 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 6 May 2019 20:21:39 +0200 Received: (from john@localhost) by jocasta.intra (8.15.2/8.15.2/Submit) id x46ILckF004392; Mon, 6 May 2019 20:21:38 +0200 From: John Darrington To: bug-gnulib@gnu.org Subject: [PATCH] version-etc.c: Do not include URLS in translatable strings. Date: Mon, 6 May 2019 20:21:34 +0200 Message-Id: <20190506182134.4347-1-john@darrington.wattle.id.au> X-Mailer: git-send-email 2.11.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 88.217.224.109 X-BeenThere: bug-gnulib@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Gnulib discussion list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnulib-bounces+normalperson=yhbt.net@gnu.org Sender: "bug-gnulib" This method is better for several reasons: 1. It avoids the danger of cut and paste errors. 2. Naive translators can't translate the urls (it's amazing how many do things like that!) 3. Should the urls ever change, only this file has to be updated rather than every single translation. * lib/version-etc.c: Take URLS out of translatable strings. --- lib/version-etc.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/lib/version-etc.c b/lib/version-etc.c index 9ca9a5628..4a060e0b5 100644 --- a/lib/version-etc.c +++ b/lib/version-etc.c @@ -82,14 +82,13 @@ version_etc_arn (FILE *stream, locale. Otherwise, do not translate "(C)"; leave it as-is. */ fprintf (stream, version_etc_copyright, _("(C)"), COPYRIGHT_YEAR); - fputs (_("\ + fprintf (stream, _("\ \n\ -License GPLv3+: GNU GPL version 3 or later .\n\ +License GPLv3+: GNU GPL version 3 or later <%s>.\n\ This is free software: you are free to change and redistribute it.\n\ There is NO WARRANTY, to the extent permitted by law.\n\ \n\ -"), - stream); +"), "https://gnu.org/licenses/gpl.html"); switch (n_authors) { @@ -250,9 +249,9 @@ emit_bug_reporting_address (void) #ifdef PACKAGE_URL printf (_("%s home page: <%s>\n"), PACKAGE_NAME, PACKAGE_URL); #else - printf (_("%s home page: \n"), - PACKAGE_NAME, PACKAGE); + printf (_("%s home page: <%s/%s/>\n"), PACKAGE_NAME, + "https://www.gnu.org/software", PACKAGE); #endif - fputs (_("General help using GNU software: \n"), - stdout); + printf (_("General help using GNU software: <%s>\n"), + "https://www.gnu.org/gethelp"); } -- 2.11.0