From: "Peter Müller" <peter.mueller@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH 1/2] procy.cgi: Fix bug#12701 - remove advproxy wpad notice line
Date: Sat, 11 Mar 2023 16:39:36 +0000 [thread overview]
Message-ID: <eb3cc490-ea41-7a80-3d1a-c7734088b69c@ipfire.org> (raw)
In-Reply-To: <20230214130847.3939253-1-adolf.belka@ipfire.org>
[-- Attachment #1: Type: text/plain, Size: 1439 bytes --]
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.
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(a)ipfire.org>
> Signed-off-by: Adolf Belka <adolf.belka(a)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'>
next prev parent reply other threads:[~2023-03-11 16:39 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-14 13:08 Adolf Belka
2023-02-14 13:08 ` [PATCH 2/2] Language files: Fixes bug#12701 - Line removed from proxy.cgi no longer needed in lang files Adolf Belka
2023-03-11 16:39 ` Peter Müller [this message]
2023-03-12 11:55 ` [PATCH 1/2] procy.cgi: Fix bug#12701 - remove advproxy wpad notice line Adolf Belka
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=eb3cc490-ea41-7a80-3d1a-c7734088b69c@ipfire.org \
--to=peter.mueller@ipfire.org \
--cc=development@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox