mirror of
https://github.com/BookStackApp/BookStack.git
synced 2024-08-25 03:35:35 +00:00
Set comment add box to show with correct permissions
- Also fixed const assignment issue in translations.js
This commit is contained in:
parent
88e076a12a
commit
4bf77f67dd
@ -52,9 +52,7 @@ class Translator {
|
||||
const rangeRegex = /^\[([0-9]+),([0-9*]+)]/;
|
||||
let result = null;
|
||||
|
||||
for (const i = 0, len = splitText.length; i < len; i++) {
|
||||
const t = splitText[i];
|
||||
|
||||
for (let t of splitText) {
|
||||
// Parse exact matches
|
||||
const exactMatches = t.match(exactCountRegex);
|
||||
if (exactMatches !== null && Number(exactMatches[1]) === count) {
|
||||
@ -77,7 +75,10 @@ class Translator {
|
||||
result = (count === 1) ? splitText[0] : splitText[1];
|
||||
}
|
||||
|
||||
if (result === null) result = splitText[0];
|
||||
if (result === null) {
|
||||
result = splitText[0];
|
||||
}
|
||||
|
||||
return this.performReplacements(result, replacements);
|
||||
}
|
||||
|
||||
|
@ -9,7 +9,7 @@
|
||||
|
||||
<div comment-count-bar class="grid half left-focus v-center no-row-gap">
|
||||
<h5 comments-title>{{ trans_choice('entities.comment_count', count($page->comments), ['count' => count($page->comments)]) }}</h5>
|
||||
@if (count($page->comments) === 0)
|
||||
@if (count($page->comments) === 0 && userCan('comment-create-all'))
|
||||
<div class="text-m-right" comment-add-button-container>
|
||||
<button type="button" action="addComment"
|
||||
class="button outline">{{ trans('entities.comment_add') }}</button>
|
||||
@ -25,13 +25,13 @@
|
||||
|
||||
@if(userCan('comment-create-all'))
|
||||
@include('comments.create')
|
||||
@endif
|
||||
|
||||
@if (count($page->comments) > 0)
|
||||
<div class="text-right" comment-add-button-container>
|
||||
<button type="button" action="addComment"
|
||||
class="button outline">{{ trans('entities.comment_add') }}</button>
|
||||
</div>
|
||||
@if (count($page->comments) > 0)
|
||||
<div class="text-right" comment-add-button-container>
|
||||
<button type="button" action="addComment"
|
||||
class="button outline">{{ trans('entities.comment_add') }}</button>
|
||||
</div>
|
||||
@endif
|
||||
@endif
|
||||
|
||||
</div>
|
Loading…
Reference in New Issue
Block a user