From mboxrd@z Thu Jan 1 00:00:00 1970 From: Larsen To: development@lists.ipfire.org Subject: Re: Aw: [PATCH] Fix hardcoded strings in pppsetup.cgi Date: Tue, 02 Jun 2015 08:58:40 +0200 Message-ID: In-Reply-To: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6581974692291347674==" List-Id: --===============6581974692291347674== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hi Bernhard, so this means that "'pptp netconfig' =3D> ''," should be missing completely = instead of setting an empty string? Lars On Mon, 01 Jun 2015 23:57:08 +0200, Bernhard Bitsch =20 wrote: > Language files should contain translations only. > The process for building the language cache for the language =20 > desired is > - read en.pl files ( the base definition ) > - read .pl files ( replacing english terms ) > --> all translated strings appear in , untranslated strings are in =20 > english > --> to find untranslated strings, computed the complement of set of keys =20 > in en.pl and set of keys in .pl > > Hope, I could clarify a bit. > > -Bernhard > >> Gesendet: Montag, 01. Juni 2015 um 22:59 Uhr >> Von: Larsen >> An: "development(a)lists.ipfire.org" >> Betreff: [PATCH] Fix hardcoded strings in pppsetup.cgi >> >> Some strings for PPTP were hardcoded instead of using i18n features. >> >> Signed-off-by: Lars Schuhmacher >> --- >> html/cgi-bin/pppsetup.cgi | 6 +++--- >> langs/de/cgi-bin/de.pl | 3 +++ >> langs/en/cgi-bin/en.pl | 3 +++ >> langs/es/cgi-bin/es.pl | 3 +++ >> langs/fr/cgi-bin/fr.pl | 3 +++ >> langs/it/cgi-bin/it.pl | 3 +++ >> langs/nl/cgi-bin/nl.pl | 3 +++ >> langs/pl/cgi-bin/pl.pl | 3 +++ >> langs/ru/cgi-bin/ru.pl | 3 +++ >> langs/tr/cgi-bin/tr.pl | 3 +++ >> 10 files changed, 30 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 <> > bgcolor=3D'$color{'color20'}'>$Lang::tr{'pptp settings'} >> >> >> - Peer >> + $Lang::tr{'pptp peer'}: >> > value=3D'$pppsettings{'PPTP_PEER'}' /> >> >> >> - My Netconfig >> + $Lang::tr{'pptp netconfig'}: >> > value=3D'$pppsettings{'PPTP_NICCFG'}' /> >> >> >> - PPTP Route 3D'*'> /> >> + $Lang::tr{'pptp route'}: > src=3D'/blob.gif' alt=3D'*' /> >> > value=3D'$pppsettings{'PPTP_ROUTE'}' /> >> >> >> 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', >> diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl >> index 90f4237..1e315a6 100644 >> --- a/langs/es/cgi-bin/es.pl >> +++ b/langs/es/cgi-bin/es.pl >> @@ -1417,6 +1417,9 @@ >> 'ppp setup' =3D> 'Configuraci=C3=B3n PPP', >> 'pppoe' =3D> 'PPPoe', >> 'pppoe settings' =3D> 'Configuraciones PPPoE adicionales', >> +'pptp netconfig' =3D> '', >> +'pptp peer' =3D> '', >> +'pptp route' =3D> '', >> 'pptp settings' =3D> 'Configuracion PPTP adicionales', >> 'pre-shared key is too short' =3D> 'La clave pre-compartida es demasiado >> corta.', >> 'prefered master' =3D> 'Master preferido', >> diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl >> index 40053a0..384cc05 100644 >> --- a/langs/fr/cgi-bin/fr.pl >> +++ b/langs/fr/cgi-bin/fr.pl >> @@ -1423,6 +1423,9 @@ >> 'ppp setup' =3D> 'Installation PPP', >> 'pppoe' =3D> 'PPPoE', >> 'pppoe settings' =3D> 'Param=C3=A8tres suppl=C3=A9mentaires PPPoE :', >> +'pptp netconfig' =3D> '', >> +'pptp peer' =3D> '', >> +'pptp route' =3D> '', >> 'pptp settings' =3D> 'Param=C3=A8tres suppl=C3=A9mentaires PPTP :', >> 'pre-shared key is too short' =3D> 'La clef partag=C3=A9e pr=C3=A9limina= ire est =20 >> trop >> courte.', >> 'prefered master' =3D> 'Ma=C3=AEtre pr=C3=A9f=C3=A9r=C3=A9', >> diff --git a/langs/it/cgi-bin/it.pl b/langs/it/cgi-bin/it.pl >> index 4fde313..050bffd 100644 >> --- a/langs/it/cgi-bin/it.pl >> +++ b/langs/it/cgi-bin/it.pl >> @@ -1808,6 +1808,9 @@ >> 'ppp setup' =3D> 'PPP setup', >> 'pppoe' =3D> 'PPPoE', >> 'pppoe settings' =3D> 'Additional PPPoE settings:', >> +'pptp netconfig' =3D> '', >> +'pptp peer' =3D> '', >> +'pptp route' =3D> '', >> 'pptp settings' =3D> 'Additional PPTP settings:', >> 'pre-shared key is too short' =3D> 'Pre-shared key is too short.', >> 'prefered master' =3D> 'Prefered Master', >> diff --git a/langs/nl/cgi-bin/nl.pl b/langs/nl/cgi-bin/nl.pl >> index 7468eb9..46b07d4 100644 >> --- a/langs/nl/cgi-bin/nl.pl >> +++ b/langs/nl/cgi-bin/nl.pl >> @@ -1760,6 +1760,9 @@ >> 'ppp setup' =3D> 'PPP setup', >> 'pppoe' =3D> 'PPPoE', >> 'pppoe settings' =3D> 'Extra PPPoE instellingen:', >> +'pptp netconfig' =3D> '', >> +'pptp peer' =3D> '', >> +'pptp route' =3D> '', >> 'pptp settings' =3D> 'Extra PPTP instellingen:', >> 'pre-shared key is too short' =3D> 'Pre-shared sleutel is te kort.', >> 'prefered master' =3D> 'Voorkeur master', >> diff --git a/langs/pl/cgi-bin/pl.pl b/langs/pl/cgi-bin/pl.pl >> index 02fb531..894a562 100644 >> --- a/langs/pl/cgi-bin/pl.pl >> +++ b/langs/pl/cgi-bin/pl.pl >> @@ -1429,6 +1429,9 @@ >> 'ppp setup' =3D> 'Konfiguracja PPP', >> 'pppoe' =3D> 'PPPoE', >> 'pppoe settings' =3D> 'Dodatkowe ustawienia PPPoE:', >> +'pptp netconfig' =3D> '', >> +'pptp peer' =3D> '', >> +'pptp route' =3D> '', >> 'pptp settings' =3D> 'Dodatkowe ustawienia PPTP:', >> 'pre-shared key is too short' =3D> 'Klucz wsp=C3=B3=C5=82dzielony jest z= a =20 >> kr=C3=B3tki.', >> 'prefered master' =3D> 'Preferowany Master', >> diff --git a/langs/ru/cgi-bin/ru.pl b/langs/ru/cgi-bin/ru.pl >> index a2a3693..6754b1d 100644 >> --- a/langs/ru/cgi-bin/ru.pl >> +++ b/langs/ru/cgi-bin/ru.pl >> @@ -1424,6 +1424,9 @@ >> 'ppp setup' =3D> '=D0=9D=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B9=D0=BA=D0=B8= PPP', >> 'pppoe' =3D> 'PPPoE', >> 'pppoe settings' =3D> '=D0=94=D0=BE=D0=BF=D0=BE=D0=BB=D0=BD=D0=B8=D1=82= =D0=B5=D0=BB=D1=8C=D0=BD=D1=8B=D0=B5 =D0=BD=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0= =B9=D0=BA=D0=B8 PPPoE:', >> +'pptp netconfig' =3D> '', >> +'pptp peer' =3D> '', >> +'pptp route' =3D> '', >> 'pptp settings' =3D> '=D0=94=D0=BE=D0=BF=D0=BE=D0=BB=D0=BD=D0=B8=D1=82= =D0=B5=D0=BB=D1=8C=D0=BD=D1=8B=D0=B5 =D0=BD=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0= =B9=D0=BA=D0=B8 PPTP:', >> 'pre-shared key is too short' =3D> 'Pre-shared key is too short.', >> 'prefered master' =3D> 'Prefered Master', >> diff --git a/langs/tr/cgi-bin/tr.pl b/langs/tr/cgi-bin/tr.pl >> index 89f753e..ced4fd8 100644 >> --- a/langs/tr/cgi-bin/tr.pl >> +++ b/langs/tr/cgi-bin/tr.pl >> @@ -1829,6 +1829,9 @@ >> 'ppp setup' =3D> 'PPP kurulumu', >> 'pppoe' =3D> 'PPPoE', >> 'pppoe settings' =3D> 'Ek PPPoE ayarlar=C4=B1:', >> +'pptp netconfig' =3D> '', >> +'pptp peer' =3D> '', >> +'pptp route' =3D> '', >> 'pptp settings' =3D> 'Ek PPTP ayarlar=C4=B1:', >> 'pre-shared key is too short' =3D> '=C3=96n payla=C5=9F=C4=B1ml=C4=B1 an= ahtar =C3=A7ok k=C4=B1sa.', >> 'prefered master' =3D> 'Tercih edilen y=C3=B6netici', --===============6581974692291347674==--