svc-admin01/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Correct way to append locale

Browse Source
This commit is contained in:
Godfrey M
2026-04-02 15:29:57 -07:00
parent cf7cb8069b
commit 6cc8ec63be
3 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Actions/CheckoutRequests/CreateCheckoutRequestAction.php
+1 -1
View File
@@ -44,7 +44,7 @@ class CreateCheckoutRequestAction
$asset->request();
$asset->increment('requests_counter', 1);
try {
$settings->notify(new RequestAssetNotification($data));
$settings->notify((new RequestAssetNotification($data))->locale($settings->locale));
} catch (\Exception $e) {
Log::warning($e);
}
app/Http/Controllers/ViewAssetsController.php
+2 -2
View File
@@ -205,7 +205,7 @@ class ViewAssetsController extends Controller
$logaction->logaction(ActionType::RequestCanceled);
if (($settings->alert_email != '') && ($settings->alerts_enabled == '1') && (! config('app.lock_passwords'))) {
$settings->notify(new RequestAssetCancelation($data));
$settings->notify((new RequestAssetNotification($data))->locale($settings->locale));
}
return redirect()->back()->with('success')->with('success', trans('admin/hardware/message.requests.canceled'));
@@ -213,7 +213,7 @@ class ViewAssetsController extends Controller
$item->request();
if (($settings->alert_email != '') && ($settings->alerts_enabled == '1') && (! config('app.lock_passwords'))) {
$logaction->logaction('requested');
$settings->notify(new RequestAssetNotification($data));
$settings->notify((new RequestAssetNotification($data))->locale($settings->locale));
}
return redirect()->route('requestable-assets')->with('success')->with('success', trans('admin/hardware/message.requests.success'));
app/Notifications/RequestAssetNotification.php
-4
View File
@@ -102,8 +102,6 @@ class RequestAssetNotification extends Notification
if (($this->item->model) && ($this->item->model->fieldset)) {
$fields = $this->item->model->fieldset->fields;
}
$originalLocale = app()->getLocale();
app()->setLocale($this->settings->locale);
$message = (new MailMessage)->markdown('notifications.markdown.asset-requested',
[
@@ -123,8 +121,6 @@ class RequestAssetNotification extends Notification
'X-System-Sender', 'Snipe-IT'
);
});
app()->setLocale($originalLocale);
return $message;
}