diff mbox series

[1/4] BUG11559: Languagefiles

Message ID	1525260427-6695-1-git-send-email-alexander.marx@ipfire.org
State	Accepted
Commit	c07eea1d38de0334e79f531710e33f656dbd5f8c
Headers	From: Alexander Marx <alexander.marx@ipfire.org> To: development@lists.ipfire.org Subject: [PATCH 1/4] BUG11559: Languagefiles Date: Wed, 2 May 2018 13:27:04 +0200 Message-Id: <1525260427-6695-1-git-send-email-alexander.marx@ipfire.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: list Errors-To: development-bounces@lists.ipfire.org Sender: "Development" <development-bounces@lists.ipfire.org>
Series	[1/4] BUG11559: Languagefiles \| [1/4] BUG11559: Languagefiles [2/4] BUG11559: firewall.cgi [3/4] BUG11559: firewall-lib [4/4] BUG11559: fwhosts

Commit Message

Alexander Marx May 2, 2018, 9:27 p.m. UTC

  When creating firewallrules or using firewall groups,
it should be possible to select a single IpSec subnet if there is more than one.

This patch adds a new languagefileword "fwdfw all subnets" which is used in firewall.cgi and fwhosts.cgi
---
 langs/de/cgi-bin/de.pl | 1 +
 langs/en/cgi-bin/en.pl | 1 +
 2 files changed, 2 insertions(+)

Comments

Peter Müller May 7, 2018, 6:02 a.m. UTC | #1

Hello,

I have tested this patchset and can confirm it is working correctly.
It solves https://bugzilla.ipfire.org/show_bug.cgi?id=11559 by adding
the ability to select networks announced via IPsec N2N connections
for firewall rules or network groups.

Best regards,
Peter Müller

> When creating firewallrules or using firewall groups,
> it should be possible to select a single IpSec subnet if there is more than one.
> 
> This patch adds a new languagefileword "fwdfw all subnets" which is used in firewall.cgi and fwhosts.cgi
> ---
>  langs/de/cgi-bin/de.pl | 1 +
>  langs/en/cgi-bin/en.pl | 1 +
>  2 files changed, 2 insertions(+)
> 
> diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
> index 07bef90..9cc345a 100644
> --- a/langs/de/cgi-bin/de.pl
> +++ b/langs/de/cgi-bin/de.pl
> @@ -1065,6 +1065,7 @@
>  'fwdfw additional' => 'Weitere Einstellungen',
>  'fwdfw addrule' => 'Regel hinzufügen/ändern:',
>  'fwdfw all icmp' => 'Alle ICMP-Typen',
> +'fwdfw all subnets' => 'Alle Subnetze',
>  'fwdfw change' => 'Aktualisieren',
>  'fwdfw copy' => 'Kopieren',
>  'fwdfw delete' => 'Löschen',
> diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
> index a343b3b..60747f7 100644
> --- a/langs/en/cgi-bin/en.pl
> +++ b/langs/en/cgi-bin/en.pl
> @@ -1092,6 +1092,7 @@
>  'fwdfw additional' => 'Additional settings',
>  'fwdfw addrule' => 'Add/Edit rule:',
>  'fwdfw all icmp' => 'All ICMP types',
> +'fwdfw all subnets' => 'All subnets',
>  'fwdfw change' => 'Update',
>  'fwdfw copy' => 'Copy',
>  'fwdfw delete' => 'Delete',
>

Michael Tremer May 7, 2018, 8:41 p.m. UTC | #2

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

Hi Peter,

could you please add the appropriate tags to the patches?

Best,
- -Michael

On Sun, 2018-05-06 at 22:02 +0200, Peter Müller wrote:
> Hello,
> 
> I have tested this patchset and can confirm it is working correctly.
> It solves https://bugzilla.ipfire.org/show_bug.cgi?id=11559 by adding
> the ability to select networks announced via IPsec N2N connections
> for firewall rules or network groups.
> 
> Best regards,
> Peter Müller
> 
> > When creating firewallrules or using firewall groups,
> > it should be possible to select a single IpSec subnet if there is more than
> > one.
> > 
> > This patch adds a new languagefileword "fwdfw all subnets" which is used in
> > firewall.cgi and fwhosts.cgi
> > ---
> >  langs/de/cgi-bin/de.pl | 1 +
> >  langs/en/cgi-bin/en.pl | 1 +
> >  2 files changed, 2 insertions(+)
> > 
> > diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
> > index 07bef90..9cc345a 100644
> > --- a/langs/de/cgi-bin/de.pl
> > +++ b/langs/de/cgi-bin/de.pl
> > @@ -1065,6 +1065,7 @@
> >  'fwdfw additional' => 'Weitere Einstellungen',
> >  'fwdfw addrule' => 'Regel hinzufügen/ändern:',
> >  'fwdfw all icmp' => 'Alle ICMP-Typen',
> > +'fwdfw all subnets' => 'Alle Subnetze',
> >  'fwdfw change' => 'Aktualisieren',
> >  'fwdfw copy' => 'Kopieren',
> >  'fwdfw delete' => 'Löschen',
> > diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
> > index a343b3b..60747f7 100644
> > --- a/langs/en/cgi-bin/en.pl
> > +++ b/langs/en/cgi-bin/en.pl
> > @@ -1092,6 +1092,7 @@
> >  'fwdfw additional' => 'Additional settings',
> >  'fwdfw addrule' => 'Add/Edit rule:',
> >  'fwdfw all icmp' => 'All ICMP types',
> > +'fwdfw all subnets' => 'All subnets',
> >  'fwdfw change' => 'Update',
> >  'fwdfw copy' => 'Copy',
> >  'fwdfw delete' => 'Delete',
> > 
> 
> 
-----BEGIN PGP SIGNATURE-----

iQIzBAEBCgAdFiEE5/rW5l3GGe2ypktxgHnw/2+QCQcFAlrwLUUACgkQgHnw/2+Q
CQec0Q/5AVU4WGh5t4muhkqgQQaN8rZ6sHPMD1I9qPIQWcUV5XRqdFF+9nHAGGN3
USmQoH7eCioC1gW5O5k5IJm1VuD2QczrTQEcuhGszsltOkW33aASU1L+AwppYVGo
BWpTLVO9TlftVVZtBFmKUjPEXbG0AQLMx3PID3vcCeYH9lohqQPhJ2zMqFenvJ/L
JOHwWJwZvmrNCDI6EIzEXTvs5/bo8FLI2571LNn2wcCoed+dKjUVKD32/wK63h55
PY96I+i0/aZPH0IjK7ru1uRKhJWxOU4ng5OiXmjuYEb46G3Gmi3G8KKlclm6p3tU
DHR6EAKFkFmfv8s5YzbTAdekFmXeEHPZ6mCJPZYYIxMVpC9KW2P02K/uB5YD90VF
nTCfTMiVTvKlfUgyPkstjuBNBqxH+od8YkPk5HNo4f0dxhiQ5ssRTzP/VXy6lnA6
YmLFN1VLxwEdNPr9u36JI4S7bJf4sZ/O5nFxhCOyZvcEp4DMXMBY1NWM40SyN3wX
nE+ho22DCBWKqUCryLGf/2Ga8uwzpxN3mQ4ImYHIrCBFAllRsE6I/BzwjxFKCoES
wbmYIyLCuZ7Wk3Vkzgt/Gs6Ntog91FEC0Q5djzQXE+sL1ZA+roOhubQw2QyhcNWt
+MrV8Z82QmOKMqNPOmkn4hmTabQRJrvSNgLgK2SpDCQZ1eKl3Mc=
=JvSO
-----END PGP SIGNATURE-----

Peter Müller May 8, 2018, 2:22 a.m. UTC | #3

When creating firewallrules or using firewall groups,
it should be possible to select a single IpSec subnet if there is more than one.

This patch adds a new languagefileword "fwdfw all subnets" which is used in firewall.cgi and fwhosts.cgi
Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
Tested-by: Peter Müller <peter.mueller@link38.eu>
---
 langs/de/cgi-bin/de.pl | 1 +
 langs/en/cgi-bin/en.pl | 1 +
 2 files changed, 2 insertions(+)

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 07bef90..9cc345a 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -1065,6 +1065,7 @@
 'fwdfw additional' => 'Weitere Einstellungen',
 'fwdfw addrule' => 'Regel hinzufügen/ändern:',
 'fwdfw all icmp' => 'Alle ICMP-Typen',
