From d1403b0da8b0e2f1b4efad510e2891a0e4c50928 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Tue, 2 Nov 2010 21:56:24 -0400
Subject: [PATCH] =?UTF-8?q?Changing=20NumberHelper::currency()=20to=20form?=
 =?UTF-8?q?at=20<=201euro=20based=20on=20the=20suggestions=20from=20'Joel?=
 =?UTF-8?q?=20Haasnoot'.=20=20Instead=20of=2099c=20you=20will=20get=20?=
 =?UTF-8?q?=E2=82=AC0,99.=20Test=20cases=20updated.=20=20Fixes=20#1253?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cake/libs/view/helpers/number.php                  |  2 +-
 cake/tests/cases/libs/view/helpers/number.test.php | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/cake/libs/view/helpers/number.php b/cake/libs/view/helpers/number.php
index 236732a92..3abf3517f 100644
--- a/cake/libs/view/helpers/number.php
+++ b/cake/libs/view/helpers/number.php
@@ -48,7 +48,7 @@ class NumberHelper extends AppHelper {
 			'decimals' => '.', 'negative' => '()','escape' => false
 		),
 		'EUR' => array(
-			'before'=>'&#8364;', 'after' => 'c', 'zero' => 0, 'places' => 2, 'thousands' => '.',
+			'before'=>'&#8364;', 'after' => false, 'zero' => 0, 'places' => 2, 'thousands' => '.',
 			'decimals' => ',', 'negative' => '()', 'escape' => false
 		)
 	);
diff --git a/cake/tests/cases/libs/view/helpers/number.test.php b/cake/tests/cases/libs/view/helpers/number.test.php
index 9f2d238de..d5f88aa61 100644
--- a/cake/tests/cases/libs/view/helpers/number.test.php
+++ b/cake/tests/cases/libs/view/helpers/number.test.php
@@ -236,7 +236,7 @@ class NumberHelperTest extends CakeTestCase {
 		$this->assertEqual($expected, $result);
 
 		$result = $this->Number->currency($value, 'EUR');
-		$expected = '99c';
+		$expected = '&#8364;0,99';
 		$this->assertEqual($expected, $result);
 
 		$result = $this->Number->currency($value, 'GBP');
@@ -258,7 +258,7 @@ class NumberHelperTest extends CakeTestCase {
 		$this->assertEqual($expected, $result);
 
 		$result = $this->Number->currency($value, 'EUR');
-		$expected = '(99c)';
+		$expected = '(&#8364;0,99)';
 		$this->assertEqual($expected, $result);
 
 		$result = $this->Number->currency($value, 'GBP');
@@ -270,7 +270,7 @@ class NumberHelperTest extends CakeTestCase {
 		$this->assertEqual($expected, $result);
 
 		$result = $this->Number->currency($value, 'EUR', array('negative'=>'-'));
-		$expected = '-99c';
+		$expected = '-&#8364;0,99';
 		$this->assertEqual($expected, $result);
 
 		$result = $this->Number->currency($value, 'GBP', array('negative'=>'-'));
@@ -336,6 +336,10 @@ class NumberHelperTest extends CakeTestCase {
 		$result = $this->Number->currency('0.35', 'GBP');
 		$expected = '35p';
 		$this->assertEqual($expected, $result);
+		
+		$result = $this->Number->currency('0.35', 'EUR');
+		$expected = '&#8364;0,35';
+		$this->assertEqual($expected, $result);
 	}
 
 /**