diff --git a/CHANGELOG.md b/CHANGELOG.md
index d3cc58aa34906094f7318a28af754d26e8820e6d..d65cdb9a448d256b9791e530a53e0165615d04cc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,7 @@
### New features
TBD
### Bug fixes
-TBD
+- Refactor translation parsing on creation pages ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/925))
### Tweaks
- Update documentation reference url in API index ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/921))
- Bump Orjson to 3.11.4 to resolve support for Python 3.14 ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/922))
diff --git a/app/frontend/templates/server/bedrock_wizard.html b/app/frontend/templates/server/bedrock_wizard.html
index 26c3dfa80440a3a5104dbc9435edc5fa7cfc53ae..49a95870897a3ef5cc0c3a412d0f3d2384799af2 100644
--- a/app/frontend/templates/server/bedrock_wizard.html
+++ b/app/frontend/templates/server/bedrock_wizard.html
@@ -4,7 +4,15 @@
{% block content %}
-
+
-
@@ -354,15 +362,15 @@
function eula_confirm() {
bootbox.confirm({
- title: "{% raw translate('error', 'eulaTitle', data['lang']) %}",
- message: "{% raw translate('error', 'eulaMsg', data['lang']) %}Minecraft EULA {% raw translate('error', 'privMsg', data['lang']) %}Microsoft Privacy Policy",
+ title: `${$("#creation-wrapper").attr("data-eulaTitle")}`,
+ message: `${$("#creation-wrapper").attr("data-eulaMsg")}Minecraft EULA ${$("#creation-wrapper").attr("data-privMsg")}Microsoft Privacy Policy`,
buttons: {
confirm: {
- label: "{% raw translate('error', 'agree', data['lang']) %}",
+ label: `${$("#creation-wrapper").attr("data-agree")}`,
className: 'btn-info'
},
cancel: {
- label: "{% raw translate('error', 'cancel', data['lang']) %}",
+ label: `${$("#creation-wrapper").attr("data-cancel")}`,
className: 'btn-secondary'
}
},
@@ -406,11 +414,11 @@
function wait_msg(importing) {
bootbox.alert({
- title: importing ? '{% raw translate("serverWizard", "importing", data['lang']) %}': '{% raw translate("serverWizard", "downloading", data['lang']) %}',
- message: ' {% raw translate("serverWizard", "bePatient", data['lang']) %}',
+ title: importing ? `${$("#creation-wrapper").attr("data-importing")}` : `${$("#creation-wrapper").attr("data-downloading")}`,
+ message: ` ${$("#creation-wrapper").attr("data-bePatient")}`,
+ className: "waitMsg",
});
}
-
$('#file').change(function () {
console.log("File changed");
if ($('#file').val()) {
diff --git a/app/frontend/templates/server/wizard.html b/app/frontend/templates/server/wizard.html
index ad6da88ee8a36f78d50af27854de35df9b27da6e..8d276b32e08e9a8ffcb6e6beded56ccb7f43606e 100644
--- a/app/frontend/templates/server/wizard.html
+++ b/app/frontend/templates/server/wizard.html
@@ -5,7 +5,10 @@
{% block content %}
-
+
-
@@ -647,6 +650,7 @@
}
async function send_server(data) {
let token = getCookie("_xsrf")
+ console.log(data)
let res = await fetch(`/api/v2/servers/`, {
method: 'POST',
headers: {
@@ -702,7 +706,7 @@
}
}
}
- console.log(send_data);
+ console.log("SEND DATA" + send_data);
// Format the plain form data as JSON
let formDataJsonString = JSON.stringify(send_data, replacer);
@@ -859,8 +863,8 @@
function wait_msg(importing) {
bootbox.alert({
- title: importing ? '{% raw translate("serverWizard", "importing", data["lang"]) %}' : '{% raw translate("serverWizard", "downloading", data["lang"]) %}',
- message: importing ? ' {% raw translate("serverWizard", "bePatient", data["lang"]) %}' : ' {% raw translate("serverWizard", "bePatient", data["lang"]) %}',
+ title: importing ? `${$("#creation-wrapper").attr("data-importing")}` : `${$("#creation-wrapper").attr("data-downloading")}`,
+ message: ` ${$("#creation-wrapper").attr("data-bePatient")}`,
className: "waitMsg",
});
}
diff --git a/app/translations/en_EN.json b/app/translations/en_EN.json
index 7cd2211289d6ed40c07d891d5df740c8b84f08bf..303043a18a0decfd9d9811da22ff675191bdab10 100644
--- a/app/translations/en_EN.json
+++ b/app/translations/en_EN.json
@@ -648,7 +648,7 @@
"absoluteZipPath": "Absolute path to your server",
"addRole": "Add Server to Existing Role(s)",
"autoCreate": "If none are selected Crafty will make one!",
- "bePatient": "Please be patient as we ' + (importing ? 'import' : 'download') + ' the server",
+ "bePatient": "Please be patient as we create your server",
"buildServer": "Build Server!",
"clickRoot": "Click here to select Root Dir",
"close": "Close",