From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: Aw: Re:  [PATCH] Fix hardcoded strings in pppsetup.cgi
Date: Tue, 02 Jun 2015 22:01:18 +0200
Message-ID: <1433275278.3370.273.camel@ipfire.org>
In-Reply-To: <op.xzmb0movcahio0@honk.fritz.box>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4738198605194859481=="
List-Id: <development.lists.ipfire.org>

--===============4738198605194859481==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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.
>=20
> 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(-)
>=20
> 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=3D'4' width=3D'100%' bgcolor=3D'$color{'color20'}'><b=
>$Lang::tr{'pptp settings'}</b></td>
>   </tr>
>   <tr>
> -        <td width=3D'25%'>Peer</td>
> +        <td width=3D'25%'>$Lang::tr{'pptp peer'}:</td>
>           <td colspan=3D'3'><input size=3D50 type=3D'text' name=3D'PPTP_PEE=
R' value=3D'$pppsettings{'PPTP_PEER'}' /></td>
>   </tr>
>   <tr>
> -        <td width=3D'25%'>My Netconfig</td>
> +        <td width=3D'25%'>$Lang::tr{'pptp netconfig'}:</td>
>           <td colspan=3D'3'><input size=3D50 type=3D'text' name=3D'PPTP_NIC=
CFG' value=3D'$pppsettings{'PPTP_NICCFG'}' /></td>
>   </tr>
>   <tr>
> -        <td width=3D'25%'>PPTP Route&nbsp;<img src=3D'/blob.gif' alt=3D'*'=
 /></td>
> +        <td width=3D'25%'>$Lang::tr{'pptp route'}:&nbsp;<img src=3D'/blob.=
gif' alt=3D'*' /></td>
>           <td colspan=3D'3'><input size=3D50 type=3D'text' name=3D'PPTP_ROU=
TE' value=3D'$pppsettings{'PPTP_ROUTE'}' /></td>
>   </tr>
>=20
> 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' =3D> 'PPP-Einstellungen',
>   'pppoe' =3D> 'PPPoE',
>   'pppoe settings' =3D> 'Zus=C3=A4tzliche PPPoE-Einstellungen:',
> +'pptp netconfig' =3D> 'Eigene Netzkonfiguration',
> +'pptp peer' =3D> 'Gegenstelle',
> +'pptp route' =3D> 'PPTP Route',
>   'pptp settings' =3D> 'Zus=C3=A4tzliche PPTP-Einstellungen:',
>   'pre-shared key is too short' =3D> 'Pre-shared Schl=C3=BCsel ist zu kurz',
>   'prefered master' =3D> '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' =3D> 'PPP setup',
>   'pppoe' =3D> 'PPPoE',
>   'pppoe settings' =3D> 'Additional PPPoE settings:',
> +'pptp netconfig' =3D> 'My Netconfig',
> +'pptp peer' =3D> 'Peer',
> +'pptp route' =3D> 'PPTP Route',
>   'pptp settings' =3D> 'Additional PPTP settings:',
>   'pre-shared key is too short' =3D> 'Pre-shared key is too short.',
>   'prefered master' =3D> 'Prefered Master',

--===============4738198605194859481==
Content-Type: application/pgp-signature
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="signature.asc"
MIME-Version: 1.0

LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KVmVyc2lvbjogR251UEcgdjIKCmlRSWNCQUFC
Q2dBR0JRSlZiZ3VSQUFvSkVJQjU4UDl2a0FrSHg0OFAvQTUxRDVCbi8weEFIbmlUZGkrZUMxc1QK
Vnlwa0dNbHh3TVRuMFpETUJRQlBERkRQVmZIa2NDZ1hjTWYvaU5pZGtJeGl0VERoVVhiclZ1cUdG
bW52QVJPcwpUV2syZGhneTB5STZ6bk93dEFNR3N5NWhHVlhlUFhZTitFUVo0NFpUMFpzRGZqMUZl
NTlOWGpIVllsTlFhRHQrCklwUmFtTWxBWWlONHVQbjM2akFha2J6ZEltZjZaeWJUWW5PaXZ0NUor
OERDNWlZSU11cm1OUVpQRTNTanJmKzcKV2wyeVY2YURkNTBBRjhrTktiM0Y5N1ZZMDRKZlNpbEg0
RHRqcjh5OUV3a1FnazQ5ek85ZlN2WVorSi95SnBEZQo3bnFabTBldlRqekxOOUJtNFVmYkNPSXNh
bmNUbHZ6RmdiZ1U4NlAvc3p4TVZsYlJndmdDUkdOY2NtR3pqOERCCjZuSDhRTU5Oa3pBcGhtRTNI
SlVjY0IzT1NkdGFZRy9TcTN0bWxtYTRxZFFtVjdnRjVVSlpoVEllQU41TmVkU04KUk8wQ0R5S1BP
dEp3bVQxNWgybk1Jd0ZBWXpRVDAzOHI1ZTc3aU9xNnk5ODhKbnp1M1JRbm9BRk1PVmZRTEFZQgpE
ZU8zbnRSa005Vm9UcXdXRXFJY3hIMTJWaERsRWFmRXJGR2Y3WHpVQTFFZ2Yzc2pja1pZVFJFRmZm
S2wzZ25SCjNMZkZtNVdxeUc2Ri9weXVXYWxBNkExUldrdnFZc0FIcGdCQVozSE5wLzBjdzdVNGRs
S1RYYmRFZ1Iyak9nL0QKU3loeFkwUzdzcGJZbmxpTC9LZ3BpbWZ0cythSlJKNEJmZFNVN1JDeVRu
SVZjMW1QZTY4OFF3QWV3WXc5K1piUwppZjZHYXNva3p3dExmWGNKQXllYQo9USsyNQotLS0tLUVO
RCBQR1AgU0lHTkFUVVJFLS0tLS0K

--===============4738198605194859481==--