From mboxrd@z Thu Jan  1 00:00:00 1970
From: Matthias Fischer <matthias.fischer@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 2/2] log.dat: Added 'squid' and 'snort' plus translations
Date: Mon, 23 May 2016 15:55:13 +0200
Message-ID: <20160523135513.1502-2-matthias.fischer@ipfire.org>
In-Reply-To: <20160523135513.1502-1-matthias.fischer@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7030123134140032973=="
List-Id: <development.lists.ipfire.org>

--===============7030123134140032973==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit

Added 'squid' and 'snort' to section dropdown in LOGS / SYSTEM LOGS,
added translations.

Added translation string for 'web proxy' in '30-network.menu'.

Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
---
 config/menu/30-network.menu   | 4 ++--
 html/cgi-bin/logs.cgi/log.dat | 8 ++++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/config/menu/30-network.menu b/config/menu/30-network.menu
index c50508f..8e1336a 100644
--- a/config/menu/30-network.menu
+++ b/config/menu/30-network.menu
@@ -3,9 +3,9 @@
 			        'title' => "$Lang::tr{'net config'}",
 			        'enabled' => 0,
 			        };
-    $subnetwork->{'20.proxy'} = {'caption' => 'Webproxy',
+    $subnetwork->{'20.proxy'} = {'caption' => "$Lang::tr{'web proxy'}",
 			        'uri' => '/cgi-bin/proxy.cgi',
-			        'title' => "Webproxy",
+			        'title' => "$Lang::tr{'web proxy'}",
 			        'enabled' => 1,
 			        };
     $subnetwork->{'21.urlfilter'} = {'caption' => $Lang::tr{'url filter'},
diff --git a/html/cgi-bin/logs.cgi/log.dat b/html/cgi-bin/logs.cgi/log.dat
index 44d6aeb..a8a7ba4 100644
--- a/html/cgi-bin/logs.cgi/log.dat
+++ b/html/cgi-bin/logs.cgi/log.dat
@@ -65,7 +65,9 @@ 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.
@@ -86,7 +88,9 @@ my %trsections = (
         'ipsec' => 'IPSec',
         'openvpn' => 'OpenVPN',
         'pakfire' => 'Pakfire',
-        'wireless' => 'Wireless'
+        'wireless' => 'Wireless',
+        'squid' => "$Lang::tr{'web proxy'}",
+        'snort' => "$Lang::tr{'intrusion detection'}"
 	);
 
 
-- 
2.8.3


--===============7030123134140032973==--