From: Michael Tremer <git@ipfire.org>
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 7ec83993e54034cfa5620fb24bec24e6f630d7a6
Date: Thu, 24 Jan 2019 12:13:07 +0000 [thread overview]
Message-ID: <20190124121308.1EF0184FDD4@people01.i.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 2158 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via 7ec83993e54034cfa5620fb24bec24e6f630d7a6 (commit)
from 75936b067f3e4ef057d7ecf37e32733467dd3a23 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 7ec83993e54034cfa5620fb24bec24e6f630d7a6
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Jan 23 06:21:53 2019 +0000
proxy: Show error messages in English by default
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/core/128/filelists/files | 1 +
html/cgi-bin/proxy.cgi | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
Difference in files:
diff --git a/config/rootfiles/core/128/filelists/files b/config/rootfiles/core/128/filelists/files
index 0be9432b5..007c06ab7 100644
--- a/config/rootfiles/core/128/filelists/files
+++ b/config/rootfiles/core/128/filelists/files
@@ -3,4 +3,5 @@ etc/issue
srv/web/ipfire/cgi-bin/credits.cgi
var/ipfire/langs
etc/sysctl.conf
+srv/web/ipfire/cgi-bin/proxy.cgi
usr/local/bin/xt_geoip_update
diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi
index 0bf72fed2..9082a7994 100644
--- a/html/cgi-bin/proxy.cgi
+++ b/html/cgi-bin/proxy.cgi
@@ -188,7 +188,7 @@ $proxysettings{'TRANSPARENT_PORT'} = '3128';
$proxysettings{'VISIBLE_HOSTNAME'} = '';
$proxysettings{'ADMIN_MAIL_ADDRESS'} = '';
$proxysettings{'ADMIN_PASSWORD'} = '';
-$proxysettings{'ERR_LANGUAGE'} = 'German';
+$proxysettings{'ERR_LANGUAGE'} = 'en';
$proxysettings{'ERR_DESIGN'} = 'ipfire';
$proxysettings{'SUPPRESS_VERSION'} = 'off';
$proxysettings{'FORWARD_VIA'} = 'off';
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2019-01-24 12:13 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20190124121308.1EF0184FDD4@people01.i.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@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