Skip to content

Commit bbfd910

Browse files
MarkusBordihnMarkusBordihn
committed
Preparing master branch for release
Hide Sphero BLE integration behind experimental flag. Added additional translation files and translations. Fixed navigation overlapping with settings screen. Fixed scrollbars in fullscreenmode. Display notification if no bluetooth devices are found / paired.
1 parent c3ab3c2 commit bbfd910

File tree

31 files changed

+600
-350
lines changed

31 files changed

+600
-350
lines changed

‎.eslintrc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
'goog': true,
4141
'i18soy': true,
4242
'i18t': true,
43+
'i18v': true,
4344
'it': true,
4445
'loadExampleFile': true,
4546
'loadTemplateFile': true,

‎app/chrome_app/manifest.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"short_name": "Coding with Chrome",
1010
"description": "Learn, improve, or teach coding skills within a Chrome browser.",
1111
"key": "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAgSWdCJSwkgFTY9d993Quot277oCS2PCM2H/F6U28NE8D3Z21GXS/7qW8XCGShB054Wboq62pP679f9tB9F+GRHzOh/an4zIu+Uhb3ZKVzZLJbHsP8N+E5wk3wgwOBgE+UXCy9I8i1RpfzutJ4aha+YEzvCsVpo6UwsuWiXORB9yRU5NuooYX+fhVpWZmrZJo4vqzQhuoJ/uWiQujABXXo4qdrclwSw8+JlpWLMqHHQ6HE8Sf7VWDdGvRdYP6LRZobWqovb659qEumJ0bxhwXtHkWgPHQWtW35T/r/oH8uuke35pH+YtBtaOqN5U3bYGPinP0bYrI33OSLUJx/DrC1wIDAQAB",
12-
"version": "5.4.2",
12+
"version": "5.4.20",
1313
"oauth2": {
1414
"client_id": "418162477970-2qmsb2sp3m522hf292154favsjgpsj9n.apps.googleusercontent.com",
1515
"scopes": [

‎app/nw_app/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "binary",
3-
"version": "5.4.2",
3+
"version": "5.4.20",
44
"main": "js/background.js",
55
"window": {
66
"title": "Coding with Chrome",

‎build/cwc/locales.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ closureBuilder.build({
5959
closureBuilder.build({
6060
name: 'Locales.deu',
6161
srcs: glob([
62-
'locales/deu/translation.js',
62+
'locales/deu/**/*.js',
6363
]),
6464
externs: [
6565
'build/externs/locales.js',
@@ -75,7 +75,7 @@ closureBuilder.build({
7575
closureBuilder.build({
7676
name: 'Locales.eng',
7777
srcs: glob([
78-
'locales/eng/translation.js',
78+
'locales/eng/**/*.js',
7979
]),
8080
externs: [
8181
'build/externs/locales.js',

‎build/externs/i18n.js‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@
2323
/** @type {Function} */
2424
var i18t = function() {};
2525

26+
/** @type {Function} */
27+
var i18v = function() {};
28+
2629
/** @type {Function} */
2730
var i18soy = function() {};
2831

‎build/externs/shepherd.js‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,12 @@ Shepherd.Tour.prototype.start = function() {};
4949
/** @type {Function} */
5050
Shepherd.Tour.prototype.next = function() {};
5151

52+
/** @type {Function} */
53+
Shepherd.Tour.prototype.once = function() {};
54+
55+
/** @type {Function} */
56+
Shepherd.Tour.prototype.back= function() {};
57+
5258

5359
/** @constructor */
5460
Shepherd.Evented = function() {};

‎locales/deu/blocks/phaser_blocks.js‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
/**
2+
* @fileoverview Translation file for Phaser blocks (german).
3+
*
4+
* @license Copyright 2018 The Coding with Chrome Authors.
5+
*
6+
* Licensed under the Apache License, Version 2.0 (the "License");
7+
* you may not use this file except in compliance with the License.
8+
* You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing, software
13+
* distributed under the License is distributed on an "AS IS" BASIS,
14+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
* See the License for the specific language governing permissions and
16+
* limitations under the License.
17+
*
18+
* @author mbordihn@google.com (Markus Bordihn)
19+
*/
20+
window['Locales'] = window['Locales'] || {};
21+
Locales['deu'] = Locales['deu'] || {};
22+
23+
24+
/**
25+
* @final
26+
* @export
27+
*/
28+
/* eslint-disable max-len */
29+
Object.assign(Locales['deu'], {
30+
'BLOCKS_PHASER_OPEN_FILE_LIBRARY': 'Öffne Datei Bibliothek',
31+
});

‎locales/deu/status.js‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
/**
2+
* @fileoverview Translation file for the Status bar / button (german).
3+
*
4+
* @license Copyright 2018 The Coding with Chrome Authors.
5+
*
6+
* Licensed under the Apache License, Version 2.0 (the "License");
7+
* you may not use this file except in compliance with the License.
8+
* You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing, software
13+
* distributed under the License is distributed on an "AS IS" BASIS,
14+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
* See the License for the specific language governing permissions and
16+
* limitations under the License.
17+
*
18+
* @author mbordihn@google.com (Markus Bordihn)
19+
*/
20+
window['Locales'] = window['Locales'] || {};
21+
Locales['deu'] = Locales['deu'] || {};
22+
23+
24+
/**
25+
* @final
26+
* @export
27+
*/
28+
/* eslint-disable max-len */
29+
Object.assign(Locales['deu'], {
30+
'STATUS_LOADED': 'Beendet nach $VAR$ Sekunden.',
31+
'STATUS_LOADING': 'Laded ...',
32+
'STATUS_PREPARE': 'Vorbereitung',
33+
'STATUS_RELOADING': 'Neu laden ...',
34+
'STATUS_RUNNING': 'Läuft ...',
35+
'STATUS_STOPPED': 'Angehalten',
36+
'STATUS_TERMINATED': 'Beended',
37+
'STATUS_UNRESPONSIVE': 'Reagiert nicht',
38+
});

‎locales/deu/translation.js‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,20 @@
1818
* @author Stephanie.Bordihn@gmail.com (Stephanie Bordihn)
1919
*/
2020
window['Locales'] = window['Locales'] || {};
21+
Locales['deu'] = Locales['deu'] || {};
2122

2223

2324
/**
2425
* @final
2526
* @export
2627
*/
2728
/* eslint-disable max-len */
28-
Locales['deu'] = {
29+
Object.assign(Locales['deu'], {
2930
'About': 'Über',
3031
'Advanced': 'Fortgeschrittener',
3132
'All': 'Alle',
3233
'Audio': 'Audio',
3334
'Automatically reloads the preview after a change on the editor content': 'Automatisches Neuladen der Vorschau nach einer Änderung des Editorinhalts',
34-
'Begin to learn coding with visual block programming. Put together the program steps by dragging and dropping coding blocks.': 'Lerne mit visuellen Blöcken zu Programmieren. Erstelle Schritt für Schritt ein Programm mit dem setzten, ziehen und ändern von Blöcken.',
35-
'Beginner': 'Anfänger',
3635
'Block Coding': 'Block basierte Programmierung',
3736
'Blockly Prompt': 'Blockly Aufforderung',
3837
'Blockly file': 'Blockly Datei',
@@ -41,7 +40,6 @@ Locales['deu'] = {
4140
'Cancel': 'Abbrechen',
4241
'Check Syntax...': 'Überprüfe Syntax...',
4342
'Close': 'Schließen',
44-
'Coding with Chrome is an educational development environment': 'Coding with Chrome ist eine pädagogische Entwicklerumgebung',
4543
'Collapse Blockly editor.': 'Verkleinere den Block Editor.',
4644
'Collapse Preview': 'Verkleinere die Vorschau',
4745
'Collapse Text editor.': 'Verkleinere den Text Editor.',
@@ -67,7 +65,6 @@ Locales['deu'] = {
6765
'Expand Text editor': 'Vergrößere den Text Editor',
6866
'File library': 'Datei Bibliothek',
6967
'Files': 'Dateien',
70-
'First, please {$startBold}select your current coding skill{$endBold}': 'Bitte, {$startBold}wähle zuerst deine aktuellen Programmierfähigkeiten aus{$endBold}',
7168
'Functions': 'Funktionen',
7269
'Game file': 'Spiele Datei',
7370
'Game': 'Game',
@@ -132,7 +129,6 @@ Locales['deu'] = {
132129
'Serial is disabled!': 'Serielle Schnittstelle ist deaktiviert!',
133130
'Settings': 'Einstellungen',
134131
'Shared with me': 'Für mich freigegeben',
135-
'Show screen on startup': 'Start Bildschirm anzeigen',
136132
'Starred': 'Makiert',
137133
'Start a file': 'Start eine neue Datei',
138134
'Start a new project': 'Starte ein neues Projekt',
@@ -156,17 +152,12 @@ Locales['deu'] = {
156152
'Update': 'Aktualisieren',
157153
'Upload file': 'Datei hochladen',
158154
'Upload': 'Hochladen',
159-
'Use Advanced Mode': 'Verwende den Fortgeschrittener Modus',
160-
'Use Beginner Mode': 'Verwende den Anfänger Modus',
161155
'Use Blockly to build code by dragging and dropping code blocks': 'Verwenden Sie Blockly, um Code zu erstellen, indem Sie Codeblöcke reinziehen und ablegen',
162-
'Use a high-level programming language like JavaScript or CoffeeScript to write your code': 'Verwerden Sie eine höhere Programmiersprache wie JavaScript oder CoffeeScript, um deinen Code zu schreiben.',
163156
'Variables': 'Variablen',
164-
'Welcome to Coding with Chrome!': 'Willkommen zu Programmieren mit Chrome!',
165157
'World wrap sprite': 'Welt wrap Sprite',
166158
'World': 'Welt',
167159
'Write many things on the screen with a repeating program (a loop)': 'Schreiben Sie viele Dinge auf mit einem sich wiederholenden Programm (eine Schleife)',
168160
'Yes': 'Ja',
169-
'You can change your choice at any time in the settings menu': 'Dies kann du jederzeit im “Einstellungsmenü” wieder ändern.',
170161
'acceleration': 'Beschleunigung',
171162
'add background image': 'füge Hintergrundbild hinzu',
172163
'add text': 'hinzufügen von Text',
@@ -307,4 +298,4 @@ Locales['deu'] = {
307298
'with style': 'mit dem Stil',
308299
'with volume': 'mit der Lautstärke',
309300
'{$startSpan}Click here{$endSpan} to see our short introduction to Coding with Chrome.': '{$startSpan}Klicke hier{$endSpan} für eine kurze Einleitung zu "Coding with Chrome".',
310-
};
301+
});

‎locales/deu/welcome_screen.js‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
/**
2+
* @fileoverview Translation file for the Welcome screen (german).
3+
*
4+
* @license Copyright 2018 The Coding with Chrome Authors.
5+
*
6+
* Licensed under the Apache License, Version 2.0 (the "License");
7+
* you may not use this file except in compliance with the License.
8+
* You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing, software
13+
* distributed under the License is distributed on an "AS IS" BASIS,
14+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
* See the License for the specific language governing permissions and
16+
* limitations under the License.
17+
*
18+
* @author mbordihn@google.com (Markus Bordihn)
19+
*/
20+
window['Locales'] = window['Locales'] || {};
21+
Locales['deu'] = Locales['deu'] || {};
22+
23+
24+
/**
25+
* @final
26+
* @export
27+
*/
28+
/* eslint-disable max-len */
29+
Object.assign(Locales['deu'], {
30+
'WELCOME_SCREEN_TITLE': 'Willkommen zu Programmieren mit Chrome!',
31+
'WELCOME_SCREEN_DESCRIPTION': 'Coding with Chrome ist eine pädagogische Entwicklerumgebung',
32+
'WELCOME_SCREEN_HEADER': 'Starte jetzt mit Programmieren ...',
33+
'WELCOME_SCREEN_CHOOSE': 'Bitte, wähle zuerst deine aktuellen Programmierfähigkeiten aus',
34+
'WELCOME_SCREEN_BEGINNER': 'Anfänger',
35+
'WELCOME_SCREEN_BEGINNER_TEXT': 'Lerne mit visuellen Blöcken zu Programmieren. Erstelle Schritt für Schritt ein Programm mit dem setzten, ziehen und ändern von Blöcken.',
36+
'WELCOME_SCREEN_BEGINNER_ACTION': 'Verwende den Anfänger Modus',
37+
'WELCOME_SCREEN_ADVANCED': 'Advanced',
38+
'WELCOME_SCREEN_ADVANCED_TEXT': ' Verwerden Sie eine höhere Programmiersprache wie JavaScript oder Python, um deinen Code zu schreiben.',
39+
'WELCOME_SCREEN_ADVANCED_ACTION': 'Verwende den Fortgeschrittener Modus',
40+
'WECLOME_SCREEN_SHOW_ON_STARTUP': 'Start Bildschirm anzeigen',
41+
'WECLOME_SCREEN_SHOW_ON_STARTUP_NOTE': 'Dies kann du jederzeit im “Einstellungsmenü” wieder ändern.',
42+
});

0 commit comments

Comments
 (0)