* [PATCH] log.dat: Added entry for 'guardian'
@ 2016-07-19 18:17 Matthias Fischer
2016-07-20 15:31 ` Michael Tremer
2016-07-28 17:49 ` Stefan Schantl
0 siblings, 2 replies; 3+ messages in thread
From: Matthias Fischer @ 2016-07-19 18:17 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 1014 bytes --]
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
---
html/cgi-bin/logs.cgi/log.dat | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/html/cgi-bin/logs.cgi/log.dat b/html/cgi-bin/logs.cgi/log.dat
index a8a7ba4..cf7d32d 100644
--- a/html/cgi-bin/logs.cgi/log.dat
+++ b/html/cgi-bin/logs.cgi/log.dat
@@ -67,7 +67,8 @@ my %sections = (
'pakfire' => '(pakfire:) ',
'wireless' => '(hostapd:|kernel: ath.*:|kernel: wifi[0-9]:) ',
'squid' => '(squid\[.*\]: |squid: )',
- 'snort' => '(snort\[.*\]: )'
+ 'snort' => '(snort\[.*\]: )',
+ 'guardian' => '(guardian\[.*\]: )'
);
# Translations for the %sections array.
@@ -90,7 +91,8 @@ my %trsections = (
'pakfire' => 'Pakfire',
'wireless' => 'Wireless',
'squid' => "$Lang::tr{'web proxy'}",
- 'snort' => "$Lang::tr{'intrusion detection'}"
+ 'snort' => "$Lang::tr{'intrusion detection'}",
+ 'guardian' => 'Guardian'
);
--
2.9.2
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] log.dat: Added entry for 'guardian'
2016-07-19 18:17 [PATCH] log.dat: Added entry for 'guardian' Matthias Fischer
@ 2016-07-20 15:31 ` Michael Tremer
2016-07-28 17:49 ` Stefan Schantl
1 sibling, 0 replies; 3+ messages in thread
From: Michael Tremer @ 2016-07-20 15:31 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 1321 bytes --]
@Stevee: Could you merge this into your guardian branch?
On Tue, 2016-07-19 at 20:17 +0200, Matthias Fischer wrote:
> Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
> ---
> html/cgi-bin/logs.cgi/log.dat | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/html/cgi-bin/logs.cgi/log.dat b/html/cgi-bin/logs.cgi/log.dat
> index a8a7ba4..cf7d32d 100644
> --- a/html/cgi-bin/logs.cgi/log.dat
> +++ b/html/cgi-bin/logs.cgi/log.dat
> @@ -67,7 +67,8 @@ my %sections = (
> 'pakfire' => '(pakfire:) ',
> 'wireless' => '(hostapd:|kernel: ath.*:|kernel: wifi[0-9]:) ',
> 'squid' => '(squid\[.*\]: |squid: )',
> - 'snort' => '(snort\[.*\]: )'
> + 'snort' => '(snort\[.*\]: )',
> + 'guardian' => '(guardian\[.*\]: )'
> );
>
> # Translations for the %sections array.
> @@ -90,7 +91,8 @@ my %trsections = (
> 'pakfire' => 'Pakfire',
> 'wireless' => 'Wireless',
> 'squid' => "$Lang::tr{'web proxy'}",
> - 'snort' => "$Lang::tr{'intrusion detection'}"
> + 'snort' => "$Lang::tr{'intrusion detection'}",
> + 'guardian' => 'Guardian'
> );
>
>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] log.dat: Added entry for 'guardian'
2016-07-19 18:17 [PATCH] log.dat: Added entry for 'guardian' Matthias Fischer
2016-07-20 15:31 ` Michael Tremer
@ 2016-07-28 17:49 ` Stefan Schantl
1 sibling, 0 replies; 3+ messages in thread
From: Stefan Schantl @ 2016-07-28 17:49 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 1415 bytes --]
Thanks for sending this patch.
Adjusted the entry on the translations section for using the translated
string from the selected language file instead of an hardcoded string.
Best regards,
-Stefan
> Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
> ---
> html/cgi-bin/logs.cgi/log.dat | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/html/cgi-bin/logs.cgi/log.dat b/html/cgi-
> bin/logs.cgi/log.dat
> index a8a7ba4..cf7d32d 100644
> --- a/html/cgi-bin/logs.cgi/log.dat
> +++ b/html/cgi-bin/logs.cgi/log.dat
> @@ -67,7 +67,8 @@ my %sections = (
> 'pakfire' => '(pakfire:) ',
> 'wireless' => '(hostapd:|kernel: ath.*:|kernel: wifi[0-9]:)
> ',
> 'squid' => '(squid\[.*\]: |squid: )',
> - 'snort' => '(snort\[.*\]: )'
> + 'snort' => '(snort\[.*\]: )',
> + 'guardian' => '(guardian\[.*\]: )'
> );
>
> # Translations for the %sections array.
> @@ -90,7 +91,8 @@ my %trsections = (
> 'pakfire' => 'Pakfire',
> 'wireless' => 'Wireless',
> 'squid' => "$Lang::tr{'web proxy'}",
> - 'snort' => "$Lang::tr{'intrusion detection'}"
> + 'snort' => "$Lang::tr{'intrusion detection'}",
> + 'guardian' => 'Guardian'
> );
>
>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-07-28 17:49 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-07-19 18:17 [PATCH] log.dat: Added entry for 'guardian' Matthias Fischer
2016-07-20 15:31 ` Michael Tremer
2016-07-28 17:49 ` Stefan Schantl
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox