Index: date_api_sql.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/date/date_api_sql.inc,v
retrieving revision 1.9.2.3.2.36
diff -u -r1.9.2.3.2.36 date_api_sql.inc
--- date_api_sql.inc	3 May 2009 15:37:16 -0000	1.9.2.3.2.36
+++ date_api_sql.inc	16 Jun 2009 17:07:42 -0000
@@ -654,33 +654,33 @@
     return true;
   }
 
-  function views_formats($granularity, $type = 'sql') {
+  function views_formats($granularity, $type = 'sql', $custom_format = NULL) {
     $formats = array('display', 'sql');
     // Start with the site long date format and add seconds to it
-    $long = str_replace(':i', ':i:s', variable_get('date_format_long',  'l, F j, Y - H:i'));
+    $format = isset($custom_format) ? $custom_format : str_replace(':i', ':i:s', variable_get('date_format_long',  'l, F j, Y - H:i'));
     switch ($granularity) {
       case('year'):
         $formats['display'] = 'Y';
         $formats['sql'] = 'Y';
         break;
       case('month'):
-        $formats['display'] = date_limit_format($long, array('year', 'month'));
+        $formats['display'] = date_limit_format($format, array('year', 'month'));
         $formats['sql'] = 'Y-m';
         break;
       case('day'):
-        $formats['display'] = date_limit_format($long, array('year', 'month', 'day'));
+        $formats['display'] = date_limit_format($format, array('year', 'month', 'day'));
         $formats['sql'] = 'Y-m-d';
         break;
       case('hour'):
-        $formats['display'] = date_limit_format($long, array('year', 'month', 'day', 'hour'));
+        $formats['display'] = date_limit_format($format, array('year', 'month', 'day', 'hour'));
         $formats['sql'] = 'Y-m-d\TH';
         break;
       case('minute'):
-        $formats['display'] = date_limit_format($long, array('year', 'month', 'day', 'hour', 'minute'));
+        $formats['display'] = date_limit_format($format, array('year', 'month', 'day', 'hour', 'minute'));
         $formats['sql'] = 'Y-m-d\TH:i';
         break;
       case('second'):
-        $formats['display'] = date_limit_format($long, array('year', 'month', 'day', 'hour', 'minute', 'second'));
+        $formats['display'] = date_limit_format($format, array('year', 'month', 'day', 'hour', 'minute', 'second'));
         $formats['sql'] = 'Y-m-d\TH:i:s';
         break;
       case('week'):
Index: includes/date_api_filter_handler.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/date/includes/date_api_filter_handler.inc,v
retrieving revision 1.1.2.40
diff -u -r1.1.2.40 date_api_filter_handler.inc
--- includes/date_api_filter_handler.inc	9 Jun 2009 11:12:11 -0000	1.1.2.40
+++ includes/date_api_filter_handler.inc	16 Jun 2009 17:07:43 -0000
@@ -110,6 +110,13 @@
       '#description' => t('Choose the form element to use for date selection.'),
       );
    
+    $form['date_format'] = array(
+      '#type' => 'textfield',
+      '#title' => t('Date format'),
+      '#default_value' => $this->options['date_format'],
+      '#description' => t('Choose the imput format to use for date selection.'),
+    );
+      
     $form['granularity'] = $this->date_handler->granularity_form($this->options['granularity']);
     $form['granularity']['#description'] = '<p>'. t("Select a granularity for the date filter. For instance, selecting 'day' will create a filter where users can select the year, month, and day.") .'</p>';
     
@@ -272,7 +279,9 @@
     if ($type == 'date_popup' && !module_exists('date_popup')) {
       $type = 'date_text';
     }
-    $format = $this->date_handler->views_formats($this->options['granularity'], 'sql');
+    $format = !empty($this->options['date_format']) ? 
+      $this->date_handler->views_formats($this->options['granularity'], 'display', $this->options['date_format']) : 
+      $this->date_handler->views_formats($this->options['granularity'], 'sql');
     $granularity = array_keys($this->date_handler->date_parts($this->options['granularity']));
     
     // Don't set a default date in the UI, only in the exposed form.