Merge branch 'dev' into refactor/cleanup-authentication-helpers

CHANGELOG.md

@@ -3,11 +3,11 @@
 ### New features
 TBD
 ### Bug fixes
-TBD
+- Fix exception related to page data on server start ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/544))
 ### Tweaks
 TBD
 ### Lang
-TBD
+- Add additional translations to backups page strings ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/543))
 <br><br>
 
 ## --- [4.0.20] - 2023/01/29

app/classes/web/server_handler.py

@@ -183,6 +183,7 @@ class ServerHandler(BaseHandler):
             "version_data": "version_data_here",  # TODO
             "user_data": exec_user,
             "show_contribute": self.helper.get_setting("show_contribute_link", True),
+            "background": self.controller.cached_login,
             "lang": self.controller.users.get_user_lang_by_id(exec_user["user_id"]),
             "lang_page": Helpers.get_lang_page(
                 self.controller.users.get_user_lang_by_id(exec_user["user_id"])

app/classes/web/status_handler.py

@@ -7,12 +7,12 @@ logger = logging.getLogger(__name__)
 
 class StatusHandler(BaseHandler):
     def get(self):
-        page_data = {"background": self.controller.cached_login}
-        page_data["lang"] = self.helper.get_setting("language")
-        page_data["lang_page"] = self.helper.get_lang_page(
-            self.helper.get_setting("language")
-        )
-        page_data["servers"] = self.controller.servers.get_all_servers_stats()
+        page_data = {
+            "background": self.controller.cached_login,
+            "lang": self.helper.get_setting("language"),
+            "lang_page": self.helper.get_lang_page(self.helper.get_setting("language")),
+            "servers": self.controller.servers.get_all_servers_stats(),
+        }
         running = 0
         for srv in page_data["servers"]:
             if srv["stats"]["running"]:

app/frontend/templates/panel/server_backup.html

@@ -110,15 +110,15 @@
                 <div class="form-group">
                   <label for="command-check" class="form-check-label ml-4 mb-4"></label>
                   {% if data['backup_config']['before'] %}
-                  <input type="checkbox" class="form-check-input" id="before-check" name="before-check" checked>Run
-                  Command Before Backup
+                  <input type="checkbox" class="form-check-input" id="before-check" name="before-check" checked>{{
+                  translate('serverBackups', 'before', data['lang']) }}
                   <br>
                   <input type="text" class="form-control" name="backup_before" id="backup_before"
                     value="{{ data['backup_config']['before'] }}" placeholder="We enter the / for you"
                     style="display: inline-block;">
                   {% else %}
-                  <input type="checkbox" class="form-check-input" id="before-check" name="before-check">Run Command
-                  Before Backup
+                  <input type="checkbox" class="form-check-input" id="before-check" name="before-check">{{
+                  translate('serverBackups', 'before', data['lang']) }}
                   <br>
                   <input type="text" class="form-control" name="backup_before" id="backup_before" value=""
                     placeholder="We enter the / for you." style="display: none;">
@@ -127,15 +127,15 @@
                 <div class="form-group">
                   <label for="command-check" class="form-check-label ml-4 mb-4"></label>
                   {% if data['backup_config']['after'] %}
-                  <input type="checkbox" class="form-check-input" id="after-check" name="after-check" checked>Run
-                  Command After Backup
+                  <input type="checkbox" class="form-check-input" id="after-check" name="after-check" checked>{{
+                  translate('serverBackups', 'after', data['lang']) }}
                   <br>
                   <input type="text" class="form-control" name="backup_after" id="backup_after"
                     value="{{ data['backup_config']['after'] }}" placeholder="We enter the / for you"
                     style="display: inline-block;">
                   {% else %}
-                  <input type="checkbox" class="form-check-input" id="after-check" name="after-check">Run Command
-                  Before Backup
+                  <input type="checkbox" class="form-check-input" id="after-check" name="after-check">{{
+                  translate('serverBackups', 'after', data['lang']) }}
                   <br>
                   <input type="text" class="form-control" name="backup_after" id="backup_after" value=""
                     placeholder="We enter the / for you." style="display: none;">

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.",