fix #3113 @0.5

diff --git a/src/app/Console/Commands/LocaleCopy.php b/src/app/Console/Commands/LocaleCopy.php
new file mode 100644 (file)
index 0000000..6962ab8
--- /dev/null
+++ b/src/app/Console/Commands/LocaleCopy.php
@@ -0,0 +1,10 @@
+<?php
+
+
+namespace Cubist\Backpack\app\Console\Commands;
+use Illuminate\Console\Command;
+
+class LocaleCopy  extends Command
+{
+
+}

diff --git a/src/app/Magic/Models/News.php b/src/app/Magic/Models/News.php
index b96dd338e8b5e26f5f5c7148dac48e55c713739d..49c89982a644bbbc9b51425bca331dd3ca96b6ed 100644 (file)
--- a/src/app/Magic/Models/News.php
+++ b/src/app/Magic/Models/News.php
@@ -3,9 +3,8 @@
 
 namespace Cubist\Backpack\app\Magic\Models;
 
-class News extends CubistMagicTranslatableModel
+class News extends CubistMagicPageModel
 {
-
     protected $table = 'cubist_news';
 
     protected $_options = ['name' => 'news',

diff --git a/src/app/Middleware/LocaleSelector.php b/src/app/Middleware/LocaleSelector.php
index 9c60479f33c2a4fdfbed41b487acbb195b3db8b7..7346df851b61804c82b1cab8afaaa8b0d4ee49fd 100644 (file)
--- a/src/app/Middleware/LocaleSelector.php
+++ b/src/app/Middleware/LocaleSelector.php
@@ -26,16 +26,17 @@ class LocaleSelector
             $selectedLocale = $defaultLocale;
         }
 
-        $this->setLocale($selectedLocale, $defaultLocale);
+        $this->setLocale($selectedLocale);
 
         return $next($request);
     }
 
-    public function setLocale($locale, $default)
+    public function setLocale($locale)
     {
         App::setLocale($locale);
+        config(['app.fallback_locale' => $locale]);
         app('translator')->setLocale($locale);
-        app('translator')->setFallback($default);
+        app('translator')->setFallback($locale);
     }
 
     /**