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 -r1.12.2.5 -r1.12.2.6
--- openacs-4/packages/acs-templating/catalog/acs-templating.en_US.ISO-8859-1.xml	11 Nov 2005 21:10:17 -0000	1.12.2.5
+++ openacs-4/packages/acs-templating/catalog/acs-templating.en_US.ISO-8859-1.xml	27 Apr 2006 02:23:49 -0000	1.12.2.6
@@ -1,43 +1,18 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-templating" package_version="5.2.0b5" locale="en_US" charset="ISO-8859-1">
+<message_catalog package_key="acs-templating" package_version="5.2.2" locale="en_US" charset="ISO-8859-1">
 
   <msg key="12-Hour">12-Hour</msg>
   <msg key="24-Hour">24-Hour</msg>
   <msg key="CSV">CSV</msg>
   <msg key="data">data</msg>
   <msg key="Day">Day</msg>
+  <msg key="day">day</msg>
   <msg key="Element_is_required">%label% is required</msg>
   <msg key="Element_is_too_long_Plural">%label% is %excess_no_bytes% characters too long.</msg>
   <msg key="Element_is_too_long_Singular">%label% is one character too long.</msg>
   <msg key="Formats">Formats</msg>
-  <msg key="Invalid_choice">Invalid choice</msg>
-  <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_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_url">Invalid url</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>
-  <msg key="lt_When_specifying_a_non">When specifying a non-zero page_size, you must also provide either page_query or page_query_name</msg>
-  <msg key="Meridian">Meridian</msg>
-  <msg key="Minutes">Minutes</msg>
-  <msg key="Month">Month</msg>
-  <msg key="Next_with_arrow">Next &gt;&gt;</msg>
-  <msg key="No_row_pretty_plural">No %row_pretty_plural%.</msg>
-  <msg key="Page">Page</msg>
-  <msg key="Page_Size">Page Size</msg>
-  <msg key="Previous_with_arrow">&lt;&lt; Previous</msg>
-  <msg key="required">required</msg>
-  <msg key="Seconds">Seconds</msg>
-  <msg key="Sort_order">Sort order</msg>
-  <msg key="Spellcheck">Spellcheck</msg>
-  <msg key="Table">Table</msg>
-  <msg key="Tag_handler_invalid_number_of_args">Invalid number of arguments to tag handler.</msg>
-  <msg key="Template_parser_error_in_parameter_list">Error in parameter list</msg>
-  <msg key="Year">Year</msg>
+  <msg key="hours">hours</msg>
+  <msg key="Hours_must_be_between_0_and_23">Hours must be between 0 and 23</msg>
   <msg key="HTMLArea_action_cancel">Cancel</msg>
   <msg key="HTMLArea_ImageAlignment">Alignment</msg>
   <msg key="HTMLArea_ImageAlignmentBottom">Bottom</msg>
@@ -72,4 +47,44 @@
   <msg key="HTMLArea_SelectImageUploadTitle">Upload Image</msg>
   <msg key="HTMLArea_SelectUploadBtn">Upload</msg>
   <msg key="HTMLArea_SpecifyUploadFilename">Specify a File for Upload</msg>
+  <msg key="Invalid_choice">Invalid choice</msg>
+  <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_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_url">Invalid url</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>
+  <msg key="lt_Dates_must_be_formatted_">Dates must be formatted as: %format%</msg>
+  <msg key="lt_day_between_for_month_pretty">The day must be between 1 and %maxdays% for the month of %month_pretty%</msg>
+  <msg key="lt_No_value_supplied_for_-field_pretty-">No value supplied for %field_pretty%</msg>
+  <msg key="lt_The_-field_pretty-_must_be_non_negative">The %field_pretty% must be a non-negative integer</msg>
+  <msg key="lt_When_specifying_a_non">When specifying a non-zero page_size, you must also provide either page_query or page_query_name</msg>
+  <msg key="Meridian">Meridian</msg>
+  <msg key="Minutes">Minutes</msg>
+  <msg key="minutes">minutes</msg>
+  <msg key="Minutes_must_be_between_0_and_59">Minutes must be between 0 and 59</msg>
+  <msg key="Month">Month</msg>
+  <msg key="month">month</msg>
+  <msg key="Month_must_be_between_1_and_12">Month must be between 1 and 12</msg>
+  <msg key="Next_with_arrow">Next &gt;&gt;</msg>
+  <msg key="No_row_pretty_plural">No %row_pretty_plural%.</msg>
+  <msg key="Page">Page</msg>
+  <msg key="Page_Size">Page Size</msg>
+  <msg key="Previous_with_arrow">&lt;&lt; Previous</msg>
+  <msg key="required">required</msg>
+  <msg key="Seconds">Seconds</msg>
+  <msg key="seconds">seconds</msg>
+  <msg key="Seconds_must_be_between_0_and_59">Seconds must be between 0 and 59</msg>
+  <msg key="Sort_order">Sort order</msg>
+  <msg key="Spellcheck">Spellcheck</msg>
+  <msg key="Table">Table</msg>
+  <msg key="Tag_handler_invalid_number_of_args">Invalid number of arguments to tag handler.</msg>
+  <msg key="Template_parser_error_in_parameter_list">Error in parameter list</msg>
+  <msg key="Year">Year</msg>
+  <msg key="year">year</msg>
+  <msg key="Year_must_be_positive">Year must be positive</msg>
 </message_catalog>
