Used trans_choice on profile view

Closes #417

diff --git a/resources/lang/en/entities.php b/resources/lang/en/entities.php
index ffd49f07d0b3df115be64796dd97081c143f6af8..4dc5ccc382c1a242ca4a2f13153eb8f09a0d7191 100644 (file)
--- a/resources/lang/en/entities.php
+++ b/resources/lang/en/entities.php
@@ -19,7 +19,6 @@ return [
     'meta_created_name' => 'Created :timeLength by :user',
     'meta_updated' => 'Updated :timeLength',
     'meta_updated_name' => 'Updated :timeLength by :user',
-    'x_pages' => ':count Pages',
     'entity_select' => 'Entity Select',
     'images' => 'Images',
     'my_recent_drafts' => 'My Recent Drafts',
@@ -70,6 +69,7 @@ return [
      */
     'book' => 'Book',
     'books' => 'Books',
+    'x_books' => ':count Book|:count Books',
     'books_empty' => 'No books have been created',
     'books_popular' => 'Popular Books',
     'books_recent' => 'Recent Books',
@@ -105,6 +105,7 @@ return [
      */
     'chapter' => 'Chapter',
     'chapters' => 'Chapters',
+    'x_chapters' => ':count Chapter|:count Chapters',
     'chapters_popular' => 'Popular Chapters',
     'chapters_new' => 'New Chapter',
     'chapters_create' => 'Create New Chapter',
@@ -129,6 +130,7 @@ return [
      */
     'page' => 'Page',
     'pages' => 'Pages',
+    'x_pages' => ':count Page|:count Pages',
     'pages_popular' => 'Popular Pages',
     'pages_new' => 'New Page',
     'pages_attachments' => 'Attachments',

diff --git a/resources/views/chapters/list-item.blade.php b/resources/views/chapters/list-item.blade.php
index 1572f0d9b49a1abd21153470a87d5458c7953de5..9c1e2d640a874372251b611081ebf431809949c5 100644 (file)
--- a/resources/views/chapters/list-item.blade.php
+++ b/resources/views/chapters/list-item.blade.php
@@ -21,7 +21,7 @@
 
 
     @if(!isset($hidePages) && count($chapter->pages) > 0)
-        <p chapter-toggle class="text-muted"><i class="zmdi zmdi-caret-right"></i> <i class="zmdi zmdi-file-text"></i> <span>{{ trans('entities.x_pages', ['count' => $chapter->pages->count()]) }}</span></p>
+        <p chapter-toggle class="text-muted"><i class="zmdi zmdi-caret-right"></i> <i class="zmdi zmdi-file-text"></i> <span>{{ trans_choice('entities.x_pages', $chapter->pages->count()) }}</span></p>
         <div class="inset-list">
             @foreach($chapter->pages as $page)
                 <h5 class="@if($page->draft) draft @endif"><a href="{{ $page->getUrl() }}" class="text-page @if($page->draft) draft @endif"><i class="zmdi zmdi-file-text"></i>{{$page->name}}</a></h5>

diff --git a/resources/views/partials/book-tree.blade.php b/resources/views/partials/book-tree.blade.php
index 80f7262ca353b627a4679055d6f6b796e2a0a902..867d9779cd8d5993636682dbbe0905f95baef4fb 100644 (file)
--- a/resources/views/partials/book-tree.blade.php
+++ b/resources/views/partials/book-tree.blade.php
@@ -15,7 +15,7 @@
 
                     @if($bookChild->isA('chapter') && count($bookChild->pages) > 0)
                         <p chapter-toggle class="text-muted @if($bookChild->matchesOrContains($current)) open @endif">
-                            <i class="zmdi zmdi-caret-right"></i> <i class="zmdi zmdi-file-text"></i> <span>{{ trans('entities.x_pages', ['count' => $bookChild->pages->count()]) }}</span>
+                            <i class="zmdi zmdi-caret-right"></i> <i class="zmdi zmdi-file-text"></i> <span>{{ trans_choice('entities.x_pages', $bookChild->pages->count()) }}</span>
                         </p>
                         <ul class="menu sub-menu inset-list @if($bookChild->matchesOrContains($current)) open @endif">
                             @foreach($bookChild->pages as $childPage)

diff --git a/resources/views/users/profile.blade.php b/resources/views/users/profile.blade.php
index d762f0f240009a35e2b311f01cd657ccf6c9385f..be04c97a990a4b02488eb1b9592140cf71c566cd 100644 (file)
--- a/resources/views/users/profile.blade.php
+++ b/resources/views/users/profile.blade.php
@@ -38,13 +38,13 @@
             <div class="col-md-5 text-bigger" id="content-counts">
                 <div class="text-muted">{{ trans('entities.profile_created_content') }}</div>
                 <div class="text-book">
-                    <i class="zmdi zmdi-book zmdi-hc-fw"></i> {{ $assetCounts['books'] }} {{ str_plural(trans('entities.book'), $assetCounts['books']) }}
+                    <i class="zmdi zmdi-book zmdi-hc-fw"></i> {{ trans_choice('entities.x_books', $assetCounts['books']) }}
                 </div>
                 <div class="text-chapter">
-                    <i class="zmdi zmdi-collection-bookmark zmdi-hc-fw"></i> {{ $assetCounts['chapters'] }} {{ str_plural(trans('entities.chapter'), $assetCounts['chapters']) }}
+                    <i class="zmdi zmdi-collection-bookmark zmdi-hc-fw"></i> {{ trans_choice('entities.x_chapters', $assetCounts['chapters']) }}
                 </div>
                 <div class="text-page">
-                    <i class="zmdi zmdi-file-text zmdi-hc-fw"></i> {{ $assetCounts['pages'] }} {{ str_plural(trans('entities.page'), $assetCounts['pages']) }}
+                    <i class="zmdi zmdi-file-text zmdi-hc-fw"></i> {{ trans_choice('entities.x_pages', $assetCounts['pages']) }}
                 </div>
             </div>
         </div>