Version 2.0.0-RC7

2016-10-16 17:25:31 +02:00
parent 233dc89a8a
commit 159d1d25b8
59 changed files with 1096 additions and 493 deletions
--- a/language/en/common.php
+++ b/language/en/common.php
@@ -4,7 +4,7 @@
 *
 * @package phpBB Extension - mChat
 * @copyright (c) 2016 dmzx - http://www.dmzx-web.net
- * @copyright (c) 2016 kasimi
+ * @copyright (c) 2016 kasimi - https://kasimi.net
 * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
@@ -61,8 +61,12 @@ $lang = array_merge($lang, array(

 	// Post notification messages (%1$s is replaced with a link to the new/edited post, %2$s is replaced with a link to the forum)
 	'MCHAT_NEW_POST'				=> 'posted a new topic: %1$s in %2$s',
+	'MCHAT_NEW_POST_DELETED'		=> 'posted a new topic that was deleted',
 	'MCHAT_NEW_REPLY'				=> 'posted a reply: %1$s in %2$s',
+	'MCHAT_NEW_REPLY_DELETED'		=> 'posted a reply that was deleted',
 	'MCHAT_NEW_QUOTE'				=> 'replied with a quote: %1$s in %2$s',
+	'MCHAT_NEW_QUOTE_DELETED'		=> 'posted a reply that was deleted',
 	'MCHAT_NEW_EDIT'				=> 'edited a post: %1$s in %2$s',
+	'MCHAT_NEW_EDIT_DELETED'		=> 'edited a post that was deleted',
 	'MCHAT_NEW_LOGIN'				=> 'just logged in',
 ));
--- a/language/en/info_acp_mchat.php
+++ b/language/en/info_acp_mchat.php
@@ -4,7 +4,7 @@
 *
 * @package phpBB Extension - mChat
 * @copyright (c) 2016 dmzx - http://www.dmzx-web.net
- * @copyright (c) 2016 kasimi
+ * @copyright (c) 2016 kasimi - https://kasimi.net
 * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
