Skip to content

Commit 5ea4d71

Browse files
osk2osk2
committed
Complete translation of joystick
1 parent 93f6b7e commit 5ea4d71

4 files changed

Lines changed: 28 additions & 14 deletions

File tree

‎blocks/msg/en.js‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -352,6 +352,11 @@ Blockly.Msg.WEBDUINO_SHOCK_EVENT_DO = "do:";
352352
Blockly.Msg.WEBDUINO_SHOCK_EVENT_HIGH = "high";
353353
Blockly.Msg.WEBDUINO_SHOCK_EVENT_LOW = "low";
354354

355+
Blockly.Msg.WEBDUINO_JOYSTICK = 'Joystick';
356+
Blockly.Msg.WEBDUINO_JOYSTICK_VALUE = 'value:';
357+
Blockly.Msg.WEBDUINO_JOYSTICK_DO = 'do:';
358+
359+
355360
Blockly.Msg.WEBDUINO_PIR = "PIR motion sensor, pin:";
356361
Blockly.Msg.WEBDUINO_PIR_WHEN = "When";
357362
Blockly.Msg.WEBDUINO_PIR_STATUS_DETECTED = "detect";
@@ -632,11 +637,11 @@ Blockly.Msg.WEBDUINO_IRLED_LAUNCHCODE = "Launch codes (m-16):";
632637

633638
Blockly.Msg.WEBDUINO_ADXL345 = "ADXL345, SDA";
634639
Blockly.Msg.WEBDUINO_ADXL345_SCL = " SCL";
635-
Blockly.Msg.WEBDUINO_ADXL345_ON = "start detecting";
636640
Blockly.Msg.WEBDUINO_ADXL345_DO = "do:";
637641
Blockly.Msg.WEBDUINO_ADXL345_S = "'s";
638642
Blockly.Msg.WEBDUINO_ADXL345_VAL = "value";
639-
Blockly.Msg.WEBDUINO_ADXL345_OFF = "stop detecting";
643+
Blockly.Msg.WEBDUINO_START_DETECTING = "start detecting";
644+
Blockly.Msg.WEBDUINO_STOP_DETECTING = "stop detecting";
640645

641646
// Tutorials - Photcell
642647

‎blocks/msg/zh-hans.js‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -389,6 +389,11 @@ Blockly.Msg.WEBDUINO_SHOCK_EVENT_DO = "执行";
389389
Blockly.Msg.WEBDUINO_SHOCK_EVENT_HIGH = "通电";
390390
Blockly.Msg.WEBDUINO_SHOCK_EVENT_LOW = "断电";
391391

392+
// Joystick
393+
Blockly.Msg.WEBDUINO_JOYSTICK = '摇杆';
394+
Blockly.Msg.WEBDUINO_JOYSTICK_VALUE = '数值：';
395+
Blockly.Msg.WEBDUINO_JOYSTICK_DO = '执行：';
396+
392397
// PIR
393398

394399
Blockly.Msg.WEBDUINO_PIR = "人体红外线侦测传感器，脚位";
@@ -473,11 +478,11 @@ Blockly.Msg.WEBDUINO_IRLED_LAUNCHCODE = "发射代码 ( 十六进位 )";
473478

474479
Blockly.Msg.WEBDUINO_ADXL345 = "三轴加速度计，SDA";
475480
Blockly.Msg.WEBDUINO_ADXL345_SCL = " SCL";
476-
Blockly.Msg.WEBDUINO_ADXL345_ON = "开始侦测";
477481
Blockly.Msg.WEBDUINO_ADXL345_DO = "执行";
478482
Blockly.Msg.WEBDUINO_ADXL345_S = "的";
479483
Blockly.Msg.WEBDUINO_ADXL345_VAL = "数值";
480-
Blockly.Msg.WEBDUINO_ADXL345_OFF = "停止侦测";
484+
Blockly.Msg.WEBDUINO_START_DETECTING = "开始侦测";
485+
Blockly.Msg.WEBDUINO_STOP_DETECTING = "停止侦测";
481486

482487
// HX711
483488

‎blocks/msg/zh-hant.js‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -383,6 +383,11 @@ Blockly.Msg.WEBDUINO_SHOCK_EVENT_DO = "執行";
383383
Blockly.Msg.WEBDUINO_SHOCK_EVENT_HIGH = "通電";
384384
Blockly.Msg.WEBDUINO_SHOCK_EVENT_LOW = "斷電";
385385

386+
// Joystick
387+
Blockly.Msg.WEBDUINO_JOYSTICK = '搖桿';
388+
Blockly.Msg.WEBDUINO_JOYSTICK_VALUE = '數值：';
389+
Blockly.Msg.WEBDUINO_JOYSTICK_DO = '執行：';
390+
386391
// PIR
387392

