Skip to content

Internal: Localize SweetAlert confirm buttons via data-* - refs BT#22937 #6783

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 1 commit into from
Sep 20, 2025
Merged

Internal: Localize SweetAlert confirm buttons via data-* - refs BT#22937 #6783

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 15 additions & 12 deletions assets/js/legacy/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,24 +132,27 @@ $(function () {
}

// MODAL DELETE CONFIRM
$(".delete-swal").click(function (e) {
$(document).on("click", ".delete-swal", function (e) {
e.preventDefault()
var url = $(this).attr("href")
var title = $(this).data("title") || $(this).attr("title")
var confirmText = $(this).data("confirm-text") || 'Yes'
var cancelText = $(this).data("cancel-text") || 'Cancel'

const $a = $(this)
const url = $a.attr("href")
const title = $a.data("title") || $a.attr("title") || ""

const confirmText = $a.data("confirm-text") || "Yes"
const cancelText = $a.data("cancel-text") || "No"

Swal.fire({
title: title,
text: "",
title,
icon: "warning",
showCancelButton: true,
confirmButtonText: confirmText,
cancelButtonText: cancelText,
confirmButtonColor: "#3085d6",
cancelButtonColor: "#d33",
confirmButtonText: confirmText,
reverseButtons: true,
}).then((result) => {
if (result.value) {
if (result.isConfirmed) {
window.location.href = url
}
})
Expand Down Expand Up @@ -456,10 +459,10 @@ function setCheckbox(value, table_id) {
}

function action_click(element, table_id) {
var d = $("#" + table_id);
var confirmMessage = $(element).attr("data-confirm") || "ConfirmYourChoice";
var d = $("#" + table_id)
var confirmMessage = $(element).attr("data-confirm") || "ConfirmYourChoice"
if (!confirm(confirmMessage)) {
return false;
return false
} else {
var action = $(element).attr("data-action")
$("#" + table_id + ' input[name="action"]').attr("value", action)
Expand Down
21 changes: 15 additions & 6 deletions public/main/admin/system_announcements.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,13 +441,22 @@ function showCareer() {
$row[] = implode(', ', $announcement->getRoles());

$row[] = $announcement->getLang();
$row[] = "<a href=\"?action=edit&id=".$announcement->getId()."\">".
Display::getMdiIcon(ActionIcon::EDIT, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Edit'))."</a>
<a
href=\"?action=delete&id=".$announcement->getId()."\"
title=".addslashes(api_htmlentities(get_lang('Please confirm your choice')))." class='delete-swal' >".
$confirmMsg = addslashes(api_htmlentities(get_lang('Please confirm your choice')));
$yesText = addslashes(api_htmlentities(get_lang('Yes')));
$noText = addslashes(api_htmlentities(get_lang('No')));
$row[] =
'<a href="?action=edit&id='.$announcement->getId().'">'.
Display::getMdiIcon(ActionIcon::EDIT, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Edit')).
'</a>
<a
href="?action=delete&id='.$announcement->getId().'"
class="delete-swal"
data-title="'.$confirmMsg.'"
data-confirm-text="'.$yesText.'"
data-cancel-text="'.$noText.'"
title="'.api_htmlentities(get_lang('Delete')).'">'.
Display::getMdiIcon(ActionIcon::DELETE, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Delete')).
"</a>";
'</a>';
$announcement_data[] = $row;
}
$table = new SortableTableFromArray($announcement_data);
Expand Down
4 changes: 3 additions & 1 deletion public/main/exercise/question_list_admin.inc.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@
['class' => 'btn btn--warning btn-sm']
);
$delete_link = null;
if (true == $objExercise->edit_exercise_in_lp) {
if ($objExercise->edit_exercise_in_lp) {
$delete_link = Display::url(
Display::getMdiIcon(ActionIcon::DELETE, 'ch-tool-icon-button', 'margin-bottom: 5px;', ICON_SIZE_TINY, get_lang('Remove from test')),
api_get_self().'?'.api_get_cidreq().'&'
Expand All @@ -230,6 +230,8 @@
'id' => "delete_$id",
'class' => 'delete-swal btn btn--danger btn-sm',
'data-title' => get_lang('Are you sure you want to delete'),
'data-confirm-text' => get_lang('Yes'),
'data-cancel-text' => get_lang('Cancel'),
'title' => get_lang('Delete'),
]
);
Expand Down
9 changes: 7 additions & 2 deletions public/main/template/default/glossary/list.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,13 @@
{{ 'ActionIcon::EDIT' | mdi_icon }}
</a>
<a
title="{{ 'Confirm if you want to delete'|trans }}" href="{{ item.delete }}"
class="btn btn-light btn-sm delete-swal">
href="{{ item.delete }}"
class="btn btn-light btn-sm delete-swal"
title="{{ 'Delete'|trans }}"
data-title="{{ 'Confirm if you want to delete'|trans }}"
data-confirm-text="{{ 'Yes'|trans }}"
data-cancel-text="{{ 'No'|trans }}"
>
{{ 'ActionIcon::DELETE' | mdi_icon }}
</a>
</div>
Expand Down
22 changes: 18 additions & 4 deletions public/main/user/user.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1088,15 +1088,29 @@ function modify_filter($user_id, $row, $data)
// Unsubscribe
if ($canEditUsers && ($user_id != $current_user_id || api_is_platform_admin())) {
$result .= Display::url(
Display::getMdiIcon(ActionIcon::EXIT, 'ch-tool-icon text-xl delete-swal', null, ICON_SIZE_MEDIUM, get_lang('Unsubscribe')),
api_get_self().'?'.api_get_cidreq().'&type='.$type.'&unregister=yes&user_id='.$user_id
Display::getMdiIcon(ActionIcon::EXIT, 'ch-tool-icon text-xl', null, ICON_SIZE_MEDIUM, get_lang('Unsubscribe')),
api_get_self().'?'.api_get_cidreq().'&type='.$type.'&unregister=yes&user_id='.$user_id,
[
'class' => 'delete-swal',
'title' => get_lang('Unsubscribe'),
'data-title' => get_lang('Are you sure you want to unsubscribe this user?'),
'data-confirm-text' => get_lang('Yes'),
'data-cancel-text' => get_lang('No'),
]
);
}
} else {
if (1 == $course_info['unsubscribe'] && $user_id == $current_user_id) {
$result .= Display::url(
Display::getMdiIcon(ActionIcon::EXIT, 'ch-tool-icon text-xl delete-swal', null, ICON_SIZE_MEDIUM, get_lang('Unsubscribe')),
api_get_self().'?'.api_get_cidreq().'&type='.$type.'&unregister=yes&user_id='.$user_id
Display::getMdiIcon(ActionIcon::EXIT, 'ch-tool-icon text-xl', null, ICON_SIZE_MEDIUM, get_lang('Unsubscribe')),
api_get_self().'?'.api_get_cidreq().'&type='.$type.'&unregister=yes&user_id='.$user_id,
[
'class' => 'delete-swal',
'title' => get_lang('Unsubscribe'),
'data-title' => get_lang('Are you sure you want to unsubscribe?'),
'data-confirm-text' => get_lang('Yes'),
'data-cancel-text' => get_lang('No'),
]
);
}
}
Expand Down
Loading