From patchwork Thu Dec 24 00:09:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Matthias Fischer X-Patchwork-Id: 3752 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) server-digest SHA384 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4D1Vmp67Nsz3wx8 for ; Thu, 24 Dec 2020 00:09:14 +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) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4D1Vmn3kJGzmh; Thu, 24 Dec 2020 00:09:13 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4D1Vmm6W4tz2y51; Thu, 24 Dec 2020 00:09:12 +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) server-digest SHA384 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4D1Vml4XnDz2xcW for ; Thu, 24 Dec 2020 00:09:11 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4D1Vmk6GZhzmh for ; Thu, 24 Dec 2020 00:09:10 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1608768550; 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; bh=HmNeRw/9b2gm3b8uHVcJcx/DGyRNOpQvflcDYCniUY4=; b=MKCYINDD0C0BJgPL7d3hBlPNQgXA5yL4YoJlLlTQ+R49i53k5KKfj0fQp8N/iCNG7MKHq2 TNdzOuPE3cF/3eBQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1608768550; 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; bh=HmNeRw/9b2gm3b8uHVcJcx/DGyRNOpQvflcDYCniUY4=; b=itdvBmdBk85EPBe0kSFwtGayl1XfQuhHqFDUcpOh/B++aw/GBUK+tYq0q/jVFNoSDwGZgN nEEWbBDlt2r4hLqORcFgG1yzCx45ohIdV6qA+CNTgHe6Vc1Azm+Esr2fml+iQgnBqvvrhH 8nWlJ7thPZC4rrWrF6DCKtgxvPYnj+c22oGMU3zc1I6ssafwiDFlph6A3gMqNEIl8A4Fzj 52bgS9zOxIn25Sd/gKNNApTYSdW75xABQpzRKhwT0zAuF9L9ELzF6bJdZWZiftDRg1ceWm y1x5M+HksCH+slGgKeLwajR99axRLuA1lJTZoP9rxmwxkc9FqmXugoKxQxvFsw== From: Matthias Fischer To: development@lists.ipfire.org Subject: [PATCH] Update (and cosmetic fixes) for 'pakfire.cgi': Added GUI entry for existing, but unused translation string Date: Thu, 24 Dec 2020 01:09:04 +0100 Message-Id: <20201224000904.3477-1-matthias.fischer@ipfire.org> MIME-Version: 1.0 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" While preparing the Core153 update, I found by chance that a language string had been added from Core152 to Core153 which I couldn't find in any CGI-file. The translation suggested that this string ('Available Updates') could belong to 'pakfire.cgi'. And I thought that on the pakfire GUI something was actually missing: the heading above the box listing the 'Available Updates'. Don't know why I didn't saw this before. So tried to add these missing heading. I hope I made it right... Some cosmetic fixes: I also added some space around the text for 'Available Addons' and 'Installed Addons' because the text lines weren't separated. There is no seen wordwrapping. This required deleting some unwanted '
' in the affected translation strings. I tried this about 4 years ago, but somehow this patch got lost. Signed-off-by: Matthias Fischer --- html/cgi-bin/pakfire.cgi | 17 ++++++++++------- langs/de/cgi-bin/de.pl | 2 +- langs/en/cgi-bin/en.pl | 7 +++---- langs/es/cgi-bin/es.pl | 4 ++-- langs/fr/cgi-bin/fr.pl | 6 +++--- langs/it/cgi-bin/it.pl | 7 +++---- langs/nl/cgi-bin/nl.pl | 6 +++--- langs/pl/cgi-bin/pl.pl | 6 +++--- langs/ru/cgi-bin/ru.pl | 6 +++--- langs/tr/cgi-bin/tr.pl | 6 +++--- 10 files changed, 34 insertions(+), 33 deletions(-) diff --git a/html/cgi-bin/pakfire.cgi b/html/cgi-bin/pakfire.cgi index 39389ad02..dd96a92e9 100644 --- a/html/cgi-bin/pakfire.cgi +++ b/html/cgi-bin/pakfire.cgi @@ -183,7 +183,7 @@ if ($return) { print < - $Lang::tr{  + $Lang::tr{  $Lang::tr{'pakfire working'} @@ -217,7 +217,7 @@ my $packages_update_age = &General::age("/opt/pakfire/db/lists/packages_list.db" &Header::openbox("100%", "center", "Pakfire"); print < + END if ( -e "/var/run/need_reboot") { print ""; @@ -225,18 +225,21 @@ if ( -e "/var/run/need_reboot") { } print < +
$Lang::tr{'needreboot'}!
$Lang::tr{'pakfire system state'}: - + + $Lang::tr{'available updates'}:
$Lang::tr{'pakfire core update level'}: $core_release
$Lang::tr{'pakfire last update'} $core_update_age $Lang::tr{'pakfire ago'}
$Lang::tr{'pakfire last serverlist update'} $server_update_age $Lang::tr{'pakfire ago'}
$Lang::tr{'pakfire last core list update'} $corelist_update_age $Lang::tr{'pakfire ago'}
$Lang::tr{'pakfire last package update'} $packages_update_age $Lang::tr{'pakfire ago'}
- +

+
 -
+
 
$Lang::tr{'pakfire available addons'} $Lang::tr{'pakfire installed addons'} -
+

$Lang::tr{'pakfire install description'}

 +

$Lang::tr{'pakfire uninstall description'}