Message ID | 20200822215900.1472-1-matthias.fischer@ipfire.org |
---|---|
State | Accepted |
Headers |
Return-Path: <development-bounces@lists.ipfire.org> 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 "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4BYsjS6wVCz3x1D for <patchwork@web04.haj.ipfire.org>; Sat, 22 Aug 2020 21:59:08 +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 "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4BYsjR1wPFzty; Sat, 22 Aug 2020 21:59:07 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4BYsjQ5x2mz2ybF; Sat, 22 Aug 2020 21:59:06 +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 "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4BYsjP0FqKz2xRB for <development@lists.ipfire.org>; Sat, 22 Aug 2020 21:59:05 +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) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 4BYsjN2DSCzRF for <development@lists.ipfire.org>; Sat, 22 Aug 2020 21:59:04 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1598133544; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=2ttbSW9Kj+Fm+0h/xK6CirYCrUMcziR6Pg8QLnocAlU=; b=e3siEYZkWAnE5urZ1JzQPmzBsIDShsvxKB8j1zJykIoowBYXH7r3EPDDa8+a5hGdFbGrBG WxahpnjRKUtDREBg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1598133544; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=2ttbSW9Kj+Fm+0h/xK6CirYCrUMcziR6Pg8QLnocAlU=; b=LgkaZz+ynLLg1L7RP9RE5FN6H9+MpEGgrSoUxs4GSPxyBVVFMrsslaDE8SWGFHTXWA7FxJ Vsf3XKd/IzjunFuH1yppV8wSo2m1S8Fh5Px9EBa8mOidVvYJJpSRS6z7pR810Lxg/RS4U/ nLVzOXxa+2iNvy9NOr2hIgRpl1QlE0ZSjbILUFUjTSLRsoNYRTwJPDTeHxTpA2J2igwQne 585Km2PcgnGDCW2nIA40kNnHEXPKs4tkBwvCQT5KdeRMQayMh3EzBsgM3RahBrk40UuZM5 ZE71dOJ1Y9PFGfa5PCwx62FqDqmNvBJUQv6YnE0JXMyxxwqzerEVredHWoYlJg== From: Matthias Fischer <matthias.fischer@ipfire.org> To: development@lists.ipfire.org Subject: [PATCH] graphs.pl: Standardize localization strings for hardware graphs (ACPI) Date: Sat, 22 Aug 2020 23:59:00 +0200 Message-Id: <20200822215900.1472-1-matthias.fischer@ipfire.org> Authentication-Results: mail01.ipfire.org; auth=pass smtp.mailfrom=matthias.fischer@ipfire.org X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk <development.lists.ipfire.org> List-Unsubscribe: <https://lists.ipfire.org/mailman/options/development>, <mailto:development-request@lists.ipfire.org?subject=unsubscribe> List-Archive: <http://lists.ipfire.org/pipermail/development/> List-Post: <mailto:development@lists.ipfire.org> List-Help: <mailto:development-request@lists.ipfire.org?subject=help> List-Subscribe: <https://lists.ipfire.org/mailman/listinfo/development>, <mailto:development-request@lists.ipfire.org?subject=subscribe> Errors-To: development-bounces@lists.ipfire.org Sender: "Development" <development-bounces@lists.ipfire.org> |
Series |
graphs.pl: Standardize localization strings for hardware graphs (ACPI)
|
|
Commit Message
Matthias Fischer
Aug. 22, 2020, 9:59 p.m. UTC
Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
---
config/cfgroot/graphs.pl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Comments
Reviewed-by: Michael Tremer <michael.tremer@ipfire.org> > On 22 Aug 2020, at 22:59, Matthias Fischer <matthias.fischer@ipfire.org> wrote: > > Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org> > --- > config/cfgroot/graphs.pl | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl > index 9531a0e37..de306710e 100644 > --- a/config/cfgroot/graphs.pl > +++ b/config/cfgroot/graphs.pl > @@ -1088,7 +1088,7 @@ sub updatethermaltempgraph { > "--start", > "-1".$period, > "-r", > - "-t "."ACPI Thermal-Zone Temperature"." - ".$Lang::tr{$period."-graph"}, > + "-t "."ACPI Thermal-Zone Temperature"." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"}, Can we have the ACPI Thermal Zone part translated, too? Maybe in a separate patch? -Michael > "-v Grad Celsius", > "--color=SHADEA".$color{"color19"}, > "--color=SHADEB".$color{"color19"}, > -- > 2.17.1 >
Hi, On 24.08.2020 16:08, Michael Tremer wrote: > Reviewed-by: Michael Tremer <michael.tremer@ipfire.org> > >> On 22 Aug 2020, at 22:59, Matthias Fischer <matthias.fischer@ipfire.org> wrote: >> >> Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org> >> --- >> config/cfgroot/graphs.pl | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl >> index 9531a0e37..de306710e 100644 >> --- a/config/cfgroot/graphs.pl >> +++ b/config/cfgroot/graphs.pl >> @@ -1088,7 +1088,7 @@ sub updatethermaltempgraph { >> "--start", >> "-1".$period, >> "-r", >> - "-t "."ACPI Thermal-Zone Temperature"." - ".$Lang::tr{$period."-graph"}, >> + "-t "."ACPI Thermal-Zone Temperature"." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"}, > > Can we have the ACPI Thermal Zone part translated, too? Maybe in a separate patch? No problem, done - but: While working on this, I found a bunch of other glitches. Besides, the following patches weren't merged yet. Just cosmetic ones, but they contain patches for 'hardwaregraphs.cgi' and 'netother.cgi' - among some others. Removed unnecessary translation string for 'graph' from several cgis: https://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=1851c3d59a6569a37aaf40af6ddee84d57f0d7bc Removed obsolete translation string: https://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=5ec038119c78a49d586afdaf3dee6b4b23f47f1c graphs.pl: Standardize localization strings for disk access graphs: https://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=9a3fba8661b76bc455e553cf9d39550d5ea919b2 graphs.pl: Standardize localization strings for hardware graphs (ACPI): https://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=b996e44f4d49724a46d35c71554ab854c42b7e96 graphs.pl: Standardize localization strings for entropy graphs: https://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=ae5cf4304940f4b4648ef0b8582f6ddb770ac3cf I'll send some patches based on "ms_conntrack", but in this way, only two CGIs from the above patches are taken into account. Can this be merged this way? Best, Matthias
Hi,
On 24.08.2020 16:08, Michael Tremer wrote:
> Can we have the ACPI Thermal Zone part translated, too? Maybe in a separate patch?
Done. and a few more...
Best,
Matthias
diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl index 9531a0e37..de306710e 100644 --- a/config/cfgroot/graphs.pl +++ b/config/cfgroot/graphs.pl @@ -1088,7 +1088,7 @@ sub updatethermaltempgraph { "--start", "-1".$period, "-r", - "-t "."ACPI Thermal-Zone Temperature"." - ".$Lang::tr{$period."-graph"}, + "-t "."ACPI Thermal-Zone Temperature"." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"}, "-v Grad Celsius", "--color=SHADEA".$color{"color19"}, "--color=SHADEB".$color{"color19"},