From 29375ced4466960c04faa792cd7c498fe489ce07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Fri, 1 Dec 2023 16:13:52 +0100 Subject: [PATCH] SYNC 11 Settings company + name usage --- theme.config.php | 4 ---- views/auth/login.blade.php | 6 +++++- views/auth/register.blade.php | 7 ++++--- views/layouts/footer-links.blade.php | 9 +++++---- views/layouts/footer.blade.php | 8 +++++--- views/layouts/teaser/footer.blade.php | 8 +++++--- views/pages/home.blade.php | 14 ++++++++------ views/pages/teaser.blade.php | 4 ++-- views/partials/icons/facebook.blade.php | 2 +- views/partials/icons/instagram.blade.php | 2 +- 10 files changed, 36 insertions(+), 28 deletions(-) diff --git a/theme.config.php b/theme.config.php index d0be82a..4e494a5 100644 --- a/theme.config.php +++ b/theme.config.php @@ -2,10 +2,6 @@ return [ 'theme_name' => 'base', - // * Nom du site - 'site_name' => config('app.name'), - // * Nom de la marque - 'company' => config('app.name'), 'models' => [ 'products' => [ 'picture_max_width' => 550, diff --git a/views/auth/login.blade.php b/views/auth/login.blade.php index 3bb7ec2..b694992 100644 --- a/views/auth/login.blade.php +++ b/views/auth/login.blade.php @@ -28,7 +28,11 @@
{{ __('Je me connecte') }} -

{{ __('Si vous possédez déjà un compte Club Le Gaulois, vous pouvez utiliser les mêmes identifiants.') }}

+

+ {{ __('Si vous possédez déjà un compte Club :company, vous pouvez utiliser les mêmes identifiants.', [ + 'company' => $settingsGlobal->company, + ]) }} +

@csrf diff --git a/views/auth/register.blade.php b/views/auth/register.blade.php index 78ac3d4..e8b0d75 100644 --- a/views/auth/register.blade.php +++ b/views/auth/register.blade.php @@ -7,12 +7,13 @@
-

{{ __('S\'inscrire au club Le Gaulois') }}

+

+ {{ __('S\'inscrire au club :company', ['company' => $settingsGlobal->company]) }}

@csrf -
+
{{ __("Merci de renseigner les champs ci-dessous\u{00A0}:") }}
@@ -210,7 +211,7 @@
@foreach ($errors->get('opt_in') as $message) diff --git a/views/layouts/footer-links.blade.php b/views/layouts/footer-links.blade.php index 2103c6b..75e2ac7 100644 --- a/views/layouts/footer-links.blade.php +++ b/views/layouts/footer-links.blade.php @@ -3,18 +3,19 @@ {{ __('Rejoignez-nous sur') }}
{{ __('Découvrez tous nos produits sur :link', ['link' => '']) }} - Legaulois.fr + {{ Str::ucfirst(parse_url($settingsGlobal->redirect_close, \PHP_URL_HOST)) }}
diff --git a/views/layouts/footer.blade.php b/views/layouts/footer.blade.php index 11d04de..b4f93ae 100644 --- a/views/layouts/footer.blade.php +++ b/views/layouts/footer.blade.php @@ -33,9 +33,11 @@
- - Le Gaulois - www.legaulois.fr + + {{ Str::ucfirst($settingsGlobal->company) }} + {{ parse_url($settingsGlobal->redirect_close, \PHP_URL_HOST) }}
diff --git a/views/layouts/teaser/footer.blade.php b/views/layouts/teaser/footer.blade.php index 94b5886..7303b8a 100644 --- a/views/layouts/teaser/footer.blade.php +++ b/views/layouts/teaser/footer.blade.php @@ -11,9 +11,11 @@
- - Le Gaulois - www.legaulois.fr + + {{ Str::ucfirst($settingsGlobal->company) }} + {{ parse_url($settingsGlobal->redirect_close, \PHP_URL_HOST) }}
diff --git a/views/pages/home.blade.php b/views/pages/home.blade.php index f4e0b4e..8b13a6a 100644 --- a/views/pages/home.blade.php +++ b/views/pages/home.blade.php @@ -1,7 +1,7 @@ @extends('theme::layout') -@section('title', __('Jeu :site_name', ['site_name' => Config::get('theme.site_name')])) -@section('description', __('Jeu :site_name', ['site_name' => Config::get('theme.site_name')])) +@section('title', __('Jeu :site_name', ['site_name' => $settingsGlobal->name])) +@section('description', __('Jeu :site_name', ['site_name' => $settingsGlobal->name])) @section('main-class', 'home-page') @section('content') @@ -83,15 +83,16 @@ class="fs-3 fw-bold">{{ __("Rien de plus simple\u{00A0}! Suivez les 3 étapes décrites à droite et laissez-vous guider.") }}
{{ __('Plusieurs produits de la marque Le Gaulois') }} + title="{{ __('Plusieurs produits de la marque :company', ['company' => $settingsGlobal->company]) }}" + alt="{{ __('Plusieurs produits de la marque :company', ['company' => $settingsGlobal->company]) }}">
{{ __('Un panier de course') }} + title="{{ __('Achetez un produit :company porteur de l\'offre.', ['company' => Str::title($settingsGlobal->company)]) }}" + alt="{{ __('Un panier de course') }}">
- {{ __('Achetez un produit Le Gaulois porteur de l\'offre.') }} + {{ __('Achetez un produit :company porteur de l\'offre.', ['company' => Str::title($settingsGlobal->company)]) }}
config('theme.site_name')])) -@section('description', __('Le jeu :site_name vas bientôt ouvrir', ['site_name' => config('theme.site_name')])) +@section('title', __('Jeu :site_name', ['site_name' => $settingsGlobal->name])) +@section('description', __('Le jeu :site_name vas bientôt ouvrir', ['site_name' => $settingsGlobal->name])) @section('main-class', 'teaser-page') @section('content') diff --git a/views/partials/icons/facebook.blade.php b/views/partials/icons/facebook.blade.php index 632f13a..a0d2388 100644 --- a/views/partials/icons/facebook.blade.php +++ b/views/partials/icons/facebook.blade.php @@ -1,6 +1,6 @@ - {{ __('Page Facebook Le Gaulois') }} + {{ __('Page Facebook :company', ['company' => $settingsGlobal->company]) }} - {{ __('Page Instagram Le Gaulois') }} + {{ __('Page Instagram :company', ['company' => $settingsGlobal->company]) }}