Index: app/helpers/application_helper.rb
===================================================================
--- app/helpers/application_helper.rb   (revision 3629)
+++ app/helpers/application_helper.rb   (working copy)
@@ -661,7 +661,7 @@
   def calendar_for(field_id)
     include_calendar_headers_tags
     image_tag("calendar.png", {:id => "#{field_id}_trigger",:class => "calendar-trigger"}) +
-    javascript_tag("Calendar.setup({inputField : '#{field_id}', ifFormat : '%Y-%m-%d', button : '#{field_id}_trigger' });")
+    javascript_tag("Calendar.setup({inputField : '#{field_id}', ifFormat : '#{Setting.date_format}', button : '#{field_id}_trigger' });")
   end

   def include_calendar_headers_tags