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

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

[Miguel Ángel Arruga Vivas]

The string "None" does not have enough context and can lead to wrong
translations, as the word or even the gender may differ for each one.
This change also will invalidate the current translation.

The code fragment where it is used is included as reported in other
thread:

"pelzflorian (Florian Pelz)" <pelzflorian@pelzflorian.de> writes:
>> (define (patches->shtml patches)
>> "Return an SHTML representation of PATCHES.
>>
>>  PATCHES (list)
>>    A list of <link> objects as defined in (apps packages types)
>>    module.
>>
>>  RETURN (shtml)
>>    If the list of patches is empty, return the string 'None'.
>>    Otherwise, return a list of links to patches."
>> (if (null? patches)
>>     (G_ "None")
>>     […]
>
>> (define (supported-systems->shtml package)
>>   "Return a list of SHTML a links to SYSTEMS builds.
>> […]
>>     (if (null? systems)
>>         (G_ "None")
>>         […]

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

[Miguel Ángel Arruga Vivas]

[-- Attachment #1.1: Type: text/plain, Size: 200 bytes --]

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: add-context-to-none.patch --]
[-- Type: text/x-patch, Size: 1548 bytes --]

From 4a9cb613b45432de3d5ec9711c95dec1ea18cf25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miguel=20=C3=81ngel=20Arruga=20Vivas?=
 <rosen644835@gmail.com>
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


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.3: update-pot.patch --]
[-- Type: text/x-patch, Size: 1341 bytes --]

From c499bf4afbb3221d9e9e8fbe69063eac6efab880 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miguel=20=C3=81ngel=20Arruga=20Vivas?=
 <rosen644835@gmail.com>
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: bug-guix@gnu.org\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 <LL@li.org>\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


[-- Attachment #1.4: update-es.patch --]
[-- Type: text/x-patch, Size: 1617 bytes --]

From 71202be1b9e4e54a5c9cb741b77887914eab534d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miguel=20=C3=81ngel=20Arruga=20Vivas?=
 <rosen644835@gmail.com>
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: bug-guix@gnu.org\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 <rosen644835@gmail.com>\n"
 "Language-Team: Spanish <es@tp.org.es>\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


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 658 bytes --]

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

[pelzflorian (Florian Pelz)]

On Thu, Nov 05, 2020 at 06:51:20PM +0100, Miguel Ángel Arruga Vivas wrote:
> Feel free to push these three together with the one for
> German when you have it ready.

Pushed as fc8ec5409bd3d7221afc2f9feaac4ce36d5c1192 and following.
Thank you for doing the work and thinking it through!

Regards,
Florian