French translation update

[bookstack] / app / Http / Controllers / HomeController.php

diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index d2c75f95622fee3d8278629dd75b3390268dcb38..a37371d3ab9ccab9f1af13260cab389e8ba8c808 100644 (file)
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -26,9 +26,9 @@ class HomeController extends Controller
     public function index()
     {
         $activity = Activity::latest(10);
     public function index()
     {
         $activity = Activity::latest(10);

-        $draftPages = $this->signedIn ? $this->entityRepo->getUserDraftPages(6) : [];
+        $draftPages = $this->isSignedIn() ? $this->entityRepo->getUserDraftPages(6) : [];

         $recentFactor = count($draftPages) > 0 ? 0.5 : 1;
         $recentFactor = count($draftPages) > 0 ? 0.5 : 1;

-        $recents = $this->signedIn ? Views::getUserRecentlyViewed(12*$recentFactor, 0) : $this->entityRepo->getRecentlyCreated('book', 12*$recentFactor);
+        $recents = $this->isSignedIn() ? Views::getUserRecentlyViewed(12*$recentFactor, 0) : $this->entityRepo->getRecentlyCreated('book', 12*$recentFactor);

         $recentlyUpdatedPages = $this->entityRepo->getRecentlyUpdated('page', 12);
 
         $homepageOptions = ['default', 'books', 'bookshelves', 'page'];
         $recentlyUpdatedPages = $this->entityRepo->getRecentlyUpdated('page', 12);
 
         $homepageOptions = ['default', 'books', 'bookshelves', 'page'];


@@ -47,9 +47,9 @@ class HomeController extends Controller
         // Add required list ordering & sorting for books & shelves views.
         if ($homepageOption === 'bookshelves' || $homepageOption === 'books') {
             $key = $homepageOption;
         // Add required list ordering & sorting for books & shelves views.
         if ($homepageOption === 'bookshelves' || $homepageOption === 'books') {
             $key = $homepageOption;

-            $view = setting()->getUser($this->currentUser, $key . '_view_type', config('app.views.' . $key));
-            $sort = setting()->getUser($this->currentUser, $key . '_sort', 'name');
-            $order = setting()->getUser($this->currentUser, $key . '_sort_order', 'asc');
+            $view = setting()->getForCurrentUser($key . '_view_type', config('app.views.' . $key));
+            $sort = setting()->getForCurrentUser($key . '_sort', 'name');
+            $order = setting()->getForCurrentUser($key . '_sort_order', 'asc');

 
             $sortOptions = [
                 'name' => trans('common.sort_name'),
 
             $sortOptions = [
                 'name' => trans('common.sort_name'),