GNU bug report logs - #48187
[PATCH] website: help: Add Guix's latest manual

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 48187 in the body.
You can then email your comments to 48187 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Luis Felipe <luis.felipe.la <at> protonmail.com>
To: Luis Felipe via Guix-patches <guix-patches <at> gnu.org>
Subject: [PATCH] website: help: Add Guix's latest manual
Date: Mon, 03 May 2021 14:07:12 +0000

[Message part 1 (text/plain, inline)]

Hi,

This patch adds the latest manual to the help page and a corresponding entry to the Help menu.


---
Luis Felipe López Acevedo
https://luis-felipe.gitlab.io/

[0001-website-help-Add-Guix-s-latest-manual.patch (text/x-patch, attachment)]

Message #8 received at 48187 <at> debbugs.gnu.org (full text, mbox):

From: Julien Lepiller <julien <at> lepiller.eu>
To: Luis Felipe <luis.felipe.la <at> protonmail.com>,48187 <at> debbugs.gnu.org
Subject: Re: [bug#48187] [PATCH] website: help: Add Guix's latest manual
Date: Mon, 03 May 2021 11:15:38 -0400

[Message part 1 (text/plain, inline)]

Great! Could you also regenerate the pot for that commit? Since we check it out with the website, the weblate repo simply copies it as is, and might miss translations.

Alternatively, we could remove it from the website repo and rcly on the weblate process to generate it, as we do for the other domains.

Le 3 mai 2021 10:07:12 GMT-04:00, Luis Felipe via Guix-patches via <guix-patches <at> gnu.org> a écrit :
>Hi,
>
>This patch adds the latest manual to the help page and a corresponding
>entry to the Help menu.
>
>
>---
>Luis Felipe López Acevedo
>https://luis-felipe.gitlab.io/

[Message part 2 (text/html, inline)]

Message #11 received at 48187 <at> debbugs.gnu.org (full text, mbox):

From: "pelzflorian (Florian Pelz)" <pelzflorian <at> pelzflorian.de>
To: Luis Felipe <luis.felipe.la <at> protonmail.com>
Cc: 48187 <at> debbugs.gnu.org
Subject: Re: [bug#48187] [PATCH] website: help: Add Guix's latest manual
Date: Mon, 3 May 2021 17:37:24 +0200

Thank you for this patch, Luis!

On Mon, May 03, 2021 at 02:07:12PM +0000, Luis Felipe via Guix-patches via wrote:
> --- a/website/apps/base/templates/help.scm
> +++ b/website/apps/base/templates/help.scm
> @@ -43,14 +43,14 @@ system|GNU Hurd|GNU Guix package manager|Help resources") #\|)
>  	(img
>  	 (@ (src ,(guix-url "static/base/img/manual-icon.png"))
>  	    (alt "")))
> -        ,(G_ `(h3 "GNU Guix Manual"))
> +        ,(G_ `(h3 "GNU Guix Manual" " " ,(latest-guix-version)))

This leads to a translatable msgid in po/guix-website.po like this:

#: apps/base/templates/help.scm:46
#, xml-text
msgid "GNU Guix Manual "
msgstr ""

Please change the ordering and strings to

,(G_ `(h3 "GNU Guix Manual " ,(latest-guix-version) ""))

This makes for a translatable string

#: apps/base/templates/help.scm:46
#, xml-text
msgid "GNU Guix Manual <1/>"
msgstr ""

Otherwise LGTM.  

Regards,
Florian

Message #14 received at 48187 <at> debbugs.gnu.org (full text, mbox):

From: Luis Felipe <luis.felipe.la <at> protonmail.com>
To: Julien Lepiller <julien <at> lepiller.eu>
Cc: "48187 <at> debbugs.gnu.org" <48187 <at> debbugs.gnu.org>
Subject: Re: [bug#48187] [PATCH] website: help: Add Guix's latest manual
Date: Mon, 03 May 2021 15:43:15 +0000

[Message part 1 (text/plain, inline)]

On Monday, May 3, 2021 3:15 PM, Julien Lepiller <julien <at> lepiller.eu> wrote:

> Great! Could you also regenerate the pot for that commit? Since we check it out with the website, the weblate repo simply copies it as is, and might miss translations.

Sorry, Julien, I don't feel confident with updating the translation catalogs yet. First, I'm not familiar with the commands; and second, the instructions in the README to try out the website in containers don't work for me. So I'm using an improvised Guix profile to check that my changes work.

So if you could take care of that part, it would be great.

> Alternatively, we could remove it from the website repo and rcly on the weblate process to generate it, as we do for the other domains.

I trust your experience on that field :)

> Le 3 mai 2021 10:07:12 GMT-04:00, Luis Felipe via Guix-patches via <guix-patches <at> gnu.org> a écrit :
>
>> Hi,
>>
>> This patch adds the latest manual to the help page and a corresponding entry to the Help menu.
>> ---------------------------------------------------------------
>>
>> Luis Felipe López Acevedo
>> https://luis-felipe.gitlab.io/

[Message part 2 (text/html, inline)]

Message #17 received at 48187 <at> debbugs.gnu.org (full text, mbox):

From: Luis Felipe <luis.felipe.la <at> protonmail.com>
To: "pelzflorian (Florian Pelz)" <pelzflorian <at> pelzflorian.de>
Cc: "48187 <at> debbugs.gnu.org" <48187 <at> debbugs.gnu.org>
Subject: Re: [bug#48187] [PATCH] website: help: Add Guix's latest manual
Date: Mon, 03 May 2021 16:27:33 +0000

[Message part 1 (text/plain, inline)]

Hi, Florian :)

On Monday, May 3, 2021 3:37 PM, pelzflorian (Florian Pelz) <pelzflorian <at> pelzflorian.de> wrote:

> Thank you for this patch, Luis!
>
> On Mon, May 03, 2021 at 02:07:12PM +0000, Luis Felipe via Guix-patches via wrote:
>
> > --- a/website/apps/base/templates/help.scm
> > +++ b/website/apps/base/templates/help.scm
> > @@ -43,14 +43,14 @@ system|GNU Hurd|GNU Guix package manager|Help resources") #\|)
> > (img
> > (@ (src ,(guix-url "static/base/img/manual-icon.png"))
> > (alt "")))
> >
> > -          ,(G_ `(h3 "GNU Guix Manual"))
> >
> >
> >
> > -          ,(G_ `(h3 "GNU Guix Manual" " " ,(latest-guix-version)))
> >
> >
>
> This leads to a translatable msgid in po/guix-website.po like this:
>
> #: apps/base/templates/help.scm:46
> #, xml-text
> msgid "GNU Guix Manual "
> msgstr ""
>
> Please change the ordering and strings to
>
> ,(G_ `(h3 "GNU Guix Manual " ,(latest-guix-version) ""))
>
> This makes for a translatable string
>
> #: apps/base/templates/help.scm:46
> #, xml-text
> msgid "GNU Guix Manual <1/>"
> msgstr ""

This new patch corrects that line.

I didn't update the catalogs though, (don't know how), so I just made the change and hope for the best :)

