WebUSB: Improve error reporting for old DAPlink.

microbit-carlos · microbit-carlos · commit d2bdb527cfc5 · 2020-12-22T16:33:41.000Z
diff --git a/js/python-main.js b/js/python-main.js
@@ -1297,8 +1297,9 @@ function web_editor(config) {
 
                 // Determine error type
                 if (err.message === "No valid interfaces found.") {
-                    errorType = "update-req";
-                    errorTitle = err.message;
+                    errorTitle = config["translate"]["webusb"]['err']['update-req-title'];
+                    errorType = 'update-req';
+                    err.message = ''
                     errorDescription = config["translate"]["webusb"]["err"][errorType];
                 } else if (err.message === "Unable to claim interface.") {
                     errorType = "clear-connect";
@@ -1367,8 +1368,7 @@ function web_editor(config) {
 
         var errorHTML = 
                     '<div>' + 
-                        '<strong>' + errorTitle + '</strong>' +
-                        '<br >' + 
+                        '<h3 id="modal-overlay-title">' + errorTitle + '</h3>' +
                         errorDescription + 
                         (err.message ? ("<code>Error: " + err.message + "</code>") : "") +
                     '</div>' + 
diff --git a/lang/en.js b/lang/en.js
@@ -83,7 +83,8 @@ var LANGUAGE = {
   },
   'webusb': {
     'err': {
-      'update-req': 'You need to <a target="_blank" href="https://support.microbit.org/support/solutions/articles/19000019131-how-to-upgrade-the-firmware-on-the-micro-bit">update your micro:bit firmware</a> to make use of this feature.',
+      'update-req': 'You need to <a target="_blank" href="https://microbit.org/firmware/">update your micro:bit firmware</a> to make use of this feature.',
+      'update-req-title': 'Please update the micro:bit firmware',
       'clear-connect': 'Another process is connected to this device.<br>Close any other tabs that may be using WebUSB (e.g. MakeCode, Python Editor), or unplug and replug the micro:bit before trying again.',
       'reconnect-microbit': 'Please reconnect your micro:bit and try again.',
       'partial-flashing-disable': 'If the errors persist, try disabling Quick Flash in the beta options.',
diff --git a/lang/es.js b/lang/es.js
@@ -83,7 +83,7 @@ var LANGUAGE = {
   },
   "webusb": {
     "err": {
-      "update-req": "Necesitas <a target=\"_blank\" href=\"https://support.microbit.org/support/solutions/articles/19000019131-how-to-upgrade-the-firmware-on-the-micro-bit\">actualizar el firmware del micro:bit </a> para poder usar esta función!",
+      "update-req": "Necesitas <a target=\"_blank\" href=\"https://microbit.org/firmware/\">actualizar el firmware del micro:bit </a> para poder usar esta función!",
       "clear-connect": "Hay otro proceso conectado a este dispositivo.<br>Cierre cualquier otra pestaña que pueda estar usando WebUSB (por ejemplo, MakeCode or Editor de Python), o desconecte y vuelva a conectar el micro:bit antes de volver a intentarlo.",
       "reconnect-microbit": "Por favor reconecta el micro:bit e intentalo de nuevo.",
       "partial-flashing-disable": "Si el error persiste, intenta deshabilitar el flasheo rapido en las opciones beta.",
diff --git a/lang/hr.js b/lang/hr.js
@@ -83,7 +83,7 @@ var LANGUAGE = {
   },
   "webusb": {
     "err": {
-      "update-req": "Trebaš <a target=\"_blank\" href=\"https://support.microbit.org/support/solutions/articles/19000019131-how-to-upgrade-the-firmware-on-the-micro-bit\">promijeniti svoj micro:bit firmware</a> da bi tu značajku mogao koristiti.",
+      "update-req": "Trebaš <a target=\"_blank\" href=\"https://microbit.org/firmware/\">promijeniti svoj micro:bit firmware</a> da bi tu značajku mogao koristiti.",
       "clear-connect": "Za ovaj je uređaj vezan još jedan proces.<br>Zatvori sve tabove u kojima se koristi WebUSB (npr. MakeCode, Python Editor) ili isključi pa ponovo uključi micro:bit i onda pokušaj ponovo.",
       "reconnect-microbit": "Nanovo uključi svoj micro:bit i pokušaj opet.",
       "partial-flashing-disable": "Ako se greške ponavljaju, pokušaj u beta opcijama isključiti opciju Quick Flash.",
diff --git a/lang/pl.js b/lang/pl.js
@@ -83,7 +83,7 @@ var LANGUAGE = {
   },
   "webusb": {
     "err": {
-      "update-req": "Musisz <a target=\"_blank\" href=\"https://support.microbit.org/support/solutions/articles/19000019131-how-to-upgrade-the-firmware-on-the-micro-bit\">zaktualizuj oprogramowanie układowe micro: bit</a>, aby skorzystać z tej funkcji.",
+      "update-req": "Musisz <a target=\"_blank\" href=\"https://microbit.org/firmware/\">zaktualizuj oprogramowanie układowe micro: bit</a>, aby skorzystać z tej funkcji.",
       "clear-connect": "Inny proces jest podłączony do tego urządzenia.<br> Zamknij wszystkie inne okna które mogą korzystać z WebUSB (np. MakeCode, Python Editor), lub odłącz i ponownie podłącz micro: bit przed ponowną próbą.",
       "reconnect-microbit": "Podłącz jeszcze raz swój micro:bit i spróbuj ponownie.",
       "partial-flashing-disable": "Jeśli error się powtarza, spróbuj wyłączyć Quick Flash w opcjach beta.",
diff --git a/lang/zh-CN.js b/lang/zh-CN.js
@@ -83,7 +83,7 @@ var LANGUAGE = {
   },
   "webusb": {
     "err": {
-      "update-req": "需要 <a target=\"_blank\" href=\"https://support.microbit.org/support/solutions/articles/19000019131-how-to-upgrade-the-firmware-on-the-micro-bit\"> 更新 micro:bit 固件</a> 以使用这个功能.",
+      "update-req": "需要 <a target=\"_blank\" href=\"https://microbit.org/firmware/\"> 更新 micro:bit 固件</a> 以使用这个功能.",
       "clear-connect": "另一个进程已连接到这个设备。<br>关闭其它可能使用 WebUSB 的标签（如 MakeCode、Python Editor），或者拔掉 micro:bit 插头再重新插上。",
       "reconnect-microbit": "请重新连接 micro:bit 然后再次尝试。",
       "partial-flashing-disable": "如果错误仍然存在，请尝试禁用beta选项中的快速下载。",
diff --git a/lang/zh-HK.js b/lang/zh-HK.js
@@ -83,7 +83,7 @@ var LANGUAGE = {
   },
   "webusb": {
     "err": {
-      "update-req": "需要 <a target=\"_blank\" href=\"https://support.microbit.org/support/solutions/articles/19000019131-how-to-upgrade-the-firmware-on-the-micro-bit\"> 更新 micro:bit 固件</a> 以使用這個功能.",
+      "update-req": "需要 <a target=\"_blank\" href=\"https://microbit.org/firmware/\"> 更新 micro:bit 固件</a> 以使用這個功能.",
       "clear-connect": "另一個進程已連接到這個設備。<br>關閉其它可能使用 WebUSB 的標籤（如 MakeCode、Python Editor），或者拔掉 micro:bit 插頭再重新插上。",
       "reconnect-microbit": "請重新連接 micro:bit 然後再次嘗試。",
       "partial-flashing-disable": "如果錯誤仍然存在，請嘗試禁用beta選項中的快速下載。",
diff --git a/lang/zh-TW.js b/lang/zh-TW.js
@@ -83,7 +83,7 @@ var LANGUAGE = {
   },
   "webusb": {
     "err": {
-      "update-req": "你需要<a target=\"_blank\" href=\"https://support.microbit.org/support/solutions/articles/19000019131-how-to-upgrade-the-firmware-on-the-micro-bit\">更新 micro:bit 韌體</a>以使用這個功能。",
+      "update-req": "你需要<a target=\"_blank\" href=\"https://microbit.org/firmware/\">更新 micro:bit 韌體</a>以使用這個功能。",
       "clear-connect": "另一個程序正在連線到這個設備。<br>關閉可能也在使用 WebUSB 的其它頁籤（像是 MakeCode、Python 編輯器），或者斷開 micro:bit 再重新連接。",
       "reconnect-microbit": "請重新連接你的 micro:bit 後再試一次。",
       "partial-flashing-disable": "如果錯誤仍然存在，請試著停用 Beta 選項中的快速燒錄功能。",
diff --git a/static/css/style.css b/static/css/style.css
@@ -786,11 +786,17 @@ input:checked + .menu-switch-slider:before {
   text-align: left;
 }
 
+#modal-overlay-title {
+  margin: 0 0 20px 0;
+  padding: 0;
+  font-size: 1.4rem;
+}
+
 #modal-msg-title{
   color:#336699;
   font-weight: bold;
-
 }
+
 .modal-close{
   color:#336699;
   content: "\00D7";
