-
Notifications
You must be signed in to change notification settings - Fork 206
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #99 from codeigniter4/develop
Bringing Master up to date.
- Loading branch information
Showing
232 changed files
with
4,196 additions
and
363 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
<?php | ||
/** | ||
* Cast language strings. | ||
* | ||
* @package CodeIgniter | ||
* @author CodeIgniter Dev Team | ||
* @copyright 2019 CodeIgniter Foundation | ||
* @license https://opensource.org/licenses/MIT MIT License | ||
* @link https://codeigniter.com | ||
* @since Version 4.0.0 | ||
* @filesource | ||
* | ||
* @codeCoverageIgnore | ||
*/ | ||
|
||
return [ | ||
'jsonErrorDepth' => 'Maximum stack depth exceeded', | ||
'jsonErrorStateMismatch' => 'Underflow or the modes mismatch', | ||
'jsonErrorCtrlChar' => 'Unexpected control character found', | ||
'jsonErrorSyntax' => 'Syntax error, malformed JSON', | ||
'jsonErrorUtf8' => 'Malformed UTF-8 characters, possibly incorrectly encoded', | ||
'jsonErrorUnknown' => 'Unknown error', | ||
]; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
<?php | ||
/** | ||
* Encryption language strings. | ||
* | ||
* @package CodeIgniter | ||
* @author CodeIgniter Dev Team | ||
* @copyright 2019 CodeIgniter Foundation | ||
* @license https://opensource.org/licenses/MIT MIT License | ||
* @link https://codeigniter.com | ||
* @since Version 3.0.0 | ||
* @filesource | ||
* | ||
* @codeCoverageIgnore | ||
*/ | ||
|
||
return [ | ||
'noDriverRequested' => 'No driver requested; Miss Daisy will be so upset!', | ||
'noHandlerAvailable' => 'Unable to find an available {0} encryption handler.', | ||
'unKnownHandler' => '"{0}" cannot be configured.', | ||
'starterKeyNeeded' => 'Encrypter needs a starter key.', | ||
'authenticationFailed' => 'Decrypting: authentication failed.', | ||
'encryptionFailed' => 'Encryption failed.', | ||
]; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
<?php | ||
|
||
/** | ||
* CLI language strings. | ||
* | ||
* @package CodeIgniter | ||
* @author CodeIgniter Dev Team | ||
* @copyright 2019 CodeIgniter Foundation | ||
* @license https://opensource.org/licenses/MIT MIT License | ||
* @link https://codeigniter.com | ||
* @filesource | ||
* | ||
* @codeCoverageIgnore | ||
*/ | ||
|
||
return | ||
[ | ||
'tryingToAccessNonExistentProperty' => 'Trying to access non existent property {0} of {1}', | ||
]; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
<?php | ||
/** | ||
* RESTful language strings. | ||
* | ||
* @package CodeIgniter | ||
* @author CodeIgniter Dev Team | ||
* @copyright 2019 CodeIgniter Foundation | ||
* @license https://opensource.org/licenses/MIT MIT License | ||
* @link https://codeigniter.com | ||
* @since Version 3.0.0 | ||
* @filesource | ||
* | ||
* @codeCoverageIgnore | ||
*/ | ||
|
||
return [ | ||
'notImplemented' => '"{0}" action not implemented.', | ||
]; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
<?php | ||
|
||
/** | ||
* Redirect language strings. | ||
* | ||
* @package CodeIgniter | ||
* @author CodeIgniter Dev Team | ||
* @copyright 2019 CodeIgniter Foundation | ||
* @license https://opensource.org/licenses/MIT MIT License | ||
* @link https://codeigniter.com | ||
* @since Version 4.0.0 | ||
* @filesource | ||
* | ||
* @codeCoverageIgnore | ||
*/ | ||
|
||
return [ | ||
'forUnableToRedirect' => 'Unable to redirect to "{0}". Error status code "{1}"', | ||
]; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.