mirror/snipe-it
3
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2026-02-06 14:55:49 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' into snipeit_v7_laravel10

Browse Source
This commit is contained in:
Brady Wetherington
2024-01-08 18:57:55 +00:00
parent d29b3633d1 4f8defb67d
commit f734e196e5
5316 changed files with 117843 additions and 109663 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/SettingsController.php
View File

@ -186,7 +186,7 @@ class SettingsController extends Controller
$settings->alerts_enabled = 1;
$settings->pwd_secure_min = 10;
$settings->brand = 1;
$settings->locale = $request->input('locale', 'en');
$settings->locale = $request->input('locale', 'en-US');
$settings->default_currency = $request->input('default_currency', 'USD');
$settings->user_id = 1;
$settings->email_domain = $request->input('email_domain');
@ -586,7 +586,7 @@ class SettingsController extends Controller
}
if (! config('app.lock_passwords')) {
$setting->locale = $request->input('locale', 'en');
$setting->locale = $request->input('locale', 'en-US');
}
$setting->default_currency = $request->input('default_currency', '$');
$setting->date_display_format = $request->input('date_display_format');