wip #3753 @0.5

diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index f618823ce344cdb10ffecca58078443fb53ca4a3..9664a55b1c6a800f42175fbe67d51606418627b3 100644 (file)
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -34,8 +34,7 @@ class Kernel extends HttpKernel
             \Illuminate\Session\Middleware\StartSession::class,
             \Backpack\CRUD\app\Http\Middleware\UseBackpackAuthGuardInsteadOfDefaultAuthGuard::class,
             \Illuminate\Session\Middleware\AuthenticateSession::class,
-            \Cubist\Backpack\Middleware\VariantSelector::class,
-            \Cubist\Backpack\Middleware\LocaleSelector::class,
+            \Cubist\Backpack\Middleware\BackLocaleSelector::class,
             \Illuminate\View\Middleware\ShareErrorsFromSession::class,
             \App\Http\Middleware\VerifyCsrfToken::class,
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
@@ -81,7 +80,6 @@ class Kernel extends HttpKernel
         \Illuminate\Routing\Middleware\ThrottleRequests::class,
         \Illuminate\Session\Middleware\AuthenticateSession::class,
         \Cubist\Backpack\Middleware\VariantSelector::class,
-        \Cubist\Backpack\Middleware\LocaleSelector::class,
         \Illuminate\Routing\Middleware\SubstituteBindings::class,
         \Illuminate\Auth\Middleware\Authorize::class,
     ];

diff --git a/composer.lock b/composer.lock
index dd7ef0c7176d72efacc47226f9200c089c50a285..63f180bca4113da8bd6741a55cd47a07677ef2ae 100644 (file)
--- a/composer.lock
+++ b/composer.lock
@@ -1118,13 +1118,13 @@
             "source": {
                 "type": "git",
                 "url": "git://git.cubedesigners.com/cubist_cms-back.git",
-                "reference": "7ece9891d817dfa66a4f15527886431b9125d04f"
+                "reference": "cff7f61007f7062fd148fe4293c6fd73a15bdf75"
             },
             "dist": {
                 "type": "tar",
-                "url": "https://composer.cubedesigners.com/dist/cubist/cms-back/cubist-cms-back-dev-master-f76c9b.tar",
-                "reference": "7ece9891d817dfa66a4f15527886431b9125d04f",
-                "shasum": "a456b685932d00b29f2236265c2ef6211ef1cfca"
+                "url": "https://composer.cubedesigners.com/dist/cubist/cms-back/cubist-cms-back-dev-master-0c31da.tar",
+                "reference": "cff7f61007f7062fd148fe4293c6fd73a15bdf75",
+                "shasum": "3b9d442ddc57f2ed4169179661da4454d658f9c1"
             },
             "require": {
                 "backpack/backupmanager": "^2.0",
@@ -1199,7 +1199,7 @@
                 }
             ],
             "description": "Cubist Backpack extension",
