always fill "translations" relations (skip translation)

src/Translatable/Translatable.php

@@ -378,6 +378,11 @@ protected function saveTranslations(): bool
             }
         }
 
+        // Fresh "translation" relation if loaded
+        if ($saved && $this->relationLoaded('translation')) {
+            $this->load('translation');
+        }
+
         return $saved;
     }
 
@@ -428,6 +433,8 @@ protected function getTranslationByLocaleKey(string $key): ?Model
             $this->relationLoaded('translation')
             && $this->translation
             && $this->translation->getAttribute($this->getLocaleKey()) == $key
+            // skip when called from fill method
+            && (debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS)[3]['function'] ?? null) !== 'fill'
         ) {
             return $this->translation;
         }

tests/Eloquent/CountryWithEarlyLoad.php

@@ -0,0 +1,48 @@
+<?php
+
+namespace Astrotomic\Translatable\Tests\Eloquent;
+
+use Astrotomic\Translatable\Contracts\Translatable as TranslatableContract;
+use Astrotomic\Translatable\Translatable;
+use Illuminate\Database\Eloquent\Model as Eloquent;
+
+class CountryWithEarlyLoad extends Eloquent implements TranslatableContract
+{
+    use Translatable;
+
+    protected $table = 'countries';
+
+    /**
+     * Array with the fields translated in the Translation table.
+     *
+     * @var array
+     */
+    public $translatedAttributes = ['name'];
+
+    protected $translationForeignKey = 'country_id';
+
+    /**
+     * Set $translationModel if you want to overwrite the convention
+     * for the name of the translation Model. Use full namespace if applied.
+     *
+     * The convention is to add "Translation" to the name of the class extending Translatable.
+     * Example: Country => CountryTranslation
+     */
+    public $translationModel = CountryTranslation::class;
+
+    /**
+     * Add your translated attributes here if you want
+     * fill them with mass assignment.
+     *
+     * @var array
+     */
+    public $fillable = [];
+    public $guarded = [];
+
+    /**
+     * The relations to eager load on every query.
+     *
+     * @var array
+     */
+    protected $with = ['translation'];
+}

tests/TranslatableTest.php

@@ -6,6 +6,7 @@
 use Astrotomic\Translatable\Tests\Eloquent\Country;
 use Astrotomic\Translatable\Tests\Eloquent\CountryStrict;
 use Astrotomic\Translatable\Tests\Eloquent\CountryTranslation;
+use Astrotomic\Translatable\Tests\Eloquent\CountryWithEarlyLoad;
 use Astrotomic\Translatable\Tests\Eloquent\Person;
 use Astrotomic\Translatable\Tests\Eloquent\Vegetable;
 use Astrotomic\Translatable\Tests\Eloquent\VegetableTranslation;
@@ -957,6 +958,80 @@ public function it_uses_translation_relation_if_locale_matches(): void
         static::assertFalse($country->relationLoaded('translations'));
     }
 
+    /** @test */
+    public function it_update_all_translated_locales_when_translation_relation_is_loaded(): void
+    {
+        $this->app->make('config')->set('translatable.locales', ['de', 'en']);
+        $this->app->setLocale('de');
+        $this->app->make(Locales::class)->load();
+
+        // First create country
+        CountryWithEarlyLoad::create([
+            'id' => 100,
+            'code' => 'my',
+            'de' => [
+                'name' => 'Deutschland',
+            ],
+            'en' => [
+                'name' => 'Germany',
+            ],
+        ]);
+
+        $country = CountryWithEarlyLoad::find(100);
+
+        // try mass update
+        $country->update([
+            'code' => 'my',
+            'de' => [
+                'name' => 'New Deutschland',
+            ],
+            'en' => [
+                'name' => 'New Germany',
+            ],
+        ]);
+
+        $country = CountryWithEarlyLoad::find(100);
+
+        static::assertEquals(100, $country->getKey());
+        static::assertEquals('New Deutschland', $country->getTranslation('de', false)->name);
+        static::assertEquals('New Germany', $country->getTranslation('en', false)->name);
+    }
+
+    /** @test */
+    public function it_fresh_translation_relation_after_successful_save_translations()
+    {
+        $this->app->make('config')->set('translatable.locales', ['de', 'en']);
+        $this->app->setLocale('de');
+        $this->app->make(Locales::class)->load();
+
+        // First create country
+        CountryWithEarlyLoad::create([
+            'id' => 100,
+            'code' => 'my',
+            'de' => [
+                'name' => 'Deutschland',
+            ],
+            'en' => [
+                'name' => 'Germany',
+            ],
+        ]);
+
+        $country = CountryWithEarlyLoad::find(100);
+
+        // try mass update
+        $country->update([
+            'code' => 'my',
+            'de' => [
+                'name' => 'New Deutschland',
+            ],
+            'en' => [
+                'name' => 'New Germany',
+            ],
+        ]);
+
+        static::assertEquals('New Deutschland', $country->translation->name);
+    }
+
     /** @test */
     public function it_uses_translations_relation_if_locale_does_not_match(): void
     {