Subject: Re: bug#44455: [ARTWORK] website: Not enough context for translation of None

From: Miguel Ángel Arruga Vivas <[email-masked]>
Date: Thu, 05 Nov 2020 18:51:20 +0100

Hi!

The first patch changes "None" usages, but it invalidates the current
translations.  Feel free to push these three together with the one for
German when you have it ready.

Happy hacking!
Miguel
From 4a9cb613b45432de3d5ec9711c95dec1ea18cf25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miguel=20=C3=81ngel=20Arruga=20Vivas?=
 <[email-masked]>
Date: Thu, 5 Nov 2020 18:31:18 +0100
Subject: [PATCH 1/3] website: Add context to None translation.

* website/apps/packages/templates/components.scm (patches->shtml): Add
context "patches" for the translation of "None".
(supported-systems->shtml): Add context "systems" for the translation
of "None".
---
 website/apps/packages/templates/components.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/website/apps/packages/templates/components.scm b/website/apps/packages/templates/components.scm
index 59b4857..2695f73 100644
--- a/website/apps/packages/templates/components.scm
+++ b/website/apps/packages/templates/components.scm
@@ -201,7 +201,7 @@
      If the list of patches is empty, return the string 'None'.
      Otherwise, return a list of links to patches."
   (if (null? patches)
-      (G_ "None")
+      (C_ "patches" "None")
       (separate
        (map (lambda (patch)
 	      (link-subtle #:label (ilink-name patch)
@@ -267,7 +267,7 @@
                   %hydra-supported-systems
                   (package-transitive-supported-systems package))))
     (if (null? systems)
-        (G_ "None")
+        (C_ "systems" "None")
         ;; TODO: There's currently no way to refer to a job like
         ;; 'coreutils-8.32' in the Cuirass web UI.  Add such a link once it's
         ;; become available.
-- 
2.28.0

From c499bf4afbb3221d9e9e8fbe69063eac6efab880 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miguel=20=C3=81ngel=20Arruga=20Vivas?=
 <[email-masked]>
Date: Thu, 5 Nov 2020 18:42:03 +0100
Subject: [PATCH 2/3] website: nls: Update guix-website.pot.

---
 website/po/guix-website.pot | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/website/po/guix-website.pot b/website/po/guix-website.pot
index 4f37532..7e44756 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 20201105\n"
+"Project-Id-Version: guix-website 20201105-2\n"
 "Report-Msgid-Bugs-To: [email-masked]\n"
-"POT-Creation-Date: 2020-11-05 18:12+0100\n"
+"POT-Creation-Date: 2020-11-05 18:38+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email-masked]>\n"
@@ -1374,7 +1374,13 @@ msgstr ""
 msgid "Browse alphabetically"
 msgstr ""
 
-#: apps/packages/templates/components.scm:204 apps/packages/templates/components.scm:270
+#: apps/packages/templates/components.scm:204
+msgctxt "patches"
+msgid "None"
+msgstr ""
+
+#: apps/packages/templates/components.scm:270
+msgctxt "systems"
 msgid "None"
 msgstr ""
 
-- 
2.28.0

From 71202be1b9e4e54a5c9cb741b77887914eab534d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miguel=20=C3=81ngel=20Arruga=20Vivas?=
 <[email-masked]>
Date: Thu, 5 Nov 2020 18:48:37 +0100
Subject: [PATCH 3/3] website: nls: Update Spanish translation.

---
 website/po/es.po | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/website/po/es.po b/website/po/es.po
index b845aa2..2658eae 100644
--- a/website/po/es.po
+++ b/website/po/es.po
@@ -7,10 +7,10 @@
 # * Feed se traduce como tablón [de anuncios] cuando es posible.
 msgid ""
 msgstr ""
-"Project-Id-Version: guix-website 20201005\n"
+"Project-Id-Version: guix-website 20201005-2\n"
 "Report-Msgid-Bugs-To: [email-masked]\n"
-"POT-Creation-Date: 2020-11-05 18:12+0100\n"
-"PO-Revision-Date: 2020-11-05 18:43+0100\n"
+"POT-Creation-Date: 2020-11-05 18:38+0100\n"
+"PO-Revision-Date: 2020-11-05 18:48+0100\n"
 "Last-Translator: Miguel Ángel Arruga Vivas <[email-masked]>\n"
 "Language-Team: Spanish <[email-masked]>\n"
 "Language: es\n"
@@ -2152,12 +2152,16 @@ msgstr "Menú de paquetes: "
 msgid "Browse alphabetically"
 msgstr "Navegar alfabéticamente"
 
-# FUZZY
 #: apps/packages/templates/components.scm:204
-#: apps/packages/templates/components.scm:270
+msgctxt "patches"
 msgid "None"
 msgstr "No hay"
 
+#: apps/packages/templates/components.scm:270
+msgctxt "systems"
+msgid "None"
+msgstr "Ninguno"
+
 #: apps/packages/templates/detailed-index.scm:22
 #: apps/packages/templates/detailed-package-list.scm:25
 #: apps/packages/templates/index.scm:22
-- 
2.28.0