[limb-svn] r6859 - 3.x/trunk/limb/i18n/src/macro

[svn at limb-project.com]

Author: vasiatka
Date: 2008-03-26 19:42:58 +0300 (Wed, 26 Mar 2008)
New Revision: 6859
URL: http://fisheye.limb-project.com/changelog/limb/?cs=6859

Added:
   3.x/trunk/limb/i18n/src/macro/filters.inc.php
Modified:
   3.x/trunk/limb/i18n/src/macro/i18n_date.filter.php
Log:
-- i18n_filter for macro was changed, filter function was placed into file filters.inc.php

Added: 3.x/trunk/limb/i18n/src/macro/filters.inc.php
===================================================================
--- 3.x/trunk/limb/i18n/src/macro/filters.inc.php	                        (rev 0)
+++ 3.x/trunk/limb/i18n/src/macro/filters.inc.php	2008-03-26 16:42:58 UTC (rev 6859)
@@ -0,0 +1,49 @@
+<?php
+/*
+ * Limb PHP Framework
+ *
+ * @link http://limb-project.com
+ * @copyright  Copyright &copy; 2004-2007 BIT(http://bit-creative.com)
+ * @license    LGPL http://www.gnu.org/copyleft/lesser.html
+ */
+
+require_once('limb/i18n/src/datetime/lmbLocaleDateTime.class.php');
+require_once('limb/datetime/src/lmbDateTime.class.php');
+
+function lmb_i18n_date_filter($params,$value)
+{
+  $toolkit = lmbToolkit :: instance();
+  if(isset($params[0]) && $params[0])
+  {
+    $locale=$toolkit->getLocaleObject($params[0]);
+  }
+  else
+    $locale=$toolkit->getLocaleObject();
+
+  if(isset($params[3]) && $params[3])
+    $format=$params[3];
+  else
+  {
+    if(isset($params[2]) && $params[2])
+      $format_type = $params[2];
+    else
+      $format_type = 'short_date';
+
+    $property = $format_type . '_format';
+    $format=$locale->$property;
+  }
+
+  if(isset($params[1]) && $params[1])
+    $date_type = $params[1];
+  else
+    $date_type = 'stamp';
+
+  switch($date_type)
+  {
+    case 'string': $date = new lmbLocaleDateTime($value);      break;
+    case 'stamp':  $date = new lmbLocaleDateTime((int)$value); break;
+    default:       $date = new lmbLocaleDateTime($value);      break;
+  }
+
+  return $date->localeStrftime($format, $locale);
+}

Modified: 3.x/trunk/limb/i18n/src/macro/i18n_date.filter.php
===================================================================
--- 3.x/trunk/limb/i18n/src/macro/i18n_date.filter.php	2008-03-26 08:32:53 UTC (rev 6858)
+++ 3.x/trunk/limb/i18n/src/macro/i18n_date.filter.php	2008-03-26 16:42:58 UTC (rev 6859)
@@ -7,8 +7,6 @@
  * @license    LGPL http://www.gnu.org/copyleft/lesser.html
  */
 
-lmb_require('limb/i18n/src/datetime/lmbLocaleDateTime.class.php');
-
 /**
  * Filter i18n_date for macro templates
  * @filter i18n_date
@@ -21,57 +19,17 @@
 
   function preGenerate($code)
   {
-    $code->registerInclude('limb/i18n/src/datetime/lmbLocaleDateTime.class.php');
-    $code->registerInclude('limb/datetime/src/lmbDateTime.class.php');
+    $code->registerInclude('limb/i18n/src/macro/filters.inc.php');
     parent :: preGenerate($code);
   }
   function getValue()
   {
     $params="array(";
     foreach ($this->params as $key=>$value)
-    {
-      $params.=$value.",";
+    {
+      $params.=$value.",";
     }
     $params.=")";
-    return 'lmbI18NMacroDateFilter::_i18nDateFilter(' . $params.', ' . $this->base->getValue() . ')';
+    return 'lmb_i18n_date_filter(' . $params.', ' . $this->base->getValue() . ')';
   }
-
-  static function _i18nDateFilter($params,$value)
-  {
-    $toolkit = lmbToolkit :: instance();
-    if(isset($params[0]) && $params[0])
-    {
-      $locale=$toolkit->getLocaleObject($params[0]);
-    }
-    else
-      $locale=$toolkit->getLocaleObject();
-
-    if(isset($params[3]) && $params[3])
-      $format=$params[3];
-    else
-    {
-      if(isset($params[2]) && $params[2])
-        $format_type = $params[2];
-      else
-        $format_type = 'short_date';
-
-      $property = $format_type . '_format';
-      $format=$locale->$property;
-    }
-
-    if(isset($params[1]) && $params[1])
-      $date_type = $params[1];
-    else
-      $date_type = 'stamp';
-
-    switch($date_type)
-    {
-      case 'string': $date = new lmbLocaleDateTime($value);      break;
-      case 'stamp':  $date = new lmbLocaleDateTime((int)$value); break;
-      default:       $date = new lmbLocaleDateTime($value);      break;
-    }
-
-    return $date->localeStrftime($format, $locale);
-  }
-}
-
+}
\ No newline at end of file