Commit graph

131 commits

Author SHA1 Message Date
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
mark_story
cd3c54bb9d Merge branch 'master' into 2.4
Conflicts:
	lib/Cake/VERSION.txt
2013-06-10 22:12:10 -04:00
euromark
a6f065e7a2 coding standards whitespace and single quote 2013-06-09 17:20:08 +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
ADmad
fb86859585 Merge branch 'master' into 2.4 2013-05-19 14:37:41 +05:30
euromark
97c2cb367d CS fixes 2013-05-17 10:36:17 +02:00
mark_story
aee8b50507 Merge branch 'master' into 2.4 2013-04-15 21:48:26 -04:00
mark_story
8eb56960d8 Remove remaining reference operators.
These were left over from the days of 1.x and aren't needed anymore.
2013-04-15 21:23:48 -04:00
Henrik Gemal
f46e00c7d9 Adding Kalaallisut locale
From pull request 1163

Fixes #3634

Signed-off-by: mark_story <mark@mark-story.com>

Conflicts:
	lib/Cake/I18n/L10n.php
2013-03-01 22:02:42 -05:00
mark_story
d1c88ebf8a Merge branch 'master' into 2.4
Conflicts:
	lib/Cake/Log/Engine/FileLog.php
	lib/Cake/Utility/Validation.php
	lib/Cake/View/Helper/HtmlHelper.php
2013-02-24 20:24:26 -05:00
euromark
111366d5c8 == to === and != to !== where applicable 2013-02-12 03:38:08 +01: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
3f4d24bfc0 remove unused local variables and a few improvements 2012-12-23 13:53:13 +01:00
euromark
b811afbc44 double spaces to single ones 2012-12-22 23:48:15 +01:00
euromark
2b1e5b02b5 code cleanup 2012-12-21 00:40:12 +01:00
Mark Story
0230fa102a Merge pull request #975 from dereuromark/2.3-i18n
use CakeSession wrapper in i18n class
2012-11-28 18:33:39 -08:00
ADmad
72d6ca636f Docblock fixes 2012-11-29 04:36:29 +05:30
euromark
c3e501b2d9 use CakeSession wrapper 2012-11-27 00:09:21 +01:00
mark_story
27d7e2865e Merge branch 'master' into 2.3
Conflicts:
	lib/Cake/Console/Command/ConsoleShell.php
	lib/Cake/Network/CakeSocket.php
	lib/Cake/Network/Http/HttpResponse.php
	lib/Cake/Utility/Folder.php
	lib/Cake/View/MediaView.php
	lib/Cake/basics.php
2012-11-20 23:02:33 -05:00
Ceeram
e02eab05d5 Remove all todo from core, create tickets for them 2012-11-14 14:59:51 +01:00
mark_story
e0aab77dab Merge branch 'master' into 2.3
Conflicts:
	app/Config/Schema/i18n.php
	lib/Cake/I18n/Multibyte.php
	lib/Cake/Test/Case/Log/CakeLogTest.php
	lib/Cake/Test/Case/Routing/DispatcherTest.php
2012-11-10 21:33:26 -05:00
Ceeram
aaf2d2ef71 fix remaining cs errors 2012-11-04 13:56:13 +01:00
ADmad
1e50ead75b Fix coding standard error 2012-10-29 02:19:24 +05:30
dogmatic69
641ba9f3e6 Merge branch '2.3' into type-checks
Conflicts:
	lib/Cake/Error/ExceptionRenderer.php
	lib/Cake/Routing/Dispatcher.php
2012-10-24 19:03:44 +01:00
ADmad
3ee267d7ef Moving the mb_* functions to bootstrap.php 2012-10-23 16:58:07 +05:30
ADmad
1763f46340 Merge branch 'master' into 2.3
Conflicts:
	lib/Cake/bootstrap.php
