Skip to content

Commit ead7b29

Browse files
committed
Translated log levels
1 parent 887402b commit ead7b29

File tree

3 files changed

+28
-20
lines changed

3 files changed

+28
-20
lines changed

src/public/google-blockly/own/blocks_action.js

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Blockly.Action.blocks['exec'] =
2323
+ ' <field name="TEXT">pwd</field>'
2424
+ ' </shadow>'
2525
+ ' </value>'
26-
+ ' <value name="LOG">'
26+
+ ' <value name="LOG_LEVEL">'
2727
+ ' </value>'
2828
+ ' <value name="WITH_STATEMENT">'
2929
+ ' </value>'
@@ -44,15 +44,15 @@ Blockly.Blocks['exec'] = {
4444
this.sourceBlock_.updateShape_(option === true || option === 'true' || option === 'TRUE');
4545
}), 'WITH_STATEMENT');
4646

47-
this.appendDummyInput('LOG')
48-
.appendField(Blockly.Translate('exec_log'))
47+
this.appendDummyInput('LOG_LEVEL')
48+
.appendField(Blockly.Translate('loglevel'))
4949
.appendField(new Blockly.FieldDropdown([
50-
[Blockly.Translate('exec_log_none'), ''],
51-
[Blockly.Translate('exec_log_info'), 'log'],
52-
[Blockly.Translate('exec_log_debug'), 'debug'],
53-
[Blockly.Translate('exec_log_warn'), 'warn'],
54-
[Blockly.Translate('exec_log_error'), 'error']
55-
]), 'LOG');
50+
[Blockly.Translate('loglevel_none'), ''],
51+
[Blockly.Translate('loglevel_debug'), 'debug'],
52+
[Blockly.Translate('loglevel_info'), 'info'],
53+
[Blockly.Translate('loglevel_warn'), 'warn'],
54+
[Blockly.Translate('loglevel_error'), 'error'],
55+
]), 'LOG_LEVEL');
5656

5757
this.setInputsInline(false);
5858
this.setPreviousStatement(true, null);
@@ -90,8 +90,8 @@ Blockly.Blocks['exec'] = {
9090
};
9191

9292
Blockly.JavaScript['exec'] = function(block) {
93-
const logLevel = block.getFieldValue('LOG');
9493
const value_command = Blockly.JavaScript.valueToCode(block, 'COMMAND', Blockly.JavaScript.ORDER_ATOMIC);
94+
const logLevel = block.getFieldValue('LOG_LEVEL');
9595
const withStatement = block.getFieldValue('WITH_STATEMENT');
9696

9797
let logText;

src/public/google-blockly/own/blocks_system.js

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,8 @@ Blockly.System.blocks['debug'] =
5858
+ ' <field name="TEXT">test</field>'
5959
+ ' </shadow>'
6060
+ ' </value>'
61+
+ ' <value name="LOG_LEVEL">'
62+
+ ' </value>'
6163
+ '</block>';
6264

6365
Blockly.Blocks['debug'] = {
@@ -66,8 +68,13 @@ Blockly.Blocks['debug'] = {
6668
.setCheck(null)
6769
.appendField(Blockly.Translate('debug'));
6870

69-
this.appendDummyInput()
70-
.appendField(new Blockly.FieldDropdown([['info', 'log'], ['debug', 'debug'], ['warning', 'warn'], ['error', 'error']]), 'Severity');
71+
this.appendDummyInput('LOG_LEVEL')
72+
.appendField(new Blockly.FieldDropdown([
73+
[Blockly.Translate('loglevel_debug'), 'debug'],
74+
[Blockly.Translate('loglevel_info'), 'info'],
75+
[Blockly.Translate('loglevel_warn'), 'warn'],
76+
[Blockly.Translate('loglevel_error'), 'error'],
77+
]), 'LOG_LEVEL');
7178

7279
this.setPreviousStatement(true, null);
7380
this.setNextStatement(true, null);
@@ -80,9 +87,9 @@ Blockly.Blocks['debug'] = {
8087

8188
Blockly.JavaScript['debug'] = function(block) {
8289
const value_text = Blockly.JavaScript.valueToCode(block, 'TEXT', Blockly.JavaScript.ORDER_ATOMIC);
83-
const dropdown_severity = block.getFieldValue('Severity');
90+
const logLevel = block.getFieldValue('LOG_LEVEL');
8491

85-
return `console.${dropdown_severity}(${value_text});\n`;
92+
return `console.${logLevel}(${value_text});\n`;
8693
};
8794

8895
// --- comment --------------------------------------------------

src/public/google-blockly/own/blocks_words.js

Lines changed: 7 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)