lang.pl: Always fall back to English
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 9 Mar 2015 23:04:55 +0000 (00:04 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 9 Mar 2015 23:06:12 +0000 (00:06 +0100)
Fixes #10769

config/cfgroot/lang.pl
config/rootfiles/core/88/filelists/files

index 3b001ad..c77e0a0 100644 (file)
@@ -169,6 +169,9 @@ sub FindWebLanguage() {
        my ($language, $country) = split(/_/, $shortlang);
        push(@options, $language);
 
        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");
        }
        foreach my $option (@options) {
                return $option if (-e "${General::swroot}/langs/$option.pl");
        }
index 0251b5d..fb7073e 100644 (file)
@@ -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
 srv/web/ipfire/cgi-bin/ovpnmain.cgi
 var/ipfire/backup/bin/backup.pl
 var/ipfire/langs
+var/ipfire/lang.pl