Ticket #2896: bug2896-kokozedman.diff

lib/i18n/sfI18N.class.php

@@ -154 +154 @@
-  }
-
-  // Return timestamp from a date formatted with a given culture
-
+Time
-  {
-
-
+
+
+
-  }
-
-  // Return a d, m and y from a date formatted with a given culture
@@ -195 +196 @@
-      return null;
-    }
-  }
+
+  // Return h and m from a time formatted with a given culture
+  public static function getTimeForCulture($time, $culture)
+  {
+    if (!$time) return 0;
+
+    $timeFormatInfo = @sfDateTimeFormatInfo::getInstance($culture);
+    $timeFormat = $timeFormatInfo->getShortTimePattern();
+
+    // We construct the regexp based on time format
+    $timeRegexp = preg_replace(array('/[^hm:]+/i', '/[hm]+/i'), array('', '(\d+)'), $timeFormat);
+
+    // We parse time format to see where things are (h, m)
+    $a = array(
+      'h' => strpos($timeFormat, 'H') !== false ? strpos($timeFormat, 'H') : strpos($timeFormat, 'h'),
+      'm' => strpos($timeFormat, 'm')
+    );
+    $tmp = array_flip($a);
+    ksort($tmp);
+    $i = 0;
+    $c = array();
+    foreach ($tmp as $value) $c[++$i] = $value;
+    $timePositions = array_flip($c);
+
+    // We find all elements
+    if (preg_match("~$timeRegexp~", $time, $matches))
+    {
+      // We get matching timestamp
+      return array($matches[$timePositions['h']], $matches[$timePositions['m']]);
+    }
+    else
+    {
+      return null;
+    }
+  }
-}