388393
Blockly.Msg.WEBDUINO_PIR = "人體紅外線偵測傳感器，腳位";
@@ -467,11 +472,11 @@ Blockly.Msg.WEBDUINO_IRLED_LAUNCHCODE = "發射代碼 ( 十六進位 )";
467472

468473
Blockly.Msg.WEBDUINO_ADXL345 = "三軸加速度計，SDA";
469474
Blockly.Msg.WEBDUINO_ADXL345_SCL = " SCL";
470-
Blockly.Msg.WEBDUINO_ADXL345_ON = "開始偵測";
471475
Blockly.Msg.WEBDUINO_ADXL345_DO = "執行";
472476
Blockly.Msg.WEBDUINO_ADXL345_S = "的";
473477
Blockly.Msg.WEBDUINO_ADXL345_VAL = "數值";
474-
Blockly.Msg.WEBDUINO_ADXL345_OFF = "停止偵測";
478+
Blockly.Msg.WEBDUINO_START_DETECTING = "開始偵測";
479+
Blockly.Msg.WEBDUINO_STOP_DETECTING = "停止偵測";
475480

476481
// Car
477482

‎blocks/webduino.js‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3463,7 +3463,7 @@ Blockly.Blocks['adxl345_on'] = {
34633463
init: function () {
34643464
this.appendDummyInput()
34653465
.appendField(new Blockly.FieldVariable("adxl"), "name_")
3466-
.appendField(Blockly.Msg.WEBDUINO_ADXL345_ON, "開始偵測");
3466+
.appendField(Blockly.Msg.WEBDUINO_START_DETECTING, "開始偵測");
34673467
this.appendStatementInput("on_")
34683468
.appendField(Blockly.Msg.WEBDUINO_ADXL345_DO, "執行：");
34693469
this.setPreviousStatement(true);
@@ -3498,7 +3498,7 @@ Blockly.Blocks['adxl345_off'] = {
34983498
init: function () {
34993499
this.appendDummyInput()
35003500
.appendField(new Blockly.FieldVariable("adxl"), "name_")
3501-
.appendField(Blockly.Msg.WEBDUINO_ADXL345_OFF, "停止偵測");
3501+
.appendField(Blockly.Msg.WEBDUINO_STOP_DETECTING, "停止偵測");
35023502
this.setPreviousStatement(true);
35033503
this.setNextStatement(true);
35043504
this.setColour(65);
@@ -3511,7 +3511,7 @@ Blockly.Blocks['adxl345_off'] = {
35113511
Blockly.Blocks['joystick_new'] = {
35123512
init: function () {
35133513
this.appendDummyInput()
3514-
.appendField("搖桿，X")
3514+
.appendField(Blockly.Msg.WEBDUINO_JOYSTICK + " X", "搖桿 X")
35153515
.appendField(new Blockly.FieldDropdown([
35163516
["A0", "0"],
35173517
["A1", "1"],
@@ -3561,9 +3561,9 @@ Blockly.Blocks['joystick_on'] = {
35613561
init: function () {
35623562
this.appendDummyInput()
35633563
.appendField(new Blockly.FieldVariable("joystick"), "name_")
3564-
.appendField("開始偵測");
3564+
.appendField(Blockly.Msg.WEBDUINO_START_DETECTING, "開始偵測");
35653565
this.appendStatementInput("on_")
3566-
.appendField("執行：");
3566+
.appendField(Blockly.Msg.WEBDUINO_JOYSTICK_DO, "執行：");
35673567
this.setPreviousStatement(true);
35683568
this.setNextStatement(true);
35693569
this.setColour(65);
@@ -3576,13 +3576,12 @@ Blockly.Blocks['joystick_val'] = {
35763576
init: function () {
35773577
this.appendDummyInput()
35783578
.appendField(new Blockly.FieldVariable("joystick"), "name_")
3579-
.appendField("的")
3579+
.appendField(Blockly.Msg.WEBDUINO_JOYSTICK_VALUE, "數值：")
35803580
.appendField(new Blockly.FieldDropdown([
35813581
["X", "_x"],
35823582
["Y", "_y"],
35833583
["SW", "_z"]
35843584
]), "val_")
3585-
.appendField("數值");
35863585
this.setOutput(true);
35873586
this.setTooltip('');
35883587
this.setColour(35);
@@ -3594,7 +3593,7 @@ Blockly.Blocks['joystick_off'] = {
35943593
init: function () {
35953594
this.appendDummyInput()
35963595
.appendField(new Blockly.FieldVariable("joystick"), "name_")
3597-
.appendField("停止偵測");
3596+
.appendField(Blockly.Msg.WEBDUINO_STOP_DETECTING, "停止偵測");
35983597
this.setPreviousStatement(true);
35993598
this.setNextStatement(true);
36003599
this.setColour(65);

0 commit comments

Comments
 (0)