#2868

diff --git a/composer.json b/composer.json
index c601e67f8a420866300cb974593b3a535361070a..5a6c5c6a25b07b5c7f404245c1825f348f0bbecc 100644 (file)
--- a/composer.json
+++ b/composer.json
@@ -60,10 +60,6 @@
         {
             "type": "composer",
             "url": "https:\/\/composer.cubedesigners.com\/"
-        },
-        {
-            "type": "git",
-            "url": "https://github.com/EnhydraV/laravel-backpack-nestedmodels.git"
         }
     ]
 }

diff --git a/src/app/Magic/Fields/Country.php b/src/app/Magic/Fields/Country.php
index b6f59effce250e3e57bb16cbd2df59ce3d9a26fc..2b3507b7ec3e63965ab5ee928639d7583c19b7cd 100644 (file)
--- a/src/app/Magic/Fields/Country.php
+++ b/src/app/Magic/Fields/Country.php
@@ -4,7 +4,22 @@
 namespace Cubist\Backpack\app\Magic\Fields;
 
 
+use Illuminate\Support\Facades\App;
+
 class Country extends Locale
 {
+    /**
+     * @return array
+     */
+    protected function _getLocales()
+    {
+        $list = Cubist\Locale\Country::getList(App::getLocale());
+
+        $res = [];
+        foreach ($list as $code => $name) {
+            $res[$code] = $code . ' | ' . $name;
+        }
 
+        return $res;
+    }
 }

diff --git a/src/app/Magic/Fields/Locale.php b/src/app/Magic/Fields/Locale.php
index 9d1e0b1c2b0befe687566924896b5d3894305b83..aa4366b1eb6d9e8cfd9d768ee0b7adf36afd0b8a 100644 (file)
--- a/src/app/Magic/Fields/Locale.php
+++ b/src/app/Magic/Fields/Locale.php
@@ -4,12 +4,13 @@
 namespace Cubist\Backpack\app\Magic\Fields;
 
 
+use Illuminate\Support\Facades\App;
+
 class Locale extends SelectFromArray
 {
     public function __construct($attributes)
     {
         $this->_options = $this->_getLocales();
-
         parent::__construct($attributes);
     }
 
@@ -18,6 +19,13 @@ class Locale extends SelectFromArray
      */
     protected function _getLocales()
     {
-        return [];
+        $list = \Cubist\Locale\Locale::getList(App::getLocale());
+
+        $res = [];
+        foreach ($list as $code => $name) {
+            $res[$code] = $code . ' | ' . $name;
+        }
+
+        return $res;
     }
 }

diff --git a/src/app/Magic/Fields/LocaleEnabled.php b/src/app/Magic/Fields/LocaleEnabled.php
index 5e001db570d8440a0ec5567d905b6f67739aba5c..89bfd7d99648eb45da0b276d21b687766535dac6 100644 (file)
--- a/src/app/Magic/Fields/LocaleEnabled.php
+++ b/src/app/Magic/Fields/LocaleEnabled.php
@@ -3,7 +3,22 @@
 
 namespace Cubist\Backpack\app\Magic\Fields;
 
+use Illuminate\Support\Facades\App;
+
 class LocaleEnabled extends Locale
 {
+    /**
+     * @return array
+     */
+    protected function _getLocales()
+    {
+        $list = \Cubist\Locale\Locale::getList(App::getLocale());
+
+        $res = [];
+        foreach ($list as $code => $name) {
+            $res[$code] = $code . ' | ' . $name;
+        }
 
+        return $res;
+    }
 }