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, master has been updated via a71beeb2342c5dcc3c99c5523e74c3914b9cbee9 (commit) from 42c545b1f5848767251cffc9ffb6d29b3cd7a4c3 (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 a71beeb2342c5dcc3c99c5523e74c3914b9cbee9 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Mar 10 00:04:55 2015 +0100

lang.pl: Always fall back to English

Fixes #10769

-----------------------------------------------------------------------

Summary of changes: config/cfgroot/lang.pl | 3 +++ config/rootfiles/core/88/filelists/files | 1 + 2 files changed, 4 insertions(+)

Difference in files: diff --git a/config/cfgroot/lang.pl b/config/cfgroot/lang.pl index 3b001ad..c77e0a0 100644 --- a/config/cfgroot/lang.pl +++ b/config/cfgroot/lang.pl @@ -169,6 +169,9 @@ sub FindWebLanguage() { my ($language, $country) = split(/_/, $shortlang); push(@options, $language);

+ # Add English as fallback + push(@options, "en"); + foreach my $option (@options) { return $option if (-e "${General::swroot}/langs/$option.pl"); } diff --git a/config/rootfiles/core/88/filelists/files b/config/rootfiles/core/88/filelists/files index 0251b5d..fb7073e 100644 --- a/config/rootfiles/core/88/filelists/files +++ b/config/rootfiles/core/88/filelists/files @@ -4,3 +4,4 @@ srv/web/ipfire/cgi-bin/fwhosts.cgi srv/web/ipfire/cgi-bin/ovpnmain.cgi var/ipfire/backup/bin/backup.pl var/ipfire/langs +var/ipfire/lang.pl

hooks/post-receive -- IPFire 2.x development tree