Added configuration option for returning fallback translations

composer.json

@@ -15,7 +15,7 @@
         "illuminate/support": "~5.0"
     },
     "require-dev": {
-        "orchestra/testbench": "3.0.*@dev",
+        "orchestra/testbench": "~3.0",
         "phpunit/phpunit": "~4.0"
     },
     "autoload": {

src/Translatable/Translatable.php

@@ -216,9 +216,16 @@ private function getFallbackLocale()
         return App::make('config')->get('translatable.fallback_locale');
     }
 
+    /**
+     * @return bool|null
+     */
     private function useFallback()
     {
-        return isset($this->useTranslationFallback) ? $this->useTranslationFallback : false;
+        if (isset($this->useTranslationFallback) and $this->useTranslationFallback !== null)
+        {
+            return $this->useTranslationFallback;
+        }
+        return App::make('config')->get('translatable.use_fallback');
     }
 
     protected function isTranslationAttribute($key)

src/config/translatable.php

@@ -12,6 +12,18 @@
     */
     'locales' => ['en', 'es'],
 
+    /*
+    |--------------------------------------------------------------------------
+    | Use fallback
+    |--------------------------------------------------------------------------
+    |
+    | Determine if fallback locales are returned by default or not. To add
+    | more flexibility and configure this option per "translatable"
+    | instance, this value will be overridden by the property
+    | $useTranslationFallback when defined
+    */
+    'use_fallback' => false,
+
     /*
     |--------------------------------------------------------------------------
     | Fallback Locale

tests/TranslatableTest.php

@@ -239,6 +239,30 @@ public function fallback_option_in_config_overrides_models_fallback_option()
         $this->assertSame($country->getTranslation('ch'), null);
     }
 
+    /**
+     * @test
+     */
+    public function configuration_defines_if_fallback_is_used()
+    {
+        App::make('config')->set('translatable.fallback_locale', 'de');
+        App::make('config')->set('translatable.use_fallback', true);
+
+        $country = Country::find(1);
+        $this->assertEquals($country->getTranslation('ch')->locale, 'de');
+    }
+
+    /**
+     * @test
+     */
+    public function useTranslationFallback_overrides_configuration()
+    {
+        App::make('config')->set('translatable.fallback_locale', 'de');
+        App::make('config')->set('translatable.use_fallback', true);
+        $country = Country::find(1);
+        $country->useTranslationFallback = false;
+        $this->assertSame($country->getTranslation('ch'), null);
+    }
+
     /**
      * @test
      */

versions.md

@@ -3,6 +3,7 @@
 ### v. 5
 
  * Laravel 5 ready
+ * Added configuration option for returning fallback translations
 
 ### v. 4.5