GNU bug report logs - #37285
[PATCH] doc: Rename translated manuals to drop the dot.

Please note: This is a static page, with minimal formatting, updated once a day.
Click here to see this page with the latest information and nicer formatting.

Package: guix-patches; Reported by: Julien Lepiller <julien@HIDDEN>; Keywords: patch; dated Mon, 2 Sep 2019 18:51:02 UTC; Maintainer for guix-patches is guix-patches@HIDDEN.

Message received at 37285 <at> debbugs.gnu.org:


Received: (at 37285) by debbugs.gnu.org; 5 Sep 2019 20:52:17 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Sep 05 16:52:17 2019
Received: from localhost ([127.0.0.1]:36140 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1i5yjl-0005Bj-5Z
	for submit <at> debbugs.gnu.org; Thu, 05 Sep 2019 16:52:17 -0400
Received: from eggs.gnu.org ([209.51.188.92]:53211)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <ludo@HIDDEN>) id 1i5yjj-0005BV-Vx
 for 37285 <at> debbugs.gnu.org; Thu, 05 Sep 2019 16:52:12 -0400
Received: from fencepost.gnu.org ([2001:470:142:3::e]:44814)
 by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <ludo@HIDDEN>)
 id 1i5yje-0005V7-QD; Thu, 05 Sep 2019 16:52:06 -0400
Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=38696 helo=ribbon)
 by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256)
 (Exim 4.82) (envelope-from <ludo@HIDDEN>)
 id 1i5yjd-0004vi-TA; Thu, 05 Sep 2019 16:52:06 -0400
From: =?utf-8?Q?Ludovic_Court=C3=A8s?= <ludo@HIDDEN>
To: Julien Lepiller <julien@HIDDEN>
Subject: Re: [bug#37285] [PATCH] doc: Rename translated manuals to drop the
 dot.
References: <20190902205034.6b4d2ea2@HIDDEN>
Date: Thu, 05 Sep 2019 22:52:04 +0200
In-Reply-To: <20190902205034.6b4d2ea2@HIDDEN> (Julien Lepiller's
 message of "Mon, 2 Sep 2019 20:50:34 +0200")
Message-ID: <87woemcvpn.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 37285
Cc: 37285 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

Hello,

Julien Lepiller <julien@HIDDEN> skribis:

> Hi, the attached patch changes the translated manual name, from e.g.
> guix.fr to guix-fr. The reason is that some info readers and generators
> drop everything after the first dot to get the name of the manual. This
> leads some readers to thing that "info guix" should open "guix.es.info"
> instead of "guix.info", and the inter-lingua links on the website
> version of the manual to be wrong.
>
> I think I replaced every instance of the filename in this patch, but I
> might have forgotten some, so if you see anything I missed, please tell
> me :)

This is a followup to <https://issues.guix.gnu.org/issue/36782>, right?
WDYT of my reply there?

Neither the standalone Info reader (which comes with Texinfo) nor Emacs
have problems with the dot.  Are you aware of another reader that has
troubles with that?  =E2=80=98pinfo=E2=80=99 maybe?

Links in HTML files are broken, but there=E2=80=99s a fix proposed upstream.

Thanks,
Ludo=E2=80=99.




Information forwarded to guix-patches@HIDDEN:
bug#37285; Package guix-patches. Full text available.

Message received at submit <at> debbugs.gnu.org:


Received: (at submit) by debbugs.gnu.org; 2 Sep 2019 18:50:57 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Mon Sep 02 14:50:57 2019
Received: from localhost ([127.0.0.1]:58971 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1i4rPg-0005mk-9b
	for submit <at> debbugs.gnu.org; Mon, 02 Sep 2019 14:50:57 -0400
Received: from lists.gnu.org ([209.51.188.17]:59642)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <julien@HIDDEN>) id 1i4rPe-0005mc-3K
 for submit <at> debbugs.gnu.org; Mon, 02 Sep 2019 14:50:50 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:45009)
 by lists.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from <julien@HIDDEN>) id 1i4rPc-0002CT-3S
 for guix-patches@HIDDEN; Mon, 02 Sep 2019 14:50:49 -0400
