From 0d1f9a55fe77279552f79d35bd0f293181466b9e Mon Sep 17 00:00:00 2001 From: Diana Lopez Alvas Date: Thu, 10 Mar 2022 11:04:41 -0300 Subject: [PATCH 1/9] procedures internationalization --- app/services/blocks-gallery.js | 15 ++++++++++++++- translations/blocks/en-us.yaml | 8 +++++++- translations/blocks/es-ar.yaml | 6 ++++++ 3 files changed, 27 insertions(+), 2 deletions(-) diff --git a/app/services/blocks-gallery.js b/app/services/blocks-gallery.js index f40f9b0a6..421cc226a 100644 --- a/app/services/blocks-gallery.js +++ b/app/services/blocks-gallery.js @@ -198,6 +198,18 @@ export default Service.extend({ }); }, + defineProcedureTranslations(){ + Blockly.Msg.PROCEDURES_DEFNORETURN_PROCEDURE = this.tString("procedures.name") + Blockly.Msg.PROCEDURES_DEFNORETURN_TITLE = this.tString("procedures.definition") + Blockly.Msg.PROCEDURES_DEFRETURN_TITLE = this.tString("procedures.definition") + Blockly.Msg.PROCEDURES_BEFORE_PARAMS = this.tString("procedures.paramWith") + Blockly.Msg.PROCEDURES_PARAMETER = this.tString("procedures.paramName") + Blockly.Msg.PROCEDURES_CALL_BEFORE_PARAMS = this.tString("procedures.paramWith") + Blockly.Msg.PROCEDURES_DEFNORETURN_TOOLTIP = this.tString("procedures.create") + + initProcedsBlockly(false); + }, + _definirColores() { // Pisar las globales de Blockly es necesario pues usamos algunos bloques de Blockly como aliases. Blockly.Blocks.math.HUE = 94; // En PB 1.1.2 era '#48930e' @@ -1360,7 +1372,8 @@ export default Service.extend({ } }; - Blockly.Msg.PROCEDURES_DEFNORETURN_TITLE = "Definir"; + this.defineProcedureTranslations() + let init_base_procedimiento = Blockly.Blocks.procedures_defnoreturn.init; Blockly.Blocks.procedures_defnoreturn.init = function () { diff --git a/translations/blocks/en-us.yaml b/translations/blocks/en-us.yaml index 9d153bb9d..6b8b48ed8 100644 --- a/translations/blocks/en-us.yaml +++ b/translations/blocks/en-us.yaml @@ -121,4 +121,10 @@ categories: sensors: "Sensors" operators: "Operators" myFunctions: "My functions" - uncategorized: "Uncategorized" \ No newline at end of file + uncategorized: "Uncategorized" +procedures: + definition: "Define" + name: "Do something" + paramWith: "with" + paramName: "parameter" + create: "Create a procedure." diff --git a/translations/blocks/es-ar.yaml b/translations/blocks/es-ar.yaml index 6e91b740d..d86b572a1 100644 --- a/translations/blocks/es-ar.yaml +++ b/translations/blocks/es-ar.yaml @@ -122,3 +122,9 @@ categories: operators: "Operadores" myFunctions: "Mis funciones" uncategorized: "SIN CATEGORÍA" +procedures: + definition: "Definir" + name: "Hacer algo" + paramWith: "con" + paramName: "parámetro" + create: "Crea un procedimiento." From dd6b5c009f6062de11011fbbc0b6706ceaadf0db Mon Sep 17 00:00:00 2001 From: Diana Lopez Alvas Date: Thu, 17 Mar 2022 16:01:23 -0300 Subject: [PATCH 2/9] changing proceds blockly init --- app/index.html | 4 +--- app/services/blocks-gallery.js | 7 ++++++- tests/index.html | 2 +- translations/blocks/en-us.yaml | 5 +++++ translations/blocks/es-ar.yaml | 5 +++++ 5 files changed, 18 insertions(+), 5 deletions(-) diff --git a/app/index.html b/app/index.html index 2a9a56c7f..2d148f9e7 100644 --- a/app/index.html +++ b/app/index.html @@ -41,9 +41,7 @@ - + {{content-for "body-footer"}} diff --git a/app/services/blocks-gallery.js b/app/services/blocks-gallery.js index 421cc226a..6277d6ebf 100644 --- a/app/services/blocks-gallery.js +++ b/app/services/blocks-gallery.js @@ -206,8 +206,13 @@ export default Service.extend({ Blockly.Msg.PROCEDURES_PARAMETER = this.tString("procedures.paramName") Blockly.Msg.PROCEDURES_CALL_BEFORE_PARAMS = this.tString("procedures.paramWith") Blockly.Msg.PROCEDURES_DEFNORETURN_TOOLTIP = this.tString("procedures.create") + Blockly.Msg.PROCEDURES_DEFNORETURN_COMMENT = this.tString("procedures.comment") + Blockly.Msg.PROCEDURES_DEFNORETURN_NOPARAMS = this.tString("procedures.noParams") + Blockly.Msg.PROCEDURES_ADD_PARAMETER = this.tString("procedures.addParam") + Blockly.Msg.PROCEDURES_ADD_PARAMETER_PROMPT = this.tString("procedures.addParamPrompt") + Blockly.Msg.PROCEDURES_REMOVE_PARAMETER = this.tString("procedures.removeParam") - initProcedsBlockly(false); + ProcedsBlockly.init() }, _definirColores() { diff --git a/tests/index.html b/tests/index.html index 8e55034c8..5f12cf75c 100644 --- a/tests/index.html +++ b/tests/index.html @@ -38,7 +38,7 @@ - + {{content-for "body-footer"}} {{content-for "test-body-footer"}} diff --git a/translations/blocks/en-us.yaml b/translations/blocks/en-us.yaml index 6b8b48ed8..2ff0c6970 100644 --- a/translations/blocks/en-us.yaml +++ b/translations/blocks/en-us.yaml @@ -128,3 +128,8 @@ procedures: paramWith: "with" paramName: "parameter" create: "Create a procedure." + removeParam: "Remove parameter" + comment: "Describe the procedure..." + noParams: "" + addParam: "Add parameter" + addParamPrompt: "Ingresa el nombre del parámetro" diff --git a/translations/blocks/es-ar.yaml b/translations/blocks/es-ar.yaml index d86b572a1..701b43592 100644 --- a/translations/blocks/es-ar.yaml +++ b/translations/blocks/es-ar.yaml @@ -128,3 +128,8 @@ procedures: paramWith: "con" paramName: "parámetro" create: "Crea un procedimiento." + removeParam: "Quitar parámetro" + comment: "Describe el procedimiento..." + noParams: "" + addParam: "Agregar parámetro" + addParamPrompt: "Enter the parameter's name" From 95a9f7809d1e6da60fc64c9aa425d586b4f00a52 Mon Sep 17 00:00:00 2001 From: Diana Lopez Alvas Date: Fri, 18 Mar 2022 12:10:50 -0300 Subject: [PATCH 3/9] delete defreturn --- app/services/blocks-gallery.js | 1 - 1 file changed, 1 deletion(-) diff --git a/app/services/blocks-gallery.js b/app/services/blocks-gallery.js index 6277d6ebf..d98bd4adf 100644 --- a/app/services/blocks-gallery.js +++ b/app/services/blocks-gallery.js @@ -201,7 +201,6 @@ export default Service.extend({ defineProcedureTranslations(){ Blockly.Msg.PROCEDURES_DEFNORETURN_PROCEDURE = this.tString("procedures.name") Blockly.Msg.PROCEDURES_DEFNORETURN_TITLE = this.tString("procedures.definition") - Blockly.Msg.PROCEDURES_DEFRETURN_TITLE = this.tString("procedures.definition") Blockly.Msg.PROCEDURES_BEFORE_PARAMS = this.tString("procedures.paramWith") Blockly.Msg.PROCEDURES_PARAMETER = this.tString("procedures.paramName") Blockly.Msg.PROCEDURES_CALL_BEFORE_PARAMS = this.tString("procedures.paramWith") From 7caec8748c44853a1ab02676f422da49ac93e318 Mon Sep 17 00:00:00 2001 From: Diana Lopez Alvas Date: Mon, 21 Mar 2022 11:19:57 -0300 Subject: [PATCH 4/9] adding inits --- app/index.html | 3 +++ app/services/blocks-gallery.js | 1 + tests/index.html | 4 +++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/index.html b/app/index.html index 2d148f9e7..4745910ac 100644 --- a/app/index.html +++ b/app/index.html @@ -41,6 +41,9 @@ + {{content-for "body-footer"}} diff --git a/app/services/blocks-gallery.js b/app/services/blocks-gallery.js index d98bd4adf..78471d907 100644 --- a/app/services/blocks-gallery.js +++ b/app/services/blocks-gallery.js @@ -1,6 +1,7 @@ import Service, { inject as service } from '@ember/service' import { isInsideProcedureDef, hasParam, isFlying, getName, requiredAllInputs } from './block-utils' import Ember from 'ember' +import * as ProcedsBlockly from 'proceds-blockly/proceds-blockly' export default Service.extend({ blockly: service(), diff --git a/tests/index.html b/tests/index.html index 5f12cf75c..4aebe4ab5 100644 --- a/tests/index.html +++ b/tests/index.html @@ -38,7 +38,9 @@ - + {{content-for "body-footer"}} {{content-for "test-body-footer"}} From d3b54d041b5888cea22974ea8e48485064b4c2eb Mon Sep 17 00:00:00 2001 From: Alfredo Sanzo Date: Mon, 21 Mar 2022 13:34:22 -0300 Subject: [PATCH 5/9] Making ProcedsBlockly.init work --- app/services/blocks-gallery.js | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/app/services/blocks-gallery.js b/app/services/blocks-gallery.js index 78471d907..7477eb5a8 100644 --- a/app/services/blocks-gallery.js +++ b/app/services/blocks-gallery.js @@ -1,7 +1,6 @@ import Service, { inject as service } from '@ember/service' import { isInsideProcedureDef, hasParam, isFlying, getName, requiredAllInputs } from './block-utils' import Ember from 'ember' -import * as ProcedsBlockly from 'proceds-blockly/proceds-blockly' export default Service.extend({ blockly: service(), @@ -212,7 +211,26 @@ export default Service.extend({ Blockly.Msg.PROCEDURES_ADD_PARAMETER_PROMPT = this.tString("procedures.addParamPrompt") Blockly.Msg.PROCEDURES_REMOVE_PARAMETER = this.tString("procedures.removeParam") + // ProcedsBlockly.init() needs all procedure blocks to work, so we need to put them back + // After calling init(), we disable unwanted toolbox blocks again + this._enableUnwantedProcedureBlocks() ProcedsBlockly.init() + this._disableUnwantedProcedureBlocks() + }, + + _disableUnwantedProcedureBlocks() { + ['procedures_defreturn','procedures_ifreturn'].forEach(blockType => { + if (Blockly.Blocks[blockType]) { + Blockly['bkp_'+blockType] = Blockly.Blocks[blockType] + delete Blockly.Blocks[blockType] + } + }) + }, + + _enableUnwantedProcedureBlocks() { + ['procedures_defreturn','procedures_ifreturn'].forEach(blockType => { + if (Blockly['bkp_'+blockType]) Blockly.Blocks[blockType] = Blockly['bkp_'+blockType] + }) }, _definirColores() { @@ -1377,6 +1395,9 @@ export default Service.extend({ } }; + // Blockly dynamically loads stuff in procedures category that we don't want, so we take them out + this._disableUnwantedProcedureBlocks() + this.defineProcedureTranslations() let init_base_procedimiento = Blockly.Blocks.procedures_defnoreturn.init; @@ -1385,9 +1406,6 @@ export default Service.extend({ init_base_procedimiento.call(this); }; - delete Blockly.Blocks.procedures_defreturn; - delete Blockly.Blocks.procedures_ifreturn; - }, _generarLenguaje() { From 0c44a7e409ad869f13b116b12a59818e595db286 Mon Sep 17 00:00:00 2001 From: Diana Lopez Alvas Date: Tue, 22 Mar 2022 16:56:56 -0300 Subject: [PATCH 6/9] changing proceds blockly version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f652fd8bf..86fb9d740 100644 --- a/package.json +++ b/package.json @@ -58,7 +58,7 @@ "clientjs": "^0.1.11", "creador-de-desafios-pilasbloques": "^1.0.1", "pilas-bloques-exercises": "1.2.3", - "proceds-blockly": "^1.0.1", + "proceds-blockly": "^1.1.0", "unzipit": "^1.3.5", "survey-knockout": "^1.8.0", "uuid": "^8.3.0", From 6e8a7272c56eabdacca41556e8d0039516c0f6ac Mon Sep 17 00:00:00 2001 From: Diana Lopez Alvas Date: Tue, 22 Mar 2022 17:02:38 -0300 Subject: [PATCH 7/9] fix translations --- translations/blocks/en-us.yaml | 2 +- translations/blocks/es-ar.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/translations/blocks/en-us.yaml b/translations/blocks/en-us.yaml index 2ff0c6970..144a5e979 100644 --- a/translations/blocks/en-us.yaml +++ b/translations/blocks/en-us.yaml @@ -132,4 +132,4 @@ procedures: comment: "Describe the procedure..." noParams: "" addParam: "Add parameter" - addParamPrompt: "Ingresa el nombre del parámetro" + addParamPrompt: "Enter the parameter's name" diff --git a/translations/blocks/es-ar.yaml b/translations/blocks/es-ar.yaml index 701b43592..92c579889 100644 --- a/translations/blocks/es-ar.yaml +++ b/translations/blocks/es-ar.yaml @@ -132,4 +132,4 @@ procedures: comment: "Describe el procedimiento..." noParams: "" addParam: "Agregar parámetro" - addParamPrompt: "Enter the parameter's name" + addParamPrompt: "Ingresa el nombre del parámetro" From 99979386ecb396684277c0bfebfe5d8d07402d1f Mon Sep 17 00:00:00 2001 From: Diana Lopez Alvas Date: Tue, 22 Mar 2022 17:05:54 -0300 Subject: [PATCH 8/9] remove inits --- app/index.html | 3 --- tests/index.html | 3 --- 2 files changed, 6 deletions(-) diff --git a/app/index.html b/app/index.html index 4745910ac..2d148f9e7 100644 --- a/app/index.html +++ b/app/index.html @@ -41,9 +41,6 @@ - {{content-for "body-footer"}} diff --git a/tests/index.html b/tests/index.html index 4aebe4ab5..904abf0c6 100644 --- a/tests/index.html +++ b/tests/index.html @@ -38,9 +38,6 @@ - {{content-for "body-footer"}} {{content-for "test-body-footer"}} From d2f6f564ebb9a30909c44886501d0a564e9ba041 Mon Sep 17 00:00:00 2001 From: Diana Lopez Alvas Date: Tue, 22 Mar 2022 17:46:01 -0300 Subject: [PATCH 9/9] remove warning --- .jshintrc | 3 ++- tests/.jshintrc | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.jshintrc b/.jshintrc index a7cf9693e..0ca927512 100644 --- a/.jshintrc +++ b/.jshintrc @@ -18,7 +18,8 @@ "Blob", "ClientJS", "uuidv4", - "unzipit" + "unzipit", + "ProcedsBlockly" ], "esversion": 9, "asi": true, diff --git a/tests/.jshintrc b/tests/.jshintrc index 587fbddc6..3b48c3973 100644 --- a/tests/.jshintrc +++ b/tests/.jshintrc @@ -31,7 +31,8 @@ "Blob", "localStorage", "ClientJS", - "uuidv4" + "uuidv4", + "ProcedsBlockly" ], "esversion": 9, "asi": true,