Allow per-language custom lang files

diff --git a/CHANGELOG b/CHANGELOG
index b13d6c6..4e7fde2 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -139,3 +139,4 @@ Sped up the loading of language files by pre-caching them in memory when Webmin
 Added support for Pardus Linux, thanks to Kaan Ozdincer.
 Major Dutch updates, thanks to Gandyman.
 Majoe French translation update, thanks to ButterflyOfFire.
+Allow per-language language overrides to be defined, in custom-lang-$code files.

diff --git a/web-lib-funcs.pl b/web-lib-funcs.pl
index 7ffb60c..c991cbc 100755 (executable)
--- a/web-lib-funcs.pl
+++ b/web-lib-funcs.pl
@@ -4443,6 +4443,10 @@ if ($ol) {
                }
        }
 &read_file_cached("$config_directory/custom-lang", \%text);
+foreach my $o (@lang_order_list) {
+       next if ($o eq "en");
+       &read_file_cached("$config_directory/custom-lang-$o", \%text);
+       }
 my $norefs = $text{'__norefs'};
 
 if ($_[0]) {
@@ -4458,6 +4462,11 @@ if ($_[0]) {
                        }
                }
        &read_file_cached("$config_directory/$_[0]/custom-lang", \%text);
+       foreach my $o (@lang_order_list) {
+               next if ($o eq "en");
+               &read_file_cached("$config_directory/$_[0]/custom-lang-$o",
+                                 \%text);
+               }
        $norefs = $text{'__norefs'} if ($norefs);
        }