2012-10-23 16:53:01 +05:30
ADmad
922d9865fa Moving multibyte encoding setting to bootstrap.php. Closes #3290 2012-10-23 13:20:01 +05:30
dogmatic69
408e619c9f Merge branch '2.3' into type-checks
Conflicts:
	lib/Cake/Console/Command/Task/ModelTask.php
	lib/Cake/Controller/Component/RequestHandlerComponent.php
	lib/Cake/Model/Datasource/Database/Mysql.php
	lib/Cake/Utility/CakeNumber.php
2012-10-01 02:08:00 +01:00
euromark
a33b187a09 doc block correction 2012-09-28 14:51:51 +02:00
euromark
032704346a after correcting nld the iso standard should be enforced for all languages 2012-09-28 14:46:29 +02:00
euromark
c87b53a7d8 correcting iso standard for nld (dutch) - making dut the alias 2012-09-27 10:10:40 +02:00
euromark
213d4caa85 coding standards 2012-09-20 01:50:15 +02:00
dogmatic69
a38a616cba changing join() to implode() for consistency 2012-09-15 11:06:02 +01:00
dogmatic69
22a2e1b51e converting $foo == / $foo == 0 to !$foo (and a few $foo === 0) 2012-09-14 18:42:25 +01:00
Jelle Henkens
f7ce5262b7 Updating mixed @param documentation to seperate list of accepted types 2012-05-21 21:55:10 +01:00
mark_story
9f9feec222 Merge branch '2.2-hash' into 2.2
Conflicts:
	lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php
	lib/Cake/View/Helper/FormHelper.php
2012-04-10 21:32:37 -04:00
ADmad
1949a20b5a Ensure L10n::get() consistently returns the set language. Closes #2737 2012-04-09 00:49:24 +05:30
ADmad
35b48c2c8c Fix indentation 2012-04-09 00:43:04 +05:30
mark_story
17bfbbb9df Port over Set to Hash usage. 2012-03-26 22:32:55 -04:00
Juan Basso
c754fb2dcb Updated copyright to 2012. 2012-03-12 22:46:46 -04:00
Juan Basso
3b1bd90ad6 Updated copyright to 2012. 2012-03-12 22:46:07 -04:00
mark_story
69ab443ed6 Fix whitespace for coding standards. 2012-03-10 21:19:04 -05:00
mark_story
664b0538b8 Fix more coding standards problems. 2012-03-04 22:49:38 -05:00
mark_story
c5be343b72 Fix most of the coding standards issues in I18n/
There are a number of whitespace related issues in Multibyte, and
variable name related ones in I18n that cannot be easily changed.
2012-03-03 20:15:21 -05:00
euromark
e94d307ee1 code conventions 2012-02-25 19:46:05 -05:00
ADmad
30522d0219 Adding $language parameter to I18n::translate() 2012-01-10 00:51:48 +05:30
ADmad
08825e54b7 Replacing hardcoded default domain with static property I18n::$defaultDomain 2012-01-10 00:51:48 +05:30
ADmad
1f246d61ca Refactoring I18n class to expose public methods to read .po, .mo and locale definition files. 2012-01-10 00:51:47 +05:30
Mark Story
21ac8492b1 Adding an int cast.
PHP 5.4 doesn't like floats for string offsets.
2011-12-27 21:57:33 -05:00
mark_story
bbad5d86bc Adding louder more informative error to i18n.
When a plural form is wrong, or the Plural-Forms header is wrong, we should
give a more useful error message than strlen() does.  Also make a dumb guess
at what the correct translation is.

