diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index bae3ad9634bb87faebd2c07b83537f1c96fb3e80..f4c0d947f94ece6504ef7eee535bcfb16bb57c57 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -50,5 +50,9 @@ class Kernel extends HttpKernel 'can' => \Illuminate\Foundation\Http\Middleware\Authorize::class, 'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class, 'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class, + + 'localize' => \Mcamara\LaravelLocalization\Middleware\LaravelLocalizationRoutes::class, + 'localizationRedirect' => \Mcamara\LaravelLocalization\Middleware\LaravelLocalizationRedirectFilter::class, + 'localeSessionRedirect' => \Mcamara\LaravelLocalization\Middleware\LocaleSessionRedirect::class ]; } diff --git a/app/Http/routes.php b/app/Http/routes.php index ac4592b65ee7e5d34870b796c653fd05f0194987..5187bf51f6c662a45d344bad4feda9bd1e441c80 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -11,15 +11,14 @@ | */ - Route::group(['prefix' => LaravelLocalization::setLocale()], function() - { - /** ADD ALL LOCALIZED ROUTES INSIDE THIS GROUP **/ - /* Route::get('/', function() + Route::group( + [ + 'prefix' => LaravelLocalization::setLocale(), + 'middleware' => [ 'localeSessionRedirect', 'localizationRedirect' ] + ], + function() { - return view('index', [ - 'title' => trans('titles.index'), - 'homeIcon']); - }); */ + /** ADD ALL LOCALIZED ROUTES INSIDE THIS GROUP **/ Route::get('/', 'StartpageController@loadStartPage'); diff --git a/config/laravellocalization.php b/config/laravellocalization.php index fed09e0f475351655e55056ae2022ab4a3f730d3..5060d6ca3938659c1a3037656c26d45284f745e0 100755 --- a/config/laravellocalization.php +++ b/config/laravellocalization.php @@ -307,6 +307,6 @@ return [ // IMPORTANT - When hideDefaultLocaleInURL is set to true, the unlocalized root is treated as the applications default locale "app.locale". // Because of this language negotiation using the Accept-Language header will NEVER occur when hideDefaultLocaleInURL is true. // - 'hideDefaultLocaleInURL' => false, + 'hideDefaultLocaleInURL' => true, ]; diff --git a/resources/lang/de/staticPages.php b/resources/lang/de/staticPages.php index 0adea0d775f15af68c03bd89c7c9eadc92eb52bd..495558211891501c8ba7eb9d29b73b232eed1e26 100644 --- a/resources/lang/de/staticPages.php +++ b/resources/lang/de/staticPages.php @@ -19,7 +19,10 @@ return [ 'nav16' => 'Fördern', 'nav17' => 'Einkaufen bei MetaGer-Fördershops', 'nav18' => 'Kontakt', + 'nav19' => 'Sprache', + 'navigationToggle' => 'Navigation anzeigen', + 'sumaev.1' => 'MetaGer wird entwickelt und betrieben vom ', 'sumaev.2' => 'SUMA-EV - Verein für freien Wissenszugang.' ]; \ No newline at end of file diff --git a/resources/lang/en/staticPages.php b/resources/lang/en/staticPages.php index 5d61d987ebcdf210470a83e5707e0731af9a71b8..06bcdc65566cf93236729e57fb4ce4982b394f5c 100644 --- a/resources/lang/en/staticPages.php +++ b/resources/lang/en/staticPages.php @@ -19,7 +19,10 @@ return [ 'nav16' => 'Support', 'nav17' => 'Purchase at MetaGer Supporting Shops', 'nav18' => 'Contact', + 'nav19' => 'Language', + 'navigationToggle' => 'show navigation', + 'sumaev.1' => 'MetaGer is developed and run by ', 'sumaev.2' => 'SUMA-EV - Association for Free Access to Knowledge.' ]; \ No newline at end of file diff --git a/resources/views/layouts/staticPages.blade.php b/resources/views/layouts/staticPages.blade.php index 84499f7c13af74f4cbab11fe97b91efd9e2da8b0..9fed8dc8029af53c59d93ce4f21ad3a53f0e3150 100644 --- a/resources/views/layouts/staticPages.blade.php +++ b/resources/views/layouts/staticPages.blade.php @@ -42,7 +42,7 @@ <div class="collapse navbar-collapse" id="navbar-collapse"> <ul class="nav navbar-nav navbar-right"> <li> - <a href="/" id="navigationSuche">{{ trans('staticPages.nav1') }} + <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}" id="navigationSuche">{{ trans('staticPages.nav1') }} </a> </li> <li class="dropdown"> @@ -52,7 +52,7 @@ </a> <ul class="dropdown-menu"> <li> - <a href="/spende/">{{ trans('staticPages.nav2') }} + <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/spende/") }}">{{ trans('staticPages.nav2') }} </a> </li> <li> @@ -62,7 +62,7 @@ </ul> </li> <li> - <a href="/datenschutz/" id="navigationPrivacy">{{ trans('staticPages.nav3') }} + <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/datenschutz/") }}" id="navigationPrivacy">{{ trans('staticPages.nav3') }} </a> </li> <li class="dropdown"> @@ -76,19 +76,19 @@ </a> </li> <li> - <a href="/kontakt/">{{ trans('staticPages.nav5') }} + <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/kontakt/") }}">{{ trans('staticPages.nav5') }} </a> </li> <li> - <a href="/team/">{{ trans('staticPages.nav6') }} + <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/team/") }}">{{ trans('staticPages.nav6') }} </a> </li> <li> - <a href="/about/">{{ trans('staticPages.nav7') }} + <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/about/") }}">{{ trans('staticPages.nav7') }} </a> </li> <li> - <a href="/impressum/">{{ trans('staticPages.nav8') }} + <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/impressum/") }}">{{ trans('staticPages.nav8') }} </a> </li> </ul> @@ -100,11 +100,11 @@ </a> <ul class="dropdown-menu"> <li> - <a href="/hilfe/">{{ trans('staticPages.nav9') }} + <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/hilfe/") }}">{{ trans('staticPages.nav9') }} </a> </li> <li> - <a href="/widget/">{{ trans('staticPages.nav10') }} + <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/widget/") }}">{{ trans('staticPages.nav10') }} </a> </li> <li> @@ -125,6 +125,16 @@ </li> </ul> </li> + <li class="dropdown"> + <a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" id="navigationSprache">{{ trans('staticPages.nav19') }} + <span class="caret"></span> + </a> + <ul class="dropdown-menu"> + @foreach(LaravelLocalization::getSupportedLocales() as $localeCode => $properties) + <li><a rel="alternate" hreflang="{{$localeCode}}" href="{{LaravelLocalization::getLocalizedURL($localeCode) }}">{{{ $properties['native'] }}}</a></li> + @endforeach + </ul> + </li> </ul> </div> </div> diff --git a/resources/views/layouts/subPages.blade.php b/resources/views/layouts/subPages.blade.php index 9d5a0236b093f62e69f6c6f810ba2aca89a396a1..c6ab157c5476b6338cad56ff7adda99ee3eb2be0 100644 --- a/resources/views/layouts/subPages.blade.php +++ b/resources/views/layouts/subPages.blade.php @@ -1,7 +1,7 @@ @extends('layouts.staticPages') @section('homeIcon') -<a class="navbar-brand" href="/"> +<a class="navbar-brand" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}""> <div class="logo"> <h1>MetaGer </h1>