Merge branch '3.2.x'

This commit is contained in:
Marc Alexander 2019-04-13 12:38:48 +02:00
commit c044f44db2
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
2 changed files with 9 additions and 1 deletions

View file

@ -805,6 +805,10 @@ $lang = array_merge($lang, array(
'TOPIC_REVIEW' => 'Topic review', 'TOPIC_REVIEW' => 'Topic review',
'TOPIC_TITLE' => 'Topic title', 'TOPIC_TITLE' => 'Topic title',
'TOPIC_UNAPPROVED' => 'This topic has not been approved.', '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.', 'TOPIC_DELETED' => 'This topic has been deleted.',
'TOTAL_ATTACHMENTS' => 'Attachment(s)', 'TOTAL_ATTACHMENTS' => 'Attachment(s)',
'TOTAL_LOGS' => array( 'TOTAL_LOGS' => array(

View file

@ -107,7 +107,11 @@
<!-- ENDIF --> <!-- ENDIF -->
<br />{forumrow.LAST_POST_TIME} <br />{forumrow.LAST_POST_TIME}
<!-- ELSE --> <!-- ELSE -->
{L_NO_POSTS}<br />&nbsp; {% if forumrow.U_UNAPPROVED_TOPICS %}
{{ lang('TOPIC_UNAPPROVED_FORUM', forumrow.TOPICS) }}
{% else %}
{{ lang('NO_POSTS') }}
{% endif %}
<!-- ENDIF --> <!-- ENDIF -->
</span> </span>
</dd> </dd>