From 819e84ec4cdba27f3a9016359aa54a3aa01132a8 Mon Sep 17 00:00:00 2001 From: amcmanu3 Date: Mon, 30 Jan 2023 23:27:40 -0500 Subject: [PATCH 1/2] Translate additions to backups page --- app/frontend/templates/panel/server_backup.html | 16 ++++++++-------- app/translations/en_EN.json | 4 +++- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/app/frontend/templates/panel/server_backup.html b/app/frontend/templates/panel/server_backup.html index 4af0ba1a..ab9b4f2e 100644 --- a/app/frontend/templates/panel/server_backup.html +++ b/app/frontend/templates/panel/server_backup.html @@ -110,15 +110,15 @@
{% if data['backup_config']['before'] %} - Run - Command Before Backup + {{ + translate('serverBackups', 'before', data['lang']) }}
{% else %} - Run Command - Before Backup + {{ + translate('serverBackups', 'before', data['lang']) }}
@@ -127,15 +127,15 @@
{% if data['backup_config']['after'] %} - Run - Command After Backup + {{ + translate('serverBackups', 'after', data['lang']) }}
{% else %} - Run Command - Before Backup + {{ + translate('serverBackups', 'after', data['lang']) }}
diff --git a/app/translations/en_EN.json b/app/translations/en_EN.json index 15a8ed27..7c5c99d4 100644 --- a/app/translations/en_EN.json +++ b/app/translations/en_EN.json @@ -297,7 +297,9 @@ "shutdown": "Shutdown server for duration of backup", "size": "Size", "storageLocation": "Storage Location", - "storageLocationDesc": "Where do you want to store backups?" + "storageLocationDesc": "Where do you want to store backups?", + "before": "Run command before backup", + "after": "Run command after backup" }, "serverConfig": { "bePatientDelete": "Please be patient while we remove your server from the Crafty panel. This screen will close in a few moments.", From 4ad96d0970d14e8dfa76adcc1afe01027e5c3a20 Mon Sep 17 00:00:00 2001 From: Zedifus Date: Sat, 11 Feb 2023 17:37:56 +0000 Subject: [PATCH 2/2] Update changelog !543 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ec750a2d..ff661d80 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,7 @@ TBD ### Tweaks TBD ### Lang -TBD +- Add additional translations to backups page strings ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/543))

## --- [4.0.20] - 2023/01/29