wip #3262

diff --git a/src/app/Magic/Models/Locale.php b/src/app/Magic/Models/Locale.php
index cadab1f5aec911e0ccb7c1ad79a67f18d8bc766d..d321a00e5e793e3af2d8e5e97f06d4f393d6c828 100644 (file)
--- a/src/app/Magic/Models/Locale.php
+++ b/src/app/Magic/Models/Locale.php
@@ -113,16 +113,21 @@ class Locale extends CubistMagicAbstractModel
 
         $data = self::getLocalesData();
         $res = [];
+
         $active = $data['locales'][$current];
         $res['active_code'] = $current;
         $res['active_flag'] = $active->flag;
         $res['active_name'] = \Cubist\Locale\Locale::translate($current, $current);
-        $res['others'] = [];
+        $res['enabled'] = [];
         foreach ($data['locales'] as $code => $locale) {
-            if (!$locale->enabled || $code === $current) {
+            if (!$locale->enabled) {
                 continue;
             }
-            $res['others'][$code] = ['code' => $code, 'flag' => $locale->flag, 'name' => \Cubist\Locale\Locale::translate($code, $code)];
+            $res['enabled'][$code] = ['code' => $code, 'flag' => $locale->flag, 'name' => \Cubist\Locale\Locale::translate($code, $code)];
+        }
+        $res['others'] = $res['enabled'];
+        if (isset($res['others'][$current])) {
+            unset($res['others'][$current]);
         }
         return $res;
     }

diff --git a/src/resources/views/favicon.blade.php b/src/resources/views/favicon.blade.php
index 6440f38744190b999def6ac99d15202a4bf12fcb..364cd70e9e829d8e28cddf558c2ac83585d3233a 100644 (file)
--- a/src/resources/views/favicon.blade.php
+++ b/src/resources/views/favicon.blade.php
@@ -1,6 +1,6 @@
 @foreach(Cubist\Backpack\app\Http\Controllers\CubistPWAController::$faviconSizes as $size)
-    <link rel="icon" type="image/png" sizes="{{$size}}x{{$size}}" href="{{ $global->getImageUrl('favicon','favicon_'.$size) }}" />
+<link rel="icon" type="image/png" sizes="{{$size}}x{{$size}}" href="{{ $global->getImageUrl('favicon','favicon_'.$size) }}">
 @endforeach
 @foreach(Cubist\Backpack\app\Http\Controllers\CubistPWAController::$iosSizes as $size)
-    <link rel="apple-touch-icon" type="image/png" sizes="{{$size}}x{{$size}}" href="{{ $global->getImageUrl('favicon_ios','favicon_ios_'.$size) }}" />
+<link rel="apple-touch-icon" type="image/png" sizes="{{$size}}x{{$size}}" href="{{ $global->getImageUrl('favicon_ios','favicon_ios_'.$size) }}">
 @endforeach