ICAL: validate & fix recurrence and conflict checking.

[citadel.git] / webcit / static / t / ical / attachment / display_conflict.html

diff --git a/webcit/static/t/ical/attachment/display_conflict.html b/webcit/static/t/ical/attachment/display_conflict.html
index 47fb42aed8415931f217f8aa1fd1d0f876e7cc3e..b6e285297e7cdbc82be588d867b6eadc323b8185 100644 (file)
--- a/webcit/static/t/ical/attachment/display_conflict.html
+++ b/webcit/static/t/ical/attachment/display_conflict.html
@@ -1,7 +1,7 @@
 <dt>
-<??("ICAL:CONFLICT:IS:UPDATE", 30)><?_("Update:"  )><??("X", 30)>
+<?!("ICAL:CONFLICT:IS:UPDATE", 30)><?_("Update:"  )><??("X", 30)>
 <??("ICAL:CONFLICT:IS:UPDATE", 40)><?_("CONFLICT:")><??("X", 40)>
 </dt><dd>
-<??("ICAL:CONFLICT:IS:UPDATE", 10)><?_("This is an update of"          )> '<?ICAL:CONFLICT:SUMMARY("X")>' <?_("which is already in your calendar.")><??("X", 10)>
-<?!("ICAL:CONFLICT:IS:UPDATE", 20)><?_("This event would conflict with")> '<?ICAL:CONFLICT:SUMMARY("X")>' <?_("which is already in your calendar.")><?!("X", 20)>
+<?!("ICAL:CONFLICT:IS:UPDATE", 10)><?_("This is an update of"          )> '<?ICAL:CONFLICT:SUMMARY("X")>' <?_("which is already in your calendar.")><??("X", 10)>
+<??("ICAL:CONFLICT:IS:UPDATE", 20)><?_("This event would conflict with")> '<?ICAL:CONFLICT:SUMMARY("X")>' <?_("which is already in your calendar.")><?!("X", 20)>
 </dd>