allow field translatable config for repeater forms in "fields" transl…

…ationMode
wintercms · Feb 20, 2024 · 203c991 · 203c991
1 parent 0ccb6c4
commit 203c991
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/classes/EventRegistry.php b/classes/EventRegistry.php
@@ -134,7 +134,9 @@ public function registerModelTranslation($widget)
         }
 
         if ($widget->isNested) {
-            $widget->fields = $this->processFormMLFields($widget->fields, $model, $this->getWidgetName($widget));
+            if (isset($widget->config->translationMode) && $widget->config->translationMode === 'fields') {
+                $widget->fields = $this->processFormMLFields($widget->fields, $model, $this->getWidgetName($widget));
+            }
             return;
         }
 
@@ -198,10 +200,13 @@ protected function processFormMLFields($fields, $model, $parent = null)
                 // apply to fields with any context
                 list($fieldName, $context) = explode('@', $name);
             }
-            if (!array_key_exists($fieldName, $translatable)) {
+            if (! (array_get($config, 'translatable') || array_key_exists($fieldName, $translatable)) ) {
+                // field is not in model's translatable array and its translatable config is false
                 continue;
             }
 
+            // field is in model's translatable array or its translatable config is true
+
             $type = array_get($config, 'type', 'text');
             if (array_key_exists($type, $typesMap)) {
                 $fields[$name]['type'] = $typesMap[$type];

diff --git a/formwidgets/MLRepeater.php b/formwidgets/MLRepeater.php
@@ -34,11 +34,13 @@ class MLRepeater extends Repeater
      */
     public function init()
     {
+        $this->fillFromConfig(['translationMode']);
+        // make the translationMode available to the repeater items formwidgets
+        $this->config->form['translationMode'] = $this->translationMode;
+
         parent::init();
         $this->initLocale();
 
-        $this->fillFromConfig(['translationMode']);
-
         if ($this->translationMode === 'fields' && $this->model) {
             $this->model->extend(function () {
                 $this->addDynamicMethod('getJsonAttributeTranslated', function ($key, $locale) {