Index: openacs-4/packages/acs-templating/tcl/date-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/date-procs.tcl,v
diff -u -r1.35.2.4 -r1.35.2.5
--- openacs-4/packages/acs-templating/tcl/date-procs.tcl	27 Apr 2006 00:17:41 -0000	1.35.2.4
+++ openacs-4/packages/acs-templating/tcl/date-procs.tcl	27 Apr 2006 02:23:49 -0000	1.35.2.5
@@ -714,73 +714,72 @@
   }
 
   variable fragment_formats
-
   upvar $error_ref error_msg
 
   unpack $date
 
-  set error_msg ""
-  set return_code 1
+  set error_msg [list]
 
   foreach {field exp} { year "YYYY|YY" month "MM|MON|MONTH" day "DD" 
                       hours "HH24|HH12" minutes "MI" seconds "SS" } {
 
     # If the field is required, but missing, report an error
     if {  [string equal [set $field] {}] } {
-      if { [regexp $exp $format match] } {
-        append error_msg "No value supplied for $field<br>"
-        set return_code 0
-      }
+	if { [regexp $exp $format match] } {
+	    set field_pretty [_ acs-templating.${field}]
+	    lappend error_msg [_ acs-templating.lt_No_value_supplied_for_-field_pretty-]
+	}
     } else {
-      # fields should only be integers
-      if { ![regexp {^[0-9]+$} [set $field] match] } {
-        append error_msg "The $field must be a non-negative integer<br>"  
-        set return_code 0
-        set $field {}
-      }
+	# fields should only be integers
+	if { ![regexp {^[0-9]+$} [set $field] match] } {
+	    set field_pretty [_ acs-templating.${field}]
+	    lappend error_msg [_ acs-templating.lt_The_-field_pretty-_must_be_non_negative]
+	    set $field {}
+	}
     }
   }
 
   if { [template::util::negative $year] } {
-    append error_msg "Year must be positive<br>"
-    set return_code 0
+      lappend error_msg [_ acs-templating.Year_must_be_positive]
   }
 
   if { ![string equal $month {}] } {
     if { $month < 1 || $month > 12 } {
-      append error_msg "Month must be between 1 and 12<br>"
-      set return_code 0
+	lappend error_msg [_ acs-templating.Month_must_be_between_1_and_12]
     } else {
       if { $year > 0 } { 
         if { ![string equal $day {}] } {
           set maxdays [get_property days_in_month $date]
           if { $day < 1 || $day > $maxdays } {
-            append error_msg "The day must be between 1 and $maxdays for "
-            append error_msg "the month of 
-                              [get_property long_month_name $date] <br>"
-            set return_code 0
+	      set month_pretty [template::util::date::get_property long_month_name $date]
+	      if { $month == "2" } {
+		  # February has a different number of days depending on the year
+		  append month_pretty " ${year}"
+	      }
+	      lappend error_msg [_ acs-templating.lt_day_between_for_month_pretty]
 	  }
         }
       }
     }
   }
 
   if { [template::util::negative $hours] || $hours > 23 } {
-    append error_msg "Hours must be between 0 and 23<br>"
-    set return_code 0
+      lappend error_msg [_ acs-templating.Hours_must_be_between_0_and_23]
   } 
 
   if { [template::util::negative $minutes] || $minutes > 59 } {
-    append error_msg "Minutes must be between 0 and 59<br>"
-    set return_code 0
+      lappend error_msg [_ acs-templating.Minutes_must_be_between_0_and_59]
   } 
 
   if { [template::util::negative $seconds] || $seconds > 59 } {
-    append error_msg "Seconds must be between 0 and 59<br>"
-    set return_code 0
+      lappend error_msg [_ acs-templating.Seconds_must_be_between_0_and_59]
   } 
-
-  return $return_code
+  if { [llength $error_msg] > 0 } {
+      set error_msg "[join $error_msg {<br />}]"
+      return 0
+  } else {
+      return 1
+  }
 }
 
 
@@ -1274,27 +1273,23 @@
 		set month [::string trimleft [lindex $datelist 1] 0]
 		set day   [::string trimleft [lindex $datelist 2] 0]
 		if { $month < 1 || $month > 12 } {
-		    lappend error_msg "Month must be between 1 and 12"
-		} else {
-		    
+		    lappend error_msg [_ acs-templating.Month_must_be_between_1_and_12]
+		} else {		    
 		    set maxdays [template::util::date::get_property days_in_month $datelist]
 		    if { $day < 1 || $day > $maxdays } {
+			set month_pretty [template::util::date::get_property long_month_name $datelist]
 			if { $month == "2" } {
-			    lappend error_msg "The day must be between 1 and $maxdays for the month of [template::util::date::get_property long_month_name $datelist] ${year}"
-			} else {
-			    lappend error_msg "The day must be between 1 and $maxdays for the month of [template::util::date::get_property long_month_name $datelist]"
+			    # February has a different number of days depending on the year
+			    append month_pretty " ${year}"
 			}
+			lappend error_msg [_ acs-templating.lt_day_between_for_month_pretty]
 		    }
 		}
-		# we do another check just in case the above stuff didn't catch a problem
-		if { [llength $error_msg] == "0"  } {
-		    lappend error_msg "The date specified is not valid"
-		}
 	    }
 	} else {
 	    # the textdate is not formatted properly
 	    set format [::string toupper [template::util::textdate_localized_format]]
-	    lappend error_msg "Dates must be formatted as: ${format}"
+	    lappend error_msg [_ acs-templating.lt_Dates_must_be_formatted_]
 	}
     }
     if { [llength $error_msg] > 0 } {