Merge pull request #50 from openclassify/translate-hot-fix

Muammer Topçu · web-flow · commit d8d1d09da30d · 2023-11-06T14:12:39.000+03:00
lang check fix
diff --git a/src/Model/Traits/Translatable.php b/src/Model/Traits/Translatable.php
@@ -140,11 +140,9 @@ public function translateOrNew($locale)
      */
     public function checkTranslation($translation)
     {
-        if (!empty($translation->getAttribute('name')) || !empty($translation->getAttribute('title'))) {
+        if ($translation || (!empty($translation->name) || !empty($translation->title))) {
             return true;
         }
-
-        return false;
     }
 
     /**
@@ -179,8 +177,8 @@ public function translations()
     /**
      * Get a translation.
      *
-     * @param  null $locale
-     * @param  bool|null $withFallback
+     * @param null $locale
+     * @param bool|null $withFallback
      * @return EloquentModel|null
      */
     public function getTranslation($locale = null, $withFallback = true)
@@ -452,9 +450,9 @@ public function getLocaleKey()
     /**
      * Return if the entry is trashed or not.
      *
+     * @return bool
      * @todo is this really used/needed?
      *
-     * @return bool
      */
     public function trashed()
     {

Original file line number	Diff line number	Diff line change
`@@ -140,11 +140,9 @@ public function translateOrNew($locale)`
`140`	`140`	`*/`
`141`	`141`	`public function checkTranslation($translation)`
`142`	`142`	`{`
`143`		`- if (!empty($translation->getAttribute('name')) \|\| !empty($translation->getAttribute('title'))) {`
	`143`	`+ if ($translation \|\| (!empty($translation->name) \|\| !empty($translation->title))) {`
`144`	`144`	`return true;`
`145`	`145`	`}`
`146`		`-`
`147`		`- return false;`
`148`	`146`	`}`
`149`	`147`
`150`	`148`	`/**`
`@@ -179,8 +177,8 @@ public function translations()`
`179`	`177`	`/**`
`180`	`178`	`* Get a translation.`
`181`	`179`	`*`
`182`		`- * @param null $locale`
`183`		`- * @param bool\|null $withFallback`
	`180`	`+ * @param null $locale`
	`181`	`+ * @param bool\|null $withFallback`
`184`	`182`	`* @return EloquentModel\|null`
`185`	`183`	`*/`
`186`	`184`	`public function getTranslation($locale = null, $withFallback = true)`
`@@ -452,9 +450,9 @@ public function getLocaleKey()`
`452`	`450`	`/**`
`453`	`451`	`* Return if the entry is trashed or not.`
`454`	`452`	`*`
	`453`	`+ * @return bool`
`455`	`454`	`* @todo is this really used/needed?`
`456`	`455`	`*`
`457`		`- * @return bool`
`458`	`456`	`*/`
`459`	`457`	`public function trashed()`
`460`	`458`	`{`