From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id 2Nd5EnM8pF8GHwAA0tVLHw (envelope-from ) for ; Thu, 05 Nov 2020 17:54:59 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id sBdDDnM8pF/3GwAAB5/wlQ (envelope-from ) for ; Thu, 05 Nov 2020 17:54:59 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 87F0A9404C7 for ; Thu, 5 Nov 2020 17:54:58 +0000 (UTC) Received: from localhost ([::1]:50178 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kajTM-00074m-4r for larch@yhetil.org; Thu, 05 Nov 2020 12:54:56 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34496) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kajQh-00041z-Of for bug-guix@gnu.org; Thu, 05 Nov 2020 12:52:11 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:42510) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kajQX-0004pL-Qv for bug-guix@gnu.org; Thu, 05 Nov 2020 12:52:07 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kajQX-0001al-Pq for bug-guix@gnu.org; Thu, 05 Nov 2020 12:52:01 -0500 X-Loop: help-debbugs@gnu.org Subject: bug#44455: [ARTWORK] website: Not enough context for translation of None Resent-From: Miguel =?UTF-8?Q?=C3=81ngel?= Arruga Vivas Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Thu, 05 Nov 2020 17:52:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 44455 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: 44455@debbugs.gnu.org Received: via spool by 44455-submit@debbugs.gnu.org id=B44455.16045986986087 (code B ref 44455); Thu, 05 Nov 2020 17:52:01 +0000 Received: (at 44455) by debbugs.gnu.org; 5 Nov 2020 17:51:38 +0000 Received: from localhost ([127.0.0.1]:54056 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kajQA-0001a7-2g for submit@debbugs.gnu.org; Thu, 05 Nov 2020 12:51:38 -0500 Received: from mail-wr1-f45.google.com ([209.85.221.45]:34602) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kajQ7-0001Zu-TB for 44455@debbugs.gnu.org; Thu, 05 Nov 2020 12:51:36 -0500 Received: by mail-wr1-f45.google.com with SMTP id e6so2795185wro.1 for <44455@debbugs.gnu.org>; Thu, 05 Nov 2020 09:51:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=T4Lf2712wFAx1eJIIYVVQ/Dy56Zlh6Q0I/vzK5S4TLc=; b=WnOxiwuA8MyzjN1ypmjOU2k4maGIAYYDl9V8btjgeEf34fkV1OcSuWIsSxep7NU068 3OxYLfohE9WlFK8U5a6ssjWUBhJKeW2qjUViWuEIvuAIfUruhq5W+Cp70nNAjBVTCcYU aLGPT90zPnm/t++kUyWfY9KxMbuu6dRL9AEwQC3VkUyJUpE2Q/448MY6KlZ/UVQjshfT RaQSbL3HdCnAt08O0lAxVcP8aHZrPxzkDdEmljIZso6ScZ+1hWEfUin8zEWRGrSb0CN1 TjwvjkLwwc4h18McKeFkCsC5ssLMXYalzzogV11uigA/QcClt1fzTfDPsEftSXrFlPu3 PTIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=T4Lf2712wFAx1eJIIYVVQ/Dy56Zlh6Q0I/vzK5S4TLc=; b=qQaQHcxBsmCuZm8wC2v0Kb/epS9JQ/KBSoVrjav2i7Iqy0YqDMS01mrw1pzWrPLAqf jE+0APJteUWeWlNTNuKAA5X3pM6eVPY+v30FTBW4k5Nr7/y6IuwDLV3K3aQjKSPx1C3e whRl+6SRxG6VQdXaS2XizxuDX38A+szHgDarhUv1xaZ+sYBRvi/G+N+JeRaztnmBQKRj z43w6GAxcBwN8OhbW6UpgKeHFt0BttgVr/4cciSCfDHvoW31ztGHDrt8faC1ae9JTwPt unimeIFXUGV6xmJ0FnBIEuxc2jlw1v90NV+fw1oMQb8djlAogOTzVFUEvVfYZIinb+6c HgIQ== X-Gm-Message-State: AOAM5310cXPSDPXXp7UP1eAbqBYU7JJlEE5i8P8dm7I5Fe+ZaGjzcBSg MzSseHvrJiersiZN/vqylEw= X-Google-Smtp-Source: ABdhPJy5LM86g8dxP1hIzged8AC+GS1V4L2ySYD0HrjysZUqQATr8dsHnguboDdHSZIoDzX1vpXLRw== X-Received: by 2002:adf:fb0f:: with SMTP id c15mr4200806wrr.86.1604598690082; Thu, 05 Nov 2020 09:51:30 -0800 (PST) Received: from unfall (218.139.134.37.dynamic.jazztel.es. [37.134.139.218]) by smtp.gmail.com with ESMTPSA id n14sm3183499wrt.8.2020.11.05.09.51.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Nov 2020 09:51:28 -0800 (PST) From: Miguel =?UTF-8?Q?=C3=81ngel?= Arruga Vivas References: <87y2jg7n0u.fsf@gmail.com> Date: Thu, 05 Nov 2020 18:51:20 +0100 In-Reply-To: <87y2jg7n0u.fsf@gmail.com> ("Miguel =?UTF-8?Q?=C3=81ngel?= Arruga Vivas"'s message of "Wed, 04 Nov 2020 23:52:33 +0100") Message-ID: <87pn4r7kvb.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: 0.2 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -0.8 (/) X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: "bug-Guix" X-Scanner: ns3122888.ip-94-23-21.eu Authentication-Results: aspmx1.migadu.com; dkim=fail (headers rsa verify failed) header.d=gmail.com header.s=20161025 header.b=WnOxiwuA; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of bug-guix-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=bug-guix-bounces@gnu.org X-Spam-Score: -2.01 X-TUID: ilTz6J+plCVB --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain 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 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-website-Add-context-to-None-translation.patch Content-Transfer-Encoding: quoted-printable Content-Description: add-context-to-none.patch From=204a9cb613b45432de3d5ec9711c95dec1ea18cf25 Mon Sep 17 00:00:00 2001 From: =3D?UTF-8?q?Miguel=3D20=3DC3=3D81ngel=3D20Arruga=3D20Vivas?=3D 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". =2D-- 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 =2D-- 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) =2D (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) =2D (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 i= t's ;; become available. =2D-=20 2.28.0 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0002-website-nls-Update-guix-website.pot.patch Content-Transfer-Encoding: quoted-printable Content-Description: update-pot.patch From=20c499bf4afbb3221d9e9e8fbe69063eac6efab880 Mon Sep 17 00:00:00 2001 From: =3D?UTF-8?q?Miguel=3D20=3DC3=3D81ngel=3D20Arruga=3D20Vivas?=3D Date: Thu, 5 Nov 2020 18:42:03 +0100 Subject: [PATCH 2/3] website: nls: Update guix-website.pot. =2D-- 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 =2D-- a/website/po/guix-website.pot +++ b/website/po/guix-website.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" =2D"Project-Id-Version: guix-website 20201105\n" +"Project-Id-Version: guix-website 20201105-2\n" "Report-Msgid-Bugs-To: bug-guix@gnu.org\n" =2D"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 \n" "Language-Team: LANGUAGE \n" @@ -1374,7 +1374,13 @@ msgstr "" msgid "Browse alphabetically" msgstr "" =20 =2D#: apps/packages/templates/components.scm:204 apps/packages/templates/co= mponents.scm:270 +#: apps/packages/templates/components.scm:204 +msgctxt "patches" +msgid "None" +msgstr "" + +#: apps/packages/templates/components.scm:270 +msgctxt "systems" msgid "None" msgstr "" =20 =2D-=20 2.28.0 --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: attachment; filename=0003-website-nls-Update-Spanish-translation.patch Content-Transfer-Encoding: quoted-printable Content-Description: update-es.patch From=2071202be1b9e4e54a5c9cb741b77887914eab534d Mon Sep 17 00:00:00 2001 From: =3D?UTF-8?q?Miguel=3D20=3DC3=3D81ngel=3D20Arruga=3D20Vivas?=3D Date: Thu, 5 Nov 2020 18:48:37 +0100 Subject: [PATCH 3/3] website: nls: Update Spanish translation. =2D-- 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 =2D-- a/website/po/es.po +++ b/website/po/es.po @@ -7,10 +7,10 @@ # * Feed se traduce como tabl=C3=B3n [de anuncios] cuando es posible. msgid "" msgstr "" =2D"Project-Id-Version: guix-website 20201005\n" +"Project-Id-Version: guix-website 20201005-2\n" "Report-Msgid-Bugs-To: bug-guix@gnu.org\n" =2D"POT-Creation-Date: 2020-11-05 18:12+0100\n" =2D"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 =C3=81ngel Arruga Vivas \n" "Language-Team: Spanish \n" "Language: es\n" @@ -2152,12 +2152,16 @@ msgstr "Men=C3=BA de paquetes: " msgid "Browse alphabetically" msgstr "Navegar alfab=C3=A9ticamente" =20 =2D# FUZZY #: apps/packages/templates/components.scm:204 =2D#: apps/packages/templates/components.scm:270 +msgctxt "patches" msgid "None" msgstr "No hay" =20 +#: 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 =2D-=20 2.28.0 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQGzBAEBCgAdFiEEiIeExBRZrMuD5+hMY0xuiXn6vsIFAl+kO5gACgkQY0xuiXn6 vsLTNwv/W41QGw/2L96uMw6wBilgrWBHN4VIX+k+Da2Z1llEqAWhs8AZwecqKqfP tL0wV3cGVhnsmBIiQueOmWgDlgM+1x8Gve9P7isSuivgKtvNGdciFsIA2nalXE+6 Zod8IRGjT1pKwFDk6K4ukfyICHfhFGpkWxtIiXNYkAfEwBduR+Ocq6xYvkqfC937 ShMlCVo9KH1Yqp2f1solWLYuQ48fdQqiYCTvRK1yBpxVvQmRIgH02OMcfrClLTge 2H72THiFZpke0MrSdqJmbmWGdQX9uZdmxxRO+oxhdr9X3iUKp8iqs/z7ABACzCF5 FwSt2rTF+afF1+zWKZtJiVnC6iTUt4SO0bisfNwxYPxKXZfxe8Cdiql1RMjBFdW/ 5umnUnA9W1uB+z8y+cgbHOwzoXDLjBUG8DnMdSCOvOKU4YSLDCbJ2vFu20Ll42o7 cGr+udu1tcwATb9idNxaMum0kSaRtYYBlVmqJ3+QhGJrgv24DliEjFMFHwztuQCr 5eYjzh7h =UQ/A -----END PGP SIGNATURE----- --==-=-=--