feat: ensure correct translations when model is converted to array

Author: athphane

src/JsonTranslatable/IsJsonTranslatable.php

@@ -255,4 +255,44 @@ public function fill(array $attributes): static
 
         return parent::fill($attributes);
     }
+
+    /**
+     * Get the value of an attribute using its mutator for array conversion.
+     *
+     * @param  string  $key
+     */
+    protected function mutateAttributeForArray($key, $value)
+    {
+        // check if is a suffixed attribute
+        [$field, $locale] = $this->getFieldAndLocale($key);
+
+        if ($locale && $this->isTranslatable($field)) {
+            return $this->{$key};
+        }
+
+        return parent::mutateAttributeForArray($key, $value);
+    }
+
+    public function attributesToArray()
+    {
+        $attributes = parent::attributesToArray();
+
+        return $this->addTranslatableAttributesToArray($attributes);
+    }
+
+    /**
+     * Add the translatable attributes to the attributes array.
+     */
+    protected function addTranslatableAttributesToArray(array $attributes): array
+    {
+        foreach ($this->getTranslatables() as $key) {
+            if ( ! isset($attributes[$key])) {
+                continue;
+            }
+
+            $attributes[$key] = $this->translate($key);
+        }
+
+        return $attributes;
+    }
 }

tests/Unit/JsonTranslatable/IsJsonTranslatableTest.php

@@ -612,4 +612,29 @@ public function it_fills_translatable_and_non_translatable_attributes()
         $this->assertEquals('Test Body', $article->body);
         $this->assertEquals('test-title', $article->slug);
     }
+
+    #[Test]
+    public function it_gives_current_locale_language_as_attribute_values()
+    {
+        $article = new Article();
+        $article->fill([
+            'title'        => 'Dhivehi Title',
+            'body'         => 'Test Body',
+            'slug'         => 'dhivehi-title',
+            'lang'         => 'dv',
+            'translations' => [
+                'en' => [
+                    'title' => 'English Title',
+                ],
+            ],
+        ]);
+
+        Languages::setCurrentLocale('dv');
+        $attributes = $article->toArray();
+        $this->assertEquals('Dhivehi Title', $attributes['title']);
+
+        Languages::setCurrentLocale('en');
+        $attributes = $article->toArray();
+        $this->assertEquals('English Title', $attributes['title']);
+    }
 }