Allow use of _ as separator for custom language override
authorJamie Cameron <jcameron@webmin.com>
Sat, 15 Jan 2011 00:16:48 +0000 (16:16 -0800)
committerJamie Cameron <jcameron@webmin.com>
Sat, 15 Jan 2011 00:16:48 +0000 (16:16 -0800)
web-lib-funcs.pl

index c991cbc..d879235 100755 (executable)
@@ -4622,12 +4622,13 @@ $rv{'category'} = $module_categories{$_[0]}
 $rv{'realdesc'} = $rv{'desc'};
 my %descs;
 &read_file_cached("$config_directory/webmin.descs", \%descs);
-if ($descs{$_[0]." ".$current_lang}) {
-       $rv{'desc'} = $descs{$_[0]." ".$current_lang};
-       }
-elsif ($descs{$_[0]}) {
+if ($descs{$_[0]}) {
        $rv{'desc'} = $descs{$_[0]};
        }
+foreach my $o (@lang_order_list) {
+       my $ov = $descs{$_[0]." ".$o} || $descs{$_[0]."_".$o};
+       $rv{'desc'} = $ov if ($ov);
+       }
 
 if (!$_[2]) {
        # Apply per-user description overridde