diff options
| author |   Marc Alexander <admin@m-a-styles.de> | 2019-04-13 12:38:44 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2019-04-13 12:38:44 +0200 |
| commit | 507efee633fee769e7e2af4a2b298c951193f800 (patch) | |
| tree | af85ad61408480a1eb4d57c4cbdd1fdf2fb52ae6 | |
| parent | Merge pull request #5484 from rxu/ticket/15915 (diff) | |
| parent | [ticket/15917] Remove br tags (diff) | |
| download | forums-507efee633fee769e7e2af4a2b298c951193f800.tar.gz forums-507efee633fee769e7e2af4a2b298c951193f800.tar.bz2 forums-507efee633fee769e7e2af4a2b298c951193f800.zip | |
Merge pull request #5534 from battye/ticket/15917
[ticket/15917] Unapproved topics message for forums with no other posts
| -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 a037c5bfe..835030762 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 eed27b513..8250a1fd0 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) }} + {% else %} + {{ lang('NO_POSTS') }} + {% endif %} <!-- ENDIF --> </span> </dd> |