Hi Peter,
On 11/03/2023 17:39, Peter Müller wrote:
Hello Adolf,
thank you for this patchset, and no worries whatsoever regarding the timeline. :-)
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 seems to bring back an older state of this file - perhaps thanks due to some orphaned version that was locally present during development.
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 lines removed and others added, which I did not specify.
Normally I run git pull origin next before doing any patch coding work so that I have the latest versions available.
I suspect what happened here is that I used the language files I had previously adjusted and as some time had passed since then, additional changes had been implemented which were not in my language file versions. I must have just used the old versions without re-doing them. Basic error.
Probably just used the old modified version also for the proxy.cgi file 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 sure they look correct.
Regards, Adolf
Thanks, and best regards, Peter Müller
- This line is no longer needed with the help button at the top of each WUI 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 adolf.belka@ipfire.org Signed-off-by: Adolf Belka adolf.belka@ipfire.org
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 <<END
<tr> <td colspan="4"> </td> </tr> -<tr> - <td colspan="4">$Lang::tr{'advproxy wpad notice'}</td> -</tr> </table>
<hr size='1'>