]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
projects / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ba8a6d8)
header.pl: Fix language loading
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 21 Aug 2024 14:02:42 +0000 (16:02 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 21 Aug 2024 14:02:42 +0000 (16:02 +0200)
We have been importing the language files many times when they are
actually rather slow. This just tidies this up.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
config/cfgroot/header.pl patch | blob | blame | history
config/cfgroot/lang.pl patch | blob | blame | history

diff --git a/config/cfgroot/header.pl b/config/cfgroot/header.pl
index 45fe44a8e8fbcc669c4a3a9065690607b922c61a..a90a6f4817675fa00947f0266973b0a721a3d447 100644 (file)
--- a/config/cfgroot/header.pl
+++ b/config/cfgroot/header.pl
@@ -107,41 +107,11 @@ $hostname = $settings{'HOSTNAME'};
 
 ### Initialize language
 require "${swroot}/lang.pl";
-$language = &Lang::FindWebLanguage($settings{"LANGUAGE"});
-
-### Read English Files
-if ( -d "/var/ipfire/langs/en/" ) {
-    opendir(DIR, "/var/ipfire/langs/en/");
-    @names = readdir(DIR) or die "Cannot Read Directory: $!\n";
-    foreach $name(@names) {
-        next if ($name eq ".");
-        next if ($name eq "..");
-        next if (!($name =~ /\.pl$/));
-        require "${swroot}/langs/en/${name}";
-    };
-};
-
-
-### Enable Language Files
-if ( -d "/var/ipfire/langs/${language}/" ) {
-    opendir(DIR, "/var/ipfire/langs/${language}/");
-    @names = readdir(DIR) or die "Cannot Read Directory: $!\n";
-    foreach $name(@names) {
-        next if ($name eq ".");
-        next if ($name eq "..");
-        next if (!($name =~ /\.pl$/));
-        require "${swroot}/langs/${language}/${name}";
-    };
-};
 
 ### Initialize user manual
 my %manualpages = ();
 &_read_manualpage_hash("${General::swroot}/main/manualpages");
 
-### Load selected language and theme functions
-require "${swroot}/langs/en.pl";
-require "${swroot}/langs/${language}.pl";
-
 ###############################################################################
 #
 # print menu html elements for submenu entries
@@ -219,7 +189,7 @@ sub openpage {
 
 print <<END;
 <!DOCTYPE html>
-<html lang="$language">
+<html lang="$Lang::language">
        <head>
        <title>$headline - $title</title>
        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
diff --git a/config/cfgroot/lang.pl b/config/cfgroot/lang.pl
index f3fe4ed515c1c19701dfba826ead467d0dd81d6d..2c3b8bbaed889be3cb49cea5aec87a3de5cd0876 100644 (file)
--- a/config/cfgroot/lang.pl
+++ b/config/cfgroot/lang.pl
@@ -37,13 +37,14 @@ $Lang::CacheLang = '/var/ipfire/langs/cache-lang.pl';
 
 ### Initialize language
 %Lang::tr = ();
+
 my %settings = ();
 &General::readhash("${General::swroot}/main/settings", \%settings);
+
+# Load the selected language
 reload($settings{'LANGUAGE'});
 
-# language variable used by makegraphs script
-our $language;
-$language = $settings{'LANGUAGE'};
+our $language = $settings{'LANGUAGE'};
 
 #
 # Load requested language file from cachefile. If cachefile doesn't exist, build on the fly.
IPFire 2.x development tree