From mboxrd@z Thu Jan  1 00:00:00 1970
From: Matthias Fischer <matthias.fischer@ipfire.org>
To: development@lists.ipfire.org
Subject:
 Re: [PATCH] log.dat: Added 'squid' and 'snort', fixes quotation for ddns
Date: Mon, 23 May 2016 14:58:25 +0200
Message-ID: <79d6cda6-f9be-8fb1-e0da-7c9d946894e8@ipfire.org>
In-Reply-To: <1464004716.19435.129.camel@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4735259851482732928=="
List-Id: <development.lists.ipfire.org>

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

Hi,

On 23.05.2016 13:58, Michael Tremer wrote:
> On Mon, 2016-05-23 at 01:21 +0200, Matthias Fischer wrote:
>> Two again (sorry):
>> While adding 'squid' and 'snort' (with translation), I found that
>> 'ddns'-translation missed quotation marks.
>>=20
>> Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
>> ---
>>  html/cgi-bin/logs.cgi/log.dat | 10 +++++++---
>>  1 file changed, 7 insertions(+), 3 deletions(-)
>>=20
>> diff --git a/html/cgi-bin/logs.cgi/log.dat b/html/cgi-bin/logs.cgi/log.dat
>> index 99c033e..2cbabfc 100644
>> --- a/html/cgi-bin/logs.cgi/log.dat
>> +++ b/html/cgi-bin/logs.cgi/log.dat
>> @@ -65,14 +65,16 @@ my %sections =3D (
>>          'ipsec' =3D> '(ipsec_[\w_]+: |pluto\[.*\]: |charon: |vpnwatch: )',
>>          'openvpn' =3D> '(openvpnserver\[.*\]: |.*n2n\[.*\]: )',
>>          'pakfire' =3D> '(pakfire:) ',
>> -        'wireless' =3D> '(hostapd:|kernel: ath.*:|kernel: wifi[0-9]:) '
>> +        'wireless' =3D> '(hostapd:|kernel: ath.*:|kernel: wifi[0-9]:) ',
>> +        'squid' =3D> '(squid\[.*\]: |squid: )',
>> +        'snort' =3D> '(snort\[.*\]: )'
>>  	 );
>> =20
>>  # Translations for the %sections array.
>>  my %trsections =3D (
>>          'ipfire' =3D> 'IPFire',
>>          'red' =3D> 'RED',
>> -        'ddns' =3D> $Lang::tr{'dynamic dns'},
>> +        'ddns' =3D> "$Lang::tr{'dynamic dns'}",
>>          'dns' =3D> 'DNS',
>>          'dma' =3D> 'Mail',
>>          'dhcp' =3D> "$Lang::tr{'dhcp server'}",
>> @@ -86,7 +88,9 @@ my %trsections =3D (
>>          'ipsec' =3D> 'IPSec',
>>          'openvpn' =3D> 'OpenVPN',
>>          'pakfire' =3D> 'Pakfire',
>> -        'wireless' =3D> 'Wireless'
>> +        'wireless' =3D> 'Wireless',
>> +        'squid' =3D> 'Webproxy',
>> +        'snort' =3D> "$Lang::tr{'intrusion detection'}"
>>  	);
>=20
> Why is "Webproxy" not translated? This is also two words.

Ok, this can be done. If I start to change these, should I change the
corresponding entry in '/var/ipfire/menu.d/30-network.menu' as well?

Now it reads: 'title' =3D> "Webproxy",'
It SHOULD read: 'title' =3D> $Lang::tr{'web proxy'},

Current settings in language files:

de.pl:
'web proxy' =3D> 'Web-Proxy',

en.pl:
'web proxy' =3D> 'Web Proxy',

es.pl:
'web proxy' =3D> 'Web Proxy',

fr.pl:
'web proxy' =3D> 'Proxy web',

it.pl:
'web proxy' =3D> 'Proxy web',

nl.pl:
'web proxy' =3D> 'Web Proxy',

...

Which one to prefer? ;-) I would say 'Web Proxy'.

> I just saw that a ton of other things isn't translated either. Fancy sendin=
g an
> other patch for that, too?

No problem. AFTER I'm back from vacation. (15.06.2016...) ;-)

For now I could prepare two patchsets:

- Fixing missing quotation marks for 'ddns' in 'log.dat'.

and

- Adding 'squid' and'snort' (plus translations) in 'log.dat' and
'30-network.menu'.

Ok?

Best,
Matthias


--===============4735259851482732928==--