Merge pull request #998 from deathart/typolang

Typo in language file
This commit is contained in:
Lonnie Ezell 2018-04-24 14:51:02 -05:00 committed by GitHub
commit d90d58db07
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 125 additions and 245 deletions

View File

@ -1,39 +1,11 @@
<?php
/**
* CodeIgniter
*
* An open source application development framework for PHP
*
* This content is released under the MIT License (MIT)
*
* Copyright (c) 2014-2018 British Columbia Institute of Technology
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*
* @package CodeIgniter
* @author CodeIgniter Dev Team
* @copyright 2014-2018 British Columbia Institute of Technology (https://bcit.ca/)
* @license https://opensource.org/licenses/MIT MIT License
* @link https://codeigniter.com
* @since Version 3.0.0
* @filesource
* System messages translation for CodeIgniter(tm)
* @author CodeIgniter community
* @copyright Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
* @license http://opensource.org/licenses/MIT MIT License
* @link https://codeigniter.com
*/
return [

View File

@ -1,39 +1,11 @@
<?php
/**
* CodeIgniter
*
* An open source application development framework for PHP
*
* This content is released under the MIT License (MIT)
*
* Copyright (c) 2014-2018 British Columbia Institute of Technology
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*
* @package CodeIgniter
* @author CodeIgniter Dev Team
* @copyright 2014-2018 British Columbia Institute of Technology (https://bcit.ca/)
* @license https://opensource.org/licenses/MIT MIT License
* @link https://codeigniter.com
* @since Version 3.0.0
* @filesource
* System messages translation for CodeIgniter(tm)
* @author CodeIgniter community
* @copyright Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
* @license http://opensource.org/licenses/MIT MIT License
* @link https://codeigniter.com
*/
return [

View File

@ -1,5 +1,13 @@
<?php
/**
* System messages translation for CodeIgniter(tm)
* @author CodeIgniter community
* @copyright Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
* @license http://opensource.org/licenses/MIT MIT License
* @link https://codeigniter.com
*/
return [
'invalidEvent' => '{0, string} is not a valid Model Event callback.',
];

View File

@ -1,5 +1,13 @@
<?php
/**
* System messages translation for CodeIgniter(tm)
* @author CodeIgniter community
* @copyright Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
* @license http://opensource.org/licenses/MIT MIT License
* @link https://codeigniter.com
*/
return [
'mustBeArray' => 'The email validation method must be passed an array.',
'invalidAddress' => 'Invalid email address: {0, string}',

View File

@ -1,5 +1,13 @@
<?php
/**
* System messages translation for CodeIgniter(tm)
* @author CodeIgniter community
* @copyright Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
* @license http://opensource.org/licenses/MIT MIT License
* @link https://codeigniter.com
*/
return [
'invalidRoute' => '{0, string} is not a valid route.',
'pageNotFound' => 'Page not found',

View File

@ -1,5 +1,13 @@
<?php
/**
* System messages translation for CodeIgniter(tm)
* @author CodeIgniter community
* @copyright Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
* @license http://opensource.org/licenses/MIT MIT License
* @link https://codeigniter.com
*/
return [
'sourceImageRequired' => 'You must specify a source image in your preferences.',
'gdRequired' => 'The GD image library is required to use this feature.',

View File

@ -1,5 +1,13 @@
<?php
/**
* System messages translation for CodeIgniter(tm)
* @author CodeIgniter community
* @copyright Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
* @license http://opensource.org/licenses/MIT MIT License
* @link https://codeigniter.com
*/
return [
'languageGetLineInvalidArgumentException' => 'Get line must be a string or array of strings.'
];

View File

@ -1,70 +1,42 @@
<?php
/**
* CodeIgniter
*
* An open source application development framework for PHP
*
* This content is released under the MIT License (MIT)
*
* Copyright (c) 2014-2018 British Columbia Institute of Technology
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*
* @package CodeIgniter
* @author CodeIgniter Dev Team
* @copyright 2014-2018 British Columbia Institute of Technology (https://bcit.ca/)
* @license https://opensource.org/licenses/MIT MIT License
* @link https://codeigniter.com
* @since Version 3.0.0
* @filesource
* System messages translation for CodeIgniter(tm)
* @author CodeIgniter community
* @copyright Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
* @license http://opensource.org/licenses/MIT MIT License
* @link https://codeigniter.com
*/
return [
// Migration Runner
'migMissingTable' => 'Migrations table must be set.',
'migInvalidType' => 'An invalid migration numbering type was specified: ',
'migDisabled' => 'Migrations have been loaded but are disabled or setup incorrectly.',
'migNotFound' => 'Migration file not found: ',
'migEmpty' => 'No Migration files found',
'migGap' => 'There is a gap in the migration sequence near version number: ',
'migClassNotFound' => 'The migration class "%s" could not be found.',
'migMissingMethod' => 'The migration class is missing an "%s" method.',
'migMultiple' => 'There are multiple migrations with the same version number: ',
'migMissingTable' => 'Migrations table must be set.',
'migInvalidType' => 'An invalid migration numbering type was specified: ',
'migDisabled' => 'Migrations have been loaded but are disabled or setup incorrectly.',
'migNotFound' => 'Migration file not found: ',
'migEmpty' => 'No Migration files found',
'migGap' => 'There is a gap in the migration sequence near version number: ',
'migClassNotFound' => 'The migration class "%s" could not be found.',
'migMissingMethod' => 'The migration class is missing an "%s" method.',
'migMultiple' => 'There are multiple migrations with the same version number: ',
// Migration Command
'migHelpLatest' => "\t\tMigrates database to latest available migration.",
'migHelpCurrent' => "\t\tMigrates database to version set as 'current' in configuration.",
'migHelpVersion' => "\tMigrates database to version {v}.",
'migHelpRollback' => "\tRuns all migrations 'down' to version 0.",
'migHelpRefresh' => "\t\tUninstalls and re-runs all migrations to freshen database.",
'migHelpSeed' => "\tRuns the seeder named [name].",
'migCreate' => "\tCreates a new migration named [name]",
'migNameMigration' => "Name the migration file",
'migBadCreateName' => 'You must provide a migration file name.',
'migWriteError' => 'Error trying to create file.',
'migHelpLatest' => "\t\tMigrates database to latest available migration.",
'migHelpCurrent' => "\t\tMigrates database to version set as 'current' in configuration.",
'migHelpVersion' => "\tMigrates database to version {v}.",
'migHelpRollback' => "\tRuns all migrations 'down' to version 0.",
'migHelpRefresh' => "\t\tUninstalls and re-runs all migrations to freshen database.",
'migHelpSeed' => "\tRuns the seeder named [name].",
'migCreate' => "\tCreates a new migration named [name]",
'migNameMigration' => 'Name the migration file',
'migBadCreateName' => 'You must provide a migration file name.',
'migWriteError' => 'Error trying to create file.',
'migToLatest' => 'Migrating to latest version...',
'migInvalidVersion' => 'Invalid version number provided.',
'migToVersionPH' => 'Migrating to version %s...',
'migToVersion' => 'Migrating to current version...',
'migRollingBack' => "Rolling back all migrations...",
'migRollingBack' => 'Rolling back all migrations...',
'migNoneFound' => 'No migrations were found.',
'migOn' => 'Migrated On: ',
'migSeeder' => 'Seeder name',
@ -73,6 +45,6 @@ return [
'migRemoved' => 'Rolling back: ',
'migAdded' => 'Running: ',
'version' => 'Version',
'filename' => 'Filename',
'version' => 'Version',
'filename' => 'Filename',
];

View File

@ -1,45 +1,18 @@
<?php
/**
* CodeIgniter
*
* An open source application development framework for PHP
*
* This content is released under the MIT License (MIT)
*
* Copyright (c) 2014-2018 British Columbia Institute of Technology
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*
* @package CodeIgniter
* @author EllisLab Dev Team
* @copyright 2008-2014 EllisLab, Inc. (https://ellislab.com/)
* @copyright 2014-2018 British Columbia Institute of Technology (https://bcit.ca/)
* @license https://opensource.org/licenses/MIT MIT License
* @link https://codeigniter.com
* @since Version 1.0.0
* @filesource
* System messages translation for CodeIgniter(tm)
* @author CodeIgniter community
* @copyright Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
* @license http://opensource.org/licenses/MIT MIT License
* @link https://codeigniter.com
*/
return [
'terabyteAbbr' => 'TB',
'gigabyteAbbr' => 'GB',
'megabyteAbbr' => 'MB',
'kilobyteAbbr' => 'KB',
'terabyteAbbr' => 'TB',
'gigabyteAbbr' => 'GB',
'megabyteAbbr' => 'MB',
'kilobyteAbbr' => 'KB',
'bytes' => 'Bytes',
// don't forget the space in front of these!
'thousand' => ' thousand',

View File

@ -1,39 +1,11 @@
<?php
/**
* CodeIgniter
*
* An open source application development framework for PHP
*
* This content is released under the MIT License (MIT)
*
* Copyright (c) 2014-2018 British Columbia Institute of Technology
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*
* @package CodeIgniter
* @author CodeIgniter Dev Team
* @copyright 2014-2018 British Columbia Institute of Technology (https://bcit.ca/)
* @license https://opensource.org/licenses/MIT MIT License
* @link https://codeigniter.com
* @since Version 3.0.0
* @filesource
* System messages translation for CodeIgniter(tm)
* @author CodeIgniter community
* @copyright Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
* @license http://opensource.org/licenses/MIT MIT License
* @link https://codeigniter.com
*/
return [

View File

@ -1,21 +1,29 @@
<?php
/**
* System messages translation for CodeIgniter(tm)
* @author CodeIgniter community
* @copyright Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
* @license http://opensource.org/licenses/MIT MIT License
* @link https://codeigniter.com
*/
return [
'invalidMonth' => 'Months must be between 0 and 12.',
'invalidDay' => 'Days must be between 0 and 31.',
'invalidHours' => 'Hours must be between 0 and 23.',
'invalidMinutes' => 'Minutes must be between 0 and 59.',
'invalidSeconds' => 'Seconds must be between 0 and 59.',
'years' => '{0, plural, =1{# year} other{# years}}',
'months' => '{0, plural, =1{# month} other{# months}}',
'weeks' => '{0, plural, =1{# week} other{# weeks}}',
'days' => '{0, plural, =1{# day} other{# days}}',
'hours' => '{0, plural, =1{# hour} other{# hours}}',
'minutes' => '{0, plural, =1{# minute} other{# minutes}}',
'seconds' => '{0, plural, =1{# second} other{# seconds}}',
'ago' => '{0} ago',
'inFuture' => 'in {0}',
'yesterday' => 'Yesterday',
'tomorrow' => 'Tomorrow',
'now' => 'Just now',
'invalidMonth' => 'Months must be between 0 and 12.',
'invalidDay' => 'Days must be between 0 and 31.',
'invalidHours' => 'Hours must be between 0 and 23.',
'invalidMinutes' => 'Minutes must be between 0 and 59.',
'invalidSeconds' => 'Seconds must be between 0 and 59.',
'years' => '{0, plural, =1{# year} other{# years}}',
'months' => '{0, plural, =1{# month} other{# months}}',
'weeks' => '{0, plural, =1{# week} other{# weeks}}',
'days' => '{0, plural, =1{# day} other{# days}}',
'hours' => '{0, plural, =1{# hour} other{# hours}}',
'minutes' => '{0, plural, =1{# minute} other{# minutes}}',
'seconds' => '{0, plural, =1{# second} other{# seconds}}',
'ago' => '{0} ago',
'inFuture' => 'in {0}',
'yesterday' => 'Yesterday',
'tomorrow' => 'Tomorrow',
'now' => 'Just now',
];

View File

@ -1,39 +1,11 @@
<?php
/**
* CodeIgniter
*
* An open source application development framework for PHP
*
* This content is released under the MIT License (MIT)
*
* Copyright (c) 2014-2018 British Columbia Institute of Technology
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*
* @package CodeIgniter
* @author CodeIgniter Dev Team
* @copyright 2014-2018 British Columbia Institute of Technology (https://bcit.ca/)
* @license https://opensource.org/licenses/MIT MIT License
* @link https://codeigniter.com
* @since Version 3.0.0
* @filesource
* System messages translation for CodeIgniter(tm)
* @author CodeIgniter community
* @copyright Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
* @license http://opensource.org/licenses/MIT MIT License
* @link https://codeigniter.com
*/
return [
@ -47,8 +19,8 @@ return [
'alpha' => 'The {field} field may only contain alphabetical characters.',
'alpha_dash' => 'The {field} field may only contain alpha-numeric characters, underscores, and dashes.',
'alpha_numeric' => 'The {field} field may only contain alpha-numeric characters.',
'alpha_numeric_space' => 'The {field} field may only contain alpha-numeric characters and spaces.',
'alpha_space' => 'The {field} field may only contain alphabetical characters and spaces.',
'alpha_numeric_space' => 'The {field} field may only contain alpha-numeric characters and spaces.',
'alpha_space' => 'The {field} field may only contain alphabetical characters and spaces.',
'decimal' => 'The {field} field must contain a decimal number.',
'differs' => 'The {field} field must differ from the {param} field.',
'exact_length' => 'The {field} field must be exactly {param} characters in length.',
@ -87,5 +59,4 @@ return [
'mime_in' => '{field} does not have a valid mime type.',
'ext_in' => '{field} does not have a valid file extension.',
'max_dims' => '{field} is either not an image, or it is too wide or tall.',
'',
];