Commit graph

62 commits

Author SHA1 Message Date
euromark
5c5fb59c8d Allow apps to overwrite translation domains from third party plugins. 2014-12-23 13:09:53 +01:00
mark_story
4d6611b328 Merge branch 'master' into 2.6
Conflicts:
	lib/Cake/VERSION.txt
2014-12-17 21:38:32 -05:00
ADmad
850edf47a0 Fix plural calculation for Arabic.
Refs #5348
2014-12-08 23:58:27 +05:30
Marlin Cremers
b47f91c47c Add context support to the I18n class which resolves cakephp/cakephp#2063
This change adds Gettext context support to the I18n class. This
allows custom translations for verbs and nouns and more.
2014-07-17 11:01:11 +02:00
func0der
06f47ee01f Introduced I18n category constants (#1894)
Replaced all hard coded category values
2014-03-23 17:00:17 +01:00
ADmad
84932fcc4a Don't start a session if it's known to be empty.
If an app only reads/checks the session there's no need to start a
session to know that the read/checked session value is empty.

Fixes #1981
2014-01-22 01:17:16 +05:30
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
Ceeram
84c980f1f4 avoid notices when loading locale file
Conflicts:

	lib/Cake/Test/Case/I18n/I18nTest.php
2013-09-01 06:05:40 +02:00
ADmad
18cd3729e4 Deprecated DEFAULT_LANGUAGE constant and config value 'Config.language' is not used for default.
Cleaned up L10n::_setLanguage(). Removed unused L10n::$found
2013-08-07 03:37:26 +05:30
ADmad
38b050a711 Merge branch 'master' into 2.4
Conflicts:
	lib/Cake/Console/Command/ConsoleShell.php
2013-08-04 19:26:55 +05:30
mark_story
17b25388b3 Throw exceptions when '' is used as translation domain.
'' is never a good translation domain and often indicates developer
error. Treat it as a mistake and throw an exception.

Fixes #3939
2013-07-27 21:41:22 -04:00
euromark
24fa926ff9 remove private in favor of protected visibility 2013-07-22 21:08:05 +02:00
ADmad
4ded269549 Merge branch 'master' into 2.4
Conflicts:
	lib/Cake/Controller/Component/Auth/BlowfishAuthenticate.php
	lib/Cake/VERSION.txt
2013-07-07 12:22:12 +05:30
euromark
af455b4121 correct return types in doc blocks 2013-07-05 17:19:22 +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
23ef13f9c7 adding Kazakh and correcting some locales 2013-02-10 20:07:09 +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
eadc3a75e5 fix coding standards 2012-11-21 15:39:03 +01:00
Mark Story
51245ce41d Merge pull request #874 from dereuromark/2.3-languages
after correcting nld the iso standard should be enforced for all langs
2012-09-28 17:55:02 -07:00
Mark Story
87fc86133c Merge pull request #873 from dereuromark/coding-standards
correcting coding-standards
2012-09-28 17:49:32 -07:00
euromark
032704346a after correcting nld the iso standard should be enforced for all languages 2012-09-28 14:46:29 +02:00
euromark
b7f1740d2b correcting coding-standards 2012-09-28 13:49:51 +02:00
euromark
c87b53a7d8 correcting iso standard for nld (dutch) - making dut the alias 2012-09-27 10:10:40 +02:00
ADmad
65e63c51c8 More missing parent calls. 2012-08-12 02:28:12 +05:30
ADmad
802f00b6e3 Adding missing calls to parent. 2012-08-12 02:13:10 +05:30
Kyle Robinson Young
b8488b8dfe Update 1.x @link in docblocks 2012-04-26 19:49:18 -07:00
ADmad
1949a20b5a Ensure L10n::get() consistently returns the set language. Closes #2737 2012-04-09 00:49:24 +05:30
mark_story
49a455a2cb Fix some code standards warnings. 2012-03-24 22:15:08 -04:00
Kyle Robinson Young
90e7afbdc7 Correct parameter order of assertEquals and assertNotEquals 2012-03-22 23:37:12 -07:00
mark_story
3851ad08a6 Fix code standards warnings. 2012-03-21 21:56:53 -04:00
mark_story
94b3839b2e Fix a few more small issues. 2012-03-18 23:25:19 -04:00
mark_story
12efa3eb70 Remove duplication in the I18n test. 2012-03-18 22:29:16 -04:00
mark_story
e33dc98124 Fix more coding style errors. 2012-03-18 18:52:35 -04:00
Juan Basso
3b1bd90ad6 Updated copyright to 2012. 2012-03-12 22:46:07 -04:00
euromark
e94d307ee1 code conventions 2012-02-25 19:46:05 -05:00
Kyle Robinson Young
22582aee63 Upgrade legacy uses of App::build() types 2012-02-18 04:31:29 -08:00
Kyle Robinson Young
c4829dc3b8 Use App::RESET instead of true with App::build() 2012-02-18 04:04:54 -08:00
Kyle Robinson Young
4141a3ab5b Load specific test plugins rather than all to avoid conflicts 2012-02-16 20:03:44 -08:00
Majna
d41e5621b7 Fix missing and invalid assertions in tests.
Remove unused variables and dead code.
2012-02-16 19:28:21 +01:00
Rachman Chavik
4574dbc273 fix failing test 2012-02-10 22:26:00 +07:00
ADmad
0be71a08d6 Adding / updating I18n class test cases. 2012-01-10 01:46:19 +05:30
Kyle Robinson Young
5876744709 Adhering to coding standards 2011-11-30 07:44:11 -08:00
m
2957a33b23 assertEqual to assertEquals in core test files
Signed-off-by: mark_story <mark@mark-story.com>
2011-11-19 09:25:03 -05:00
Kyle Robinson Young
98f03dc6df Replacing test case compatibility functions 2011-11-16 21:07:08 -05:00
mark_story
684c154777 Removing more flaky tests. 2011-09-04 10:50:15 +01:00
mark_story
2218923782 Removing a failing test. I think the encoding of the file has changed over time,
and I don't have a typeface with lowercase Georgian text.
2011-09-04 10:22:35 +01:00
mark_story
8630f4cdcb Fixing mistake in last commit. 2011-09-04 02:15:45 +01:00
mark_story
8c8dc6cebb Fixing the one failing Multibyte test. 2011-09-04 01:55:26 +01:00