+'fwdfw all subnets' => 'Alle Subnetze',
 'fwdfw change' => 'Aktualisieren',
 'fwdfw copy' => 'Kopieren',
 'fwdfw delete' => 'Löschen',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index a343b3b..60747f7 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -1092,6 +1092,7 @@
 'fwdfw additional' => 'Additional settings',
 'fwdfw addrule' => 'Add/Edit rule:',
 'fwdfw all icmp' => 'All ICMP types',
+'fwdfw all subnets' => 'All subnets',
 'fwdfw change' => 'Update',
 'fwdfw copy' => 'Copy',
 'fwdfw delete' => 'Delete',

Peter Müller May 8, 2018, 2:25 a.m. UTC | #4

Hello Michael,

done. I also added the missing "Signed-off-by..."-tags;
hope Alexander does not mind.

Best regards,
Peter Müller

> Hi Peter,
> 
> could you please add the appropriate tags to the patches?
> 
> Best,
> -Michael
> 
> On Sun, 2018-05-06 at 22:02 +0200, Peter Müller wrote:
>> Hello,
> 
>> I have tested this patchset and can confirm it is working correctly.
>> It solves https://bugzilla.ipfire.org/show_bug.cgi?id=11559 by adding
>> the ability to select networks announced via IPsec N2N connections
>> for firewall rules or network groups.
> 
>> Best regards,
>> Peter Müller
> 
>>> When creating firewallrules or using firewall groups,
>>> it should be possible to select a single IpSec subnet if there is more than
>>> one.
>>>
>>> This patch adds a new languagefileword "fwdfw all subnets" which is used in
>>> firewall.cgi and fwhosts.cgi
>>> ---
>>>  langs/de/cgi-bin/de.pl | 1 +
>>>  langs/en/cgi-bin/en.pl | 1 +
>>>  2 files changed, 2 insertions(+)
>>>
>>> diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
>>> index 07bef90..9cc345a 100644
>>> --- a/langs/de/cgi-bin/de.pl
>>> +++ b/langs/de/cgi-bin/de.pl
>>> @@ -1065,6 +1065,7 @@
>>>  'fwdfw additional' => 'Weitere Einstellungen',
>>>  'fwdfw addrule' => 'Regel hinzufügen/ändern:',
>>>  'fwdfw all icmp' => 'Alle ICMP-Typen',
>>> +'fwdfw all subnets' => 'Alle Subnetze',
>>>  'fwdfw change' => 'Aktualisieren',
>>>  'fwdfw copy' => 'Kopieren',
>>>  'fwdfw delete' => 'Löschen',
>>> diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
>>> index a343b3b..60747f7 100644
>>> --- a/langs/en/cgi-bin/en.pl
>>> +++ b/langs/en/cgi-bin/en.pl
>>> @@ -1092,6 +1092,7 @@
>>>  'fwdfw additional' => 'Additional settings',
>>>  'fwdfw addrule' => 'Add/Edit rule:',
>>>  'fwdfw all icmp' => 'All ICMP types',
>>> +'fwdfw all subnets' => 'All subnets',
>>>  'fwdfw change' => 'Update',
>>>  'fwdfw copy' => 'Copy',
>>>  'fwdfw delete' => 'Delete',
>>>
> 
> 
>

diff mbox series

Patch

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 07bef90..9cc345a 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -1065,6 +1065,7 @@ 
 'fwdfw additional' => 'Weitere Einstellungen',
 'fwdfw addrule' => 'Regel hinzufügen/ändern:',
 'fwdfw all icmp' => 'Alle ICMP-Typen',
+'fwdfw all subnets' => 'Alle Subnetze',
 'fwdfw change' => 'Aktualisieren',
 'fwdfw copy' => 'Kopieren',
 'fwdfw delete' => 'Löschen',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index a343b3b..60747f7 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -1092,6 +1092,7 @@ 
 'fwdfw additional' => 'Additional settings',
 'fwdfw addrule' => 'Add/Edit rule:',
 'fwdfw all icmp' => 'All ICMP types',
+'fwdfw all subnets' => 'All subnets',
 'fwdfw change' => 'Update',
 'fwdfw copy' => 'Copy',
 'fwdfw delete' => 'Delete',