From 9da3130a12301c9b2cc52a3bb6ada2d65a66c106 Mon Sep 17 00:00:00 2001 From: Dan Brown Date: Thu, 1 Sep 2022 14:55:35 +0100 Subject: [PATCH] Aligned bookshelf terminology to consistently be 'Shelf' For #3553 EN only, other languages should be handled via CrowdIn --- resources/lang/en/activities.php | 14 +++++------ resources/lang/en/entities.php | 25 +++++++++---------- resources/lang/en/errors.php | 2 +- resources/views/books/show.blade.php | 2 +- .../views/settings/roles/parts/form.blade.php | 2 +- 5 files changed, 22 insertions(+), 23 deletions(-) diff --git a/resources/lang/en/activities.php b/resources/lang/en/activities.php index edddf9aeb..f348bff1f 100644 --- 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 - '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_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', diff --git a/resources/lang/en/entities.php b/resources/lang/en/entities.php index 07d4b625d..1720801d2 100644 --- 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', - 'shelves_long' => 'Bookshelves', '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_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_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', diff --git a/resources/lang/en/errors.php b/resources/lang/en/errors.php index f023b6bdf..52f96cbe7 100644 --- a/resources/lang/en/errors.php +++ b/resources/lang/en/errors.php @@ -58,7 +58,7 @@ return [ // 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', diff --git a/resources/views/books/show.blade.php b/resources/views/books/show.blade.php index 03801f9a5..76a4a6005 100644 --- a/resources/views/books/show.blade.php +++ b/resources/views/books/show.blade.php @@ -162,7 +162,7 @@ @if(count($bookParentShelves) > 0)
-
{{ trans('entities.shelves_long') }}
+
{{ trans('entities.shelves') }}
@include('entities.list', ['entities' => $bookParentShelves, 'style' => 'compact'])
@endif diff --git a/resources/views/settings/roles/parts/form.blade.php b/resources/views/settings/roles/parts/form.blade.php index aeaa39a6d..73d6a03d0 100644 --- a/resources/views/settings/roles/parts/form.blade.php +++ b/resources/views/settings/roles/parts/form.blade.php @@ -68,7 +68,7 @@ -
{{ trans('entities.shelves_long') }}
+
{{ trans('entities.shelves') }}
{{ trans('common.toggle_all') }}