From mboxrd@z Thu Jan  1 00:00:00 1970
From: Peter =?utf-8?q?M=C3=BCller?= <peter.mueller@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH] system.cgi: properly translate load average graph
Date: Mon, 27 Apr 2020 18:11:53 +0200
Message-ID: <951a1b0f-4bbf-1279-848d-05d7f03a908f@ipfire.org>
In-Reply-To: <A5FA199F-F1CA-4CA9-BF99-A069D79B35A4@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0152769099996956280=="
List-Id: <development.lists.ipfire.org>

--===============0152769099996956280==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Hello Michael,

> Hi,
>=20
>> On 27 Apr 2020, at 16:37, Peter M=C3=BCller <peter.mueller(a)ipfire.org> w=
rote:
>>
>> Signed-off-by: Peter M=C3=BCller <peter.mueller(a)ipfire.org>
>> ---
>> config/cfgroot/graphs.pl | 2 +-
>> html/cgi-bin/system.cgi  | 2 +-
>> 2 files changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl
>> index 1bed49fa3..928a74cfb 100644
>> --- a/config/cfgroot/graphs.pl
>> +++ b/config/cfgroot/graphs.pl
>> @@ -256,7 +256,7 @@ sub updateloadgraph {
>> 		"-1".$period,
>> 		"-l 0",
>> 		"-r",
>> -		"-t Load Average ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph=
"},
>> +		"-t ".$Lang::tr{'uptime load average'}." ".$Lang::tr{'graph per'}." ".$=
Lang::tr{$period."-graph"},
>> 		"-v ".$Lang::tr{'processes'},
>> 		"--color=3DSHADEA".$color{"color19"},
>> 		"--color=3DSHADEB".$color{"color19"},
>> diff --git a/html/cgi-bin/system.cgi b/html/cgi-bin/system.cgi
>> index 487ba996c..2c83f1e81 100644
>> --- a/html/cgi-bin/system.cgi
>> +++ b/html/cgi-bin/system.cgi
>> @@ -66,7 +66,7 @@ if ( $querry[0] =3D~ "cpufreq"){
>> 		&Header::closebox();
>> 	}
>>
>> -	&Header::openbox('100%', 'center', "Load $Lang::tr{'graph'}");
>> +	&Header::openbox('100%', 'center', "$Lang::tr{'uptime load average'} $La=
ng::tr{'graph'}");
>=20
> You are concatenating two strings here. This might work in English, but not=
 in other languages.
>=20
> So the correct way would be to have =E2=80=9Cuptime load average graph=E2=
=80=9D as one string.

I agree. Unfortunately, we did the same thing in other places so this probabl=
y requires some
clean up effort > 5 minutes. :-/ In the meantime, this can be merged or dropp=
ed.

Thanks, and best regards,
Peter M=C3=BCller

>=20
> Best,
> -Michael
>=20
>> 	&Graphs::makegraphbox("system.cgi","load","day");
>> 	&Header::closebox();
>>
>> --=20
>> 2.16.4
>=20

--===============0152769099996956280==--