Reverse Rx and Tx

- Improve translation
- Improve code style

Author: osk2

blockly/blocks.js

@@ -4,36 +4,36 @@ var utmUrl = '?utm_source=cloud-blockly&utm_medium=contextMenu&utm_campaign=tuto
 Blockly.Blocks['DFPlayer_new'] = {
   init: function () {
     this.appendDummyInput()
-      .appendField(Blockly.Msg.WEBDUINO_DFPLAYER, "MP3 DFPlayer Rx:")
+      .appendField(Blockly.Msg.WEBDUINO_DFPLAYER)
       .appendField(new Blockly.FieldDropdown([
-        ["2", "2"],
-        ["3", "3"],
-        ["4", "4"],
-        ["5", "5"],
-        ["6", "6"],
-        ["7", "7"],
-        ["8", "8"],
-        ["9", "9"],
-        ["10", "10"],
-        ["11", "11"],
-        ["12", "12"],
-        ["13", "13"]
-      ]), "Rx_")
-      .appendField(Blockly.Msg.WEBDUINO_DFPLAYER_TX, "  Tx")
+        ['2', '2'],
+        ['3', '3'],
+        ['4', '4'],
+        ['5', '5'],
+        ['6', '6'],
+        ['7', '7'],
+        ['8', '8'],
+        ['9', '9'],
+        ['10', '10'],
+        ['11', '11'],
+        ['12', '12'],
+        ['13', '13']
+      ]), 'Rx_')
+      .appendField(Blockly.Msg.WEBDUINO_DFPLAYER_RX)
       .appendField(new Blockly.FieldDropdown([
-        ["2", "2"],
-        ["3", "3"],
-        ["4", "4"],
-        ["5", "5"],
-        ["6", "6"],
-        ["7", "7"],
-        ["8", "8"],
-        ["9", "9"],
-        ["10", "10"],
-        ["11", "11"],
-        ["12", "12"],
-        ["13", "13"]
-      ]), "Tx_");
+        ['2', '2'],
+        ['3', '3'],
+        ['4', '4'],
+        ['5', '5'],
+        ['6', '6'],
+        ['7', '7'],
+        ['8', '8'],
+        ['9', '9'],
+        ['10', '10'],
+        ['11', '11'],
+        ['12', '12'],
+        ['13', '13']
+      ]), 'Tx_');
     this.setOutput(true);
     this.setColour(230);
     this.setTooltip('');
