The app.fallback_locale setting can be overridden in each model sep…

…arately.

Fallback translation is not returned if it is not defined.

Translatable/Translatable.php

@@ -25,12 +25,16 @@ public function translateOrDefault($locale)
     public function getTranslation($locale = null, $withFallback = false)
     {
         $locale = $locale ?: App::getLocale();
+        $withFallback = isset($this->useTranslationFallback) ? $this->useTranslationFallback : $withFallback;
 
         if ($this->getTranslationByLocaleKey($locale))
         {
             $translation = $this->getTranslationByLocaleKey($locale);
         }
-        elseif ($withFallback && App::make('config')->has('app.fallback_locale'))
+        elseif ($withFallback
+            && App::make('config')->has('app.fallback_locale')
+            && $this->getTranslationByLocaleKey(App::make('config')->get('app.fallback_locale'))
+        )
         {
             $translation = $this->getTranslationByLocaleKey(App::make('config')->get('app.fallback_locale'));
         }

readme.md

@@ -172,7 +172,9 @@ Translatable is fully compatible with all kinds of Eloquent extensions, includin
 
 ### v. 4.3
 
-* Added option to override translation class suffix. See [#29](https://github.com/dimsav/laravel-translatable/pull/29)
+* The `Translation` class suffix default can be overridden in the app config. See [7ecc0a75d](https://github.com/dimsav/laravel-translatable/commit/7ecc0a75dfcec58ebf694e0a7feb686294b49847)
+* The `app.fallback_locale` setting can be overridden in each model separately. See [#33](https://github.com/dimsav/laravel-translatable/pull/33)
+* Fallback translation is not returned if it is not defined.
 
 ### v. 4.2
 

tests/TranslatableTest.php

@@ -218,4 +218,32 @@ public function it_returns_default_translation()
         $this->assertEquals($country->getTranslation('ch', false)->name, null);
     }
 
+    /**
+     * @test
+     */
+    public function models_fallback_option_overrides_fallback_option_in_config()
+    {
+        $country = Country::find(1);
+        $this->assertEquals($country->getTranslation('ch', true)->locale, 'de');
+
+        $country = Country::find(1);
+        $country->useTranslationFallback = false;
+        $this->assertEquals($country->getTranslation('ch', true)->locale, 'ch');
+
+        $country = Country::find(1);
+        $country->useTranslationFallback = true;
+        $this->assertEquals($country->getTranslation('ch', true)->locale, 'de');
+    }
+
+    /**
+     * @test
+     */
+    public function it_skips_fallback_if_fallback_is_not_defined()
+    {
+        App::make('config')->set('app.fallback_locale', 'ch');
+
+        $country = Country::find(1);
+        $this->assertEquals($country->getTranslation('pl', true)->locale, 'pl');
+    }
+
 }