Commit graph

39 commits

Author SHA1 Message Date
Marc Würth
7cfa0116f4 Removed "PHP 5" from file header DocBlocks
This statement does not serve a purpose anymore.
In a long forgotten world it indicated the main version number of PHP which the code in the file was compatible to.
http://pear.php.net/manual/en/standards.sample.php
But since PHP 5.1 and later this is only marginally true.
Thus I propose to remove it from CakePHP.
2013-11-13 22:58:39 +01:00
mark_story
ada0ec4c77 Fix formatting of decimal values when there is no fractionSymbol.
When a currency format does not include a fractionSymbol it should be
able to format fractional values.

Fixes #2253
2013-11-09 09:36:38 -05:00
mark_story
3244b9e3d7 Merge branch 'master' into 2.4 2013-08-16 14:47:01 -04:00
Frank de Graaf
33f7de0072 Merge pull request #1520 from mvdriel/cakenumber-fix
Cakenumber fix
2013-08-14 13:41:53 -07:00
Mark van Driel
559fb5805b Fix formatting with locales using , as decimal separator
No double number formatting for readable size

Fixed testPrecisionLocalized for travis (when locale is missing?)

Switched locale to nl_NL and fixed test

Skip test when locale is not available
2013-08-14 22:19:38 +02:00
Phally
6f74e1958b Makes the locale test not always pass, be verbose when it is skipped. 2013-08-14 21:00:31 +02:00
euromark
ad6fcd43d7 Fix currency output for fraction values using fractionExponent option. 2013-08-07 00:36:37 +02:00
Phally
e35bd80dfb Adds option to multiply decimal percentages. Fixes #3814 2013-07-10 14:37:57 +02:00
ADmad
3303a2cda1 Merge branch 'master' into 2.4
Conflicts:
	lib/Cake/Console/Templates/skel/Config/Schema/db_acl.php
	lib/Cake/Console/Templates/skel/Config/Schema/i18n.php
	lib/Cake/Console/Templates/skel/Config/Schema/sessions.php
	lib/Cake/Console/Templates/skel/Config/acl.ini.php
	lib/Cake/Console/Templates/skel/Config/acl.php
	lib/Cake/Console/Templates/skel/Config/bootstrap.php
	lib/Cake/Console/Templates/skel/Config/core.php
	lib/Cake/Console/Templates/skel/Config/database.php.default
	lib/Cake/Console/Templates/skel/Config/email.php.default
	lib/Cake/Console/Templates/skel/Config/routes.php
	lib/Cake/Console/Templates/skel/Console/Command/AppShell.php
	lib/Cake/Console/Templates/skel/Console/cake.bat
	lib/Cake/Console/Templates/skel/Console/cake.php
	lib/Cake/Console/Templates/skel/Controller/AppController.php
	lib/Cake/Console/Templates/skel/Controller/PagesController.php
	lib/Cake/Console/Templates/skel/Model/AppModel.php
	lib/Cake/Console/Templates/skel/View/Errors/error400.ctp
	lib/Cake/Console/Templates/skel/View/Errors/error500.ctp
	lib/Cake/Console/Templates/skel/View/Helper/AppHelper.php
	lib/Cake/Console/Templates/skel/View/Layouts/Emails/html/default.ctp
	lib/Cake/Console/Templates/skel/View/Layouts/ajax.ctp
	lib/Cake/Console/Templates/skel/View/Layouts/default.ctp
	lib/Cake/Console/Templates/skel/View/Layouts/error.ctp
	lib/Cake/Console/Templates/skel/View/Layouts/flash.ctp
	lib/Cake/Console/Templates/skel/View/Pages/home.ctp
	lib/Cake/Console/Templates/skel/index.php
	lib/Cake/Console/Templates/skel/webroot/index.php
	lib/Cake/Console/Templates/skel/webroot/test.php
2013-06-02 18:03:59 +05:30
Marc Würth
4c9f0414cb Improved the DocBlocks and other code cleanup
Fixed @license tag, url comes first
Whitespace and other minor code cleanup
Added some docblocks
2013-05-31 00:11:19 +02:00
euromark
f633241775 fix spacing error 2013-03-10 18:26:58 +01:00
euromark
a9bbaed3d6 fix coding standards 2013-03-10 18:11:50 +01:00
euromark
eb874f87a3 Top 6 world currencies and make them utf8 per default 2013-03-06 23:35:18 +01:00
Graham Weldon
66d856d883 Added extra line for referencing license file for copyright 2013-02-08 21:22:51 +09:00
Graham Weldon
7b860debe4 This commit is dedicated to Mark Story, who has put in much dedicated time and effort into CakePHP over the years.
I just wanted to ruin his evening, because this change needs to be merged into CakePHP 3.0.
2013-02-08 20:59:49 +09:00
Ceeram
16be9d4990 remove unused local vars 2013-01-23 17:22:06 +01:00
dogmatic69
bcb3eb89dc Before this change 0.00 and '0.00' are treated differently. Floats from the database are returned as the string
version while doing calculations will normally end up as floats.