Fixes #2045
2011-12-25 23:27:01 -05:00
Kyle Robinson Young
51f9837db4 Code standards formatting 2011-12-15 22:52:07 -08:00
ADmad
f367249bdb Fixing visibility keyword for constructor 2011-12-09 14:08:20 +05:30
Kyle Robinson Young
94e119fe67 Adhere to code formatting standard 2011-11-30 23:21:31 -08:00
mark_story
cd81f9c30a Fix comment in I18n
Move construction details to a protected constructor.
Fixes #2222
2011-11-05 08:19:57 -04:00
ADmad
11f38687f7 Fixing doc block 2011-09-29 20:04:06 +05:30
Mark Story
59c6b419e5 Merge branch '1.3' into merger
Conflicts:
	cake/console/libs/bake.php
	cake/libs/configure.php
	cake/libs/controller/components/request_handler.php
	cake/tests/cases/console/libs/tasks/fixture.test.php
	cake/tests/cases/libs/controller/components/request_handler.test.php
	lib/Cake/Cache/Engine/FileEngine.php
	lib/Cake/Test/Case/Controller/ScaffoldTest.php
	lib/Cake/Utility/Validation.php
2011-08-28 22:08:49 -04:00
Juan Basso
f5a54d00dd Changed methods and attributes from private to protected. 2011-08-20 00:43:34 -04:00
Juan Basso
895c10af7b Adjusted some types in @param, @return and @var. 2011-07-31 22:57:17 -04:00
Juan Basso
9bc3e567c1 Removed the @access and @static. 2011-07-30 20:56:48 -04:00
Juan Basso
070980b170 Fixed some API doc in i18n and network. 2011-07-28 23:56:10 -04:00
Jose Lorenzo Rodriguez
25682db434 Removing duplicate directory separator when looking for locale search paths, closes #1854 2011-07-27 17:41:25 -04:30
Jose Lorenzo Rodriguez
cfd2d9e00b Updating all @package annotations in doc blocks 2011-07-26 01:46:14 -04:30
Juan Basso
192812ee7f Updating the copyright to 2011. 2011-05-30 22:32:43 -04:00
ADmad
4c042ae133 Adding proper visibility keywords for class functions 2011-05-29 03:31:34 +05:30
AD7six
83e7028ecd fix multibyte test case
put the mb_internal_encoding call in a file which is _always_ loaded
2011-05-17 18:41:35 +02:00
Jose Lorenzo Rodriguez
217e9e0330 Fixing test in I18n due to case sensitivity problems 2011-05-16 23:58:18 -04:30
Florian Krmer
8aa3159037 Fixing Fatal error: Class 'CakePlugin' not found in \lib\Cake\I18n\I18n.php on line 267 2011-05-15 23:53:55 +02:00
Jose Lorenzo Rodriguez
eea981940e Replacing config string in favor of Config 2011-05-13 03:36:45 -04:30
Jose Lorenzo Rodriguez
7171887c7a Correctly loading plugins in I18n 2011-05-09 00:36:52 -04:30
evilbloodydemon
255dc1c44b Unused variables in I18n removed 2011-04-23 00:02:07 +04:00
Jose Lorenzo Rodriguez
42b3f993b9 Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading 2011-03-01 23:04:52 -04:30
José Lorenzo Rodríguez
4c0e06c451 Merge remote branch 'origin/2.0' into 2.0-class-loading
Conflicts:
	cake/bootstrap.php
	cake/libs/view/helpers/js.php
	lib/Cake/Model/AclNode.php
	lib/Cake/Model/ConnectionManager.php
	lib/Cake/bootstrap.php
	lib/Cake/tests/cases/libs/controller/controller.test.php
2011-01-02 02:00:03 -04:30
José Lorenzo Rodríguez
b8344ecd33 Replacing some of the App::import by App::uses 2010-12-08 23:15:18 -04:30
José Lorenzo Rodríguez
e3690ebccb Making shells run again 2010-12-07 01:26:10 -04:30
José Lorenzo Rodríguez
5dddb362ec Merge remote branch 'origin/2.0' into 2.0-class-loading
Conflicts:
	lib/Cake/config/ini_file.php
2010-12-06 09:42:52 -04:30
José Lorenzo Rodríguez
ff8b1a1041 Stating to move loggers to the new folder 2010-12-04 13:50:26 -04:30
José Lorenzo Rodríguez
6b40c9c854 Moving I18n related classes to the new folder schema 2010-12-04 13:45:07 -04:30