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

Merge pull request #3224 from zochris/variable-exists-phrasing

Browse Source 
Rephrase "variable already exists" message
This commit is contained in:
Rachel Fenichel
2019-10-16 12:37:15 -06:00
committed by GitHub
parent d45da54bef f26829eb6d
commit b4b3ae316f
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/variables.js
View File

@@ -283,14 +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);
'%1', 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', existing.name).replace('%2', existing.type);
}
Blockly.alert(msg,
function() {
@@ -351,7 +350,7 @@ 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('%1', existing.name)
.replace('%2', existing.type);
Blockly.alert(msg,
function() {