wip #3080 2

diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index cd9feafbb8ae6f91cd3ff5ad957d39c9c6f33e62..6acd4a78b48d70e46a47b919bcec68a84fbfd756 100644 (file)
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -15,6 +15,7 @@ class Kernel extends HttpKernel
      * @var array
      */
     protected $middleware = [
+        \Cubist\Backpack\app\Middleware\LocaleSelector::class,
         \App\Http\Middleware\CheckForMaintenanceMode::class,
         \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
         \App\Http\Middleware\TrimStrings::class,

diff --git a/app/Models/Product.php b/app/Models/Product.php
index c7043c156d23b72b20f239da7e4515e0d71b38e1..28a43b5b84cbd30f241d0a4d84c9473a7bd54975 100644 (file)
--- a/app/Models/Product.php
+++ b/app/Models/Product.php
@@ -476,7 +476,7 @@ class Product extends CubistMagicPageModel
                     }
                 }
                 if (isset($values['-'])) {
-                    $options['-'] = ['label' => __('Non défini'), 'value' => '-', 'nb_products' => $values['-']];
+                    $options['-'] = ['label' => 'Non défini', 'value' => '-', 'nb_products' => $values['-']];
                 }
                 $f['options'] = $options;
             } else if ($data->type == 'numeric' || $data->type == 'range' || $data->type == 'numeric_list') {

diff --git a/app/Models/Producttype.php b/app/Models/Producttype.php
index 15c3c831260628f02bf559171c6afe57a403166b..5c2516ec4be21134574ba6f2e601af072129cf38 100644 (file)
--- a/app/Models/Producttype.php
+++ b/app/Models/Producttype.php
@@ -79,7 +79,7 @@ class ProductType extends CubistMagicPageModel
             'name' => 'intro',
             'type' => 'BunchOfFields',
             'bunch' => 'App\SubForms\Intro',
-            'label' => __('Introduction'),
+            'label' => 'Introduction',
             'tab' => 'Introduction',
         ]);
 

diff --git a/app/Models/Settings.php b/app/Models/Settings.php
index 465177c843257f8c52773b346cc59073d2fb1267..ea3cf125519c9c69c5cff846c7f3ad6ab0f6326c 100644 (file)
--- a/app/Models/Settings.php
+++ b/app/Models/Settings.php
@@ -12,18 +12,18 @@ class Settings extends \Cubist\Backpack\app\Magic\Models\Settings
 
         $this->addField(['name' => 'email',
             'type' => 'Email',
-            'label' => __('E-mail'),
+            'label' => 'E-mail',
             'tab' => 'Informations de contact']);
 
         $this->addField(['name' => 'phone',
             'type' => 'Text',
-            'label' => __('Téléphone'),
+            'label' => 'Téléphone',
             'translatable' => false,
             'tab' => 'Informations de contact']);
 
         $this->addField(['name' => 'address',
             'type' => 'Textarea',
-            'label' => __('Adresse'),
+            'label' => 'Adresse',
             'translatable' => false,
             'tab' => 'Informations de contact']);
 
@@ -32,8 +32,8 @@ class Settings extends \Cubist\Backpack\app\Magic\Models\Settings
             'name' => 'social',
             'type' => 'BunchOfFields',
             'bunch' => 'App\SubForms\SocialNetworks',
-            'label' => __('Réseaux Sociaux'),
-            'tab' => __('Réseaux Sociaux'),
+            'label' => 'Réseaux Sociaux',
+            'tab' => 'Réseaux Sociaux',
         ]);
 
         //=== Forms