-            "time": "2020-12-08T19:43:50+00:00"
+            "time": "2020-12-08T20:28:43+00:00"
         },
         {
             "name": "cubist/cms-front",

diff --git a/config/backpack/base.php b/config/backpack/base.php
index 4774d954023b980cf306e2c4ee0225eccd4f7977..45d847deda54914468d2e28ab67ef2e176285b94 100644 (file)
--- a/config/backpack/base.php
+++ b/config/backpack/base.php
@@ -280,4 +280,5 @@ return [
     */
 
     'license_code' => env('BACKPACK_LICENSE', false),
+    'locales' => explode(',', env('BACKPACK_LOCALES', 'en')),
 ];

diff --git a/resources/views/vendor/backpack/base/inc/sidebar_content.blade.php b/resources/views/vendor/backpack/base/inc/sidebar_content.blade.php
index dfbf3847fe72e1eeab013e103e3171d1749f5015..4dfd6fa54fd9d4c465599f85c319006665dfafdc 100644 (file)
--- a/resources/views/vendor/backpack/base/inc/sidebar_content.blade.php
+++ b/resources/views/vendor/backpack/base/inc/sidebar_content.blade.php
@@ -4,15 +4,15 @@
 
 @canany(['quiz:read','quiztranslation:read'])
     <li class='nav-item nav-dropdown open'><a class='nav-link nav-dropdown-toggle' href='#'><i
-                class='nav-icon la la-question'></i>Quiz</a>
+                class='nav-icon la la-question'></i>{{__('Quiz')}}</a>
         <ul class='nav-dropdown-items'>
             @can('quiz:read')
                 <li class="nav-item"><a class="nav-link" href="{{ backpack_url('quiz') }}"><i
-                            class="la la-table nav-icon"></i> Quizzes</a></li>
+                            class="la la-table nav-icon"></i> {{__('Quiz')}}</a></li>
             @endcan
             @can('quiztranslation:read')
                 <li class="nav-item"><a class="nav-link" href="{{ backpack_url('quiztranslation') }}"><i
-                            class="la la-language nav-icon"></i> Translations</a></li>
+                            class="la la-language nav-icon"></i> {{__('Traductions')}}</a></li>
             @endcan
         </ul>
     </li>
@@ -20,15 +20,15 @@
 
 @canany(['fluidbook-quote:read','signature:read'])
     <li class='nav-item nav-dropdown open'><a class='nav-link nav-dropdown-toggle' href='#'><i
-                class="nav-icon la"><img src="/images/icons/icon-fluidbook.svg"/></i>Fluidbook</a>
+                class="nav-icon la"><img src="/images/icons/icon-fluidbook.svg"/></i>{{__('Fluidbook')}}</a>
         <ul class='nav-dropdown-items'>
             @can('signature:read')
                 <li class="nav-item"><a class="nav-link" href="{{ backpack_url('signature') }}"><i
-                            class="la la-signature nav-icon"></i> Signatures</a></li>
+                            class="la la-signature nav-icon"></i> {{__('Signatures')}}</a></li>
             @endcan
             @can('fluidbook-quote:read')
                 <li class="nav-item"><a class="nav-link" href="{{ backpack_url('fluidbook-quote') }}"><i
-                            class="la la-wpforms nav-icon"></i> Demandes de devis</a></li>
+                            class="la la-wpforms nav-icon"></i> {{__('Demandes de devis')}}</a></li>
             @endcan
         </ul>
     </li>
@@ -40,34 +40,35 @@
         <ul class='nav-dropdown-items'>
             @can('users:read')
                 <li class='nav-item'><a class='nav-link' href='{{ backpack_url('users') }}'><i
-                            class='nav-icon la la-user'></i><span>Users</span></a></li>
+                            class='nav-icon la la-user'></i><span>{{__('Utilisateurs')}}</span></a></li>
             @endcan
             @can('company:read')
                 <li class='nav-item'><a class='nav-link' href='{{ backpack_url('company') }}'><i
                             class='nav-icon la la-building'></i>
-                        <span>Companies</span></a></li>
+                        <span>{{__('Entreprises')}}</span></a></li>
             @endcan
             @can('managerolesandpersmissions')
                 <li class='nav-item'><a class='nav-link' href='{{ backpack_url('role') }}'><i
                             class='nav-icon la la-group'></i>
-                        <span>Roles</span></a></li>
+                        <span>{{__('Roles')}}</span></a></li>
                 <li class='nav-item'><a class='nav-link' href='{{ backpack_url('permission') }}'><i
-                            class='nav-icon la la-key'></i><span>Permissions</span></a></li>
+                            class='nav-icon la la-key'></i><span>{{__('Permissions')}}</span></a></li>
             @endcan
         </ul>
     </li>
 @endcan
 
-@can('maintenance')
+@can('maintenance','toolbox:translate')
     <li class='nav-item nav-dropdown'><a class='nav-link nav-dropdown-toggle' href='#'><i
-                class='nav-icon la la-cogs'></i>Maintenance</a>
+                class='nav-icon la la-cogs'></i>{{__('Administration')}}</a>
         <ul class='nav-dropdown-items'>
             <li class="nav-item"><a class="nav-link" href='{{ backpack_url('backup') }}'><i class='la la-hdd-o'></i>
-                    <span>Backups</span></a>
+                    <span>{{__('Sauvegardes')}}</span></a>
             </li>
             <li class="nav-item"><a class="nav-link" href='{{ backpack_url('log') }}'><i class='la la-terminal'></i>
-                    <span>Logs</span></a>
+                    <span>{{__('Journaux d\'erreurs')}}</span></a>
             </li>
         </ul>
     </li>
 @endcan
+