adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-02-12 06:56:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Changing NumberHelper::currency() to format < 1euro based on the suggestions from 'Joel Haasnoot'. Instead of 99c you will get €0,99.

Browse source 
Test cases updated.  Fixes #1253
This commit is contained in:
mark_story 2010-11-02 21:56:24 -04:00
parent 2403d7fedc
commit d1403b0da8
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cake/libs/view/helpers/number.php
View file

@ -48,7 +48,7 @@ class NumberHelper extends AppHelper {
'decimals' => '.', 'negative' => '()','escape' => false 'decimals' => '.', 'negative' => '()','escape' => false
), ),
'EUR' => array( 'EUR' => array(
'before'=>'&#8364;', 'after' => 'c', 'zero' => 0, 'places' => 2, 'thousands' => '.', 'before'=>'&#8364;', 'after' => false, 'zero' => 0, 'places' => 2, 'thousands' => '.',
'decimals' => ',', 'negative' => '()', 'escape' => false 'decimals' => ',', 'negative' => '()', 'escape' => false
) )
); );

10
cake/tests/cases/libs/view/helpers/number.test.php
View file

@ -236,7 +236,7 @@ class NumberHelperTest extends CakeTestCase {
$this->assertEqual($expected, $result); $this->assertEqual($expected, $result);
$result = $this->Number->currency($value, 'EUR'); $result = $this->Number->currency($value, 'EUR');
$expected = '99c'; $expected = '&#8364;0,99';
$this->assertEqual($expected, $result); $this->assertEqual($expected, $result);
$result = $this->Number->currency($value, 'GBP'); $result = $this->Number->currency($value, 'GBP');
@ -258,7 +258,7 @@ class NumberHelperTest extends CakeTestCase {
$this->assertEqual($expected, $result); $this->assertEqual($expected, $result);
$result = $this->Number->currency($value, 'EUR'); $result = $this->Number->currency($value, 'EUR');
$expected = '(99c)'; $expected = '(&#8364;0,99)';
$this->assertEqual($expected, $result); $this->assertEqual($expected, $result);
$result = $this->Number->currency($value, 'GBP'); $result = $this->Number->currency($value, 'GBP');
@ -270,7 +270,7 @@ class NumberHelperTest extends CakeTestCase {
$this->assertEqual($expected, $result); $this->assertEqual($expected, $result);
$result = $this->Number->currency($value, 'EUR', array('negative'=>'-')); $result = $this->Number->currency($value, 'EUR', array('negative'=>'-'));
$expected = '-99c'; $expected = '-&#8364;0,99';
$this->assertEqual($expected, $result); $this->assertEqual($expected, $result);
$result = $this->Number->currency($value, 'GBP', array('negative'=>'-')); $result = $this->Number->currency($value, 'GBP', array('negative'=>'-'));
@ -336,6 +336,10 @@ class NumberHelperTest extends CakeTestCase {
$result = $this->Number->currency('0.35', 'GBP'); $result = $this->Number->currency('0.35', 'GBP');
$expected = '35p'; $expected = '35p';
$this->assertEqual($expected, $result); $this->assertEqual($expected, $result);
$result = $this->Number->currency('0.35', 'EUR');
$expected = '&#8364;0,35';
$this->assertEqual($expected, $result);
} }
/** /**