Aligned bookshelf terminology to consistently be 'Shelf'

For #3553
EN only, other languages should be handled via CrowdIn

diff --git a/resources/lang/en/activities.php b/resources/lang/en/activities.php
index edddf9aebcc6a4cf9c3e70f6b6ea4ebf98d646af..f348bff1f5254ef697d5ebe2dd25d585405c1a1f 100644 (file)
--- a/resources/lang/en/activities.php
+++ b/resources/lang/en/activities.php
@@ -38,14 +38,14 @@ return [
     'book_sort_notification'      => 'Book successfully re-sorted',
 
     // Bookshelves
     'book_sort_notification'      => 'Book successfully re-sorted',
 
     // Bookshelves

-    'bookshelf_create'            => 'created bookshelf',
-    'bookshelf_create_notification'    => 'Bookshelf successfully created',
-    'bookshelf_create_from_book'    => 'converted book to bookshelf',
+    'bookshelf_create'            => 'created shelf',
+    'bookshelf_create_notification'    => 'Shelf successfully created',
+    'bookshelf_create_from_book'    => 'converted book to shelf',

     'bookshelf_create_from_book_notification'    => 'Book successfully converted to a shelf',
     'bookshelf_create_from_book_notification'    => 'Book successfully converted to a shelf',

-    'bookshelf_update'                 => 'updated bookshelf',
-    'bookshelf_update_notification'    => 'Bookshelf successfully updated',
-    'bookshelf_delete'                 => 'deleted bookshelf',
-    'bookshelf_delete_notification'    => 'Bookshelf successfully deleted',
+    'bookshelf_update'                 => 'updated shelf',
+    'bookshelf_update_notification'    => 'Shelf successfully updated',
+    'bookshelf_delete'                 => 'deleted shelf',
+    'bookshelf_delete_notification'    => 'Shelf successfully deleted',

 
     // Favourites
     'favourite_add_notification' => '":name" has been added to your favourites',
 
     // Favourites
     'favourite_add_notification' => '":name" has been added to your favourites',

diff --git a/resources/lang/en/entities.php b/resources/lang/en/entities.php
index 07d4b625d8d7f0f1d66795bb63f790eb4eb35fb6..1720801d2757440eb7a428d836bd7e453ae9323b 100644 (file)
--- a/resources/lang/en/entities.php
+++ b/resources/lang/en/entities.php
@@ -78,7 +78,6 @@ return [
     'shelf' => 'Shelf',
     'shelves' => 'Shelves',
     'x_shelves' => ':count Shelf|:count Shelves',
     'shelf' => 'Shelf',
     'shelves' => 'Shelves',
     'x_shelves' => ':count Shelf|:count Shelves',

-    'shelves_long' => 'Bookshelves',

     'shelves_empty' => 'No shelves have been created',
     'shelves_create' => 'Create New Shelf',
     'shelves_popular' => 'Popular Shelves',
     'shelves_empty' => 'No shelves have been created',
     'shelves_create' => 'Create New Shelf',
     'shelves_popular' => 'Popular Shelves',


@@ -92,20 +91,20 @@ return [
     'shelves_drag_books' => 'Drag books below to add them to this shelf',
     'shelves_empty_contents' => 'This shelf has no books assigned to it',
     'shelves_edit_and_assign' => 'Edit shelf to assign books',
     'shelves_drag_books' => 'Drag books below to add them to this shelf',
     'shelves_empty_contents' => 'This shelf has no books assigned to it',
     'shelves_edit_and_assign' => 'Edit shelf to assign books',

-    'shelves_edit_named' => 'Edit Bookshelf :name',
-    'shelves_edit' => 'Edit Bookshelf',
-    'shelves_delete' => 'Delete Bookshelf',
-    'shelves_delete_named' => 'Delete Bookshelf :name',
-    'shelves_delete_explain' => "This will delete the bookshelf with the name ':name'. Contained books will not be deleted.",
-    'shelves_delete_confirmation' => 'Are you sure you want to delete this bookshelf?',
-    'shelves_permissions' => 'Bookshelf Permissions',
-    'shelves_permissions_updated' => 'Bookshelf Permissions Updated',
-    'shelves_permissions_active' => 'Bookshelf Permissions Active',
-    'shelves_permissions_cascade_warning' => 'Permissions on bookshelves do not automatically cascade to contained books. This is because a book can exist on multiple shelves. Permissions can however be copied down to child books using the option found below.',
+    'shelves_edit_named' => 'Edit Shelf :name',
+    'shelves_edit' => 'Edit Shelf',
+    'shelves_delete' => 'Delete Shelf',
+    'shelves_delete_named' => 'Delete Shelf :name',
+    'shelves_delete_explain' => "This will delete the shelf with the name ':name'. Contained books will not be deleted.",
+    'shelves_delete_confirmation' => 'Are you sure you want to delete this shelf?',
+    'shelves_permissions' => 'Shelf Permissions',
+    'shelves_permissions_updated' => 'Shelf Permissions Updated',
+    'shelves_permissions_active' => 'Shelf Permissions Active',
+    'shelves_permissions_cascade_warning' => 'Permissions on shelves do not automatically cascade to contained books. This is because a book can exist on multiple shelves. Permissions can however be copied down to child books using the option found below.',

     'shelves_copy_permissions_to_books' => 'Copy Permissions to Books',
     'shelves_copy_permissions' => 'Copy Permissions',
     'shelves_copy_permissions_to_books' => 'Copy Permissions to Books',
     'shelves_copy_permissions' => 'Copy Permissions',

-    'shelves_copy_permissions_explain' => 'This will apply the current permission settings of this bookshelf to all books contained within. Before activating, ensure any changes to the permissions of this bookshelf have been saved.',
-    'shelves_copy_permission_success' => 'Bookshelf permissions copied to :count books',
+    'shelves_copy_permissions_explain' => 'This will apply the current permission settings of this shelf to all books contained within. Before activating, ensure any changes to the permissions of this shelf have been saved.',
+    'shelves_copy_permission_success' => 'Shelf permissions copied to :count books',

 
     // Books
     'book' => 'Book',
 
     // Books
     'book' => 'Book',

diff --git a/resources/lang/en/errors.php b/resources/lang/en/errors.php
index f023b6bdf67871ce3830d39ed540a7232510973a..52f96cbe741852c60b45ec62cd9da6726e7f1bf4 100644 (file)
--- a/resources/lang/en/errors.php
+++ b/resources/lang/en/errors.php
@@ -58,7 +58,7 @@ return [
 
     // Entities
     'entity_not_found' => 'Entity not found',
 
     // Entities
     'entity_not_found' => 'Entity not found',

-    'bookshelf_not_found' => 'Bookshelf not found',
+    'bookshelf_not_found' => 'Shelf not found',

     'book_not_found' => 'Book not found',
     'page_not_found' => 'Page not found',
     'chapter_not_found' => 'Chapter not found',
     'book_not_found' => 'Book not found',
     'page_not_found' => 'Page not found',
     'chapter_not_found' => 'Chapter not found',

diff --git a/resources/views/books/show.blade.php b/resources/views/books/show.blade.php
index 03801f9a5f827ea9d6ac36a8c4a8312414d01048..76a4a600523355580017126cd6a982ac649a50be 100644 (file)
--- a/resources/views/books/show.blade.php
+++ b/resources/views/books/show.blade.php
@@ -162,7 +162,7 @@
 
     @if(count($bookParentShelves) > 0)
         <div class="actions mb-xl">
 
     @if(count($bookParentShelves) > 0)
         <div class="actions mb-xl">

-            <h5>{{ trans('entities.shelves_long') }}</h5>
+            <h5>{{ trans('entities.shelves') }}</h5>

             @include('entities.list', ['entities' => $bookParentShelves, 'style' => 'compact'])
         </div>
     @endif
             @include('entities.list', ['entities' => $bookParentShelves, 'style' => 'compact'])
         </div>
     @endif

diff --git a/resources/views/settings/roles/parts/form.blade.php b/resources/views/settings/roles/parts/form.blade.php
index aeaa39a6da7b5ea8cdfa574cd3e1899d98e823a8..73d6a03d09b60d1036d93f63b4343b8bee255846 100644 (file)
--- a/resources/views/settings/roles/parts/form.blade.php
+++ b/resources/views/settings/roles/parts/form.blade.php
@@ -68,7 +68,7 @@
             </tr>
             <tr>
                 <td>
             </tr>
             <tr>
                 <td>

-                    <div>{{ trans('entities.shelves_long') }}</div>
+                    <div>{{ trans('entities.shelves') }}</div>

                     <a href="#" permissions-table-toggle-all-in-row class="text-small text-primary">{{ trans('common.toggle_all') }}</a>
                 </td>
                 <td>
                     <a href="#" permissions-table-toggle-all-in-row class="text-small text-primary">{{ trans('common.toggle_all') }}</a>
                 </td>
                 <td>