Merge pull request #12 from latevaweb/develop

Develop
latevaweb · Apr 23, 2020 · e2a706e · e2a706e
2 parents 579b5b8 + d0cc774
commit e2a706e
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/Traits/Translatable.php b/src/Traits/Translatable.php
@@ -70,10 +70,10 @@ public function getTranslatableAttributes(): array
 
     public function getTranslation(string $field, string $locale, bool $useFallbackLocale = true): ?string
     {
-        $locale = $this->normalizeLocale($field, $locale, $useFallbackLocale);
-
         $translations = $this->getTranslations($field)->all();
 
+        $locale = $this->normalizeLocale(array_keys($translations), $field, $locale, $useFallbackLocale);
+
         $translation = $translations[$locale] ?? '';
 
         if ($this->hasGetMutator($field)) {
@@ -128,9 +128,9 @@ public function translations(): MorphToMany
             'translation_id');
     }
 
-    protected function normalizeLocale(string $field, string $locale, bool $useFallbackLocale): string
+    protected function normalizeLocale($locales, string $field, string $locale, bool $useFallbackLocale): string
     {
-        if (in_array($locale, $this->getTranslatedLocales($field)->all())) {
+        if (in_array($locale, $locales)) {
             return $locale;
         }
         if (! $useFallbackLocale) {