bug#26302: Multilingual web site is on-line!

["pelzflorian (Florian Pelz)" <pelzflorian@pelzflorian.de>]

[-- Attachment #1: Type: text/plain, Size: 744 bytes --]

On Mon, Aug 03, 2020 at 04:53:48PM +0200, Ludovic Courtès wrote:
> "pelzflorian (Florian Pelz)" <pelzflorian@pelzflorian.de> skribis:
> > What version number should we give it?  That of Guix, or a YYYYMMDD?
> > I suppose the version number should be part of the POT file’s
> > Project-Id-Version field and the tar filename, but I don’t know.
> 
> I’d say YYYYMMDD.  The coordinator might have suggestions.

I will push the attached patch if there are no objections.

> > Could you Julien or someone else send the tarball(s) off to the TP
> > coordinator?
> 
> That’d be great.   Julien, let us know if you’d rather hand over this
> responsibility.

Is it OK if you send it when you have time after the patch is in?

Regards,
Florian

[-- Attachment #2: 0001-website-nls-Include-package-version-in-the-POT-file.patch --]
[-- Type: text/plain, Size: 5218 bytes --]

From 6e60fb3f7272b5e4996c2366758a151e2ebc3495 Mon Sep 17 00:00:00 2001
From: Florian Pelz <pelzflorian@pelzflorian.de>
Date: Fri, 21 Aug 2020 02:03:08 +0200
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Subject: [PATCH] website: nls: Include package version in the POT file.

Including a package version in the .pot file is probably necessary for
sending it to the Translation Project.

* i18n-howto.txt: Advice using '--package-version' command-line argument.
* po/guix-website.pot: Recreate with '--package-version'.
---
 website/i18n-howto.txt      |  3 ++-
 website/po/guix-website.pot | 24 ++++++++++++------------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/website/i18n-howto.txt b/website/i18n-howto.txt
index 29b8852..98a4d00 100644
--- a/website/i18n-howto.txt
+++ b/website/i18n-howto.txt
@@ -34,13 +34,14 @@ The following commands are an example of the translation for locale
 de_DE.  Adapt as necessary.  We assume the software requirements
 mentioned in the README are installed.
 
-To create a pot file:
+To create a pot file (adjust the package version!):
 
 guile scripts/sexp-xgettext.scm -f po/POTFILES \
                                 -o po/guix-website.pot \
                                 --from-code=UTF-8 \
                                 --copyright-holder="Ludovic Courtès" \
                                 --package-name="guix-website" \
+                                --package-version="20200821" \
                                 --msgid-bugs-address="ludo@gnu.org" \
                                 --keyword=G_ \
                                 --keyword=N_:1,2 \
diff --git a/website/po/guix-website.pot b/website/po/guix-website.pot
index f200bcd..502e2de 100644
--- a/website/po/guix-website.pot
+++ b/website/po/guix-website.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: guix-website\n"
+"Project-Id-Version: guix-website 20200821\n"
 "Report-Msgid-Bugs-To: ludo@gnu.org\n"
-"POT-Creation-Date: 2020-07-28 10:47+0200\n"
+"POT-Creation-Date: 2020-08-21 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -228,36 +228,36 @@ msgctxt "website menu"
 msgid "Latest"
 msgstr ""
 
-#: apps/base/templates/components.scm:406 apps/packages/templates/detailed-index.scm:31 apps/packages/templates/detailed-index.scm:38 apps/packages/templates/detailed-package-list.scm:34 apps/packages/templates/detailed-package-list.scm:43 apps/packages/templates/index.scm:31 apps/packages/templates/index.scm:37 apps/packages/templates/package-list.scm:34 apps/packages/templates/package-list.scm:40 apps/packages/templates/package.scm:36 apps/packages/templates/package.scm:41
+#: apps/base/templates/components.scm:406 apps/base/templates/help.scm:26 apps/base/templates/help.scm:30
+msgctxt "website menu"
+msgid "Help"
+msgstr ""
+
+#: apps/base/templates/components.scm:407 apps/packages/templates/detailed-index.scm:31 apps/packages/templates/detailed-index.scm:38 apps/packages/templates/detailed-package-list.scm:34 apps/packages/templates/detailed-package-list.scm:43 apps/packages/templates/index.scm:31 apps/packages/templates/index.scm:37 apps/packages/templates/package-list.scm:34 apps/packages/templates/package-list.scm:40 apps/packages/templates/package.scm:36 apps/packages/templates/package.scm:41
 msgctxt "website menu"
 msgid "Packages"
 msgstr ""
 
-#: apps/base/templates/components.scm:407 apps/blog/templates/post-list.scm:33 apps/blog/templates/post-list.scm:39 apps/blog/templates/post.scm:29 apps/blog/templates/post.scm:35 apps/blog/templates/tag.scm:37 apps/blog/templates/tag.scm:43
+#: apps/base/templates/components.scm:408 apps/blog/templates/post-list.scm:33 apps/blog/templates/post-list.scm:39 apps/blog/templates/post.scm:29 apps/blog/templates/post.scm:35 apps/blog/templates/tag.scm:37 apps/blog/templates/tag.scm:43
 msgctxt "website menu"
 msgid "Blog"
 msgstr ""
 
-#: apps/base/templates/components.scm:409 apps/media/templates/screenshot.scm:28 apps/media/templates/screenshots-overview.scm:25 apps/media/templates/video.scm:29 apps/media/templates/video-list.scm:29
+#: apps/base/templates/components.scm:410 apps/media/templates/screenshot.scm:28 apps/media/templates/screenshots-overview.scm:25 apps/media/templates/video.scm:29 apps/media/templates/video-list.scm:29
 msgctxt "website menu"
 msgid "Media"
 msgstr ""
 
-#: apps/base/templates/components.scm:412 apps/media/templates/video.scm:33 apps/media/templates/video-list.scm:33
+#: apps/base/templates/components.scm:413 apps/media/templates/video.scm:33 apps/media/templates/video-list.scm:33
 msgctxt "website menu"
 msgid "Videos"
 msgstr ""
 
-#: apps/base/templates/components.scm:413
+#: apps/base/templates/components.scm:414
 msgctxt "website menu"
 msgid "Screenshots"
 msgstr ""
 
-#: apps/base/templates/components.scm:415 apps/base/templates/help.scm:26 apps/base/templates/help.scm:30
-msgctxt "website menu"
-msgid "Help"
-msgstr ""
-
 #: apps/base/templates/components.scm:416 apps/base/templates/donate.scm:26 apps/base/templates/donate.scm:29
 msgctxt "website menu"
 msgid "Donate"
-- 
2.28.0