Commit graph

115 commits

Author SHA1 Message Date
Val Bancer
f4866efffc restored deleted linebreak 2016-04-27 13:21:08 +02:00
Val Bancer
dee53e8298 added support for several european locales 2016-04-27 13:14:30 +02:00
Edgaras Janušauskas
4101a96a95 Use correct context when parsing MO file. 2015-12-18 12:59:00 +02:00
mark_story
a73fc25657 Fix incorrectly parsed mo file context.
The context from mo files should be parsed correctly.

Refs 
2015-07-30 22:28:55 -04:00
Mark Scherer
52e79987a2 Replacing self with static due to PHP5.3+. Following . 2015-07-21 10:22:53 +02:00
antograssiot
c2f298a8b7 Replace our custom code fence with markdown standard fence 2015-01-09 13:47:25 +01:00
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
31c7b01c3a Add reference links to docblock 2014-12-09 00:03:24 +05:30
ADmad
850edf47a0 Fix plural calculation for Arabic.
Refs 
2014-12-08 23:58:27 +05:30
euromark
41c646c5a1 Simplification of return types. No need to return more mixed than necessary. 2014-11-08 20:07:47 +01:00
euromark
345a18f15f Merge branch 'master' into 2.6 2014-11-05 23:29:06 +01:00
euromark
768f2c809c Correct doc block return types. 2014-11-05 13:03:27 +01:00
mark_story
7c316bbc56 Merge branch 'master' into 2.6
Conflicts:
	lib/Cake/basics.php
2014-08-30 21:28:11 -04:00
Mark Story
dbe7329e54 Merge pull request from MMS-Projects/i18n-context-2.6
Basic support for I18n contexts as requested by 
2014-07-18 21:48:19 -04:00
Marlin Cremers
b47f91c47c Add context support to the I18n class which resolves
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
mark_story
2bcd817367 Merge branch 'master' into 2.6 2014-07-03 11:13:06 -04:00
euromark
974ca851c2 Correct doc blocks according to cs guidelines.
Remove superfluous empty lines.
2014-07-03 15:36:42 +02:00
Marlin Cremers
4f91e14cab Refactor translation functions arguments handeling 2014-06-12 08:48:28 +02:00
ADmad
e7debd8692 More API docblock CS fixes. 2014-06-02 18:27:11 +05:30
func0der
06f47ee01f Introduced I18n category constants ()
Replaced all hard coded category values
2014-03-23 17:00:17 +01:00
Marlin Cremers
5795111391 Moved Limburgish to correct the order 2014-03-02 14:30:26 +01:00
Marlin Cremers
7ab028e9d7 Added the Limburgish language 2014-03-02 10:40:39 +01:00
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
euromark
1cb24ae537 CS fixes using phpcs-fixer auto-correction. 2013-10-12 01:27:00 +02:00
Phally
f4929c1b04 Strict checks for I18n::loadLocaleDefinition(). 2013-09-01 06:20:53 +02:00
Phally
4f91465af7 Safer way to prevent the array to string notice. 2013-09-01 06:16:10 +02: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
mark_story
f18d354f55 Merge branch 'master' into 2.4 2013-08-28 12:35:07 -04:00
ADmad
fc47bf9e1d Avoid reparsing locale definition file. 2013-08-27 04:04:39 +05:30
mark_story
0f2d59d987 Merge branch 'master' into 2.4
Conflicts:
	lib/Cake/Network/CakeResponse.php
	lib/Cake/TestSuite/CakeTestCase.php
2013-08-18 23:10:08 -04:00
euromark
6cf147e8c8 unify null checks - avoid method call in favor of strict check 2013-08-16 20:12:49 +02:00
euromark
fc2d28974b remove undocumented code and uncessary in_array() checks + cleanup 2013-08-08 03:56:58 +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 
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 

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