AD7six
32df3156a7
consolidate cake_error and cake_developer to simply "cake_dev"
...
it's a lot easier for adding new translations to think:
is it for the end user?
use 'cake' as the domain
is it for the developer
use 'cake_dev' as the domain
is it for the console
use 'cake_console' as the domain
also neatly avoids the "this message is an error, and it's in
cake_developer, why?" - question (because cake_error was intended for
anything which is used in trigger_error/exceptions, not a variable named
$error
2011-03-20 16:38:31 +01:00
AD7six
d2badbeb22
update language domains
...
no domain - the thing being translated comes from the app - so let the
user handle that
cake - end user
cake_error - error messages
2011-03-19 18:29:31 +01:00
AD7six
e492bce64f
Merge branch '2.0-translations' of github.com:AD7six/cakephp into 2.0-class-loading
2011-03-16 17:08:15 +01:00
AD7six
64e71de52a
Merge branch '2.0-class-loading' of github.com:cakephp/cakephp into 2.0-class-loading
2011-03-16 17:07:22 +01:00
AD7six
39c7d03319
Merge branch '2.0-class-loading' into 2.0-translations
...
Conflicts:
lib/Cake/Console/Command/Task/ControllerTask.php
lib/Cake/Console/Command/Task/ProjectTask.php
lib/Cake/Core/Configure.php
lib/Cake/View/pages/home.ctp
2011-03-16 12:29:39 +01:00
Jose Lorenzo Rodriguez
2e2f5ea2a5
Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading
2011-03-15 21:13:45 -04:00
AD7six
28eae99ecb
translation changes in the view folder
2011-03-12 20:02:56 +01:00
Jose Lorenzo Rodriguez
f8a08432f4
Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading
2011-03-05 17:37:31 -04:30
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
6e4f4efb79
Merge remote branch 'origin/2.0' into 2.0-class-loading
...
Conflicts:
cake/bootstrap.php
lib/Cake/Console/Command/TestSuiteShell.php
lib/Cake/Console/TaskCollection.php
lib/Cake/Controller/ComponentCollection.php
lib/Cake/Controller/Controller.php
lib/Cake/Core/App.php
lib/Cake/Model/BehaviorCollection.php
lib/Cake/Network/CakeRequest.php
lib/Cake/TestSuite/CakeTestSuiteDispatcher.php
lib/Cake/TestSuite/CakeWebTestCase.php
lib/Cake/TestSuite/TestManager.php
lib/Cake/TestSuite/TestRunner.php
lib/Cake/View/HelperCollection.php
lib/Cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
lib/Cake/tests/cases/libs/test_manager.test.php
2011-02-13 23:10:19 -04:30
José Lorenzo Rodríguez
aa18cca1c3
Merge remote branch 'origin/2.0' into 2.0-class-loading
...
Conflicts:
lib/Cake/View/Helper.php
2011-01-28 01:14:59 -04:30
José Lorenzo Rodríguez
d9c99b5ef6
Merge remote branch 'origin/2.0' into 2.0-class-loading
...
Conflicts:
cake/tests/cases/libs/controller_test_case.test.php
lib/Cake/Controller/ComponentCollection.php
lib/Cake/Model/ConnectionManager.php
lib/Cake/TestSuite/Fixture/CakeTestFixture.php
lib/Cake/View/pages/home.ctp
2011-01-22 01:00:15 -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
07e43bb0f8
Merge remote branch 'origin/2.0' into 2.0-class-loading
...
Conflicts:
cake/libs/view/scaffolds/edit.ctp
cake/libs/view/scaffolds/form.ctp
cake/tests/test_app/plugins/test_plugin/views/tests/scaffold.edit.ctp
cake/tests/test_app/plugins/test_plugin/views/tests/scaffold.form.ctp
cake/tests/test_app/views/posts/scaffold.edit.ctp
cake/tests/test_app/views/posts/scaffold.form.ctp
lib/Cake/Error/ErrorHandler.php
lib/Cake/Model/Behavior/TranslateBehavior.php
lib/Cake/Model/Datasource/CakeSession.php
lib/Cake/Routing/Router.php
lib/Cake/TestSuite/TestManager.php
lib/Cake/View/scaffolds/edit.ctp
lib/Cake/tests/cases/console/shells/bake.test.php
lib/Cake/tests/cases/libs/cake_log.test.php
lib/Cake/tests/cases/libs/cake_request.test.php
lib/Cake/tests/cases/libs/view/helpers/number.test.php
lib/Cake/tests/test_app/plugins/test_plugin/views/tests/scaffold.edit.ctp
lib/Cake/tests/test_app/views/posts/scaffold.edit.ctp
2010-12-15 01:13:05 -04:30
José Lorenzo Rodríguez
3f64844de9
Merge remote branch 'origin/2.0' into 2.0-class-loading
...
Conflicts:
lib/Cake/Model/ConnectionManager.php
lib/Cake/basics.php
2010-12-05 23:43:58 -04:30
José Lorenzo Rodríguez
f3eb2159eb
Making helpers load
2010-12-04 13:40:24 -04:30
José Lorenzo Rodríguez
be9bcb3627
Moving view clasess to their new home
2010-12-04 13:31:04 -04:30
