From 846df59882a38b42303a848f7580c38e455e112b Mon Sep 17 00:00:00 2001 From: mrgoldy Date: Tue, 4 Feb 2020 18:39:23 +0100 Subject: [PATCH 1/3] [ticket/16344] Add UCP language to memberlist's contact form PHPBB3-16344 --- phpBB/memberlist.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index 1343bd7c60..4065c54d39 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -894,6 +894,8 @@ switch ($mode) trigger_error('NO_EMAIL'); } + $user->add_lang('ucp'); + /** @var $form \phpbb\message\form */ $form = $phpbb_container->get('message.form.' . $form_name); From 13f59975540db2e854490916f787514a8fa77ee5 Mon Sep 17 00:00:00 2001 From: mrgoldy Date: Tue, 4 Feb 2020 19:16:43 +0100 Subject: [PATCH 2/3] [ticket/16344] Move DOMAIN_NO_MX_RECORD_EMAIL to common.php PHPBB3-16344 --- phpBB/language/en/common.php | 37 ++++++++++++++++++------------------ phpBB/language/en/ucp.php | 1 - phpBB/memberlist.php | 2 -- 3 files changed, 19 insertions(+), 21 deletions(-) diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 6a27e6b89d..72705bb4f7 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -190,24 +190,25 @@ $lang = array_merge($lang, array( 'COOKIES_DELETED' => 'All board cookies successfully deleted.', 'CURRENT_TIME' => 'It is currently %s', - 'DAY' => 'Day', - 'DAYS' => 'Days', - 'DELETE' => 'Delete', - 'DELETE_ALL' => 'Delete all', - 'DELETE_COOKIES' => 'Delete cookies', - 'DELETE_MARKED' => 'Delete marked', - 'DELETE_POST' => 'Delete post', - 'DELIMITER' => 'Delimiter', - 'DESCENDING' => 'Descending', - 'DISABLED' => 'Disabled', - 'DISPLAY' => 'Display', - 'DISPLAY_GUESTS' => 'Display guests', - 'DISPLAY_MESSAGES' => 'Display messages from previous', - 'DISPLAY_POSTS' => 'Display posts from previous', - 'DISPLAY_TOPICS' => 'Display topics from previous', - 'DOWNLOADED' => 'Downloaded', - 'DOWNLOADING_FILE' => 'Downloading file', - 'DOWNLOAD_COUNTS' => array( + 'DAY' => 'Day', + 'DAYS' => 'Days', + 'DELETE' => 'Delete', + 'DELETE_ALL' => 'Delete all', + 'DELETE_COOKIES' => 'Delete cookies', + 'DELETE_MARKED' => 'Delete marked', + 'DELETE_POST' => 'Delete post', + 'DELIMITER' => 'Delimiter', + 'DESCENDING' => 'Descending', + 'DISABLED' => 'Disabled', + 'DISPLAY' => 'Display', + 'DISPLAY_GUESTS' => 'Display guests', + 'DISPLAY_MESSAGES' => 'Display messages from previous', + 'DISPLAY_POSTS' => 'Display posts from previous', + 'DISPLAY_TOPICS' => 'Display topics from previous', + 'DOMAIN_NO_MX_RECORD_EMAIL' => 'The entered email domain has no valid MX record.', + 'DOWNLOADED' => 'Downloaded', + 'DOWNLOADING_FILE' => 'Downloading file', + 'DOWNLOAD_COUNTS' => array( 0 => 'Not downloaded yet', 1 => 'Downloaded %d time', 2 => 'Downloaded %d times', diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index 8549230b9f..676e9bf986 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -179,7 +179,6 @@ $lang = array_merge($lang, array( 'DEMOTE_SELECTED' => 'Demote selected', 'DISABLE_CENSORS' => 'Enable word censoring', 'DISPLAY_GALLERY' => 'Display gallery', - 'DOMAIN_NO_MX_RECORD_EMAIL' => 'The entered email domain has no valid MX record.', 'DOWNLOADS' => 'Downloads', 'DRAFTS_DELETED' => 'All selected drafts were successfully deleted.', 'DRAFTS_EXPLAIN' => 'Here you can view, edit and delete your saved drafts.', diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index 4065c54d39..1343bd7c60 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -894,8 +894,6 @@ switch ($mode) trigger_error('NO_EMAIL'); } - $user->add_lang('ucp'); - /** @var $form \phpbb\message\form */ $form = $phpbb_container->get('message.form.' . $form_name); From a6c5def4f43ce9a383375a90bab2083cb002d2b6 Mon Sep 17 00:00:00 2001 From: mrgoldy Date: Tue, 4 Feb 2020 22:32:10 +0100 Subject: [PATCH 3/3] [ticket/16344] Un-indent irrelevant language strings PHPBB3-16344 --- phpBB/language/en/common.php | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 72705bb4f7..e9cf2b0ccc 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -190,25 +190,25 @@ $lang = array_merge($lang, array( 'COOKIES_DELETED' => 'All board cookies successfully deleted.', 'CURRENT_TIME' => 'It is currently %s', - 'DAY' => 'Day', - 'DAYS' => 'Days', - 'DELETE' => 'Delete', - 'DELETE_ALL' => 'Delete all', - 'DELETE_COOKIES' => 'Delete cookies', - 'DELETE_MARKED' => 'Delete marked', - 'DELETE_POST' => 'Delete post', - 'DELIMITER' => 'Delimiter', - 'DESCENDING' => 'Descending', - 'DISABLED' => 'Disabled', - 'DISPLAY' => 'Display', - 'DISPLAY_GUESTS' => 'Display guests', - 'DISPLAY_MESSAGES' => 'Display messages from previous', - 'DISPLAY_POSTS' => 'Display posts from previous', - 'DISPLAY_TOPICS' => 'Display topics from previous', + 'DAY' => 'Day', + 'DAYS' => 'Days', + 'DELETE' => 'Delete', + 'DELETE_ALL' => 'Delete all', + 'DELETE_COOKIES' => 'Delete cookies', + 'DELETE_MARKED' => 'Delete marked', + 'DELETE_POST' => 'Delete post', + 'DELIMITER' => 'Delimiter', + 'DESCENDING' => 'Descending', + 'DISABLED' => 'Disabled', + 'DISPLAY' => 'Display', + 'DISPLAY_GUESTS' => 'Display guests', + 'DISPLAY_MESSAGES' => 'Display messages from previous', + 'DISPLAY_POSTS' => 'Display posts from previous', + 'DISPLAY_TOPICS' => 'Display topics from previous', 'DOMAIN_NO_MX_RECORD_EMAIL' => 'The entered email domain has no valid MX record.', - 'DOWNLOADED' => 'Downloaded', - 'DOWNLOADING_FILE' => 'Downloading file', - 'DOWNLOAD_COUNTS' => array( + 'DOWNLOADED' => 'Downloaded', + 'DOWNLOADING_FILE' => 'Downloading file', + 'DOWNLOAD_COUNTS' => array( 0 => 'Not downloaded yet', 1 => 'Downloaded %d time', 2 => 'Downloaded %d times',