diff --git a/app/Console/Commands/LdapSync.php b/app/Console/Commands/LdapSync.php index 1856bf10f..845db27ef 100755 --- a/app/Console/Commands/LdapSync.php +++ b/app/Console/Commands/LdapSync.php @@ -251,6 +251,7 @@ class LdapSync extends Command // 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'; } diff --git a/app/Http/Middleware/CheckLocale.php b/app/Http/Middleware/CheckLocale.php index 412a423f2..68a9c48c3 100644 --- a/app/Http/Middleware/CheckLocale.php +++ b/app/Http/Middleware/CheckLocale.php @@ -45,7 +45,7 @@ class CheckLocale } - \App::setLocale(Helper::mapLegacyLocale($language)); + app()->setLocale(Helper::mapLegacyLocale($language)); return $next($request); } } diff --git a/app/Models/Ldap.php b/app/Models/Ldap.php index dd3920b56..ecce46d82 100644 --- a/app/Models/Ldap.php +++ b/app/Models/Ldap.php @@ -229,6 +229,7 @@ class Ldap extends Model $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 @@ class Ldap extends Model * @author [A. Gianotto] [] * @since [v3.0] * @param $ldapatttibutes - * @return array|bool + * @return User | bool */ public static function createUserFromLdap($ldapatttibutes, $password) { @@ -252,6 +253,7 @@ class Ldap extends Model $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') {