[PATCH] Fixed missing 'Captive' localization string for 'logs.dat' - Development

9 Jan 2018

Added 'Captive' localization string in 'de/en.pl'.
After a fresh install of Core 117, the system log shows a blank line
for 'Captive Portal' entries.
Deleted translation for 'Captive menu' and changed '30-network.menu' accordingly
to avoid duplicate translation strings.
Best,
Matthias
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org
---
 config/menu/30-network.menu | 4 ++--
 langs/de/cgi-bin/de.pl      | 2 +-
 langs/en/cgi-bin/en.pl      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/config/menu/30-network.menu b/config/menu/30-network.menu
index 137fd686c..9b27de872 100644
--- a/config/menu/30-network.menu
+++ b/config/menu/30-network.menu
@@ -23,9 +23,9 @@
    			 'title' => "$Lang::tr{'dhcp server'}",
    			 'enabled' => 1,
    			 };
-	$subnetwork->{'32.captive'} = {'caption' => $Lang::tr{'Captive menu'},
+	$subnetwork->{'32.captive'} = {'caption' => $Lang::tr{'Captive'},
    		        'uri' => '/cgi-bin/captive.cgi',
-			        'title' => $Lang::tr{'Captive menu'},
+			        'title' => $Lang::tr{'Captive'},
    		        'enabled' => 1,
    		        };
     $subnetwork->{'40.scheduler'} = {
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 7c1074edd..07bef906b 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -8,6 +8,7 @@
 'Add Rule' => 'Regel hinzufügen',
 'Add a route' => 'Eine Route hinzufügen',
 'Async logging enabled' => 'Aktiviere asynchrones Schreiben des Syslogs',
+'Captive' => 'Captive-Portal',
 'Captive 1day' => '1 Tag',
 'Captive 1month' => '1 Monat',
 'Captive 1week' => '1 Woche',
@@ -43,7 +44,6 @@
 'Captive logo_upload' => 'Logo hochladen',
 'Captive logo_upload1' => '(PNG, min. 1280x400, max. 1920x800)',
 'Captive mac' => 'MAC-Adresse',
-'Captive menu' => 'Captive-Portal',
 'Captive noexpiretime' => 'Es wurde kein gültiger Verbindungszeitraum angegeben',
 'Captive nolimit' => 'Unbegrenzt',
 'Captive nr' => 'Nummer',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 3940d7b7c..a22c4b566 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -8,6 +8,7 @@
 'Add Rule' => 'Add rule',
 'Add a route' => 'Add a route',
 'Async logging enabled' => 'Enable asynchronous writing of the syslog file',
+'Captive' => 'Captive Portal',
 'Captive 1day' => '1 day',
 'Captive 1month' => '1 month',
 'Captive 1week' => '1 week',
@@ -42,7 +43,6 @@
 'Captive logo uploaded' => 'Logo uploaded',
 'Captive logo_set' => 'Current Logo',
 'Captive mac' => 'MAC Address',
-'Captive menu' => 'Captive Portal',
 'Captive noexpiretime' => 'No valid connection time range given',
 'Captive nolimit' => 'unlimited',
 'Captive nr' => 'Number',
-- 
2.15.1


    