diff --git a/system/Language/en/CLI.php b/system/Language/en/CLI.php index 5c3945bf1f..b6fd198209 100644 --- a/system/Language/en/CLI.php +++ b/system/Language/en/CLI.php @@ -1,39 +1,11 @@ '{0, string} is not a valid Model Event callback.', ]; diff --git a/system/Language/en/Email.php b/system/Language/en/Email.php index b923cdc1b9..15062fe742 100644 --- a/system/Language/en/Email.php +++ b/system/Language/en/Email.php @@ -1,5 +1,13 @@ 'The email validation method must be passed an array.', 'invalidAddress' => 'Invalid email address: {0, string}', diff --git a/system/Language/en/HTTP.php b/system/Language/en/HTTP.php index d57a516e5f..f47a9e1028 100644 --- a/system/Language/en/HTTP.php +++ b/system/Language/en/HTTP.php @@ -1,5 +1,13 @@ '{0, string} is not a valid route.', 'pageNotFound' => 'Page not found', diff --git a/system/Language/en/Images.php b/system/Language/en/Images.php index 05e77c98db..4f9252690c 100644 --- a/system/Language/en/Images.php +++ b/system/Language/en/Images.php @@ -1,5 +1,13 @@ 'You must specify a source image in your preferences.', 'gdRequired' => 'The GD image library is required to use this feature.', diff --git a/system/Language/en/Language.php b/system/Language/en/Language.php index a20e1ce033..8d69c17f31 100644 --- a/system/Language/en/Language.php +++ b/system/Language/en/Language.php @@ -1,5 +1,13 @@ 'Get line must be a string or array of strings.' ]; diff --git a/system/Language/en/Migrations.php b/system/Language/en/Migrations.php index e6006289b9..2135d5a4a5 100644 --- a/system/Language/en/Migrations.php +++ b/system/Language/en/Migrations.php @@ -1,70 +1,42 @@ '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', ]; diff --git a/system/Language/en/Number.php b/system/Language/en/Number.php index 98a2c0e94a..99928593a9 100644 --- a/system/Language/en/Number.php +++ b/system/Language/en/Number.php @@ -1,45 +1,18 @@ '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', diff --git a/system/Language/en/Pager.php b/system/Language/en/Pager.php index ac09920c8a..3539a157af 100644 --- a/system/Language/en/Pager.php +++ b/system/Language/en/Pager.php @@ -1,39 +1,11 @@ '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', ]; diff --git a/system/Language/en/Validation.php b/system/Language/en/Validation.php index 8059e58864..74ed0c8162 100644 --- a/system/Language/en/Validation.php +++ b/system/Language/en/Validation.php @@ -1,39 +1,11 @@ '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.', - '', ];