Changeset 10841

Timestamp:

08/13/08 14:51:18 (11 months ago)

Author:

noel

Message:

[1.0] fixed Hours & Minutes not parsed by sfI18N::getTimestampForCulture() (backported from r9853) (closes #2896)

Files:

• branches/1.0/lib/i18n/sfI18N.class.php (modified) (2 diffs)
• branches/1.0/test/unit/i18n/sfI18NTest.php (added)

branches/1.0/lib/i18n/sfI18N.class.php

@@ -157 +157 @@
-  public static function getTimestampForCulture($date, $culture)
-  {
-
-
+
+
+
+
-  }
-
@@ -196 +198 @@
-    }
-  }
+
+  /**
+   * Returns the hour, minute from a date formatted with a given culture.
+   *
+   * @param  string  $date    The formatted date as string
+   * @param  string  $culture The culture
+   *
+   * @return array   An array with the hour and minute
+   */
+  protected static function getTimeForCulture($time, $culture)
+  {
+    if (!$time) return 0;
+
+    $culture = is_null($culture) ? $this->culture : $culture;
+
+    $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;
+    }
+  }
+
-}