X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org
X-Spam-Level: 
X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,URIBL_BLOCKED
 autolearn=disabled version=3.3.2
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
 (envelope-from <julien@HIDDEN>) id 1i4rPa-0006UV-Ef
 for guix-patches@HIDDEN; Mon, 02 Sep 2019 14:50:47 -0400
Received: from lepiller.eu ([89.234.186.109]:44680)
 by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)
 (Exim 4.71) (envelope-from <julien@HIDDEN>) id 1i4rPX-0006R7-Lt
 for guix-patches@HIDDEN; Mon, 02 Sep 2019 14:50:44 -0400
Received: from lepiller.eu (localhost [127.0.0.1])
 by lepiller.eu (OpenSMTPD) with ESMTP id 86dbab7c
 for <guix-patches@HIDDEN>; Mon, 2 Sep 2019 18:50:38 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=lepiller.eu; h=date:from
 :to:subject:message-id:mime-version:content-type; s=dkim; bh=Bl+
 wS9lFzXXYJLHcedosfmbJ0P8=; b=TO5LT//40dhn6SqogDBO5InHYEFfXVVveMn
 t42iIVhzoivnqw+hIaseUK2bnnFewglX+kkmN8owVtZOCjGNQ78LGSvNU4GeuI0M
 9VQCuzQ9Ek+QHVJrNOpJKCTfdsqnpX143KjhPLtWc30SVOQmJME70QaCMaZOg0Cc
 Y1g4rKx0K9ky2tl4N8PWK3pa7deAtsg0zJvD1ggUJud86iWrIgA+p+ybcpSfqftd
 ceo6dvI8f2Wq68vgUOStg3tHltI4C8uHYxspF7EWykzSFvgrAF1HmoQqVhnCIs8V
 9Q8q29YcQ5sUbhhWLkp2xN/g0Y3qRWgGI0Yk1cyfwx1uqGz39Mg==
DomainKey-Signature: a=rsa-sha1; c=nofws; d=lepiller.eu; h=date:from:to
 :subject:message-id:mime-version:content-type; q=dns; s=dkim; b=
 YEYQQSMcBVOPEflFa6iz0yvuLYgCqhYKz4XWaQZSTVJcN1te4AlUoK1sh1okn4VZ
 PPYOvNw7c4y+sWEkW5SX7z2Tsv+bGxJqflelDMiKjKKiCMp7R44jRBdkmDgpdEnd
 ut3LQqOFviWT3bJiMxJyYCcz6QV2Tf/5WkDMXoEp2e3jiIsjn53trVLKKdd66YYt
 NICm9MUF0k33H9Av7/i1E12yWKhvZZs9Gp6BXwMazcvA2T0gmOSyOXo1ePxAQ930
 +MH+qABy/Sw33eQDJc17iquvrovlsV/gK+X9ljdhdpmpVO2wzofAQBGEIepPiOBX
 5MYfanJ9CTUOgNroFYeUpw==
Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id e77bd6ca
 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO)
 for <guix-patches@HIDDEN>; Mon, 2 Sep 2019 18:50:38 +0000 (UTC)
Date: Mon, 2 Sep 2019 20:50:34 +0200
From: Julien Lepiller <julien@HIDDEN>
To: guix-patches@HIDDEN
Subject: [PATCH] doc: Rename translated manuals to drop the dot.
Message-ID: <20190902205034.6b4d2ea2@HIDDEN>
X-Mailer: Claws Mail 3.17.3 (GTK+ 2.24.32; x86_64-unknown-linux-gnu)
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="MP_/lPeDPzHu.cT6WhqcbLGuaCZ"
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 89.234.186.109
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: submit
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)

--MP_/lPeDPzHu.cT6WhqcbLGuaCZ
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

Hi, the attached patch changes the translated manual name, from e.g.
guix.fr to guix-fr. The reason is that some info readers and generators
drop everything after the first dot to get the name of the manual. This
leads some readers to thing that "info guix" should open "guix.es.info"
instead of "guix.info", and the inter-lingua links on the website
version of the manual to be wrong.

I think I replaced every instance of the filename in this patch, but I
might have forgotten some, so if you see anything I missed, please tell
me :)

