[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 7ec83993e54034cfa5620fb24bec24e6f630d7a6

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 7ec83993e54034cfa5620fb24bec24e6f630d7a6

[Michael Tremer]

[-- 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