From 8fb8bc120d1b7e1faab316aacbfd7f6e4fb87605 Mon Sep 17 00:00:00 2001
From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Fri, 5 Jul 2019 15:05:20 +0200
Subject: [PATCH] #2868

---
 composer.json                          |  4 ----
 src/app/Magic/Fields/Country.php       | 15 +++++++++++++++
 src/app/Magic/Fields/Locale.php        | 12 ++++++++++--
 src/app/Magic/Fields/LocaleEnabled.php | 15 +++++++++++++++
 4 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/composer.json b/composer.json
index c601e67..5a6c5c6 100644
--- 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 b6f59ef..2b3507b 100644
--- 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 9d1e0b1..aa4366b 100644
--- 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 5e001db..89bfd7d 100644
--- 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;
+    }
 }
-- 
2.39.5