Skip to content

update #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Nov 7, 2019
Merged

update #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bdf720a
Lang: Add Croatian language (#294)
microbit-josephine Nov 1, 2019
c1e55fd
Bump version to 2.0.0 🎉 and update changelog.
microbit-carlos Nov 1, 2019
6aca519
Tests: Update manual test procedure for v2 features (#296)
microbit-josephine Nov 4, 2019
495936c
Fix issue downloading Python Script in Safari. (#298)
microbit-carlos Nov 5, 2019
0ce5e3f
A11y: Make Load/Save and Snippet modals accessible (#290)
microbit-mark Nov 6, 2019
9c67605
A11y: Document encoding should be in the page first 1024 bytes. (#299)
microbit-carlos Nov 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
2.0.0
-----
* Added Croatian language 🇭🇷 (#294)
* Update help file with latest v2 UI changes (#292)
* Internationalisation internal improvements (#287) (#293)
* WebUSB internal improvements and fixes (#289) (#291)

2.0.0-rc.1
----------
Expand Down
52 changes: 28 additions & 24 deletions editor.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
<!DOCTYPE html>
<html lang="en" data-useragent="Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.2; Trident/6.0)">
<!--
<head>
<meta charset="utf-8">
<!--
.:://++++++//:-.
.++/::++++++++++++/`
:++ /+++++++++++/:
Expand Down Expand Up @@ -57,9 +59,7 @@
Happy hacking,

Nicholas and Damien.
-->
<head>
<meta charset="utf-8">
-->
<title>Python editor</title>
<meta name="viewport" content="width=device-width,initial-scale=1">
<link rel="stylesheet" type="text/css" href="static/css/style.css" />
Expand All @@ -78,30 +78,34 @@
</script>
<script type="application/javascript">
// VERSION INFORMATION
EDITOR_VERSION = "2.0.0-rc.1";
EDITOR_VERSION = "2.0.0";
UPY_VERSION = "1.0.1";
</script>
<script id="files-template" type="x-tmpl-mustache">
<div tabindex="-1" role="dialog" aria-labelledby="loadSave-modal" aria-modal="true" class="modal-div">
<h2 class="modal-title"><i class="fa fa-upload"></i> <strong>{{ load-title }}</strong></h2>
<div class="load-drag-target" id="load-drag-target">
<input type="file" style="display: none" name="load-form-file-upload" id="file-upload-input">
<p>{{ instructions }}<br><a href="#" id="file-upload-link" class="load-drag-target load-toggle action">{{ toggle-file }}</a></p>
</div>
<h2 class="modal-title"><i class="fa fa-download"></i> <strong>{{ save-but }}</strong></h2>
<div class="save-buttons-container">
<button type="button" class="action save-button py" id="save-py" title="{{ save-py }}"><i class="fa fa-download"></i> {{ save-py}}</button>
<button type="button" class="action save-button hex" id="save-hex" title="{{ save-hex }}"><i class="fa fa-download"></i> {{ save-hex}}</button>
<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>
<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>
</div>
<div id="addFile">
<div id="addFileHeader">
<h2 class="modal-title"><i class="fa fa-download"></i> <strong>{{ files-title }}</strong></h2>
</div>
<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>
<div id="addFileHelp">
<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>
</div>
</div>
<div id="fileHelpPara">{{ file-help-text }}<a href="help.html#fs" target="_blank" class="action" id="files-help-link">{{ help-link }}</a>.
</div>
<div id="fileHelpPara">{{ file-help-text }}<a href="help.html#fs" target="_blank" class="action" id="files-help-link">{{ help-link }}</a>.</div>
<div class="expandable">
<div class="expandable-always-visible">
<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>
<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>
</div>
<div class="expandable-content">
<div class="fs-file-list" id="fs-file-list">
Expand All @@ -128,13 +132,15 @@ <h2 class="modal-title"><i class="fa fa-download"></i> <strong>{{ files-title }}
</tbody>
</table>
<div>
<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>
<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>
<input type="file" style="display: none" name="fs-file-upload-input" id="fs-file-upload-input" multiple>
</div>
</div>
</div>
</div>
</script>
<script id="snippet-template" type="x-tmpl-mustache">
<div tabindex="-1" role="dialog" aria-labelledby="snippets-modal" aria-modal="true" class="modal-div">
<h2><i class="fa fa-cogs"></i> <strong>{{ title }}</strong></h2>
<p>{{ description }}</p>
<p>{{ instructions }}</p>
Expand All @@ -146,11 +152,12 @@ <h2><i class="fa fa-cogs"></i> <strong>{{ title }}</strong></h2>
</tr>
{{#snippets}}
<tr id="snippet-{{trigger}}" class="action snippet-selection">
<td>{{trigger}}<span class="snippet-name">{{name}}</span></td>
<td><button class="snippet-button">{{trigger}}</button> <span class="snippet-name">{{name}}</span></td>
<td>{{#describe}}{{name}}{{/describe}}</td>
</tr>
{{/snippets}}
</table>
</div>
</script>
<script id="share-template" type="x-tmpl-mustache">
<h2><i class="fa fa-share-alt"></i> <strong>{{ title }}</strong></h2>
Expand Down Expand Up @@ -365,6 +372,7 @@ <h2><i class="fa fa-unlock-alt"></i> <strong>{{ title }}</strong></h2>
<li><span title="English"><a href="#" class="action lang-choice" id="en" tabindex="121">English</a></span></li>
<li><span title="Spanish"><a lang="es" href="#" class="action lang-choice" id="es" tabindex="122">Español</a></span></li>
<li><span title="Polish"><a lang="pl" href="#" class="action lang-choice" id="pl" tabindex="123">Polski</a></span></li>
<li><span title="Croatian"><a lang="hr" href="#" class="action lang-choice" id="hr" tabindex="124">Hrvatski</a></span></li>
</ul>
<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>
</div>
Expand All @@ -387,7 +395,7 @@ <h2><i class="fa fa-unlock-alt"></i> <strong>{{ title }}</strong></h2>
<div id="editor" class="flex3" tabindex="-1"></div>
</div>
<div id="flashing-overlay-container" class="modal-overlay-container">
<div id="flashing-overlay" class="modal-overlay">
<div id="flashing-overlay" class="modal-overlay" tabindex="-1" role="dialog" aria-labelledby="flashing-overlay" aria-modal="true">
<div id="flashing-info">
<h2 id="flashing-text">Flashing micro:bit</h2>
<div id="webusb-flashing-loader"></div>
Expand All @@ -399,7 +407,7 @@ <h2 id="flashing-text">Flashing micro:bit</h2>
</div>
</div>
<div id="modal-msg-overlay-container" class="modal-overlay-container modal-msg-overlay-container">
<div id="modal-msg-overlay" class="modal-overlay">
<div id="modal-msg-overlay" class="modal-overlay" tabindex="-1" role="dialog" aria-labelledby="flashing-overlay" aria-modal="true">
<a class="vex-close modal-close" onclick="$('#modal-msg-overlay-container').hide()"></a>
<div id="modal-msg-text">
<h2 id="modal-msg-title"></h2>
Expand All @@ -408,19 +416,15 @@ <h2 id="modal-msg-title"></h2>
</div>
</div>
</div>
<script src="ace/ace.js" type="application/javascript"
charset="utf-8"></script>
<script src="ace/ext-language_tools.js" type="application/javascript"
charset="utf-8"></script>
<script src="static/js/jquery-2.1.4.min.js"
type="application/javascript"></script>
<script src="ace/ace.js" type="application/javascript" charset="utf-8"></script>
<script src="ace/ext-language_tools.js" type="application/javascript" charset="utf-8"></script>
<script src="static/js/jquery-2.1.4.min.js" type="application/javascript"></script>
<script src="static/js/jquery.browser.min.js" type="application/javascript"></script>
<script src="static/js/forge.min.js" type="application/javascript"></script>
<script src="static/js/FileSaver.min.js" type="application/javascript"></script>
<script src="static/js/vex.combined.min.js"
type="application/javascript"></script>
<script src="static/js/vex.combined.min.js" type="application/javascript"></script>
<script src="static/js/encoding.min.js" type="application/javascript"></script>
<script src="static/js/mustache.min.js"
type="application/javascript"></script>
<script src="static/js/mustache.min.js" type="application/javascript"></script>
<script src="static/js/ResizeSensor.js"></script>
<script src="static/js/ElementQueries.min.js"></script>
<script src="static/js/custom-event-polyfill.js"></script>
Expand Down
3 changes: 3 additions & 0 deletions lang/en.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,9 @@ var language = {
},
'pl': {
'title': 'Polish'
},
'hr': {
'title': 'Croatian'
}
},
'static-strings': {
Expand Down
5 changes: 4 additions & 1 deletion lang/es.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ var language = {
"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.",
"device-disconnected": "Dispositivo desconectado.",
"timeout-error":":Unable to connect to the micro:bit",
"timeout-error": "Unable to connect to the micro:bit",
"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.",
"find-more": "Saber más"
},
Expand Down Expand Up @@ -133,6 +133,9 @@ var language = {
},
"pl": {
"title": "Polaco"
},
"hr": {
"title": "Croatian"
}
},
"static-strings": {
Expand Down
Loading