Merge remote-tracking branch 'nickvergessen/ticket/10690' into develop

* nickvergessen/ticket/10690:
  [ticket/10690] Fix undefined UNAPPROVED_POSTS_ZERO_TOTAL in queue
This commit is contained in:
Oleg Pudeyev 2012-03-16 05:29:23 -04:00
commit 29b11b69f8
3 changed files with 3 additions and 2 deletions

View file

@ -238,6 +238,7 @@ $lang = array_merge($lang, array(
'NO_POST' => 'You have to select a post in order to warn the user for a post.', 'NO_POST' => 'You have to select a post in order to warn the user for a post.',
'NO_POST_REPORT' => 'This post was not reported.', 'NO_POST_REPORT' => 'This post was not reported.',
'NO_POST_SELECTED' => 'You must select at least one post to perform this action.', 'NO_POST_SELECTED' => 'You must select at least one post to perform this action.',
'NO_POSTS_QUEUE' => 'There are no posts waiting for approval.',
'NO_REASON_DISAPPROVAL' => 'Please give an appropriate reason for disapproval.', 'NO_REASON_DISAPPROVAL' => 'Please give an appropriate reason for disapproval.',
'NO_REPORT' => 'No report found', 'NO_REPORT' => 'No report found',
'NO_REPORTS' => 'No reports found', 'NO_REPORTS' => 'No reports found',

View file

@ -78,7 +78,7 @@
</li> </li>
</ul> </ul>
<!-- ELSE --> <!-- ELSE -->
<p class="notopics"><strong><!-- IF S_TOPICS -->{L_NO_TOPICS_QUEUE}<!-- ELSE -->{L_UNAPPROVED_POSTS_ZERO_TOTAL}<!-- ENDIF --></strong></p> <p class="notopics"><strong><!-- IF S_TOPICS -->{L_NO_TOPICS_QUEUE}<!-- ELSE -->{L_NO_POSTS_QUEUE}<!-- ENDIF --></strong></p>
<!-- ENDIF --> <!-- ENDIF -->
<span class="corners-bottom"><span></span></span></div> <span class="corners-bottom"><span></span></span></div>

View file

@ -27,7 +27,7 @@
</tr> </tr>
<!-- BEGINELSE --> <!-- BEGINELSE -->
<tr> <tr>
<td class="row1" colspan="4" height="30" align="center" valign="middle"><span class="gen"><!-- IF S_TOPICS -->{L_NO_TOPICS_QUEUE}<!-- ELSE -->{L_UNAPPROVED_POSTS_ZERO_TOTAL}<!-- ENDIF --></span></td> <td class="row1" colspan="4" height="30" align="center" valign="middle"><span class="gen"><!-- IF S_TOPICS -->{L_NO_TOPICS_QUEUE}<!-- ELSE -->{L_NO_POSTS_QUEUE}<!-- ENDIF --></span></td>
</tr> </tr>
<!-- END postrow --> <!-- END postrow -->
<tr> <tr>