mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-31 14:00:31 +02:00
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
This commit is contained in:
@@ -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',
|
||||
|
Reference in New Issue
Block a user