Merge branch 'development' into release

Author: ssddanbrown

.github/translators.txt

@@ -324,7 +324,7 @@ Robin Flikkema (RobinFlikkema) :: Dutch
 Michal Gurcik (mgurcik) :: Slovak
 Pooyan Arab (pooyanarab) :: Persian
 Ochi Darma Putra (troke12) :: Indonesian
-H.-H. Peng (Hsins) :: Chinese Traditional
+Hsin-Hsiang Peng (Hsins) :: Chinese Traditional
 Mosi  Wang (mosiwang) :: Chinese Traditional
 骆言 (LawssssCat) :: Chinese Simplified
 Stickers Gaming Shøw (StickerSGSHOW) :: French
@@ -386,3 +386,5 @@ Y (cnsr) :: Ukrainian
 ZY ZV (vy0b0x) :: Chinese Simplified
 diegobenitez :: Spanish
 Marc Hagen (MarcHagen) :: Dutch
+Kasper Alsøe (zeonos) :: Danish
+sultani :: Persian

app/Entities/Controllers/ChapterApiController.php

@@ -134,8 +134,9 @@ protected function forJsonDisplay(Chapter $chapter): Chapter
         $chapter->unsetRelations()->refresh();
 
         $chapter->load(['tags']);
-        $chapter->makeVisible('description_html')
-            ->setAttribute('description_html', $chapter->descriptionHtml());
+        $chapter->makeVisible('description_html');
+        $chapter->setAttribute('description_html', $chapter->descriptionHtml());
+        $chapter->setAttribute('book_slug', $chapter->book()->first()->slug);
 
         return $chapter;
     }

dev/api/responses/chapters-create.json

@@ -11,6 +11,7 @@
   "updated_by": 1,
   "owned_by": 1,
   "description_html": "<p>This is a <strong>great new chapter<\/strong> that I've created via the API<\/p>",
