Changeset 30562 for main/trunk/greenstone2

Timestamp:

2016-06-02T19:19:53+12:00 (8 years ago)

Author:

ak19

Message:

Another bugfix in gtil.pl: regex was too greedy, must only discard until first closing square bracket. Else existing translations like es [truncado] for en [truncated] will be marked as needing translating, since the regex removing the language portion like [l=es] is too greedy.

File:

• main/trunk/greenstone2/bin/script/gti.pl (modified) (1 diff)

main/trunk/greenstone2/bin/script/gti.pl

@@ -1422 +1422 @@
     $chunk_text =~ s/^\"//;
     $chunk_text =~ s/\"$//;
-}
-
-# No, so it must be a text macro
-else {
+    }
+
+    # No, so it must be a text macro
+    else {
     # Remove macro key
     $chunk_text =~ s/^_([^_]+)_(\s*)//;
     
     # Remove language specifier
-    $chunk_text =~ s/^\[l=.*\](\s*)//;
+    $chunk_text =~ s/^\[l=[^\]]*\](\s*)//; # only remove until first closing square bracket, ]
     
     # Remove braces enclosing text
     $chunk_text =~ s/^{(\s*)((.|\n)*)}(\s*)(\#.+\s*)?/$2/;
-}
-
-return $chunk_text;
+    }
+
+    return $chunk_text;
 }