diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-05-06 13:59:09 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-05-06 13:59:09 +0200 |
| commit | c7d29fbdb1bb0d265e7791ce40699def97f4388e (patch) | |
| tree | e8ec269bdf1022b59dbebd101932ebb1db361648 /phpBB/language/en/common.php | |
| parent | 1b3d54f5dd38bc1bbb5d1f4d87ad53e04e8a9bf6 (diff) | |
| parent | 717f8a6671a216b4d9985c286454b47cd9cb8691 (diff) | |
| download | forums-c7d29fbdb1bb0d265e7791ce40699def97f4388e.tar forums-c7d29fbdb1bb0d265e7791ce40699def97f4388e.tar.gz forums-c7d29fbdb1bb0d265e7791ce40699def97f4388e.tar.bz2 forums-c7d29fbdb1bb0d265e7791ce40699def97f4388e.tar.xz forums-c7d29fbdb1bb0d265e7791ce40699def97f4388e.zip | |
Merge pull request #2373 from Nicofuma/ticket/12459
[ticket/12459] Unapproved posts/topics are not correctly handled in feeds
* Nicofuma/ticket/12459:
[ticket/12459] Change language strings
[ticket/12459] Enable related tests
[ticket/12459] Fix: Differentiating unapproved and deleted posts
[ticket/12459] Fix: Soft deleted topics should appear in feeds
[ticket/12459] Fix: the posts were always marked as unapproved
Diffstat (limited to 'phpBB/language/en/common.php')
| -rw-r--r-- | phpBB/language/en/common.php | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index aac4f2516e..7faa46daf3 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -555,7 +555,8 @@ $lang = array_merge($lang, array( 'POST_BY_FOE' => '<strong>%1$s</strong>, 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' => '<strong>%2$s</strong> deleted the post by <strong>%1$s</strong> on %3$s.', 'POST_DELETED_BY_REASON'=> '<strong>%2$s</strong> deleted the post by <strong>%1$s</strong> on %3$s for the following reason: %4$s', 'POST_DETAILS' => 'Post details', @@ -568,7 +569,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 @@ -738,7 +740,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_UNAPPROVED' => 'This topic has not been approved.', + 'TOPIC_DELETED' => 'This topic has been deleted.', 'TOTAL_ATTACHMENTS' => 'Attachment(s)', 'TOTAL_LOGS' => array( 1 => '%d log', |