Change default locale to be fallback_locale

despark · Mar 21, 2017 · 60212a9 · 60212a9
1 parent 5e794fa
commit 60212a9
Showing 1 changed file with 13 additions and 17 deletions.
diff --git a/src/Traits/HasTranslation.php b/src/Traits/HasTranslation.php
@@ -1,9 +1,7 @@
 <?php
 
-
 namespace Despark\LaravelDbLocalization\Traits;
 
-
 use Despark\LaravelDbLocalization\Models\TranslationModel;
 use Despark\LaravelDbLocalization\Observers\ModelObserver;
 
@@ -33,7 +31,7 @@ trait HasTranslation
     protected $activeLocale;
 
     /**
-     * Bootstrap the trait
+     * Bootstrap the trait.
      */
     public static function bootHasTranslation()
     {
@@ -51,8 +49,9 @@ public function translation()
     /**
      * Create a new instance of the given model.
      *
-     * @param  array $attributes
-     * @param  bool  $exists
+     * @param array $attributes
+     * @param bool  $exists
+     *
      * @return static
      */
     public function newInstance($attributes = [], $exists = false)
@@ -67,14 +66,14 @@ public function newInstance($attributes = [], $exists = false)
      * Create a new model instance for a related model.
      * We overwrite this so we can dynamically create the table on the related model.
      *
-     * @param  string $class
+     * @param string $class
+     *
      * @return mixed
      */
     protected function newRelatedInstance($class)
     {
-
         if (is_a($class, TranslationModel::class, true)) {
-            return tap(new $class, function ($instance) {
+            return tap(new $class(), function ($instance) {
                 $instance->setTable($this->getTranslationTable());
 
                 if (! $instance->getConnectionName()) {
@@ -83,7 +82,7 @@ protected function newRelatedInstance($class)
             });
         }
 
-        return tap(new $class, function ($instance) {
+        return tap(new $class(), function ($instance) {
             if (! $instance->getConnectionName()) {
                 $instance->setConnection($this->connection);
             }
@@ -92,7 +91,6 @@ protected function newRelatedInstance($class)
 
     /**
      * @param string $key
-     * @return null
      */
     public function getAttribute($key)
     {
@@ -118,10 +116,10 @@ public function setTranslation($key, $locale, $value)
         $this->translatedAttributes[$locale][$key] = $value;
     }
 
-
     /**
      * @param $key
      * @param $locale
+     *
      * @return string|null
      */
     public function getTranslation($key, $locale = null)
@@ -163,6 +161,7 @@ public function unsetTranslation($locale, $key = null)
     /**
      * @param $key
      * @param $value
+     *
      * @return $this
      */
     public function setAttribute($key, $value)
@@ -176,7 +175,6 @@ public function setAttribute($key, $value)
         return parent::setAttribute($key, $value);
     }
 
-
     /**
      * Load transaltions from database.
      */
@@ -218,7 +216,7 @@ public function getAvailableLocales()
      */
     public function getDefaultLocale()
     {
-        return config('app.locale');
+        return config('app.fallback_locale');
     }
 
     /**
@@ -271,16 +269,14 @@ public function getTranslationModel()
 
     /**
      * @param $key
+     *
      * @return bool
      */
     public function isTranslatable($key)
     {
         return in_array($key, $this->translatable);
     }
 
-    /**
-     *
-     */
     public function refreshTranslations()
     {
         $this->translatedAttributes = [];
@@ -295,4 +291,4 @@ public function getTranslatable()
     {
         return $this->translatable;
     }
-}
+}