From 7d6f908dee09fa4da656ee4b51cc5d080233995b Mon Sep 17 00:00:00 2001
From: Aria <aria@suma-ev.de>
Date: Mon, 3 Jul 2017 10:46:03 +0200
Subject: [PATCH] =?UTF-8?q?unn=C3=B6tigen=20parameter=20entfernt,=20an=20d?=
=?UTF-8?q?ie=20nt,=20an=20Laravel=20Localization=20angepasst?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
resources/lang/de/metaGer.php | 1 +
resources/lang/en/metaGer.php | 3 ++-
resources/views/kontakt/kontakt.blade.php | 2 +-
resources/views/layouts/resultPage.blade.php | 4 +++-
routes/web.php | 5 ++---
5 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/resources/lang/de/metaGer.php b/resources/lang/de/metaGer.php
index a59c6c2eb..e5e33246b 100644
--- a/resources/lang/de/metaGer.php
+++ b/resources/lang/de/metaGer.php
@@ -18,4 +18,5 @@ return [
'sitesearch.failed' => 'Sie wollten eine Sitesearch auf :site durchführen. Leider unterstützen die eingestellten Suchmaschinen diese nicht. Sie können <a href=":searchLink">hier</a> die Sitesearch im Web-Fokus durchführen. Es werden ihnen Ergebnisse ohne Sitesearch angezeigt.',
'sitesearch.success' => 'Sie führen eine Sitesearch durch. Es werden nur Ergebnisse von der Seite: <a href="http://:site" target="_blank" rel="noopener">":site"</a> angezeigt.',
+ 'feedback' => 'Nichts passendes auf dabei? Geben Sie uns Feedback: ',
];
diff --git a/resources/lang/en/metaGer.php b/resources/lang/en/metaGer.php
index 57660e567..8e2389238 100644
--- a/resources/lang/en/metaGer.php
+++ b/resources/lang/en/metaGer.php
@@ -12,5 +12,6 @@ return [
"formdata.stopwords" => "You have excluded results with the following words: \":stopwords\"",
"formdata.phrase" => "You are doing a string search: :phrase",
"sitesearch.failed" => "You intend to do a site search on :site. Unfortunately the chosen search engines do not support that. You can do a site search <a href=\":searchLink\">here</a> within the Web focus",
- "sitesearch.success" => "You are doing a site search. Only results of the website <a href=\"http://:site\" target=\"_blank\" rel=\"noopener\">\":site\"</a> will be shown."
+ "sitesearch.success" => "You are doing a site search. Only results of the website <a href=\"http://:site\" target=\"_blank\" rel=\"noopener\">\":site\"</a> will be shown.",
+ "feedback" => "Not what you were looking for? Give us feedback: ",
];
\ No newline at end of file
diff --git a/resources/views/kontakt/kontakt.blade.php b/resources/views/kontakt/kontakt.blade.php
index 971d11876..eb8b1f935 100644
--- a/resources/views/kontakt/kontakt.blade.php
+++ b/resources/views/kontakt/kontakt.blade.php
@@ -16,7 +16,7 @@
<div class="form-group kontakt-form-group">
<input class="form-control" name="email" placeholder="{!! trans('kontakt.form.5') !!}" type="text"></div>
<div class="form-group kontakt-form-group">
- <textarea class="form-control" id="message" name="message" placeholder="{!! trans('kontakt.form.6') !!}">@if($url !== "")Die Suche unter "{{ base64_decode($url) }}" mit dem Suchbegriff "{{base64_decode($query)}}" war unvollständig.@endif</textarea>
+ <textarea class="form-control" id="message" name="message" placeholder="{!! trans('kontakt.form.6') !!}">@if($url !== "")Die Suche unter "{{ base64_decode($url) }}" ist unvollständig.@endif</textarea>
</div>
<div class="form-group kontakt-form-group">
<p>{!! trans('kontakt.form.7') !!}</p>
diff --git a/resources/views/layouts/resultPage.blade.php b/resources/views/layouts/resultPage.blade.php
index eaa365915..88f6968cd 100644
--- a/resources/views/layouts/resultPage.blade.php
+++ b/resources/views/layouts/resultPage.blade.php
@@ -27,7 +27,9 @@
@endif
<div id="feedback" style="width:50%;margin-left:25%;position: relative; top:10px;" class="alert alert-danger alert-dismissable">
<a href="#" class="close" data-dismiss="alert" aria-label="close">×</a>
- <strong> Nichts passendes auf dabei? Geben Sie uns Feedback über das <a href="{{URL::to('')}}/kontakt/{{base64_encode(Request::fullUrl())}}/{{base64_encode($eingabe)}}" target="_blank">Kontaktformular</a>!</strong>
+ <strong> {!! trans('metaGer.feedback') !!}<a href="{{URL::to('')}}/kontakt/{{base64_encode(Request::fullUrl())}}/" target="_blank">
+ {!! trans('kontakt.form.1') !!}</a>
+ </strong>
</div>
<footer>
<div class="row">
diff --git a/routes/web.php b/routes/web.php
index 99f3a487c..2b11d23e6 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -48,12 +48,11 @@ Route::group(
->with('navbarFocus', 'kontakt');
});
- Route::get('kontakt/{url?}/{query?}', function ($url = "", $query = "") {
+ Route::get('kontakt/{url?}', function ($url = "") {
return view('kontakt.kontakt')
->with('title', trans('titles.kontakt'))
->with('navbarFocus', 'kontakt')
- ->with('url', $url)
- ->with('query', $query);
+ ->with('url', $url);
});
Route::post('kontakt', 'MailController@contactMail');
--
GitLab