bug fix for translation update

grinry · Apr 29, 2016 · 1cc9a39 · 1cc9a39
1 parent daf15f0
commit 1cc9a39
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/Eloquent/Traits/Translatable.php b/Eloquent/Traits/Translatable.php
@@ -48,9 +48,7 @@ protected static function bootTranslatable()
             //Check if string was json or translation key
             foreach ((array) with(new self)->translatable as $item) {
                 if ($model->{$item}) {
-                    $updated_locales = array_filter($model->{$item}, function($var) {
-                        return strlen(strip_tags(trim($var))) != 0;
-                    });
+                    $updated_locales = $model->{$item};
 
                     $original = $model->getOriginal($item);
                     $original_locales = json_decode($original, true);
@@ -96,6 +94,17 @@ protected static function bootTranslatable()
 
     }
 
+//    public function __get($key)
+//    {
+//        if (in_array($key, (array) $this->translatable)) {
+//            if (array_key_exists($key, $this->attributes) || $this->hasGetMutator($key)) {
+//                return new Translate($this->getAttributeValue($key), static::class);
+//            }
+//        }
+//        // TODO: Implement __get() method.
+//        return parent::__get($key);
+//    }
+
     /**
      * @param array $attributes
      * @param null $connection

diff --git a/Eloquent/Translate.php b/Eloquent/Translate.php
@@ -26,7 +26,7 @@ class Translate {
      */
     public function __construct($string = '', $domain = '')
     {
-        $decode = json_decode($string, true);
+        $decode = is_string($string) ? json_decode($string, true) : $string;
         $this->translations = $decode ? $decode : [
             config('app.fallback_locale') => $string
         ];