From 561c753e40f6f94fc6eafea3a41865626331bf25 Mon Sep 17 00:00:00 2001
From: Ilia Rostovtsev <ilia@rostovtsev.io>
Date: Thu, 23 Apr 2020 23:16:36 +0300
Subject: [PATCH] Fix small bugs

---
 bin/language-manager | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/bin/language-manager b/bin/language-manager
index 3586a074a..507dbb55a 100755
--- a/bin/language-manager
+++ b/bin/language-manager
@@ -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 =~ /<|>/) {