fw-groups: fix language strings

This commit is contained in:
Alexander Marx
2014-09-05 08:12:44 +02:00
parent 3928f52b39
commit d8cc443938
3 changed files with 5 additions and 7 deletions

View File

@@ -293,7 +293,6 @@ if ($fwhostsettings{'ACTION'} eq 'savenet' )
if($fwhostsettings{'error'} ne 'on'){ if($fwhostsettings{'error'} ne 'on'){
my $fullip="$fwhostsettings{'IP'}/".&General::iporsubtocidr($fwhostsettings{'SUBNET'}); my $fullip="$fwhostsettings{'IP'}/".&General::iporsubtocidr($fwhostsettings{'SUBNET'});
$errormessage=$errormessage.&General::checksubnets($fwhostsettings{'HOSTNAME'},$fullip,""); $errormessage=$errormessage.&General::checksubnets($fwhostsettings{'HOSTNAME'},$fullip,"");
if ($fwhostsettings{'update'} eq 'on'){$fwhostsettings{'ACTION'}='editnet';}
} }
#only check plausi when no error till now #only check plausi when no error till now
if (!$errormessage){ if (!$errormessage){
@@ -310,9 +309,8 @@ if ($fwhostsettings{'ACTION'} eq 'savenet' )
$customnetwork{$key}[3] = $fwhostsettings{'orgnetremark'}; $customnetwork{$key}[3] = $fwhostsettings{'orgnetremark'};
&General::writehasharray("$confignet", \%customnetwork); &General::writehasharray("$confignet", \%customnetwork);
undef %customnetwork; undef %customnetwork;
} }
if (!$errormessage){ if (!$errormessage){
&General::readhasharray("$confignet", \%customnetwork); &General::readhasharray("$confignet", \%customnetwork);
if ($fwhostsettings{'ACTION'} eq 'updatenet'){ if ($fwhostsettings{'ACTION'} eq 'updatenet'){
if ($fwhostsettings{'update'} == '0'){ if ($fwhostsettings{'update'} == '0'){
@@ -364,7 +362,7 @@ if ($fwhostsettings{'ACTION'} eq 'savenet' )
&General::writehasharray("$fwconfiginp", \%fwinp); &General::writehasharray("$fwconfiginp", \%fwinp);
} }
} }
} }
my $key = &General::findhasharraykey (\%customnetwork); my $key = &General::findhasharraykey (\%customnetwork);
foreach my $i (0 .. 3) { $customnetwork{$key}[$i] = "";} foreach my $i (0 .. 3) { $customnetwork{$key}[$i] = "";}
$fwhostsettings{'SUBNET'} = &General::iporsubtocidr($fwhostsettings{'SUBNET'}); $fwhostsettings{'SUBNET'} = &General::iporsubtocidr($fwhostsettings{'SUBNET'});
@@ -388,7 +386,7 @@ if ($fwhostsettings{'ACTION'} eq 'savenet' )
} }
&addnet; &addnet;
&viewtablenet; &viewtablenet;
}else { }else{
$fwhostsettings{'HOSTNAME'} = $fwhostsettings{'orgname'}; $fwhostsettings{'HOSTNAME'} = $fwhostsettings{'orgname'};
&addnet; &addnet;
&viewtablenet; &viewtablenet;

View File

@@ -1111,7 +1111,7 @@
'fwhost err remark' => 'Ungültige Bemerkung. Erlaubte Zeichen: Klein- und Großbuchstaben, Bindestrich, Unterstrich, Runde Klammern, Semikolon, Punkt.', 'fwhost err remark' => 'Ungültige Bemerkung. Erlaubte Zeichen: Klein- und Großbuchstaben, Bindestrich, Unterstrich, Runde Klammern, Semikolon, Punkt.',
'fwhost err srv exists' => 'Ein Service mit diesem Namen existiert bereits', 'fwhost err srv exists' => 'Ein Service mit diesem Namen existiert bereits',
'fwhost err srvexist' => 'Dieser Dienst ist bereits in der Gruppe', 'fwhost err srvexist' => 'Dieser Dienst ist bereits in der Gruppe',
'fwhost err sub32' => 'Bitte einen einzelnen Host hinzufügen, keine Netzwerke', 'fwhost err sub32' => 'Bitte Netzwerke hinzufügen, keinen einzelnen Host',
'fwhost green' => 'Grün', 'fwhost green' => 'Grün',
'fwhost hint' => 'Hinweis', 'fwhost hint' => 'Hinweis',
'fwhost hosts' => 'Firewall-Hosts', 'fwhost hosts' => 'Firewall-Hosts',

View File

@@ -1138,7 +1138,7 @@
'fwhost err remark' => 'Invalid remark. Allowed characters: Upper- and lowercase letters, digits, space, dash, braces, semicolon, pipe and dot.', 'fwhost err remark' => 'Invalid remark. Allowed characters: Upper- and lowercase letters, digits, space, dash, braces, semicolon, pipe and dot.',
'fwhost err srv exists' => 'A service with the same name already exists', 'fwhost err srv exists' => 'A service with the same name already exists',
'fwhost err srvexist' => 'This service already exists in the group', 'fwhost err srvexist' => 'This service already exists in the group',
'fwhost err sub32' => 'Please add a single host, not a network.', 'fwhost err sub32' => 'Please add a network, not a single host',
'fwhost green' => 'Green', 'fwhost green' => 'Green',
'fwhost hint' => 'Note', 'fwhost hint' => 'Note',
'fwhost hosts' => 'Firewall Hosts', 'fwhost hosts' => 'Firewall Hosts',