Merge pull request #15084 from snipe/fixes_ldap_sync_locale

Fixes #15067 - updated ldap sync locale to use `app()->getLocale()`

Author: snipe

app/Console/Commands/LdapSync.php

@@ -251,6 +251,7 @@ public function handle()
                     // Creating a new user.
                     $user = new User;
                     $user->password = $user->noPassword();
+                    $user->locale = app()->getLocale();
                     $user->activated = 1; // newly created users can log in by default, unless AD's UAC is in use, or an active flag is set (below)
                     $item['createorupdate'] = 'created';
                 }

app/Http/Middleware/CheckLocale.php

@@ -45,7 +45,7 @@ public function handle($request, Closure $next, $guard = null)
 
         }
 
-        \App::setLocale(Helper::mapLegacyLocale($language));
+        app()->setLocale(Helper::mapLegacyLocale($language));
         return $next($request);
     }
 }

app/Models/Ldap.php

@@ -229,6 +229,7 @@ public static function parseAndMapLdapAttributes($ldapattributes)
         $item['department'] = $ldapattributes[$ldap_result_dept][0] ?? '';
         $item['manager'] = $ldapattributes[$ldap_result_manager][0] ?? '';
         $item['location'] = $ldapattributes[$ldap_result_location][0] ?? '';
+        $item['locale'] = app()->getLocale();
 
         return $item;
     }
@@ -239,7 +240,7 @@ public static function parseAndMapLdapAttributes($ldapattributes)
      * @author [A. Gianotto] [<[email protected]>]
      * @since [v3.0]
      * @param $ldapatttibutes
-     * @return array|bool
+     * @return User | bool
      */
     public static function createUserFromLdap($ldapatttibutes, $password)
     {
@@ -252,6 +253,7 @@ public static function createUserFromLdap($ldapatttibutes, $password)
             $user->last_name = $item['lastname'];
             $user->username = $item['username'];
             $user->email = $item['email'];
+            $user->locale = $item['locale'];
             $user->password = $user->noPassword();
 
             if (Setting::getSettings()->ldap_pw_sync == '1') {