Extracted entity perms. text to translation files

diff --git a/app/Auth/Permissions/PermissionFormData.php b/app/Auth/Permissions/PermissionFormData.php
index ae06762f4f41c9deb2411643bb71e0c789f209b9..2e2af6854f21d8489a0a50c456328879aa7bc8ab 100644 (file)
--- a/app/Auth/Permissions/PermissionFormData.php
+++ b/app/Auth/Permissions/PermissionFormData.php
@@ -61,8 +61,8 @@ class PermissionFormData
     {
         return (new Role())->forceFill([
             'id' => 0,
-            'display_name' => 'Everyone Else',
-            'description' => 'Set permissions for all roles not specifically overridden.'
+            'display_name' => trans('entities.permissions_role_everyone_else'),
+            'description' => trans('entities.permissions_role_everyone_else_desc'),
         ]);
     }
 }

diff --git a/app/Http/Controllers/PermissionsController.php b/app/Http/Controllers/PermissionsController.php
index 93498a2b9f2a2353d3d14a103c0fe9e3efae1e1a..9d50b834b3f818456b9b0270ed798e130046bf3b 100644 (file)
--- a/app/Http/Controllers/PermissionsController.php
+++ b/app/Http/Controllers/PermissionsController.php
@@ -29,6 +29,7 @@ class PermissionsController extends Controller
         $page = Page::getBySlugs($bookSlug, $pageSlug);
         $this->checkOwnablePermission('restrictions-manage', $page);
 
+        $this->setPageTitle(trans('entities.pages_permissions'));
         return view('pages.permissions', [
             'page' => $page,
             'data' => new PermissionFormData($page),
@@ -58,6 +59,7 @@ class PermissionsController extends Controller
         $chapter = Chapter::getBySlugs($bookSlug, $chapterSlug);
         $this->checkOwnablePermission('restrictions-manage', $chapter);
 
+        $this->setPageTitle(trans('entities.chapters_permissions'));
         return view('chapters.permissions', [
             'chapter' => $chapter,
             'data' => new PermissionFormData($chapter),
@@ -87,6 +89,7 @@ class PermissionsController extends Controller
         $book = Book::getBySlug($slug);
         $this->checkOwnablePermission('restrictions-manage', $book);
 
+        $this->setPageTitle(trans('entities.books_permissions'));
         return view('books.permissions', [
             'book' => $book,
             'data' => new PermissionFormData($book),
@@ -116,6 +119,7 @@ class PermissionsController extends Controller
         $shelf = Bookshelf::getBySlug($slug);
         $this->checkOwnablePermission('restrictions-manage', $shelf);
 
+        $this->setPageTitle(trans('entities.shelves_permissions'));
         return view('shelves.permissions', [
             'shelf' => $shelf,
             'data' => new PermissionFormData($shelf),

diff --git a/resources/lang/en/entities.php b/resources/lang/en/entities.php
index 28ec591d7d3f48b4a6e8205043746845ddc7c822..bf6201900fc3653724e85d715411695325b6fd0a 100644 (file)
--- a/resources/lang/en/entities.php
+++ b/resources/lang/en/entities.php
@@ -42,9 +42,14 @@ return [
 
     // Permissions and restrictions
     'permissions' => 'Permissions',
-    'permissions_intro' => 'Once enabled, These permissions will take priority over any set role permissions.',
+    'permissions_desc' => 'Set permissions here to override the default permissions provided by user roles.',
+    'permissions_book_cascade' => 'Permissions set on books will automatically cascade to child chapters and pages, unless they have their own permissions defined.',
+    'permissions_chapter_cascade' => 'Permissions set on chapters will automatically cascade to child pages, unless they have their own permissions defined.',
     'permissions_save' => 'Save Permissions',
     'permissions_owner' => 'Owner',
+    'permissions_role_everyone_else' => 'Everyone Else',
+    'permissions_role_everyone_else_desc' => 'Set permissions for all roles not specifically overridden.',
+    'permissions_role_override' => 'Override permissions for role',
 
     // Search
     'search_results' => 'Search Results',

diff --git a/resources/views/form/entity-permissions-row.blade.php b/resources/views/form/entity-permissions-row.blade.php
index a7a314bf4c704adea7c6e8688e8f7203c68b43d3..d2e6a475631ce6a9becada220d9d4c0b8403ccd0 100644 (file)
--- a/resources/views/form/entity-permissions-row.blade.php
+++ b/resources/views/form/entity-permissions-row.blade.php
@@ -7,7 +7,7 @@ $inheriting - Boolean if the current row should be marked as inheriting default
 
 <div component="permissions-table" class="content-permissions-row flex-container-row justify-space-between wrap">
     <div class="gap-x-m flex-container-row items-center px-l py-m flex">
-        <div class="text-large" title="{{ $role->id === 0 ? 'Everyone Else' : trans('common.role') }}">
+        <div class="text-large" title="{{ $role->id === 0 ? trans('entities.permissions_role_everyone_else') : trans('common.role') }}">
             @icon($role->id === 0 ? 'groups' : 'role')
         </div>
         <span>
@@ -80,8 +80,8 @@ $inheriting - Boolean if the current row should be marked as inheriting default
                     class="text-neg p-m icon-button"
                     data-role-id="{{ $role->id }}"
                     data-role-name="{{ $role->display_name }}"
-                    title="Remove Row">
-                @icon('close') <span class="hide-over-m ml-xs">Remove Row</span>
+                    title="{{ trans('common.remove') }}">
+                @icon('close') <span class="hide-over-m ml-xs">{{ trans('common.remove') }}</span>
             </button>
         </div>
     @endif

diff --git a/resources/views/form/entity-permissions.blade.php b/resources/views/form/entity-permissions.blade.php
index 5e6503e0ed2bbfaece593a65002b49b50fe4392f..724d0fb393658b4f5152331d8ba3117d4386ca2b 100644 (file)
--- a/resources/views/form/entity-permissions.blade.php
+++ b/resources/views/form/entity-permissions.blade.php
@@ -11,20 +11,13 @@
     <div class="grid half left-focus v-end gap-m wrap">
         <div>
             <h1 class="list-heading">{{ $title }}</h1>
-{{--            <p class="mb-none mt-m">{{ trans('entities.permissions_intro') }}</p>--}}
             <p class="text-muted mb-s">
-                Set permissions here to override the default permissions provided by user roles.
+                {{ trans('entities.permissions_desc') }}
 
                 @if($model instanceof \BookStack\Entities\Models\Book)
-                <br>
-                Permissions set on books will automatically cascade to child chapters and pages, unless
-                they have their own permissions defined.
-                @endif
-
-                @if($model instanceof \BookStack\Entities\Models\Chapter)
-                    <br>
-                    Permissions set on chapters will automatically cascade to child pages, unless
-                    they have their own permissions defined.
+                    <br> {{ trans('entities.permissions_book_cascade') }}
+                @elseif($model instanceof \BookStack\Entities\Models\Chapter)
+                    <br> {{ trans('entities.permissions_chapter_cascade') }}
                 @endif
             </p>
 
@@ -55,7 +48,7 @@
 
     <div class="flex-container-row justify-flex-end mb-xl">
         <div class="flex-container-row items-center gap-m">
-            <label for="role_select" class="m-none p-none"><span class="bold">Override permissions for role</span></label>
+            <label for="role_select" class="m-none p-none"><span class="bold">{{ trans('entities.permissions_role_override') }}</span></label>
             <select name="role_select" id="role_select" refs="entity-permissions@role-select">
                 <option value="">{{ trans('common.select') }}</option>
                 @foreach($data->rolesNotAssigned() as $role)