From 9dc4e5a61f5bfe7299f9f6ffbd851529ad459ba1 Mon Sep 17 00:00:00 2001 From: Tristan Darricau Date: Sun, 20 Apr 2014 18:32:34 +0200 Subject: [ticket/12459] Fix: Soft deleted topics should appear in feeds As for the posts, a soft deleted topic should appear (with a corresponding message) in topic's based feeds. PHPBB3-12459 --- phpBB/language/en/common.php | 1 + 1 file changed, 1 insertion(+) (limited to 'phpBB/language') diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 4d4a955aa3..21a7aa0a64 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -740,6 +740,7 @@ $lang = array_merge($lang, array( 'TOPIC_REVIEW' => 'Topic review', 'TOPIC_TITLE' => 'Topic title', 'TOPIC_UNAPPROVED' => 'This topic has not been approved', + 'TOPIC_DELETED' => 'Deleted topic:', 'TOTAL_ATTACHMENTS' => 'Attachment(s)', 'TOTAL_LOGS' => array( 1 => '%d log', -- cgit v1.2.1 From 717f8a6671a216b4d9985c286454b47cd9cb8691 Mon Sep 17 00:00:00 2001 From: Tristan Darricau Date: Mon, 5 May 2014 18:58:15 +0200 Subject: [ticket/12459] Change language strings PHPBB3-12459 --- phpBB/language/en/common.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'phpBB/language') diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 21a7aa0a64..2df585ca03 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -556,7 +556,8 @@ $lang = array_merge($lang, array( 'POST_BY_FOE' => '%1$s, who is currently on your ignore list, made this post.', 'POST_DISPLAY' => '%1$sDisplay this post%2$s.', 'POST_DAY' => '%.2f posts per day', - 'POST_DELETED' => 'Deleted post:', + 'POST_DELETED_ACTION' => 'Deleted post:', + 'POST_DELETED' => 'This post has been deleted.', 'POST_DELETED_BY' => '%2$s deleted the post by %1$s on %3$s.', 'POST_DELETED_BY_REASON'=> '%2$s deleted the post by %1$s on %3$s for the following reason: %4$s', 'POST_DETAILS' => 'Post details', @@ -569,7 +570,8 @@ $lang = array_merge($lang, array( 'POST_SUBJECT' => 'Post subject', 'POST_TIME' => 'Post time', 'POST_TOPIC' => 'Post a new topic', - 'POST_UNAPPROVED' => 'Post awaiting approval:', + 'POST_UNAPPROVED_ACTION' => 'Post awaiting approval:', + 'POST_UNAPPROVED' => 'This post has not been approved.', 'POWERED_BY' => 'Powered by %s', 'PREVIEW' => 'Preview', 'PREVIOUS' => 'Previous', // Used in pagination @@ -739,8 +741,8 @@ $lang = array_merge($lang, array( 'TOPIC_MOVED' => 'Moved topic', 'TOPIC_REVIEW' => 'Topic review', 'TOPIC_TITLE' => 'Topic title', - 'TOPIC_UNAPPROVED' => 'This topic has not been approved', - 'TOPIC_DELETED' => 'Deleted topic:', + 'TOPIC_UNAPPROVED' => 'This topic has not been approved.', + 'TOPIC_DELETED' => 'This topic has been deleted.', 'TOTAL_ATTACHMENTS' => 'Attachment(s)', 'TOTAL_LOGS' => array( 1 => '%d log', -- cgit v1.2.1