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

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

[Matthias Fischer]

[-- Attachment #1: Type: text/plain, Size: 2760 bytes --]

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(a)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

Re: [PATCH] Fixed missing 'Captive' localization string for 'logs.dat'

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 3188 bytes --]

Thank you.

On Tue, 2018-01-09 at 14:11 +0100, Matthias Fischer wrote:
> 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.

There should be a list with all missing strings that should find things like
this:

https://git.ipfire.org/?p=ipfire-2.x.git;a=blob;f=doc/language_issues.en;h=48a85d0036ab5d5346e8a8a34ef25d018bef2dfd;hb=HEAD

> 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(a)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',

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH] Fixed missing 'Captive' localization string for 'logs.dat'

[Matthias Fischer]

[-- Attachment #1: Type: text/plain, Size: 1474 bytes --]

Hi,

On 09.01.2018 15:59, Michael Tremer wrote:
> On Tue, 2018-01-09 at 14:11 +0100, Matthias Fischer wrote:
>> 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.
> There should be a list with all missing strings that should find things like
> this:
> 
> https://git.ipfire.org/?p=ipfire-2.x.git;a=blob;f=doc/language_issues.en;h=48a85d0036ab5d5346e8a8a34ef25d018bef2dfd;hb=HEAD
> 

Thanks, but beware.
'./make.sh lang' isn't working correctly, there are many strings marked
as 'unused', which in fact are used by addons or other files...

For the records/information:

I'm in the midst of optimizing the translation-files as formerly shown
in these commits:
https://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=7a6eb31d37a5d123e122b31ea23e3765a0214b4e

https://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=3e8b7fb79c4630b85ef8888759195f0a04c4fd98

https://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=dd41a88a4f8a8c2c4e8d326a152654017cb53918

https://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=8b185742955970b9bb575f0dfca1907212c76ece

This includes deleting unused and multiple strings, fixing typos, fixing
the corresponding CGIs, adding translations (where I can), and so on.

Current status:
The *.pl files shrinked from about 1.2 MB to 925 KB.

Best,
Matthias