[PATCH] website: help: Add Guix's latest manual

  • Done
  • quality assurance status badge
Details
3 participants
  • Julien Lepiller
  • Luis Felipe
  • pelzflorian (Florian Pelz)
Owner
unassigned
Submitted by
Luis Felipe
Severity
normal
L
J
J
Julien Lepiller wrote on 3 May 2021 17:15
FF780FA0-B51B-4109-9598-8D3B066C4566@lepiller.eu
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@gnu.org> a écrit :
Toggle quote (9 lines)
>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/
Attachment: file
P
P
pelzflorian (Florian Pelz) wrote on 3 May 2021 17:37
(name . Luis Felipe)(address . luis.felipe.la@protonmail.com)(address . 48187@debbugs.gnu.org)
20210503153724.74z2kuwyajusqguo@pelzflorian.localdomain
Thank you for this patch, Luis!

On Mon, May 03, 2021 at 02:07:12PM +0000, Luis Felipe via Guix-patches via wrote:
Toggle quote (9 lines)
> --- 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
L
L
Luis Felipe wrote on 3 May 2021 17:43
(name . Julien Lepiller)(address . julien@lepiller.eu)(name . 48187@debbugs.gnu.org)(address . 48187@debbugs.gnu.org)
RAsJlMtgbWYbKkOr_N0eT8G4E5v8FQs0ocNqpasYcieS8yYQ9_bzkFYKZmD2jv2ap3Z2gWsENYCtE6FrO72PHjp7d6fxnfQmsM7nyTrfUTk=@protonmail.com
On Monday, May 3, 2021 3:15 PM, Julien Lepiller <julien@lepiller.eu> wrote:

Toggle quote (2 lines)
> 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.

Toggle quote (2 lines)
> 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 :)

Toggle quote (9 lines)
> Le 3 mai 2021 10:07:12 GMT-04:00, Luis Felipe via Guix-patches via <guix-patches@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/
Attachment: file
L
L
Luis Felipe wrote on 3 May 2021 18:27
(name . pelzflorian (Florian Pelz))(address . pelzflorian@pelzflorian.de)(name . 48187@debbugs.gnu.org)(address . 48187@debbugs.gnu.org)
-aFK74j-0pQv6Y1jlavwIzTZ4044hhMip9S-umIDDctwnwwQp0ZZ2_lB6Sl3Jp1C6qxbf4QzORa4kwFqTqwc-4goT17gDN69W83fRH34gs8=@protonmail.com
Hi, Florian :)

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

Toggle quote (37 lines)
> 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 :)
Attachment: 0001-website-help-Add-Guix-s-latest-manual.patch
J
J
Julien Lepiller wrote on 4 May 2021 00:25
(name . 48187@debbugs.gnu.org)(address . 48187@debbugs.gnu.org)
71DCCD6D-6BF4-4989-AC2D-4AACBE02CB85@lepiller.eu
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@gnu.org> a écrit :
Toggle quote (48 lines)
>Hi, Florian :)
>
>On Monday, May 3, 2021 3:37 PM, pelzflorian (Florian Pelz)
><pelzflorian@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 :)
Attachment: file
P
P
pelzflorian (Florian Pelz) wrote on 4 May 2021 08:05
(name . Luis Felipe)(address . luis.felipe.la@protonmail.com)(name . 48187@debbugs.gnu.org)(address . 48187@debbugs.gnu.org)
20210504060531.ra4rvkbo3ilfdlxd@pelzflorian.localdomain
Hi Luis,

sorry for not noticing:

Toggle quote (7 lines)
> --- 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
P
P
pelzflorian (Florian Pelz) wrote on 4 May 2021 08:37
(name . Luis Felipe)(address . luis.felipe.la@protonmail.com)
20210504063548.nvu7knxzvlfkncaz@pelzflorian.localdomain
On Tue, May 04, 2021 at 08:05:39AM +0200, pelzflorian (Florian Pelz) wrote:
Toggle quote (3 lines)
> > --- 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
P
P
pelzflorian (Florian Pelz) wrote on 4 May 2021 15:25
(name . Luis Felipe)(address . luis.felipe.la@protonmail.com)
20210504132547.gyia4ygrt7dl6uav@pelzflorian.localdomain
On Tue, May 04, 2021 at 08:37:11AM +0200, pelzflorian (Florian Pelz) wrote:
Toggle quote (7 lines)
> 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

Toggle diff (31 lines)
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
L
L
Luis Felipe wrote on 4 May 2021 16:00
(name . pelzflorian (Florian Pelz))(address . pelzflorian@pelzflorian.de)
ADDgOPNqj8fgpRkJDsibGzX6LjPezCk96L27u33soI3J3VrB3IVpSOIGXxfNN2WylpEOPIpAg8Vv2QiHvPokS_oABrXod5xJiF5n_dms1Tg=@protonmail.com
On Tuesday, May 4, 2021 1:25 PM, pelzflorian (Florian Pelz) <pelzflorian@pelzflorian.de> wrote:

Toggle quote (22 lines)
> 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 :)


Toggle quote (23 lines)
> 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.
P
P
pelzflorian (Florian Pelz) wrote on 4 May 2021 16:33
(name . Luis Felipe)(address . luis.felipe.la@protonmail.com)
20210504143309.kuohokoadwsdlxmf@pelzflorian.localdomain
Pushed as f2152c8d76d59d4522ea3cf9a379d935338f57fa.

On Tue, May 04, 2021 at 02:00:43PM +0000, Luis Felipe wrote:
Toggle quote (2 lines)
> 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.

Toggle quote (2 lines)
> I think it's OK, Florian. Thanks for your help.

Thank you for all your contributions!

Regards,
Florian
Closed
?
Your comment

This issue is archived.

To comment on this conversation send an email to 48187@debbugs.gnu.org

To respond to this issue using the mumi CLI, first switch to it
mumi current 48187
Then, you may apply the latest patchset in this issue (with sign off)
mumi am -- -s
Or, compose a reply to this issue
mumi compose
Or, send patches to this issue
mumi send-email *.patch