Skip to content

Commit 8fe4815

Browse files
microbit-josephinemicrobit-josephine
authored
Merge pull request #5 from bbcmicrobit/master
update
2 parents 9390937 + 9c67605 commit 8fe4815

File tree

12 files changed

+581
-56
lines changed

12 files changed

+581
-56
lines changed

‎CHANGELOG‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
2.0.0
2+
-----
3+
* Added Croatian language 🇭🇷 (#294)
4+
* Update help file with latest v2 UI changes (#292)
5+
* Internationalisation internal improvements (#287) (#293)
6+
* WebUSB internal improvements and fixes (#289) (#291)
17

28
2.0.0-rc.1
39
----------

‎editor.html‎

Lines changed: 28 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
<!DOCTYPE html>
22
<html lang="en" data-useragent="Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.2; Trident/6.0)">
3-
<!--
3+
<head>
4+
<meta charset="utf-8">
5+
<!--
46
.:://++++++//:-.
57
.++/::++++++++++++/`
68
:++ /+++++++++++/:
@@ -57,9 +59,7 @@
5759
Happy hacking,
5860

5961
Nicholas and Damien.
60-
-->
61-
<head>
62-
<meta charset="utf-8">
62+
-->
6363
<title>Python editor</title>
6464
<meta name="viewport" content="width=device-width,initial-scale=1">
6565
<link rel="stylesheet" type="text/css" href="static/css/style.css" />
@@ -78,30 +78,34 @@
7878
</script>
7979
<script type="application/javascript">
8080
// VERSION INFORMATION
81-
EDITOR_VERSION = "2.0.0-rc.1";
81+
EDITOR_VERSION = "2.0.0";
8282
UPY_VERSION = "1.0.1";
8383
</script>
8484
<script id="files-template" type="x-tmpl-mustache">
85+
<div tabindex="-1" role="dialog" aria-labelledby="loadSave-modal" aria-modal="true" class="modal-div">
8586
<h2 class="modal-title"><i class="fa fa-upload"></i> <strong>{{ load-title }}</strong></h2>
8687
<div class="load-drag-target" id="load-drag-target">
8788
<input type="file" style="display: none" name="load-form-file-upload" id="file-upload-input">
8889
<p>{{ instructions }}<br><a href="#" id="file-upload-link" class="load-drag-target load-toggle action">{{ toggle-file }}</a></p>
8990
</div>
9091
<h2 class="modal-title"><i class="fa fa-download"></i> <strong>{{ save-but }}</strong></h2>
9192
<div class="save-buttons-container">
92-
<button type="button" class="action save-button py" id="save-py" title="{{ save-py }}"><i class="fa fa-download"></i> {{ save-py}}</button>
93-
<button type="button" class="action save-button hex" id="save-hex" title="{{ save-hex }}"><i class="fa fa-download"></i> {{ save-hex}}</button>
93+
<button aria-labelledby="save-py" type="button" class="action save-button py" id="save-py" title="{{ save-py }}"><i class="fa fa-download"></i> {{ save-py}}</button>
94+
<button aria-labelledby="save-hex" type="button" class="action save-button hex" id="save-hex" title="{{ save-hex }}"><i class="fa fa-download"></i> {{ save-hex}}</button>
9495
</div>
9596
<div id="addFile">
9697
<div id="addFileHeader">
9798
<h2 class="modal-title"><i class="fa fa-download"></i> <strong>{{ files-title }}</strong></h2>
9899
</div>
99-
<div id="addFileHelp"><a class="action" id="files-expand-help"><i class="fa fa-info-circle" aria-hidden="true"> <span>{{ help-button }}</span></i></a></div>
100+
<div id="addFileHelp">
101+
<button aria-labelledby="add-files" aria-expanded="false" type="button" class="snippet-button" id="expandHelpPara"><i class="fa fa-info-circle"></i> {{ help-button }}</button>
102+
</div>
103+
</div>
104+
<div id="fileHelpPara">{{ file-help-text }}<a href="help.html#fs" target="_blank" class="action" id="files-help-link">{{ help-link }}</a>.
100105
</div>
101-
<div id="fileHelpPara">{{ file-help-text }}<a href="help.html#fs" target="_blank" class="action" id="files-help-link">{{ help-link }}</a>.</div>
102106
<div class="expandable">
103107
<div class="expandable-always-visible">
104-
<button type="button" class="action save-button show" id="show-files" title="{{ show-files }}">{{ show-files }} &nbsp;<i class="fa fa-caret-down"></i></button>
108+
<button aria-labelledby="show-files" aria-expanded="false" type="button" class="action save-button show" id="show-files" title="{{ show-files }}">{{ show-files }} &nbsp;<i class="fa fa-caret-down"></i></button>
105109
</div>
106110
<div class="expandable-content">
107111
<div class="fs-file-list" id="fs-file-list">
@@ -128,13 +132,15 @@ <h2 class="modal-title"><i class="fa fa-download"></i> <strong>{{ files-title }}
128132
</tbody>
129133
</table>
130134
<div>
131-
<button type="button" class="action save-button add" id="fs-file-upload-button" tile="{{ fs-add-file }}"><i class="fa fa-plus-circle"></i> {{ fs-add-file }}</button>
135+
<button role=button type="button" class="action save-button add" id="fs-file-upload-button" tile="{{ fs-add-file }}"><i class="fa fa-plus-circle"></i> {{ fs-add-file }}</button>
132136
<input type="file" style="display: none" name="fs-file-upload-input" id="fs-file-upload-input" multiple>
133137
</div>
134138
</div>
135139
</div>
140+
</div>
136141
</script>
137142
<script id="snippet-template" type="x-tmpl-mustache">
143+
<div tabindex="-1" role="dialog" aria-labelledby="snippets-modal" aria-modal="true" class="modal-div">
138144
<h2><i class="fa fa-cogs"></i> <strong>{{ title }}</strong></h2>
139145
<p>{{ description }}</p>
140146
<p>{{ instructions }}</p>
@@ -146,11 +152,12 @@ <h2><i class="fa fa-cogs"></i> <strong>{{ title }}</strong></h2>
146152
</tr>
147153
{{#snippets}}
148154
<tr id="snippet-{{trigger}}" class="action snippet-selection">
149-
<td>{{trigger}}<span class="snippet-name">{{name}}</span></td>
155+
<td><button class="snippet-button">{{trigger}}</button> <span class="snippet-name">{{name}}</span></td>
150156
<td>{{#describe}}{{name}}{{/describe}}</td>
151157
</tr>
152158
{{/snippets}}
153159
</table>
160+
</div>
154161
</script>
155162
<script id="share-template" type="x-tmpl-mustache">
156163
<h2><i class="fa fa-share-alt"></i> <strong>{{ title }}</strong></h2>
@@ -365,6 +372,7 @@ <h2><i class="fa fa-unlock-alt"></i> <strong>{{ title }}</strong></h2>
365372
<li><span title="English"><a href="#" class="action lang-choice" id="en" tabindex="121">English</a></span></li>
366373
<li><span title="Spanish"><a lang="es" href="#" class="action lang-choice" id="es" tabindex="122">Español</a></span></li>
367374
<li><span title="Polish"><a lang="pl" href="#" class="action lang-choice" id="pl" tabindex="123">Polski</a></span></li>
375+
<li><span title="Croatian"><a lang="hr" href="#" class="action lang-choice" id="hr" tabindex="124">Hrvatski</a></span></li>
368376
</ul>
369377
<div><a id="add-language-link" class="action" title="Add a language translation to the Editor" href="https://support.microbit.org/support/solutions/articles/19000106022-translating-the-micro-bit-python-editor" target="_blank" tabindex="124">Add a language</a></div>
370378
</div>
@@ -387,7 +395,7 @@ <h2><i class="fa fa-unlock-alt"></i> <strong>{{ title }}</strong></h2>
387395
<div id="editor" class="flex3" tabindex="-1"></div>
388396
</div>
389397
<div id="flashing-overlay-container" class="modal-overlay-container">
390-
<div id="flashing-overlay" class="modal-overlay">
398+
<div id="flashing-overlay" class="modal-overlay" tabindex="-1" role="dialog" aria-labelledby="flashing-overlay" aria-modal="true">
391399
<div id="flashing-info">
392400
<h2 id="flashing-text">Flashing micro:bit</h2>
393401
<div id="webusb-flashing-loader"></div>
@@ -399,7 +407,7 @@ <h2 id="flashing-text">Flashing micro:bit</h2>
399407
</div>
400408
</div>
401409
<div id="modal-msg-overlay-container" class="modal-overlay-container modal-msg-overlay-container">
402-
<div id="modal-msg-overlay" class="modal-overlay">
410+
<div id="modal-msg-overlay" class="modal-overlay" tabindex="-1" role="dialog" aria-labelledby="flashing-overlay" aria-modal="true">
403411
<a class="vex-close modal-close" onclick="$('#modal-msg-overlay-container').hide()"></a>
404412
<div id="modal-msg-text">
405413
<h2 id="modal-msg-title"></h2>
@@ -408,19 +416,15 @@ <h2 id="modal-msg-title"></h2>
408416
</div>
409417
</div>
410418
</div>
411-
<script src="ace/ace.js" type="application/javascript"
412-
charset="utf-8"></script>
413-
<script src="ace/ext-language_tools.js" type="application/javascript"
414-
charset="utf-8"></script>
415-
<script src="static/js/jquery-2.1.4.min.js"
416-
type="application/javascript"></script>
419+
<script src="ace/ace.js" type="application/javascript" charset="utf-8"></script>
420+
<script src="ace/ext-language_tools.js" type="application/javascript" charset="utf-8"></script>
421+
<script src="static/js/jquery-2.1.4.min.js" type="application/javascript"></script>
422+
<script src="static/js/jquery.browser.min.js" type="application/javascript"></script>
417423
<script src="static/js/forge.min.js" type="application/javascript"></script>
418424
<script src="static/js/FileSaver.min.js" type="application/javascript"></script>
419-
<script src="static/js/vex.combined.min.js"
420-
type="application/javascript"></script>
425+
<script src="static/js/vex.combined.min.js" type="application/javascript"></script>
421426
<script src="static/js/encoding.min.js" type="application/javascript"></script>
422-
<script src="static/js/mustache.min.js"
423-
type="application/javascript"></script>
427+
<script src="static/js/mustache.min.js" type="application/javascript"></script>
424428
<script src="static/js/ResizeSensor.js"></script>
425429
<script src="static/js/ElementQueries.min.js"></script>
426430
<script src="static/js/custom-event-polyfill.js"></script>

‎lang/en.js‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,9 @@ var language = {
133133
},
134134
'pl': {
135135
'title': 'Polish'
136+
},
137+
'hr': {
138+
'title': 'Croatian'
136139
}
137140
},
138141
'static-strings': {

‎lang/es.js‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ var language = {
8888
"reconnect-microbit": "Por favor reconecta el micro:bit e intentalo de nuevo.",
8989
"partial-flashing-disable": "Si el error persiste, intenta deshabilitar el flasheo rapido en las opciones beta.",
9090
"device-disconnected": "Dispositivo desconectado.",
91-
"timeout-error":":Unable to connect to the micro:bit",
91+
"timeout-error": "Unable to connect to the micro:bit",
9292
"unavailable": "Con WebUSB puedes programar tu micro: bit y conectarte a la consola de serie directamente desde el Editor de Python.<br/>Desafortunadamente, WebUSB no es compatible con este navegador. Recomendamos Chrome o un navegador basado en Chrome para usar WebUSB.",
9393
"find-more": "Saber más"
9494
},
@@ -133,6 +133,9 @@ var language = {
133133
},
134134
"pl": {
135135
"title": "Polaco"
136+
},
137+
"hr": {
138+
"title": "Croatian"
136139
}
137140
},
138141
"static-strings": {

0 commit comments

Comments
 (0)