[0001-website-help-Add-Guix-s-latest-manual.patch (text/x-patch, attachment)]

Message #20 received at 48187 <at> debbugs.gnu.org (full text, mbox):

From: Julien Lepiller <julien <at> lepiller.eu>
To: Luis Felipe <luis.felipe.la <at> protonmail.com>,
 "pelzflorian (Florian Pelz)" <pelzflorian <at> pelzflorian.de>
Cc: "48187 <at> debbugs.gnu.org" <48187 <at> debbugs.gnu.org>
Subject: Re: [bug#48187] [PATCH] website: help: Add Guix's latest manual
Date: Mon, 03 May 2021 18:25:59 -0400

[Message part 1 (text/plain, inline)]

Alright, I decoupled weblate from the checked out pot file. I regenerate it on the fly now, since it was almost always forgotten anyway. Don't worry about it, we can even remove it, since I suppose it will get out of sync pretty soon :)

Le 3 mai 2021 12:27:33 GMT-04:00, Luis Felipe via Guix-patches via <guix-patches <at> gnu.org> a écrit :
>Hi, Florian :)
>
>On Monday, May 3, 2021 3:37 PM, pelzflorian (Florian Pelz)
><pelzflorian <at> pelzflorian.de> wrote:
>
>> Thank you for this patch, Luis!
>>
>> On Mon, May 03, 2021 at 02:07:12PM +0000, Luis Felipe via
>Guix-patches via wrote:
>>
>> > --- a/website/apps/base/templates/help.scm
>> > +++ b/website/apps/base/templates/help.scm
>> > @@ -43,14 +43,14 @@ system|GNU Hurd|GNU Guix package manager|Help
>resources") #\|)
>> > (img
>> > (@ (src ,(guix-url "static/base/img/manual-icon.png"))
>> > (alt "")))
>> >
>> > -          ,(G_ `(h3 "GNU Guix Manual"))
>> >
>> >
>> >
>> > -          ,(G_ `(h3 "GNU Guix Manual" " " ,(latest-guix-version)))
>> >
>> >
>>
>> This leads to a translatable msgid in po/guix-website.po like this:
>>
>> #: apps/base/templates/help.scm:46
>> #, xml-text
>> msgid "GNU Guix Manual "
>> msgstr ""
>>
>> Please change the ordering and strings to
>>
>> ,(G_ `(h3 "GNU Guix Manual " ,(latest-guix-version) ""))
>>
>> This makes for a translatable string
>>
>> #: apps/base/templates/help.scm:46
>> #, xml-text
>> msgid "GNU Guix Manual <1/>"
>> msgstr ""
>
>This new patch corrects that line.
>
>I didn't update the catalogs though, (don't know how), so I just made
>the change and hope for the best :)

[Message part 2 (text/html, inline)]

Message #23 received at 48187 <at> debbugs.gnu.org (full text, mbox):

From: "pelzflorian (Florian Pelz)" <pelzflorian <at> pelzflorian.de>
To: Luis Felipe <luis.felipe.la <at> protonmail.com>
Cc: "48187 <at> debbugs.gnu.org" <48187 <at> debbugs.gnu.org>
Subject: Re: [bug#48187] [PATCH] website: help: Add Guix's latest manual
Date: Tue, 4 May 2021 08:05:31 +0200

Hi Luis,

sorry for not noticing:

> --- a/website/apps/base/templates/help.scm
> +++ b/website/apps/base/templates/help.scm
> […]
> +        (p
> +         ,(link-more #:label (G_ "Read latest manual")
> +                     #:url (guix-url "manual/devel/"))))

This must be

#:url (guix-url "manual/devel/" #:localize #f))))

I think you do not have commit rights, so I will push soon.

Regards,
Florian

Message #26 received at 48187 <at> debbugs.gnu.org (full text, mbox):

From: "pelzflorian (Florian Pelz)" <pelzflorian <at> pelzflorian.de>
To: Luis Felipe <luis.felipe.la <at> protonmail.com>
Cc: Julien Lepiller <julien <at> lepiller.eu>,
 "48187 <at> debbugs.gnu.org" <48187 <at> debbugs.gnu.org>
Subject: Re: [bug#48187] [PATCH] website: help: Add Guix's latest manual
Date: Tue, 4 May 2021 08:37:11 +0200

On Tue, May 04, 2021 at 08:05:39AM +0200, pelzflorian (Florian Pelz) wrote:
> > --- a/website/apps/base/templates/help.scm
> > +++ b/website/apps/base/templates/help.scm

P.S. Shouldn’t this file get your copyright header since the text
changes are of creative, copyrightable nature?

Can someone confirm that a copyright header is wanted on the website?
Otherwise for a full list of copyright holders, one would have to use
“git log”.

Regards,
Florian

Message #29 received at 48187 <at> debbugs.gnu.org (full text, mbox):

From: "pelzflorian (Florian Pelz)" <pelzflorian <at> pelzflorian.de>
To: Luis Felipe <luis.felipe.la <at> protonmail.com>
Cc: Julien Lepiller <julien <at> lepiller.eu>,
 "48187 <at> debbugs.gnu.org" <48187 <at> debbugs.gnu.org>
Subject: Re: [bug#48187] [PATCH] website: help: Add Guix's latest manual
Date: Tue, 4 May 2021 15:25:47 +0200

On Tue, May 04, 2021 at 08:37:11AM +0200, pelzflorian (Florian Pelz) wrote:
> On Tue, May 04, 2021 at 08:05:39AM +0200, pelzflorian (Florian Pelz) wrote:
> > > --- a/website/apps/base/templates/help.scm
> > > +++ b/website/apps/base/templates/help.scm
> 
> P.S. Shouldn’t this file get your copyright header since the text
> changes are of creative, copyrightable nature?

Luis, may I add a line

diff --git a/website/apps/base/templates/help.scm b/website/apps/base/templates/help.scm
index c6acbf7..cdb7870 100644
--- a/website/apps/base/templates/help.scm
+++ b/website/apps/base/templates/help.scm
@@ -1,4 +1,5 @@
 ;;; GNU Guix web site
+;;; Public domain 2021 Luis Felipe López Acevedo
 ;;; Initially written by sirgazil who waives all
 ;;; copyright interest on this file.

and also add

diff --git a/website/apps/base/templates/help.scm b/website/apps/base/templates/help.scm
index c6acbf7..02ad759 100644
--- a/website/apps/base/templates/help.scm
+++ b/website/apps/base/templates/help.scm
@@ -79,7 +80,7 @@ system|GNU Hurd|GNU Guix package manager|Help resources") #\|)
             Guix."))
         (p
          ,(link-more #:label (G_ "Read latest manual")
-                     #:url (guix-url "manual/devel/"))))
+                     #:url (guix-url "manual/devel/" #:localize #f))))
 
 
        (div


and push your changes?

Regards,
Florian

Message #32 received at 48187 <at> debbugs.gnu.org (full text, mbox):

From: Luis Felipe <luis.felipe.la <at> protonmail.com>
To: "pelzflorian (Florian Pelz)" <pelzflorian <at> pelzflorian.de>
Cc: Julien Lepiller <julien <at> lepiller.eu>,
 "48187 <at> debbugs.gnu.org" <48187 <at> debbugs.gnu.org>
Subject: Re: [bug#48187] [PATCH] website: help: Add Guix's latest manual
Date: Tue, 04 May 2021 14:00:43 +0000

On Tuesday, May 4, 2021 1:25 PM, pelzflorian (Florian Pelz) <pelzflorian <at> pelzflorian.de> wrote:

> On Tue, May 04, 2021 at 08:37:11AM +0200, pelzflorian (Florian Pelz) wrote:
>
> > On Tue, May 04, 2021 at 08:05:39AM +0200, pelzflorian (Florian Pelz) wrote:
> >
> > > > --- a/website/apps/base/templates/help.scm
> > > > +++ b/website/apps/base/templates/help.scm
> >
> > P.S. Shouldn’t this file get your copyright header since the text
> > changes are of creative, copyrightable nature?
>
> Luis, may I add a line
>
> diff --git a/website/apps/base/templates/help.scm b/website/apps/base/templates/help.scm
> index c6acbf7..cdb7870 100644
> --- a/website/apps/base/templates/help.scm
> +++ b/website/apps/base/templates/help.scm
> @@ -1,4 +1,5 @@
> ;;; GNU Guix web site
> +;;; Public domain 2021 Luis Felipe López Acevedo
> ;;; Initially written by sirgazil who waives all
> ;;; copyright interest on this file.

Well, if that's legally suitable, it's fine by me, because, yes, I still waive all copyright interest on my contributions to the website :)


> and also add
>
> diff --git a/website/apps/base/templates/help.scm b/website/apps/base/templates/help.scm
> index c6acbf7..02ad759 100644
> --- a/website/apps/base/templates/help.scm
> +++ b/website/apps/base/templates/help.scm
> @@ -79,7 +80,7 @@ system|GNU Hurd|GNU Guix package manager|Help resources") #\|)
> Guix."))
> (p
> ,(link-more #:label (G_ "Read latest manual")
>
> -                       #:url (guix-url "manual/devel/"))))
>
>
>
> -                       #:url (guix-url "manual/devel/" #:localize #f))))
>
>
>
> (div
>
> and push your changes?

I think it's OK, Florian. Thanks for your help.

Message #37 received at 48187-done <at> debbugs.gnu.org (full text, mbox):

From: "pelzflorian (Florian Pelz)" <pelzflorian <at> pelzflorian.de>
To: Luis Felipe <luis.felipe.la <at> protonmail.com>
Cc: Julien Lepiller <julien <at> lepiller.eu>, 48187-done <at> debbugs.gnu.org
Subject: Re: [bug#48187] [PATCH] website: help: Add Guix's latest manual
Date: Tue, 4 May 2021 16:33:09 +0200

Pushed as f2152c8d76d59d4522ea3cf9a379d935338f57fa.

On Tue, May 04, 2021 at 02:00:43PM +0000, Luis Felipe wrote:
> Well, if that's legally suitable, it's fine by me, because, yes, I still waive all copyright interest on my contributions to the website :)

Probably it has legal weight (if not we’d have to change other files
too).  I’m not familiar enough with the difference between public
domain declarations and CC0 in the various jurisdictions.

> I think it's OK, Florian. Thanks for your help.

Thank you for all your contributions!

Regards,
Florian

Previous Next

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