@@ -43,11 +43,11 @@ Blockly.Blocks['DFPlayer_new'] = {
 
 Blockly.Blocks['DFPlayer_play'] = {
   init: function () {
-    this.appendValueInput("value_")
-      .appendField(new Blockly.FieldVariable("dfplayer"), "name_")
-      .appendField(Blockly.Msg.WEBDUINO_DFPLAYER_PLAY, "播放第");
+    this.appendValueInput('value_')
+      .appendField(new Blockly.FieldVariable('dfplayer'), 'name_')
+      .appendField(Blockly.Msg.WEBDUINO_DFPLAYER_PLAY);
     this.appendDummyInput()
-      .appendField(Blockly.Msg.WEBDUINO_DFPLAYER_NUM,"首");
+      .appendField(Blockly.Msg.WEBDUINO_DFPLAYER_NUM);
     this.setPreviousStatement(true);
     this.setNextStatement(true);
     this.setTooltip('');
@@ -58,9 +58,9 @@ Blockly.Blocks['DFPlayer_play'] = {
 
 Blockly.Blocks['DFPlayer_volume'] = {
   init: function () {
-    this.appendValueInput("value_")
-      .appendField(new Blockly.FieldVariable("dfplayer"), "name_")
-      .appendField(Blockly.Msg.WEBDUINO_DFPLAYER_VOLUME, "音量:");
+    this.appendValueInput('value_')
+      .appendField(new Blockly.FieldVariable('dfplayer'), 'name_')
+      .appendField(Blockly.Msg.WEBDUINO_DFPLAYER_VOLUME);
     this.setPreviousStatement(true);
     this.setNextStatement(true);
     this.setTooltip('');
@@ -71,11 +71,11 @@ Blockly.Blocks['DFPlayer_volume'] = {
 
 Blockly.Blocks['DFPlayer_loop'] = {
   init: function () {
-    this.appendValueInput("value_")
-      .appendField(new Blockly.FieldVariable("dfplayer"), "name_")
-      .appendField(Blockly.Msg.WEBDUINO_DFPLAYER_LOOP, "重複播放第");
+    this.appendValueInput('value_')
+      .appendField(new Blockly.FieldVariable('dfplayer'), 'name_')
+      .appendField(Blockly.Msg.WEBDUINO_DFPLAYER_LOOP);
     this.appendDummyInput()
-      .appendField(Blockly.Msg.WEBDUINO_DFPLAYER_NUM,"首");
+      .appendField(Blockly.Msg.WEBDUINO_DFPLAYER_NUM);
     this.setPreviousStatement(true);
     this.setNextStatement(true);
     this.setTooltip('');
@@ -87,15 +87,15 @@ Blockly.Blocks['DFPlayer_loop'] = {
 Blockly.Blocks['DFPlayer_action'] = {
   init: function() {
     this.appendDummyInput()
-        .appendField(new Blockly.FieldVariable("dfplayer"), "name_")
-        .appendField(Blockly.Msg.WEBDUINO_DFPLAYER_SET, "設定")
+        .appendField(new Blockly.FieldVariable('dfplayer'), 'name_')
+        .appendField(Blockly.Msg.WEBDUINO_DFPLAYER_SET)
         .appendField(new Blockly.FieldDropdown([
-          [Blockly.Msg.WEBDUINO_DFPLAYER_PREVIOUS, "prev"],
-          [Blockly.Msg.WEBDUINO_DFPLAYER_NEXT, "next"],
-          [Blockly.Msg.WEBDUINO_DFPLAYER_START, "start"],
-          [Blockly.Msg.WEBDUINO_DFPLAYER_STOP, "stop"],
-          [Blockly.Msg.WEBDUINO_DFPLAYER_PAUSE, "pause"]
-        ]), "action_");
+          [Blockly.Msg.WEBDUINO_DFPLAYER_PREVIOUS, 'prev'],
+          [Blockly.Msg.WEBDUINO_DFPLAYER_NEXT, 'next'],
+          [Blockly.Msg.WEBDUINO_DFPLAYER_START, 'start'],
+          [Blockly.Msg.WEBDUINO_DFPLAYER_STOP, 'stop'],
+          [Blockly.Msg.WEBDUINO_DFPLAYER_PAUSE, 'pause']
+        ]), 'action_');
     this.setInputsInline(false);
     this.setPreviousStatement(true, null);
     this.setNextStatement(true, null);

blockly/msg/blocks/en.js

@@ -1,5 +1,5 @@
-Blockly.Msg.WEBDUINO_DFPLAYER = 'MP3 ( DFPlayer ), Rx ';
-Blockly.Msg.WEBDUINO_DFPLAYER_TX = '  Tx';
+Blockly.Msg.WEBDUINO_DFPLAYER = 'MP3 (DFPlayer), Tx ';
+Blockly.Msg.WEBDUINO_DFPLAYER_RX = '  Rx';
 Blockly.Msg.WEBDUINO_DFPLAYER_PLAY = 'Play #';
 Blockly.Msg.WEBDUINO_DFPLAYER_START = 'Start';
 Blockly.Msg.WEBDUINO_DFPLAYER_STOP = 'Stop';

blockly/msg/blocks/zh-hans.js

@@ -1,5 +1,5 @@
-Blockly.Msg.WEBDUINO_DFPLAYER = 'MP3 ( DFPlayer )，Rx ';
-Blockly.Msg.WEBDUINO_DFPLAYER_TX = '  Tx';
+Blockly.Msg.WEBDUINO_DFPLAYER = 'MP3 (DFPlayer)，Tx ';
+Blockly.Msg.WEBDUINO_DFPLAYER_RX = '  Rx';
 Blockly.Msg.WEBDUINO_DFPLAYER_PLAY = '播放第';
 Blockly.Msg.WEBDUINO_DFPLAYER_START = '开始播放';
 Blockly.Msg.WEBDUINO_DFPLAYER_STOP = '停止播放';

blockly/msg/blocks/zh-hant.js

@@ -1,5 +1,5 @@
-Blockly.Msg.WEBDUINO_DFPLAYER = 'MP3 ( DFPlayer )，Rx ';
-Blockly.Msg.WEBDUINO_DFPLAYER_TX = '  Tx';
+Blockly.Msg.WEBDUINO_DFPLAYER = 'MP3 (DFPlayer)，Tx ';
+Blockly.Msg.WEBDUINO_DFPLAYER_RX = '  Rx';
 Blockly.Msg.WEBDUINO_DFPLAYER_PLAY = '播放第';
 Blockly.Msg.WEBDUINO_DFPLAYER_START = '開始播放';
 Blockly.Msg.WEBDUINO_DFPLAYER_STOP = '停止播放';