[limb-svn] r6241 - in 3.x/trunk/limb: active_record/tests/cases cache/tests/cases config/tests/cases core/tests/cases datetime/tests/cases i18n/src/datetime i18n/src/template/tags/i18n i18n/src/toolkit i18n/src/translation i18n/tests/cases/template/tags/i18n macro/tests/cases net/tests/cases tests_runner/tests/cases validation/tests/cases validation/tests/cases/rule wact/tests/cases/compiler/compile_tree_node web_app/tests/cases/db/validation/rule web_app/tests/cases/plain/filter web_app/tests/cases/plain/request web_app/tests/cases/plain/toolkit web_spider/tests/cases
svn at limb-project.com
svn at limb-project.com
Wed Aug 29 09:46:07 MSD 2007
Author: pachanga
Date: 2007-08-29 09:46:06 +0400 (Wed, 29 Aug 2007)
New Revision: 6241
URL: http://fisheye.limb-project.com/changelog/limb/?cs=6241
Modified:
3.x/trunk/limb/active_record/tests/cases/lmbARAutoTimesTest.class.php
3.x/trunk/limb/cache/tests/cases/lmbCacheFilePersisterTest.class.php
3.x/trunk/limb/cache/tests/cases/lmbCachePersisterKeyDecoratorTest.class.php
3.x/trunk/limb/config/tests/cases/lmbIniTest.class.php
3.x/trunk/limb/config/tests/cases/other.conf.php
3.x/trunk/limb/core/tests/cases/lmbCollectionPaginationTest.class.php
3.x/trunk/limb/datetime/tests/cases/lmbDatePeriodTest.class.php
3.x/trunk/limb/datetime/tests/cases/lmbMonthTest.class.php
3.x/trunk/limb/i18n/src/datetime/lmbLocaleDate.class.php
3.x/trunk/limb/i18n/src/template/tags/i18n/capitalize.filter.php
3.x/trunk/limb/i18n/src/template/tags/i18n/clip.filter.php
3.x/trunk/limb/i18n/src/template/tags/i18n/current_locale.tag.php
3.x/trunk/limb/i18n/src/template/tags/i18n/date.filter.php
3.x/trunk/limb/i18n/src/template/tags/i18n/lowercase.filter.php
3.x/trunk/limb/i18n/src/template/tags/i18n/number.filter.php
3.x/trunk/limb/i18n/src/template/tags/i18n/uppercase.filter.php
3.x/trunk/limb/i18n/src/toolkit/lmbI18NTools.class.php
3.x/trunk/limb/i18n/src/translation/lmbDictionaryUpdater.class.php
3.x/trunk/limb/i18n/src/translation/lmbFsDictionaryExtractor.class.php
3.x/trunk/limb/i18n/src/translation/lmbI18NDictionary.class.php
3.x/trunk/limb/i18n/src/translation/lmbPHPDictionaryExtractor.class.php
3.x/trunk/limb/i18n/src/translation/lmbQtDictionaryBackend.class.php
3.x/trunk/limb/i18n/src/translation/lmbSourceDictionaryExtractor.class.php
3.x/trunk/limb/i18n/src/translation/lmbWACTDictionaryExtractor.class.php
3.x/trunk/limb/i18n/tests/cases/template/tags/i18n/lmbCurrentLocaleTagTest.class.php
3.x/trunk/limb/i18n/tests/cases/template/tags/i18n/lmbI18NCapitalizeFilterTest.class.php
3.x/trunk/limb/i18n/tests/cases/template/tags/i18n/lmbI18NClipFilterTest.class.php
3.x/trunk/limb/i18n/tests/cases/template/tags/i18n/lmbI18NDateFilterTest.class.php
3.x/trunk/limb/i18n/tests/cases/template/tags/i18n/lmbI18NLowercaseFilterTest.class.php
3.x/trunk/limb/i18n/tests/cases/template/tags/i18n/lmbI18NNumberFilterTest.class.php
3.x/trunk/limb/i18n/tests/cases/template/tags/i18n/lmbI18NStringFilterTest.class.php
3.x/trunk/limb/i18n/tests/cases/template/tags/i18n/lmbI18NTrimFilterTest.class.php
3.x/trunk/limb/i18n/tests/cases/template/tags/i18n/lmbI18NUppercaseFilterTest.class.php
3.x/trunk/limb/macro/tests/cases/lmbMacroTokenizerTest.class.php
3.x/trunk/limb/net/tests/cases/lmbHttpCacheTest.class.php
3.x/trunk/limb/net/tests/cases/lmbHttpRequestTest.class.php
3.x/trunk/limb/net/tests/cases/lmbHttpResponseTest.class.php
3.x/trunk/limb/net/tests/cases/lmbIpTest.class.php
3.x/trunk/limb/net/tests/cases/lmbMimeTypeTest.class.php
3.x/trunk/limb/net/tests/cases/lmbUploadedFilesParserTest.class.php
3.x/trunk/limb/net/tests/cases/lmbUriTest.class.php
3.x/trunk/limb/tests_runner/tests/cases/lmbTestTreeFilePathNodeTest.class.php
3.x/trunk/limb/validation/tests/cases/lmbErrorListTest.class.php
3.x/trunk/limb/validation/tests/cases/lmbValidationExceptionTest.class.php
3.x/trunk/limb/validation/tests/cases/lmbValidatorTest.class.php
3.x/trunk/limb/validation/tests/cases/rule/lmbAtleastOneFieldRequiredRuleTest.class.php
3.x/trunk/limb/validation/tests/cases/rule/lmbDateRuleTest.class.php
3.x/trunk/limb/validation/tests/cases/rule/lmbDomainRuleTest.class.php
3.x/trunk/limb/validation/tests/cases/rule/lmbEmailRuleTest.class.php
3.x/trunk/limb/validation/tests/cases/rule/lmbI18NSizeRangeTest.class.php
3.x/trunk/limb/validation/tests/cases/rule/lmbIdentifierRuleTest.class.php
3.x/trunk/limb/validation/tests/cases/rule/lmbInvalidValueRuleTest.class.php
3.x/trunk/limb/validation/tests/cases/rule/lmbLocaleDateRuleTest.class.php
3.x/trunk/limb/validation/tests/cases/rule/lmbMatchRuleTest.class.php
3.x/trunk/limb/validation/tests/cases/rule/lmbNumericPrecisionRuleTest.class.php
3.x/trunk/limb/validation/tests/cases/rule/lmbNumericValueRangeRuleTest.class.php
3.x/trunk/limb/validation/tests/cases/rule/lmbPatternRuleTest.class.php
3.x/trunk/limb/validation/tests/cases/rule/lmbRequiredObjectRuleTest.class.php
3.x/trunk/limb/validation/tests/cases/rule/lmbRequiredRuleTest.class.php
3.x/trunk/limb/validation/tests/cases/rule/lmbSizeRangeRuleTest.class.php
3.x/trunk/limb/validation/tests/cases/rule/lmbUrlRuleTest.class.php
3.x/trunk/limb/validation/tests/cases/rule/lmbValidationRuleTestCase.class.php
3.x/trunk/limb/wact/tests/cases/compiler/compile_tree_node/WactPHPNodeTest.class.php
3.x/trunk/limb/web_app/tests/cases/db/validation/rule/lmbUniqueTableFieldRuleTest.class.php
3.x/trunk/limb/web_app/tests/cases/plain/filter/lmbActionPerformingFilterTest.class.php
3.x/trunk/limb/web_app/tests/cases/plain/filter/lmbViewRenderingFilterTest.class.php
3.x/trunk/limb/web_app/tests/cases/plain/request/lmbInputFilterTest.class.php
3.x/trunk/limb/web_app/tests/cases/plain/request/lmbRoutesToUrlTest.class.php
3.x/trunk/limb/web_app/tests/cases/plain/toolkit/lmbWebAppToolsTest.class.php
3.x/trunk/limb/web_spider/tests/cases/lmbInnerUriNormalizerObserverTest.class.php
Log:
-- removing closing ?> and replacing rest of \r\n with \n
Modified: 3.x/trunk/limb/active_record/tests/cases/lmbARAutoTimesTest.class.php
===================================================================
--- 3.x/trunk/limb/active_record/tests/cases/lmbARAutoTimesTest.class.php 2007-08-28 14:21:06 UTC (rev 6240)
+++ 3.x/trunk/limb/active_record/tests/cases/lmbARAutoTimesTest.class.php 2007-08-29 05:46:06 UTC (rev 6241)
@@ -83,4 +83,4 @@
$this->assertEqual($object2->getUpdateTime(), $utime2);
}
}
-?>
+
Modified: 3.x/trunk/limb/cache/tests/cases/lmbCacheFilePersisterTest.class.php
===================================================================
--- 3.x/trunk/limb/cache/tests/cases/lmbCacheFilePersisterTest.class.php 2007-08-28 14:21:06 UTC (rev 6240)
+++ 3.x/trunk/limb/cache/tests/cases/lmbCacheFilePersisterTest.class.php 2007-08-29 05:46:06 UTC (rev 6241)
@@ -48,4 +48,4 @@
}
}
-?>
+
Modified: 3.x/trunk/limb/cache/tests/cases/lmbCachePersisterKeyDecoratorTest.class.php
===================================================================
--- 3.x/trunk/limb/cache/tests/cases/lmbCachePersisterKeyDecoratorTest.class.php 2007-08-28 14:21:06 UTC (rev 6240)
+++ 3.x/trunk/limb/cache/tests/cases/lmbCachePersisterKeyDecoratorTest.class.php 2007-08-29 05:46:06 UTC (rev 6241)
@@ -74,4 +74,4 @@
}
}
-?>
+
Modified: 3.x/trunk/limb/config/tests/cases/lmbIniTest.class.php
===================================================================
--- 3.x/trunk/limb/config/tests/cases/lmbIniTest.class.php 2007-08-28 14:21:06 UTC (rev 6240)
+++ 3.x/trunk/limb/config/tests/cases/lmbIniTest.class.php 2007-08-29 05:46:06 UTC (rev 6241)
@@ -375,4 +375,4 @@
}
}
-?>
+
Modified: 3.x/trunk/limb/config/tests/cases/other.conf.php
===================================================================
--- 3.x/trunk/limb/config/tests/cases/other.conf.php 2007-08-28 14:21:06 UTC (rev 6240)
+++ 3.x/trunk/limb/config/tests/cases/other.conf.php 2007-08-29 05:46:06 UTC (rev 6241)
@@ -3,4 +3,4 @@
$conf = array('foo' => 1,
'bar' => 2);
-?>
\ No newline at end of file
+
Modified: 3.x/trunk/limb/core/tests/cases/lmbCollectionPaginationTest.class.php
===================================================================
--- 3.x/trunk/limb/core/tests/cases/lmbCollectionPaginationTest.class.php 2007-08-28 14:21:06 UTC (rev 6240)
+++ 3.x/trunk/limb/core/tests/cases/lmbCollectionPaginationTest.class.php 2007-08-29 05:46:06 UTC (rev 6241)
@@ -131,4 +131,4 @@
}
}
-?>
+
Modified: 3.x/trunk/limb/datetime/tests/cases/lmbDatePeriodTest.class.php
===================================================================
--- 3.x/trunk/limb/datetime/tests/cases/lmbDatePeriodTest.class.php 2007-08-28 14:21:06 UTC (rev 6240)
+++ 3.x/trunk/limb/datetime/tests/cases/lmbDatePeriodTest.class.php 2007-08-29 05:46:06 UTC (rev 6241)
@@ -68,4 +68,4 @@
}
}
-?>
+
Modified: 3.x/trunk/limb/datetime/tests/cases/lmbMonthTest.class.php
===================================================================
--- 3.x/trunk/limb/datetime/tests/cases/lmbMonthTest.class.php 2007-08-28 14:21:06 UTC (rev 6240)
+++ 3.x/trunk/limb/datetime/tests/cases/lmbMonthTest.class.php 2007-08-29 05:46:06 UTC (rev 6241)
@@ -198,4 +198,4 @@
$this->assertEqual(new lmbMonth(2006, 12), $prev);
}
}
-?>
+
Modified: 3.x/trunk/limb/i18n/src/datetime/lmbLocaleDate.class.php
===================================================================
--- 3.x/trunk/limb/i18n/src/datetime/lmbLocaleDate.class.php 2007-08-28 14:21:06 UTC (rev 6240)
+++ 3.x/trunk/limb/i18n/src/datetime/lmbLocaleDate.class.php 2007-08-29 05:46:06 UTC (rev 6241)
@@ -1,359 +1,359 @@
-<?php
+<?php
/*
* Limb PHP Framework
*
* @link http://limb-project.com
* @copyright Copyright © 2004-2007 BIT(http://bit-creative.com)
* @license LGPL http://www.gnu.org/copyleft/lesser.html
- */
-lmb_require('limb/core/src/exception/lmbException.class.php');
+ */
+lmb_require('limb/core/src/exception/lmbException.class.php');
lmb_require('limb/datetime/src/lmbDate.class.php');
-/**
- * class lmbLocaleDate.
- *
- * @package i18n
- * @version $Id$
+/**
+ * class lmbLocaleDate.
+ *
+ * @package i18n
+ * @version $Id$
*/
-class lmbLocaleDate extends lmbDate
-{
- /**
- * Formats the date in the given format according to locale settings, much like
- * strftime(). Most strftime() attributes are supported.
- *
- * %a abbreviated weekday name (Sun, Mon, Tue)
- * %A full weekday name (Sunday, Monday, Tuesday)
- * %b abbreviated month name (Jan, Feb, Mar)
- * %B full month name (January, February, March)
- * %C century number (the year divided by 100 and truncated to an integer, range 00 to 99)
- * %d day of month (range 00 to 31)
- * %D same as "%m/%d/%y"
- * %e day of month, single digit (range 0 to 31)
- * %E number of days since unspecified epoch
- * %H hour as decimal number (00 to 23)
- * %I hour as decimal number on 12-hour clock (01 to 12)
- * %j day of year (range 001 to 366)
- * %m month as decimal number (range 01 to 12)
- * %M minute as a decimal number (00 to 59)
- * %n newline character (\n)
- * %O dst-corrected timezone offset expressed as "+/-HH:MM"
- * %o raw timezone offset expressed as "+/-HH:MM"
- * %p either 'am' or 'pm' depending on the time
- * %P either 'AM' or 'PM' depending on the time
- * %r time in am/pm notation, same as "%I:%M:%S %p"
- * %R time in 24-hour notation, same as "%H:%M"
- * %S seconds as a decimal number (00 to 59)
- * %t tab character (\t)
- * %T current time, same as "%H:%M:%S"
- * %w weekday as decimal (0 = Sunday)
- * %U week number of current year, first sunday as first week
- * %y year as decimal (range 00 to 99)
- * %Y year as decimal including century (range 0000 to 9999)
- * %% literal '%'
- */
- function localeStrftime($format, $locale=null)
- {
- $output = '';
-
- for($strpos=0; $strpos < strlen($format); $strpos++)
- {
- $char = substr($format, $strpos, 1);
- if($char != '%')
- {
- $output .= $char;
- continue;
- }
-
- $nextchar = substr($format, $strpos + 1, 1);
- switch($nextchar)
- {
- case 'a':
- $this->_ensureLocale($locale);
- $output .= $locale->getDayName($this->getPhpDayOfWeek(), true);
- break;
- case 'A':
- $this->_ensureLocale($locale);
- $output .= $locale->getDayName($this->getPhpDayOfWeek());
- break;
- case 'b':
- $this->_ensureLocale($locale);
- $output .= $locale->getMonthName($this->getMonth() - 1, true);
- break;
- case 'B':
- $this->_ensureLocale($locale);
- $output .= $locale->getMonthName($this->getMonth() - 1);
- break;
- case 'p':
- $this->_ensureLocale($locale);
- $output .= $locale->getMeridiemName($this->getHour());
- break;
- case 'P':
- $this->_ensureLocale($locale);
- $output .= $locale->getMeridiemName($this->getHour(), true);
- break;
- case 'C':
- $output .= sprintf("%02d", intval($this->getYear()/100));
- break;
- case 'd':
- $output .= sprintf("%02d", $this->getDay());
- break;
- case 'D':
- $output .= sprintf("%02d/%02d/%02d", $this->getMonth(), $this->getDay(), substr($this->getYear(), 2));
- break;
- case 'e':
- $output .= $this->getDay();
- break;
- case 'E':
- $output .= $this->getDateDays();
- break;
- case 'H':
- $output .= sprintf("%02d", $this->getHour());
- break;
- case 'I':
- $hour = ($this->getHour() + 1) > 12 ? $this->getHour() - 12 : $this->getHour();
- $output .= sprintf("%02d", $hour==0 ? 12 : $hour);
- break;
- case 'j':
- $output .= sprintf("%03d", $this->getDayOfYear());
- break;
- case 'm':
- $output .= sprintf("%02d",$this->getMonth());
- break;
- case 'M':
- $output .= sprintf("%02d",$this->getMinute());
- break;
- case 'n':
- $output .= "\n";
- break;
- case 'O':
- $offms = $this->getTimeZone()->getOffset($this);
- $direction = $offms >= 0 ? '+' : '-';
- $offmins = abs($offms) / 1000 / 60;
- $hours = $offmins / 60;
- $minutes = $offmins % 60;
- $output .= sprintf("%s%02d:%02d", $direction, $hours, $minutes);
- break;
- case 'o':
- $offms = $this->getTimeZone()->getRawOffset($this);
- $direction = $offms >= 0 ? '+' : '-';
- $offmins = abs($offms) / 1000 / 60;
- $hours = $offmins / 60;
- $minutes = $offmins % 60;
- $output .= sprintf("%s%02d:%02d", $direction, $hours, $minutes);
- break;
- case 'r':
- $hour = ($this->getHour() + 1) > 12 ? $this->getHour() - 12 : $this->getHour();
- $output .= sprintf("%02d:%02d:%02d %s", $hour==0 ? 12 : $hour, $this->getMinute(), $this->getSecond(), $this->getHour() >= 12 ? "PM" : "AM");
- break;
- case 'R':
- $output .= sprintf("%02d:%02d", $this->getHour(), $this->getMinute());
- break;
- case 'S':
- $output .= sprintf("%02d", $this->getSecond());
- break;
- case 't':
- $output .= "\t";
- break;
- case 'T':
- $output .= sprintf("%02d:%02d:%02d", $this->getHour(), $this->getMinute(), $this->getSecond());
- break;
- case 'w':
- $output .= $this->getPhpDayOfWeek();
- break;
- case 'U':
- $output .= $this->getWeekOfYear();
- break;
- case 'y':
- $output .= substr($this->getYear() . '', 2);
- break;
- case 'Y':
- $output .= sprintf("%04d", $this->getYear());
- break;
- case 'Z':
- $output .= $this->getTimeZone()->isInDaylightTime() ? $this->getTimeZone()->getDSTShortName() : $this->getTimeZone()->getShortName();
- break;
- case '%':
- $output .= '%';
- break;
- default:
- $output .= $char . $nextchar;
- }
- $strpos++;
- }
- return $output;
- }
-
- /**
- * Tries to guess time values in time string $time_string formatted with $fmt
- * Returns an array('hour','minute','second','month','day','year')
- * At this moment only most common tags are supported.
- */
- static function parseTimeString($locale, $time_string, $fmt)
- {
- $hour = 0;
- $minute = 0;
- $second = 0;
- $month = 0;
- $day = 0;
- $year = 0;
-
- if(!($time_array = self :: explodeTimeStringByFormat($time_string, $fmt)))
- return -1;
-
- foreach($time_array as $time_char => $value)
- {
- switch($time_char)
- {
- case '%p':
- case '%P':
- if(strtolower($value) == $locale->getPmName())
- $hour += 12;
- break;
-
- case '%I':
- case '%H':
- $hour = (int)$value;
- break;
-
- case '%M':
- $minute = (int)$value;
- break;
-
- case '%S':
- $second = (int)$value;
- break;
-
- case '%m':
- $month = (int)$value;
- break;
-
- case '%b':
- case '%h':
- if(($index = array_search($value, $locale->getMonthNames(true))) !== false)
- {
- if($index !== false)
- $month = $index + 1;
- }
- break;
-
- case '%B':
- if(($index = array_search($value, $locale->getMonthNames())) !== false)
- {
- if($index !== false)
- $month = $index + 1;
- }
- break;
-
- case '%d':
- $day = (int)$value;
- break;
-
- case '%Y':
- $year = (int)$value;
- break;
- case '%y':
- if($value < 40)
- $year = 2000 + $value;
- else
- $year = 1900 + $value;
- break;
-
- case '%T':
- if ($regs = explode(':', $value))
- {
- $hour = (int)$regs[1];
- $minute = (int)$regs[2];
- $second = (int)$regs[3];
- }
- break;
-
- case '%D':
- if ($regs = explode('/', $value))
- {
- $hour = (int)$regs[1];
- $minute = (int)$regs[2];
- $second = (int)$regs[3];
- }
- break;
-
- case '%R':
- if ($regs = explode(':', $value))
- {
- $hour = (int)$regs[1];
- $minute = (int)$regs[2];
- }
- break;
- }
- }
- return array('hour' => $hour, 'minute' => $minute, 'second' => $second, 'month' => $month, 'day' => $day, 'year' => $year);
- }
-
- static function explodeTimeStringByFormat($time_string, $fmt)
- {
- $fmt_len = strlen($fmt);
- $time_string_len = strlen($time_string);
-
- $time_array = array();
-
- $fmt_pos = 0;
- $time_string_pos = 0;
-
- while(($fmt_pos = strpos($fmt, '%', $fmt_pos)) !== false)
- {
- $current_time_char = $fmt{++$fmt_pos};
-
- if(($fmt_pos+1) >= $fmt_len)
- $delimiter_pos = $time_string_len;
- elseif($time_string_pos <= $time_string_len)
- {
- $current_delimiter = $fmt{++$fmt_pos};
- $delimiter_pos = strpos($time_string, $current_delimiter, $time_string_pos);
- if($delimiter_pos === false)
- $delimiter_pos = $time_string_len;
- }
-
- $delimiter_len = $delimiter_pos - $time_string_pos;
-
- $value = substr($time_string, $time_string_pos, $delimiter_len);
-
- if(preg_match("/[-\/]/", $value))
- throw new lmbException("Wrong date format: $time_string does not matches $fmt format");
-
- $time_array['%' . $current_time_char] = $value;
-
- $time_string_pos += ($delimiter_len + 1);
- }
-
- return $time_array;
- }
-
- protected function _ensureLocale(&$locale)
- {
- if(!is_object($locale))
- $locale = lmbToolkit :: instance()->getLocaleObject();
- }
-
- static function localStringToDate($locale, $string, $format = null)
- {
- if(!$format)
- $format = $locale->getShortDateFormat();
-
- $arr = self :: parseTimeString($locale, $string, $format);
- return new lmbDate($arr['year'], $arr['month'], $arr['day'], $arr['hour'], $arr['minute'], $arr['second']);
- }
-
- static function isLocalStringValid($locale, $string, $format = null)
- {
- try
- {
- lmbLocaleDate :: localStringToDate($locale, $string, $format);
- return true;
- }
- catch(lmbException $e)
- {
- return false;
- }
- }
-}
-
-?>
+class lmbLocaleDate extends lmbDate
+{
+ /**
+ * Formats the date in the given format according to locale settings, much like
+ * strftime(). Most strftime() attributes are supported.
+ *
+ * %a abbreviated weekday name (Sun, Mon, Tue)
+ * %A full weekday name (Sunday, Monday, Tuesday)
+ * %b abbreviated month name (Jan, Feb, Mar)
+ * %B full month name (January, February, March)
+ * %C century number (the year divided by 100 and truncated to an integer, range 00 to 99)
+ * %d day of month (range 00 to 31)
+ * %D same as "%m/%d/%y"
+ * %e day of month, single digit (range 0 to 31)
+ * %E number of days since unspecified epoch
+ * %H hour as decimal number (00 to 23)
+ * %I hour as decimal number on 12-hour clock (01 to 12)
+ * %j day of year (range 001 to 366)
+ * %m month as decimal number (range 01 to 12)
+ * %M minute as a decimal number (00 to 59)
+ * %n newline character (\n)
+ * %O dst-corrected timezone offset expressed as "+/-HH:MM"
+ * %o raw timezone offset expressed as "+/-HH:MM"
+ * %p either 'am' or 'pm' depending on the time
+ * %P either 'AM' or 'PM' depending on the time
+ * %r time in am/pm notation, same as "%I:%M:%S %p"
+ * %R time in 24-hour notation, same as "%H:%M"
+ * %S seconds as a decimal number (00 to 59)
+ * %t tab character (\t)
+ * %T current time, same as "%H:%M:%S"
+ * %w weekday as decimal (0 = Sunday)
+ * %U week number of current year, first sunday as first week
+ * %y year as decimal (range 00 to 99)
+ * %Y year as decimal including century (range 0000 to 9999)
+ * %% literal '%'
+ */
+ function localeStrftime($format, $locale=null)
+ {
+ $output = '';
+
+ for($strpos=0; $strpos < strlen($format); $strpos++)
+ {
+ $char = substr($format, $strpos, 1);
+ if($char != '%')
+ {
+ $output .= $char;
+ continue;
+ }
+
+ $nextchar = substr($format, $strpos + 1, 1);
+ switch($nextchar)
+ {
+ case 'a':
+ $this->_ensureLocale($locale);
+ $output .= $locale->getDayName($this->getPhpDayOfWeek(), true);
+ break;
+ case 'A':
+ $this->_ensureLocale($locale);
+ $output .= $locale->getDayName($this->getPhpDayOfWeek());
+ break;
+ case 'b':
+ $this->_ensureLocale($locale);
+ $output .= $locale->getMonthName($this->getMonth() - 1, true);
+ break;
+ case 'B':
+ $this->_ensureLocale($locale);
+ $output .= $locale->getMonthName($this->getMonth() - 1);
+ break;
+ case 'p':
+ $this->_ensureLocale($locale);
+ $output .= $locale->getMeridiemName($this->getHour());
+ break;
+ case 'P':
+ $this->_ensureLocale($locale);
+ $output .= $locale->getMeridiemName($this->getHour(), true);
+ break;
+ case 'C':
+ $output .= sprintf("%02d", intval($this->getYear()/100));
+ break;
+ case 'd':
+ $output .= sprintf("%02d", $this->getDay());
+ break;
+ case 'D':
+ $output .= sprintf("%02d/%02d/%02d", $this->getMonth(), $this->getDay(), substr($this->getYear(), 2));
+ break;
+ case 'e':
+ $output .= $this->getDay();
+ break;
+ case 'E':
+ $output .= $this->getDateDays();
+ break;
+ case 'H':
+ $output .= sprintf("%02d", $this->getHour());
+ break;
+ case 'I':
+ $hour = ($this->getHour() + 1) > 12 ? $this->getHour() - 12 : $this->getHour();
+ $output .= sprintf("%02d", $hour==0 ? 12 : $hour);
+ break;
+ case 'j':
+ $output .= sprintf("%03d", $this->getDayOfYear());
+ break;
+ case 'm':
+ $output .= sprintf("%02d",$this->getMonth());
+ break;
+ case 'M':
+ $output .= sprintf("%02d",$this->getMinute());
+ break;
+ case 'n':
+ $output .= "\n";
+ break;
+ case 'O':
+ $offms = $this->getTimeZone()->getOffset($this);
+ $direction = $offms >= 0 ? '+' : '-';
+ $offmins = abs($offms) / 1000 / 60;
+ $hours = $offmins / 60;
+ $minutes = $offmins % 60;
+ $output .= sprintf("%s%02d:%02d", $direction, $hours, $minutes);
+ break;
+ case 'o':
+ $offms = $this->getTimeZone()->getRawOffset($this);
+ $direction = $offms >= 0 ? '+' : '-';
+ $offmins = abs($offms) / 1000 / 60;
+ $hours = $offmins / 60;
+ $minutes = $offmins % 60;
+ $output .= sprintf("%s%02d:%02d", $direction, $hours, $minutes);
+ break;
+ case 'r':
+ $hour = ($this->getHour() + 1) > 12 ? $this->getHour() - 12 : $this->getHour();
+ $output .= sprintf("%02d:%02d:%02d %s", $hour==0 ? 12 : $hour, $this->getMinute(), $this->getSecond(), $this->getHour() >= 12 ? "PM" : "AM");
+ break;
+ case 'R':
+ $output .= sprintf("%02d:%02d", $this->getHour(), $this->getMinute());
+ break;
+ case 'S':
+ $output .= sprintf("%02d", $this->getSecond());
+ break;
+ case 't':
+ $output .= "\t";
+ break;
+ case 'T':
+ $output .= sprintf("%02d:%02d:%02d", $this->getHour(), $this->getMinute(), $this->getSecond());
+ break;
+ case 'w':
+ $output .= $this->getPhpDayOfWeek();
+ break;
+ case 'U':
+ $output .= $this->getWeekOfYear();
+ break;
+ case 'y':
+ $output .= substr($this->getYear() . '', 2);
+ break;
+ case 'Y':
+ $output .= sprintf("%04d", $this->getYear());
+ break;
+ case 'Z':
+ $output .= $this->getTimeZone()->isInDaylightTime() ? $this->getTimeZone()->getDSTShortName() : $this->getTimeZone()->getShortName();
+ break;
+ case '%':
+ $output .= '%';
+ break;
+ default:
+ $output .= $char . $nextchar;
+ }
+ $strpos++;
+ }
+ return $output;
+ }
+
+ /**
+ * Tries to guess time values in time string $time_string formatted with $fmt
+ * Returns an array('hour','minute','second','month','day','year')
+ * At this moment only most common tags are supported.
+ */
+ static function parseTimeString($locale, $time_string, $fmt)
+ {
+ $hour = 0;
+ $minute = 0;
+ $second = 0;
+ $month = 0;
+ $day = 0;
+ $year = 0;
+
+ if(!($time_array = self :: explodeTimeStringByFormat($time_string, $fmt)))
+ return -1;
+
+ foreach($time_array as $time_char => $value)
+ {
+ switch($time_char)
+ {
+ case '%p':
+ case '%P':
+ if(strtolower($value) == $locale->getPmName())
+ $hour += 12;
+ break;
+
+ case '%I':
+ case '%H':
+ $hour = (int)$value;
+ break;
+
+ case '%M':
+ $minute = (int)$value;
+ break;
+
+ case '%S':
+ $second = (int)$value;
+ break;
+
+ case '%m':
+ $month = (int)$value;
+ break;
+
+ case '%b':
+ case '%h':
+ if(($index = array_search($value, $locale->getMonthNames(true))) !== false)
+ {
+ if($index !== false)
+ $month = $index + 1;
+ }
+ break;
+
+ case '%B':
+ if(($index = array_search($value, $locale->getMonthNames())) !== false)
+ {
+ if($index !== false)
+ $month = $index + 1;
+ }
+ break;
+
+ case '%d':
+ $day = (int)$value;
+ break;
+
+ case '%Y':
+ $year = (int)$value;
+ break;
+ case '%y':
+ if($value < 40)
+ $year = 2000 + $value;
+ else
+ $year = 1900 + $value;
+ break;
+
+ case '%T':
+ if ($regs = explode(':', $value))
+ {
+ $hour = (int)$regs[1];
+ $minute = (int)$regs[2];
+ $second = (int)$regs[3];
+ }
+ break;
+
+ case '%D':
+ if ($regs = explode('/', $value))
+ {
+ $hour = (int)$regs[1];
+ $minute = (int)$regs[2];
+ $second = (int)$regs[3];
+ }
+ break;
+
+ case '%R':
+ if ($regs = explode(':', $value))
+ {
+ $hour = (int)$regs[1];
+ $minute = (int)$regs[2];
+ }
+ break;
+ }
+ }
+ return array('hour' => $hour, 'minute' => $minute, 'second' => $second, 'month' => $month, 'day' => $day, 'year' => $year);
+ }
+
+ static function explodeTimeStringByFormat($time_string, $fmt)
+ {
+ $fmt_len = strlen($fmt);
+ $time_string_len = strlen($time_string);
+
+ $time_array = array();
+
+ $fmt_pos = 0;
+ $time_string_pos = 0;
+
+ while(($fmt_pos = strpos($fmt, '%', $fmt_pos)) !== false)
+ {
+ $current_time_char = $fmt{++$fmt_pos};
+
+ if(($fmt_pos+1) >= $fmt_len)
+ $delimiter_pos = $time_string_len;
+ elseif($time_string_pos <= $time_string_len)
+ {
+ $current_delimiter = $fmt{++$fmt_pos};
+ $delimiter_pos = strpos($time_string, $current_delimiter, $time_string_pos);
+ if($delimiter_pos === false)
+ $delimiter_pos = $time_string_len;
+ }
+
+ $delimiter_len = $delimiter_pos - $time_string_pos;
+
+ $value = substr($time_string, $time_string_pos, $delimiter_len);
+
+ if(preg_match("/[-\/]/", $value))
+ throw new lmbException("Wrong date format: $time_string does not matches $fmt format");
+
+ $time_array['%' . $current_time_char] = $value;
+
+ $time_string_pos += ($delimiter_len + 1);
+ }
+
+ return $time_array;
+ }
+
+ protected function _ensureLocale(&$locale)
+ {
+ if(!is_object($locale))
+ $locale = lmbToolkit :: instance()->getLocaleObject();
+ }
+
+ static function localStringToDate($locale, $string, $format = null)
+ {
+ if(!$format)
+ $format = $locale->getShortDateFormat();
+
+ $arr = self :: parseTimeString($locale, $string, $format);
+ return new lmbDate($arr['year'], $arr['month'], $arr['day'], $arr['hour'], $arr['minute'], $arr['second']);
+ }
+
+ static function isLocalStringValid($locale, $string, $format = null)
+ {
+ try
+ {
+ lmbLocaleDate :: localStringToDate($locale, $string, $format);
+ return true;
+ }
+ catch(lmbException $e)
+ {
+ return false;
+ }
+ }
+}
+
+
Modified: 3.x/trunk/limb/i18n/src/template/tags/i18n/capitalize.filter.php
===================================================================
--- 3.x/trunk/limb/i18n/src/template/tags/i18n/capitalize.filter.php 2007-08-28 14:21:06 UTC (rev 6240)
+++ 3.x/trunk/limb/i18n/src/template/tags/i18n/capitalize.filter.php 2007-08-29 05:46:06 UTC (rev 6241)
@@ -1,40 +1,40 @@
-<?php
+<?php
/*
* Limb PHP Framework
*
* @link http://limb-project.com
* @copyright Copyright © 2004-2007 BIT(http://bit-creative.com)
* @license LGPL http://www.gnu.org/copyleft/lesser.html
- */
+ */
/**
* @filter i18n_capitalize
* @package i18n
* @version $Id$
*/
-class lmbI18NCapitalizeFilter extends WactCompilerFilter
-{
- var $locale_var;
-
- function getValue()
- {
- $value = $this->base->getValue();
-
- $toolkit = lmbToolkit :: instance();
-
- if ($this->isConstant())
- return lmb_ucfirst($value);
- else
- $this->raiseUnresolvedBindingError();
- }
-
- function generateExpression($code)
- {
- parent :: generateExpression($code);
-
- $code->writePHP('lmb_ucfirst(');
- $this->base->generateExpression($code);
- $code->writePHP(')');
- }
-}
-
-?>
\ No newline at end of file
+class lmbI18NCapitalizeFilter extends WactCompilerFilter
+{
+ var $locale_var;
+
+ function getValue()
+ {
+ $value = $this->base->getValue();
+
+ $toolkit = lmbToolkit :: instance();
+
+ if ($this->isConstant())
+ return lmb_ucfirst($value);
+ else
+ $this->raiseUnresolvedBindingError();
+ }
+
+ function generateExpression($code)
+ {
+ parent :: generateExpression($code);
+
+ $code->writePHP('lmb_ucfirst(');
+ $this->base->generateExpression($code);
+ $code->writePHP(')');
+ }
+}
+
+
Modified: 3.x/trunk/limb/i18n/src/template/tags/i18n/clip.filter.php
===================================================================
--- 3.x/trunk/limb/i18n/src/template/tags/i18n/clip.filter.php 2007-08-28 14:21:06 UTC (rev 6240)
+++ 3.x/trunk/limb/i18n/src/template/tags/i18n/clip.filter.php 2007-08-29 05:46:06 UTC (rev 6241)
@@ -1,11 +1,11 @@
-<?php
+<?php
/*
* Limb PHP Framework
*
* @link http://limb-project.com
* @copyright Copyright © 2004-2007 BIT(http://bit-creative.com)
* @license LGPL http://www.gnu.org/copyleft/lesser.html
- */
+ */
/**
* @filter i18n_clip
* @min_attributes 1
@@ -13,148 +13,147 @@
* @package i18n
* @version $Id$
*/
-class I18NClipFilter extends WactCompilerFilter
-{
- var $str;
- var $strlen;
- var $start;
- var $len;
- var $suffix;
- var $match;
-
- function getValue()
- {
- $suffix = '';
-
- if ($this->isConstant())
- {
- $value = $this->base->getValue();
- switch (count($this->parameters)) {
- case 1:
- return lmb_substr($value, 0, $this->parameters[0]->getValue());
- break;
- case 2:
- return lmb_substr($value, $this->parameters[1]->getValue(), $this->parameters[0]->getValue());
- break;
- case 3:
- $suffix = $this->_getSuffix($value,
- $this->parameters[0]->getValue(),
- $this->parameters[1]->getValue(),
- $this->parameters[2]->getValue());
- return lmb_substr($value, $this->parameters[1]->getValue(), $this->parameters[0]->getValue()) . $suffix;
- break;
- case 4:
- $limit = $this->parameters[0]->getValue();
- $offset = $this->parameters[1]->getValue();
- $word_wrap = $this->parameters[3]->getValue();
- $suffix = $this->_getSuffix($value, $limit, $offset, $this->parameters[2]->getValue());
-
- if (strtoupper(substr($word_wrap,0,1)) != 'N')
- {
- if(lmb_preg_match('~^(.{0,'.$limit.'}(?U)\w*)\b~ism', lmb_substr($value, $offset), $match))
- return $match[1].$suffix;
- else
- return '';
- }
- else
- return lmb_substr($value, $offset, $limit) . $suffix;
- break;
- default:
- throw new WactException('Wrong number of filter parameters(1..4)');
- }
- }
- else
- $this->raiseUnresolvedBindingError();
- }
-
- function _getSuffix($value, $limit, $offset, $suffix)
- {
- $result = '';
- if(lmb_strlen($value) > ($limit + $offset))
- $result = $suffix;
- return $result;
- }
-
- function generatePreStatement($code)
- {
- parent::generatePreStatement($code);
-
- switch (count($this->parameters))
- {
- case 1:
- $this->_generateBaseVars($code);
- break;
- case 2:
- $this->_generateBaseVars($code);
- $this->_generateOffset($code);
- break;
- case 3:
- case 4:
- $this->_generateBaseVars($code);
- $this->_generateOffset($code);
- $this->_generateSuffix($code);
- break;
- default:
- throw new WactException('Wrong number of filter parameters(1..4)');
- }
- }
-
- function generateExpression($code)
- {
- switch (count($this->parameters))
- {
- case 1:
- $code->writePHP('lmb_substr('.$this->str.',0 ,'.$this->len.')');
- break;
- case 2:
- $code->writePHP('lmb_substr('.$this->str.','.$this->start.','.$this->len.')');
- break;
- case 3:
- case 4:
- $code->writePHP('lmb_substr('.$this->str.','.$this->start.','.$this->len.').' . $this->suffix);
- break;
- default:
- throw new WactException('Wrong number of filter parameters(1..4)');
- }
- }
-
- protected function _generateBaseVars($code)
- {
- $this->str = $code->getTempVarRef();
- $this->strlen = $code->getTempVarRef();
- $this->len = $code->getTempVarRef();
-
- $code->writePHP($this->str.'=');
- $this->base->generateExpression($code);
- $code->writePHP(';');
-
- $code->writePHP($this->strlen.' = lmb_strlen('.$this->str.');');
-
- $code->writePHP($this->len.'=');
- $this->parameters[0]->generateExpression($code);
- $code->writePHP(';');
- }
-
- protected function _generateOffset($code)
- {
-
- $this->start = $code->getTempVarRef();
-
-
- $code->writePHP($this->start.'=');
- $this->parameters[1]->generateExpression($code);
- $code->writePHP(';');
-
- }
-
- protected function _generateSuffix($code)
- {
- $this->suffix = $code->getTempVarRef();
-
- $code->writePHP($this->suffix.'=('.$this->strlen.'>'.$this->start.'+'.$this->len.')?');
- $this->parameters[2]->generateExpression($code);
- $code->writePHP(':\'\';');
- }
-}
-
-?>
\ No newline at end of file
+class I18NClipFilter extends WactCompilerFilter
+{
+ var $str;
+ var $strlen;
+ var $start;
+ var $len;
+ var $suffix;
+ var $match;
+
+ function getValue()
+ {
+ $suffix = '';
+
+ if ($this->isConstant())
+ {
+ $value = $this->base->getValue();
+ switch (count($this->parameters)) {
+ case 1:
+ return lmb_substr($value, 0, $this->parameters[0]->getValue());
+ break;
+ case 2:
+ return lmb_substr($value, $this->parameters[1]->getValue(), $this->parameters[0]->getValue());
+ break;
+ case 3:
+ $suffix = $this->_getSuffix($value,
+ $this->parameters[0]->getValue(),
+ $this->parameters[1]->getValue(),
+ $this->parameters[2]->getValue());
+ return lmb_substr($value, $this->parameters[1]->getValue(), $this->parameters[0]->getValue()) . $suffix;
+ break;
+ case 4:
+ $limit = $this->parameters[0]->getValue();
+ $offset = $this->parameters[1]->getValue();
+ $word_wrap = $this->parameters[3]->getValue();
+ $suffix = $this->_getSuffix($value, $limit, $offset, $this->parameters[2]->getValue());
+
+ if (strtoupper(substr($word_wrap,0,1)) != 'N')
+ {
+ if(lmb_preg_match('~^(.{0,'.$limit.'}(?U)\w*)\b~ism', lmb_substr($value, $offset), $match))
+ return $match[1].$suffix;
+ else
+ return '';
+ }
+ else
+ return lmb_substr($value, $offset, $limit) . $suffix;
+ break;
+ default:
+ throw new WactException('Wrong number of filter parameters(1..4)');
+ }
+ }
+ else
+ $this->raiseUnresolvedBindingError();
+ }
+
+ function _getSuffix($value, $limit, $offset, $suffix)
+ {
+ $result = '';
+ if(lmb_strlen($value) > ($limit + $offset))
+ $result = $suffix;
+ return $result;
+ }
+
+ function generatePreStatement($code)
+ {
+ parent::generatePreStatement($code);
+
+ switch (count($this->parameters))
+ {
+ case 1:
+ $this->_generateBaseVars($code);
+ break;
+ case 2:
+ $this->_generateBaseVars($code);
+ $this->_generateOffset($code);
+ break;
+ case 3:
+ case 4:
+ $this->_generateBaseVars($code);
+ $this->_generateOffset($code);
+ $this->_generateSuffix($code);
+ break;
+ default:
+ throw new WactException('Wrong number of filter parameters(1..4)');
+ }
+ }
+
+ function generateExpression($code)
+ {
+ switch (count($this->parameters))
+ {
+ case 1:
+ $code->writePHP('lmb_substr('.$this->str.',0 ,'.$this->len.')');
+ break;
+ case 2:
+ $code->writePHP('lmb_substr('.$this->str.','.$this->start.','.$this->len.')');
+ break;
+ case 3:
+ case 4:
+ $code->writePHP('lmb_substr('.$this->str.','.$this->start.','.$this->len.').' . $this->suffix);
+ break;
+ default:
+ throw new WactException('Wrong number of filter parameters(1..4)');
+ }
+ }
+
+ protected function _generateBaseVars($code)
+ {
+ $this->str = $code->getTempVarRef();
+ $this->strlen = $code->getTempVarRef();
+ $this->len = $code->getTempVarRef();
+
+ $code->writePHP($this->str.'=');
+ $this->base->generateExpression($code);
+ $code->writePHP(';');
+
+ $code->writePHP($this->strlen.' = lmb_strlen('.$this->str.');');
+
+ $code->writePHP($this->len.'=');
+ $this->parameters[0]->generateExpression($code);
+ $code->writePHP(';');
+ }
+
+ protected function _generateOffset($code)
+ {
+
+ $this->start = $code->getTempVarRef();
+
+
+ $code->writePHP($this->start.'=');
+ $this->parameters[1]->generateExpression($code);
+ $code->writePHP(';');
+
+ }
+
+ protected function _generateSuffix($code)
+ {
+ $this->suffix = $code->getTempVarRef();
+
+ $code->writePHP($this->suffix.'=('.$this->strlen.'>'.$this->start.'+'.$this->len.')?');
+ $this->parameters[2]->generateExpression($code);
+ $code->writePHP(':\'\';');
+ }
+}
+
Modified: 3.x/trunk/limb/i18n/src/template/tags/i18n/current_locale.tag.php
===================================================================
--- 3.x/trunk/limb/i18n/src/template/tags/i18n/current_locale.tag.php 2007-08-28 14:21:06 UTC (rev 6240)
+++ 3.x/trunk/limb/i18n/src/template/tags/i18n/current_locale.tag.php 2007-08-29 05:46:06 UTC (rev 6241)
@@ -1,29 +1,29 @@
-<?php
+<?php
/*
* Limb PHP Framework
*
* @link http://limb-project.com
* @copyright Copyright © 2004-2007 BIT(http://bit-creative.com)
* @license LGPL http://www.gnu.org/copyleft/lesser.html
- */
+ */
/**
* @tag limb:CURRENT_LOCALE
* @req_const_attributes name
* @package i18n
* @version $Id$
*/
-class lmbCurrentLocaleTag extends WactCompilerTag
-{
- function generateTagContent($code)
- {
-
- $name = $this->getAttribute('name');
- $code->writePhp('if ("' . $name. '" == lmbToolkit :: instance()->getLocale()) {');
-
- parent::generateTagContent($code);
-
- $code->writePhp('}');
- }
-}
-
-?>
\ No newline at end of file
+class lmbCurrentLocaleTag extends WactCompilerTag
+{
+ function generateTagContent($code)
+ {
+
+ $name = $this->getAttribute('name');
+ $code->writePhp('if ("' . $name. '" == lmbToolkit :: instance()->getLocale()) {');
+
+ parent::generateTagContent($code);
+
+ $code->writePhp('}');
+ }
+}
+
+
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-08-28 14:21:06 UTC (rev 6240)
+++ 3.x/trunk/limb/i18n/src/template/tags/i18n/date.filter.php 2007-08-29 05:46:06 UTC (rev 6241)
@@ -1,165 +1,164 @@
-<?php
+<?php
/*
* Limb PHP Framework
*
* @link http://limb-project.com
* @copyright Copyright © 2004-2007 BIT(http://bit-creative.com)
* @license LGPL http://www.gnu.org/copyleft/lesser.html
- */
-lmb_require('limb/i18n/src/datetime/lmbLocaleDate.class.php');
-
+ */
+lmb_require('limb/i18n/src/datetime/lmbLocaleDate.class.php');
+
/**
* @filter i18n_date
* @max_attributes 5
* @package i18n
* @version $Id$
*/
-class lmbI18NDateFilter extends WactCompilerFilter
-{
- var $date;
-
- var $locale_var;
- var $date_var;
- var $date_format_var;
-
- function getValue()
- {
- $value = $this->base->getValue();
-
- $toolkit = lmbToolkit :: instance();
-
- if(isset($this->parameters[0]) && $this->parameters[0]->getValue())
- $locale = $toolkit->getLocaleObject($this->parameters[0]->getValue());
- else
- $locale = $toolkit->getLocaleObject();
-
- $this->date = new lmbLocaleDate();
-
- $this->_setDate();
-
- if($this->isConstant())
- return $this->date->localeStrftime($this->_getFormat($locale), $locale);
- else
- $this->raiseUnresolvedBindingError();
- }
-
- function _setDate()
- {
- if(isset($this->parameters[1]) && $this->parameters[1]->getValue())
- $date_type = $this->parameters[1]->getValue();
- else
- $date_type = 'stamp';
-
- $value = $this->base->getValue();
- switch($date_type)
- {
- case 'string':
- $this->date = new lmbLocaleDate($value);
- break;
- case 'stamp':
- $this->date = new lmbLocaleDate((int)$value);
- break;
-
- default:
- $this->date = new lmbLocaleDate($value);
- break;
- }
- }
-
- function _getFormat($locale)
- {
- if(isset($this->parameters[3]) && $this->parameters[3]->getValue())
- return $this->parameters[3]->getValue();
-
- if(isset($this->parameters[2]) && $this->parameters[2]->getValue())
- $format_type = $this->parameters[2]->getValue();
- else
- $format_type = 'short_date';
-
- $property = $format_type . '_format';
- return $locale->$property;
- }
-
- function generatePreStatement($code)
- {
- parent :: generatePreStatement($code);
-
- $toolkit_var = $code->getTempVarRef();
- $this->locale_var = $code->getTempVarRef();
-
- $code->writePHP("lmb_require('limb/i18n/src/datetime/lmbLocaleDate.class.php');");
- $code->writePHP($toolkit_var . ' = lmbToolkit :: instance();' . "\n");
- $code->writePHP($this->locale_var . ' = ');
-
- if(isset($this->parameters[0]) && $this->parameters[0]->getValue())
- {
- $code->writePHP($toolkit_var . '->getLocaleObject("' . $this->parameters[0]->getValue(). '");');
- }
- else
- {
- $code->writePHP($toolkit_var . '->getLocaleObject();');
- }
-
- $this->date_var = $code->getTempVarRef();
-
- $this->_setDBEDate($code);
-
- }
-
- function _setDBEDate($code)
- {
- if(isset($this->parameters[1]) && $this->parameters[1]->getValue())
- $date_type = $this->parameters[1]->getValue();
- else
- $date_type = 'stamp';
-
- switch($date_type)
- {
- case 'stamp':
- $code->writePHP($this->date_var . ' = new lmbLocaleDate((int)');
- $this->base->generateExpression($code);
- $code->writePHP(');');
- break;
-
- case 'string':
- $code->writePHP($this->date_var . ' = new lmbLocaleDate(');
- $this->base->generateExpression($code);
- $code->writePHP(');');
- break;
-
- default:
- $code->writePHP($this->date_var . ' = new lmbLocaleDate((int)');
- $this->base->generateExpression($code);
- $code->writePHP(');');
- break;
- }
- }
-
- function generateExpression($code)
- {
- parent :: generateExpression($code);
-
- $code->writePHP($this->date_var . '->localeStrftime(');
- $this->_getDBEFormat($code);
- $code->writePHP(' ,' . $this->locale_var . ')');
- }
-
- function _getDBEFormat($code)
- {
- if(isset($this->parameters[3]) && $this->parameters[3]->getValue())
- {
- $code->writePHP('"' . $this->parameters[3]->getValue() . '"');
- return;
- }
-
- if(isset($this->parameters[2]) && $this->parameters[2]->getValue())
- $format_type = $this->parameters[2]->getValue();
- else
- $format_type = 'short_date';
-
- $property = $format_type . '_format';
- $code->writePHP($this->locale_var .'->' . $property);
- }
-}
-
-?>
\ No newline at end of file
+class lmbI18NDateFilter extends WactCompilerFilter
+{
+ var $date;
+
+ var $locale_var;
+ var $date_var;
+ var $date_format_var;
+
+ function getValue()
+ {
+ $value = $this->base->getValue();
+
+ $toolkit = lmbToolkit :: instance();
+
+ if(isset($this->parameters[0]) && $this->parameters[0]->getValue())
+ $locale = $toolkit->getLocaleObject($this->parameters[0]->getValue());
+ else
+ $locale = $toolkit->getLocaleObject();
+
+ $this->date = new lmbLocaleDate();
+
+ $this->_setDate();
+
+ if($this->isConstant())
+ return $this->date->localeStrftime($this->_getFormat($locale), $locale);
+ else
+ $this->raiseUnresolvedBindingError();
+ }
+
+ function _setDate()
+ {
+ if(isset($this->parameters[1]) && $this->parameters[1]->getValue())
+ $date_type = $this->parameters[1]->getValue();
+ else
+ $date_type = 'stamp';
+
+ $value = $this->base->getValue();
+ switch($date_type)
+ {
+ case 'string':
+ $this->date = new lmbLocaleDate($value);
+ break;
+ case 'stamp':
+ $this->date = new lmbLocaleDate((int)$value);
+ break;
+
+ default:
+ $this->date = new lmbLocaleDate($value);
+ break;
+ }
+ }
+
+ function _getFormat($locale)
+ {
+ if(isset($this->parameters[3]) && $this->parameters[3]->getValue())
+ return $this->parameters[3]->getValue();
+
+ if(isset($this->parameters[2]) && $this->parameters[2]->getValue())
+ $format_type = $this->parameters[2]->getValue();
+ else
+ $format_type = 'short_date';
+
+ $property = $format_type . '_format';
+ return $locale->$property;
+ }
+
+ function generatePreStatement($code)
+ {
+ parent :: generatePreStatement($code);
+
+ $toolkit_var = $code->getTempVarRef();
+ $this->locale_var = $code->getTempVarRef();
+
+ $code->writePHP("lmb_require('limb/i18n/src/datetime/lmbLocaleDate.class.php');");
+ $code->writePHP($toolkit_var . ' = lmbToolkit :: instance();' . "\n");
+ $code->writePHP($this->locale_var . ' = ');
+
+ if(isset($this->parameters[0]) && $this->parameters[0]->getValue())
+ {
+ $code->writePHP($toolkit_var . '->getLocaleObject("' . $this->parameters[0]->getValue(). '");');
+ }
+ else
+ {
+ $code->writePHP($toolkit_var . '->getLocaleObject();');
+ }
+
+ $this->date_var = $code->getTempVarRef();
+
+ $this->_setDBEDate($code);
+
+ }
+
+ function _setDBEDate($code)
+ {
+ if(isset($this->parameters[1]) && $this->parameters[1]->getValue())
+ $date_type = $this->parameters[1]->getValue();
+ else
+ $date_type = 'stamp';
+
+ switch($date_type)
+ {
+ case 'stamp':
+ $code->writePHP($this->date_var . ' = new lmbLocaleDate((int)');
+ $this->base->generateExpression($code);
+ $code->writePHP(');');
+ break;
+
+ case 'string':
+ $code->writePHP($this->date_var . ' = new lmbLocaleDate(');
+ $this->base->generateExpression($code);
+ $code->writePHP(');');
+ break;
+
+ default:
+ $code->writePHP($this->date_var . ' = new lmbLocaleDate((int)');
+ $this->base->generateExpression($code);
+ $code->writePHP(');');
+ break;
+ }
+ }
+
+ function generateExpression($code)
+ {
+ parent :: generateExpression($code);
+
+ $code->writePHP($this->date_var . '->localeStrftime(');
+ $this->_getDBEFormat($code);
+ $code->writePHP(' ,' . $this->locale_var . ')');
+ }
+
+ function _getDBEFormat($code)
+ {
+ if(isset($this->parameters[3]) && $this->parameters[3]->getValue())
+ {
+ $code->writePHP('"' . $this->parameters[3]->getValue() . '"');
+ return;
+ }
+
+ if(isset($this->parameters[2]) && $this->parameters[2]->getValue())
+ $format_type = $this->parameters[2]->getValue();
+ else
+ $format_type = 'short_date';
+
+ $property = $format_type . '_format';
+ $code->writePHP($this->locale_var .'->' . $property);
+ }
+}
+
Modified: 3.x/trunk/limb/i18n/src/template/tags/i18n/lowercase.filter.php
===================================================================
--- 3.x/trunk/limb/i18n/src/template/tags/i18n/lowercase.filter.php 2007-08-28 14:21:06 UTC (rev 6240)
+++ 3.x/trunk/limb/i18n/src/template/tags/i18n/lowercase.filter.php 2007-08-29 05:46:06 UTC (rev 6241)
@@ -1,38 +1,38 @@
-<?php
+<?php
/*
* Limb PHP Framework
*
* @link http://limb-project.com
* @copyright Copyright © 2004-2007 BIT(http://bit-creative.com)
* @license LGPL http://www.gnu.org/copyleft/lesser.html
- */
+ */
/**
* @filter i18n_lowercase
* @package i18n
* @version $Id$
*/
-class lmbI18NLowercaseFilter extends WactCompilerFilter
-{
- var $locale_var;
-
- function getValue()
- {
- $value = $this->base->getValue();
-
- $toolkit = lmbToolkit :: instance();
-
- if ($this->isConstant())
- return lmb_strtolower($value);
- else
- $this->raiseUnresolvedBindingError();
- }
-
- function generateExpression($code)
- {
- $code->writePHP('lmb_strtolower(');
- $this->base->generateExpression($code);
- $code->writePHP(')');
- }
-}
-
-?>
\ No newline at end of file
+class lmbI18NLowercaseFilter extends WactCompilerFilter
+{
+ var $locale_var;
+
+ function getValue()
+ {
+ $value = $this->base->getValue();
+
+ $toolkit = lmbToolkit :: instance();
+
+ if ($this->isConstant())
+ return lmb_strtolower($value);
+ else
+ $this->raiseUnresolvedBindingError();
+ }
+
+ function generateExpression($code)
+ {
+ $code->writePHP('lmb_strtolower(');
+ $this->base->generateExpression($code);
+ $code->writePHP(')');
+ }
+}
+
+
Modified: 3.x/trunk/limb/i18n/src/template/tags/i18n/number.filter.php
===================================================================
--- 3.x/trunk/limb/i18n/src/template/tags/i18n/number.filter.php 2007-08-28 14:21:06 UTC (rev 6240)
+++ 3.x/trunk/limb/i18n/src/template/tags/i18n/number.filter.php 2007-08-29 05:46:06 UTC (rev 6241)
@@ -1,98 +1,98 @@
-<?php
+<?php
/*
* Limb PHP Framework
*
* @link http://limb-project.com
* @copyright Copyright © 2004-2007 BIT(http://bit-creative.com)
* @license LGPL http://www.gnu.org/copyleft/lesser.html
- */
+ */
/**
* @filter i18n_number
* @max_attributes 5
* @package i18n
* @version $Id$
*/
-class lmbI18NNumberFilter extends WactCompilerFilter
-{
- var $locale_var;
-
- function getValue()
- {
- $value = $this->base->getValue();
-
- $toolkit = lmbToolkit :: instance();
-
- if(isset($this->parameters[0]) && $this->parameters[0]->getValue())
- $locale = $toolkit->getLocaleObject($this->parameters[0]->getValue());
- else
- $locale = $toolkit->getLocaleObject();
-
- if(isset($this->parameters[1]) && $this->parameters[1]->getValue())
- $fract_digits = $this->parameters[1]->getValue();
- else
- $fract_digits = $locale->fract_digits;
-
- if(isset($this->parameters[2]) && $this->parameters[2]->getValue())
- $decimal_symbol = $this->parameters[2]->getValue();
- else
- $decimal_symbol = $locale->decimal_symbol;
-
- if(isset($this->parameters[3]) && $this->parameters[3]->getValue())
- $thousand_separator = $this->parameters[3]->getValue();
- else
- $thousand_separator = $locale->thousand_separator;
-
- if ($this->isConstant())
- return number_format($value, $fract_digits, $decimal_symbol, $thousand_separator);
- else
- $this->raiseUnresolvedBindingError();
- }
-
- function generatePreStatement($code)
- {
- $toolkit_var = $code->getTempVarRef();
- $this->locale_var = $code->getTempVarRef();
-
- $code->writePHP($toolkit_var . ' = lmbToolkit :: instance();' . "\n");
- $code->writePHP($this->locale_var . ' = ');
-
- if(isset($this->parameters[0]) && $this->parameters[0]->getValue())
- {
- $code->writePHP($toolkit_var . '->getLocaleObject("' . $this->parameters[0]->getValue(). '");');
- }
- else
- {
- $code->writePHP($toolkit_var . '->getLocaleObject();');
- }
- }
-
- function generateExpression($code)
- {
- $code->writePHP('number_format(');
- $this->base->generateExpression($code);
- $code->writePHP(',');
-
- if(isset($this->parameters[1]) && $this->parameters[1]->getValue())
- $this->parameters[1]->generateExpression($code);
- else
- $code->writePHP($this->locale_var . '->fract_digits');
-
- $code->writePHP(',');
-
- if(isset($this->parameters[2]) && $this->parameters[2]->getValue())
- $this->parameters[2]->generateExpression($code);
- else
- $code->writePHP($this->locale_var . '->decimal_symbol');
-
- $code->writePHP(',');
-
- if(isset($this->parameters[3]) && $this->parameters[3]->getValue())
- $this->parameters[3]->generateExpression($code);
- else
- $code->writePHP($this->locale_var . '->thousand_separator');
-
- $code->writePHP(')');
- }
-}
-
-?>
\ No newline at end of file
+class lmbI18NNumberFilter extends WactCompilerFilter
+{
+ var $locale_var;
+
+ function getValue()
+ {
+ $value = $this->base->getValue();
+
+ $toolkit = lmbToolkit :: instance();
+
+ if(isset($this->parameters[0]) && $this->parameters[0]->getValue())
+ $locale = $toolkit->getLocaleObject($this->parameters[0]->getValue());
+ else
+ $locale = $toolkit->getLocaleObject();
+
+ if(isset($this->parameters[1]) && $this->parameters[1]->getValue())
+ $fract_digits = $this->parameters[1]->getValue();
+ else
+ $fract_digits = $locale->fract_digits;
+
+ if(isset($this->parameters[2]) && $this->parameters[2]->getValue())
+ $decimal_symbol = $this->parameters[2]->getValue();
+ else
+ $decimal_symbol = $locale->decimal_symbol;
+
+ if(isset($this->parameters[3]) && $this->parameters[3]->getValue())
+ $thousand_separator = $this->parameters[3]->getValue();
+ else
+ $thousand_separator = $locale->thousand_separator;
+
+ if ($this->isConstant())
+ return number_format($value, $fract_digits, $decimal_symbol, $thousand_separator);
+ else
+ $this->raiseUnresolvedBindingError();
+ }
+
+ function generatePreStatement($code)
+ {
+ $toolkit_var = $code->getTempVarRef();
+ $this->locale_var = $code->getTempVarRef();
+
+ $code->writePHP($toolkit_var . ' = lmbToolkit :: instance();' . "\n");
+ $code->writePHP($this->locale_var . ' = ');
+
+ if(isset($this->parameters[0]) && $this->parameters[0]->getValue())
+ {
+ $code->writePHP($toolkit_var . '->getLocaleObject("' . $this->parameters[0]->getValue(). '");');
+ }
+ else
+ {
+ $code->writePHP($toolkit_var . '->getLocaleObject();');
+ }
+ }
+
+ function generateExpression($code)
+ {
+ $code->writePHP('number_format(');
+ $this->base->generateExpression($code);
+ $code->writePHP(',');
+
+ if(isset($this->parameters[1]) && $this->parameters[1]->getValue())
+ $this->parameters[1]->generateExpression($code);
+ else
+ $code->writePHP($this->locale_var . '->fract_digits');
+
+ $code->writePHP(',');
+
+ if(isset($this->parameters[2]) && $this->parameters[2]->getValue())
+ $this->parameters[2]->generateExpression($code);
+ else
+ $code->writePHP($this->locale_var . '->decimal_symbol');
+
+ $code->writePHP(',');
+
+ if(isset($this->parameters[3]) && $this->parameters[3]->getValue())
+ $this->parameters[3]->generateExpression($code);
+ else
+ $code->writePHP($this->locale_var . '->thousand_separator');
+
+ $code->writePHP(')');
+ }
+}
+
+
Modified: 3.x/trunk/limb/i18n/src/template/tags/i18n/uppercase.filter.php
===================================================================
--- 3.x/trunk/limb/i18n/src/template/tags/i18n/uppercase.filter.php 2007-08-28 14:21:06 UTC (rev 6240)
+++ 3.x/trunk/limb/i18n/src/template/tags/i18n/uppercase.filter.php 2007-08-29 05:46:06 UTC (rev 6241)
@@ -1,38 +1,38 @@
-<?php
+<?php
/*
* Limb PHP Framework
*
* @link http://limb-project.com
* @copyright Copyright © 2004-2007 BIT(http://bit-creative.com)
* @license LGPL http://www.gnu.org/copyleft/lesser.html
- */
+ */
/**
* @filter i18n_uppercase
* @package i18n
* @version $Id$
*/
-class lmbI18NUppercaseFilter extends WactCompilerFilter
-{
- var $locale_var;
-
- function getValue()
- {
- $value = $this->base->getValue();
-
- $toolkit = lmbToolkit :: instance();
-
- if($this->isConstant())
- return lmb_strtoupper($value);
- else
- $this->raiseUnresolvedBindingError();
- }
-
- function generateExpression($code)
- {
- $code->writePHP('lmb_strtoupper(');
- $this->base->generateExpression($code);
- $code->writePHP(')');
- }
-}
-
-?>
\ No newline at end of file
+class lmbI18NUppercaseFilter extends WactCompilerFilter
+{
+ var $locale_var;
+
+ function getValue()
+ {
+ $value = $this->base->getValue();
+
+ $toolkit = lmbToolkit :: instance();
+
+ if($this->isConstant())
+ return lmb_strtoupper($value);
+ else
+ $this->raiseUnresolvedBindingError();
+ }
+
+ function generateExpression($code)
+ {
+ $code->writePHP('lmb_strtoupper(');
+ $this->base->generateExpression($code);
+ $code->writePHP(')');
+ }
+}
+
+
Modified: 3.x/trunk/limb/i18n/src/toolkit/lmbI18NTools.class.php
===================================================================
--- 3.x/trunk/limb/i18n/src/toolkit/lmbI18NTools.class.php 2007-08-28 14:21:06 UTC (rev 6240)
+++ 3.x/trunk/limb/i18n/src/toolkit/lmbI18NTools.class.php 2007-08-29 05:46:06 UTC (rev 6241)
@@ -125,4 +125,3 @@
return $text;
}
}
-?>
Modified: 3.x/trunk/limb/i18n/src/translation/lmbDictionaryUpdater.class.php
===================================================================
--- 3.x/trunk/limb/i18n/src/translation/lmbDictionaryUpdater.class.php 2007-08-28 14:21:06 UTC (rev 6240)
+++ 3.x/trunk/limb/i18n/src/translation/lmbDictionaryUpdater.class.php 2007-08-29 05:46:06 UTC (rev 6241)
@@ -79,4 +79,4 @@
}
}
}
-?>
+
Modified: 3.x/trunk/limb/i18n/src/translation/lmbFsDictionaryExtractor.class.php
===================================================================
--- 3.x/trunk/limb/i18n/src/translation/lmbFsDictionaryExtractor.class.php 2007-08-28 14:21:06 UTC (rev 6240)
+++ 3.x/trunk/limb/i18n/src/translation/lmbFsDictionaryExtractor.class.php 2007-08-29 05:46:06 UTC (rev 6241)
@@ -36,4 +36,4 @@
}
}
-?>
+
Modified: 3.x/trunk/limb/i18n/src/translation/lmbI18NDictionary.class.php
===================================================================
--- 3.x/trunk/limb/i18n/src/translation/lmbI18NDictionary.class.php 2007-08-28 14:21:06 UTC (rev 6240)
+++ 3.x/trunk/limb/i18n/src/translation/lmbI18NDictionary.class.php 2007-08-29 05:46:06 UTC (rev 6241)
@@ -1,4 +1,4 @@
-<?php
+<?php
/*
* Limb PHP Framework
*
@@ -7,91 +7,91 @@
* @license LGPL http://www.gnu.org/copyleft/lesser.html
*/
-/**
- * class lmbI18NDictionary.
- *
- * @package i18n
- * @version $Id$
+/**
+ * class lmbI18NDictionary.
+ *
+ * @package i18n
+ * @version $Id$
*/
-class lmbI18NDictionary
-{
- protected $translations;
-
- function __construct($translations = array())
- {
- $this->translations = $translations;
- }
-
- function isEmpty()
- {
- return sizeof($this->translations) == 0;
- }
-
- function translate($text, $attributes = array())
- {
- if(isset($this->translations[$text]) &&
- !empty($this->translations[$text]))
- $translation = $this->translations[$text];
- else
- $translation = $text;
-
- if($attributes)
- return str_replace(array_keys($attributes), array_values($attributes), $translation);
- else
- return $translation;
- }
-
- function add($text, $translation = '')
- {
- $this->translations[$text] = $translation;
- }
-
- function has($text)
- {
- return isset($this->translations[$text]);
- }
-
- function isTranslated($text)
- {
- return isset($this->translations[$text]) &&
- !empty($this->translations[$text]);
- }
-
- function setTranslations($translations)
- {
- $this->translations = $translations;
- }
-
- function getTranslations()
- {
- return $this->translations;
- }
-
- function merge($d)
- {
- $dictionary = new lmbI18NDictionary($this->getTranslations());
-
- $translations = $d->getTranslations();
- foreach($translations as $text => $translation)
- $dictionary->add($text, $translation);
-
- return $dictionary;
- }
-
- function hasSameEntries($d)
- {
- foreach($this->translations as $text => $translation)
- {
- if(!$d->has($text))
- return false;
- }
- return true;
- }
-
- function isEqual($d)
- {
- return $this->translations == $d->getTranslations();
- }
-}
-
-?>
+class lmbI18NDictionary
+{
+ protected $translations;
+
+ function __construct($translations = array())
+ {
+ $this->translations = $translations;
+ }
+
+ function isEmpty()
+ {
+ return sizeof($this->translations) == 0;
+ }
+
+ function translate($text, $attributes = array())
+ {
+ if(isset($this->translations[$text]) &&
+ !empty($this->translations[$text]))
+ $translation = $this->translations[$text];
+ else
+ $translation = $text;
+
+ if($attributes)
+ return str_replace(array_keys($attributes), array_values($attributes), $translation);
+ else
+ return $translation;
+ }
+
+ function add($text, $translation = '')
+ {
+ $this->translations[$text] = $translation;
+ }
+
+ function has($text)
+ {
+ return isset($this->translations[$text]);
+ }
+
+ function isTranslated($text)
+ {
+ return isset($this->translations[$text]) &&
+ !empty($this->translations[$text]);
+ }
+
+ function setTranslations($translations)
+ {
+ $this->translations = $translations;
+ }
+
+ function getTranslations()
+ {
+ return $this->translations;
+ }
+
+ function merge($d)
+ {
+ $dictionary = new lmbI18NDictionary($this->getTranslations());
+
+ $translations = $d->getTranslations();
+ foreach($translations as $text => $translation)
+ $dictionary->add($text, $translation);
+
+ return $dictionary;
+ }
+
+ function hasSameEntries($d)
+ {
+ foreach($this->translations as $text => $translation)
+ {
+ if(!$d->has($text))
+ return false;
+ }
+ return true;
+ }
+
+ function isEqual($d)
+ {
+ return $this->translations == $d->getTranslations();
+ }
+}
+
+
Modified: 3.x/trunk/limb/i18n/src/translation/lmbPHPDictionaryExtractor.class.php
===================================================================
--- 3.x/trunk/limb/i18n/src/translation/lmbPHPDictionaryExtractor.class.php 2007-08-28 14:21:06 UTC (rev 6240)
+++ 3.x/trunk/limb/i18n/src/translation/lmbPHPDictionaryExtractor.class.php 2007-08-29 05:46:06 UTC (rev 6241)
@@ -1,84 +1,84 @@
-<?php
+<?php
/*
* Limb PHP Framework
*
* @link http://limb-project.com
* @copyright Copyright © 2004-2007 BIT(http://bit-creative.com)
* @license LGPL http://www.gnu.org/copyleft/lesser.html
- */
-lmb_require('limb/core/src/lmbPHPTokenizer.class.php');
-lmb_require('limb/i18n/src/translation/lmbSourceDictionaryExtractor.class.php');
+ */
+lmb_require('limb/core/src/lmbPHPTokenizer.class.php');
+lmb_require('limb/i18n/src/translation/lmbSourceDictionaryExtractor.class.php');
lmb_require('limb/i18n/src/translation/lmbI18NDictionary.class.php');
-/**
- * class lmbPHPDictionaryExtractor.
- *
- * @package i18n
- * @version $Id$
+/**
+ * class lmbPHPDictionaryExtractor.
+ *
+ * @package i18n
+ * @version $Id$
*/
-class lmbPHPDictionaryExtractor extends lmbSourceDictionaryExtractor
-{
- protected $tokenizer;
-
- function __construct()
- {
- $this->tokenizer = new lmbPHPTokenizer();
- }
-
- function extract($code, &$dictionaries = array(), $response = null)
- {
- $this->tokenizer->input($code);
-
- while($token = $this->tokenizer->next())
- {
- if(is_array($token) && $token[0] == T_STRING && $token[1] == 'lmb_i18n')
- {
- $parenthesis = array();
- if($this->tokenizer->next() == "(")
- {
- $text_token = $this->tokenizer->next();
- if(!is_array($text_token) || $text_token[0] != T_CONSTANT_ENCAPSED_STRING)
- continue;
-
- array_push($parenthesis, 1);
- $text = trim($text_token[1], '"\'');
-
- //getting tokens until function closes its last )
- $buffer = array();
- while($parenthesis && $token = $this->tokenizer->next())
- {
- if($token == ")")
- array_pop($parenthesis);
- elseif($token == "(")
- array_push($parenthesis, 1);
-
- $buffer[] = $token;
- }
-
- $domain = 'default';
- if(sizeof($buffer) > 2)
- {
- $domain_token = $buffer[sizeof($buffer)-2];
- if(is_array($domain_token) && $domain_token[0] == T_CONSTANT_ENCAPSED_STRING)
- $domain = trim($domain_token[1], '"\'');
- }
-
- if($response)
- $response->write("PHP source: '$text'@$domain\n");
-
- if(!isset($dictionaries[$domain]))
- {
- $dictionary = new lmbI18NDictionary();
- $dictionaries[$domain] = $dictionary;
- }
- else
- $dictionary = $dictionaries[$domain];
-
- $dictionary->add($text);
- }
- }
- }
- }
-}
-
-?>
+class lmbPHPDictionaryExtractor extends lmbSourceDictionaryExtractor
+{
+ protected $tokenizer;
+
+ function __construct()
+ {
+ $this->tokenizer = new lmbPHPTokenizer();
+ }
+
+ function extract($code, &$dictionaries = array(), $response = null)
+ {
+ $this->tokenizer->input($code);
+
+ while($token = $this->tokenizer->next())
+ {
+ if(is_array($token) && $token[0] == T_STRING && $token[1] == 'lmb_i18n')
+ {
+ $parenthesis = array();
+ if($this->tokenizer->next() == "(")
+ {
+ $text_token = $this->tokenizer->next();
+ if(!is_array($text_token) || $text_token[0] != T_CONSTANT_ENCAPSED_STRING)
+ continue;
+
+ array_push($parenthesis, 1);
+ $text = trim($text_token[1], '"\'');
+
+ //getting tokens until function closes its last )
+ $buffer = array();
+ while($parenthesis && $token = $this->tokenizer->next())
+ {
+ if($token == ")")
+ array_pop($parenthesis);
+ elseif($token == "(")
+ array_push($parenthesis, 1);
+
+ $buffer[] = $token;
+ }
+
+ $domain = 'default';
+ if(sizeof($buffer) > 2)
+ {
+ $domain_token = $buffer[sizeof($buffer)-2];
+ if(is_array($domain_token) && $domain_token[0] == T_CONSTANT_ENCAPSED_STRING)
+ $domain = trim($domain_token[1], '"\'');
+ }
+
+ if($response)
+ $response->write("PHP source: '$text'@$domain\n");
+
+ if(!isset($dictionaries[$domain]))
+ {
+ $dictionary = new lmbI18NDictionary();
+ $dictionaries[$domain] = $dictionary;
+ }
+ else
+ $dictionary = $dictionaries[$domain];
+
+ $dictionary->add($text);
+ }
+ }
+ }
+ }
+}
+
+
Modified: 3.x/trunk/limb/i18n/src/translation/lmbQtDictionaryBackend.class.php
===================================================================
--- 3.x/trunk/limb/i18n/src/translation/lmbQtDictionaryBackend.class.php 2007-08-28 14:21:06 UTC (rev 6240)
+++ 3.x/trunk/limb/i18n/src/translation/lmbQtDictionaryBackend.class.php 2007-08-29 05:46:06 UTC (rev 6241)
@@ -202,4 +202,4 @@
}
}
-?>
+
Modified: 3.x/trunk/limb/i18n/src/translation/lmbSourceDictionaryExtractor.class.php
===================================================================
--- 3.x/trunk/limb/i18n/src/translation/lmbSourceDictionaryExtractor.class.php 2007-08-28 14:21:06 UTC (rev 6240)
+++ 3.x/trunk/limb/i18n/src/translation/lmbSourceDictionaryExtractor.class.php 2007-08-29 05:46:06 UTC (rev 6241)
@@ -1,4 +1,4 @@
-<?php
+<?php
/*
* Limb PHP Framework
*
@@ -7,20 +7,20 @@
* @license LGPL http://www.gnu.org/copyleft/lesser.html
*/
-/**
- * abstract class lmbSourceDictionaryExtractor.
- *
- * @package i18n
- * @version $Id$
+/**
+ * abstract class lmbSourceDictionaryExtractor.
+ *
+ * @package i18n
+ * @version $Id$
*/
-abstract class lmbSourceDictionaryExtractor
-{
- abstract function extract($code, &$dictionaries = array(), $response = null);
-
- function extractFromFile($file, &$dictionaries = array(), $response = null)
- {
- $this->extract(file_get_contents($file), $dictionaries, $response);
- }
-}
-
-?>
+abstract class lmbSourceDictionaryExtractor
+{
+ abstract function extract($code, &$dictionaries = array(), $response = null);
+
+ function extractFromFile($file, &$dictionaries = array(), $response = null)
+ {
+ $this->extract(file_get_contents($file), $dictionaries, $response);
+ }
+}
+
+
Modified: 3.x/trunk/limb/i18n/src/translation/lmbWACTDictionaryExtractor.class.php
===================================================================
--- 3.x/trunk/limb/i18n/src/translation/lmbWACTDictionaryExtractor.class.php 2007-08-28 14:21:06 UTC (rev 6240)
+++ 3.x/trunk/limb/i18n/src/translation/lmbWACTDictionaryExtractor.class.php 2007-08-29 05:46:06 UTC (rev 6241)
@@ -1,44 +1,44 @@
-<?php
+<?php
/*
* Limb PHP Framework
*
* @link http://limb-project.com
* @copyright Copyright © 2004-2007 BIT(http://bit-creative.com)
* @license LGPL http://www.gnu.org/copyleft/lesser.html
- */
+ */
lmb_require('limb/i18n/src/translation/lmbSourceDictionaryExtractor.class.php');
-/**
- * class lmbWACTDictionaryExtractor.
- *
- * @package i18n
- * @version $Id$
+/**
+ * class lmbWACTDictionaryExtractor.
+ *
+ * @package i18n
+ * @version $Id$
*/
-class lmbWACTDictionaryExtractor extends lmbSourceDictionaryExtractor
-{
- function extract($code, &$dictionaries = array(), $response = null)
- {
- if(preg_match_all('~\{\$[\'"]([^\'"]+)[\'"]\|i18n(:[\'"]([^\'"]+)[\'"])?~', $code, $matches))
- {
- foreach($matches[1] as $index => $text)
- {
- $domain = $matches[3][$index] ? $matches[3][$index] : 'default';
-
- if($response)
- $response->write("WACT template: '$text'@$domain\n");
-
- if(!isset($dictionaries[$domain]))
- {
- $dictionary = new lmbI18NDictionary();
- $dictionaries[$domain] = $dictionary;
- }
- else
- $dictionary = $dictionaries[$domain];
-
- $dictionary->add($text);
- }
- }
- }
-}
-
-?>
+class lmbWACTDictionaryExtractor extends lmbSourceDictionaryExtractor
+{
+ function extract($code, &$dictionaries = array(), $response = null)
+ {
+ if(preg_match_all('~\{\$[\'"]([^\'"]+)[\'"]\|i18n(:[\'"]([^\'"]+)[\'"])?~', $code, $matches))
+ {
+ foreach($matches[1] as $index => $text)
+ {
+ $domain = $matches[3][$index] ? $matches[3][$index] : 'default';
+
+ if($response)
+ $response->write("WACT template: '$text'@$domain\n");
+
+ if(!isset($dictionaries[$domain]))
+ {
+ $dictionary = new lmbI18NDictionary();
+ $dictionaries[$domain] = $dictionary;
+ }
+ else
+ $dictionary = $dictionaries[$domain];
+
+ $dictionary->add($text);
+ }
+ }
+ }
+}
+
+
Modified: 3.x/trunk/limb/i18n/tests/cases/template/tags/i18n/lmbCurrentLocaleTagTest.class.php
===================================================================
--- 3.x/trunk/limb/i18n/tests/cases/template/tags/i18n/lmbCurrentLocaleTagTest.class.php 2007-08-28 14:21:06 UTC (rev 6240)
+++ 3.x/trunk/limb/i18n/tests/cases/template/tags/i18n/lmbCurrentLocaleTagTest.class.php 2007-08-29 05:46:06 UTC (rev 6241)
@@ -35,4 +35,4 @@
$this->assertEqual($page->capture(), 'Some text');
}
}
-?>
+
Modified: 3.x/trunk/limb/i18n/tests/cases/template/tags/i18n/lmbI18NCapitalizeFilterTest.class.php
===================================================================
--- 3.x/trunk/limb/i18n/tests/cases/template/tags/i18n/lmbI18NCapitalizeFilterTest.class.php 2007-08-28 14:21:06 UTC (rev 6240)
+++ 3.x/trunk/limb/i18n/tests/cases/template/tags/i18n/lmbI18NCapitalizeFilterTest.class.php 2007-08-29 05:46:06 UTC (rev 6241)
@@ -60,4 +60,4 @@
$this->assertEqual($page->capture(), 'Тест');
}
}
-?>
+
Modified: 3.x/trunk/limb/i18n/tests/cases/template/tags/i18n/lmbI18NClipFilterTest.class.php
===================================================================
--- 3.x/trunk/limb/i18n/tests/cases/template/tags/i18n/lmbI18NClipFilterTest.class.php 2007-08-28 14:21:06 UTC (rev 6240)
+++ 3.x/trunk/limb/i18n/tests/cases/template/tags/i18n/lmbI18NClipFilterTest.class.php 2007-08-29 05:46:06 UTC (rev 6241)
@@ -143,4 +143,4 @@
}
}
-?>
+
Modified: 3.x/trunk/limb/i18n/tests/cases/template/tags/i18n/lmbI18NDateFilterTest.class.php
===================================================================
--- 3.x/trunk/limb/i18n/tests/cases/template/tags/i18n/lmbI18NDateFilterTest.class.php 2007-08-28 14:21:06 UTC (rev 6240)
+++ 3.x/trunk/limb/i18n/tests/cases/template/tags/i18n/lmbI18NDateFilterTest.class.php 2007-08-29 05:46:06 UTC (rev 6241)
@@ -189,4 +189,4 @@
$this->assertEqual($page->capture(), '2005 01 20');
}
}
-?>
+
Modified: 3.x/trunk/limb/i18n/tests/cases/template/tags/i18n/lmbI18NLowercaseFilterTest.class.php
===================================================================
--- 3.x/trunk/limb/i18n/tests/cases/template/tags/i18n/lmbI18NLowercaseFilterTest.class.php 2007-08-28 14:21:06 UTC (rev 6240)
+++ 3.x/trunk/limb/i18n/tests/cases/template/tags/i18n/lmbI18NLowercaseFilterTest.class.php 2007-08-29 05:46:06 UTC (rev 6241)
@@ -48,4 +48,4 @@
}
}
-?>
+
Modified: 3.x/trunk/limb/i18n/tests/cases/template/tags/i18n/lmbI18NNumberFilterTest.class.php
===================================================================
--- 3.x/trunk/limb/i18n/tests/cases/template/tags/i18n/lmbI18NNumberFilterTest.class.php 2007-08-28 14:21:06 UTC (rev 6240)
+++ 3.x/trunk/limb/i18n/tests/cases/template/tags/i18n/lmbI18NNumberFilterTest.class.php 2007-08-29 05:46:06 UTC (rev 6241)
@@ -147,4 +147,4 @@
$this->assertEqual($page->capture(), '100 000.00');
}
}
-?>
+
Modified: 3.x/trunk/limb/i18n/tests/cases/template/tags/i18n/lmbI18NStringFilterTest.class.php
===================================================================
--- 3.x/trunk/limb/i18n/tests/cases/template/tags/i18n/lmbI18NStringFilterTest.class.php 2007-08-28 14:21:06 UTC (rev 6240)
+++ 3.x/trunk/limb/i18n/tests/cases/template/tags/i18n/lmbI18NStringFilterTest.class.php 2007-08-29 05:46:06 UTC (rev 6241)
@@ -81,4 +81,4 @@
}
}
-?>
+
Modified: 3.x/trunk/limb/i18n/tests/cases/template/tags/i18n/lmbI18NTrimFilterTest.class.php
===================================================================
--- 3.x/trunk/limb/i18n/tests/cases/template/tags/i18n/lmbI18NTrimFilterTest.class.php 2007-08-28 14:21:06 UTC (rev 6240)
+++ 3.x/trunk/limb/i18n/tests/cases/template/tags/i18n/lmbI18NTrimFilterTest.class.php 2007-08-29 05:46:06 UTC (rev 6241)
@@ -56,4 +56,4 @@
}
}
-?>
+
Modified: 3.x/trunk/limb/i18n/tests/cases/template/tags/i18n/lmbI18NUppercaseFilterTest.class.php
===================================================================
--- 3.x/trunk/limb/i18n/tests/cases/template/tags/i18n/lmbI18NUppercaseFilterTest.class.php 2007-08-28 14:21:06 UTC (rev 6240)
+++ 3.x/trunk/limb/i18n/tests/cases/template/tags/i18n/lmbI18NUppercaseFilterTest.class.php 2007-08-29 05:46:06 UTC (rev 6241)
@@ -48,4 +48,4 @@
}
}
-?>
+
Modified: 3.x/trunk/limb/macro/tests/cases/lmbMacroTokenizerTest.class.php
===================================================================
--- 3.x/trunk/limb/macro/tests/cases/lmbMacroTokenizerTest.class.php 2007-08-28 14:21:06 UTC (rev 6240)
+++ 3.x/trunk/limb/macro/tests/cases/lmbMacroTokenizerTest.class.php 2007-08-29 05:46:06 UTC (rev 6241)
@@ -166,4 +166,4 @@
$this->parser->parse("<%tag\ta=\"A\"\rb='B'\nc = \"C\"\n%>");
}
}
-?>
+
Modified: 3.x/trunk/limb/net/tests/cases/lmbHttpCacheTest.class.php
===================================================================
--- 3.x/trunk/limb/net/tests/cases/lmbHttpCacheTest.class.php 2007-08-28 14:21:06 UTC (rev 6240)
+++ 3.x/trunk/limb/net/tests/cases/lmbHttpCacheTest.class.php 2007-08-29 05:46:06 UTC (rev 6241)
@@ -258,4 +258,4 @@
$this->assertTrue($this->cache->checkAndWrite($this->response));
}
}
-?>
+
Modified: 3.x/trunk/limb/net/tests/cases/lmbHttpRequestTest.class.php
===================================================================
--- 3.x/trunk/limb/net/tests/cases/lmbHttpRequestTest.class.php 2007-08-28 14:21:06 UTC (rev 6240)
+++ 3.x/trunk/limb/net/tests/cases/lmbHttpRequestTest.class.php 2007-08-29 05:46:06 UTC (rev 6241)
@@ -181,4 +181,4 @@
}
}
-?>
+
Modified: 3.x/trunk/limb/net/tests/cases/lmbHttpResponseTest.class.php
===================================================================
--- 3.x/trunk/limb/net/tests/cases/lmbHttpResponseTest.class.php 2007-08-28 14:21:06 UTC (rev 6240)
+++ 3.x/trunk/limb/net/tests/cases/lmbHttpResponseTest.class.php 2007-08-29 05:46:06 UTC (rev 6241)
@@ -215,4 +215,4 @@
}
}
-?>
+
Modified: 3.x/trunk/limb/net/tests/cases/lmbIpTest.class.php
===================================================================
--- 3.x/trunk/limb/net/tests/cases/lmbIpTest.class.php 2007-08-28 14:21:06 UTC (rev 6240)
+++ 3.x/trunk/limb/net/tests/cases/lmbIpTest.class.php 2007-08-29 05:46:06 UTC (rev 6241)
@@ -65,4 +65,4 @@
}
}
-?>
+
Modified: 3.x/trunk/limb/net/tests/cases/lmbMimeTypeTest.class.php
===================================================================
--- 3.x/trunk/limb/net/tests/cases/lmbMimeTypeTest.class.php 2007-08-28 14:21:06 UTC (rev 6240)
+++ 3.x/trunk/limb/net/tests/cases/lmbMimeTypeTest.class.php 2007-08-29 05:46:06 UTC (rev 6241)
@@ -49,4 +49,4 @@
$this->assertEqual(lmbMimeType :: getFileMimeType('test.rtf'), 'text/rtf');
}
}
-?>
+
Modified: 3.x/trunk/limb/net/tests/cases/lmbUploadedFilesParserTest.class.php
===================================================================
--- 3.x/trunk/limb/net/tests/cases/lmbUploadedFilesParserTest.class.php 2007-08-28 14:21:06 UTC (rev 6240)
+++ 3.x/trunk/limb/net/tests/cases/lmbUploadedFilesParserTest.class.php 2007-08-29 05:46:06 UTC (rev 6241)
@@ -385,4 +385,4 @@
}
}
-?>
+
Modified: 3.x/trunk/limb/net/tests/cases/lmbUriTest.class.php
===================================================================
--- 3.x/trunk/limb/net/tests/cases/lmbUriTest.class.php 2007-08-28 14:21:06 UTC (rev 6240)
+++ 3.x/trunk/limb/net/tests/cases/lmbUriTest.class.php 2007-08-29 05:46:06 UTC (rev 6241)
@@ -548,4 +548,4 @@
}
}
-?>
+
Modified: 3.x/trunk/limb/tests_runner/tests/cases/lmbTestTreeFilePathNodeTest.class.php
===================================================================
--- 3.x/trunk/limb/tests_runner/tests/cases/lmbTestTreeFilePathNodeTest.class.php 2007-08-28 14:21:06 UTC (rev 6240)
+++ 3.x/trunk/limb/tests_runner/tests/cases/lmbTestTreeFilePathNodeTest.class.php 2007-08-29 05:46:06 UTC (rev 6241)
@@ -166,4 +166,4 @@
}
}
-?>
+
Modified: 3.x/trunk/limb/validation/tests/cases/lmbErrorListTest.class.php
===================================================================
--- 3.x/trunk/limb/validation/tests/cases/lmbErrorListTest.class.php 2007-08-28 14:21:06 UTC (rev 6240)
+++ 3.x/trunk/limb/validation/tests/cases/lmbErrorListTest.class.php 2007-08-29 05:46:06 UTC (rev 6241)
@@ -27,4 +27,4 @@
$this->assertEqual($errors[0]->getValues(), array('FOO'));
}
}
-?>
+
Modified: 3.x/trunk/limb/validation/tests/cases/lmbValidationExceptionTest.class.php
===================================================================
--- 3.x/trunk/limb/validation/tests/cases/lmbValidationExceptionTest.class.php 2007-08-28 14:21:06 UTC (rev 6240)
+++ 3.x/trunk/limb/validation/tests/cases/lmbValidationExceptionTest.class.php 2007-08-29 05:46:06 UTC (rev 6241)
@@ -20,4 +20,4 @@
$this->assertEqual($exception->getMessage(), 'Message. Errors list : error1, error2');
}
}
-?>
+
Modified: 3.x/trunk/limb/validation/tests/cases/lmbValidatorTest.class.php
===================================================================
--- 3.x/trunk/limb/validation/tests/cases/lmbValidatorTest.class.php 2007-08-28 14:21:06 UTC (rev 6240)
+++ 3.x/trunk/limb/validation/tests/cases/lmbValidatorTest.class.php 2007-08-29 05:46:06 UTC (rev 6241)
@@ -61,4 +61,4 @@
}
}
-?>
+
Modified: 3.x/trunk/limb/validation/tests/cases/rule/lmbAtleastOneFieldRequiredRuleTest.class.php
===================================================================
--- 3.x/trunk/limb/validation/tests/cases/rule/lmbAtleastOneFieldRequiredRuleTest.class.php 2007-08-28 14:21:06 UTC (rev 6240)
+++ 3.x/trunk/limb/validation/tests/cases/rule/lmbAtleastOneFieldRequiredRuleTest.class.php 2007-08-29 05:46:06 UTC (rev 6241)
@@ -76,4 +76,4 @@
}
}
-?>
+
Modified: 3.x/trunk/limb/validation/tests/cases/rule/lmbDateRuleTest.class.php
===================================================================
--- 3.x/trunk/limb/validation/tests/cases/rule/lmbDateRuleTest.class.php 2007-08-28 14:21:06 UTC (rev 6240)
+++ 3.x/trunk/limb/validation/tests/cases/rule/lmbDateRuleTest.class.php 2007-08-29 05:46:06 UTC (rev 6241)
@@ -37,4 +37,4 @@
}
-?>
+
Modified: 3.x/trunk/limb/validation/tests/cases/rule/lmbDomainRuleTest.class.php
===================================================================
--- 3.x/trunk/limb/validation/tests/cases/rule/lmbDomainRuleTest.class.php 2007-08-28 14:21:06 UTC (rev 6240)
+++ 3.x/trunk/limb/validation/tests/cases/rule/lmbDomainRuleTest.class.php 2007-08-29 05:46:06 UTC (rev 6241)
@@ -172,4 +172,4 @@
$rule->validate($dataspace, $this->error_list);
}
}
-?>
+
Modified: 3.x/trunk/limb/validation/tests/cases/rule/lmbEmailRuleTest.class.php
===================================================================
--- 3.x/trunk/limb/validation/tests/cases/rule/lmbEmailRuleTest.class.php 2007-08-28 14:21:06 UTC (rev 6240)
+++ 3.x/trunk/limb/validation/tests/cases/rule/lmbEmailRuleTest.class.php 2007-08-29 05:46:06 UTC (rev 6241)
@@ -93,4 +93,4 @@
}
}
-?>
+
Modified: 3.x/trunk/limb/validation/tests/cases/rule/lmbI18NSizeRangeTest.class.php
===================================================================
--- 3.x/trunk/limb/validation/tests/cases/rule/lmbI18NSizeRangeTest.class.php 2007-08-28 14:21:06 UTC (rev 6240)
+++ 3.x/trunk/limb/validation/tests/cases/rule/lmbI18NSizeRangeTest.class.php 2007-08-29 05:46:06 UTC (rev 6241)
@@ -90,4 +90,4 @@
}
}
-?>
+
Modified: 3.x/trunk/limb/validation/tests/cases/rule/lmbIdentifierRuleTest.class.php
===================================================================
--- 3.x/trunk/limb/validation/tests/cases/rule/lmbIdentifierRuleTest.class.php 2007-08-28 14:21:06 UTC (rev 6240)
+++ 3.x/trunk/limb/validation/tests/cases/rule/lmbIdentifierRuleTest.class.php 2007-08-29 05:46:06 UTC (rev 6241)
@@ -67,4 +67,4 @@
$rule->validate($data, $this->error_list);
}
}
-?>
+
Modified: 3.x/trunk/limb/validation/tests/cases/rule/lmbInvalidValueRuleTest.class.php
===================================================================
--- 3.x/trunk/limb/validation/tests/cases/rule/lmbInvalidValueRuleTest.class.php 2007-08-28 14:21:06 UTC (rev 6240)
+++ 3.x/trunk/limb/validation/tests/cases/rule/lmbInvalidValueRuleTest.class.php 2007-08-29 05:46:06 UTC (rev 6241)
@@ -93,4 +93,4 @@
}
-?>
+
Modified: 3.x/trunk/limb/validation/tests/cases/rule/lmbLocaleDateRuleTest.class.php
===================================================================
--- 3.x/trunk/limb/validation/tests/cases/rule/lmbLocaleDateRuleTest.class.php 2007-08-28 14:21:06 UTC (rev 6240)
+++ 3.x/trunk/limb/validation/tests/cases/rule/lmbLocaleDateRuleTest.class.php 2007-08-29 05:46:06 UTC (rev 6241)
@@ -75,4 +75,4 @@
}
}
-?>
+
Modified: 3.x/trunk/limb/validation/tests/cases/rule/lmbMatchRuleTest.class.php
===================================================================
--- 3.x/trunk/limb/validation/tests/cases/rule/lmbMatchRuleTest.class.php 2007-08-28 14:21:06 UTC (rev 6240)
+++ 3.x/trunk/limb/validation/tests/cases/rule/lmbMatchRuleTest.class.php 2007-08-29 05:46:06 UTC (rev 6241)
@@ -89,4 +89,4 @@
$rule->validate($dataspace, $this->error_list);
}
}
-?>
+
Modified: 3.x/trunk/limb/validation/tests/cases/rule/lmbNumericPrecisionRuleTest.class.php
===================================================================
--- 3.x/trunk/limb/validation/tests/cases/rule/lmbNumericPrecisionRuleTest.class.php 2007-08-28 14:21:06 UTC (rev 6240)
+++ 3.x/trunk/limb/validation/tests/cases/rule/lmbNumericPrecisionRuleTest.class.php 2007-08-29 05:46:06 UTC (rev 6241)
@@ -107,4 +107,4 @@
$rule->validate($dataspace, $this->error_list);
}
}
-?>
+
Modified: 3.x/trunk/limb/validation/tests/cases/rule/lmbNumericValueRangeRuleTest.class.php
===================================================================
--- 3.x/trunk/limb/validation/tests/cases/rule/lmbNumericValueRangeRuleTest.class.php 2007-08-28 14:21:06 UTC (rev 6240)
+++ 3.x/trunk/limb/validation/tests/cases/rule/lmbNumericValueRangeRuleTest.class.php 2007-08-29 05:46:06 UTC (rev 6241)
@@ -83,4 +83,4 @@
$rule->validate($dataspace, $this->error_list);
}
}
-?>
+
Modified: 3.x/trunk/limb/validation/tests/cases/rule/lmbPatternRuleTest.class.php
===================================================================
--- 3.x/trunk/limb/validation/tests/cases/rule/lmbPatternRuleTest.class.php 2007-08-28 14:21:06 UTC (rev 6240)
+++ 3.x/trunk/limb/validation/tests/cases/rule/lmbPatternRuleTest.class.php 2007-08-29 05:46:06 UTC (rev 6241)
@@ -53,4 +53,4 @@
$rule->validate($data, $this->error_list);
}
}
-?>
+
Modified: 3.x/trunk/limb/validation/tests/cases/rule/lmbRequiredObjectRuleTest.class.php
===================================================================
--- 3.x/trunk/limb/validation/tests/cases/rule/lmbRequiredObjectRuleTest.class.php 2007-08-28 14:21:06 UTC (rev 6240)
+++ 3.x/trunk/limb/validation/tests/cases/rule/lmbRequiredObjectRuleTest.class.php 2007-08-29 05:46:06 UTC (rev 6241)
@@ -74,4 +74,4 @@
}
}
-?>
+
Modified: 3.x/trunk/limb/validation/tests/cases/rule/lmbRequiredRuleTest.class.php
===================================================================
--- 3.x/trunk/limb/validation/tests/cases/rule/lmbRequiredRuleTest.class.php 2007-08-28 14:21:06 UTC (rev 6240)
+++ 3.x/trunk/limb/validation/tests/cases/rule/lmbRequiredRuleTest.class.php 2007-08-29 05:46:06 UTC (rev 6241)
@@ -123,4 +123,4 @@
}
}
-?>
\ No newline at end of file
+
Modified: 3.x/trunk/limb/validation/tests/cases/rule/lmbSizeRangeRuleTest.class.php
===================================================================
--- 3.x/trunk/limb/validation/tests/cases/rule/lmbSizeRangeRuleTest.class.php 2007-08-28 14:21:06 UTC (rev 6240)
+++ 3.x/trunk/limb/validation/tests/cases/rule/lmbSizeRangeRuleTest.class.php 2007-08-29 05:46:06 UTC (rev 6241)
@@ -129,4 +129,4 @@
}
}
-?>
+
Modified: 3.x/trunk/limb/validation/tests/cases/rule/lmbUrlRuleTest.class.php
===================================================================
--- 3.x/trunk/limb/validation/tests/cases/rule/lmbUrlRuleTest.class.php 2007-08-28 14:21:06 UTC (rev 6240)
+++ 3.x/trunk/limb/validation/tests/cases/rule/lmbUrlRuleTest.class.php 2007-08-29 05:46:06 UTC (rev 6241)
@@ -102,4 +102,4 @@
}
}
-?>
+
Modified: 3.x/trunk/limb/validation/tests/cases/rule/lmbValidationRuleTestCase.class.php
===================================================================
--- 3.x/trunk/limb/validation/tests/cases/rule/lmbValidationRuleTestCase.class.php 2007-08-28 14:21:06 UTC (rev 6240)
+++ 3.x/trunk/limb/validation/tests/cases/rule/lmbValidationRuleTestCase.class.php 2007-08-29 05:46:06 UTC (rev 6241)
@@ -20,4 +20,4 @@
$this->error_list = new MockErrorList();
}
}
-?>
+
Modified: 3.x/trunk/limb/wact/tests/cases/compiler/compile_tree_node/WactPHPNodeTest.class.php
===================================================================
--- 3.x/trunk/limb/wact/tests/cases/compiler/compile_tree_node/WactPHPNodeTest.class.php 2007-08-28 14:21:06 UTC (rev 6240)
+++ 3.x/trunk/limb/wact/tests/cases/compiler/compile_tree_node/WactPHPNodeTest.class.php 2007-08-29 05:46:06 UTC (rev 6241)
@@ -30,4 +30,4 @@
$this->assertEqual($code_writer->renderCode(), '<?php test ?>');
}
}
-?>
+
Modified: 3.x/trunk/limb/web_app/tests/cases/db/validation/rule/lmbUniqueTableFieldRuleTest.class.php
===================================================================
--- 3.x/trunk/limb/web_app/tests/cases/db/validation/rule/lmbUniqueTableFieldRuleTest.class.php 2007-08-28 14:21:06 UTC (rev 6240)
+++ 3.x/trunk/limb/web_app/tests/cases/db/validation/rule/lmbUniqueTableFieldRuleTest.class.php 2007-08-29 05:46:06 UTC (rev 6241)
@@ -88,4 +88,4 @@
}
}
-?>
+
Modified: 3.x/trunk/limb/web_app/tests/cases/plain/filter/lmbActionPerformingFilterTest.class.php
===================================================================
--- 3.x/trunk/limb/web_app/tests/cases/plain/filter/lmbActionPerformingFilterTest.class.php 2007-08-28 14:21:06 UTC (rev 6240)
+++ 3.x/trunk/limb/web_app/tests/cases/plain/filter/lmbActionPerformingFilterTest.class.php 2007-08-29 05:46:06 UTC (rev 6241)
@@ -57,4 +57,4 @@
$filter->run($fc);
}
}
-?>
+
Modified: 3.x/trunk/limb/web_app/tests/cases/plain/filter/lmbViewRenderingFilterTest.class.php
===================================================================
--- 3.x/trunk/limb/web_app/tests/cases/plain/filter/lmbViewRenderingFilterTest.class.php 2007-08-28 14:21:06 UTC (rev 6240)
+++ 3.x/trunk/limb/web_app/tests/cases/plain/filter/lmbViewRenderingFilterTest.class.php 2007-08-29 05:46:06 UTC (rev 6241)
@@ -73,4 +73,4 @@
}
}
-?>
+
Modified: 3.x/trunk/limb/web_app/tests/cases/plain/request/lmbInputFilterTest.class.php
===================================================================
--- 3.x/trunk/limb/web_app/tests/cases/plain/request/lmbInputFilterTest.class.php 2007-08-28 14:21:06 UTC (rev 6240)
+++ 3.x/trunk/limb/web_app/tests/cases/plain/request/lmbInputFilterTest.class.php 2007-08-29 05:46:06 UTC (rev 6241)
@@ -38,4 +38,4 @@
}
}
-?>
+
Modified: 3.x/trunk/limb/web_app/tests/cases/plain/request/lmbRoutesToUrlTest.class.php
===================================================================
--- 3.x/trunk/limb/web_app/tests/cases/plain/request/lmbRoutesToUrlTest.class.php 2007-08-28 14:21:06 UTC (rev 6240)
+++ 3.x/trunk/limb/web_app/tests/cases/plain/request/lmbRoutesToUrlTest.class.php 2007-08-29 05:46:06 UTC (rev 6241)
@@ -137,4 +137,4 @@
$path = str_replace('/admin_', '/admin/', $path);
}
}
-?>
+
Modified: 3.x/trunk/limb/web_app/tests/cases/plain/toolkit/lmbWebAppToolsTest.class.php
===================================================================
--- 3.x/trunk/limb/web_app/tests/cases/plain/toolkit/lmbWebAppToolsTest.class.php 2007-08-28 14:21:06 UTC (rev 6240)
+++ 3.x/trunk/limb/web_app/tests/cases/plain/toolkit/lmbWebAppToolsTest.class.php 2007-08-29 05:46:06 UTC (rev 6241)
@@ -54,4 +54,4 @@
}
}
-?>
+
Modified: 3.x/trunk/limb/web_spider/tests/cases/lmbInnerUriNormalizerObserverTest.class.php
===================================================================
--- 3.x/trunk/limb/web_spider/tests/cases/lmbInnerUriNormalizerObserverTest.class.php 2007-08-28 14:21:06 UTC (rev 6240)
+++ 3.x/trunk/limb/web_spider/tests/cases/lmbInnerUriNormalizerObserverTest.class.php 2007-08-29 05:46:06 UTC (rev 6241)
@@ -68,4 +68,4 @@
}
-?>
+
More information about the limb-svn
mailing list