Index: openacs-4/packages/calendar/www/cal-item-new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/cal-item-new.adp,v
diff -u -r1.13 -r1.13.2.1
--- openacs-4/packages/calendar/www/cal-item-new.adp	22 Oct 2003 14:49:19 -0000	1.13
+++ openacs-4/packages/calendar/www/cal-item-new.adp	18 Nov 2003 13:16:18 -0000	1.13.2.1
@@ -16,28 +16,23 @@
 
 
 <script language="JavaScript">
-    function TimePChanged() {
+    function TimePChanged(elm) {
       var form_name = "cal_item";
-      var element_name = "time_p";
 
+      if (elm == null) return;
       if (document.forms == null) return;
       if (document.forms[form_name] == null) return;
-      if (document.forms[form_name].elements[element_name] == null) return;
 
-      if (document.forms[form_name].elements[element_name][0].checked) {
-          document.forms[form_name].elements["start_time.short_hours"].disabled = true;
-          document.forms[form_name].elements["start_time.minutes"].disabled = true;
-          document.forms[form_name].elements["start_time.ampm"].disabled = true;
-          document.forms[form_name].elements["end_time.short_hours"].disabled = true;
-          document.forms[form_name].elements["end_time.minutes"].disabled = true;
-          document.forms[form_name].elements["end_time.ampm"].disabled = true;
+      if (elm.value == 0) {
+          <multiple name="time_format_elms">
+            document.forms[form_name].elements["start_time.@time_format_elms.name@"].disabled = true;
+            document.forms[form_name].elements["end_time.@time_format_elms.name@"].disabled = true;
+          </multiple>
       } else {
-          document.forms[form_name].elements["start_time.short_hours"].disabled = false;
-          document.forms[form_name].elements["start_time.minutes"].disabled = false;
-          document.forms[form_name].elements["start_time.ampm"].disabled = false;
-          document.forms[form_name].elements["end_time.short_hours"].disabled = false;
-          document.forms[form_name].elements["end_time.minutes"].disabled = false;
-          document.forms[form_name].elements["end_time.ampm"].disabled = false;
+          <multiple name="time_format_elms">
+            document.forms[form_name].elements["start_time.@time_format_elms.name@"].disabled = false;
+            document.forms[form_name].elements["end_time.@time_format_elms.name@"].disabled = false;
+          </multiple>
       }
   }
 </script>
Index: openacs-4/packages/calendar/www/cal-item-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/cal-item-new.tcl,v
diff -u -r1.20 -r1.20.2.1
--- openacs-4/packages/calendar/www/cal-item-new.tcl	27 Oct 2003 13:04:42 -0000	1.20
+++ openacs-4/packages/calendar/www/cal-item-new.tcl	18 Nov 2003 13:16:18 -0000	1.20.2.1
@@ -76,7 +76,7 @@
 
     {time_p:text(radio)     
         {label "&nbsp;"}
-        {html {onchange "javascript:TimePChanged();"}} 
+        {html {onClick "javascript:TimePChanged(this);"}} 
         {options {{"[_ calendar.All_Day_Event]" 0}
                   {"[_ calendar.Use_Hours_Below]" 1} }}
     }
@@ -105,6 +105,35 @@
     {calendar_id:text(hidden) {value $calendar_id}}
 }
 
+
+#----------------------------------------------------------------------
+# LARS: Hack to make enable/disable time widgets work with i18n
+#----------------------------------------------------------------------
+
+set format_string [lc_get formbuilder_time_format]
+
+multirow create time_format_elms name
+
+while { ![empty_string_p $format_string] } {
+    # Snip off the next token
+    regexp {([^/\-.: ]*)([/\-.: ]*)(.*)} \
+          $format_string match word sep format_string
+    # Extract the trailing "t", if any
+    regexp -nocase $template::util::date::token_exp $word \
+          match token type
+
+    # Output the widget
+    set fragment_def $template::util::date::fragment_widgets([string toupper $token])
+
+    multirow append time_format_elms [lindex $fragment_def 1]
+}
+
+
+
+
+
+
+
 set cal_item_types [calendar::get_item_types -calendar_id $calendar_id]
 
 if {[llength $cal_item_types] > 1} {