From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 9 Mar 2015 23:04:55 +0000 (+0100)
Subject: lang.pl: Always fall back to English
X-Git-Tag: v2.17-core89~31
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=a71beeb2342c5dcc3c99c5523e74c3914b9cbee9;hp=42c545b1f5848767251cffc9ffb6d29b3cd7a4c3

lang.pl: Always fall back to English

Fixes #10769
---

diff --git a/config/cfgroot/lang.pl b/config/cfgroot/lang.pl
index 3b001ad9d4..c77e0a0665 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 0251b5d6b7..fb7073ee4e 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