6543/CommunityID
1
0
Fork 0
Code Issues 3 Pull Requests Releases Wiki Activity

import v1.1.0_RC2 | 2009-09-20

Browse Source
This commit is contained in:
6543
2019-07-17 22:19:00 +02:00
parent 3b7ba80568
commit 38c146901c
2504 changed files with 101817 additions and 62316 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
libs/Zend/Measure/Number.php
View File

@ -14,9 +14,9 @@
*
* @category Zend
* @package Zend_Measure
* @copyright Copyright (c) 2005-2008 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id: Number.php 12514 2008-11-10 16:30:24Z matthew $
* @version $Id: Number.php 16220 2009-06-21 19:49:21Z thomas $
*/
/**
@ -33,7 +33,7 @@ require_once 'Zend/Locale.php';
* @category Zend
* @package Zend_Measure
* @subpackage Zend_Measure_Number
* @copyright Copyright (c) 2005-2008 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Zend_Measure_Number extends Zend_Measure_Abstract
@ -76,7 +76,7 @@ class Zend_Measure_Number extends Zend_Measure_Abstract
/**
* Definition of all roman signs
*
*
* @var array $_roman
*/
private static $_roman = array(
@ -109,7 +109,7 @@ class Zend_Measure_Number extends Zend_Measure_Abstract
/**
* Convertion table for roman signs
*
*
* @var array $_romanconvert
*/
private static $_romanconvert = array(
@ -336,7 +336,7 @@ class Zend_Measure_Number extends Zend_Measure_Abstract
$target = call_user_func(Zend_Locale_Math::$mod, $value, $base);
$newvalue = strtoupper(dechex($target)) . $newvalue;
$value = call_user_func(Zend_Locale_Math::$sub, $value, $target, 0);
$value = call_user_func(Zend_Locale_Math::$div, $value, $base, 0);
@ -346,7 +346,7 @@ class Zend_Measure_Number extends Zend_Measure_Abstract
throw new Zend_Measure_Exception("Your value '$tempvalue' cannot be processed because it extends 200 digits");
}
}
if ($newvalue === '') {
$newvalue = '0';
}
@ -412,9 +412,9 @@ class Zend_Measure_Number extends Zend_Measure_Abstract
* @param integer $round (Optional) Precision to add, will always be 0
* @return string
*/
public function convertTo($type, $round = 0)
public function convertTo($type, $round = 0, $locale = null)
{
$this->setType($type);
return $this->toString($round);
return $this->toString($round, $locale);
}
}