Index: openacs-4/packages/acs-templating/acs-templating.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/acs-templating.info,v
diff -u -N -r1.66.2.2 -r1.66.2.3
--- openacs-4/packages/acs-templating/acs-templating.info	27 Mar 2019 17:54:24 -0000	1.66.2.2
+++ openacs-4/packages/acs-templating/acs-templating.info	25 Apr 2019 15:49:19 -0000	1.66.2.3
@@ -9,7 +9,7 @@
     <implements-subsite-p>f</implements-subsite-p>
     <inherit-templates-p>t</inherit-templates-p>
 
-    <version name="5.10.0d9" url="http://openacs.org/repository/download/apm/acs-templating-5.10.0d9.apm">
+    <version name="5.10.0d10" url="http://openacs.org/repository/download/apm/acs-templating-5.10.0d10.apm">
         <owner url="http://openacs.org">OpenACS</owner>
         <summary>Templating library.</summary>
         <release-date>2019-01-23</release-date>
@@ -27,7 +27,7 @@
         <license>GPL version 2</license>
         <maturity>3</maturity>
 
-        <provides url="acs-templating" version="5.10.0d9"/>
+        <provides url="acs-templating" version="5.10.0d10"/>
         <requires url="acs-kernel" version="5.9.1"/>
         <requires url="acs-tcl" version="5.10.0d8"/>
 
Index: openacs-4/packages/acs-templating/catalog/acs-templating.de_DE.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/catalog/acs-templating.de_DE.ISO-8859-1.xml,v
diff -u -N -r1.15 -r1.15.2.1
--- openacs-4/packages/acs-templating/catalog/acs-templating.de_DE.ISO-8859-1.xml	15 Jan 2019 13:55:35 -0000	1.15
+++ openacs-4/packages/acs-templating/catalog/acs-templating.de_DE.ISO-8859-1.xml	25 Apr 2019 15:49:19 -0000	1.15.2.1
@@ -68,11 +68,15 @@
   <msg key="Invalid_currency">Ung�ltige W�hrung</msg>
   <msg key="Invalid_decimal_number">Ung�ltige Dezimalzahl</msg>
   <msg key="Invalid_email_format">Ung�ltiges E-Mail-Format</msg>
+  <msg key="Invalid_enumeration">Ung�ltige Aufz�hlung</msg>  
+  <msg key="Invalid_enumeration_duplicate_elements">Ung�ltige Aufz�hlung. "%value%" enth�lt mehrfach vorkommende Elemente.</msg>  
   <msg key="Invalid_filename">Ung�ltiger Dateiname</msg>
   <msg key="Invalid_integer">Ung�ltiger ganzzahliger Wert</msg>
   <msg key="Invalid_keyword">Ung�ltiges Schl�sselwort</msg>
   <msg key="Invalid_natural_number">Ung�ltiger nat�rlicher Zahlenwert</msg>
+  <msg key="Invalid_number">Ung�ltige Zahl</msg>  
   <msg key="Invalid_url">Ung�ltige URL</msg>
+  <msg key="Invalid_url_element">Ung�ltige URL: "%value%". Bitte verwenden Sie nur Kleinbuchstaben, Ziffern und Bindestriche wie z.B.: "foo-bar".</msg>  
   <msg key="Link_Title">Link-Titel</msg>
   <msg key="lt_Checkuncheck_all_rows">Markieren aller Reihen/ Markierung aller Reihen entfernen</msg>
   <msg key="lt_Checkuncheck_this_row">Markieren Sie diese Spalte/ Entfernen Sie die Markierung und w�hlen Sie unten eine Aktion die durchgef�hrt werden soll</msg>
Index: openacs-4/packages/acs-templating/catalog/acs-templating.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/catalog/acs-templating.en_US.ISO-8859-1.xml,v
diff -u -N -r1.25 -r1.25.2.1
--- openacs-4/packages/acs-templating/catalog/acs-templating.en_US.ISO-8859-1.xml	15 Jan 2019 13:55:35 -0000	1.25
+++ openacs-4/packages/acs-templating/catalog/acs-templating.en_US.ISO-8859-1.xml	25 Apr 2019 15:49:19 -0000	1.25.2.1
@@ -69,11 +69,15 @@
   <msg key="Invalid_currency">Invalid currency</msg>
   <msg key="Invalid_decimal_number">Invalid decimal number</msg>
   <msg key="Invalid_email_format">Invalid email format</msg>
+  <msg key="Invalid_enumeration">Invalid enumeration</msg>
+  <msg key="Invalid_enumeration_duplicate_elements">Invalid enumeration. "%value%" does not contain unique values.</msg>
   <msg key="Invalid_filename">Invalid filename</msg>
   <msg key="Invalid_integer">Invalid integer</msg>
   <msg key="Invalid_keyword">Invalid keyword</msg>
-  <msg key="Invalid_natural_number">Invalid natural number </msg>
+  <msg key="Invalid_natural_number">Invalid natural number</msg>
+  <msg key="Invalid_number">Invalid number</msg>  
   <msg key="Invalid_url">Invalid url</msg>
+  <msg key="Invalid_url_element">Invalid url: "%value%". Please use only lowercase characters, numbers and hyphens, e.g. "foo-bar".</msg>
   <msg key="Link_Title">Link Title</msg>
   <msg key="lt_Checkuncheck_all_rows">Check/uncheck all rows</msg>
   <msg key="lt_Checkuncheck_this_row">Check/uncheck this row, and select an action to perform below</msg>
