[6.x] Revert "Fix translator locale" (#14358)

Author: jasonvarga

src/Http/Middleware/Localize.php

@@ -17,16 +17,21 @@ public function handle($request, Closure $next)
     {
         $site = Site::current();
 
-        // Dates, Carbon, etc expect the full locale. (eg. "fr_FR" or whatever is
+        // PHP date-formatting functions expect the full locale. (eg. "fr_FR" or whatever is
         // installed on your actual server. You can check by running `locale -a`).
         // We'll save the original locale so we can reset it later. Of course,
         // you can get the locale by calling the setlocale method. Logical.
         $originalLocale = setlocale(LC_TIME, 0);
         setlocale(LC_TIME, $site->locale());
 
-        // Use the site's lang for translations.
-        $originalTranslatorLocale = app('translator')->getLocale();
-        app('translator')->setLocale($site->lang());
+        // The sites lang is used for your translations.
+        // e.g. If you set your lang to "fr" it'll look for "fr" translations.
+        // If not explicitly set, a site's lang will fall back to the "short locale"
+        // e.g. If your site's locale is "fr_FR", the lang would be "fr".
+        // Note that Carbon does also use this for some things.
+        // Again, we'll save the original locale so we can reset it later.
+        $originalAppLocale = app()->getLocale();
+        app()->setLocale($site->lang());
 
         // Get original Carbon format so it can be restored later.
         $originalToStringFormat = $this->getToStringFormat();
@@ -43,7 +48,7 @@ public function handle($request, Closure $next)
         // Reset everything back to their originals. This allows everything
         // not within the scope of the request to be the "defaults".
         setlocale(LC_TIME, $originalLocale);
-        app('translator')->setLocale($originalTranslatorLocale);
+        app()->setLocale($originalAppLocale);
         Date::setToStringFormat($originalToStringFormat);
 
         return $response;

tests/FrontendTest.php

@@ -739,8 +739,6 @@ public function it_sets_the_carbon_to_string_format()
     #[Test]
     public function it_sets_the_locale()
     {
-        // Frontend localization sets PHP LC_TIME and the translator locale for the site;
-        // Laravel's configured app locale (app()->getLocale()) is left unchanged.
         // You can only set the locale to one that is actually installed on the server.
         // The names are a little different across jobs in the GitHub actions matrix.
         // We'll test against whichever was successfully applied. Finally, we will
@@ -768,16 +766,16 @@ public function index()
 
         (new class extends Tags
         {
-            public static $handle = 'translator_locale';
+            public static $handle = 'laravel_locale';
 
             public function index()
             {
-                return app('translator')->getLocale();
+                return app()->getLocale();
             }
         })->register();
 
         $this->viewShouldReturnRaw('layout', '{{ template_content }}');
-        $this->viewShouldReturnRaw('some_template', 'PHP Locale: {{ php_locale }} Translator Locale: {{ translator_locale }}');
+        $this->viewShouldReturnRaw('some_template', 'PHP Locale: {{ php_locale }} App Locale: {{ laravel_locale }}');
 
         $this->makeCollection()->sites(['english', 'french'])->save();
         tap($this->makePage('about', ['with' => ['template' => 'some_template']])->locale('english'))->save();
@@ -788,7 +786,7 @@ public function index()
 
         $this->get('/fr/le-about')->assertSeeInOrder([
             'PHP Locale: '.$frLocale,
-            'Translator Locale: fr',
+            'App Locale: fr',
         ]);
 
         $this->assertEquals('en', app()->getLocale());