Merge remote-tracking branch 'remotes/origin/issue-309'

# Conflicts:
#	src/Translatable/Translatable.php

Author: Gummibeer

src/Translatable/Contracts/Translatable.php

@@ -4,6 +4,7 @@
 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Eloquent\Relations\HasOne;
 
 interface Translatable
 {
@@ -13,8 +14,6 @@ public static function disableAutoloadTranslations(): void;
 
     public static function enableAutoloadTranslations(): void;
 
-    public function translations(): HasMany;
-
     public function deleteTranslations($locales = null): void;
 
     public function getDefaultLocale(): ?string;
@@ -40,4 +39,8 @@ public function translate(?string $locale = null, bool $withFallback = false): ?
     public function translateOrDefault(?string $locale = null): ?Model;
 
     public function translateOrNew(?string $locale = null): Model;
+
+    public function translation(): HasOne;
+
+    public function translations(): HasMany;
 }

src/Translatable/Traits/Relationship.php

@@ -3,6 +3,7 @@
 namespace Astrotomic\Translatable\Traits;
 
 use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Eloquent\Relations\HasOne;
 
 /**
  * @property-read string $translationModel
@@ -60,6 +61,19 @@ public function getTranslationRelationKey(): string
         return $this->getForeignKey();
     }
 
+    public function translation(): HasOne
+    {
+        if ($this->useFallback() && ! $this->translations()->where('locale', $this->locale())->exists()) {
+            return $this
+                ->hasOne($this->getTranslationModelName(), $this->getTranslationRelationKey())
+                ->where('locale', $this->getFallbackLocale());
+        }
+
+        return $this
+            ->hasOne($this->getTranslationModelName(), $this->getTranslationRelationKey())
+            ->where('locale', $this->locale());
+    }
+
     public function translations(): HasMany
     {
         return $this->hasMany($this->getTranslationModelName(), $this->getTranslationRelationKey());

tests/TranslatableTest.php

@@ -4,6 +4,7 @@
 use Astrotomic\Translatable\Test\Model\Person;
 use Astrotomic\Translatable\Test\Model\Country;
 use Astrotomic\Translatable\Test\Model\CountryStrict;
+use Astrotomic\Translatable\Test\Model\CountryTranslation;
 use Astrotomic\Translatable\Test\Model\CountryWithCustomLocaleKey;
 use Astrotomic\Translatable\Test\Model\CountryWithCustomTranslationModel;
 
@@ -785,4 +786,36 @@ protected function isEmptyTranslatableAttribute(string $key, $value): bool
         $this->app->setLocale('fr');
         $this->assertSame('1', $city->name);
     }
+
+    public function test_translation_relation()
+    {
+        $this->app->make('config')->set('translatable.fallback_locale', 'fr');
+        $this->app->make('config')->set('translatable.use_fallback', true);
+        $this->app->setLocale('en');
+
+        $translation = Country::find(1)->translation;
+        $this->assertInstanceOf(CountryTranslation::class, $translation);
+        $this->assertEquals('en', $translation->locale);
+    }
+
+    public function test_translation_relation_fallback()
+    {
+        $this->app->make('config')->set('translatable.fallback_locale', 'fr');
+        $this->app->make('config')->set('translatable.use_fallback', true);
+        $this->app->setLocale('xyz');
+
+        $translation = Country::find(1)->translation;
+        $this->assertInstanceOf(CountryTranslation::class, $translation);
+        $this->assertEquals('fr', $translation->locale);
+    }
+
+    public function test_translation_relation_not_found()
+    {
+        $this->app->make('config')->set('translatable.fallback_locale', 'xyz');
+        $this->app->make('config')->set('translatable.use_fallback', true);
+        $this->app->setLocale('xyz');
+
+        $translation = Country::find(1)->translation;
+        $this->assertNull($translation);
+    }
 }