diff mbox series

graphs.pl: Standardize localization strings for hardware graphs (ACPI)

Message ID 20200822215900.1472-1-matthias.fischer@ipfire.org
State Accepted
Headers
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

Michael Tremer Aug. 24, 2020, 2:08 p.m. UTC | #1 
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
>
Matthias Fischer Sept. 5, 2020, 3:42 p.m. UTC | #2 
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
Matthias Fischer Sept. 5, 2020, 3:42 p.m. UTC | #3 
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 mbox series

Patch

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"},