From patchwork Sat Nov 19 22:49:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "pelzflorian (Florian Pelz)" X-Patchwork-Id: 44692 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 8EDE727BBEC; Sat, 19 Nov 2022 22:50:28 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id D54D327BBE9 for ; Sat, 19 Nov 2022 22:50:26 +0000 (GMT) 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) Authentication-Results: mors-relay-8405.netcup.net; dkim=permerror (bad message/signature format) 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 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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: …' is correct, instead of `nls: …'. 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(-) base-commit: bb04b5e0ceb606c8d33d53bf06f7fc8855a2c56b 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=> (service-type-description type) - (compose texi->plain-text P_))) + (compose texi->plain-text G_))) (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=> (service-type-description type) P_) + (or (and=> (service-type-description type) G_) "")))) #\newline))))) @@ -144,7 +144,7 @@ (define highlighting* (define (service-type-description-string type) "Return the rendered and localised description of TYPE, a service type." (and=> (service-type-description type) - (compose texi->plain-text P_))) + (compose texi->plain-text G_))) (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