log.dat: Added 'squid' and 'snort', fixes quotation for ddns
Message ID | 20160522232123.2454-1-matthias.fischer@ipfire.org |
---|---|
State | Superseded |
Headers |
Return-Path: <development-bounces@lists.ipfire.org> Received: from mail01.ipfire.org (hedwig.ipfire.org [172.28.1.200]) by web02.ipfire.org (Postfix) with ESMTP id B5D9362924 for <patchwork@ipfire.org>; Mon, 23 May 2016 01:21:51 +0200 (CEST) Received: from mail01.ipfire.org (localhost [IPv6:::1]) by mail01.ipfire.org (Postfix) with ESMTP id 2ABCFCB0; Mon, 23 May 2016 01:21:48 +0200 (CEST) Received: from Devel.localdomain (p5DD8248F.dip0.t-ipconnect.de [93.216.36.143]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id D639DB85 for <development@lists.ipfire.org>; Mon, 23 May 2016 01:21:37 +0200 (CEST) From: Matthias Fischer <matthias.fischer@ipfire.org> To: development@lists.ipfire.org Subject: [PATCH] log.dat: Added 'squid' and 'snort', fixes quotation for ddns Date: Mon, 23 May 2016 01:21:23 +0200 Message-Id: <20160522232123.2454-1-matthias.fischer@ipfire.org> X-Mailer: git-send-email 2.8.3 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: IPFire development talk <development.lists.ipfire.org> List-Unsubscribe: <http://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: <http://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> |
Message
Matthias Fischer
May 23, 2016, 9:21 a.m. UTC
Two again (sorry):
While adding 'squid' and 'snort' (with translation), I found that
'ddns'-translation missed quotation marks.
Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
---
html/cgi-bin/logs.cgi/log.dat | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
Comments
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. > > Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org> > --- > html/cgi-bin/logs.cgi/log.dat | 10 +++++++--- > 1 file changed, 7 insertions(+), 3 deletions(-) > > 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 = ( > 'ipsec' => '(ipsec_[\w_]+: |pluto\[.*\]: |charon: |vpnwatch: )', > 'openvpn' => '(openvpnserver\[.*\]: |.*n2n\[.*\]: )', > 'pakfire' => '(pakfire:) ', > - 'wireless' => '(hostapd:|kernel: ath.*:|kernel: wifi[0-9]:) ' > + 'wireless' => '(hostapd:|kernel: ath.*:|kernel: wifi[0-9]:) ', > + 'squid' => '(squid\[.*\]: |squid: )', > + 'snort' => '(snort\[.*\]: )' > ); > > # Translations for the %sections array. > my %trsections = ( > 'ipfire' => 'IPFire', > 'red' => 'RED', > - 'ddns' => $Lang::tr{'dynamic dns'}, > + 'ddns' => "$Lang::tr{'dynamic dns'}", > 'dns' => 'DNS', > 'dma' => 'Mail', > 'dhcp' => "$Lang::tr{'dhcp server'}", > @@ -86,7 +88,9 @@ my %trsections = ( > 'ipsec' => 'IPSec', > 'openvpn' => 'OpenVPN', > 'pakfire' => 'Pakfire', > - 'wireless' => 'Wireless' > + 'wireless' => 'Wireless', > + 'squid' => 'Webproxy', > + 'snort' => "$Lang::tr{'intrusion detection'}" > ); Why is "Webproxy" not translated? This is also two words. I just saw that a ton of other things isn't translated either. Fancy sending an other patch for that, too? -Michael > >
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. >> >> Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org> >> --- >> html/cgi-bin/logs.cgi/log.dat | 10 +++++++--- >> 1 file changed, 7 insertions(+), 3 deletions(-) >> >> 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 = ( >> 'ipsec' => '(ipsec_[\w_]+: |pluto\[.*\]: |charon: |vpnwatch: )', >> 'openvpn' => '(openvpnserver\[.*\]: |.*n2n\[.*\]: )', >> 'pakfire' => '(pakfire:) ', >> - 'wireless' => '(hostapd:|kernel: ath.*:|kernel: wifi[0-9]:) ' >> + 'wireless' => '(hostapd:|kernel: ath.*:|kernel: wifi[0-9]:) ', >> + 'squid' => '(squid\[.*\]: |squid: )', >> + 'snort' => '(snort\[.*\]: )' >> ); >> >> # Translations for the %sections array. >> my %trsections = ( >> 'ipfire' => 'IPFire', >> 'red' => 'RED', >> - 'ddns' => $Lang::tr{'dynamic dns'}, >> + 'ddns' => "$Lang::tr{'dynamic dns'}", >> 'dns' => 'DNS', >> 'dma' => 'Mail', >> 'dhcp' => "$Lang::tr{'dhcp server'}", >> @@ -86,7 +88,9 @@ my %trsections = ( >> 'ipsec' => 'IPSec', >> 'openvpn' => 'OpenVPN', >> 'pakfire' => 'Pakfire', >> - 'wireless' => 'Wireless' >> + 'wireless' => 'Wireless', >> + 'squid' => 'Webproxy', >> + 'snort' => "$Lang::tr{'intrusion detection'}" >> ); > > 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' => "Webproxy",' It SHOULD read: 'title' => $Lang::tr{'web proxy'}, Current settings in language files: de.pl: 'web proxy' => 'Web-Proxy', en.pl: 'web proxy' => 'Web Proxy', es.pl: 'web proxy' => 'Web Proxy', fr.pl: 'web proxy' => 'Proxy web', it.pl: 'web proxy' => 'Proxy web', nl.pl: 'web proxy' => '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 sending 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
Hi,
On 23.05.2016 14:58, Matthias Fischer wrote:
> For now I could prepare two patchsets:
Done. ;-)
Best,
Matthias
P.S.: my first patchset - and guess what!? It worked.