@@ -44,7 +44,6 @@ $lang = array_merge($lang, array(
 	// Log entries (%1$s is replaced with the user name who triggered the event)
 	'LOG_MCHAT_CONFIG_UPDATE'		=> '<strong>mChat configuration updated</strong><br />» %1$s',
 	'LOG_MCHAT_TABLE_PRUNED'		=> '<strong>mChat messages pruned: %2$d</strong><br />» %1$s',
-	'LOG_MCHAT_TABLE_PRUNE_FAIL'	=> '<strong>mChat pruning failed: invalid time period</strong><br />» %1$s',
 	'LOG_MCHAT_TABLE_PURGED'		=> '<strong>mChat messages purged</strong><br />» %1$s',
 	'LOG_DELETED_MCHAT'				=> '<strong>mChat message deleted</strong><br />» %1$s',
 	'LOG_EDITED_MCHAT'				=> '<strong>mChat message edited</strong><br />» %1$s',
--- a/language/en/info_ucp_mchat.php
+++ b/language/en/info_ucp_mchat.php
@@ -4,7 +4,7 @@
 *
 * @package phpBB Extension - mChat
 * @copyright (c) 2016 dmzx - http://www.dmzx-web.net
- * @copyright (c) 2016 kasimi
+ * @copyright (c) 2016 kasimi - https://kasimi.net
 * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
--- a/language/en/mchat.php
+++ b/language/en/mchat.php
@@ -4,7 +4,7 @@
 *
 * @package phpBB Extension - mChat
 * @copyright (c) 2016 dmzx - http://www.dmzx-web.net
- * @copyright (c) 2016 kasimi
+ * @copyright (c) 2016 kasimi - https://kasimi.net
 * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
@@ -38,6 +38,7 @@ $lang = array_merge($lang, array(
 	'MCHAT_ADD'						=> 'Send',
 	'MCHAT_ARCHIVE'					=> 'Archive',
 	'MCHAT_ARCHIVE_PAGE'			=> 'mChat Archive',
+	'MCHAT_CUSTOM_PAGE'				=> 'mChat',
 	'MCHAT_BBCODES'					=> 'BBCodes',
 	'MCHAT_CUSTOM_BBCODES'			=> 'Custom BBCodes',
 	'MCHAT_DELCONFIRM'				=> 'Are you sure you want to delete this message?',
--- a/language/en/mchat_acp.php
+++ b/language/en/mchat_acp.php
@@ -4,7 +4,7 @@
 *
 * @package phpBB Extension - mChat
 * @copyright (c) 2016 dmzx - http://www.dmzx-web.net
- * @copyright (c) 2016 kasimi
+ * @copyright (c) 2016 kasimi - https://kasimi.net
 * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
@@ -52,6 +52,12 @@ $lang = array_merge($lang, array(
 	'MCHAT_ACP_USER_PREFS_EXPLAIN'					=> 'Below are listed all mChat preferences of the selected user. Settings for which the selected user does not have permission to customise are disabled. These settings can be changed in the <em>Global user settings</em> mChat configuration section.',

 	// ACP settings
+	'MCHAT_ACP_CHARACTERS'							=> 'characters',
+	'MCHAT_ACP_MESSAGES'							=> 'messages',
+	'MCHAT_ACP_SECONDS'								=> 'seconds',
+	'MCHAT_ACP_HOURS'								=> 'hours',
+	'MCHAT_ACP_DAYS'								=> 'days',
+	'MCHAT_ACP_WEEKS'								=> 'weeks',
 	'MCHAT_ACP_GLOBALSETTINGS_TITLE'				=> 'mChat Global settings',
 	'MCHAT_ACP_GLOBALUSERSETTINGS_TITLE'			=> 'mChat Global user settings',
 	'MCHAT_VERSION'									=> 'Version',
@@ -70,9 +76,10 @@ $lang = array_merge($lang, array(
 	'MCHAT_LIVE_UPDATES'							=> 'Live updates of edited and deleted messages',
 	'MCHAT_LIVE_UPDATES_EXPLAIN'					=> 'When a user edits or deletes messages, the changes are updated live for all others, without them having to refresh the page. Disable this if you experience performance issues.',
 	'MCHAT_PRUNE'									=> 'Enable message pruning',
-	'MCHAT_PRUNE_EXPLAIN'							=> 'The messages table is pruned every 24 hours.',
+	'MCHAT_PRUNE_GC'								=> 'Message prune task interval',
+	'MCHAT_PRUNE_GC_EXPLAIN'						=> 'The time in seconds that needs to pass before the next message pruning is triggered. Note: this setting controls <em>when</em> messages are checked if they can be deleted. It does <em>not</em> control <em>which</em> messages are deleted. <em>Default is 86400 = 24 hours.</em>',
 	'MCHAT_PRUNE_NUM'								=> 'Messages to retain when pruning',
-	'MCHAT_PRUNE_NUM_EXPLAIN'						=> 'You can specify either a number to keep a fixed number of messages (example: <em>42</em>) or a time period (examples: <em>24 hours</em>, <em>5 days</em>, <em>2 weeks</em>, <em>1 month</em>). All messages older than the time period at the time of pruning will be deleted.',
+	'MCHAT_PRUNE_NUM_EXPLAIN'						=> 'When using ’messages’ a fixed number of messages will be kept. When using ’hours’, ’days’ or ’weeks’ all messages older than the specified time period at the time of pruning will be deleted.',
 	'MCHAT_PRUNE_NOW'								=> 'Prune messages now',
 	'MCHAT_PRUNE_NOW_CONFIRM'						=> 'Confirm pruning messages',
 	'MCHAT_PRUNED'									=> '%1$d mChat messages have been pruned',
@@ -85,7 +92,7 @@ $lang = array_merge($lang, array(
 	'MCHAT_MESSAGE_NUM_ARCHIVE'						=> 'Number of messages to display on the archive page',
 	'MCHAT_MESSAGE_NUM_ARCHIVE_EXPLAIN'				=> 'The maximum number of messages to show per page on the archive page.<br /><em>You are limited from 10 to 100. Default is 25.</em>',
 	'MCHAT_FLOOD_TIME'								=> 'Flood time',
-	'MCHAT_FLOOD_TIME_EXPLAIN'						=> 'The number of seconds a user must wait before posting another message in the chat.<br /><em>You are limited from 5 to 60 seconds. Default is 0. Set to 0 to disable.</em>',
+	'MCHAT_FLOOD_TIME_EXPLAIN'						=> 'The number of seconds a user must wait before posting another message in the chat.<br /><em>You are limited from 0 to 60 seconds. Default is 0. Set to 0 to disable.</em>',
 	'MCHAT_EDIT_DELETE_LIMIT'						=> 'Time limit for editing and deleting messages',
 	'MCHAT_EDIT_DELETE_LIMIT_EXPLAIN'				=> 'Messages older than the specified number of seconds cannot be edited or deleted by the author any more.<br />Users who have <em>edit/delete permission as well as moderator permission are exempt</em> from this time limit.<br />Set to 0 to allow unlimited editing and deleting.',
 	'MCHAT_MAX_MESSAGE_LENGTH'						=> 'Maximum message length',
--- a/language/en/mchat_ucp.php
+++ b/language/en/mchat_ucp.php
@@ -4,7 +4,7 @@
 *
 * @package phpBB Extension - mChat
 * @copyright (c) 2016 dmzx - http://www.dmzx-web.net
- * @copyright (c) 2016 kasimi
+ * @copyright (c) 2016 kasimi - https://kasimi.net
 * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
@@ -49,7 +49,7 @@ $lang = array_merge($lang, array(
 	'MCHAT_INPUT_AREA'				=> 'Input field',
 	'MCHAT_TEXT_AREA'				=> 'Text area',
 	'MCHAT_POSTS'					=> 'Display new posts (currently all disabled, can be enabled in the mChat Global Settings section in the ACP)',
-	'MCHAT_CHARACTER_COUNT'			=> 'Display number of characters when typing a message',
+	'MCHAT_DISPLAY_CHARACTER_COUNT'	=> 'Display number of characters when typing a message',
 	'MCHAT_RELATIVE_TIME'			=> 'Display relative time for new messages',
 	'MCHAT_RELATIVE_TIME_EXPLAIN'	=> 'Displays “just now”, “1 minute ago” and so on for each message. Set to <em>No</em> to always display the full date.',
 	'MCHAT_PAUSE_ON_INPUT'			=> 'Pause on input',
--- a/language/en/permissions_mchat.php
+++ b/language/en/permissions_mchat.php
@@ -4,7 +4,7 @@
 *
 * @package phpBB Extension - mChat
 * @copyright (c) 2016 dmzx - http://www.dmzx-web.net
- * @copyright (c) 2016 kasimi
+ * @copyright (c) 2016 kasimi - https://kasimi.net
 * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */