Item12391: Better Maketext fix

git-svn-id: http://svn.foswiki.org/trunk@16535 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
foswiki · Feb 13, 2013 · b674a61 · b674a61
1 parent 2f42e93
commit b674a61
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 2 deletions.
diff --git a/UnitTestContrib/test/unit/Fn_MAKETEXT.pm b/UnitTestContrib/test/unit/Fn_MAKETEXT.pm
@@ -140,6 +140,28 @@ sub test_escaping {
         ' This \\\'.`echo A`.\\\'  1 \\\'.`echo A`.\\\'  ', $result );
 }
 
+sub test_escaping_brackets {
+    my $this = shift;
+
+    # Make sure the real Locale::Maketext gets called
+    $Foswiki::cfg{UserInterfaceInternationalisation} = 1;
+
+    my $str = ' %MAKETEXT{"~~[quant,4,singular,plural~~]"}% ';
+
+    my $result = $topicObject->expandMacros($str);
+    $this->assert_str_equals( ' [quant,4,singular,plural] ', $result );
+
+    $str = ' %MAKETEXT{"~~~[quant,4,singular,plural~~~]"}% ';
+
+    $result = $topicObject->expandMacros($str);
+    $this->assert_str_equals( ' [quant,4,singular,plural] ', $result );
+
+    $str = ' %MAKETEXT{"~~~~[quant,4,singular,plural~~~]"}% ';
+
+    $result = $topicObject->expandMacros($str);
+    $this->assert_str_equals( ' [quant,4,singular,plural] ', $result );
+}
+
 sub test_invalid_args {
     my $this = shift;
 

diff --git a/core/lib/Foswiki/Macros/MAKETEXT.pm b/core/lib/Foswiki/Macros/MAKETEXT.pm
@@ -17,8 +17,8 @@ sub MAKETEXT {
     $str =~ s/\]/~]/g;
 
     # restore already escaped stuff:
-    $str =~ s/~~\[/~[/g;
-    $str =~ s/~~\]/~]/g;
+    $str =~ s/~~+\[/~[/g;
+    $str =~ s/~~+\]/~]/g;
 
     my $max         = 0;
     my $min         = 1;