Index: openacs-4/packages/acs-templating/tcl/data-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/data-procs.tcl,v
diff -u -N -r1.23 -r1.23.2.1
--- openacs-4/packages/acs-templating/tcl/data-procs.tcl	7 Apr 2018 19:37:20 -0000	1.23
+++ openacs-4/packages/acs-templating/tcl/data-procs.tcl	25 Apr 2019 15:49:19 -0000	1.23.2.1
@@ -61,7 +61,7 @@
   set result [regexp {^[+-]?\d+$} $value]
 
   if { ! $result } {
-    set message "Invalid integer \"$value\""
+    set message "[_ acs-templating.Invalid_integer] \"[ns_quotehtml $value]\""
   }
    
   return $result 
@@ -88,7 +88,7 @@
     set result [regexp {^(0*)(([1-9][0-9]*|0))$} $value match zeros value]
 
     if { ! $result } {
-    set message "Invalid natural number \"$value\""
+    set message "[_ acs-templating.Invalid_natural_number] \"[ns_quotehtml $value]\""
     }
 
   return $result
@@ -113,7 +113,7 @@
   set result [regexp {^([+-]?)(?=\d|\.\d)\d*(\.\d*)?$} $value]
 
   if { ! $result } {
-    set message "Invalid decimal number \"$value\""
+    set message "[_ acs-templating.Invalid_decimal_number] \"[ns_quotehtml $value]\""
   }
    
   return $result 
@@ -153,7 +153,7 @@
       }
       default {
          set result 0
-         set message "Invalid choice \"$value\""
+         set message "[_ acs-templating.Invalid_choice] \"[ns_quotehtml $value]\""
       }
   }
 
@@ -207,7 +207,7 @@
   set result [regexp {^[a-zA-Z0-9_]+$} $value]
 
   if { ! $result } {
-    set message "Invalid keyword \"$value\""
+    set message "[_ acs-templating.Invalid_keyword] \"[ns_quotehtml $value]\""
   }
    
   return $result 
@@ -231,7 +231,7 @@
   set result [regexp {^[a-zA-Z0-9_-]+$} $value]
 
   if { ! $result } {
-    set message "Invalid filename \"$value\""
+    set message "[_ acs-templating.Invalid_filename] \"[ns_quotehtml $value]\""
   }
    
   return $result 
@@ -254,7 +254,7 @@
   set result [util_email_valid_p $value]
 
   if { ! $result } {
-    set message "Invalid email format \"$value\""
+     set message "[_ acs-templating.Invalid_email_format] \"[ns_quotehtml $value]\""
   }
    
   return $result 
@@ -279,7 +279,7 @@
   set result [regexp $expr $value]
 
   if { ! $result } {
-    set message "Invalid url \"$value\""
+    set message "[_ acs-templating.Invalid_url] \"[ns_quotehtml $value]\""
   }
    
   return $result 
@@ -311,7 +311,7 @@
     set result [regexp $expr $value]
 
     if { ! $result } {
-	set message "Invalid url \"$value\". Please use only lowercase characters, numbers and hyphens, e.g. \"foo-bar\"."
+        set message "[_ acs-templating.Invalid_url_element [list value [ns_quotehtml $value]]]"
     }
    
     return $result 
@@ -462,7 +462,7 @@
   set result [regexp {^([+-]?)(?=\d|\.\d)\d*(\.\d*)?$} $value]
 
   if { ! $result } {
-    set message "Invalid number \"$value\""
+    set message "[_ acs-templating.Invalid_number] \"[ns_quotehtml $value]\""
   }
    
   return $result 
@@ -486,7 +486,7 @@
   set result [regexp {^([A-z0-9]+,?)+$} $value]
   
   if { ! $result } {
-    set message "Invalid enumeration \"$value\""
+    set message "[_ acs-templating.Invalid_enumeration] \"[ns_quotehtml $value]\""
     return $result
   }
   
@@ -495,7 +495,7 @@
   set result [expr {[llength $list] == [llength [lsort -unique $list]]}]
   
   if { ! $result } {
-    set message "Invalid enumeration. \"$value\" does not contain unique values."
+    set message "[_ acs-templating.Invalid_enumeration_duplicate_elements [list value [ns_quotehtml $value]]]"
   }  
   
   return $result 
Index: openacs-4/packages/acs-templating/tcl/element-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/element-procs.tcl,v
diff -u -N -r1.37.2.1 -r1.37.2.2
--- openacs-4/packages/acs-templating/tcl/element-procs.tcl	25 Apr 2019 09:19:45 -0000	1.37.2.1
+++ openacs-4/packages/acs-templating/tcl/element-procs.tcl	25 Apr 2019 15:49:19 -0000	1.37.2.2
@@ -531,11 +531,12 @@
     foreach { v_name v_code v_message } $element(validate) {
 
       if { ! [eval $v_code] } {
-      
-	# value is invalid according to custom validation code
+
+        # value is invalid according to custom validation code
         # Do some expansion on $value, ${value}, $label, and ${label}
-	lappend v_errors [string map [list \$value $value \${value} $value \$label $label \${label} $label] $v_message]
-	set formerror($element_id:$v_name) [lindex $v_errors end]
+        set v_message [util::var_subst_quotehtml $v_message]
+        lappend v_errors $v_message
+        set formerror($element_id:$v_name) $v_message
       }
     }
   }