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

Rephrase "variable already exists" message

Browse Source 
The message now includes the name with casing of the already existing
variable.
This commit is contained in:
zochris
2019-10-13 13:00:54 +02:00
committed by zochris
parent 43f9ab6889
commit bf7abee679
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/variables.js
View File

@@ -286,11 +286,12 @@ Blockly.Variables.createVariableButtonHandler = function(
var lowerCase = text.toLowerCase();
if (existing.type == type) {
var msg = Blockly.Msg['VARIABLE_ALREADY_EXISTS'].replace(
'%1', lowerCase);
'%1', lowerCase).replace('%2', existing.name);
} else {
var msg =
Blockly.Msg['VARIABLE_ALREADY_EXISTS_FOR_ANOTHER_TYPE'];
msg = msg.replace('%1', lowerCase).replace('%2', existing.type);
msg = msg.replace('%1', lowerCase).replace('%2', existing.type)
.replace('%3', existing.name);
}
Blockly.alert(msg,
function() {
@@ -352,7 +353,8 @@ Blockly.Variables.renameVariable = function(workspace, variable,
if (existing) {
var msg = Blockly.Msg['VARIABLE_ALREADY_EXISTS_FOR_ANOTHER_TYPE']
.replace('%1', newName.toLowerCase())
.replace('%2', existing.type);
.replace('%2', existing.type)
.replace('%3', existing.name);
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.';
Blockly.Msg.VARIABLE_ALREADY_EXISTS = 'A variable named "%1" already exists (as "%2").';
/** @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".';
Blockly.Msg.VARIABLE_ALREADY_EXISTS_FOR_ANOTHER_TYPE = 'A variable named "%1" already exists for another type: "%2" (as "%3").';
// Variable deletion.
/** @type {string} */