[limb-svn] r5837 - in 3.x/trunk/limb: datetime/src i18n/src/template/tags/i18n i18n/tests/cases/datetime

[svn at limb-project.com]

Author: pachanga
Date: 2007-05-08 18:19:37 +0400 (Tue, 08 May 2007)
New Revision: 5837
URL: http://fisheye.limb-project.com/changelog/limb/?cs=5837

Modified:
   3.x/trunk/limb/datetime/src/lmbDate.class.php
   3.x/trunk/limb/i18n/src/template/tags/i18n/date.filter.php
   3.x/trunk/limb/i18n/tests/cases/datetime/lmbLocaleDateFormatTest.class.php
Log:
-- fixing lmbLocaleDate includes

Modified: 3.x/trunk/limb/datetime/src/lmbDate.class.php
===================================================================
--- 3.x/trunk/limb/datetime/src/lmbDate.class.php	2007-05-08 13:47:27 UTC (rev 5836)
+++ 3.x/trunk/limb/datetime/src/lmbDate.class.php	2007-05-08 14:19:37 UTC (rev 5837)
@@ -78,9 +78,15 @@
       return new lmbDate($hour_or_date, $minute_or_tz);
   }
 
-  static function createWithoutTime($year, $month, $day, $tz='')
+  static function createWithoutTime($year=null, $month=null, $day=null, $tz='')
   {
-    return new lmbDate(0, 0, 0, $day, $month, $year, $tz);
+    if(!$year && !$month && !$day)
+    {
+      $date = new lmbDate();
+      return $date->setSecond(0)->setMinute(0)->setHour(0);
+    }
+    else
+      return new lmbDate(0, 0, 0, $day, $month, $year, $tz);
   }
 
   static function createByDays($days)
@@ -293,9 +299,12 @@
     $s1 = $this->getStamp();
     $s2 = $d->getStamp();
 
-    if($s1 > $s2) return 1;
-    elseif($s2 > $s1)  return -1;
-    else return 0;
+    if($s1 > $s2)
+      return 1;
+    elseif($s2 > $s1)
+      return -1;
+    else
+      return 0;
   }
 
   function isBefore($when, $use_time_zone=false)

Modified: 3.x/trunk/limb/i18n/src/template/tags/i18n/date.filter.php
===================================================================
--- 3.x/trunk/limb/i18n/src/template/tags/i18n/date.filter.php	2007-05-08 13:47:27 UTC (rev 5836)
+++ 3.x/trunk/limb/i18n/src/template/tags/i18n/date.filter.php	2007-05-08 14:19:37 UTC (rev 5837)
@@ -9,8 +9,7 @@
  * @version    $Id$
  * @package    i18n
  */
-lmb_require('limb/datetime/src/lmbLocaleDate.class.php');
-lmb_require('limb/i18n/src/datetime/lmbLocaleDateFormat.class.php');
+lmb_require('limb/i18n/src/datetime/lmbLocaleDate.class.php');
 
 /**
 * @filter i18n_date
@@ -89,7 +88,7 @@
     $toolkit_var = $code->getTempVarRef();
     $this->locale_var = $code->getTempVarRef();
 
-    $code->writePHP("lmb_require('limb/datetime/src/lmbLocaleDate.class.php');");
+    $code->writePHP("lmb_require('limb/i18n/src/datetime/lmbLocaleDate.class.php');");
     $code->writePHP($toolkit_var . ' = lmbToolkit :: instance();' . "\n");
     $code->writePHP($this->locale_var . ' = ');
 

Modified: 3.x/trunk/limb/i18n/tests/cases/datetime/lmbLocaleDateFormatTest.class.php
===================================================================
--- 3.x/trunk/limb/i18n/tests/cases/datetime/lmbLocaleDateFormatTest.class.php	2007-05-08 13:47:27 UTC (rev 5836)
+++ 3.x/trunk/limb/i18n/tests/cases/datetime/lmbLocaleDateFormatTest.class.php	2007-05-08 14:19:37 UTC (rev 5837)
@@ -9,7 +9,7 @@
  * @version    $Id$
  * @package    i18n
  */
-lmb_require('limb/datetime/src/lmbLocaleDate.class.php');
+lmb_require('limb/i18n/src/datetime/lmbLocaleDate.class.php');
 lmb_require('limb/i18n/toolkit.inc.php');
 
 class lmbLocaleDateFormatTest extends UnitTestCase