From 8ff5bf615b9d41f6acba6693a4bc80d8b1ab71fa Mon Sep 17 00:00:00 2001 From: deathart Date: Sun, 22 Apr 2018 13:47:33 +0200 Subject: [PATCH 1/5] Typo in language file --- system/Language/en/Database.php | 36 ++++++++++++++++ system/Language/en/Email.php | 36 ++++++++++++++++ system/Language/en/HTTP.php | 36 ++++++++++++++++ system/Language/en/Images.php | 36 ++++++++++++++++ system/Language/en/Language.php | 36 ++++++++++++++++ system/Language/en/Migrations.php | 44 +++++++++---------- system/Language/en/Number.php | 10 +++-- system/Language/en/Time.php | 70 +++++++++++++++++++++++-------- system/Language/en/Validation.php | 3 +- 9 files changed, 262 insertions(+), 45 deletions(-) diff --git a/system/Language/en/Database.php b/system/Language/en/Database.php index 197e6d90e1..8b4b35e200 100644 --- a/system/Language/en/Database.php +++ b/system/Language/en/Database.php @@ -1,5 +1,41 @@ '{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..66fc74d120 100644 --- a/system/Language/en/Email.php +++ b/system/Language/en/Email.php @@ -1,5 +1,41 @@ '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..4e5d04f2f7 100644 --- a/system/Language/en/HTTP.php +++ b/system/Language/en/HTTP.php @@ -1,5 +1,41 @@ '{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..8d88905f03 100644 --- a/system/Language/en/Images.php +++ b/system/Language/en/Images.php @@ -1,5 +1,41 @@ '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..f4980a744e 100644 --- a/system/Language/en/Language.php +++ b/system/Language/en/Language.php @@ -1,5 +1,41 @@ '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..132eb82f81 100644 --- a/system/Language/en/Migrations.php +++ b/system/Language/en/Migrations.php @@ -38,33 +38,33 @@ 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 +73,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..b2c1f63bdc 100644 --- a/system/Language/en/Number.php +++ b/system/Language/en/Number.php @@ -1,4 +1,5 @@ '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/Time.php b/system/Language/en/Time.php index 12fa336e3e..573434ea70 100644 --- a/system/Language/en/Time.php +++ b/system/Language/en/Time.php @@ -1,21 +1,57 @@ '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..b3618c3939 100644 --- a/system/Language/en/Validation.php +++ b/system/Language/en/Validation.php @@ -47,7 +47,7 @@ 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_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.', @@ -87,5 +87,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.', - '', ]; From 2ce7f566c2b2e3c83b5c3beb988d8c7581a50963 Mon Sep 17 00:00:00 2001 From: deathart Date: Tue, 24 Apr 2018 21:17:05 +0200 Subject: [PATCH 2/5] Typo alignment --- system/Language/en/Migrations.php | 4 ++-- system/Language/en/Time.php | 24 ++++++++++++------------ 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/system/Language/en/Migrations.php b/system/Language/en/Migrations.php index 132eb82f81..c24b6d7fb5 100644 --- a/system/Language/en/Migrations.php +++ b/system/Language/en/Migrations.php @@ -73,6 +73,6 @@ return [ 'migRemoved' => 'Rolling back: ', 'migAdded' => 'Running: ', - 'version' => 'Version', - 'filename' => 'Filename', + 'version' => 'Version', + 'filename' => 'Filename', ]; diff --git a/system/Language/en/Time.php b/system/Language/en/Time.php index 573434ea70..940f696606 100644 --- a/system/Language/en/Time.php +++ b/system/Language/en/Time.php @@ -42,16 +42,16 @@ return [ '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', + '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', ]; From df600dcabf471bb5f92a707ea2e12e6d765a056a Mon Sep 17 00:00:00 2001 From: deathart Date: Tue, 24 Apr 2018 21:18:44 +0200 Subject: [PATCH 3/5] Use space --- system/Language/en/Time.php | 10 +++++----- system/Language/en/Validation.php | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/system/Language/en/Time.php b/system/Language/en/Time.php index 940f696606..ac817827a4 100644 --- a/system/Language/en/Time.php +++ b/system/Language/en/Time.php @@ -37,11 +37,11 @@ */ 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.', + '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}}', diff --git a/system/Language/en/Validation.php b/system/Language/en/Validation.php index b3618c3939..00ef425906 100644 --- a/system/Language/en/Validation.php +++ b/system/Language/en/Validation.php @@ -48,7 +48,7 @@ return [ '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_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.', From 4fdcffd4fef1161b76d31f7c205d07f74dd81e93 Mon Sep 17 00:00:00 2001 From: deathart Date: Tue, 24 Apr 2018 21:22:46 +0200 Subject: [PATCH 4/5] Update copy --- system/Language/en/Database.php | 38 +++++---------------------------- system/Language/en/Email.php | 38 +++++---------------------------- system/Language/en/HTTP.php | 38 +++++---------------------------- system/Language/en/Images.php | 38 +++++---------------------------- system/Language/en/Language.php | 38 +++++---------------------------- system/Language/en/Time.php | 38 +++++---------------------------- 6 files changed, 30 insertions(+), 198 deletions(-) diff --git a/system/Language/en/Database.php b/system/Language/en/Database.php index 8b4b35e200..e90739282f 100644 --- a/system/Language/en/Database.php +++ b/system/Language/en/Database.php @@ -1,39 +1,11 @@ Date: Tue, 24 Apr 2018 21:46:23 +0200 Subject: [PATCH 5/5] Update all copy --- system/Language/en/CLI.php | 38 ++++-------------------------- system/Language/en/Cache.php | 38 ++++-------------------------- system/Language/en/Migrations.php | 38 ++++-------------------------- system/Language/en/Number.php | 39 ++++--------------------------- system/Language/en/Pager.php | 38 ++++-------------------------- system/Language/en/Validation.php | 38 ++++-------------------------- 6 files changed, 30 insertions(+), 199 deletions(-) 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 @@