Merge pull request #508 from ahmed-aliraqi/master

Allow to change default translation model namespace from config file

Author: Gummibeer

src/Translatable/Translatable.php

@@ -111,7 +111,21 @@ public function getTranslationModelName()
      */
     public function getTranslationModelNameDefault()
     {
-        return get_class($this).config('translatable.translation_suffix', 'Translation');
+        $modelName = get_class($this);
+
+        if ($namespace = $this->getTranslationModelNamespace()) {
+            $modelName = $namespace.'\\'.class_basename(get_class($this));
+        }
+
+        return $modelName.config('translatable.translation_suffix', 'Translation');
+    }
+
+    /**
+     * @return string|null
+     */
+    public function getTranslationModelNamespace()
+    {
+        return config('translatable.translation_model_namespace');
     }
 
     /**

src/config/translatable.php

@@ -82,6 +82,18 @@
     */
     'fallback_locale' => 'en',
 
+    /*
+    |--------------------------------------------------------------------------
+    | Translation Model Namespace
+    |--------------------------------------------------------------------------
+    |
+    | Defines the default 'Translation' class namespace. For example, if
+    | you want to use App\Translations\CountryTranslation instead of App\CountryTranslation
+    | set this to 'App\Translations'.
+    |
+    */
+    'translation_model_namespace' => null,
+
     /*
     |--------------------------------------------------------------------------
     | Translation Suffix

tests/TranslatableTest.php

@@ -16,6 +16,15 @@ public function test_it_finds_the_default_translation_class()
             $country->getTranslationModelNameDefault());
     }
 
+    public function test_it_finds_the_translation_class_with_namespace_set()
+    {
+        $this->app->make('config')->set('translatable.translation_model_namespace', 'App\Models\Translations');
+        $country = new Country();
+        $this->assertEquals(
+            'App\Models\Translations\CountryTranslation',
+            $country->getTranslationModelNameDefault());
+    }
+
     public function test_it_finds_the_translation_class_with_suffix_set()
     {
         App::make('config')->set('translatable.translation_suffix', 'Trans');