Add support for translation strings in FormField->options() (#1192)

Co-authored-by: Luke Towers <[email protected]>
Co-authored-by: Ben Thomson <[email protected]>

Author: 3 people

modules/backend/classes/FormField.php

@@ -3,9 +3,10 @@
 namespace Backend\Classes;
 
 use BackedEnum;
-use Html;
+use Illuminate\Support\Facades\Lang;
 use Winter\Storm\Database\Model;
 use Winter\Storm\Html\Helper as HtmlHelper;
+use Winter\Storm\Support\Facades\Html;
 use Winter\Storm\Support\Str;
 
 /**
@@ -229,10 +230,11 @@ public function options($value = null)
         if ($value === null) {
             if (is_array($this->options)) {
                 return $this->options;
-            }
-            elseif (is_callable($this->options)) {
+            } elseif (is_callable($this->options)) {
                 $callable = $this->options;
                 return $callable();
+            } elseif (is_string($this->options) && is_array($options = Lang::get($this->options))) {
+                return $options;
             }
 
             return [];
@@ -434,9 +436,8 @@ public function getAttributes($position = 'field', $htmlBuild = true)
         // Field is required, so add the "required" attribute
         if ($position === 'field' && $this->required && (!isset($result['required']) || $result['required'])) {
             $result['required'] = '';
-        }
-        // The "required" attribute is set and falsy, so unset it
-        elseif ($position === 'field' && isset($result['required']) && !$result['required']) {
+        } elseif ($position === 'field' && isset($result['required']) && !$result['required']) {
+            // The "required" attribute is set and falsy, so unset it
             unset($result['required']);
         }