This causes output differences on pages like order totals or invoices where there is a mix of calculated values
and database values.

	Number::currency(0.00, 'GBP') -> £0.00
	Number::currency('0.00', 'GBP') -> 0p

Both versions will return `£0.00` (or whatever 0 is configured to return).
2013-01-11 17:00:06 +00:00
ADmad
a340c19c08 Added support for php.ini style values 2012-12-23 02:25:59 +05:30
Ceeram
f4f4aa4a2a Squashed commit of the following:
commit 22311a1e62934da757d53d7aecfce884f5a1ca10
Merge: fda331e d051b69
Author: Ceeram <c33ram@gmail.com>
Date:   Fri Oct 26 14:40:24 2012 +0200

    Merge branch '2.3' into currency

commit fda331eab169068763717f88838032b7c0c02c29
Author: Ceeram <c33ram@gmail.com>
Date:   Sun Oct 7 23:53:03 2012 +0200

    NumberHelper now also uses the default currency from CakeNumber, instead of default argument value

commit 967bf8e27ea2438f1972390b7ef78ae62e17a762
Author: Ceeram <c33ram@gmail.com>
Date:   Sun Oct 7 18:01:35 2012 +0200

    Adding feature to set default currency on CakeNumber, to make repetetive calls to CakeNumber::currency() more DRY
2012-10-26 19:32:39 +02:00
euromark
0be1943bcd adding basic test 2012-09-20 01:56:52 +02:00
euromark
3fa6b96ad0 adding CakeNumber::formatDelta() and fixing issue with near-zero values and format() 2012-09-20 01:41:41 +02:00
Ceeram
ff676b5ea4 allow for lowercase as well, also strip the unit part off before pow() 2012-09-18 17:15:33 +02:00
Ceeram
9530e68ae6 add default return value as parameter to use when size can not be determined 2012-09-17 13:21:50 +02:00
Ceeram
6ec0afcf5d Add CakeNumber::fromReadableSize() and Validation::filesize() 2012-06-26 12:17:25 +02:00
Jose Lorenzo Rodriguez
03d31b57f7 Merge remote-tracking branch 'origin/2.1' into 2.2 2012-06-19 19:28:20 -04:30
Ceeram
cd209ce099 Avoid using LC_ALL, on some installs this would cause error:
"setlocale(): Specified locale name is too long"
2012-06-19 23:20:08 +02:00
Ceeram
03e2263b69 Merge branch '2.1' into 2.2 2012-06-19 18:35:36 +02:00
mark_story
89b2eddf0b Try regexp as not all locales are available. 2012-06-18 23:45:44 -04:00
mark_story
6a1e9e80b2 Try LC_ALL instead. 2012-06-18 23:31:10 -04:00
mark_story
77fc8a9d33 Switch to de_DE
nl_NL doesn't seem to exist on the ci server.
2012-06-18 23:25:42 -04:00
mark_story
001e89bf3f Fix formatting with locales using , as decimal separator
Fixes #2958
2012-06-18 23:13:09 -04:00
Jelle Henkens
97ebbc8e23 Fixing coding conventions 2012-05-19 16:08:40 +01:00
Jose Lorenzo Rodriguez
bf0f5ab118 Merge remote-tracking branch 'origin/2.1' into 2.2 2012-04-29 20:05:39 -04:30
Kyle Robinson Young
b8488b8dfe Update 1.x @link in docblocks 2012-04-26 19:49:18 -07:00
euromark
bc2cd00123 cake 2.2 test case fixes (assert corrections, correct class names) 2012-04-21 15:02:35 +02:00
Kyle Robinson Young
4370bf280a Support multiple bytes with thousands/decimals in CakeNumber::format < PHP5.4
Fixes #2602
2012-03-28 10:46:31 -07:00
mark_story
1efee89169 Fix most coding standards issues in Test/Case/Utility 2012-03-13 22:59:20 -04:00
Juan Basso
3b1bd90ad6 Updated copyright to 2012. 2012-03-12 22:46:07 -04:00
Rachman Chavik
cd7a8452a2 renaming NumberHelperTest to CakeNumberTest 2012-02-10 22:25:59 +07:00
Renamed from lib/Cake/Test/Case/View/Helper/NumberHelperTest.php (Browse further)