Created
January 13, 2021 20:40
-
-
Save marc1706/bbcd4013a58decb8b048a25e164ba44d to your computer and use it in GitHub Desktop.
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
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php | |
index 29d0ec5947..64096bbed3 100644 | |
--- a/phpBB/language/en/acp/common.php | |
+++ b/phpBB/language/en/acp/common.php | |
@@ -371,9 +371,11 @@ $lang = array_merge($lang, array( | |
'ERROR_MBSTRING_ENCODING_TRANSLATION' => 'Transparent character encoding is improperly configured', | |
'ERROR_MBSTRING_ENCODING_TRANSLATION_EXPLAIN' => '<var>mbstring.encoding_translation</var> must be set to 0. You can check the current value on the <samp>PHP information</samp> page.', | |
'ERROR_MBSTRING_HTTP_INPUT' => 'HTTP input character conversion is improperly configured', | |
- 'ERROR_MBSTRING_HTTP_INPUT_EXPLAIN' => '<var>mbstring.http_input</var> must be set to <samp>pass</samp>. You can check the current value on the <samp>PHP information</samp> page.', | |
+ 'ERROR_MBSTRING_HTTP_INPUT_EXPLAIN' => '<var>mbstring.http_input</var> must be left empty. You can check the current value on the <samp>PHP information</samp> page.', | |
'ERROR_MBSTRING_HTTP_OUTPUT' => 'HTTP output character conversion is improperly configured', | |
- 'ERROR_MBSTRING_HTTP_OUTPUT_EXPLAIN' => '<var>mbstring.http_output</var> must be set to <samp>pass</samp>. You can check the current value on the <samp>PHP information</samp> page.', | |
+ 'ERROR_MBSTRING_HTTP_OUTPUT_EXPLAIN' => '<var>mbstring.http_output</var> must be left empty. You can check the current value on the <samp>PHP information</samp> page.', | |
+ 'ERROR_DEFAULT_CHARSET' => 'Default charset is improperly configured', | |
+ 'ERROR_DEFAULT_CHARSET_EXPLAIN' => '<var>default_charset</var> must be set to <samp>UTF-8</samp>. You can check the current value on the <samp>PHP information</samp> page.', | |
'FILES_PER_DAY' => 'Attachments per day', | |
'FORUM_STATS' => 'Board statistics', | |
diff --git a/phpBB/language/en/captcha_recaptcha.php b/phpBB/language/en/captcha_recaptcha.php | |
index 60d61cc2c8..103a9cf89d 100644 | |
--- a/phpBB/language/en/captcha_recaptcha.php | |
+++ b/phpBB/language/en/captcha_recaptcha.php | |
@@ -21,7 +21,7 @@ if (!defined('IN_PHPBB')) | |
if (empty($lang) || !is_array($lang)) | |
{ | |
- $lang = array(); | |
+ $lang = []; | |
} | |
// DEVELOPERS PLEASE NOTE | |
@@ -36,7 +36,7 @@ if (empty($lang) || !is_array($lang)) | |
// equally where a string contains only two placeholders which are used to wrap text | |
// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine | |
-$lang = array_merge($lang, array( | |
+$lang = array_merge($lang, [ | |
// Find the language/country code on https://developers.google.com/recaptcha/docs/language | |
// If no code exists for your language you can use "en" or leave the string empty | |
'RECAPTCHA_LANG' => 'en-GB', | |
@@ -73,4 +73,5 @@ $lang = array_merge($lang, array( | |
'RECAPTCHA_V3_THRESHOLD_REPORT' => 'Report threshold', | |
'RECAPTCHA_V3_THRESHOLDS' => 'Thresholds', | |
'RECAPTCHA_V3_THRESHOLDS_EXPLAIN' => 'reCAPTCHA v3 returns a score (<samp>1.0</samp> is very likely a good interaction, <samp>0.0</samp> is very likely a bot). Here you can set the minimum score per action.', | |
-)); | |
+ 'EMPTY_RECAPTCHA_V3_REQUEST_METHOD' => 'reCAPTCHA v3 requires to know which available method you want to use when verifying the request.', | |
+]); | |
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php | |
index fefb7dafb6..2fc7eeb12a 100644 | |
--- a/phpBB/language/en/common.php | |
+++ b/phpBB/language/en/common.php | |
@@ -398,7 +398,7 @@ $lang = array_merge($lang, array( | |
'LOGIN_CONFIRM_EXPLAIN' => 'To prevent brute forcing accounts the board requires you to enter a confirmation code after a maximum amount of failed logins. The code is displayed in the image you should see below. If you are visually impaired or cannot otherwise read this code please contact the %sBoard Administrator%s.', // unused | |
'LOGIN_ERROR_ATTEMPTS' => 'You exceeded the maximum allowed number of login attempts. In addition to your username and password you now also have to pass the CAPTCHA test.', | |
'LOGIN_ERROR_EXTERNAL_AUTH_APACHE' => 'You have not been authenticated by Apache.', | |
- 'LOGIN_ERROR_OAUTH_SERVICE_DOES_NOT_EXIST' => 'A non-existant OAuth service has been requested.', | |
+ 'LOGIN_ERROR_OAUTH_SERVICE_DOES_NOT_EXIST' => 'A non-existent OAuth service has been requested.', | |
'LOGIN_ERROR_PASSWORD' => 'You have specified an incorrect password. Please check your password and try again. If you continue to have problems please contact the %sBoard Administrator%s.', | |
'LOGIN_ERROR_PASSWORD_CONVERT' => 'It was not possible to convert your password when updating this bulletin board’s software. Please %srequest a new password%s. If you continue to have problems please contact the %sBoard Administrator%s.', | |
'LOGIN_ERROR_USERNAME' => 'You have specified an incorrect username. Please check your username and try again. If you continue to have problems please contact the %sBoard Administrator%s.', |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment