Fix Patch 0187

Fix german code, optimise text und resolve EOF-Problem
jens-maus · Aug 14, 2024 · d0a2c3c · d0a2c3c
1 parent 701d2b6
commit d0a2c3c
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 18 deletions.
diff --git 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-<br/>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-<br/>Colour",
diff --git a/...al/patches/occu/0187-WebUI-UpgradeNewDeviceDialog/occu/WebUI/www/config/cp_add_device.cgi b/...al/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/...0187-WebUI-UpgradeNewDeviceDialog/occu/WebUI/www/webui/js/lang/de/translate.lang.label.js b/...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-<br/>Farbe",

diff --git a/...0187-WebUI-UpgradeNewDeviceDialog/occu/WebUI/www/webui/js/lang/en/translate.lang.label.js b/...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-<br/>Colour",