Merge pull request #50 from kenepa/fix-language-switcher-currentlang-…

…issue Fixed: Language switcher causes problems if the active language is no…
kenepa · Jun 7, 2024 · 78d44dd · 78d44dd
2 parents c59a634 + 601587c
commit 78d44dd
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/resources/views/language-switcher.blade.php b/resources/views/language-switcher.blade.php
@@ -29,7 +29,7 @@ function try_svg($name, $classes) {
                     ])
             >
             <span class="opacity-100">
-                @if ($showFlags)
+                @if (isset($currentLanguage) && $showFlags)
                     {{ try_svg('flag-1x1-'.$currentLanguage['flag'], 'rounded-full w-8 h-8') }}
                 @else
                     <x-icon
@@ -44,7 +44,12 @@ class="w-5 h-5"
 
     <x-filament::dropdown.list>
         @foreach ($otherLanguages as $language)
-            @php $isCurrent = $currentLanguage['code'] === $language['code']; @endphp
+            @php
+                $isCurrent = false;
+                if (isset($currentLanguage)) {
+                    $isCurrent = $currentLanguage['code'] === $language['code'];
+                }
+            @endphp
             <x-filament::dropdown.list.item>
                 <a
                         @class([