From 87e5bbbd2f952f410b353bef0eefa183d2c5d0f9 Mon Sep 17 00:00:00 2001 From: Dima Udod Date: Wed, 17 Apr 2024 11:18:43 +0300 Subject: [PATCH] Fixed repeater with translation bug #8328 --- .../src/Resources/Pages/EditRecord/Concerns/Translatable.php | 4 ++-- .../src/Resources/Pages/ViewRecord/Concerns/Translatable.php | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/spatie-laravel-translatable-plugin/src/Resources/Pages/EditRecord/Concerns/Translatable.php b/packages/spatie-laravel-translatable-plugin/src/Resources/Pages/EditRecord/Concerns/Translatable.php index a18e7dda8a..e3c71fe12f 100644 --- a/packages/spatie-laravel-translatable-plugin/src/Resources/Pages/EditRecord/Concerns/Translatable.php +++ b/packages/spatie-laravel-translatable-plugin/src/Resources/Pages/EditRecord/Concerns/Translatable.php @@ -91,10 +91,10 @@ trait Translatable $this->otherLocaleData[$this->oldActiveLocale] = Arr::only($this->data, $translatableAttributes); - $this->data = [ + $this->form->fill([ ...Arr::except($this->data, $translatableAttributes), ...$this->otherLocaleData[$this->activeLocale] ?? [], - ]; + ]); unset($this->otherLocaleData[$this->activeLocale]); } diff --git a/packages/spatie-laravel-translatable-plugin/src/Resources/Pages/ViewRecord/Concerns/Translatable.php b/packages/spatie-laravel-translatable-plugin/src/Resources/Pages/ViewRecord/Concerns/Translatable.php index 8b3c70455b..157e260797 100644 --- a/packages/spatie-laravel-translatable-plugin/src/Resources/Pages/ViewRecord/Concerns/Translatable.php +++ b/packages/spatie-laravel-translatable-plugin/src/Resources/Pages/ViewRecord/Concerns/Translatable.php @@ -29,10 +29,11 @@ trait Translatable $translatableAttributes = static::getResource()::getTranslatableAttributes(); $this->otherLocaleData[$this->oldActiveLocale] = Arr::only($this->data, $translatableAttributes); - $this->data = [ + + $this->form->fill([ ...$this->data, ...$this->otherLocaleData[$this->activeLocale] ?? [], - ]; + ]); } public function getTranslatableLocales(): array