forge-joniko/ldc-wenn-dann-mit-respekt
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into trunk

Browse source
This commit is contained in:
Vincent BRIDIER 2024-06-10 15:01:06 +02:00
commit 6dd90e283d
No known key found for this signature in database
GPG key ID: 8571BFA20420D512
8 changed files with 18 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/Http/Requests/Fo/ContactRequest.php
View file

@ -18,18 +18,6 @@ class ContactRequest extends FormRequest
return true;
}
/**
* Prepare the data for validation.
*
* @return void
*/
public function prepareForValidation(): void
{
$this->merge([
'terms' => $this->terms ? true : false
]);
}
/**
* Get the validation rules that apply to the request.
*
@ -42,7 +30,6 @@ class ContactRequest extends FormRequest
'last_name' => 'required|min:1',
'email' => 'required|email:rfc,spoof,dns,strict',
'message' => 'required|string|min:10',
'terms' => 'accepted',
// phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundInExtendedClassBeforeLastUsed
'g-recaptcha-response' => function (string $attribute, mixed $value, \Closure $fail) {
try {

4
resources/lang/de.json
View file

@ -275,5 +275,7 @@
"up to date on the latest news around nature & respect.": "die aktuellsten Neuigkeiten und Entwicklungen rund um Nature & Respect.",
"You must accept reCaptcha cookies to use the forms.": "Um die Formulare nutzen zu können, müssen Sie reCaptcha-Cookies akzeptieren.",
"Accept this cookie to use the forms": "Akzeptieren Sie dieses Cookie, um die Formulare zu verwenden",
"Authorize": "Autorisieren"
"Authorize": "Autorisieren",
"Privacy Policy": "Datenschutzrichtlinie",
"You must accept cookies :type to view the videos.": "Um die Videos ansehen zu können, müssen Sie :type-Cookies akzeptieren."
}

1
resources/sass/fo/partials/_cn-inline-buttons.scss
View file

@ -68,6 +68,7 @@ $xmobile: 320px;
border-width: 0.1rem;
border-radius: 1rem;
// * Prevent weird theme override
color: #fff !important;
font-size: 0.9rem !important;
@include min-width($mobile) {

2
resources/views/fo/pages/concepts/bloc.blade.php
View file

@ -43,7 +43,7 @@
@include('fo.partials.inline-cookie', [
'cookie_name' => $player,
'class' => ['d-flex-column'],
'text_line_1' => __('Vous devez accepter les cookies :type pour visionner les videos.', [
'text_line_1' => __('You must accept cookies :type to view the videos.', [
'type' => $player,
]),
])

22
resources/views/fo/pages/contact.blade.php
View file

@ -77,23 +77,13 @@
</div>
<div class="mb-6 sm:col-span-3">
<div class="check-standard text-sm mt-2 mr-6">
<label for="terms" class="cursor-pointer text-weiss">
<input type="checkbox" id="terms" name="terms" class="hidden">
<span class="">
{!! __('The information collected from this form is processed by the Data Controller to follow up on your contact request. To know about your rights, you can consult :start the Privacy Policy :end' ,[
'start' => '<a href="' . route('privacy') . '" class="hover:underline">',
'end' => '</a>'
]) !!} *
</span>
</label>
</div>
<span class="">
{!! __('The information collected from this form is processed by the Data Controller to follow up on your contact request. To know about your rights, you can consult :start the Privacy Policy :end' ,[
'start' => '<a href="' . route('privacy') . '" class="hover:underline">',
'end' => '</a>'
]) !!}
</span>
</div>
@if ($errors->has('terms'))
<div class="mb-6">
<span class="text-red-600">{{ $errors->first('terms') }}</span>
</div>
@endif
<div class="mb-6 sm:col-span-3">
<p>*{{ __('Required fields') }}</p>

2
resources/views/fo/partials/model-video.blade.php
View file

@ -21,7 +21,7 @@
@include('front.partials.inline-cookie', [
'cookie_name' => $type,
'class' => ['d-flex-column'],
'text_line_1' => __('Vous devez accepter les cookies :type pour visionner les videos.', [
'text_line_1' => __('You must accept cookies :type to view the videos.', [
'type' => $type,
]),
])

2
resources/views/fo/vendor/cookie-notice/templates/standard.blade.php vendored
View file

@ -20,7 +20,7 @@
<span>{!! nl2br(e($strings->banner_title)) !!}</span>
</div>
<div class="cn-banner-para-p">
<p>{!! clean($strings->banner_text) !!}</p>
<p>{!! $strings->banner_text !!}</p>
</div>
</div>
</div>

6
resources/views/fo/vendor/ldcweb-cookies.blade.php vendored
View file

@ -24,7 +24,11 @@ $strings = (object)[
'button_allow_all_title' => __('cookie-notice.button_allow_all_title'),
'button_validate_and_close' => Str::upper(__('cookie-notice.button_validate_and_close')),
'banner_title' => __('cookie-notice.banner_title', ['site_name' => $site_name]),
'banner_text' => __('cookie-notice.banner_text'),
'banner_text' => sprintf(
"%s<br><br>%s",
__('cookie-notice.banner_text'),
"<a class='underline' href='" . route('privacy') . "'>" . __('Privacy Policy') . "</a>"
),
'panel_title' => __('cookie-notice.panel_title'),
'panel_content' => __('cookie-notice.panel_content'),
'panel_subtitle' => __('cookie-notice.panel_subtitle'),