From mboxrd@z Thu Jan  1 00:00:00 1970
From: Larsen <larsen007@web.de>
To: development@lists.ipfire.org
Subject: Re: Aw: Re:  [PATCH] Fix hardcoded strings in pppsetup.cgi
Date: Tue, 02 Jun 2015 21:49:24 +0200
Message-ID: <op.xzmb0movcahio0@honk.fritz.box>
In-Reply-To: <op.xzlkw2ewcahio0@atl-uetersen.atlantisgmbh.local>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7734125773555317336=="
List-Id: <development.lists.ipfire.org>

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

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=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_PEER'=
 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_NICCF=
G' 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.gi=
f' alt=3D'*' /></td>
          <td colspan=3D'3'><input size=3D50 type=3D'text' name=3D'PPTP_ROUTE=
' value=3D'$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' =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',

--===============7734125773555317336==--