From 12fee0f4914e405972a94ce04a6274040d0d8b8c Mon Sep 17 00:00:00 2001 From: osk2 Date: Mon, 24 Jul 2017 11:52:50 +0800 Subject: [PATCH 01/10] Complete i18n --- blockly/blocks.js | 21 +++++++++++++-------- blockly/msg/blocks/en.js | 9 +++++++++ blockly/msg/blocks/zh-hans.js | 17 +++++++++++++---- blockly/msg/blocks/zh-hant.js | 9 +++++++++ 4 files changed, 44 insertions(+), 12 deletions(-) diff --git a/blockly/blocks.js b/blockly/blocks.js index 593699c..37ab0ea 100644 --- a/blockly/blocks.js +++ b/blockly/blocks.js @@ -1,7 +1,7 @@ Blockly.Blocks['gps_new'] = { init: function () { this.appendDummyInput() - .appendField(Blockly.Msg.WEBDUINO_GPS_RX, "GPS定位，rx") + .appendField(Blockly.Msg.WEBDUINO_GPS_RX) .appendField(new Blockly.FieldDropdown([ ["2", "2"], ["3", "3"], @@ -16,7 +16,7 @@ Blockly.Blocks['gps_new'] = { ["12", "12"], ["13", "13"] ]), "rx_") - .appendField(Blockly.Msg.WEBDUINO_GPS_TX, " tx") + .appendField(Blockly.Msg.WEBDUINO_GPS_TX) .appendField(new Blockly.FieldDropdown([ ["2", "2"], ["3", "3"], @@ -44,12 +44,13 @@ Blockly.Blocks['gps_read'] = { this.appendValueInput("qryTime") .setCheck(null) .appendField(new Blockly.FieldVariable("gps"), "gps") - .appendField("取得經緯度和時間，每"); + .appendField(Blockly.Msg.WEBDUINO_GPS_GET_CORD); + .appendField(Blockly.Msg.WEBDUINO_GPS_EVERY); this.appendDummyInput() - .appendField("毫秒執行一次"); + .appendField(Blockly.Msg.WEBDUINO_GPS_RUN_EVERY_MS); this.appendStatementInput("callback") .setCheck(null) - .appendField("執行"); + .appendField(Blockly.Msg.WEBDUINO_GPS_DO); this.setInputsInline(true); this.setPreviousStatement(true, null); this.setNextStatement(true, null); @@ -59,13 +60,17 @@ Blockly.Blocks['gps_read'] = { } }; - Blockly.Blocks['gps_get_data'] = { init: function() { this.appendDummyInput() .appendField(new Blockly.FieldVariable("gps"), "gps") - .appendField("所測得目前的") - .appendField(new Blockly.FieldDropdown([["經度", "longitude"], ["緯度", "latitude"], ["日期", "date"], ["時間", "time"]]), "dataType"); + .appendField(Blockly.Msg.WEBDUINO_GPS_CURRENT_VALUE) + .appendField(new Blockly.FieldDropdown([ + [Blockly.Msg.WEBDUINO_GPS_CURRENT_LONGITUDE, "longitude"], + [Blockly.Msg.WEBDUINO_GPS_CURRENT_LATITUDE, "latitude"], + [Blockly.Msg.WEBDUINO_GPS_CURRENT_DATE, "date"], + [Blockly.Msg.WEBDUINO_GPS_CURRENT_TIME, "time"] + ]), "dataType"); this.setOutput(true, null); this.setColour(20); this.setTooltip(''); diff --git a/blockly/msg/blocks/en.js b/blockly/msg/blocks/en.js index b5bc72b..0b1c13f 100644 --- a/blockly/msg/blocks/en.js +++ b/blockly/msg/blocks/en.js @@ -4,3 +4,12 @@ Blockly.Msg.WEBDUINO_GPS_TX = " TX"; Blockly.Msg.WEBDUINO_GPS_LOCATE = "Location:"; Blockly.Msg.WEBDUINO_GPS_TIME = "Time:"; Blockly.Msg.WEBDUINO_GPS_GET_NOW = "read Info:"; +Blockly.Msg.WEBDUINO_GPS_GET_CORD = "Get coordinate with time"; +Blockly.Msg.WEBDUINO_GPS_EVERY = "run every"; +Blockly.Msg.WEBDUINO_GPS_RUN_EVERY_MS = "millisecond"; +Blockly.Msg.WEBDUINO_GPS_DO = "Do"; +Blockly.Msg.WEBDUINO_GPS_CURRENT_VALUE = "current value of"; +Blockly.Msg.WEBDUINO_GPS_CURRENT_LATITUDE = "latitude"; +Blockly.Msg.WEBDUINO_GPS_CURRENT_LONGITUDE = "longtitude"; +Blockly.Msg.WEBDUINO_GPS_CURRENT_DATE = "date"; +Blockly.Msg.WEBDUINO_GPS_CURRENT_TIME = "time"; \ No newline at end of file diff --git a/blockly/msg/blocks/zh-hans.js b/blockly/msg/blocks/zh-hans.js index b5bc72b..e28d3c0 100644 --- a/blockly/msg/blocks/zh-hans.js +++ b/blockly/msg/blocks/zh-hans.js @@ -1,6 +1,15 @@ // GPS -Blockly.Msg.WEBDUINO_GPS_RX = "GPS (TinyGPS)，RX "; +Blockly.Msg.WEBDUINO_GPS_RX = "GPS 定位(TinyGPS)，RX "; Blockly.Msg.WEBDUINO_GPS_TX = " TX"; -Blockly.Msg.WEBDUINO_GPS_LOCATE = "Location:"; -Blockly.Msg.WEBDUINO_GPS_TIME = "Time:"; -Blockly.Msg.WEBDUINO_GPS_GET_NOW = "read Info:"; +Blockly.Msg.WEBDUINO_GPS_LOCATE = "经纬度:"; +Blockly.Msg.WEBDUINO_GPS_TIME = "目前时间:"; +Blockly.Msg.WEBDUINO_GPS_GET_NOW = "取得资讯:"; +Blockly.Msg.WEBDUINO_GPS_GET_CORD = "取得经纬度和时间"; +Blockly.Msg.WEBDUINO_GPS_EVERY = "，每"; +Blockly.Msg.WEBDUINO_GPS_RUN_EVERY_MS = "毫秒执行一次"; +Blockly.Msg.WEBDUINO_GPS_DO = "执行"; +Blockly.Msg.WEBDUINO_GPS_CURRENT_VALUE = "所测得目前的"; +Blockly.Msg.WEBDUINO_GPS_CURRENT_LATITUDE = "纬度"; +Blockly.Msg.WEBDUINO_GPS_CURRENT_LONGITUDE = "经度"; +Blockly.Msg.WEBDUINO_GPS_CURRENT_DATE = "日期"; +Blockly.Msg.WEBDUINO_GPS_CURRENT_TIME = "时间"; \ No newline at end of file diff --git a/blockly/msg/blocks/zh-hant.js b/blockly/msg/blocks/zh-hant.js index 4c61641..b756754 100644 --- a/blockly/msg/blocks/zh-hant.js +++ b/blockly/msg/blocks/zh-hant.js @@ -4,3 +4,12 @@ Blockly.Msg.WEBDUINO_GPS_TX = " TX"; Blockly.Msg.WEBDUINO_GPS_LOCATE = "經緯度:"; Blockly.Msg.WEBDUINO_GPS_TIME = "目前時間:"; Blockly.Msg.WEBDUINO_GPS_GET_NOW = "取得資訊:"; +Blockly.Msg.WEBDUINO_GPS_GET_CORD = "取得經緯度和時間"; +Blockly.Msg.WEBDUINO_GPS_EVERY = "，每"; +Blockly.Msg.WEBDUINO_GPS_RUN_EVERY_MS = "毫秒執行一次"; +Blockly.Msg.WEBDUINO_GPS_DO = "執行"; +Blockly.Msg.WEBDUINO_GPS_CURRENT_VALUE = "所測得目前的"; +Blockly.Msg.WEBDUINO_GPS_CURRENT_LATITUDE = "緯度"; +Blockly.Msg.WEBDUINO_GPS_CURRENT_LONGITUDE = "經度"; +Blockly.Msg.WEBDUINO_GPS_CURRENT_DATE = "日期"; +Blockly.Msg.WEBDUINO_GPS_CURRENT_TIME = "時間"; \ No newline at end of file From 334e5e63facb89e59189aa577c7211a8e96d9f93 Mon Sep 17 00:00:00 2001 From: oxxo Date: Wed, 2 Aug 2017 13:49:13 +0800 Subject: [PATCH 02/10] edit ui content --- blockly/blocks.js | 4 ++-- blockly/msg/blocks/zh-hant.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/blockly/blocks.js b/blockly/blocks.js index 37ab0ea..b781187 100644 --- a/blockly/blocks.js +++ b/blockly/blocks.js @@ -44,7 +44,7 @@ Blockly.Blocks['gps_read'] = { this.appendValueInput("qryTime") .setCheck(null) .appendField(new Blockly.FieldVariable("gps"), "gps") - .appendField(Blockly.Msg.WEBDUINO_GPS_GET_CORD); + .appendField(Blockly.Msg.WEBDUINO_GPS_GET_CORD) .appendField(Blockly.Msg.WEBDUINO_GPS_EVERY); this.appendDummyInput() .appendField(Blockly.Msg.WEBDUINO_GPS_RUN_EVERY_MS); @@ -72,7 +72,7 @@ Blockly.Blocks['gps_get_data'] = { [Blockly.Msg.WEBDUINO_GPS_CURRENT_TIME, "time"] ]), "dataType"); this.setOutput(true, null); - this.setColour(20); + this.setColour(35); this.setTooltip(''); this.setHelpUrl('https://webduino.io'); } diff --git a/blockly/msg/blocks/zh-hant.js b/blockly/msg/blocks/zh-hant.js index b756754..ac755ef 100644 --- a/blockly/msg/blocks/zh-hant.js +++ b/blockly/msg/blocks/zh-hant.js @@ -1,6 +1,6 @@ // GPS -Blockly.Msg.WEBDUINO_GPS_RX = "GPS 定位(TinyGPS)，RX "; -Blockly.Msg.WEBDUINO_GPS_TX = " TX"; +Blockly.Msg.WEBDUINO_GPS_RX = "GPS 定位 ( TinyGPS )，RX "; +Blockly.Msg.WEBDUINO_GPS_TX = " TX"; Blockly.Msg.WEBDUINO_GPS_LOCATE = "經緯度:"; Blockly.Msg.WEBDUINO_GPS_TIME = "目前時間:"; Blockly.Msg.WEBDUINO_GPS_GET_NOW = "取得資訊:"; From 932c7ffca2e05a31f5286efae2a60a455c4f1302 Mon Sep 17 00:00:00 2001 From: oxxo Date: Wed, 2 Aug 2017 14:07:51 +0800 Subject: [PATCH 03/10] Change order --- blockly.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blockly.json b/blockly.json index 289f230..159a148 100644 --- a/blockly.json +++ b/blockly.json @@ -1,6 +1,6 @@ { "types": ["gps_new","gps_read","gps_get_number"], - "category": "catMenu2", + "category": "catMenu4", "scripts": [ "blockly/blocks.js", "blockly/javascript.js" From 070357a799597f849e66b76eb197385b6c784de5 Mon Sep 17 00:00:00 2001 From: oxxo Date: Fri, 4 Aug 2017 13:54:22 +0800 Subject: [PATCH 04/10] add tutorials link --- blockly/blocks.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/blockly/blocks.js b/blockly/blocks.js index b781187..5ca254a 100644 --- a/blockly/blocks.js +++ b/blockly/blocks.js @@ -1,3 +1,6 @@ +var mainUrl = 'https://tutorials.webduino.io/zh-tw/docs/'; +var utmUrl = '?utm_source=cloud-blockly&utm_campaign=help_url'; + Blockly.Blocks['gps_new'] = { init: function () { this.appendDummyInput() @@ -34,7 +37,7 @@ Blockly.Blocks['gps_new'] = { this.setOutput(true); this.setColour(230); this.setTooltip(''); - this.setHelpUrl('https://webduino.io'); + this.setHelpUrl(mainUrl + 'basic/index.html' + utmUrl); } }; @@ -56,7 +59,7 @@ Blockly.Blocks['gps_read'] = { this.setNextStatement(true, null); this.setColour(65); this.setTooltip(''); - this.setHelpUrl('https://webduino.io'); + this.setHelpUrl(mainUrl + 'basic/index.html' + utmUrl); } }; @@ -74,6 +77,6 @@ Blockly.Blocks['gps_get_data'] = { this.setOutput(true, null); this.setColour(35); this.setTooltip(''); - this.setHelpUrl('https://webduino.io'); + this.setHelpUrl(mainUrl + 'basic/index.html' + utmUrl); } }; \ No newline at end of file From 401aaa11369233993a0522a73811e3126fdcbd57 Mon Sep 17 00:00:00 2001 From: osk2 Date: Fri, 4 Aug 2017 14:01:41 +0800 Subject: [PATCH 05/10] Update translation --- blockly/msg/blocks/en.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blockly/msg/blocks/en.js b/blockly/msg/blocks/en.js index 0b1c13f..e8503fb 100644 --- a/blockly/msg/blocks/en.js +++ b/blockly/msg/blocks/en.js @@ -8,7 +8,7 @@ Blockly.Msg.WEBDUINO_GPS_GET_CORD = "Get coordinate with time"; Blockly.Msg.WEBDUINO_GPS_EVERY = "run every"; Blockly.Msg.WEBDUINO_GPS_RUN_EVERY_MS = "millisecond"; Blockly.Msg.WEBDUINO_GPS_DO = "Do"; -Blockly.Msg.WEBDUINO_GPS_CURRENT_VALUE = "current value of"; +Blockly.Msg.WEBDUINO_GPS_CURRENT_VALUE = "Current value of"; Blockly.Msg.WEBDUINO_GPS_CURRENT_LATITUDE = "latitude"; Blockly.Msg.WEBDUINO_GPS_CURRENT_LONGITUDE = "longtitude"; Blockly.Msg.WEBDUINO_GPS_CURRENT_DATE = "date"; From 2a83905de09b8b04c21543ebce293a3476258398 Mon Sep 17 00:00:00 2001 From: oxxo Date: Fri, 4 Aug 2017 14:09:23 +0800 Subject: [PATCH 06/10] edit utm url --- blockly/blocks.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blockly/blocks.js b/blockly/blocks.js index 5ca254a..675aef0 100644 --- a/blockly/blocks.js +++ b/blockly/blocks.js @@ -1,5 +1,5 @@ var mainUrl = 'https://tutorials.webduino.io/zh-tw/docs/'; -var utmUrl = '?utm_source=cloud-blockly&utm_campaign=help_url'; +var utmUrl = '?utm_source=cloud-blockly&utm_medium=help&utm_campaign=help_url'; Blockly.Blocks['gps_new'] = { init: function () { From 5bb53d05d5bc1406acae32c7c5ecf748a576d8ec Mon Sep 17 00:00:00 2001 From: oxxo Date: Fri, 4 Aug 2017 14:25:31 +0800 Subject: [PATCH 07/10] edit utm url --- blockly/blocks.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blockly/blocks.js b/blockly/blocks.js index 675aef0..b37d4a1 100644 --- a/blockly/blocks.js +++ b/blockly/blocks.js @@ -1,5 +1,5 @@ var mainUrl = 'https://tutorials.webduino.io/zh-tw/docs/'; -var utmUrl = '?utm_source=cloud-blockly&utm_medium=help&utm_campaign=help_url'; +var utmUrl = '?utm_source=cloud-blockly&utm_medium=contextMenu&utm_campaign=tutorials'; Blockly.Blocks['gps_new'] = { init: function () { From a0dd4ae519567edae3b29c9ca37c3c277a09c07e Mon Sep 17 00:00:00 2001 From: osk2 Date: Fri, 4 Aug 2017 14:34:53 +0800 Subject: [PATCH 08/10] Update translation --- blockly/msg/blocks/en.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/blockly/msg/blocks/en.js b/blockly/msg/blocks/en.js index e8503fb..7934cd4 100644 --- a/blockly/msg/blocks/en.js +++ b/blockly/msg/blocks/en.js @@ -1,15 +1,15 @@ // GPS -Blockly.Msg.WEBDUINO_GPS_RX = "GPS (TinyGPS)，RX "; +Blockly.Msg.WEBDUINO_GPS_RX = "GPS (TinyGPS), RX "; Blockly.Msg.WEBDUINO_GPS_TX = " TX"; Blockly.Msg.WEBDUINO_GPS_LOCATE = "Location:"; Blockly.Msg.WEBDUINO_GPS_TIME = "Time:"; -Blockly.Msg.WEBDUINO_GPS_GET_NOW = "read Info:"; -Blockly.Msg.WEBDUINO_GPS_GET_CORD = "Get coordinate with time"; +Blockly.Msg.WEBDUINO_GPS_GET_NOW = "Read Info:"; +Blockly.Msg.WEBDUINO_GPS_GET_CORD = "Get Coordinate with Time"; Blockly.Msg.WEBDUINO_GPS_EVERY = "run every"; -Blockly.Msg.WEBDUINO_GPS_RUN_EVERY_MS = "millisecond"; +Blockly.Msg.WEBDUINO_GPS_RUN_EVERY_MS = "Millisecond"; Blockly.Msg.WEBDUINO_GPS_DO = "Do"; -Blockly.Msg.WEBDUINO_GPS_CURRENT_VALUE = "Current value of"; -Blockly.Msg.WEBDUINO_GPS_CURRENT_LATITUDE = "latitude"; -Blockly.Msg.WEBDUINO_GPS_CURRENT_LONGITUDE = "longtitude"; -Blockly.Msg.WEBDUINO_GPS_CURRENT_DATE = "date"; -Blockly.Msg.WEBDUINO_GPS_CURRENT_TIME = "time"; \ No newline at end of file +Blockly.Msg.WEBDUINO_GPS_CURRENT_VALUE = "Current Value of"; +Blockly.Msg.WEBDUINO_GPS_CURRENT_LATITUDE = "Latitude"; +Blockly.Msg.WEBDUINO_GPS_CURRENT_LONGITUDE = "Longtitude"; +Blockly.Msg.WEBDUINO_GPS_CURRENT_DATE = "Date"; +Blockly.Msg.WEBDUINO_GPS_CURRENT_TIME = "Time"; \ No newline at end of file From 34b1ebfc9499c398a89940266af507f46f67ebbe Mon Sep 17 00:00:00 2001 From: oxxo Date: Fri, 17 Nov 2017 22:35:00 +0800 Subject: [PATCH 09/10] Add index --- blockly/toolbox.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blockly/toolbox.xml b/blockly/toolbox.xml index 137d4c1..32f8340 100644 --- a/blockly/toolbox.xml +++ b/blockly/toolbox.xml @@ -1,4 +1,4 @@ - + gps From 983f805823f03bd3a868eb966cb390cc688b48c5 Mon Sep 17 00:00:00 2001 From: sheng Date: Mon, 14 Apr 2025 11:35:00 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E7=A7=BB=E9=99=A4=20GPS=20=E6=A8=A1?= =?UTF-8?q?=E7=B5=84=E5=B9=AB=E5=8A=A9=E7=B6=B2=E5=9D=80=E7=9A=84=E8=A8=AD?= =?UTF-8?q?=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- blockly/blocks.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/blockly/blocks.js b/blockly/blocks.js index b37d4a1..926aca6 100644 --- a/blockly/blocks.js +++ b/blockly/blocks.js @@ -37,7 +37,7 @@ Blockly.Blocks['gps_new'] = { this.setOutput(true); this.setColour(230); this.setTooltip(''); - this.setHelpUrl(mainUrl + 'basic/index.html' + utmUrl); + this.setHelpUrl(''); } }; @@ -59,7 +59,7 @@ Blockly.Blocks['gps_read'] = { this.setNextStatement(true, null); this.setColour(65); this.setTooltip(''); - this.setHelpUrl(mainUrl + 'basic/index.html' + utmUrl); + this.setHelpUrl(''); } }; @@ -77,6 +77,6 @@ Blockly.Blocks['gps_get_data'] = { this.setOutput(true, null); this.setColour(35); this.setTooltip(''); - this.setHelpUrl(mainUrl + 'basic/index.html' + utmUrl); + this.setHelpUrl(''); } }; \ No newline at end of file