diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index f4c0d947f94ece6504ef7eee535bcfb16bb57c57..33e768c8cc3b924b4cc7a3b7c2a9a6b4755e3584 100644
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -29,7 +29,7 @@ class Kernel extends HttpKernel
\Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
\Illuminate\Session\Middleware\StartSession::class,
\Illuminate\View\Middleware\ShareErrorsFromSession::class,
- \App\Http\Middleware\VerifyCsrfToken::class,
+ #\App\Http\Middleware\VerifyCsrfToken::class,
],
'api' => [
diff --git a/resources/lang/de/index.php b/resources/lang/de/index.php
index d7e0ed1e471ac843734ffc3ecfe8e6f6a13dd032..675b3789869aa1625733ad8336cfd8f305e904d6 100644
--- a/resources/lang/de/index.php
+++ b/resources/lang/de/index.php
@@ -6,6 +6,7 @@ return [
'foki.wissenschaft' => 'Wissenschaft',
'foki.produkte' => 'Produkte',
'foki.anpassen' => 'anpassen',
+ 'foki.angepasst' => 'angepasst',
'conveyor' => 'Einkaufen bei MetaGer-Fördershops',
diff --git a/resources/lang/de/settings.php b/resources/lang/de/settings.php
index b7e559996892549bf1f4102996aa5491a03c13cc..edc340f7759df77f72a27940dd280997920ae379 100644
--- a/resources/lang/de/settings.php
+++ b/resources/lang/de/settings.php
@@ -20,7 +20,7 @@ return [
'suchmaschinen.1' => 'Suchmaschinen',
'suchmaschinen.2' => 'Web-Suche',
- 'suchmaschinen.3' => 'alle an-/abwählen',
+ 'suchmaschinen.3' => '(alle an-/abwählen)',
'suchmaschinen.4' => 'Video',
'suchmaschinen.5' => 'Deutschland',
'suchmaschinen.6' => 'Nachrichten',
@@ -34,4 +34,8 @@ return [
'suchmaschinen.14' => 'Börse & Finanzen',
'suchmaschinen.15' => 'mit Archiv',
'suchmaschinen.16' => 'Deutschland, mit Archiv',
+
+ 'speichern.1' => 'Startseite für einmalige Nutzung generieren',
+ 'speichern.2' => 'Einstellungen dauerhaft speichern',
+ 'speichern.3' => 'Plugin mit diesen Einstellungen generieren',
];
\ No newline at end of file
diff --git a/resources/lang/en/index.php b/resources/lang/en/index.php
index 5513ce4505c392531449a4266211150fd789f2bc..81adc0226ab1ebc7ecd832a8de7e2f8d1f1ac414 100644
--- a/resources/lang/en/index.php
+++ b/resources/lang/en/index.php
@@ -6,6 +6,7 @@ return [
'foki.wissenschaft' => 'Science',
'foki.produkte' => 'Shopping',
'foki.anpassen' => 'customize',
+ 'foki.angepasst' => 'customized',
'conveyor' => 'Purchase at affiliate shops',
diff --git a/resources/lang/en/settings.php b/resources/lang/en/settings.php
index df9519072a3552430010cf7bea48404b6f857fc0..1f78bed916cb448850a6b07f41d41e5c44dd1f93 100644
--- a/resources/lang/en/settings.php
+++ b/resources/lang/en/settings.php
@@ -20,7 +20,7 @@ return [
'suchmaschinen.1' => 'search engines',
'suchmaschinen.2' => 'web-search',
- 'suchmaschinen.3' => 'select / deselect all',
+ 'suchmaschinen.3' => '(select / deselect all)',
'suchmaschinen.4' => 'video',
'suchmaschinen.5' => 'germany',
'suchmaschinen.6' => 'news',
@@ -34,4 +34,8 @@ return [
'suchmaschinen.14' => 'stocks & finances',
'suchmaschinen.15' => 'with archive',
'suchmaschinen.16' => 'germany, with archive',
+
+ 'speichern.1' => 'Create a startpage for one-time use',
+ 'speichern.2' => 'Save settings permanently',
+ 'speichern.3' => 'Generate plugin with these settings',
];
diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php
index a4c64f6ee88a976cfa8d5533a7b0626eb40a0a8c..8afbf2bb8316b2a66799dccc33a69abd7958227e 100644
--- a/resources/views/index.blade.php
+++ b/resources/views/index.blade.php
@@ -124,13 +124,18 @@
<span class="glyphicon glyphicon-cog">
</span>
<span class="content">
- <a href="/settings/">{{ trans('index.foki.anpassen') }}
+ <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/settings") }}">
+ @if ($focus === 'angepasst')
+ {{ trans('index.foki.angepasst') }}
+ @else
+ {{ trans('index.foki.anpassen') }}
+ @endif
</a>
</span>
</label>
</fieldset>
<fieldset>
- <form id="searchForm" method="GET" action="/meta/meta.ger3" accept-charset="UTF-8">
+ <form id="searchForm" method="GET" action="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/meta/meta.ger3") }}" accept-charset="UTF-8">
<div class="input-group">
<div class="input-group-addon">
<button type="button" data-toggle="popover" data-html="true" data-container="body" title="Persönliches Design auswählen" data-content=' <ul id="color-chooser" class="list-inline list-unstyled">
diff --git a/resources/views/layouts/researchandtabs.blade.php b/resources/views/layouts/researchandtabs.blade.php
index 689ff152f4dc9669f77be69cf0d79c78ffca590c..a02b44dd2e8f63e39cc8b4a0557c66f973eb9e4c 100644
--- a/resources/views/layouts/researchandtabs.blade.php
+++ b/resources/views/layouts/researchandtabs.blade.php
@@ -3,11 +3,11 @@
<nav>
<ul class="list-inline">
<li class="hidden-xs hidden-sm pull-left">
- <div class="logo"><a href="/"><h1>MetaGer</h1></a>
+ <div class="logo"><a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}"><h1>MetaGer</h1></a>
</div>
</li>
<li class="visible-xs visible-sm pull-left">
- <div class="logo"><a href="/"><h1>MG</h1></a>
+ <div class="logo"><a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}"><h1>MG</h1></a>
</div>
</li>
<li class="pull-right">
@@ -52,14 +52,14 @@
<li id="bilderTabSelector" role="presentation" data-loaded="1" class="active">
<a aria-controls="bilder" data-href="#bilder" href="#bilder">
<span class='glyphicon glyphicon-picture'></span>
- <span class="hidden-xs">Bilder</span>
+ <span class="hidden-xs">{{ trans('index.foki.bilder') }}</span>
</a>
</li>
@else
<li data-loaded="0" id="bilderTabSelector" role="presentation">
<a aria-controls="bilder" data-href="{{ $metager->generateSearchLink('bilder') }}" href="{{ $metager->generateSearchLink('bilder') }}">
<span class='glyphicon glyphicon-picture'></span>
- <span class="hidden-xs">Bilder</span>
+ <span class="hidden-xs">{{ trans('index.foki.bilder') }}</span>
</a>
</li>
@endif
@@ -68,14 +68,14 @@
<li id="nachrichtenTabSelector" role="presentation" data-loaded="1" class="active">
<a aria-controls="nachrichten" data-href="#nachrichten" href="#nachrichten">
<span class='glyphicon glyphicon-bullhorn'></span>
- <span class="hidden-xs">Nachrichten</span>
+ <span class="hidden-xs">{{ trans('index.foki.nachrichten') }}</span>
</a>
</li>
@else
<li data-loaded="0" id="nachrichtenTabSelector" role="presentation" >
<a aria-controls="nachrichten" data-href="{{ $metager->generateSearchLink('nachrichten') }}" href="{{ $metager->generateSearchLink('nachrichten') }}">
<span class='glyphicon glyphicon-bullhorn'></span>
- <span class="hidden-xs">Nachrichten</span>
+ <span class="hidden-xs">{{ trans('index.foki.nachrichten') }}</span>
</a>
</li>
@endif
@@ -84,14 +84,14 @@
<li id="wissenschaftTabSelector" role="presentation" data-loaded="1" class="active">
<a aria-controls="wissenschaft" data-href="#wissenschaft" href="#wissenschaft">
<span class='glyphicon glyphicon-file'></span>
- <span class="hidden-xs">Wissenschaft</span>
+ <span class="hidden-xs">{{ trans('index.foki.wissenschaft') }}</span>
</a>
</li>
@else
<li data-loaded="0" id="wissenschaftTabSelector" role="presentation">
<a aria-controls="wissenschaft" data-href="{{ $metager->generateSearchLink('wissenschaft') }}" href="{{ $metager->generateSearchLink('wissenschaft') }}">
<span class='glyphicon glyphicon-file'></span>
- <span class="hidden-xs">Wissenschaft</span>
+ <span class="hidden-xs">{{ trans('index.foki.wissenschaft') }}</span>
</a>
</li>
@endif
@@ -100,14 +100,14 @@
<li id="produktsucheTabSelector" role="presentation" data-loaded="1" class="active">
<a aria-controls="produktsuche" data-href="#produktsuche" href="#produktsuche">
<span class='glyphicon glyphicon-shopping-cart'></span>
- <span class="hidden-xs">Produktsuche</span>
+ <span class="hidden-xs">{{ trans('index.foki.produkte') }}</span>
</a>
</li>
@else
<li data-loaded="0" id="produktsucheTabSelector" role="presentation" >
<a aria-controls="produktsuche" data-href="{{ $metager->generateSearchLink('produktsuche') }}" href="{{ $metager->generateSearchLink('produktsuche') }}">
<span class='glyphicon glyphicon-shopping-cart'></span>
- <span class="hidden-xs">Produktsuche</span>
+ <span class="hidden-xs">{{ trans('index.foki.produkte') }}</span>
</a>
</li>
@endif
@@ -116,7 +116,7 @@
<li id="angepasstTabSelector" role="presentation" data-loaded="1" class="active">
<a aria-controls="angepasst" data-href="#angepasst" href="#angepasst">
<span class='glyphicon glyphicon-cog'></span>
- <span class="hidden-xs">angepasst</span>
+ <span class="hidden-xs">{{ trans('index.foki.angepasst') }}</span>
</a>
</li>
@endif
diff --git a/resources/views/settings1.blade.php b/resources/views/settings1.blade.php
index fe1bf0f74070b714ebe1eb631253aab168111c78..0a67b1ba8ec232681334483a7296a75c91fb43bc 100644
--- a/resources/views/settings1.blade.php
+++ b/resources/views/settings1.blade.php
@@ -3,7 +3,7 @@
@section('title', $title )
@section('content')
- <form action="/" method="get">
+ <form action="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}" method="get">
<h1>{{ trans('settings.head.1') }}</h1>
<p id="lead">{{ trans('settings.head.2') }} <a href="#unten">{{ trans('settings.head.3') }}</a> {{ trans('settings.head.4') }}</p>
<h2>{{ trans('settings.allgemein.1') }}</h2>
@@ -38,7 +38,7 @@
<h3>
{{ ucfirst($fokus) }}
<small>
- <a class="checker" data-type="{{ $fokus }}">(alle an-/abwählen)</a>
+ <a class="checker" data-type="{{ $fokus }}">{{ trans('settings.suchmaschinen.3') }}</a>
</small>
</h3>
<div class="row">
@@ -55,9 +55,9 @@
</div>
</div>
@endforeach
- <input id="unten" type="submit" class="btn btn-primary" value="Startseite für einmalige Nutzung generieren">
- <input type="button" class="btn btn-primary hidden" id="save" value="Einstellungen dauerhaft speichern">
- <input id="plugin" type="submit" class="btn btn-primary" value="Plugin mit diesen Einstellungen generieren.">
+ <input id="unten" type="submit" class="btn btn-primary" value="{{ trans('settings.speichern.1') }}">
+ <input type="button" class="btn btn-primary hidden" id="save" value="{{ trans('settings.speichern.2') }}">
+ <input id="plugin" type="submit" class="btn btn-primary" value="{{ trans('settings.speichern.3') }}">
<input type="button" class="btn btn-danger hidden" id="reset" value="Einstellungen Zurücksetzen">
</form>
@endsection
\ No newline at end of file