DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-25 21:54:14 -08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Updated language

Browse source 
Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
snipe 2023-03-17 16:50:02 -07:00
parent 820ae09a6f
commit e47fc9527b
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/Listeners/LogListener.php
View file

@ -108,7 +108,7 @@ class LogListener
$logaction->target_id = $event->merged_to->id;
$logaction->target_type = User::class;
$logaction->action_type = 'merged';
$logaction->note = trans('general.merged_users_log_merged_into', $to_from_array);
$logaction->note = trans('general.merged_log_this_user_from', $to_from_array);
$logaction->user_id = $event->admin->id;
$logaction->save();
@ -119,7 +119,7 @@ class LogListener
$logaction->item_id = $event->merged_to->id;
$logaction->item_type = User::class;
$logaction->action_type = 'merged';
$logaction->note = trans('general.merged_users_log_merged_from', $to_from_array);
$logaction->note = trans('general.merged_log_this_user_into', $to_from_array);
$logaction->user_id = $event->merged_to->admin_id;
$logaction->save();

4
resources/lang/en/general.php
View file

@ -415,8 +415,8 @@ return [
'not_enough_users_selected' => 'At least :count users must be selected',
'merge_success' => ':count users merged successfully into :into_username!',
'merged' => 'merged',
'merged_users_log_merged_from' => 'Merged this user (ID :to_id - :to_username) into user ID :from_id (:from_username) ',
'merged_users_log_merged_into' => 'Merged user ID :from_id (:from_username) into this user (ID :to_id - :to_username)',
'merged_log_this_user_into' => 'Merged this user (ID :to_id - :to_username) into user ID :from_id (:from_username) ',
'merged_log_this_user_from' => 'Merged user ID :from_id (:from_username) into this user (ID :to_id - :to_username)',
];