From 99fabe2eb83ec90acedc49e87b21b46424e7d2d0 Mon Sep 17 00:00:00 2001
From: Christian Schnegelberger <mail@crizzo.de>
Date: Thu, 21 Sep 2023 10:53:39 +0200
Subject: [PATCH] [ticket/17191] new config values lang/en/composer.json fr
 common/recaptcha

PHPBB3-17191
---
 phpBB/language/en/captcha_recaptcha.php | 4 ----
 phpBB/language/en/common.php            | 7 -------
 phpBB/language/en/composer.json         | 6 +++++-
 3 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/phpBB/language/en/captcha_recaptcha.php b/phpBB/language/en/captcha_recaptcha.php
index b76ae56ac0..513e47d3b4 100644
--- a/phpBB/language/en/captcha_recaptcha.php
+++ b/phpBB/language/en/captcha_recaptcha.php
@@ -37,10 +37,6 @@ if (empty($lang) || !is_array($lang))
 // in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
 
 $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',
-
 	'CAPTCHA_RECAPTCHA'				=> 'reCaptcha v2',
 	'CAPTCHA_RECAPTCHA_V3'			=> 'reCaptcha v3',
 
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 3470527318..d974a7e7f5 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -42,15 +42,8 @@ if (empty($lang) || !is_array($lang))
 
 $lang = array_merge($lang, array(
 	'TRANSLATION_INFO'	=> '',
-	'DIRECTION'			=> 'ltr',
 	'DATE_FORMAT'		=> '|d M Y|',	// 01 Jan 2007 (with Relative days enabled)
 	'DATETIME_FORMAT'	=> '|d M Y, H:i|',	// 01 Jan 2007, 13:37 (with Relative days enabled)
-	'USER_LANG'			=> 'en-gb',
-
-	// You can define different rules for the determination of plural forms here.
-	// See https://area51.phpbb.com/docs/dev/3.3.x/language/plurals.html for more information
-	// or ask the translation manager for help.
-	'PLURAL_RULE'		=> 1,
 
 	'1_DAY'			=> '1 day',
 	'1_MONTH'		=> '1 month',
diff --git a/phpBB/language/en/composer.json b/phpBB/language/en/composer.json
index bbb2da4ae1..aef3c41be7 100644
--- a/phpBB/language/en/composer.json
+++ b/phpBB/language/en/composer.json
@@ -22,6 +22,10 @@
 		"language-iso": "en",
 		"english-name": "British English",
 		"local-name": "British English",
-		"phpbb-version": "4.0.0-a1-dev"
+		"phpbb-version": "4.0.0-a1-dev",
+		"direction": "ltr",
+		"user_lang": "en-gb",
+		"plural_rule": "1",
+		"recaptcha_lang": "en-GB"
 	}
 }