diff --git a/CHANGELOG.md b/CHANGELOG.md index 99f95ec8..640984bd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ TBD - Bump requests to resolve yank for CVE-2024-35195 ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/808)) - Better handle malformed mcping data ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/799)) ### Tweaks +- Dyamically change child action translation for backups ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/806)) - Remove EXIF image data on app Background Photos ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/805)) - Bump Docker base image `22.04` -> `24.04` ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/812)) - Bump python pip `2.0.3` -> `24.3.1` ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/812)) diff --git a/app/frontend/templates/panel/server_schedule_edit.html b/app/frontend/templates/panel/server_schedule_edit.html index d6b64429..925dcec2 100644 --- a/app/frontend/templates/panel/server_schedule_edit.html +++ b/app/frontend/templates/panel/server_schedule_edit.html @@ -74,8 +74,10 @@

-
- {% for backup in data["backups"] %} {% if backup.backup_id == data["schedule"]["action_id"] %} @@ -350,7 +352,7 @@ function yesnoCheck() { if (document.getElementById('action').value == "command") { document.getElementById("ifYes").classList.add("d-block"); - document.getElementById("ifYes").classList.remove("d-none"); + document.getElementById("ifYes").classList.remove("d-none"); document.getElementById("command_input").required = true; } else { document.getElementById("ifYes").classList.add("d-none"); @@ -361,11 +363,13 @@ document.getElementById("ifBackup").classList.add("d-block"); document.getElementById("ifBackup").classList.remove("d-none"); document.getElementById("action_id").required = true; + $("#action_id_label").html($("#action_id_label").attr("data-backup-translate")); } else { document.getElementById("ifBackup").classList.remove("d-block"); document.getElementById("ifBackup").classList.add("d-none"); document.getElementById("action_id").required = false; $("#action_id").val(null); + $("#action_id_label").html($("#action_id_label").attr("data-action-translate")); } } function basicAdvanced() { @@ -459,4 +463,4 @@ window.onload(startup()) - {% end %} \ No newline at end of file + {% end %} diff --git a/app/translations/en_EN.json b/app/translations/en_EN.json index f5df43ce..f88fc69f 100644 --- a/app/translations/en_EN.json +++ b/app/translations/en_EN.json @@ -508,7 +508,8 @@ }, "serverSchedules": { "action": "Action", - "actionId": "Select Action Child", + "actionId": "Action Child", + "backupPol": "Backup Policy", "areYouSure": "Delete Scheduled Task?", "cancel": "Cancel", "cannotSee": "Not seeing everything?",