Improve readability.

diff --git a/framework/Date/lib/Horde/Date/Utils.php b/framework/Date/lib/Horde/Date/Utils.php
index 13761cb..919bdde 100644 (file)
--- a/framework/Date/lib/Horde/Date/Utils.php
+++ b/framework/Date/lib/Horde/Date/Utils.php
@@ -111,87 +111,47 @@ class Horde_Date_Utils
      */
     public static function strftime2date($format)
     {
-        return preg_replace(array('/%a/',
-                                  '/%A/',
-                                  '/%d/',
-                                  '/%e/',
-                                  '/%j/',
-                                  '/%u/',
-                                  '/%w/',
-                                  '/%U/',
-                                  '/%V/',
-                                  '/%W/',
-                                  '/%b/',
-                                  '/%B/',
-                                  '/%h/',
-                                  '/%m/',
-                                  '/%C/',
-                                  '/%g/',
-                                  '/%G/',
-                                  '/%y/',
-                                  '/%Y/',
-                                  '/%H/',
-                                  '/%I/',
-                                  '/%i/',
-                                  '/%M/',
-                                  '/%p/',
-                                  '/%P/',
-                                  '/%r/',
-                                  '/%R/',
-                                  '/%S/',
-                                  '/%T/',
-                                  '/%X/e',
-                                  '/%z/',
-                                  '/%Z/',
-                                  '/%c/',
-                                  '/%D/',
-                                  '/%F/',
-                                  '/%s/',
-                                  '/%x/e',
-                                  '/%n/',
-                                  '/%t/',
-                                  '/%%/'),
-                           array('D',
-                                 'l',
-                                 'd',
-                                 'j',
-                                 'z',
-                                 'N',
-                                 'w',
-                                 '',
-                                 'W',
-                                 '',
-                                 'M',
-                                 'F',
-                                 'M',
-                                 'm',
-                                 '',
-                                 '',
-                                 'o',
-                                 'y',
-                                 'Y',
-                                 'H',
-                                 'h',
-                                 'g',
-                                 'i',
-                                 'A',
-                                 'a',
-                                 'h:i:s A',
-                                 'H:i',
-                                 's',
-                                 'H:i:s',
-                                 'Horde_Date_Utils::strftime2date(Horde_Nls::getLangInfo(T_FMT))',
-                                 'O',
-                                 '',
-                                 '',
-                                 'm/d/y',
-                                 'Y-m-d',
-                                 'U',
-                                 'Horde_Date_Utils::strftime2date(Horde_Nls::getLangInfo(D_FMT))',
-                                 "\n",
-                                 "\t",
-                                 '%'),
-                           $format);
+        $replace = array('/%a/'  => 'D',
+                         '/%A/'  => 'l',
+                         '/%d/'  => 'd',
+                         '/%e/'  => 'j',
+                         '/%j/'  => 'z',
+                         '/%u/'  => 'N',
+                         '/%w/'  => 'w',
+                         '/%U/'  => '',
+                         '/%V/'  => 'W',
+                         '/%W/'  => '',
+                         '/%b/'  => 'M',
+                         '/%B/'  => 'F',
+                         '/%h/'  => 'M',
+                         '/%m/'  => 'm',
+                         '/%C/'  => '',
+                         '/%g/'  => '',
+                         '/%G/'  => 'o',
+                         '/%y/'  => 'y',
+                         '/%Y/'  => 'Y',
+                         '/%H/'  => 'H',
+                         '/%I/'  => 'h',
+                         '/%i/'  => 'g',
+                         '/%M/'  => 'i',
+                         '/%p/'  => 'A',
+                         '/%P/'  => 'a',
+                         '/%r/'  => 'h:i:s A',
+                         '/%R/'  => 'H:i',
+                         '/%S/'  => 's',
+                         '/%T/'  => 'H:i:s',
+                         '/%X/e' => 'Horde_Date_Utils::strftime2date(Horde_Nls::getLangInfo(T_FMT))',
+                         '/%z/'  => 'O',
+                         '/%Z/'  => '',
+                         '/%c/'  => '',
+                         '/%D/'  => 'm/d/y',
+                         '/%F/'  => 'Y-m-d',
+                         '/%s/'  => 'U',
+                         '/%x/e' => 'Horde_Date_Utils::strftime2date(Horde_Nls::getLangInfo(D_FMT))',
+                         '/%n/'  => "\n",
+                         '/%t/'  => "\t",
+                         '/%%/'  => '%');
+        return preg_replace(array_keys($replace), array_values($replace), $format);
     }
 
 }