Translated log levels

ioBroker · May 3, 2024 · ead7b29 · ead7b29
1 parent 887402b
commit ead7b29
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 20 deletions.
diff --git a/src/public/google-blockly/own/blocks_action.js b/src/public/google-blockly/own/blocks_action.js
@@ -23,7 +23,7 @@ Blockly.Action.blocks['exec'] =
     + '             <field name="TEXT">pwd</field>'
     + '         </shadow>'
     + '     </value>'
-    + '     <value name="LOG">'
+    + '     <value name="LOG_LEVEL">'
     + '     </value>'
     + '     <value name="WITH_STATEMENT">'
     + '     </value>'
@@ -44,15 +44,15 @@ Blockly.Blocks['exec'] = {
                 this.sourceBlock_.updateShape_(option === true || option === 'true' || option === 'TRUE');
             }), 'WITH_STATEMENT');
 
-        this.appendDummyInput('LOG')
-            .appendField(Blockly.Translate('exec_log'))
+        this.appendDummyInput('LOG_LEVEL')
+            .appendField(Blockly.Translate('loglevel'))
             .appendField(new Blockly.FieldDropdown([
-                [Blockly.Translate('exec_log_none'),  ''],
-                [Blockly.Translate('exec_log_info'),  'log'],
-                [Blockly.Translate('exec_log_debug'), 'debug'],
-                [Blockly.Translate('exec_log_warn'),  'warn'],
-                [Blockly.Translate('exec_log_error'), 'error']
-            ]), 'LOG');
+                [Blockly.Translate('loglevel_none'),  ''],
+                [Blockly.Translate('loglevel_debug'), 'debug'],
+                [Blockly.Translate('loglevel_info'),  'info'],
+                [Blockly.Translate('loglevel_warn'),  'warn'],
+                [Blockly.Translate('loglevel_error'), 'error'],
+            ]), 'LOG_LEVEL');
 
         this.setInputsInline(false);
         this.setPreviousStatement(true, null);
@@ -90,8 +90,8 @@ Blockly.Blocks['exec'] = {
 };
 
 Blockly.JavaScript['exec'] = function(block) {
-    const logLevel = block.getFieldValue('LOG');
     const value_command = Blockly.JavaScript.valueToCode(block, 'COMMAND', Blockly.JavaScript.ORDER_ATOMIC);
+    const logLevel = block.getFieldValue('LOG_LEVEL');
     const withStatement = block.getFieldValue('WITH_STATEMENT');
 
     let logText;

diff --git a/src/public/google-blockly/own/blocks_system.js b/src/public/google-blockly/own/blocks_system.js
@@ -58,6 +58,8 @@ Blockly.System.blocks['debug'] =
     + '             <field name="TEXT">test</field>'
     + '         </shadow>'
     + '     </value>'
+    + '     <value name="LOG_LEVEL">'
+    + '     </value>'
     + '</block>';
 
 Blockly.Blocks['debug'] = {
@@ -66,8 +68,13 @@ Blockly.Blocks['debug'] = {
             .setCheck(null)
             .appendField(Blockly.Translate('debug'));
 
-        this.appendDummyInput()
-            .appendField(new Blockly.FieldDropdown([['info', 'log'], ['debug', 'debug'], ['warning', 'warn'], ['error', 'error']]), 'Severity');
+        this.appendDummyInput('LOG_LEVEL')
+            .appendField(new Blockly.FieldDropdown([
+                [Blockly.Translate('loglevel_debug'), 'debug'],
+                [Blockly.Translate('loglevel_info'),  'info'],
+                [Blockly.Translate('loglevel_warn'),  'warn'],
+                [Blockly.Translate('loglevel_error'), 'error'],
+            ]), 'LOG_LEVEL');
 
         this.setPreviousStatement(true, null);
         this.setNextStatement(true, null);
@@ -80,9 +87,9 @@ Blockly.Blocks['debug'] = {
 
 Blockly.JavaScript['debug'] = function(block) {
     const value_text = Blockly.JavaScript.valueToCode(block, 'TEXT', Blockly.JavaScript.ORDER_ATOMIC);
-    const dropdown_severity = block.getFieldValue('Severity');
+    const logLevel = block.getFieldValue('LOG_LEVEL');
 
-    return `console.${dropdown_severity}(${value_text});\n`;
+    return `console.${logLevel}(${value_text});\n`;
 };
 
 // --- comment --------------------------------------------------

diff --git a/src/public/google-blockly/own/blocks_words.js b/src/public/google-blockly/own/blocks_words.js