From patchwork Sun May 8 12:09:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Leo-Andres Hofmann X-Patchwork-Id: 5596 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4Kx3635LKdz3x1v for ; Sun, 8 May 2022 12:10:19 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4Kx35y028Kz5R3; Sun, 8 May 2022 12:10:14 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4Kx35x6h9vz2ySt; Sun, 8 May 2022 12:10:13 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4Kx35x11Yyz2x9j for ; Sun, 8 May 2022 12:10:13 +0000 (UTC) Received: from arche.uberspace.de (arche.uberspace.de [185.26.156.147]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPS id 4Kx35p2Lq6zPq for ; Sun, 8 May 2022 12:10:06 +0000 (UTC) Received: (qmail 30379 invoked by uid 990); 8 May 2022 12:10:05 -0000 From: Leo-Andres Hofmann To: development@lists.ipfire.org Subject: [PATCH 7/7] pakfire.cgi: Cosmetic fixes Date: Sun, 8 May 2022 14:09:52 +0200 Message-Id: <20220508120952.52-7-hofmann@leo-andres.de> X-Mailer: git-send-email 2.27.0.windows.1 In-Reply-To: <20220508120952.52-1-hofmann@leo-andres.de> References: <20220508120952.52-1-hofmann@leo-andres.de> MIME-Version: 1.0 X-Rspamd-Bar: - X-Rspamd-Report: MID_CONTAINS_FROM(1) MIME_HTML_ONLY(0.2) BAYES_HAM(-3) X-Rspamd-Score: -1.8 Received: from unknown (HELO unkown) (::1) by arche.uberspace.de (Haraka/2.8.28) with ESMTPSA; Sun, 08 May 2022 14:10:05 +0200 ARC-Seal: i=1; s=202003rsa; d=lists.ipfire.org; t=1652011806; a=rsa-sha256; cv=none; b=QhQjQsXQ/rjSqSbZB8C/hvdpTk2L2rHyqBrXRyazxs4PyBac6y8j39+OPr/Ckt/KqgHCdj mVjePT4Ps6Bzz5BDj8c+0HVlO5ByKuWyTKScyLZ/QUabkM63hd97MySJKCFoATxFKa6jn1 f7+7jF50K1DZZCuxgVvmzRE9MK7gXjj0HTAI2evpFEkLmI3VXchX8MYjG+YSIEAwavDfAx oapEXHzXX52xcK51sFC8b+7LqeztK8U+3P65RWet1weZFgc09JayAbL4K54HsceBgH3XKJ tpo/+iUrIFhak66PNYPy14diYBWftvkYJviXuRWPQQJpLmW1ilTVpeZx9NSvKA== ARC-Authentication-Results: i=1; mail01.ipfire.org; dkim=none; spf=pass (mail01.ipfire.org: domain of hofmann@leo-andres.de designates 185.26.156.147 as permitted sender) smtp.mailfrom=hofmann@leo-andres.de; dmarc=pass (policy=quarantine) header.from=leo-andres.de ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=lists.ipfire.org; s=202003rsa; t=1652011806; h=from:from: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: in-reply-to:in-reply-to:references:references; bh=CYAgGz+rDSeWTCAHsWXNxxxTcMQIZJ58r8+pt/rf3ww=; b=C8uqB+6xdsfc4dQZ4dDu37dhNdvxbTvW0xb2Vw3dEQgiRhIcGwdh1kug9jufaNmABybtEG MAGst18Mjklm2rx/pQl0TVyAG3co35pz7gdIISBDc87IHXSonR0zKjlr08LE/DqXvT95WF hYdzJS28nKZFa+EJ5rrGd/tM2oiiZW+jdKhTRvh2dqwTuaw6aYpwsCE7uaXQ48EhnhbDjx oarYgyyDJkdTMWXkmTAWFTS9CixhdB6E6Fi1Ll5qlgjEW/DhqFn+biJXiJ1nOyU2/Qxqzb kV90vpZSAHCNMbKtJk3SaxKJfZZKDu5oGwyWQQdlCOGovKOoRhAMsysdhwq5tg== X-Rspamd-Queue-Id: 4Kx35p2Lq6zPq X-Rspamd-Server: mail01.haj.ipfire.org X-Spamd-Result: default: False [-3.75 / 11.00]; BAYES_HAM(-2.97)[99.88%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM(-1.00)[-1.000]; SPF_REPUTATION_HAM(-0.77)[-0.77342682734463]; DMARC_POLICY_ALLOW(-0.50)[leo-andres.de,quarantine]; MX_INVALID(0.50)[]; R_SPF_ALLOW(-0.20)[+mx:c]; MIME_HTML_ONLY(0.20)[]; IP_REPUTATION_HAM(-0.01)[asn: 205766(0.00), country: DE(-0.01), ip: 185.26.156.147(0.00)]; MIME_TRACE(0.00)[0:~]; RCVD_COUNT_TWO(0.00)[2]; ASN(0.00)[asn:205766, ipnet:185.26.156.0/24, country:DE]; FROM_EQ_ENVFROM(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[185.26.156.147:from]; RCVD_TLS_ALL(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_NONE(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; ARC_SIGNED(0.00)[lists.ipfire.org:s=202003rsa:i=1]; ARC_NA(0.00)[] Authentication-Results: mail01.ipfire.org; dkim=none; spf=pass (mail01.ipfire.org: domain of hofmann@leo-andres.de designates 185.26.156.147 as permitted sender) smtp.mailfrom=hofmann@leo-andres.de; dmarc=pass (policy=quarantine) header.from=leo-andres.de X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Add formatting to improve readability of dependencies list header. Signed-off-by: Leo-Andres Hofmann Acked-by: Peter Müller --- html/cgi-bin/pakfire.cgi | 6 ++++-- langs/fr/cgi-bin/fr.pl | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/html/cgi-bin/pakfire.cgi b/html/cgi-bin/pakfire.cgi index 489b07a6d..3e8dc5460 100644 --- a/html/cgi-bin/pakfire.cgi +++ b/html/cgi-bin/pakfire.cgi @@ -283,7 +283,8 @@ if (($cgiparams{'ACTION'} eq 'install') && ($pagemode eq $PM_DEFAULT)) { my @pkgs = split(/\|/, $cgiparams{'INSPAKS'}); my @output = &General::system_output("/usr/local/bin/pakfire", "resolvedeps", "--no-colors", @pkgs); print <$Lang::tr{'pakfire install package'} @pkgs $Lang::tr{'pakfire possible dependency'} +

$Lang::tr{'pakfire install package'} @{pkgs}
+ $Lang::tr{'pakfire possible dependency'}

 END
 	foreach (@output) {
@@ -321,7 +322,8 @@ END
 	my @pkgs = split(/\|/, $cgiparams{'DELPAKS'});
 	my @output = &General::system_output("/usr/local/bin/pakfire", "resolvedeps", "--no-colors", @pkgs);
 	print <
$Lang::tr{'pakfire uninstall package'} @pkgs $Lang::tr{'pakfire possible dependency'} +

$Lang::tr{'pakfire uninstall package'} @{pkgs}
+ $Lang::tr{'pakfire possible dependency'}

 END
 	foreach (@output) {
diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl
index bd17df4ee..6dbeebc16 100644
--- a/langs/fr/cgi-bin/fr.pl
+++ b/langs/fr/cgi-bin/fr.pl
@@ -2055,7 +2055,7 @@
 'pakfire last package update' => 'Dernière mise à jour de la liste des paquets : ',
 'pakfire last serverlist update' => 'Dernière mise à jour de la liste des serveurs : ',
 'pakfire last update' => 'Dernière mise à jour : ',
-'pakfire possible dependency' => '

Il y a peut-être des dépendances, voici la liste des paquets qu\'il faut (dés)installer.
',
+'pakfire possible dependency' => 'Il y a peut-être des dépendances, voici la liste des paquets qu\'il faut (dés)installer.',
 'pakfire register' => 'S\'inscrire au serveur pakfire :',
 'pakfire return' => 'Retour à Pakfire',
 'pakfire system state' => 'Statut système PakFire ',