? .DS_Store
? 279570-1.patch
? modules/.DS_Store
? sites/.DS_Store
? sites/default/files
? sites/default/private
? sites/default/settings.php
Index: modules/system/system.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.admin.inc,v
retrieving revision 1.197
diff -u -p -r1.197 system.admin.inc
--- modules/system/system.admin.inc	26 Aug 2009 10:53:45 -0000	1.197
+++ modules/system/system.admin.inc	5 Sep 2009 14:33:47 -0000
@@ -1618,12 +1618,33 @@ function system_regional_settings() {
   $date_long = 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', 'l, j. F Y - G:i');
 
+  // Array of human-readable descriptions of date format elements
+  $date_formats_transform = array(
+    'a' => ' ' . t('am/pm'),
+    'd' => t('DD'),
+    'D' => date('D'),
+    'F' => date('F'),
+    'g' => t('12h'),
+    'G' => t('24h'),
+    'h' => t('12hh'),
+    'H' => t('24hh'),
+    'i' => t('mm'),
+    'j' => t('D'),
+    'm' => t('MM'),
+    'n' => t('M'),
+    's' => t('ss'),
+    'y' => t('YY'),
+    'Y' => t('YYYY'),
+  );
+  
   // Date settings: construct choices for user
   foreach ($date_short as $f) {
-    $date_short_choices[$f] = format_date(REQUEST_TIME, 'custom', $f);
+    $date_readable = ' (' . strtr($f, $date_formats_transform) . ')';
+    $date_short_choices[$f] = format_date(REQUEST_TIME, 'custom', $f) . $date_readable;
   }
   foreach ($date_medium as $f) {
-    $date_medium_choices[$f] = format_date(REQUEST_TIME, 'custom', $f);
+    $date_readable = ' (' . strtr($f, $date_formats_transform) . ')';
+    $date_medium_choices[$f] = format_date(REQUEST_TIME, 'custom', $f) . $date_readable;
   }
   foreach ($date_long as $f) {
     $date_long_choices[$f] = format_date(REQUEST_TIME, 'custom', $f);