Skip to content

Commit 459c7bb

Browse files
committed
Fixed translations in toolbox not being updated after language change
1 parent 22e3692 commit 459c7bb

File tree

3 files changed

+24
-6
lines changed

3 files changed

+24
-6
lines changed

vue-frontend/locales/en.json

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,16 @@
104104
"GET_ANALOG_PIN_VALUE": "analog value of pin %1",
105105
"GET_DIGITAL_PIN_VALUE": "digital value of pin %1",
106106
"WAIT": "wait %1 second(s)",
107-
"WAIT_UNTIL": "wait until %1"
107+
"WAIT_UNTIL": "wait until %1",
108+
"COLOR_SENSOR_TB": "Color sensor",
109+
"ULTRASONIC_SENSOR_TB": "Distance sensor (m)",
110+
"IR_SENSOR_TB": "IR sensor",
111+
"KEYPAD_SENSOR_TB": "Keypad",
112+
"WHEEL_ENCODER_TB": "Wheel encoder",
113+
"PP_MOTOR_TB": "Motor (pp)",
114+
"DP_MOTOR_TB": "Motor (dp)",
115+
"DDP_MOTOR_TB": "Motor (ddp)",
116+
"SERVO_TB": "Servo",
117+
"OLED_TB": "OLED Screen"
108118
}
109119
}

vue-frontend/locales/nl.json

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,16 @@
104104
"GET_ANALOG_PIN_VALUE": "analoge waarde van pin %1",
105105
"GET_DIGITAL_PIN_VALUE": "digitale waarde van pin %1",
106106
"WAIT": "wacht %1 seconde(n)",
107-
"WAIT_UNTIL": "wacht totdat %1"
107+
"WAIT_UNTIL": "wacht totdat %1",
108+
"COLOR_SENSOR_TB": "Kleuren sensor",
109+
"ULTRASONIC_SENSOR_TB": "Afstand sensor (m)",
110+
"IR_SENSOR_TB": "IR sensor",
111+
"KEYPAD_SENSOR_TB": "Toetsen",
112+
"WHEEL_ENCODER_TB": "Encoder",
113+
"PP_MOTOR_TB": "Motor (pp)",
114+
"DP_MOTOR_TB": "Motor (dp)",
115+
"DDP_MOTOR_TB": "Motor (ddp)",
116+
"SERVO_TB": "Servo",
117+
"OLED_TB": "OLED Scherm"
108118
}
109119
}

vue-frontend/src/components/Blockly.vue

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
</category>
1616

1717

18-
<category v-for="sensor in getSensors()" :name="$t('peripherals.' + peripherals[sensor].text)"
18+
<category v-for="sensor in getSensors()" :name="'%{BKY_' + peripherals[sensor].text.toUpperCase() + '_TB}'"
1919
colour="%{BKY_SENSORS_RGB}">
2020
<block v-for="func in peripherals[sensor].functions"
2121
:type="func.concat('_').concat(sensor)">
@@ -208,7 +208,7 @@
208208

209209
</category>
210210

211-
<category v-for="actuator in getActuators()" :name="$t('peripherals.' + peripherals[actuator].text)"
211+
<category v-for="actuator in getActuators()" :name="'%{BKY_' + peripherals[actuator].text.toUpperCase() + '_TB}'"
212212
colour="%{BKY_ACTIONS_RGB}">
213213
<block v-for="func in peripherals[actuator].functions"
214214
:type="func.concat('_').concat(actuator)">
@@ -381,7 +381,6 @@ export default {
381381
return this.params.sensors ? Object.keys(this.params.sensors) : [];
382382
},
383383
getActuators(){
384-
console.log(this.params.actuators);
385384
return this.params.actuators ? Object.keys(this.params.actuators) : [];
386385
},
387386
// Loads in imported blockly modules block definitions
@@ -421,7 +420,6 @@ export default {
421420
// Get current values
422421
var xml = Blockly.Xml.workspaceToDom(this.workspace);
423422
var toolbox_item = this.workspace.toolbox_.getSelectedItem();
424-
this.workspace.dispose();
425423
426424
// Reint workspace
427425
this.workspace.dispose();

0 commit comments

Comments
 (0)