=== modified file 'sites/all/modules/date/date_api_elements.inc'
--- sites/all/modules/date/date_api_elements.inc	2009-09-17 18:53:14 +0000
+++ sites/all/modules/date/date_api_elements.inc	2010-04-01 02:28:20 +0000
@@ -145,9 +145,10 @@
 
   $element['date']['#type'] = 'textfield';
   $element['date']['#weight'] = !empty($element['date']['#weight']) ? $element['date']['#weight'] : $element['#weight'];
-  $element['date']['#default_value'] = is_object($date) ? date_format($date , $element['#date_format']) : '';
+  // The displayed date needs to be valid in the active locale.
+  $element['date']['#default_value'] = is_object($date) ? date_format_date($date, 'custom' , $element['#date_format']) : '';
   $element['date']['#attributes'] = array('class' => (isset($element['#attributes']['class']) ? $element['#attributes']['class'] : '') .' date-date');
-  $element['date']['#description'] = ' '. t('Format: @date', array('@date' => date($element['#date_format'], time())));
+  $element['date']['#description'] = ' '. t('Format: @date', array('@date' => date_format_date(time(), 'custom', $element['#date_format'])));
   
   // Keep the system from creating an error message for the sub-element.
   // We'll set our own message on the parent element.

=== modified file 'sites/all/modules/date/date_popup/date_popup.module'
--- sites/all/modules/date/date_popup/date_popup.module	2009-09-17 18:53:14 +0000
+++ sites/all/modules/date/date_popup/date_popup.module	2010-04-01 01:30:49 +0000
@@ -244,7 +244,7 @@
   $id = date_popup_js_settings_id($element['#id'], 'datepicker', $settings);
   $sub_element = array(
     '#type' => 'textfield',
-    '#default_value' => (!empty($element['#value']['date']) || !empty($edit['date'])) && is_object($date) ? date_format($date, $date_format) : '',
+    '#default_value' => (!empty($element['#value']['date']) || !empty($edit['date'])) && is_object($date) ? date_format_date($date, 'custom', $date_format) : '',
     '#id' => $id,    
     '#size' => !empty($element['#size']) ? $element['#size'] : 20,
     '#maxlength' => !empty($element['#maxlength']) ? $element['#maxlength'] : 30,
@@ -256,7 +256,7 @@
     $sub_element['#value'] = $sub_element['#default_value'];
   }
   // TODO, figure out exactly when we want this description. In many places it is not desired.
-  $sub_element['#description'] = ' '. t('Format: @date', array('@date' => date($date_format, time())));
+  $sub_element['#description'] = ' '. t('Format: @date', array('@date' => date_format_date(time(), 'custom', $date_format)));
   return $sub_element;
 }