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.8 -r1.8.2.1 --- openacs-4/packages/acs-templating/catalog/acs-templating.en_US.ISO-8859-1.xml 12 Mar 2004 13:45:33 -0000 1.8 +++ openacs-4/packages/acs-templating/catalog/acs-templating.en_US.ISO-8859-1.xml 25 Mar 2004 14:40:26 -0000 1.8.2.1 @@ -1,6 +1,12 @@ - + + 12-Hour + 24-Hour + Day + %label% is required + %label% is %excess_no_bytes% characters too long. + %label% is one character too long. Invalid choice Invalid currency Invalid decimal number @@ -10,11 +16,16 @@ Invalid keyword Invalid natural number Invalid url + Meridian + Minutes + Month Next >> No %row_pretty_plural%. << Previous required + Seconds Spellcheck Invalid number of arguments to tag handler. Error in parameter list + Year 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.27 -r1.27.2.1 --- openacs-4/packages/acs-templating/tcl/date-procs.tcl 26 Jan 2004 15:39:46 -0000 1.27 +++ openacs-4/packages/acs-templating/tcl/date-procs.tcl 25 Mar 2004 14:40:26 -0000 1.27.2.1 @@ -51,17 +51,17 @@ # Forward lookup array set fragment_widgets { - YYYY {dateFragment year 4 Year} - YY {dateFragment short_year 2 Year} - MM {dateFragment month 2 Month} - MON {monthFragment month short Month} - MONTH {monthFragment month long Month} - DD {dateFragment day 2 Day} - HH12 {dateFragment short_hours 2 {12-Hour}} - HH24 {dateFragment hours 2 {24-Hour}} - MI {dateFragment minutes 2 Minutes} - SS {dateFragment seconds 2 Seconds} - AM {ampmFragment ampm 2 Meridian} + YYYY {dateFragment year 4 [_ acs-templating.Year]} + YY {dateFragment short_year 2 [_ acs-templating.Year]} + MM {dateFragment month 2 [_ acs-templating.Month]} + MON {monthFragment month short [_ acs-templating.Month]} + MONTH {monthFragment month long [_ acs-templating.Month]} + DD {dateFragment day 2 [_ acs-templating.Day]} + HH12 {dateFragment short_hours 2 {[_ acs-templating.12-Hour]}} + HH24 {dateFragment hours 2 {[_ acs-templating.24-Hour]}} + MI {dateFragment minutes 2 [_ acs-templating.Minutes]} + SS {dateFragment seconds 2 [_ acs-templating.Seconds]} + AM {ampmFragment ampm 2 [_ acs-templating.Meridian]} } # Reverse lookup 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 -r1.24 -r1.24.2.1 --- openacs-4/packages/acs-templating/tcl/element-procs.tcl 26 Jan 2004 15:39:46 -0000 1.24 +++ openacs-4/packages/acs-templating/tcl/element-procs.tcl 25 Mar 2004 14:40:26 -0000 1.24.2.1 @@ -396,8 +396,8 @@ if { ! $is_inform && ! $is_optional && ! [llength $values] } { # no value was submitted for a required element - set formerror($element_id) "$label is required" - set formerror($element_id:required) "$label is required" + set formerror($element_id) [_ acs-templating.Element_is_required] + set formerror($element_id:required) [_ acs-templating.Element_is_required] if { [lsearch -exact {hidden submit} $element(widget)] > -1 } { ns_log Warning "template::element::validate: No value for hidden/submit element $label" @@ -442,7 +442,11 @@ set value_bytelength [string bytelength $value] if { $value_bytelength > $element(maxlength) } { set excess_no_bytes [expr { $value_bytelength - $element(maxlength) }] - set message "$label is [ad_decode $excess_no_bytes "1" "one character" "$excess_no_bytes characters"] too long." + if { $excess_no_bytes == 1 } { + set message [_ acs-templating.Element_is_too_long_Singular] + } else { + set message [_ acs-templating.Element_is_too_long_Plural] + } lappend v_errors $message set formerror($element_id:maxlength) $message }