diff options
| author | battye <battye@phpbb.com> | 2019-02-13 06:57:29 +0000 |
|---|---|---|
| committer | battye <battye@phpbb.com> | 2019-02-13 06:57:29 +0000 |
| commit | 59a84a71be236d3f5f05fa932f4f52984fb39037 (patch) | |
| tree | ccfa678e2486c14582162e27b7c84f67bad67e2c | |
| parent | 33afd3f350b60bd60581e7e0292381619da96df2 (diff) | |
| download | forums-59a84a71be236d3f5f05fa932f4f52984fb39037.tar forums-59a84a71be236d3f5f05fa932f4f52984fb39037.tar.gz forums-59a84a71be236d3f5f05fa932f4f52984fb39037.tar.bz2 forums-59a84a71be236d3f5f05fa932f4f52984fb39037.tar.xz forums-59a84a71be236d3f5f05fa932f4f52984fb39037.zip | |
[ticket/15917] Special unapproved topics message
For forums that have no approved posts but also have
topics awaiting approval, to avoid the inconsistency
of saying 'no posts' alongside a positive post count.
PHPBB3-15917
| -rw-r--r-- | phpBB/language/en/common.php | 4 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/forumlist_body.html | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index a037c5bfe8..835030762c 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -780,6 +780,10 @@ $lang = array_merge($lang, array( 'TOPIC_REVIEW' => 'Topic review', 'TOPIC_TITLE' => 'Topic title', 'TOPIC_UNAPPROVED' => 'This topic has not been approved.', + 'TOPIC_UNAPPROVED_FORUM' => array( + 1 => 'Topic awaiting approval', + 2 => 'Topics awaiting approval', + ), 'TOPIC_DELETED' => 'This topic has been deleted.', 'TOTAL_ATTACHMENTS' => 'Attachment(s)', 'TOTAL_LOGS' => array( diff --git a/phpBB/styles/prosilver/template/forumlist_body.html b/phpBB/styles/prosilver/template/forumlist_body.html index eed27b5131..faf100f91b 100644 --- a/phpBB/styles/prosilver/template/forumlist_body.html +++ b/phpBB/styles/prosilver/template/forumlist_body.html @@ -103,7 +103,11 @@ <!-- ENDIF --> <br />{forumrow.LAST_POST_TIME} <!-- ELSE --> - {L_NO_POSTS}<br /> + {% if forumrow.U_UNAPPROVED_TOPICS %} + {{ lang('TOPIC_UNAPPROVED_FORUM', forumrow.TOPICS) }}<br /> + {% else %} + {{ lang('NO_POSTS') }}<br /> + {% endif %} <!-- ENDIF --> </span> </dd> |