From d0a2c3c235acd314f950912b389d2de7479690cd Mon Sep 17 00:00:00 2001 From: Maik2208 <79879510+Maik2208@users.noreply.github.com> Date: Wed, 14 Aug 2024 21:00:30 +0200 Subject: [PATCH] Fix Patch 0187 Fix german code, optimise text und resolve EOF-Problem --- .../0187-WebUI-UpgradeNewDeviceDialog.patch | 18 +++++++++--------- .../occu/WebUI/www/config/cp_add_device.cgi | 14 +++++++------- .../webui/js/lang/de/translate.lang.label.js | 2 +- .../webui/js/lang/en/translate.lang.label.js | 2 +- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/buildroot-external/patches/occu/0187-WebUI-UpgradeNewDeviceDialog.patch b/buildroot-external/patches/occu/0187-WebUI-UpgradeNewDeviceDialog.patch index d0acb308b4..b7ab0a97ca 100644 --- a/buildroot-external/patches/occu/0187-WebUI-UpgradeNewDeviceDialog.patch +++ b/buildroot-external/patches/occu/0187-WebUI-UpgradeNewDeviceDialog.patch @@ -17,13 +17,13 @@ + append html "jQuery(\"#keyHmIPLocal_$iFace\").prop('disabled', true);" + append html "jQuery(\"#serialHmIPLocal_$iFace\").prop('disabled', true);" + append html "if(qrcode.length == 65){" -+ append html "var Teil1 = qrcode.substr(0,6);" -+ append html "var Teil2 = qrcode.substr(6,24);" -+ append html "var Teil3 = qrcode.substr(30,3);" -+ append html "var Teil4 = qrcode.substr(33,32);" -+ append html "if((Teil1 == \"EQ01SG\") && (Teil3 == \"DLK\")){" -+ append html "jQuery(\"#keyHmIPLocal_$iFace\").val(Teil2);" -+ append html "jQuery(\"#serialHmIPLocal_$iFace\").val(Teil4);" ++ append html "var SubString1 = qrcode.substr(0,6);" ++ append html "var SubString2 = qrcode.substr(6,24);" ++ append html "var SubString3 = qrcode.substr(30,3);" ++ append html "var SubString4 = qrcode.substr(33,32);" ++ append html "if((SubString1 == \"EQ01SG\") && (SubString3 == \"DLK\")){" ++ append html "jQuery(\"#keyHmIPLocal_$iFace\").val(SubString2);" ++ append html "jQuery(\"#serialHmIPLocal_$iFace\").val(SubString4);" + append html "} else {" + append html "alert(translateKey(\"lblTeachInQRCodeFaulty\"));" + append html "}" @@ -93,7 +93,7 @@ "lblTeachInKEY" : "KEY", "lblTeachInSGTIN" : "SGTIN", + "lblTeachInQRCode" : "QR-Code", -+ "lblTeachInQRCodeFaulty" : "Eingegebener QR-Code ist fehlerhaft", ++ "lblTeachInQRCodeFaulty" : "Gescannter QR-Code ist fehlerhaft", "lblText" : "Text", "lblTextBlock" : "Textblock", "lblTextColorBR" : "Text-
Farbe", @@ -115,7 +115,7 @@ "lblTeachInKEY" : "KEY", "lblTeachInSGTIN" : "SGTIN", + "lblTeachInQRCode" : "QR-Code", -+ "lblTeachInQRCodeFaulty" : "QR-Code is faulty", ++ "lblTeachInQRCodeFaulty" : "Scanned QR-Code is faulty", "lblText" : "Text", "lblTextBlock" : "Text block", "lblTextColorBR" : "Text-
Colour", diff --git a/buildroot-external/patches/occu/0187-WebUI-UpgradeNewDeviceDialog/occu/WebUI/www/config/cp_add_device.cgi b/buildroot-external/patches/occu/0187-WebUI-UpgradeNewDeviceDialog/occu/WebUI/www/config/cp_add_device.cgi index b94bed86a5..10fbbdab76 100644 --- a/buildroot-external/patches/occu/0187-WebUI-UpgradeNewDeviceDialog/occu/WebUI/www/config/cp_add_device.cgi +++ b/buildroot-external/patches/occu/0187-WebUI-UpgradeNewDeviceDialog/occu/WebUI/www/config/cp_add_device.cgi @@ -197,13 +197,13 @@ proc putSectionHMIP {} { append html "jQuery(\"#keyHmIPLocal_$iFace\").prop('disabled', true);" append html "jQuery(\"#serialHmIPLocal_$iFace\").prop('disabled', true);" append html "if(qrcode.length == 65){" - append html "var Teil1 = qrcode.substr(0,6);" - append html "var Teil2 = qrcode.substr(6,24);" - append html "var Teil3 = qrcode.substr(30,3);" - append html "var Teil4 = qrcode.substr(33,32);" - append html "if((Teil1 == \"EQ01SG\") && (Teil3 == \"DLK\")){" - append html "jQuery(\"#keyHmIPLocal_$iFace\").val(Teil2);" - append html "jQuery(\"#serialHmIPLocal_$iFace\").val(Teil4);" + append html "var SubString1 = qrcode.substr(0,6);" + append html "var SubString2 = qrcode.substr(6,24);" + append html "var SubString3 = qrcode.substr(30,3);" + append html "var SubString4 = qrcode.substr(33,32);" + append html "if((SubString1 == \"EQ01SG\") && (SubString3 == \"DLK\")){" + append html "jQuery(\"#keyHmIPLocal_$iFace\").val(SubString2);" + append html "jQuery(\"#serialHmIPLocal_$iFace\").val(SubString4);" append html "} else {" append html "alert(translateKey(\"lblTeachInQRCodeFaulty\"));" append html "}" diff --git a/buildroot-external/patches/occu/0187-WebUI-UpgradeNewDeviceDialog/occu/WebUI/www/webui/js/lang/de/translate.lang.label.js b/buildroot-external/patches/occu/0187-WebUI-UpgradeNewDeviceDialog/occu/WebUI/www/webui/js/lang/de/translate.lang.label.js index 2c8555d066..86bd1935a4 100644 --- a/buildroot-external/patches/occu/0187-WebUI-UpgradeNewDeviceDialog/occu/WebUI/www/webui/js/lang/de/translate.lang.label.js +++ b/buildroot-external/patches/occu/0187-WebUI-UpgradeNewDeviceDialog/occu/WebUI/www/webui/js/lang/de/translate.lang.label.js @@ -305,7 +305,7 @@ jQuery.extend(true,langJSON, { "lblTeachInKEY" : "KEY", "lblTeachInSGTIN" : "SGTIN", "lblTeachInQRCode" : "QR-Code", - "lblTeachInQRCodeFaulty" : "Eingegebener QR-Code ist fehlerhaft", + "lblTeachInQRCodeFaulty" : "Gescannter QR-Code ist fehlerhaft", "lblText" : "Text", "lblTextBlock" : "Textblock", "lblTextColorBR" : "Text-
Farbe", diff --git a/buildroot-external/patches/occu/0187-WebUI-UpgradeNewDeviceDialog/occu/WebUI/www/webui/js/lang/en/translate.lang.label.js b/buildroot-external/patches/occu/0187-WebUI-UpgradeNewDeviceDialog/occu/WebUI/www/webui/js/lang/en/translate.lang.label.js index 50012413f7..a01e36db8e 100644 --- a/buildroot-external/patches/occu/0187-WebUI-UpgradeNewDeviceDialog/occu/WebUI/www/webui/js/lang/en/translate.lang.label.js +++ b/buildroot-external/patches/occu/0187-WebUI-UpgradeNewDeviceDialog/occu/WebUI/www/webui/js/lang/en/translate.lang.label.js @@ -305,7 +305,7 @@ jQuery.extend(true,langJSON, { "lblTeachInKEY" : "KEY", "lblTeachInSGTIN" : "SGTIN", "lblTeachInQRCode" : "QR-Code", - "lblTeachInQRCodeFaulty" : "QR-Code is faulty", + "lblTeachInQRCodeFaulty" : "Scanned QR-Code is faulty", "lblText" : "Text", "lblTextBlock" : "Text block", "lblTextColorBR" : "Text-
Colour",