@@ -48,7 +48,7 @@ class Settings extends \Cubist\Backpack\app\Magic\Models\Settings
         $this->addField([
             'name' => 'footer_text',
             'type' => 'Textarea',
-            'label' => __('Texte de footer'),
+            'label' => 'Texte de footer',
             'attributes' => [
                 'rows' => 4,
             ],
@@ -58,14 +58,14 @@ class Settings extends \Cubist\Backpack\app\Magic\Models\Settings
         $this->addField([
             'name' => 'footer_heading_contact',
             'type' => 'Text',
-            'label' => __('Titre de colonne « Nous contacter »'),
+            'label' => 'Titre de colonne « Nous contacter »',
             'tab' => 'Footer',
         ]);
 
         $this->addField([
             'name' => 'footer_heading_strengths',
             'type' => 'Text',
-            'label' => __('Titre de colonne « PMI à votre service »'),
+            'label' => 'Titre de colonne « PMI à votre service »',
             'tab' => 'Footer'
         ]);
 
@@ -74,7 +74,7 @@ class Settings extends \Cubist\Backpack\app\Magic\Models\Settings
             'name' => 'strengths',
             'type' => 'BunchOfFieldsMultiple',
             'bunch' => 'App\SubForms\Strength',
-            'label' => __('Points Forts'),
+            'label' => 'Points Forts',
             'tab' => 'Footer',
         ]);
     }

diff --git a/app/SubForms/Person.php b/app/SubForms/Person.php
index 22f5ad55f579b99b1bbb8d629c43fcbd77bb5e47..e85d20e3959cbb8d06f02f5271a3dccbbbb3b91f 100644 (file)
--- a/app/SubForms/Person.php
+++ b/app/SubForms/Person.php
@@ -10,15 +10,15 @@ class Person extends SubForm
     {
         parent::init();
         $this->addField(['name' => 'name',
-            'label' => __('Nom'),
+            'label' => 'Nom',
             'type' => 'Text']);
 
         $this->addField(['name' => 'role',
-            'label' => __('Role'),
+            'label' => 'Role',
             'type' => 'Text']);
 
         $this->addField(['name' => 'photo',
-            'label' => __('Photo'),
+            'label' => 'Photo',
             'type' => 'Images',
             'maxFiles' => 1]);
     }

diff --git a/app/SubForms/SocialNetworks.php b/app/SubForms/SocialNetworks.php
index 723fc628545d8bbdcbf5abcb966c0158cd8ac683..72919e2d7ecb6a6343dac47c6e947eabb0f6dd46 100644 (file)
--- a/app/SubForms/SocialNetworks.php
+++ b/app/SubForms/SocialNetworks.php
@@ -14,12 +14,12 @@ class SocialNetworks extends SubForm
 
         $this->addField(['name' => 'twitter',
             'type' => 'Text',
-            'label' => __('Twitter'),
+            'label' => 'Twitter',
             'translatable' => false]);
 
         $this->addField(['name' => 'linkedin',
             'type' => 'Text',
-            'label' => __('LinkedIn'),
+            'label' => 'LinkedIn',
             'translatable' => false]);
     }
 }

diff --git a/app/SubForms/Strength.php b/app/SubForms/Strength.php
index 4033f9bf6ed33c90ab3f68c2cccda3d74c0baa78..59ba50e52e49288e78d35d6ab405bea5b3297497 100644 (file)
--- a/app/SubForms/Strength.php
+++ b/app/SubForms/Strength.php
@@ -12,19 +12,19 @@ class Strength extends SubForm
         parent::init();
         $this->addField([
             'name' => 'title',
-            'label' => __('Titre'),
+            'label' => 'Titre',
             'type' => 'Text',
         ]);
 
         $this->addField([
             'name' => 'description',
-            'label' => __('Description'),
+            'label' => 'Description',
             'type' => 'Text',
         ]);
 
         $this->addField([
             'name' => 'icon',
-            'label' => __('Picto'),
+            'label' => 'Picto',
             'type' => 'Images',
             'translatable' => false,
         ]);

diff --git a/app/SubForms/Value.php b/app/SubForms/Value.php
index 4508bb7bf2561b8bb6753cd382b8bfa3eecfa62c..78cdf4ee6ab1ca7a1d95521a78be4bdc00c5244d 100644 (file)
--- a/app/SubForms/Value.php
+++ b/app/SubForms/Value.php
@@ -10,15 +10,15 @@ class Value extends SubForm
     {
         parent::init();
         $this->addField(['name' => 'title',
-            'label' => __('Titre de valeur'),
+            'label' => 'Titre de valeur',
             'type' => 'Text']);
 
         $this->addField(['name' => 'text',
-            'label' => __('Texte de valeur'),
+            'label' => 'Texte de valeur',
             'type' => 'Textarea']);
 
         $this->addField(['name' => 'image',
-            'label' => __('Image de valeur'),
+            'label' => 'Image de valeur',
             'type' => 'Images',
             'maxFiles' => 1]);
     }

