Fix translated fields not switching to fallback language (closes #14)

getformwork · Mar 17, 2019 · 4c02b73 · 4c02b73
1 parent e95b953
commit 4c02b73
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/admin/src/Fields/Translator.php b/admin/src/Fields/Translator.php
@@ -20,6 +20,13 @@ class Translator
      */
     protected static $ignore = array('name', 'type', 'import', 'fields');
 
+    /**
+     * Keys of which array value has to be ignored
+     *
+     * @var array
+     */
+    protected static $ignoreArrayKeys = array('value', 'options');
+
     /**
      * Translate a field
      */
@@ -31,6 +38,8 @@ public static function translate(Field $field)
                 if (is_array($value)) {
                     if (isset($value[$language])) {
                         $value = $value[$language];
+                    } elseif (!in_array($key, static::$ignoreArrayKeys, true)) {
+                        $value = array_shift($value);
                     }
                 } elseif (!is_string($value)) {
                     continue;