Skip to content

Commit 92b9029

Browse files
Update wording for quick and long flashing modal messages.
1 parent 8a28c1e commit 92b9029

File tree

9 files changed

+19
-12
lines changed

9 files changed

+19
-12
lines changed

editor.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,7 @@ <h2><i class="fa fa-unlock-alt"></i> <strong>{{ title }}</strong></h2>
400400
<div id="flashing-overlay-container" class="modal-overlay-container">
401401
<div id="flashing-overlay" class="modal-overlay modal-div" tabindex="-1" role="dialog" aria-labelledby="flashing-overlay" aria-modal="true">
402402
<div id="flashing-info">
403-
<h2 id="flashing-text">Flashing micro:bit</h2>
403+
<h2 id="flashing-title">Flashing Code</h2>
404404
<div id="flashing-extra-msg"></div>
405405
<div id="webusb-flashing-loader"></div>
406406
<progress id="webusb-flashing-progress" max="1">

lang/en.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ var language = {
9696
'close': 'Close',
9797
'request-repl': 'Send CTRL-C for REPL',
9898
'request-serial': 'Send CTRL-D to reset',
99-
'flashing-text': 'Flashing micro:bit',
99+
'flashing-title': 'Flashing MicroPython',
100100
'download': 'Download Hex'
101101
},
102102
'load': {

lang/es.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ var language = {
9696
"close": "Cerrar",
9797
"request-repl": "Envia CTRL-C para el REPL",
9898
"request-serial": "Envia CTRL-D para reiniciar",
99-
"flashing-text": "Flasheando micro:bit",
99+
"flashing-title": "Flasheando MicroPython",
100100
"download": "Descargar Hex"
101101
},
102102
"load": {

lang/hr.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ var language = {
9696
"close": "Zatvori",
9797
"request-repl": "Pošalji CTRL-C za REPL",
9898
"request-serial": "Pošalji CTRL-D za krenuti ispočetka",
99-
"flashing-text": "\"Flashanje\" micro:bita (prijenos datoteke)",
99+
"flashing-title": "\"Flashanje\" MicroPython (prijenos datoteke)",
100100
"download": "Preuzmi .hex"
101101
},
102102
"load": {

lang/pl.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ var language = {
9696
"close": "Zamknij",
9797
"request-repl": "Wyślij CTRL-C aby wystartować REPL",
9898
"request-serial": "Wyślij CTRL-D aby zresetować",
99-
"flashing-text": "Instalowanie na micro:bit",
99+
"flashing-title": "Instalowanie na MicroPython",
100100
"download": "Download hex"
101101
},
102102
"load": {

lang/zh-CN.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ var language = {
9696
"close": "关闭",
9797
"request-repl": "发送 CTRL-C 到 REPL",
9898
"request-serial": "发送 CTRL-D 以复位",
99-
"flashing-text": "编程 micro:bit",
99+
"flashing-title": "编程 MicroPython",
100100
"download": "下载 Hex"
101101
},
102102
"load": {

lang/zh-HK.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ var language = {
9696
"close": "關閉",
9797
"request-repl": "發送 CTRL-C 到 REPL",
9898
"request-serial": "發送 CTRL-D 以復位",
99-
"flashing-text": "編程 micro:bit",
99+
"flashing-title": "編程 MicroPython",
100100
"download": "下載 Hex"
101101
},
102102
"load": {

lang/zh-TW.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ var language = {
9696
"close": "關閉",
9797
"request-repl": "發送 CTRL-C 到 REPL",
9898
"request-serial": "發送 CTRL-D 以重設",
99-
"flashing-text": "燒錄 micro:bit",
99+
"flashing-title": "燒錄 MicroPython",
100100
"download": "下載 Hex 檔案"
101101
},
102102
"load": {

python-main.js

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,6 @@ function translations() {
330330
$('#script-name-label').text(language['static-strings']['script-name']['label']);
331331
$('#request-repl').text(language['webusb']['request-repl']);
332332
$('#request-serial').text(language['webusb']['request-serial']);
333-
$('#flashing-text').text(language['webusb']['flashing-text']);
334333
var optionsStrings = language['static-strings']['options-dropdown'];
335334
for (var object in optionsStrings) {
336335
$("#" + object).text(optionsStrings[object]);
@@ -1451,11 +1450,19 @@ function web_editor(config) {
14511450
$('#flashing-overlay-error').html("");
14521451
$("#flashing-info").removeClass('hidden');
14531452
$("#flashing-overlay-container").css("display", "flex");
1454-
// TODO: Translate this string
1455-
$('#flashing-extra-msg').text('Full flash in progress, subsequent flashes will be much quicker.').hide();
1453+
// TODO: Translate these string
1454+
$('#flashing-title').text('Flashing code');
1455+
$('#flashing-extra-msg').text('Initial flash might longer, subsequent flashes will be quicker.').hide();
14561456

14571457
var updateProgress = function(progress, longFlash) {
1458-
$('#flashing-extra-msg').toggle(!!longFlash);
1458+
// TODO: Translate these string
1459+
if (!!longFlash) {
1460+
$('#flashing-title').text(language['webusb']['flashing-title']);
1461+
$('#flashing-extra-msg').show()
1462+
} else {
1463+
$('#flashing-title').text('Flashing code');
1464+
$('#flashing-extra-msg').hide();
1465+
}
14591466
$('#webusb-flashing-progress').val(progress).css('display', 'inline-block');
14601467
};
14611468

0 commit comments

Comments
 (0)