Re: Aw: Re: [PATCH] Fix hardcoded strings in pppsetup.cgi

[Michael Tremer <michael.tremer@ipfire.org>]

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

Hi,

this patch looks okay, but it won't apply. Git error:

Applying: Aw: Re: [PATCH] Fix hardcoded strings in pppsetup.cgi
error: patch failed: html/cgi-bin/pppsetup.cgi:793
error: html/cgi-bin/pppsetup.cgi: patch does not apply
error: patch failed: langs/de/cgi-bin/de.pl:1822
error: langs/de/cgi-bin/de.pl: patch does not apply
error: patch failed: langs/en/cgi-bin/en.pl:1852
error: langs/en/cgi-bin/en.pl: patch does not apply
Patch failed at 0001 Aw: Re: [PATCH] Fix hardcoded strings in pppsetup.cgi

This is probably caused by copy-and-paste and replacing tabs by spaces
or similar.

-Michael

On Tue, 2015-06-02 at 21:49 +0200, Larsen wrote:
> Some strings for PPTP were hardcoded instead of using i18n features.
> 
> Signed-off-by: Lars Schuhmacher <larsen007(a)web.de>
> ---
>   html/cgi-bin/pppsetup.cgi | 6 +++---
>   langs/de/cgi-bin/de.pl    | 3 +++
>   langs/en/cgi-bin/en.pl    | 3 +++
>   3 files changed, 9 insertions(+), 3 deletions(-)
> 
> diff --git a/html/cgi-bin/pppsetup.cgi b/html/cgi-bin/pppsetup.cgi
> index 33f521e..59677a4 100644
> --- a/html/cgi-bin/pppsetup.cgi
> +++ b/html/cgi-bin/pppsetup.cgi
> @@ -793,15 +793,15 @@ print <<END
>           <td colspan='4' width='100%' bgcolor='$color{'color20'}'><b>$Lang::tr{'pptp settings'}</b></td>
>   </tr>
>   <tr>
> -        <td width='25%'>Peer</td>
> +        <td width='25%'>$Lang::tr{'pptp peer'}:</td>
>           <td colspan='3'><input size=50 type='text' name='PPTP_PEER' value='$pppsettings{'PPTP_PEER'}' /></td>
>   </tr>
>   <tr>
> -        <td width='25%'>My Netconfig</td>
> +        <td width='25%'>$Lang::tr{'pptp netconfig'}:</td>
>           <td colspan='3'><input size=50 type='text' name='PPTP_NICCFG' value='$pppsettings{'PPTP_NICCFG'}' /></td>
>   </tr>
>   <tr>
> -        <td width='25%'>PPTP Route&nbsp;<img src='/blob.gif' alt='*' /></td>
> +        <td width='25%'>$Lang::tr{'pptp route'}:&nbsp;<img src='/blob.gif' alt='*' /></td>
>           <td colspan='3'><input size=50 type='text' name='PPTP_ROUTE' value='$pppsettings{'PPTP_ROUTE'}' /></td>
>   </tr>
> 
> diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
> index 8adefdf..65277a9 100644
> --- a/langs/de/cgi-bin/de.pl
> +++ b/langs/de/cgi-bin/de.pl
> @@ -1822,6 +1822,9 @@
>   'ppp setup' => 'PPP-Einstellungen',
>   'pppoe' => 'PPPoE',
>   'pppoe settings' => 'Zusätzliche PPPoE-Einstellungen:',
> +'pptp netconfig' => 'Eigene Netzkonfiguration',
> +'pptp peer' => 'Gegenstelle',
> +'pptp route' => 'PPTP Route',
>   'pptp settings' => 'Zusätzliche PPTP-Einstellungen:',
>   'pre-shared key is too short' => 'Pre-shared Schlüsel ist zu kurz',
>   'prefered master' => 'Prefered Master',
> diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
> index 43601c8..3e60b00 100644
> --- a/langs/en/cgi-bin/en.pl
> +++ b/langs/en/cgi-bin/en.pl
> @@ -1852,6 +1852,9 @@
>   'ppp setup' => 'PPP setup',
>   'pppoe' => 'PPPoE',
>   'pppoe settings' => 'Additional PPPoE settings:',
> +'pptp netconfig' => 'My Netconfig',
> +'pptp peer' => 'Peer',
> +'pptp route' => 'PPTP Route',
>   'pptp settings' => 'Additional PPTP settings:',
>   'pre-shared key is too short' => 'Pre-shared key is too short.',
>   'prefered master' => 'Prefered Master',

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