From a7e007e4ab7bd100e2e9c98723c77c3b2777194e Mon Sep 17 00:00:00 2001
From: Dominik Hebeler <dominik@suma-ev.de>
Date: Wed, 14 Sep 2022 13:55:19 +0200
Subject: [PATCH] changed sidebar menu for lang selector
---
metager/lang/de/sidebar.php | 1 -
metager/lang/en/sidebar.php | 1 -
metager/lang/es/sidebar.php | 57 +++++++++----------
.../resources/views/lang-selector.blade.php | 2 +-
.../resources/views/parts/sidebar.blade.php | 18 ++----
5 files changed, 34 insertions(+), 45 deletions(-)
diff --git a/metager/lang/de/sidebar.php b/metager/lang/de/sidebar.php
index 9e23e2fa2..1e7f43588 100644
--- a/metager/lang/de/sidebar.php
+++ b/metager/lang/de/sidebar.php
@@ -17,7 +17,6 @@ return [
'nav16' => 'Fördern',
'nav17' => 'MetaGer-Fördershops',
'nav18' => 'Kontakt',
- 'nav19' => 'Sprache',
'nav20' => 'Hilfe',
'nav22' => 'Zitatsuche',
'nav23' => 'Mitglied werden',
diff --git a/metager/lang/en/sidebar.php b/metager/lang/en/sidebar.php
index 9682ad4db..915ac1c15 100644
--- a/metager/lang/en/sidebar.php
+++ b/metager/lang/en/sidebar.php
@@ -17,7 +17,6 @@ return [
"nav16" => "Support Us",
"nav17" => "Purchase at affiliate shops",
"nav18" => "Contact",
- "nav19" => "Language",
"nav20" => "Help",
"nav22" => "Citation Search",
"nav23" => "Become a member",
diff --git a/metager/lang/es/sidebar.php b/metager/lang/es/sidebar.php
index e7f558f4d..75f08bc07 100644
--- a/metager/lang/es/sidebar.php
+++ b/metager/lang/es/sidebar.php
@@ -1,33 +1,32 @@
<?php
return [
- "nav1" => "Búsqueda",
- "nav2" => "Donaciones",
- "nav3" => "Protección de datos",
- "nav4" => "Foro",
- "nav5" => "Contacto",
- "nav6" => "Equipo",
- "nav7" => "Sobre nosotros",
- "nav8" => "Aviso legal",
- "nav9" => "Ayuda",
- "nav10" => "Widget",
- "nav11" => "Asociador",
- "nav14" => "TOR-Hidden-Service",
- "nav15" => "Servicios",
- "nav16" => "Patrocinar",
- "nav17" => "Comprar y promover",
- "nav18" => "Contacto",
- "nav19" => "Idioma",
- "nav20" => "Ayuda",
- "nav22" => "Búsqueda de citas",
- "nav23" => "Afiliarse a SUMA-EV",
- "nav24" => "Código fuente MetaGer",
- "nav25" => "MetaGer App",
- "nav26" => "Tienda de fans",
- "nav27" => "MetaGer Maps",
- "nav28" => "Ajustes",
- "nav29" => "Declaración de transparencia",
- "navigationToggle" => "Mostrar navegación",
- "titles.tips" => "Sugerencias",
- "plugin" => "MetaGer Plugin"
+ "nav1" => "Búsqueda",
+ "nav2" => "Donaciones",
+ "nav3" => "Protección de datos",
+ "nav4" => "Foro",
+ "nav5" => "Contacto",
+ "nav6" => "Equipo",
+ "nav7" => "Sobre nosotros",
+ "nav8" => "Aviso legal",
+ "nav9" => "Ayuda",
+ "nav10" => "Widget",
+ "nav11" => "Asociador",
+ "nav14" => "TOR-Hidden-Service",
+ "nav15" => "Servicios",
+ "nav16" => "Patrocinar",
+ "nav17" => "Comprar y promover",
+ "nav18" => "Contacto",
+ "nav20" => "Ayuda",
+ "nav22" => "Búsqueda de citas",
+ "nav23" => "Afiliarse a SUMA-EV",
+ "nav24" => "Código fuente MetaGer",
+ "nav25" => "MetaGer App",
+ "nav26" => "Tienda de fans",
+ "nav27" => "MetaGer Maps",
+ "nav28" => "Ajustes",
+ "nav29" => "Declaración de transparencia",
+ "navigationToggle" => "Mostrar navegación",
+ "titles.tips" => "Sugerencias",
+ "plugin" => "MetaGer Plugin"
];
diff --git a/metager/resources/views/lang-selector.blade.php b/metager/resources/views/lang-selector.blade.php
index 80bdb400a..1070d7fe5 100644
--- a/metager/resources/views/lang-selector.blade.php
+++ b/metager/resources/views/lang-selector.blade.php
@@ -10,7 +10,7 @@
<h2>{{ trans("lang-selector.lang.$language", [], $language) }}</h2>
<ul>
@foreach($locales as $locale => $locale_native)
- <li><a @if(LaravelLocalization::getCurrentLocale() === $locale)class="active" @endif rel="alternate" hreflang="{{ LaravelLocalization::getSupportedLocales()[$locale]["regional"] }}" href="{{ LaravelLocalization::getLocalizedURL($locale) }}">{{ $locale_native }}</a></li>
+ <li><a @if(LaravelLocalization::getCurrentLocale() === $locale)class="active" @endif rel="alternate" hreflang="{{ LaravelLocalization::getSupportedLocales()[$locale]["regional"] }}" href="{{ LaravelLocalization::getLocalizedURL($locale, null, [], true) }}">{{ $locale_native }}</a></li>
@endforeach
</ul>
@endforeach
diff --git a/metager/resources/views/parts/sidebar.blade.php b/metager/resources/views/parts/sidebar.blade.php
index 7f11e0f9a..ca00f7cee 100644
--- a/metager/resources/views/parts/sidebar.blade.php
+++ b/metager/resources/views/parts/sidebar.blade.php
@@ -162,20 +162,12 @@
@endif
</ul>
</li>
- <li class="metager-dropdown">
- <input id="languagesToggle" class="sidebarCheckbox" type="checkbox">
- <label for="languagesToggle" class="metager-dropdown-toggle navigation-element" aria-haspopup="true" id="navigationSprache" tabindex=0>
+ <hr>
+ <li>
+ <a href="{{ LaravelLocalization::getLocalizedURL(null, route('lang-selector')) }}">
<img src="/img/icon-language.svg" alt="" aria-hidden="true" id="sidebar-img-language">
- <span>{{ trans('sidebar.nav19') }} ({{ LaravelLocalization::getSupportedLocales()[LaravelLocalization::getCurrentLocale()]['native'] }})</span>
- <span class="caret"></span>
- </label>
- <ul class="metager-dropdown-content">
- @foreach(LaravelLocalization::getSupportedLocales() as $localeCode => $properties)
- <li>
- <a rel="alternate" hreflang="{{$localeCode}}" href="{{LaravelLocalization::getLocalizedURL($localeCode, null, [], true) }}" >{{{ $properties['native'] }}}</a>
- </li>
- @endforeach
- </ul>
+ <span>{{ LaravelLocalization::getSupportedLocales()[LaravelLocalization::getCurrentLocale()]['native'] }}</span>
+ </a>
</li>
</ul>
</div>
--
GitLab