Check if locale isn't null instead of if property exists.

koenhoeijmakers · Nov 19, 2018 · 44508fa · 44508fa
1 parent db559ab
commit 44508fa
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/HasTranslations.php b/src/HasTranslations.php
@@ -208,7 +208,8 @@ public function getTranslationValue(string $locale, string $name)
      */
     public function getLocaleKeyName(): string
     {
-        return property_exists($this, 'localeKeyName') ? $this->localeKeyName
+        return property_exists($this, 'localeKeyName') 
+            ? $this->localeKeyName
             : config('translatable.locale_key_name', 'locale');
     }
 
@@ -219,7 +220,9 @@ public function getLocaleKeyName(): string
      */
     public function getLocale(): string
     {
-        return property_exists($this, 'currentLocale') ? $this->currentLocale : app()->getLocale();
+        return null !== $this->currentLocale
+            ? $this->currentLocale 
+            : app()->getLocale();
     }
 
     /**