+  "book_slug": "example-book",
   "tags": [
     {
       "name": "Category",

dev/api/responses/chapters-update.json

@@ -11,6 +11,7 @@
   "updated_by": 1,
   "owned_by": 1,
   "description_html": "<p>This is an <strong>updated chapter<\/strong> that I've altered via the API<\/p>",
+  "book_slug": "example-book",
   "tags": [
     {
       "name": "Category",

lang/ca/entities.php

@@ -23,7 +23,7 @@
     'meta_updated' => 'Actualitzat :timeLength',
     'meta_updated_name' => 'Actualitzat :timeLength per :user',
     'meta_owned_name' => 'Propietat de :user',
-    'meta_reference_count' => 'Referenced by :count item|Referenced by :count items',
+    'meta_reference_count' => 'Hi fa referència :count element|Hi fan referència :count elements',
     'entity_select' => 'Selecciona una entitat',
     'entity_select_lack_permission' => 'No teniu els permisos necessaris per a seleccionar aquest element',
     'images' => 'Imatges',
@@ -409,7 +409,7 @@
     // References
     'references' => 'Referències',
     'references_none' => 'Ni hi ha cap referència detectada a aquest element.',
-    'references_to_desc' => 'Listed below is all the known content in the system that links to this item.',
+    'references_to_desc' => 'A continuació es llisten tots els continguts coneguts del sistema que enllacen a aquest element.',
 
     // Watch Options
     'watch' => 'Segueix',

lang/cs/entities.php

@@ -23,7 +23,7 @@
     'meta_updated' => 'Aktualizováno :timeLength',
     'meta_updated_name' => 'Aktualizováno :timeLength uživatelem :user',
     'meta_owned_name' => 'Vlastník :user',
-    'meta_reference_count' => 'Referenced by :count item|Referenced by :count items',
+    'meta_reference_count' => 'Odkazováno :count položkou|Odkazováno :count položkami',
     'entity_select' => 'Výběr entity',
     'entity_select_lack_permission' => 'Nemáte dostatečná oprávnění k výběru této položky',
     'images' => 'Obrázky',
@@ -409,7 +409,7 @@
     // References
     'references' => 'Odkazy',
     'references_none' => 'Nebyly nalezeny žádné odkazy na tuto položku.',
-    'references_to_desc' => 'Listed below is all the known content in the system that links to this item.',
+    'references_to_desc' => 'Níže je uveden veškerý obsah o kterém systém ví, že odkazuje na tuto položku.',
 
     // Watch Options
     'watch' => 'Sledovat',

lang/da/notifications.php

@@ -4,13 +4,13 @@
  */
 return [
 
-    'new_comment_subject' => 'New comment on page: :pageName',
-    'new_comment_intro' => 'A user has commented on a page in :appName:',
-    'new_page_subject' => 'New page: :pageName',
-    'new_page_intro' => 'A new page has been created in :appName:',
-    'updated_page_subject' => 'Updated page: :pageName',
-    'updated_page_intro' => 'A page has been updated in :appName:',
-    'updated_page_debounce' => 'To prevent a mass of notifications, for a while you won\'t be sent notifications for further edits to this page by the same editor.',
+    'new_comment_subject' => 'Ny kommentar på siden: :pageName',
+    'new_comment_intro' => 'En bruger har kommenteret på en side i :appName:',
+    'new_page_subject' => 'Ny side: :pageName',
+    'new_page_intro' => 'En ny side er blevet oprettet i :appName:',
+    'updated_page_subject' => 'Opdateret side: :pageName',
+    'updated_page_intro' => 'En side er blevet opdateret i :appName:',
+    'updated_page_debounce' => 'For at forhindre en masse af notifikationer, i et stykke tid vil du ikke blive sendt notifikationer for yderligere redigeringer til denne side af den samme editor.',
 
     'detail_page_name' => 'Page Name:',
     'detail_page_path' => 'Page Path:',

lang/de/entities.php

@@ -23,7 +23,7 @@
     'meta_updated' => 'Zuletzt aktualisiert: :timeLength',
     'meta_updated_name' => 'Zuletzt aktualisiert: :timeLength von :user',
     'meta_owned_name' => 'Im Besitz von :user',
-    'meta_reference_count' => 'Referenced by :count item|Referenced by :count items',
+    'meta_reference_count' => 'Referenziert von :count Element|Referenziert von :count Elementen',
     'entity_select' => 'Eintrag auswählen',
     'entity_select_lack_permission' => 'Sie haben nicht die benötigte Berechtigung, um dieses Element auszuwählen',
     'images' => 'Bilder',
@@ -409,7 +409,7 @@
     // References
     'references' => 'Verweise',
     'references_none' => 'Es gibt keine nachverfolgten Referenzen zu diesem Element.',
-    'references_to_desc' => 'Listed below is all the known content in the system that links to this item.',
+    'references_to_desc' => 'Unten sind alle bekannten Inhalte im System aufgelistet, die auf diesen Eintrag verweisen.',
 
     // Watch Options
     'watch' => 'Beobachten',

lang/de_informal/entities.php

@@ -23,7 +23,7 @@
     'meta_updated' => 'Zuletzt aktualisiert: :timeLength',
     'meta_updated_name' => 'Zuletzt aktualisiert: :timeLength von :user',
     'meta_owned_name' => 'Im Besitz von :user',
-    'meta_reference_count' => 'Referenced by :count item|Referenced by :count items',
+    'meta_reference_count' => 'Referenziert von :count Element|Referenziert von :count Elementen',
     'entity_select' => 'Eintrag auswählen',
     'entity_select_lack_permission' => 'Du hast nicht die benötigte Berechtigung, um dieses Element auszuwählen',
     'images' => 'Bilder',
@@ -409,7 +409,7 @@
     // References
     'references' => 'Verweise',
     'references_none' => 'Es gibt keine nachverfolgten Referenzen zu diesem Element.',
-    'references_to_desc' => 'Listed below is all the known content in the system that links to this item.',
+    'references_to_desc' => 'Unten sind alle bekannten Inhalte im System aufgelistet, die auf diesen Eintrag verweisen.',
 
     // Watch Options
     'watch' => 'Beobachten',

lang/fa/notifications.php

@@ -5,22 +5,22 @@
 return [
 
     'new_comment_subject' => 'نظر جدید در صفحه: :pageName',
-    'new_comment_intro' => 'یک کاربر در بر روی صفحه‌ای نظر ثبت کرده است :appName:',
+    'new_comment_intro' => 'یک کاربر در صفحه نظر ارایه کرده است :appName:',
     'new_page_subject' => 'صفحه جدید: :pageName',
     'new_page_intro' => 'یک صفحه جدید ایجاد شده است در :appName:',
     'updated_page_subject' => 'صفحه جدید: :pageName',
     'updated_page_intro' => 'یک صفحه جدید ایجاد شده است در :appName:',
     'updated_page_debounce' => 'برای جلوگیری از انبوه اعلان‌ها، برای مدتی اعلان‌ ویرایش‌هایی که توسط همان ویرایشگر در این صفحه انجام می‌شود، ارسال نخواهد شد.',
 
     'detail_page_name' => 'نام صفحه:',
-    'detail_page_path' => 'Page Path:',
+    'detail_page_path' => 'نام میسر صفحه:',
     'detail_commenter' => 'نظر دهنده:',
     'detail_comment' => 'نظر:',
     'detail_created_by' => 'ایجاد شده توسط:',
     'detail_updated_by' => 'به روزرسانی شده توسط:',
 
     'action_view_comment' => 'مشاهده نظر',
-    'action_view_page' => 'View Page',
+    'action_view_page' => 'مشاهده صفحه',
 
     'footer_reason' => 'This notification was sent to you because :link cover this type of activity for this item.',
     'footer_reason_link' => 'تنظیمات اطلاع‌رسانی شما',