Settings cleanup

studioespresso · Feb 15, 2024 · bed5432 · bed5432
1 parent bd0e3e9
commit bed5432
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 29 deletions.
diff --git a/src/fields/EasyAddressFieldField.php b/src/fields/EasyAddressFieldField.php
@@ -176,9 +176,6 @@ public function getInputHtml($value, ElementInterface $element = null): string
         $id = Craft::$app->getView()->formatInputId($this->handle);
         $namespacedId = Craft::$app->getView()->namespaceInputId($id);
 
-        $pluginSettings = EasyAddressField::getInstance()->getSettings();
-        $fieldSettings = $this->getSettings();
-
         return Craft::$app->getView()->renderTemplate(
             'easy-address-field/_field/_input',
             [
@@ -188,8 +185,7 @@ public function getInputHtml($value, ElementInterface $element = null): string
                 'id' => $id,
                 'countries' => EasyAddressField::getInstance()->countries->getCountriesAsArray(),
                 'namespacedId' => $namespacedId,
-                'fieldSettings' => $fieldSettings,
-                'pluginSettings' => $pluginSettings,
+                'fieldSettings' => $this->getSettings(),
             ]
         );
     }

diff --git a/src/services/CountriesService.php b/src/services/CountriesService.php
@@ -32,8 +32,7 @@ public function getCountryNameByAlpha2($code, $locale)
         $country = $data->alpha2($code);
 
         try {
-            $translatedLocale = Locale::getDisplayRegion('-' . $country['alpha2'], $locale);
-            return $translatedLocale;
+            return Locale::getDisplayRegion('-' . $country['alpha2'], $locale);
         } catch (\Exception $e) {
             return $country['name'];
         }

diff --git a/src/services/GeoLocationService.php b/src/services/GeoLocationService.php
@@ -9,14 +9,6 @@
 
 class GeoLocationService extends Component
 {
-    public $settings;
-
-    public function init(): void
-    {
-        parent::init(); // TODO: Change the autogenerated stub
-        $this->settings = EasyAddressField::getInstance()->getSettings();
-    }
-
     /**
      * @param EasyAddressFieldModel $model
      *

diff --git a/src/translations/nl/easy-address-field.php b/src/translations/nl/easy-address-field.php
@@ -14,5 +14,4 @@
     'Postal code' => 'Postcode',
     'City' => 'Stad of gemeente',
     'Pick an address on the map' => 'Kies een adres op de kaart',
-
 ];
diff --git a/src/web/twig/variables/AddressVariable.php b/src/web/twig/variables/AddressVariable.php
@@ -3,22 +3,11 @@
 namespace studioespresso\easyaddressfield\web\twig\variables;
 
 use studioespresso\easyaddressfield\EasyAddressField;
-use studioespresso\easyaddressfield\services\CountriesService;
 
 class AddressVariable
 {
-    private $settings;
-
-    public function __construct()
+    public function countries(): array
     {
-        $pluginSettings = EasyAddressField::getInstance()->getSettings();
-        $this->settings = $pluginSettings;
-    }
-
-    public function countries()
-    {
-        $countriesService = new CountriesService();
-
-        return $countriesService->getCountriesAsArray();
+        return EasyAddressField::getInstance()->countries->getCountriesAsArray();
     }
 }