Index: openacs-4/packages/xotcl-core/tcl/30-widget-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/30-widget-procs.tcl,v diff -u -r1.57.2.9 -r1.57.2.10 --- openacs-4/packages/xotcl-core/tcl/30-widget-procs.tcl 3 Oct 2016 13:29:18 -0000 1.57.2.9 +++ openacs-4/packages/xotcl-core/tcl/30-widget-procs.tcl 14 Oct 2016 18:58:53 -0000 1.57.2.10 @@ -226,12 +226,12 @@ # prevent such substitutions. # proc remove_escapes {text} { - regsub -all \x001# $text "#" text + regsub -all \x01# $text "#" text return $text } proc escape_message_keys {text} { - regsub -all {(\#[a-zA-Z0-9_:-]+\.[a-zA-Z0-9_:-]+)\#} $text "\\1\x001#" text + regsub -all {(\#[a-zA-Z0-9_:-]+\.[a-zA-Z0-9_:-]+)\#} $text "\\1\x01#" text return $text } @@ -247,21 +247,21 @@ if {![$obj exists __localizer]} { $obj set __localizer [list] } - if {[string first \x002 $text] == -1} { + if {[string first \x02 $text] == -1} { return $text } else { set return_text "" if {$inline} { # Attempt to move all message keys outside of tags - while { [regsub -all {(<[^>]*)(\x002\(\x001[^\x001]*\x001\)\x002)([^>]*>)} $text {\2\1\3} text] } {} + while { [regsub -all {(<[^>]*)(\x02\(\x01[^\x01]*\x01\)\x02)([^>]*>)} $text {\2\1\3} text] } {} # Attempt to move all message keys outside of statements - regsub -all -nocase {(]*>[^<]*)(\x002\(\x001[^\x001]*\x001\)\x002)([^<]*]*>)} $text {\2\1\3} text + regsub -all -nocase {(]*>[^<]*)(\x02\(\x01[^\x01]*\x01\)\x02)([^<]*]*>)} $text {\2\1\3} text - while { [regsub -all -nocase {(]*>[^<]*)(\x002\(\x001[^\x001]*\x001\)\x002)} $text {\2\1} text] } {} + while { [regsub -all -nocase {(]*>[^<]*)(\x02\(\x01[^\x01]*\x01\)\x02)} $text {\2\1} text] } {} } - while {[regexp {^([^\x002]*)\x002\(\x001([^\x001]*)\x001\)\x002(.*)$} $text _ \ + while {[regexp {^([^\x02]*)\x02\(\x01([^\x01]*)\x01\)\x02(.*)$} $text _ \ before key text]} { append return_text $before lassign [split $key .] package_key message_key