Skip to content

Translate error messages for end user #601

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Jan 24, 2025
Merged

Translate error messages for end user #601

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
07a92af
Translate error messages for end user
eduardomozart Jan 22, 2025
6d9f113
Translate error messages from DB on client side
eduardomozart Jan 22, 2025
0584d24
Revert "Translate error messages from DB on client side"
eduardomozart Jan 22, 2025
3104a64
Translate error messages from DB on client side
eduardomozart Jan 22, 2025
0c77894
Update task.class.php
eduardomozart Jan 23, 2025
1f268cb
Remove whitespace
eduardomozart Jan 23, 2025
70a6a5f
Fix Clean CronTask test
eduardomozart Jan 24, 2025
e90c776
Revert: Fix CronTask Test
eduardomozart Jan 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 21 additions & 21 deletions inc/task.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,25 +464,25 @@ public function getTaskjobstatesForAgent($agent_id, $methods = [], $options = []
$result['run']['state'] == PluginGlpiinventoryTaskjobstate::SERVER_HAS_SENT_DATA
or $result['run']['state'] == PluginGlpiinventoryTaskjobstate::AGENT_HAS_SENT_DATA
) {
$msg = "The agent is requesting a configuration that has already been sent to him by the server. It is more likely that the agent is subject to a critical error.";
$translatable_msg = __("The agent is requesting a configuration that has already been sent to him by the server. It is more likely that the agent is subject to a critical error.", 'glpiinventory');

$jobstates_to_cancel[$jobstate->fields['id']] = [
'jobstate' => $jobstate,
'reason' => __(
"The agent is requesting a configuration that has already been sent to him by the server. It is more likely that the agent is subject to a critical error.",
'glpiinventory'
),
'code' => $jobstate::IN_ERROR
'reason' => $msg,
'code' => $jobstate::IN_ERROR
];
continue;
}

// Cancel the jobstate if the related tasks has been deactivated
if ($result['task']['is_active'] == 0) {
$msg = "The task has been deactivated after preparation of this job.";
$translatable_msg = __("The task has been deactivated after preparation of this job.", 'glpiinventory');

$jobstates_to_cancel[$jobstate->fields['id']] = [
'jobstate' => $jobstate,
'reason' => __(
'The task has been deactivated after preparation of this job.',
'glpiinventory'
)
'reason' => $msg
];
continue;
};
Expand All @@ -498,12 +498,12 @@ public function getTaskjobstatesForAgent($agent_id, $methods = [], $options = []
}

if (!($schedule_start <= $now and $now <= $schedule_end)) {
$msg = "This job can not be executed anymore due to the task's schedule.";
$translatable_msg = __("This job can not be executed anymore due to the task's schedule.", 'glpiinventory');

$jobstates_to_cancel[$jobstate->fields['id']] = [
'jobstate' => $jobstate,
'reason' => __(
"This job can not be executed anymore due to the task's schedule.",
'glpiinventory'
)
'reason' => $msg
];
continue;
}
Expand Down Expand Up @@ -545,12 +545,12 @@ public function getTaskjobstatesForAgent($agent_id, $methods = [], $options = []

// If no timeslot matched, cancel this jobstate.
if (!$timeslot_matched) {
$msg = "This job can not be executed anymore due to the task's timeslot.";
$translatable_msg = __("This job can not be executed anymore due to the task's timeslot.", 'glpiinventory');

$jobstates_to_cancel[$jobstate->fields['id']] = [
'jobstate' => $jobstate,
'reason' => __(
"This job can not be executed anymore due to the task's timeslot.",
'glpiinventory'
)
'reason' => $msg
];
continue;
}
Expand All @@ -564,12 +564,12 @@ public function getTaskjobstatesForAgent($agent_id, $methods = [], $options = []

//$job_actors = importArrayFromDB($result['job']['actors']);
if (!in_array($agent_id, $agents)) {
$msg = "This agent does not belong anymore in the actors defined in the job.";
$translatable_msg = __("This agent does not belong anymore in the actors defined in the job.", 'glpiinventory');

$jobstates_to_cancel[$jobstate->fields['id']] = [
'jobstate' => $jobstate,
'reason' => __(
'This agent does not belong anymore in the actors defined in the job.',
'glpiinventory'
)
'reason' => $msg
];
continue;
}
Expand Down
2 changes: 1 addition & 1 deletion js/taskjobs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,7 +423,7 @@ function agents_chart(chart_id) {
"<tr class='run log'>" +
"<td>" + log['log.date'] +"</td>"+
"<td>" + taskjobs.logstatuses_names[log['log.state']] +"</td>"+
"<td class='comment'>" + log['log.comment'] +"</td>"+
"<td class='comment'>" + __(log['log.comment'], 'glpiinventory') +"</td>"+
"</tr>"
);
});
Expand Down
Loading