Index: modules/system.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/system.module,v
retrieving revision 1.245
diff -u -r1.245 system.module
--- modules/system.module	22 Oct 2005 15:14:46 -0000	1.245
+++ modules/system.module	23 Oct 2005 11:25:03 -0000
@@ -371,29 +371,6 @@
   // Date settings:
   $zones = _system_zonelist();
 
-  // Date settings: possible date formats
-  $dateshort = array('Y-m-d H:i','m/d/Y - H:i', 'd/m/Y - H:i', 'Y/m/d - H:i',
-           'm/d/Y - g:ia', 'd/m/Y - g:ia', 'Y/m/d - g:ia',
-           'M j Y - H:i', 'j M Y - H:i', 'Y M j - H:i',
-           'M j Y - g:ia', 'j M Y - g:ia', 'Y M j - g:ia');
-  $datemedium = array('D, Y-m-d H:i', 'D, m/d/Y - H:i', 'D, d/m/Y - H:i',
-          'D, Y/m/d - H:i', 'F j, Y - H:i', 'j F, Y - H:i', 'Y, F j - H:i',
-          'D, m/d/Y - g:ia', 'D, d/m/Y - g:ia', 'D, Y/m/d - g:ia',
-          'F j, Y - g:ia', 'j F, Y - g:ia', 'Y, F j - g:ia');
-  $datelong = array('l, F j, Y - H:i', 'l, j F, Y - H:i', 'l, Y,  F j - H:i',
-        'l, F j, Y - g:ia', 'l, j F, Y - g:ia', 'l, Y,  F j - g:ia');
-
-  // Date settings: construct choices for user
-  foreach ($dateshort as $f) {
-    $dateshortchoices[$f] = format_date(time(), 'custom', $f);
-  }
-  foreach ($datemedium as $f) {
-    $datemediumchoices[$f] = format_date(time(), 'custom', $f);
-  }
-  foreach ($datelong as $f) {
-    $datelongchoices[$f] = format_date(time(), 'custom', $f);
-  }
-
   $form['dates'] = array('#type' => 'fieldset', '#title' => t('Date settings'), '#collapsible' => TRUE, '#collapsed' => TRUE);
   $form['dates']['date_default_timezone'] = array(
     '#type' => 'select', '#title' => t('Default time zone'), '#default_value' => variable_get('date_default_timezone', 0),
@@ -406,19 +383,28 @@
   );
 
   $form['dates']['date_format_short'] = array(
-    '#type' => 'select', '#title' => t('Short date format'), '#default_value' => variable_get('date_format_short', $dateshort[0]),
-    '#options' => $dateshortchoices,  '#description' => t('The short format of date display.')
+    '#type' => 'textfield',
+    '#title' => t('Short date format'),
+    '#default_value' => variable_get('date_format_short', 'Y-m-d H:i'),
+    '#size' => 30,
+    '#description' => t('The short format of date display.') . ' ' . t('See the <a href="%url">PHP manual page</a> for a detailed description of allowed parameters.', array('%url' => 'http://php.net/manual/en/function.date.php'))
   );
 
   $form['dates']['date_format_medium'] = array(
-    '#type' => 'select', '#title' => t('Medium date format'), '#default_value' => variable_get('date_format_medium', $datemedium[0]),
-    '#options' => $datemediumchoices, '#description' => t('The medium sized date display.')
+    '#type' => 'textfield',
+    '#title' => t('Medium date format'),
+    '#default_value' => variable_get('date_format_medium', 'D, Y-m-d H:i'),
+    '#size' => 30,
+    '#description' => t('The medium sized date display.') . ' ' . t('See the <a href="%url">PHP manual page</a> for a detailed description of allowed parameters.', array('%url' => 'http://php.net/manual/en/function.date.php'))
   );
 
   $form['dates']['date_format_long'] = array(
-    '#type' => 'select', '#title' => t('Long date format'), '#default_value' => variable_get('date_format_long', $datelong[0]),
-    '#options' => $datelongchoices, '#description' => t('Longer date format used for detailed display.')
-  );
+    '#type' => 'textfield',
+    '#title' => t('Long date format'),
+    '#default_value' => variable_get('date_format_long', 'l, F j, Y - H:i'),
+    '#size' => 30,
+    '#description' => t('Longer date format used for detailed display.') . ' ' . t('See the <a href="%url">PHP manual page</a> for a detailed description of allowed parameters.', array('%url' => 'http://php.net/manual/en/function.date.php'))
+  );   
 
   $form['dates']['date_first_day'] = array(
     '#type' => 'select', '#title' => t('First day of week'), '#default_value' => variable_get('date_first_day', 0),