CodingPirates/blockly
1
0
Fork 0
mirror of https://github.com/google/blockly.git synced 2026-01-11 10:57:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Change variable exists message to show casing

Browse Source
This commit is contained in:
zochris
2019-10-13 20:32:19 +02:00
committed by zochris
parent bf7abee679
commit f26829eb6d
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/variables.js
View File

@@ -283,15 +283,13 @@ Blockly.Variables.createVariableButtonHandler = function(
var existing =
Blockly.Variables.nameUsedWithAnyType_(text, workspace);
if (existing) {
var lowerCase = text.toLowerCase();
if (existing.type == type) {
var msg = Blockly.Msg['VARIABLE_ALREADY_EXISTS'].replace(
'%1', lowerCase).replace('%2', existing.name);
'%1', existing.name);
} else {
var msg =
Blockly.Msg['VARIABLE_ALREADY_EXISTS_FOR_ANOTHER_TYPE'];
msg = msg.replace('%1', lowerCase).replace('%2', existing.type)
.replace('%3', existing.name);
msg = msg.replace('%1', existing.name).replace('%2', existing.type);
}
Blockly.alert(msg,
function() {
@@ -352,9 +350,8 @@ Blockly.Variables.renameVariable = function(workspace, variable,
variable.type, workspace);
if (existing) {
var msg = Blockly.Msg['VARIABLE_ALREADY_EXISTS_FOR_ANOTHER_TYPE']
.replace('%1', newName.toLowerCase())
.replace('%2', existing.type)
.replace('%3', existing.name);
.replace('%1', existing.name)
.replace('%2', existing.type);
Blockly.alert(msg,
function() {
promptAndCheckWithAlert(newName); // Recurse

4
msg/messages.js
View File

@@ -172,10 +172,10 @@ Blockly.Msg.NEW_VARIABLE_TYPE_TITLE = 'New variable type:';
Blockly.Msg.NEW_VARIABLE_TITLE = 'New variable name:';
/** @type {string} */
/// alert - Tells the user that the name they entered is already in use.
Blockly.Msg.VARIABLE_ALREADY_EXISTS = 'A variable named "%1" already exists (as "%2").';
Blockly.Msg.VARIABLE_ALREADY_EXISTS = 'A variable named "%1" already exists.';
/** @type {string} */
/// alert - Tells the user that the name they entered is already in use for another type.
Blockly.Msg.VARIABLE_ALREADY_EXISTS_FOR_ANOTHER_TYPE = 'A variable named "%1" already exists for another type: "%2" (as "%3").';
Blockly.Msg.VARIABLE_ALREADY_EXISTS_FOR_ANOTHER_TYPE = 'A variable named "%1" already exists for another type: "%2".';
// Variable deletion.
/** @type {string} */