From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id WPXhDLNdeWPkqAAAbAwnHQ (envelope-from ) for ; Sat, 19 Nov 2022 23:50:27 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id AFb9C7NdeWNBagEAG6o9tA (envelope-from ) for ; Sat, 19 Nov 2022 23:50:27 +0100 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 CA74E2DE1F for ; Sat, 19 Nov 2022 23:50:26 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1owWey-0005rw-9S; Sat, 19 Nov 2022 17:50:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1owWex-0005rg-1B for guix-patches@gnu.org; Sat, 19 Nov 2022 17:50:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1owWew-0000E1-KB for guix-patches@gnu.org; Sat, 19 Nov 2022 17:50:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1owWew-0005JQ-1L for guix-patches@gnu.org; Sat, 19 Nov 2022 17:50:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59392] scripts: Use translations for guix.pot for service descriptions. Resent-From: "pelzflorian (Florian Pelz)" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 19 Nov 2022 22:50:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 59392 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 59392@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.166889818720390 (code B ref -1); Sat, 19 Nov 2022 22:50:01 +0000 Received: (at submit) by debbugs.gnu.org; 19 Nov 2022 22:49:47 +0000 Received: from localhost ([127.0.0.1]:41625 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1owWeh-0005In-3e for submit@debbugs.gnu.org; Sat, 19 Nov 2022 17:49:47 -0500 Received: from lists.gnu.org ([209.51.188.17]:48680) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1owWef-0005If-4K for submit@debbugs.gnu.org; Sat, 19 Nov 2022 17:49:46 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1owWee-0005qp-UQ for guix-patches@gnu.org; Sat, 19 Nov 2022 17:49:44 -0500 Received: from relay.yourmailgateway.de ([188.68.61.107]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1owWec-0000At-RL for guix-patches@gnu.org; Sat, 19 Nov 2022 17:49:44 -0500 Received: from mors-relay-8405.netcup.net (localhost [127.0.0.1]) by mors-relay-8405.netcup.net (Postfix) with ESMTPS id 4NF83l6tDQz74Pf for ; Sat, 19 Nov 2022 23:49:39 +0100 (CET) Received: from policy01-mors.netcup.net (unknown [46.38.225.35]) by mors-relay-8405.netcup.net (Postfix) with ESMTPS id 4NF83l6Dl2z74Pc for ; Sat, 19 Nov 2022 23:49:39 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at policy01-mors.netcup.net Received: from mxe217.netcup.net (unknown [10.243.12.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by policy01-mors.netcup.net (Postfix) with ESMTPS id 4NF83l2NZ3z8sf6 for ; Sat, 19 Nov 2022 23:49:39 +0100 (CET) Received: from florianrock64 (ip5b40a50f.dynamic.kabel-deutschland.de [91.64.165.15]) by mxe217.netcup.net (Postfix) with ESMTPSA id 09C249E9E1 for ; Sat, 19 Nov 2022 23:49:38 +0100 (CET) From: "pelzflorian (Florian Pelz)" Date: Sat, 19 Nov 2022 23:49:37 +0100 Message-ID: <87leo6muf2.fsf@pelzflorian.de> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 09C249E9E1 X-Spamd-Result: default: False [-5.60 / 15.00]; BAYES_HAM(-5.50)[100.00%]; MIME_GOOD(-0.10)[text/plain]; ARC_NA(0.00)[]; RCVD_COUNT_ZERO(0.00)[0]; ASN(0.00)[asn:3209, ipnet:91.64.0.0/14, country:DE]; RCPT_COUNT_ONE(0.00)[1]; MIME_TRACE(0.00)[0:+]; FROM_EQ_ENVFROM(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_NONE(0.00)[] X-Rspamd-Server: rspamd-worker-8404 X-NC-CID: OyPpMTndMRWuSBwqFvZgrc/lnO8i9KQrJ43Qbnij7JQTVe0gttrKB8go Received-SPF: none client-ip=188.68.61.107; envelope-from=pelzflorian@pelzflorian.de; helo=relay.yourmailgateway.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_PASS=-0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1668898226; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=3BVp1APp31qoTNjx/eGTfvOk7gl2G2RUFo59I7lJHnY=; b=PDI4HBwP++mB7ZLUVKwlzgnD+ygvITdFaTUNs+UpWZuCNYqxUAIuZjcyQh14s3QN/sqaLn 0HDESHXSIj587s3q2YkxgKzDeVEPaM16Tw5WGcmt4xZZ2XU+q81Pl4o9yl+c6i+Me8bvka PCOFtMg90K6/gy6dZD+cNyujYbWtLqdOKW8RfjFP6b59jcvD4AOdwnMtrY9QJZo9oX00US f05Q7vSPH7IxVTx/Sxn5hHehpXipWrqF0McIq/9NQG0BVCWJaQoepZ6QxMSywr8Ny7dEke qr5DDpgMa3j4Al8KeMdIEAG7gUzYDen4w10wL0eZs8NmWqwWi2sHnV8RS2z5Rw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1668898226; a=rsa-sha256; cv=none; b=Z/OnVHHl/aEHK4FJu7hKoVYpQtWjZ1FOiYkf4/Fw8pcqHZHrKcZ6/RhytG11FqDKGQdneJ jJbCYAqmI8o31BtijHEUg3YMvsOyN6CvGVzRHrlWqFNXqe+GgQEGAzfl+OI0M57i6gXz4Q Dnjcn1tlLP5HWuUKFMmliqffq2zung+AUC3nSKnIlHF20fOXUOikOhnSYtN9uWNfXANymi XrO36255WimjlQjYkpXA27RTQEnwuPsCo0fOJzXp0nMcVlfAxuCgXEla4/PfaKglJkrdPU d1c+iPiDpwCP7AB2jZ61nRDUdnYz9N/emaT6B3Lq/6Qz16Gv10I+bSTMg8uAUA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -3.71 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: CA74E2DE1F X-Spam-Score: -3.71 X-Migadu-Scanner: scn0.migadu.com X-TUID: 9GvULufyiLAo Previously, service descriptions appeared in both guix.pot and packages.pot, but only translations of packages.pot were used. Now, translations are only done with guix.pot. This is better, because translators are more likely to translate guix.pot, and is also easier, because files in gnu/{home/,}services need to be in po/guix/POTFILES.in anyway and po/guix/Makevars already acts on the 'description' keyword because of lint checkers. * guix/scripts/home.scm (service-type-description-string): Use translations from guix.pot. * guix/scripts/system/search.scm (service-type-description-string) (service-type->recutils): Likewise. * po/packages/POTFILES.in: Move files in gnu/services to ... * po/guix/POTFILES.in: ... here. --- P.S. I hope the subject line `scripts: =E2=80=A6' is correct, instead of `nls: =E2=80=A6'. guix/scripts/home.scm | 2 +- guix/scripts/system/search.scm | 4 ++-- po/guix/POTFILES.in | 4 ++++ po/packages/POTFILES.in | 5 ----- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/guix/scripts/home.scm b/guix/scripts/home.scm index 754001a5b8..1c481ccf91 100644 --- a/guix/scripts/home.scm +++ b/guix/scripts/home.scm @@ -705,7 +705,7 @@ (define service-type-name* (define (service-type-description-string type) "Return the rendered and localised description of TYPE, a service type." (and=3D> (service-type-description type) - (compose texi->plain-text P_))) + (compose texi->plain-text G_))) =20 (define %service-type-metrics ;; Metrics used to estimate the relevance of a search result. diff --git a/guix/scripts/system/search.scm b/guix/scripts/system/search.scm index 44f00194cd..d978884518 100644 --- a/guix/scripts/system/search.scm +++ b/guix/scripts/system/search.scm @@ -127,7 +127,7 @@ (define highlighting* (parameterize ((%text-width width*)) (texi->plain-text (string-append "description: " - (or (and=3D> (service-type-description ty= pe) P_) + (or (and=3D> (service-type-description ty= pe) G_) "")))) #\newline))))) =20 @@ -144,7 +144,7 @@ (define highlighting* (define (service-type-description-string type) "Return the rendered and localised description of TYPE, a service type." (and=3D> (service-type-description type) - (compose texi->plain-text P_))) + (compose texi->plain-text G_))) =20 (define %service-type-metrics ;; Metrics used to estimate the relevance of a search result. diff --git a/po/guix/POTFILES.in b/po/guix/POTFILES.in index 228ce04240..7009fc756c 100644 --- a/po/guix/POTFILES.in +++ b/po/guix/POTFILES.in @@ -4,10 +4,14 @@ gnu.scm gnu/packages.scm gnu/services.scm gnu/system.scm +gnu/services/base.scm +gnu/services/certbot.scm gnu/services/configuration.scm +gnu/services/file-sharing.scm gnu/services/networking.scm gnu/services/shepherd.scm gnu/services/samba.scm +gnu/services/version-control.scm gnu/home/services.scm gnu/home/services/ssh.scm gnu/home/services/symlink-manager.scm diff --git a/po/packages/POTFILES.in b/po/packages/POTFILES.in index 398f9adfdf..32d34d6456 100644 --- a/po/packages/POTFILES.in +++ b/po/packages/POTFILES.in @@ -57,8 +57,3 @@ gnu/packages/webkit.scm gnu/packages/web.scm gnu/packages/wordnet.scm gnu/packages/xiph.scm -gnu/services/base.scm -gnu/services/certbot.scm -gnu/services/file-sharing.scm -gnu/services/networking.scm -gnu/services/version-control.scm base-commit: bb04b5e0ceb606c8d33d53bf06f7fc8855a2c56b --=20 2.38.0