Changeset 9853

Timestamp:

06/25/08 13:11:49 (2 months ago)

Author:

FabianLange

Message:

1.1: fixed I18N timestamp handling, using Dustins r9760 + added tests. closes #2896, #2570.

Files:

• branches/1.1/lib/i18n/sfI18N.class.php (modified) (4 diffs)
• branches/1.1/test/unit/i18n/sfI18NTest.php (modified) (3 diffs)

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

@@ -82 +82 @@
-  }
-
-
-  /**
-   * Returns the initialization options
@@ -259 +258 @@
-
-  /**
-
-
-  The formatted dat
+with time 
+
+Time  The formatted date with tim
-   * @param  string  $culture The culture
-   *
-   * @return integer The timestamp
-   */
-
-
-
-
-
+
+
+
+
+
+
-  }
-
@@ -320 +320 @@
-
-  /**
+   * 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
+   */
+  public 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;
+    }
+  }
+
+  /**
-   * Returns true if messages are stored in a file.
-   *
@@ -356 +400 @@
-    $this->setMessageSource($this->configuration->getI18NDirs($event['module']));
-  }
+
-}

branches/1.1/test/unit/i18n/sfI18NTest.php

@@ -11 +11 @@
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
-
-2
+8
-
-class ProjectConfiguration extends sfProjectConfiguration
@@ -80 +80 @@
-$i18n = new sfI18N($configuration, $cache, array('culture' => 'fr'));
-$t->is($i18n->getTimestampForCulture('15/10/2005'), mktime(0, 0, 0, '10', '15', '2005'), '->getTimestampForCulture() returns the timestamp for a data formatted in the current culture');
+$t->is($i18n->getTimestampForCulture('15/10/2005 15:33'), mktime(15, 33, 0, '10', '15', '2005'), '->getTimestampForCulture() returns the timestamp for a data formatted in the current culture');
-$t->is($i18n->getTimestampForCulture('10/15/2005', 'en_US'), mktime(0, 0, 0, '10', '15', '2005'), '->getTimestampForCulture() can take a culture as its second argument');
+$t->is($i18n->getTimestampForCulture('10/15/2005 15:33', 'en_US'), mktime(15, 33, 0, '10', '15', '2005'), '->getTimestampForCulture() can take a culture as its second argument');
-$t->is($i18n->getTimestampForCulture('not a date'), null, '->getTimestampForCulture() returns the day, month and year for a data formatted in the current culture');
-
@@ -89 +91 @@
-$t->is($i18n->getDateForCulture('10/15/2005', 'en_US'), array('15', '10', '2005'), '->getDateForCulture() can take a culture as its second argument');
-$t->is($i18n->getDateForCulture(null), null, '->getDateForCulture() returns null in case of conversion problem');
-
+
+
+
+
+
+
+
+
+