Refactoring

.circleci/config.yml

@@ -11,7 +11,7 @@ defaults: &defaults
         command: 'dockerize -wait tcp://localhost:3306 -timeout 1m'
     - run:
         name: 'Install MySQL-Client'
-        command: 'sudo apt-get update && sudo apt-get install -y mysql-client'
+        command: 'sudo apt-get update && sudo apt-get install -y mariadb-client'
 
     - run:
         name: 'MySQL Database'

src/Translatable/Traits/Relationship.php

@@ -63,15 +63,16 @@ public function getTranslationRelationKey(): string
 
     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());
+            ->where('locale', $this->localeOrFallback());
+    }
+
+    private function localeOrFallback()
+    {
+        return $this->useFallback() && ! $this->translations()->where('locale', $this->locale())->exists()
+            ? $this->getFallbackLocale()
+            : $this->locale();
     }
 
     public function translations(): HasMany