diff --git a/app/Templates/Base.php b/app/Templates/Base.php
index bf41d5950984f230ab62d198913dcef426f0c880..e46c63767a4e5ffa939fe67a6b701f10b49e38f7 100644 (file)
--- a/app/Templates/Base.php
+++ b/app/Templates/Base.php
@@ -14,7 +14,7 @@ class Base extends TemplatePage
             'name' => 'intro',
             'type' => 'BunchOfFields',
             'bunch' => 'App\SubForms\Intro',
-            'label' => __('Introduction'),
+            'label' => 'Introduction',
             'tab' => 'Intro',
         ]);
     }

diff --git a/app/Templates/Catalog.php b/app/Templates/Catalog.php
index 044e237f52ce334c48730c2a9b09a86140acaace..5fab9fc3c1778408de6a5398bdc30995875a5659 100644 (file)
--- a/app/Templates/Catalog.php
+++ b/app/Templates/Catalog.php
@@ -24,7 +24,7 @@ class Catalog extends TemplateAbstract
         Debugbar::startMeasure('nav_catalog', 'Make Products sub navigation');
         parent::setMenuChildren($menu);
 
-        $families = ['captor' => __('Capteurs'), 'system' => __('Systèmes de mesure')];
+        $families = ['captor' =>'Capteurs', 'system' => 'Systèmes de mesure'];
 
         Debugbar::startMeasure('nav_catalog_models', 'Request catalog models');
         Debugbar::startMeasure('nav_catalog_models_types', 'Request catalog models (types)');

diff --git a/app/Templates/Home.php b/app/Templates/Home.php
index 2cf45a8eb959c0b28cbb78982003eda594e6f12d..31390b03c2d708f2e429b94cbbb867c2efef55a5 100644 (file)
--- a/app/Templates/Home.php
+++ b/app/Templates/Home.php
@@ -25,7 +25,7 @@ class Home extends Base
             'name' => 'slideshow',
             'type' => 'BunchOfFieldsMultiple',
             'bunch' => 'App\SubForms\Slide',
-            'label' => __('Slideshow'),
+            'label' => 'Slideshow',
             'tab' => 'Slideshow',
         ]);
 
@@ -33,7 +33,7 @@ class Home extends Base
             'name' => 'services_support',
             'type' => 'BunchOfFields',
             'bunch' => 'App\SubForms\Intro',
-            'label' => __('Bloc « Services & Support »'),
+            'label' => 'Bloc « Services & Support »',
             'tab' => 'Services & Support',
         ]);
 

diff --git a/config/cubist.php b/config/cubist.php
index 89c9dd972abf47dc150c60d444d74708f39946e6..30b613b9613a38db34b6263e35f6b24c57706e92 100644 (file)
--- a/config/cubist.php
+++ b/config/cubist.php
@@ -4,6 +4,7 @@ return [
     'internal_search_index' => env('CUBIST_INTERNAL_SEARCH_INDEX', strtolower(env('APP_NAME', 'App_name') . '_' . env('APP_ENV', 'dev'))),
     'page_model' => '\App\Models\Page',
     'settings_model' => '\App\Models\Settings',
+    'locale_model' => '\App\Models\Locale',
     'seo_robots' => env('SEO_ROBOTS', true),
 ];
 

diff --git a/resources/views/partials/contact-shortcut.blade.php b/resources/views/partials/contact-shortcut.blade.php
index 38550b75083786805bc9496d7f9e5e47eaea12c6..ee74803cb79a02a68c76e4f8cf40b4be29146da0 100644 (file)
--- a/resources/views/partials/contact-shortcut.blade.php
+++ b/resources/views/partials/contact-shortcut.blade.php
@@ -9,7 +9,7 @@
     <div class="contact-shortcut-tab">
         <a href="/contact" class="bg-blue p-3 bg-blue flex items-center pr-10">
             <img class="contact-shortcut-icon" src="{{ asset('images/icon-email.svg') }}" alt="{{ __('Contact') }}">
-            {!! __('Formulaire de contact</a>') !!}
+            {!! __('Formulaire de contact') !!}
         </a>
         {{--
         <div class="contact-shortcut-detail bg-blue">