Merge pull request #3192 from HughieW/fix/MessageFormatter-issues

ArgType 'String' is not valid in MessageFormatter class. Fixes #3191
codeigniter4 · Jul 1, 2020 · 63d715b · 63d715b
2 parents b9940bb + f413d6d
commit 63d715b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/system/Language/en/Email.php b/system/Language/en/Email.php
@@ -23,7 +23,7 @@
    'sendFailurePHPMail'   => 'Unable to send email using PHP mail(). Your server might not be configured to send mail using this method.',
    'sendFailureSendmail'  => 'Unable to send email using PHP Sendmail. Your server might not be configured to send mail using this method.',
    'sendFailureSmtp'      => 'Unable to send email using PHP SMTP. Your server might not be configured to send mail using this method.',
-   'sent'                 => 'Your message has been successfully sent using the following protocol: {0, string}',
+   'sent'                 => 'Your message has been successfully sent using the following protocol: {0}',
    'noSocket'             => 'Unable to open a socket to Sendmail. Please check settings.',
    'noHostname'           => 'You did not specify a SMTP hostname.',
    'SMTPError'            => 'The following SMTP error was encountered: {0}',

diff --git a/system/Language/en/HTTP.php b/system/Language/en/HTTP.php
@@ -31,7 +31,7 @@
    'emptySupportedNegotiations' => 'You must provide an array of supported values to all Negotiations.',
 
 	// RedirectResponse
-   'invalidRoute'               => '{0, string} route cannot be found while reverse-routing.',
+   'invalidRoute'               => '{0} route cannot be found while reverse-routing.',
 
 	// DownloadResponse
    'cannotSetBinary'            => 'When setting filepath cannot set binary.',
@@ -42,7 +42,7 @@
 
 	// Response
    'missingResponseStatus'      => 'HTTP Response is missing a status code',
-   'invalidStatusCode'          => '{0, string} is not a valid HTTP return status code',
+   'invalidStatusCode'          => '{0} is not a valid HTTP return status code',
    'unknownStatusCode'          => 'Unknown HTTP status code provided with no message: {0}',
 
 	// URI

diff --git a/system/Language/en/Images.php b/system/Language/en/Images.php
@@ -26,7 +26,7 @@
    'unsupportedImageCreate' => 'Your server does not support the GD function required to process this type of image.',
    'jpgOrPngRequired'       => 'The image resize protocol specified in your preferences only works with JPEG or PNG image types.',
    'rotateUnsupported'      => 'Image rotation does not appear to be supported by your server.',
-   'libPathInvalid'         => 'The path to your image library is not correct. Please set the correct path in your image preferences. {0, string)',
+   'libPathInvalid'         => 'The path to your image library is not correct. Please set the correct path in your image preferences. {0}',
    'imageProcessFailed'     => 'Image processing failed. Please verify that your server supports the chosen protocol and that the path to your image library is correct.',
    'rotationAngleRequired'  => 'An angle of rotation is required to rotate the image.',
    'invalidPath'            => 'The path to the image is not correct.',