--MP_/lPeDPzHu.cT6WhqcbLGuaCZ
Content-Type: text/x-patch
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename=0001-doc-Rename-translated-manuals-to-drop-the-dot.patch

From ac14ab493f6b8a9861be71183833a1b4fe7dbcb1 Mon Sep 17 00:00:00 2001
From: Julien Lepiller <julien@HIDDEN>
Date: Mon, 2 Sep 2019 19:45:05 +0200
Subject: [PATCH] doc: Rename translated manuals to drop the dot.

Some info readers and the html generator assume the name of the manual
is only what's before the first dot, which leads to errors, such as
wrong inter-lingua links and opening a translated manual with "info
guix".
---
 .gitignore    | 32 ++++++++++++++++----------------
 bootstrap     |  6 +++---
 doc/build.scm |  4 ++--
 doc/local.mk  | 22 +++++++++++-----------
 guix/self.scm |  4 ++--
 5 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/.gitignore b/.gitignore
index 93d2ec9801..44a0febd60 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,22 +29,22 @@
 /doc/*.1
 /doc/.dirstamp
 /doc/contributing.*.texi
-/doc/guix.*.aux
-/doc/guix.*.cp
-/doc/guix.*.cps
-/doc/guix.*.fn
-/doc/guix.*.fns
-/doc/guix.*.html
-/doc/guix.*.info
-/doc/guix.*.info-[0-9]
-/doc/guix.*.ky
-/doc/guix.*.pg
-/doc/guix.*.toc
-/doc/guix.*.t2p
-/doc/guix.*.tp
-/doc/guix.*.vr
-/doc/guix.*.vrs
-/doc/guix.*.texi
+/doc/guix-*.aux
+/doc/guix-*.cp
+/doc/guix-*.cps
+/doc/guix-*.fn
+/doc/guix-*.fns
+/doc/guix-*.html
+/doc/guix-*.info
+/doc/guix-*.info-[0-9]
+/doc/guix-*.ky
+/doc/guix-*.pg
+/doc/guix-*.toc
+/doc/guix-*.t2p
+/doc/guix-*.tp
+/doc/guix-*.vr
+/doc/guix-*.vrs
+/doc/guix-*.texi
 /doc/guix.aux
 /doc/guix.cp
 /doc/guix.cps
diff --git a/bootstrap b/bootstrap
index c0b5af7677..6471c96bcc 100755
--- a/bootstrap
+++ b/bootstrap
@@ -8,9 +8,9 @@ langs=`find po/doc -type f -name '*.po' \
         | sed -e 's,guix-manual\.,,' \
         | xargs -n 1 -I{} basename {} .po`
 for lang in ${langs}; do
-    if [ ! -e "doc/guix.${lang}.texi" ]; then
-	echo "@setfilename guix.${lang}.info" > "doc/guix.${lang}.texi"
-	echo "@include version-${lang}.texi" >> "doc/guix.${lang}.texi"
+    if [ ! -e "doc/guix-${lang}.texi" ]; then
+	echo "@setfilename guix-${lang}.info" > "doc/guix-${lang}.texi"
+	echo "@include version-${lang}.texi" >> "doc/guix-${lang}.texi"
 	# Ensure .po file is newer.
 	touch "po/doc/guix-manual.${lang}.po"
     fi
diff --git a/doc/build.scm b/doc/build.scm
index 7ba9f57bc9..af284805eb 100644
--- a/doc/build.scm
+++ b/doc/build.scm
@@ -210,7 +210,7 @@ makeinfo OPTIONS."
                                          (string-append #$manual-source "/"
                                                         #$manual ".texi")
                                          (string-append #$manual-source "/"
-                                                        #$manual "." language ".texi")))))
+                                                        #$manual "-" language ".texi")))))
                         (format #t "building HTML manual for language '~a'...~%"
                                 language)
                         (mkdir-p (string-append #$output "/"
@@ -313,7 +313,7 @@ makeinfo OPTIONS."
                                          (string-append #$manual-source "/"
                                                         #$manual ".texi")
                                          (string-append #$manual-source "/"
-                                                        #$manual "." language ".texi")))))
+                                                        #$manual "-" language ".texi")))))
                         (format #t "building PDF manual for language '~a'...~%"
                                 language)
                         (mkdir-p (string-append #$output "/"
diff --git a/doc/local.mk b/doc/local.mk
index 336e961c4f..e4db71e8c7 100644
--- a/doc/local.mk
+++ b/doc/local.mk
@@ -22,11 +22,11 @@
 # along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 info_TEXINFOS = %D%/guix.texi			\
-  %D%/guix.de.texi				\
-  %D%/guix.es.texi				\
-  %D%/guix.fr.texi				\
-  %D%/guix.ru.texi				\
-  %D%/guix.zh_CN.texi
+  %D%/guix-de.texi				\
+  %D%/guix-es.texi				\
+  %D%/guix-fr.texi				\
+  %D%/guix-ru.texi				\
+  %D%/guix-zh_CN.texi
 
 %C%_guix_TEXINFOS = \
   %D%/contributing.texi \
@@ -58,11 +58,11 @@ OS_CONFIG_EXAMPLES_TEXI =			\
   %D%/os-config-lightweight-desktop.texi
 
 TRANSLATED_INFO =				\
-  %D%/guix.de.texi				\
-  %D%/guix.es.texi				\
-  %D%/guix.fr.texi				\
-  %D%/guix.ru.texi				\
-  %D%/guix.zh_CN.texi				\
+  %D%/guix-de.texi				\
+  %D%/guix-es.texi				\
+  %D%/guix-fr.texi				\
+  %D%/guix-ru.texi				\
+  %D%/guix-zh_CN.texi				\
   %D%/contributing.de.texi			\
   %D%/contributing.es.texi			\
   %D%/contributing.fr.texi			\
@@ -102,7 +102,7 @@ cat "$@.tmp" | egrep '@p?x?ref' -A1 | sed 'N;s|--\n||g;P;D' | sed 's|^| |g' | \
 done
 endef
 
-$(srcdir)/%D%/guix.%.texi: po/doc/guix-manual.%.po $(srcdir)/%D%/contributing.%.texi
+$(srcdir)/%D%/guix-%.texi: po/doc/guix-manual.%.po $(srcdir)/%D%/contributing.%.texi
 	-$(AM_V_PO4A)$(PO4A_TRANSLATE) $(PO4A_PARAMS) -m "%D%/guix.texi" -p "$<" -l "$@.tmp"
 	-sed -i "s|guix\.info|$$(basename "$@" | sed 's|texi$$|info|')|" "$@.tmp"
 	-$(AM_V_POXREF)$(xref_command)
diff --git a/guix/self.scm b/guix/self.scm
index f03fe01d0c..3370de0e18 100644
--- a/guix/self.scm
+++ b/guix/self.scm
@@ -341,10 +341,10 @@ TRANSLATIONS, an alist of msgid and msgstr."
             "Translate the manual for one language LANG using the PO file."
             (let ((translations (call-with-input-file po read-po-file)))
               (translate-tmp-texi po "guix.texi"
-                                  (string-append "guix." lang ".texi.tmp"))
+                                  (string-append "guix-" lang ".texi.tmp"))
               (translate-tmp-texi po "contributing.texi"
                                   (string-append "contributing." lang ".texi.tmp"))
-              (let* ((texi-name (string-append "guix." lang ".texi"))
+              (let* ((texi-name (string-append "guix-" lang ".texi"))
                      (tmp-name (string-append texi-name ".tmp")))
                 (with-output-to-file texi-name
                   (lambda _
-- 
2.22.0


--MP_/lPeDPzHu.cT6WhqcbLGuaCZ--




Acknowledgement sent to Julien Lepiller <julien@HIDDEN>:
New bug report received and forwarded. Copy sent to guix-patches@HIDDEN. Full text available.
Report forwarded to guix-patches@HIDDEN:
bug#37285; Package guix-patches. Full text available.
Please note: This is a static page, with minimal formatting, updated once a day.
Click here to see this page with the latest information and nicer formatting.
Last modified: Thu, 5 Sep 2019 21:00:02 UTC

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997 nCipher Corporation Ltd, 1994-97 Ian Jackson.