wip #3200 @1

diff --git a/src/app/Http/Controllers/CubistFrontController.php b/src/app/Http/Controllers/CubistFrontController.php
index 6ca1c9287ae483277969a98e8c0feea7efe8dc7b..6a7f6722f12a58fbebb3c4e1fcf5513911c915ce 100644 (file)
--- a/src/app/Http/Controllers/CubistFrontController.php
+++ b/src/app/Http/Controllers/CubistFrontController.php
@@ -3,7 +3,6 @@
 
 namespace Cubist\Backpack\app\Http\Controllers;
 
-use App\Models\Page;
 use Cubist\Backpack\app\Magic\Menu\Menu;
 use Cubist\Backpack\app\Magic\Models\Settings;
 use Illuminate\Routing\Controller as BaseController;

diff --git a/src/app/Magic/Models/Settings.php b/src/app/Magic/Models/Settings.php
index 63b10c39c346b0017167515895096bcdc34809d1..8e2f975f163f38f696c223496c07a3775492bac0 100644 (file)
--- a/src/app/Magic/Models/Settings.php
+++ b/src/app/Magic/Models/Settings.php
@@ -5,12 +5,13 @@ namespace Cubist\Backpack\app\Magic\Models;
 
 use Cubist\Backpack\app\Http\Controllers\CubistPWAController;
 use Cubist\Backpack\app\Magic\PageData;
+use Illuminate\Support\Facades\App;
 use Spatie\MediaLibrary\Models\Media;
 
 class Settings extends CubistMagicTranslatableModel
 {
-    /** @var PageData|null */
-    protected static $_data = null;
+    /** @var PageData[] */
+    protected static $_data = [];
 
     protected $table = 'cubist_settings';
 
@@ -153,10 +154,14 @@ class Settings extends CubistMagicTranslatableModel
      */
     public static function getData()
     {
-        if (null === self::$_data) {
+
+        $locale=App::getLocale();
+        if (!isset(self::$_data[$locale])) {
             $settings_class = self::getSettingsClass();
-            self::$_data = $settings_class::find(1)->getPageData();
+            $entity = $settings_class::find(1);
+            $entity->setLocale($locale);
+            self::$_data[$locale] = $entity->getPageData();
         }
-        return self::$_data;
+        return self::$_data[$locale];
     }
 }