Update Translate.php

grinry · web-flow · commit 9af543b6a919 · 2017-02-15T12:59:46.000+02:00
diff --git a/Eloquent/Translate.php b/Eloquent/Translate.php
@@ -25,9 +25,9 @@ class Translate implements JsonSerializable {
      */
     public function __construct($string = '', $domain = '')
     {
-        $decode = is_string($string) ? json_decode($string, true) : $string;
+        $decode = is_string($string) ? json_decode($string, true)  : $string;
         $this->translations = $decode ? $decode : [
-            config('app.fallback_locale') => $string
+            config('app.fallback_locale') => $string != '{}' ? $string : null
         ];
         $this->locale = Translator::getLocale();
     }

Original file line number	Diff line number	Diff line change
`@@ -25,9 +25,9 @@ class Translate implements JsonSerializable {`
`25`	`25`	`*/`
`26`	`26`	`public function __construct($string = '', $domain = '')`
`27`	`27`	`{`
`28`		`- $decode = is_string($string) ? json_decode($string, true) : $string;`
	`28`	`+ $decode = is_string($string) ? json_decode($string, true) : $string;`
`29`	`29`	`$this->translations = $decode ? $decode : [`
`30`		`- config('app.fallback_locale') => $string`
	`30`	`+ config('app.fallback_locale') => $string != '{}' ? $string : null`
`31`	`31`	`];`
`32`	`32`	`$this->locale = Translator::getLocale();`
`33`	`33`	`}`