Fix hideDefaultLocale (#664)

A previous commit for caching broke
the functionality of `hideDefaultLocale`.

The purpose of `setLocale` is to return the
locale of the url (even if there is none).
This is necessary for ensuring that the
current requested route actually exists.
Therefore this behaviour was reestablished.

The same behaviour goes for the cached routes.
The file `bootstrap/cache/routes_**.php` imitates
the routes from `setLocale`. Therefore, `getCurrentLocale`
has to be dismissed. Also a nullable locale should
refere to `bootstrap/cache/routes.php` and not
an alternative.

Fixes #656
Fixes #661

Author: niels-numbers

src/Mcamara/LaravelLocalization/LaravelLocalization.php

@@ -170,11 +170,6 @@ public function setLocale($locale = null)
 
         if (!empty($this->supportedLocales[$locale])) {
             $this->currentLocale = $locale;
-
-            if ($locale === $this->defaultLocale && $this->hideDefaultLocaleInURL()) {
-                $locale = null;
-            }
-            
         } else {
             // if the first segment/locale passed is not valid
             // the system would ask which locale have to take

src/Mcamara/LaravelLocalization/Traits/LoadsTranslatedCachedRoutes.php

@@ -22,9 +22,9 @@ protected function loadCachedRoutes()
     {
         $localization = $this->getLaravelLocalization();
 
-        $localization->setLocale();
-
-        $locale = $localization->getCurrentLocale();
+        // compute $locale from url.
+        // It is null if url does not contain locale.
+        $locale = $localization->setLocale();
 
         $localeKeys = $localization->getSupportedLanguagesKeys();
 
@@ -58,11 +58,6 @@ protected function makeLocaleRoutesPath($locale, $localeKeys)
     {
         $path = $this->getDefaultCachedRoutePath();
 
-        // If we have no specifically forced locale, use default or let the request determine it.
-        if ($locale === null) {
-            $locale = $this->getLocaleFromRequest();
-        }
-
         if ( ! $locale || ! in_array($locale, $localeKeys)) {
             return $path;
         }