Set comment add box to show with correct permissions

- Also fixed const assignment issue in translations.js

diff --git a/resources/assets/js/services/translations.js b/resources/assets/js/services/translations.js
index 645286c08b9238ef8842846a80594cce7733ff51..b595a05e6f95b8e9a2d7862adbc5b5d003f6e163 100644 (file)
--- a/resources/assets/js/services/translations.js
+++ b/resources/assets/js/services/translations.js
@@ -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);
     }
 

diff --git a/resources/views/comments/comments.blade.php b/resources/views/comments/comments.blade.php
index 99b21b9b263a8e51c1c0c042a7f30c6008003d14..5bfcc31bd4a730b80f75e94998ac7dab619946a0 100644 (file)
--- a/resources/views/comments/comments.blade.php
+++ b/resources/views/comments/comments.blade.php
@@ -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>
\ No newline at end of file