makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 12:28:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/16344] Move DOMAIN_NO_MX_RECORD_EMAIL to common.php

Browse source 
PHPBB3-16344
This commit is contained in:
mrgoldy 2020-02-04 19:16:43 +01:00
parent 846df59882
commit 13f5997554
3 changed files with 19 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
phpBB/language/en/common.php
View file

@ -190,24 +190,25 @@ $lang = array_merge($lang, array(
'COOKIES_DELETED' => 'All board cookies successfully deleted.', 'COOKIES_DELETED' => 'All board cookies successfully deleted.',
'CURRENT_TIME' => 'It is currently %s', 'CURRENT_TIME' => 'It is currently %s',
'DAY' => 'Day', 'DAY' => 'Day',
'DAYS' => 'Days', 'DAYS' => 'Days',
'DELETE' => 'Delete', 'DELETE' => 'Delete',
'DELETE_ALL' => 'Delete all', 'DELETE_ALL' => 'Delete all',
'DELETE_COOKIES' => 'Delete cookies', 'DELETE_COOKIES' => 'Delete cookies',
'DELETE_MARKED' => 'Delete marked', 'DELETE_MARKED' => 'Delete marked',
'DELETE_POST' => 'Delete post', 'DELETE_POST' => 'Delete post',
'DELIMITER' => 'Delimiter', 'DELIMITER' => 'Delimiter',
'DESCENDING' => 'Descending', 'DESCENDING' => 'Descending',
'DISABLED' => 'Disabled', 'DISABLED' => 'Disabled',
'DISPLAY' => 'Display', 'DISPLAY' => 'Display',
'DISPLAY_GUESTS' => 'Display guests', 'DISPLAY_GUESTS' => 'Display guests',
'DISPLAY_MESSAGES' => 'Display messages from previous', 'DISPLAY_MESSAGES' => 'Display messages from previous',
'DISPLAY_POSTS' => 'Display posts from previous', 'DISPLAY_POSTS' => 'Display posts from previous',
'DISPLAY_TOPICS' => 'Display topics from previous', 'DISPLAY_TOPICS' => 'Display topics from previous',
'DOWNLOADED' => 'Downloaded', 'DOMAIN_NO_MX_RECORD_EMAIL' => 'The entered email domain has no valid MX record.',
'DOWNLOADING_FILE' => 'Downloading file', 'DOWNLOADED' => 'Downloaded',
'DOWNLOAD_COUNTS' => array( 'DOWNLOADING_FILE' => 'Downloading file',
'DOWNLOAD_COUNTS' => array(
0 => 'Not downloaded yet', 0 => 'Not downloaded yet',
1 => 'Downloaded %d time', 1 => 'Downloaded %d time',
2 => 'Downloaded %d times', 2 => 'Downloaded %d times',

1
phpBB/language/en/ucp.php
View file

@ -179,7 +179,6 @@ $lang = array_merge($lang, array(
'DEMOTE_SELECTED' => 'Demote selected', 'DEMOTE_SELECTED' => 'Demote selected',
'DISABLE_CENSORS' => 'Enable word censoring', 'DISABLE_CENSORS' => 'Enable word censoring',
'DISPLAY_GALLERY' => 'Display gallery', 'DISPLAY_GALLERY' => 'Display gallery',
'DOMAIN_NO_MX_RECORD_EMAIL' => 'The entered email domain has no valid MX record.',
'DOWNLOADS' => 'Downloads', 'DOWNLOADS' => 'Downloads',
'DRAFTS_DELETED' => 'All selected drafts were successfully deleted.', 'DRAFTS_DELETED' => 'All selected drafts were successfully deleted.',
'DRAFTS_EXPLAIN' => 'Here you can view, edit and delete your saved drafts.', 'DRAFTS_EXPLAIN' => 'Here you can view, edit and delete your saved drafts.',

2
phpBB/memberlist.php
View file

@ -894,8 +894,6 @@ switch ($mode)
trigger_error('NO_EMAIL'); trigger_error('NO_EMAIL');
} }
$user->add_lang('ucp');
/** @var $form \phpbb\message\form */ /** @var $form \phpbb\message\form */
$form = $phpbb_container->get('message.form.' . $form_name); $form = $phpbb_container->get('message.form.' . $form_name);