Index: openacs-4/packages/xowiki/tcl/form-field-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/form-field-procs.tcl,v
diff -u -r1.284.2.120 -r1.284.2.121
--- openacs-4/packages/xowiki/tcl/form-field-procs.tcl	9 Sep 2020 10:23:20 -0000	1.284.2.120
+++ openacs-4/packages/xowiki/tcl/form-field-procs.tcl	22 Sep 2020 10:32:06 -0000	1.284.2.121
@@ -534,7 +534,7 @@
     #
     return [xo::escape_message_keys $value]
   }
-  
+
   FormField instproc render_input {} {
     #
     # This is the most general widget content renderer.
@@ -2132,7 +2132,7 @@
     #
     return xowiki-$object_id-formfield-${:name}
   }
-  
+
   localized_text instproc convert_to_internal {} {
     set value [:value]
     #
@@ -2142,7 +2142,7 @@
     #:log "localized_text sees <$value>"
     if {![regexp [lang::util::message_key_regexp] $value]} {
       set object_id  [${:object} item_id]
-      set package_id [${:object} package_id]      
+      set package_id [${:object} package_id]
       #
       # Try to get the desired locale first from a form parameter with
       # a name suffix "__locale" or get the locale as specified by the user.
@@ -2181,8 +2181,8 @@
       }
     }
   }
-  
 
+
   ###########################################################
   #
   # ::xowiki::formfield::correct_when
@@ -5075,6 +5075,9 @@
   Class create label -superclass FormField -parameter {
     {disableOutputEscaping:boolean false}
   }
+  label instproc pretty_value {v} {
+    return [expr {${:disableOutputEscaping} ? $v : [next]}]
+  }
   label instproc render_item {} {
     # sanity check; required and label do not fit well together
     if {${:required}} {set :required false}