Also translate fallback language for current model

1up-lab · Jan 16, 2020 · 3f7279a · 3f7279a
1 parent 8fef15a
commit 3f7279a
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/Model/Multilingual.php b/src/Model/Multilingual.php
@@ -46,6 +46,11 @@ public function getAlias($language, $aliasColumnName = 'alias')
     {
         // Do not load any translation if already target language
         $langColumn = static::getLangColumn();
+        $fallbackLang = static::getFallbackLanguage();
+
+        if ($language === $fallbackLang && $this->{$langColumn} === '') {
+            return $this->{$aliasColumnName};
+        }
 
         if ($language === $this->{$langColumn}) {
             return $this->{$aliasColumnName};
@@ -56,8 +61,6 @@ public function getAlias($language, $aliasColumnName = 'alias')
 
         if (null === $translatedModel) {
             // Get fallback
-            $fallbackLang = static::getFallbackLanguage();
-
             if ($language === $fallbackLang) {
                 return $this->{$aliasColumnName};
             }