Set the app locale to the sites lang (#4715)

statamic · Nov 12, 2021 · be11b59 · be11b59 · ebeauchamps · Nov 15, 2021
1 parent c322825
commit be11b59
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/Http/Middleware/Localize.php b/src/Http/Middleware/Localize.php
@@ -17,9 +17,10 @@ public function handle($request, Closure $next)
         // installed on your actual server. You can check by running `locale -a`).
         setlocale(LC_TIME, $site->locale());
 
-        // The short locale is used for your translations. (eg. if you set your site's locale
-        // to "fr_FR", the translator will look for "fr" files rather than "fr_FR" files.)
-        app()->setLocale($site->shortLocale());
+        // The sites lang is used for your translations. (eg. if you set your site's lang
+        // to "fr_FR", the translator will look for "fr_FR" files rather than "fr" files
+        // but if not set the translator will look for "fr" files rather than "fr_FR" files.)
+        app()->setLocale($site->lang());
 
         Carbon::setToStringFormat(Statamic::dateFormat());