From mboxrd@z Thu Jan 1 00:00:00 1970 From: Adolf Belka To: development@lists.ipfire.org Subject: Re: [PATCH 1/2] procy.cgi: Fix bug#12701 - remove advproxy wpad notice line Date: Sun, 12 Mar 2023 12:55:26 +0100 Message-ID: <92343807-b452-df20-ebc1-d1be76b6820e@ipfire.org> In-Reply-To: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5131922209037174404==" List-Id: --===============5131922209037174404== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hi Peter, On 11/03/2023 17:39, Peter M=C3=BCller wrote: > Hello Adolf, >=20 > thank you for this patchset, and no worries whatsoever regarding the timeli= ne. :-) >=20 > While the first part of this patchset looks good to me, the changes made to= en.pl > in the second part look odd: Instead of removing a single translation, it s= eems to > bring back an older state of this file - perhaps thanks due to some orphane= d version > that was locally present during development. >=20 > Could you please double-check the second patch? If necessary, feel free to = just send > that one in - I'll merge the first part in due course, so there is no need = to resubmit > the entire series. Having looked closer at the language patch I see that there are several=20 lines removed and others added, which I did not specify. Normally I run git pull origin next before doing any patch coding work=20 so that I have the latest versions available. I suspect what happened here is that I used the language files I had=20 previously adjusted and as some time had passed since then, additional=20 changes had been implemented which were not in my language file=20 versions. I must have just used the old versions without re-doing them.=20 Basic error. Probably just used the old modified version also for the proxy.cgi file=20 but that didn't have any other changes in the intervening period. I will re-do the language files again and check them this time to make=20 sure they look correct. Regards, Adolf >=20 > Thanks, and best regards, > Peter M=C3=BCller >=20 >=20 >> - This line is no longer needed with the help button at the top of each WU= I page that was >> implemented by @Leo >> - Sorry for long time for me to get around to finalising this patch but it= is done now. >> >> Fixes: bug#12701 >> Tested-by: Adolf Belka >> Signed-off-by: Adolf Belka >> --- >> html/cgi-bin/proxy.cgi | 3 --- >> 1 file changed, 3 deletions(-) >> >> diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi >> index b4073343e..a718d5771 100644 >> --- a/html/cgi-bin/proxy.cgi >> +++ b/html/cgi-bin/proxy.cgi >> @@ -1421,9 +1421,6 @@ print <> >>   >> >> - >> - $Lang::tr{'advproxy wpad notice'} >> - >> >> =20 >>
--=20 Sent from my laptop --===============5131922209037174404==--