michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-06-23 04:20:32 +01:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Fix small bugs

Browse Source
This commit is contained in:
Ilia Rostovtsev
2020-04-23 23:16:36 +03:00
parent d0591c4400
commit 561c753e40
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
bin/language-manager
View File

@@ -54,6 +54,7 @@ sub main
'keys-test|kt:s' => \$opt{'keys-test'},
'values-fix|vf:s' => \$opt{'values-fix'},
'values-fix-delimiter|vfd:s' => \$opt{'values-fix-delimiter'},
'translate-format|tf:s' => \$opt{'translate-format'},
'git-commit|gc!' => \$opt{'git-commit'},
'log|l:s' => \$opt{'log'},
'verbose|v:i' => \$opt{'verbose'});
@@ -84,7 +85,7 @@ sub main
$data{'type'} = $type;
# Set default format to text
$opt{'translate-format'} = 'text';
$opt{'translate-format'} ||= 'text';
# Force HTML format for "module" type translates
if (defined($opt{'type'}) && $opt{'type'} =~ /module|help/) {
@@ -525,6 +526,8 @@ sub source_data
$language_source = $opt->{'language-source'};
$type = $data->{'type'};
$target_help = '';
if ($type eq 'config' || $type eq 'uconfig' || $type eq 'module') {
$language_source = $language_source ne 'en' ? "$type.info.$language_source" : "$type.info";
}
@@ -593,7 +596,9 @@ sub translate_substitute
# Preserve path in strings
elsif ($format eq 'html') {
$value =~ s/(?:(^(\/[\w+].*?),|^(\/[\w+].*?)\.|(\/[\w+].*?) |(\/[\w+].*?)$))/<span translate="no">"$1"<\/span>/g;
$value =~ s/<tt>/<tt translate="no">/gm;
$value =~
s/(?:(^(?<!<)(\/[\w+].*?),|^(?<!<)(\/[\w+].*?)\.|(?<!<)(\/[\w+].*?) |(?<!<)(\/[\w+].*?)$))/<span translate="no">"$1"<\/span>/g;
}
return $value;
@@ -672,6 +677,8 @@ sub translated_substitute
# Remove any escapes as returned by translator, when run in HTML mode
$translated =~ s/&quot;//gi;
$translated =~ s/&#39;/'/gi;
$translated =~ s/<tt translate="no">/<tt>/gm;
}
# Restore destroyed tags
@@ -747,6 +754,13 @@ sub translated_substitute
$translated =~ s/[ ]*%[ ]*/ % /g;
$translated =~ s/[ ]*٪[ ]*/ ٪ /g;
}
# If original string contains `${VAR}`, fix the output
if ($original =~ /\$\{/ || $original =~ /\{\$/) {
$translated =~ s/\$ \{/\${/g;
$translated =~ s/\{\$ /{\$/g;
$translated =~ s/\.\.\. /.../g;
}
# If original value on template file contained escaped HTML entities, do the same on translated string
if ($original =~ /&lt;|&gt;/ && $original !~ /<|>/ && $translated =~ /<|>/) {