diff --git a/README.md b/README.md
index 5de76cb2e..fd626a49a 100644
--- a/README.md
+++ b/README.md
@@ -5,4 +5,4 @@ blocks together to build programs. All code is free and open source.
**The project page is https://developers.google.com/blockly/**
-
+
diff --git a/accessible/toolbox.component.js b/accessible/toolbox.component.js
index 081803103..99f9a1bd5 100644
--- a/accessible/toolbox.component.js
+++ b/accessible/toolbox.component.js
@@ -29,10 +29,10 @@ blocklyApp.ToolboxComponent = ng.core
template: `
Toolbox
@@ -75,8 +75,8 @@ blocklyApp.WorkspaceComponent = ng.core
clearWorkspace: function() {
this.workspace.clear();
},
- getActiveDescId: function(tree) {
- return this.treeService.getActiveDescId(tree.id);
+ getActiveDescId: function(treeId) {
+ return this.treeService.getActiveDescId(treeId);
},
onWorkspaceToolbarKeypress: function(e) {
this.treeService.onWorkspaceToolbarKeypress(
diff --git a/blockly_compressed.js b/blockly_compressed.js
index bfb67e211..ed2ea67e5 100644
--- a/blockly_compressed.js
+++ b/blockly_compressed.js
@@ -859,14 +859,14 @@ goog.ui.tree.TreeControl.prototype.handleMouseEvent_=function(a){goog.log.fine(t
goog.ui.tree.TreeControl.prototype.handleKeyEvent=function(a){var b;(b=this.typeAhead_.handleNavigation(a)||this.selectedItem_&&this.selectedItem_.onKeyDown(a)||this.typeAhead_.handleTypeAheadChar(a))&&a.preventDefault();return b};goog.ui.tree.TreeControl.prototype.getNodeFromEvent_=function(a){for(var b=a.target;null!=b;){if(a=goog.ui.tree.BaseNode.allNodes[b.id])return a;if(b==this.getElement())break;b=b.parentNode}return null};
goog.ui.tree.TreeControl.prototype.createNode=function(a){return new goog.ui.tree.TreeNode(a||goog.html.SafeHtml.EMPTY,this.getConfig(),this.getDomHelper())};goog.ui.tree.TreeControl.prototype.setNode=function(a){this.typeAhead_.setNodeInMap(a)};goog.ui.tree.TreeControl.prototype.removeNode=function(a){this.typeAhead_.removeNodeFromMap(a)};goog.ui.tree.TreeControl.prototype.clearTypeAhead=function(){this.typeAhead_.clear()};goog.ui.tree.TreeControl.defaultConfig=goog.ui.tree.BaseNode.defaultConfig;
// Copyright 2013 Google Inc. Apache License 2.0
-var Blockly={Blocks:{}};
+var Blockly={Blocks:{}};Blockly.Blocks.ONE_BASED_INDEXING=!0;
// Copyright 2012 Google Inc. Apache License 2.0
Blockly.Workspace=function(a){this.id=Blockly.genUid();Blockly.Workspace.WorkspaceDB_[this.id]=this;this.options=a||{};this.RTL=!!this.options.RTL;this.horizontalLayout=!!this.options.horizontalLayout;this.toolboxPosition=this.options.toolboxPosition;this.topBlocks_=[];this.listeners_=[];this.undoStack_=[];this.redoStack_=[];this.blockDB_=Object.create(null);this.variableList=[]};Blockly.Workspace.prototype.rendered=!1;Blockly.Workspace.prototype.MAX_UNDO=1024;
-Blockly.Workspace.prototype.dispose=function(){this.listeners_.length=0;this.clear();delete Blockly.Workspace.WorkspaceDB_[this.id]};Blockly.Workspace.SCAN_ANGLE=3;Blockly.Workspace.prototype.addTopBlock=function(a){this.topBlocks_.push(a);if(this.isFlyout){a=Blockly.Variables.allVariables(a);for(var b=0;bthis.MAX_UNDO&&this.undoStack_.unshift());for(var b=0,c;c=this.listeners_[b];b++)c(a)};
@@ -1000,14 +1000,14 @@ Blockly.Xml.cloneShadow_=function(a){for(var b=a=a.cloneNode(!0),c;b;)if(b.first
Blockly.Xml.domToPrettyText=function(a){a=Blockly.Xml.domToText(a).split("<");for(var b="",c=1;c"!=d.slice(-2)&&(b+=" ")}a=a.join("\n");a=a.replace(/(<(\w+)\b[^>]*>[^\n]*)\n *<\/\2>/g,"$1");return a.replace(/^\n/,"")};
Blockly.Xml.textToDom=function(a){(a=(new DOMParser).parseFromString(a,"text/xml"))&&a.firstChild&&"xml"==a.firstChild.nodeName.toLowerCase()&&a.firstChild===a.lastChild||goog.asserts.fail("Blockly.Xml.textToDom did not obtain a valid XML tree.");return a.firstChild};
Blockly.Xml.domToWorkspace=function(a,b){if(a instanceof Blockly.Workspace){var c=a;a=b;b=c;console.warn("Deprecated call to Blockly.Xml.domToWorkspace, swap the arguments.")}var d;b.RTL&&(d=b.getWidth());Blockly.Field.startCache();var c=a.childNodes.length,e=Blockly.Events.getGroup();e||Blockly.Events.setGroup(!0);for(var f=0;f=this.remainingCapacity())){Blockly.terminateDrag_();Blockly.Events.disable();var b=Blockly.Xml.domToBlock(a,this),c=parseInt(a.getAttribute("x"),10);a=parseInt(a.getAttribute("y"),10);if(!isNaN(c)&&!isNaN(a)){this.RTL&&(c=-c);do{for(var d=!1,e=this.getAllBlocks(),f=0,g;g=e[f];f++)if(g=g.getRelativeToSurfaceXY(),1>=Math.abs(c-g.x)&&1>=Math.abs(a-g.y)){d=!0;break}if(!d)for(e=b.getConnections_(!1),
-f=0;g=e[f];f++)if(g.closest(Blockly.SNAP_RADIUS,new goog.math.Coordinate(c,a)).connection){d=!0;break}d&&(c=this.RTL?c-Blockly.SNAP_RADIUS:c+Blockly.SNAP_RADIUS,a+=2*Blockly.SNAP_RADIUS)}while(d);b.moveBy(c,a)}Blockly.Events.enable();Blockly.Events.isEnabled()&&!b.isShadow()&&Blockly.Events.fire(new Blockly.Events.Create(b));b.select()}};Blockly.WorkspaceSvg.prototype.createVariable=function(a){Blockly.WorkspaceSvg.superClass_.createVariable.call(this,a);this.toolbox_&&this.toolbox_.flyout_&&this.toolbox_.refreshSelection()};
-Blockly.WorkspaceSvg.prototype.recordDeleteAreas=function(){this.deleteAreaTrash_=this.trashcan?this.trashcan.getClientRect():null;this.deleteAreaToolbox_=this.flyout_?this.flyout_.getClientRect():this.toolbox_?this.toolbox_.getClientRect():null};
+Blockly.WorkspaceSvg.prototype.paste=function(a){if(this.rendered&&!(a.getElementsByTagName("block").length>=this.remainingCapacity())){Blockly.terminateDrag_();Blockly.Events.disable();try{var b=Blockly.Xml.domToBlock(a,this),c=parseInt(a.getAttribute("x"),10),d=parseInt(a.getAttribute("y"),10);if(!isNaN(c)&&!isNaN(d)){this.RTL&&(c=-c);do{a=!1;for(var e=this.getAllBlocks(),f=0,g;g=e[f];f++){var h=g.getRelativeToSurfaceXY();if(1>=Math.abs(c-h.x)&&1>=Math.abs(d-h.y)){a=!0;break}}if(!a)for(var k=b.getConnections_(!1),
+f=0,m;m=k[f];f++)if(m.closest(Blockly.SNAP_RADIUS,new goog.math.Coordinate(c,d)).connection){a=!0;break}a&&(c=this.RTL?c-Blockly.SNAP_RADIUS:c+Blockly.SNAP_RADIUS,d+=2*Blockly.SNAP_RADIUS)}while(a);b.moveBy(c,d)}}finally{Blockly.Events.enable()}Blockly.Events.isEnabled()&&!b.isShadow()&&Blockly.Events.fire(new Blockly.Events.Create(b));b.select()}};
+Blockly.WorkspaceSvg.prototype.createVariable=function(a){Blockly.WorkspaceSvg.superClass_.createVariable.call(this,a);this.toolbox_&&this.toolbox_.flyout_&&this.toolbox_.refreshSelection()};Blockly.WorkspaceSvg.prototype.recordDeleteAreas=function(){this.deleteAreaTrash_=this.trashcan?this.trashcan.getClientRect():null;this.deleteAreaToolbox_=this.flyout_?this.flyout_.getClientRect():this.toolbox_?this.toolbox_.getClientRect():null};
Blockly.WorkspaceSvg.prototype.isDeleteArea=function(a){a=new goog.math.Coordinate(a.clientX,a.clientY);if(this.deleteAreaTrash_){if(this.deleteAreaTrash_.contains(a))return this.trashcan.setOpen_(!0),Blockly.Css.setCursor(Blockly.Css.Cursor.DELETE),!0;this.trashcan.setOpen_(!1)}if(this.deleteAreaToolbox_&&this.deleteAreaToolbox_.contains(a))return Blockly.Css.setCursor(Blockly.Css.Cursor.DELETE),!0;Blockly.Css.setCursor(Blockly.Css.Cursor.CLOSED);return!1};
-Blockly.WorkspaceSvg.prototype.onMouseDown_=function(a){this.markFocused();Blockly.isTargetInput_(a)||(Blockly.terminateDrag_(),Blockly.hideChaff(),a.target&&a.target.nodeName&&("svg"==a.target.nodeName.toLowerCase()||a.target==this.svgBackground_)&&Blockly.selected&&!this.options.readOnly&&Blockly.selected.unselect(),Blockly.isRightButton(a)?this.showContextMenu_(a):this.scrollbar&&(this.isScrolling=!0,this.startDragMouseX=a.clientX,this.startDragMouseY=a.clientY,this.startDragMetrics=this.getMetrics(),
-this.startScrollX=this.scrollX,this.startScrollY=this.scrollY,"mouseup"in Blockly.bindEvent_.TOUCH_MAP&&(Blockly.onTouchUpWrapper_=Blockly.onTouchUpWrapper_||[],Blockly.onTouchUpWrapper_=Blockly.onTouchUpWrapper_.concat(Blockly.bindEvent_(document,"mouseup",null,Blockly.onMouseUp_))),Blockly.onMouseMoveWrapper_=Blockly.onMouseMoveWrapper_||[],Blockly.onMouseMoveWrapper_=Blockly.onMouseMoveWrapper_.concat(Blockly.bindEvent_(document,"mousemove",null,Blockly.onMouseMove_))),a.stopPropagation(),a.preventDefault())};
-Blockly.WorkspaceSvg.prototype.startDrag=function(a,b){var c=Blockly.mouseToSvg(a,this.getParentSvg(),this.getInverseScreenCTM());c.x/=this.scale;c.y/=this.scale;this.dragDeltaXY_=goog.math.Coordinate.difference(b,c)};Blockly.WorkspaceSvg.prototype.moveDrag=function(a){a=Blockly.mouseToSvg(a,this.getParentSvg(),this.getInverseScreenCTM());a.x/=this.scale;a.y/=this.scale;return goog.math.Coordinate.sum(this.dragDeltaXY_,a)};
-Blockly.WorkspaceSvg.prototype.isDragging=function(){return Blockly.dragMode_==Blockly.DRAG_FREE||this.isScrolling};Blockly.WorkspaceSvg.prototype.onMouseWheel_=function(a){Blockly.terminateDrag_();var b=0b.bottomRight.x&&(b.bottomRight.x=d.bottomRight.x);d.topLeft.yb.bottomRight.y&&(b.bottomRight.y=d.bottomRight.y)}return{x:b.topLeft.x,y:b.topLeft.y,width:b.bottomRight.x-
+Blockly.WorkspaceSvg.prototype.onMouseDown_=function(a){this.markFocused();Blockly.isTargetInput_(a)||(Blockly.terminateDrag_(),Blockly.hideChaff(),a.target&&a.target.nodeName&&("svg"==a.target.nodeName.toLowerCase()||a.target==this.svgBackground_)&&Blockly.selected&&!this.options.readOnly&&Blockly.selected.unselect(),Blockly.isRightButton(a)?this.showContextMenu_(a):this.scrollbar&&(this.dragMode_=Blockly.DRAG_BEGIN,this.startDragMouseX=a.clientX,this.startDragMouseY=a.clientY,this.startDragMetrics=
+this.getMetrics(),this.startScrollX=this.scrollX,this.startScrollY=this.scrollY,"mouseup"in Blockly.bindEvent_.TOUCH_MAP&&(Blockly.onTouchUpWrapper_=Blockly.onTouchUpWrapper_||[],Blockly.onTouchUpWrapper_=Blockly.onTouchUpWrapper_.concat(Blockly.bindEvent_(document,"mouseup",null,Blockly.onMouseUp_))),Blockly.onMouseMoveWrapper_=Blockly.onMouseMoveWrapper_||[],Blockly.onMouseMoveWrapper_=Blockly.onMouseMoveWrapper_.concat(Blockly.bindEvent_(document,"mousemove",null,Blockly.onMouseMove_))),a.stopPropagation(),
+a.preventDefault())};Blockly.WorkspaceSvg.prototype.startDrag=function(a,b){var c=Blockly.mouseToSvg(a,this.getParentSvg(),this.getInverseScreenCTM());c.x/=this.scale;c.y/=this.scale;this.dragDeltaXY_=goog.math.Coordinate.difference(b,c)};Blockly.WorkspaceSvg.prototype.moveDrag=function(a){a=Blockly.mouseToSvg(a,this.getParentSvg(),this.getInverseScreenCTM());a.x/=this.scale;a.y/=this.scale;return goog.math.Coordinate.sum(this.dragDeltaXY_,a)};
+Blockly.WorkspaceSvg.prototype.isDragging=function(){return Blockly.dragMode_==Blockly.DRAG_FREE||this.dragMode_==Blockly.DRAG_FREE};Blockly.WorkspaceSvg.prototype.onMouseWheel_=function(a){Blockly.terminateDrag_();var b=0b.bottomRight.x&&(b.bottomRight.x=d.bottomRight.x);d.topLeft.yb.bottomRight.y&&(b.bottomRight.y=d.bottomRight.y)}return{x:b.topLeft.x,y:b.topLeft.y,width:b.bottomRight.x-
b.topLeft.x,height:b.bottomRight.y-b.topLeft.y}};Blockly.WorkspaceSvg.prototype.cleanUp_=function(){Blockly.Events.setGroup(!0);for(var a=this.getTopBlocks(!0),b=0,c=0,d;d=a[c];c++){var e=d.getRelativeToSurfaceXY();d.moveBy(-e.x,b-e.y);d.snapToGrid();b=d.getRelativeToSurfaceXY().y+d.getHeightWidth().height+Blockly.BlockSvg.MIN_BLOCK_Y}Blockly.Events.setGroup(!1);Blockly.resizeSvgContents(this)};
Blockly.WorkspaceSvg.prototype.showContextMenu_=function(a){function b(a){if(a.isDeletable())l=l.concat(a.getDescendants());else{a=a.getChildren();for(var c=0;c=b.height&&(k-=f.height);c?f.width>=a.clientX&&(g+=f.width):a.clientX+f.width>=b.width&&(g-=f.width);Blockly.WidgetDiv.position(g,k,b,e,c);d.setAllowAutoFocus(!0);setTimeout(function(){h.focus()},1);Blockly.ContextMenu.currentBlock=null}else Blockly.ContextMenu.hide()};
Blockly.ContextMenu.hide=function(){Blockly.WidgetDiv.hideIfOwner(Blockly.ContextMenu);Blockly.ContextMenu.currentBlock=null};
-Blockly.ContextMenu.callbackFactory=function(a,b){return function(){Blockly.Events.disable();var c=Blockly.Xml.domToBlock(b,a.workspace),d=a.getRelativeToSurfaceXY();d.x=a.RTL?d.x-Blockly.SNAP_RADIUS:d.x+Blockly.SNAP_RADIUS;d.y+=2*Blockly.SNAP_RADIUS;c.moveBy(d.x,d.y);Blockly.Events.enable();Blockly.Events.isEnabled()&&!c.isShadow()&&Blockly.Events.fire(new Blockly.Events.Create(c));c.select()}};Blockly.RenderedConnection=function(a,b){Blockly.RenderedConnection.superClass_.constructor.call(this,a,b);this.offsetInBlock_=new goog.math.Coordinate(0,0)};goog.inherits(Blockly.RenderedConnection,Blockly.Connection);Blockly.RenderedConnection.prototype.distanceFrom=function(a){var b=this.x_-a.x_;a=this.y_-a.y_;return Math.sqrt(b*b+a*a)};
+Blockly.ContextMenu.callbackFactory=function(a,b){return function(){Blockly.Events.disable();try{var c=Blockly.Xml.domToBlock(b,a.workspace),d=a.getRelativeToSurfaceXY();d.x=a.RTL?d.x-Blockly.SNAP_RADIUS:d.x+Blockly.SNAP_RADIUS;d.y+=2*Blockly.SNAP_RADIUS;c.moveBy(d.x,d.y)}finally{Blockly.Events.enable()}Blockly.Events.isEnabled()&&!c.isShadow()&&Blockly.Events.fire(new Blockly.Events.Create(c));c.select()}};Blockly.RenderedConnection=function(a,b){Blockly.RenderedConnection.superClass_.constructor.call(this,a,b);this.offsetInBlock_=new goog.math.Coordinate(0,0)};goog.inherits(Blockly.RenderedConnection,Blockly.Connection);Blockly.RenderedConnection.prototype.distanceFrom=function(a){var b=this.x_-a.x_;a=this.y_-a.y_;return Math.sqrt(b*b+a*a)};
Blockly.RenderedConnection.prototype.bumpAwayFrom_=function(a){if(Blockly.dragMode_==Blockly.DRAG_NONE){var b=this.sourceBlock_.getRootBlock();if(!b.isInFlyout){var c=!1;if(!b.isMovable()){b=a.getSourceBlock().getRootBlock();if(!b.isMovable())return;a=this;c=!0}var d=Blockly.selected==b;d||b.select();var e=a.x_+Blockly.SNAP_RADIUS-this.x_;a=a.y_+Blockly.SNAP_RADIUS-this.y_;c&&(a=-a);b.RTL&&(e=-e);b.moveBy(e,a);d||b.unselect()}}};
Blockly.RenderedConnection.prototype.moveTo=function(a,b){this.inDB_&&this.db_.removeConnection_(this);this.x_=a;this.y_=b;this.hidden_||this.db_.addConnection(this)};Blockly.RenderedConnection.prototype.moveBy=function(a,b){this.moveTo(this.x_+a,this.y_+b)};Blockly.RenderedConnection.prototype.moveToOffset=function(a){this.moveTo(a.x+this.offsetInBlock_.x,a.y+this.offsetInBlock_.y)};
Blockly.RenderedConnection.prototype.setOffsetInBlock=function(a,b){this.offsetInBlock_.x=a;this.offsetInBlock_.y=b};Blockly.RenderedConnection.prototype.tighten_=function(){var a=this.targetConnection.x_-this.x_,b=this.targetConnection.y_-this.y_;if(0!=a||0!=b){var c=this.targetBlock(),d=c.getSvgRoot();if(!d)throw"block is not rendered.";d=Blockly.getRelativeXY_(d);c.getSvgRoot().setAttribute("transform","translate("+(d.x-a)+","+(d.y-b)+")");c.moveConnections_(-a,-b)}};
@@ -1124,13 +1124,14 @@ Blockly.RenderedConnection.prototype.closest=function(a,b,c){return this.dbOppos
Blockly.RenderedConnection.prototype.highlight=function(){var a;a=this.type==Blockly.INPUT_VALUE||this.type==Blockly.OUTPUT_VALUE?"m 0,0 "+Blockly.BlockSvg.TAB_PATH_DOWN+" v 5":"m -20,0 h 5 "+Blockly.BlockSvg.NOTCH_PATH_LEFT+" h 5";var b=this.sourceBlock_.getRelativeToSurfaceXY();Blockly.Connection.highlightedPath_=Blockly.createSvgElement("path",{"class":"blocklyHighlightedConnectionPath",d:a,transform:"translate("+(this.x_-b.x)+","+(this.y_-b.y)+")"+(this.sourceBlock_.RTL?" scale(-1 1)":"")},this.sourceBlock_.getSvgRoot())};
Blockly.RenderedConnection.prototype.unhideAll=function(){this.setHidden(!1);var a=[];if(this.type!=Blockly.INPUT_VALUE&&this.type!=Blockly.NEXT_STATEMENT)return a;var b=this.targetBlock();if(b){var c;b.isCollapsed()?(c=[],b.outputConnection&&c.push(b.outputConnection),b.nextConnection&&c.push(b.nextConnection),b.previousConnection&&c.push(b.previousConnection)):c=b.getConnections_(!0);for(var d=0;db?!1:Blockly.RenderedConnection.superClass_.isConnectionAllowed.call(this,a)};
+Blockly.RenderedConnection.prototype.hideAll=function(){this.setHidden(!0);if(this.targetConnection)for(var a=this.targetBlock().getDescendants(),b=0;bb?!1:Blockly.RenderedConnection.superClass_.isConnectionAllowed.call(this,a)};
Blockly.RenderedConnection.prototype.disconnectInternal_=function(a,b){Blockly.RenderedConnection.superClass_.disconnectInternal_.call(this,a,b);a.rendered&&a.render();b.rendered&&(b.updateDisabled(),b.render())};
Blockly.RenderedConnection.prototype.respawnShadow_=function(){var a=this.getSourceBlock(),b=this.getShadowDom();if(a.workspace&&b&&Blockly.Events.recordUndo){Blockly.RenderedConnection.superClass_.respawnShadow_.call(this);b=this.targetBlock();if(!b)throw"Couldn't respawn the shadow block that should exist here.";b.initSvg();b.render(!1);a.rendered&&a.render()}};Blockly.RenderedConnection.prototype.neighbours_=function(a){return this.dbOpposite_.getNeighbours(this,a)};
Blockly.RenderedConnection.prototype.connect_=function(a){Blockly.RenderedConnection.superClass_.connect_.call(this,a);var b=this.getSourceBlock();a=a.getSourceBlock();b.rendered&&b.updateDisabled();a.rendered&&a.updateDisabled();b.rendered&&a.rendered&&(this.type==Blockly.NEXT_STATEMENT||this.type==Blockly.PREVIOUS_STATEMENT?a.render():b.render())};Blockly.BlockSvg=function(a,b,c){this.svgGroup_=Blockly.createSvgElement("g",{},null);this.svgPathDark_=Blockly.createSvgElement("path",{"class":"blocklyPathDark",transform:"translate(1,1)"},this.svgGroup_);this.svgPath_=Blockly.createSvgElement("path",{"class":"blocklyPath"},this.svgGroup_);this.svgPathLight_=Blockly.createSvgElement("path",{"class":"blocklyPathLight"},this.svgGroup_);this.svgPath_.tooltip=this;this.rendered=!1;Blockly.Tooltip.bindMouseEvents(this.svgPath_);Blockly.BlockSvg.superClass_.constructor.call(this,
a,b,c)};goog.inherits(Blockly.BlockSvg,Blockly.Block);Blockly.BlockSvg.prototype.height=0;Blockly.BlockSvg.prototype.width=0;Blockly.BlockSvg.prototype.dragStartXY_=null;Blockly.BlockSvg.INLINE=-1;
Blockly.BlockSvg.prototype.initSvg=function(){goog.asserts.assert(this.workspace.rendered,"Workspace is headless.");for(var a=0,b;b=this.inputList[a];a++)b.init();b=this.getIcons();for(a=0;ac;c+=15)Blockly.createSvgElement("line",{x1:Blockly.FieldAngle.HALF+Blockly.FieldAngle.RADIUS,y1:Blockly.FieldAngle.HALF,x2:Blockly.FieldAngle.HALF+Blockly.FieldAngle.RADIUS-
(0==c%45?10:5),y2:Blockly.FieldAngle.HALF,"class":"blocklyAngleMarks",transform:"rotate("+c+","+Blockly.FieldAngle.HALF+","+Blockly.FieldAngle.HALF+")"},a);a.style.marginLeft=15-Blockly.FieldAngle.RADIUS+"px";this.clickWrapper_=Blockly.bindEvent_(a,"click",this,Blockly.WidgetDiv.hide);this.moveWrapper1_=Blockly.bindEvent_(b,"mousemove",this,this.onMouseMove);this.moveWrapper2_=Blockly.bindEvent_(this.gauge_,"mousemove",this,this.onMouseMove);this.updateGraph_()}};
-Blockly.FieldAngle.prototype.onMouseMove=function(a){var b=this.gauge_.ownerSVGElement.getBoundingClientRect(),c=a.clientX-b.left-Blockly.FieldAngle.HALF;a=a.clientY-b.top-Blockly.FieldAngle.HALF;b=Math.atan(-a/c);isNaN(b)||(b=goog.math.toDegrees(b),0>c?b+=180:0c?b+=180:0=a.clientX&&0==a.clientY&&0==a.button))if(this.determineDragIntention_(a.clientX-Blockly.Flyout.startDownEvent_.clientX,a.clientY-Blockly.Flyout.startDownEvent_.clientY))this.createBlockFunc_(Blockly.Flyout.startBlock_)(Blockly.Flyout.startDownEvent_);else if(this.dragMode_==Blockly.DRAG_FREE)this.onMouseMove_(a);a.stopPropagation()};
Blockly.Flyout.prototype.determineDragIntention_=function(a,b){if(this.dragMode_==Blockly.DRAG_FREE)return!1;if(Math.sqrt(a*a+b*b)90-e&&(d=!0):c>-90-e&&c<-90+e&&(d=!0);else if(this.toolboxPosition_==Blockly.TOOLBOX_AT_LEFT)c-e&&(d=!0);else if(c<-180+e||c>180-e)d=!0;return d};
-Blockly.Flyout.prototype.createBlockFunc_=function(a){var b=this;return function(c){if(!Blockly.isRightButton(c)&&!a.disabled){Blockly.Events.disable();var d=b.placeNewBlock_(a);Blockly.Events.enable();Blockly.Events.isEnabled()&&(Blockly.Events.setGroup(!0),Blockly.Events.fire(new Blockly.Events.Create(d)));b.autoClose?b.hide():b.filterForCapacity_();d.onMouseDown_(c);Blockly.dragMode_=Blockly.DRAG_FREE;d.setDragging_(!0)}}};
+Blockly.Flyout.prototype.createBlockFunc_=function(a){var b=this;return function(c){if(!Blockly.isRightButton(c)&&!a.disabled){Blockly.Events.disable();try{var d=b.placeNewBlock_(a)}finally{Blockly.Events.enable()}Blockly.Events.isEnabled()&&(Blockly.Events.setGroup(!0),Blockly.Events.fire(new Blockly.Events.Create(d)));b.autoClose?b.hide():b.filterForCapacity_();d.onMouseDown_(c);Blockly.dragMode_=Blockly.DRAG_FREE;d.setDragging_(!0)}}};
Blockly.Flyout.prototype.placeNewBlock_=function(a){var b=this.targetWorkspace_,c=a.getSvgRoot();if(!c)throw"originBlock is not rendered.";var c=Blockly.getSvgXY_(c,b),d=this.workspace_.scrollX,e=this.workspace_.scale;c.x+=d/e-d;this.toolboxPosition_==Blockly.TOOLBOX_AT_RIGHT&&(d=b.getMetrics().viewWidth-this.width_,e=b.scale,c.x+=d/e-d);d=this.workspace_.scrollY;e=this.workspace_.scale;c.y+=d/e-d;this.toolboxPosition_==Blockly.TOOLBOX_AT_BOTTOM&&(d=b.getMetrics().viewHeight-this.height_,e=b.scale,
c.y+=d/e-d);a=Blockly.Xml.blockToDom(a);a=Blockly.Xml.domToBlock(a,b);e=a.getSvgRoot();if(!e)throw"block is not rendered.";e=Blockly.getSvgXY_(e,b);e.x+=b.scrollX/b.scale-b.scrollX;e.y+=b.scrollY/b.scale-b.scrollY;b.toolbox_&&!b.scrollbar&&(e.x+=b.toolbox_.getWidth()/b.scale,e.y+=b.toolbox_.getHeight()/b.scale);a.moveBy(c.x-e.x,c.y-e.y);return a};
Blockly.Flyout.prototype.filterForCapacity_=function(){for(var a=this.targetWorkspace_.remainingCapacity(),b=this.workspace_.getTopBlocks(!1),c=0,d;d=b[c];c++)if(-1==this.permanentlyDisabled_.indexOf(d)){var e=d.getDescendants();d.setDisabled(e.length>a)}};
@@ -1355,10 +1356,10 @@ Blockly.Toolbox.prototype.init=function(){var a=this.workspace_;this.HtmlDiv=goo
toolboxPosition:a.options.toolboxPosition});goog.dom.insertSiblingAfter(this.flyout_.createDom(),a.svgGroup_);this.flyout_.init(a);this.config_.cleardotPath=a.options.pathToMedia+"1x1.gif";this.config_.cssCollapsedFolderIcon="blocklyTreeIconClosed"+(a.RTL?"Rtl":"Ltr");var b=new Blockly.Toolbox.TreeControl(this,this.config_);this.tree_=b;b.setShowRootNode(!1);b.setShowLines(!1);b.setShowExpandIcons(!1);b.setSelectedItem(null);this.populate_(a.options.languageTree);b.render(this.HtmlDiv);this.addColour_();
this.position()};Blockly.Toolbox.prototype.dispose=function(){this.flyout_.dispose();this.tree_.dispose();goog.dom.removeNode(this.HtmlDiv);this.lastCategory_=this.workspace_=null};Blockly.Toolbox.prototype.getWidth=function(){return this.width};Blockly.Toolbox.prototype.getHeight=function(){return this.height};
Blockly.Toolbox.prototype.position=function(){var a=this.HtmlDiv;if(a){var b=this.workspace_.getParentSvg(),c=goog.style.getPageOffset(b),b=Blockly.svgSize(b);this.horizontalLayout_?(a.style.left=c.x+"px",a.style.height="auto",a.style.width=b.width+"px",this.height=a.offsetHeight,a.style.top=this.toolboxPosition==Blockly.TOOLBOX_AT_TOP?c.y+"px":c.y+b.height-a.offsetHeight+"px"):(a.style.left=this.toolboxPosition==Blockly.TOOLBOX_AT_RIGHT?c.x+b.width-a.offsetWidth+"px":c.x+"px",a.style.height=b.height+
-"px",a.style.top=c.y+"px",this.width=a.offsetWidth,this.toolboxPosition==Blockly.TOOLBOX_AT_LEFT&&--this.width);this.flyout_.position()}};
-Blockly.Toolbox.prototype.populate_=function(a){function b(a,g,h){for(var k=null,m=0,p;p=a.childNodes[m];m++)if(p.tagName)switch(p.tagName.toUpperCase()){case "CATEGORY":k=c.createNode(p.getAttribute("name"));k.blocks=[];g.add(k);var l=p.getAttribute("custom");l?k.blocks=l:b(p,k,h);l=p.getAttribute("colour");goog.isString(l)?(l.match(/^#[0-9a-fA-F]{6}$/)?k.hexColour=l:k.hexColour=Blockly.hueToRgb(l),e=!0):k.hexColour="";"true"==p.getAttribute("expanded")?(k.blocks.length&&c.setSelectedItem(k),k.setExpanded(!0)):
-k.setExpanded(!1);k=p;break;case "SEP":k&&("CATEGORY"==k.tagName.toUpperCase()?g.add(new Blockly.Toolbox.TreeSeparator(d.treeSeparatorConfig_)):(p=parseFloat(p.getAttribute("gap")),isNaN(p)||(l=parseFloat(k.getAttribute("gap")),p=isNaN(l)?p:l+p,k.setAttribute("gap",p))));break;case "BLOCK":case "SHADOW":g.blocks.push(p),k=p}}var c=this.tree_,d=this;c.removeChildren();c.blocks=[];var e=!1;b(a,this.tree_,this.workspace_.options.pathToMedia);this.hasColours_=e;if(c.blocks.length)throw"Toolbox cannot have both blocks and categories in the root level.";
-Blockly.resizeSvgContents(this.workspace_)};Blockly.Toolbox.prototype.addColour_=function(a){a=(a||this.tree_).getChildren();for(var b=0,c;c=a[b];b++){var d=c.getRowElement();if(d){var e=this.hasColours_?"8px solid "+(c.hexColour||"#ddd"):"none";this.workspace_.RTL?d.style.borderRight=e:d.style.borderLeft=e}this.addColour_(c)}};Blockly.Toolbox.prototype.clearSelection=function(){this.tree_.setSelectedItem(null)};
+"px",a.style.top=c.y+"px",this.width=a.offsetWidth,this.toolboxPosition==Blockly.TOOLBOX_AT_LEFT&&--this.width);this.flyout_.position()}};Blockly.Toolbox.prototype.populate_=function(a){this.tree_.removeChildren();this.tree_.blocks=[];this.hasColours_=!1;this.syncTrees_(a,this.tree_,this.workspace_.options.pathToMedia);if(this.tree_.blocks.length)throw"Toolbox cannot have both blocks and categories in the root level.";Blockly.resizeSvgContents(this.workspace_)};
+Blockly.Toolbox.prototype.syncTrees_=function(a,b,c){for(var d=null,e=0,f;f=a.childNodes[e];e++)if(f.tagName)switch(f.tagName.toUpperCase()){case "CATEGORY":d=this.tree_.createNode(f.getAttribute("name"));d.blocks=[];b.add(d);var g=f.getAttribute("custom");g?d.blocks=g:this.syncTrees_(f,d,c);g=f.getAttribute("colour");goog.isString(g)?(g.match(/^#[0-9a-fA-F]{6}$/)?d.hexColour=g:d.hexColour=Blockly.hueToRgb(g),this.hasColours_=!0):d.hexColour="";"true"==f.getAttribute("expanded")?(d.blocks.length&&
+this.tree_.setSelectedItem(d),d.setExpanded(!0)):d.setExpanded(!1);d=f;break;case "SEP":d&&("CATEGORY"==d.tagName.toUpperCase()?b.add(new Blockly.Toolbox.TreeSeparator(this.treeSeparatorConfig_)):(f=parseFloat(f.getAttribute("gap")),isNaN(f)||(g=parseFloat(d.getAttribute("gap")),f=isNaN(g)?f:g+f,d.setAttribute("gap",f))));break;case "BLOCK":case "SHADOW":b.blocks.push(f),d=f}};
+Blockly.Toolbox.prototype.addColour_=function(a){a=(a||this.tree_).getChildren();for(var b=0,c;c=a[b];b++){var d=c.getRowElement();if(d){var e=this.hasColours_?"8px solid "+(c.hexColour||"#ddd"):"none";this.workspace_.RTL?d.style.borderRight=e:d.style.borderLeft=e}this.addColour_(c)}};Blockly.Toolbox.prototype.clearSelection=function(){this.tree_.setSelectedItem(null)};
Blockly.Toolbox.prototype.getClientRect=function(){if(!this.HtmlDiv)return null;var a=this.HtmlDiv.getBoundingClientRect(),b=a.left,c=a.top,d=a.width,a=a.height;return this.toolboxPosition==Blockly.TOOLBOX_AT_LEFT?new goog.math.Rect(-1E7,-1E7,1E7+b+d,2E7):this.toolboxPosition==Blockly.TOOLBOX_AT_RIGHT?new goog.math.Rect(b,-1E7,1E7+d,2E7):this.toolboxPosition==Blockly.TOOLBOX_AT_TOP?new goog.math.Rect(-1E7,-1E7,2E7,1E7+c+a):new goog.math.Rect(0,c,2E7,1E7+d)};
Blockly.Toolbox.prototype.refreshSelection=function(){var a=this.tree_.getSelectedItem();a&&a.blocks&&this.flyout_.show(a.blocks)};Blockly.Toolbox.TreeControl=function(a,b){this.toolbox_=a;goog.ui.tree.TreeControl.call(this,goog.html.SafeHtml.EMPTY,b)};goog.inherits(Blockly.Toolbox.TreeControl,goog.ui.tree.TreeControl);
Blockly.Toolbox.TreeControl.prototype.enterDocument=function(){Blockly.Toolbox.TreeControl.superClass_.enterDocument.call(this);if(goog.events.BrowserFeature.TOUCH_ENABLED){var a=this.getElement();Blockly.bindEvent_(a,goog.events.EventType.TOUCHSTART,this,this.handleTouchEvent_)}};Blockly.Toolbox.TreeControl.prototype.handleTouchEvent_=function(a){a.preventDefault();var b=this.getNodeFromEvent_(a);b&&a.type===goog.events.EventType.TOUCHSTART&&setTimeout(function(){b.onMouseDown(a)},1)};
@@ -1390,8 +1391,8 @@ Blockly.Css.CONTENT=[".blocklySvg {","background-color: #fff;","outline: none;",
Blockly.WidgetDiv.show=function(a,b,c){Blockly.WidgetDiv.hide();Blockly.WidgetDiv.owner_=a;Blockly.WidgetDiv.dispose_=c;a=goog.style.getViewportPageOffset(document);Blockly.WidgetDiv.DIV.style.top=a.y+"px";Blockly.WidgetDiv.DIV.style.direction=b?"rtl":"ltr";Blockly.WidgetDiv.DIV.style.display="block"};
Blockly.WidgetDiv.hide=function(){Blockly.WidgetDiv.owner_&&(Blockly.WidgetDiv.owner_=null,Blockly.WidgetDiv.DIV.style.display="none",Blockly.WidgetDiv.DIV.style.left="",Blockly.WidgetDiv.DIV.style.top="",Blockly.WidgetDiv.DIV.style.height="",Blockly.WidgetDiv.dispose_&&Blockly.WidgetDiv.dispose_(),Blockly.WidgetDiv.dispose_=null,goog.dom.removeChildren(Blockly.WidgetDiv.DIV))};Blockly.WidgetDiv.isVisible=function(){return!!Blockly.WidgetDiv.owner_};
Blockly.WidgetDiv.hideIfOwner=function(a){Blockly.WidgetDiv.owner_==a&&Blockly.WidgetDiv.hide()};Blockly.WidgetDiv.position=function(a,b,c,d,e){bc.width+d.x&&(a=c.width+d.x):ad&&(d=h,e=g)}return e?Blockly.utils.wrapMutate_(a,e,c):b};Blockly.utils.wrapToText_=function(a,b){for(var c=[],d=0;dBlockly.DRAG_RADIUS&&
-Blockly.longStop_();a.stopPropagation();a.preventDefault()}}};
+Blockly.onMouseUp_=function(a){a=Blockly.getMainWorkspace();Blockly.Css.setCursor(Blockly.Css.Cursor.OPEN);a.dragMode_=Blockly.DRAG_NONE;Blockly.onTouchUpWrapper_&&(Blockly.unbindEvent_(Blockly.onTouchUpWrapper_),Blockly.onTouchUpWrapper_=null);Blockly.onMouseMoveWrapper_&&(Blockly.unbindEvent_(Blockly.onMouseMoveWrapper_),Blockly.onMouseMoveWrapper_=null)};
+Blockly.onMouseMove_=function(a){if(!(a.touches&&2<=a.touches.length)){var b=Blockly.getMainWorkspace();if(b.dragMode_!=Blockly.DRAG_NONE){var c=a.clientX-b.startDragMouseX,d=a.clientY-b.startDragMouseY,e=b.startDragMetrics,f=b.startScrollX+c,g=b.startScrollY+d,f=Math.min(f,-e.contentLeft),g=Math.min(g,-e.contentTop),f=Math.max(f,e.viewWidth-e.contentLeft-e.contentWidth),g=Math.max(g,e.viewHeight-e.contentTop-e.contentHeight);b.scrollbar.set(-f-e.contentLeft,-g-e.contentTop);Math.sqrt(c*c+d*d)>Blockly.DRAG_RADIUS&&
+(Blockly.longStop_(),b.dragMode_=Blockly.DRAG_FREE);a.stopPropagation();a.preventDefault()}}};
Blockly.onKeyDown_=function(a){if(!Blockly.mainWorkspace.options.readOnly&&!Blockly.isTargetInput_(a)){var b=!1;if(27==a.keyCode)Blockly.hideChaff();else if(8==a.keyCode||46==a.keyCode)a.preventDefault(),Blockly.selected&&Blockly.selected.isDeletable()&&(b=!0);else if(a.altKey||a.ctrlKey||a.metaKey)Blockly.selected&&Blockly.selected.isDeletable()&&Blockly.selected.isMovable()&&(67==a.keyCode?(Blockly.hideChaff(),Blockly.copy_(Blockly.selected)):88==a.keyCode&&(Blockly.copy_(Blockly.selected),b=!0)),
-86==a.keyCode?Blockly.clipboardXml_&&Blockly.clipboardSource_.paste(Blockly.clipboardXml_):90==a.keyCode&&(Blockly.hideChaff(),Blockly.mainWorkspace.undo(a.shiftKey));b&&(Blockly.Events.setGroup(!0),Blockly.hideChaff(),Blockly.selected.dispose(Blockly.dragMode_!=Blockly.DRAG_FREE,!0),Blockly.highlightedConnection_&&(Blockly.highlightedConnection_.unhighlight(),Blockly.highlightedConnection_=null),Blockly.Events.setGroup(!1))}};Blockly.terminateDrag_=function(){Blockly.BlockSvg.terminateDrag();Blockly.Flyout.terminateDrag_()};
-Blockly.longPid_=0;Blockly.longStart_=function(a,b){Blockly.longStop_();Blockly.longPid_=setTimeout(function(){a.button=2;b.onMouseDown_(a)},Blockly.LONGPRESS)};Blockly.longStop_=function(){Blockly.longPid_&&(clearTimeout(Blockly.longPid_),Blockly.longPid_=0)};
+86==a.keyCode?Blockly.clipboardXml_&&(Blockly.Events.setGroup(!0),Blockly.clipboardSource_.paste(Blockly.clipboardXml_),Blockly.Events.setGroup(!1)):90==a.keyCode&&(Blockly.hideChaff(),Blockly.mainWorkspace.undo(a.shiftKey));b&&(Blockly.Events.setGroup(!0),Blockly.hideChaff(),Blockly.selected.dispose(Blockly.dragMode_!=Blockly.DRAG_FREE,!0),Blockly.highlightedConnection_&&(Blockly.highlightedConnection_.unhighlight(),Blockly.highlightedConnection_=null),Blockly.Events.setGroup(!1))}};
+Blockly.terminateDrag_=function(){Blockly.BlockSvg.terminateDrag();Blockly.Flyout.terminateDrag_()};Blockly.longPid_=0;Blockly.longStart_=function(a,b){Blockly.longStop_();Blockly.longPid_=setTimeout(function(){a.button=2;b.onMouseDown_(a)},Blockly.LONGPRESS)};Blockly.longStop_=function(){Blockly.longPid_&&(clearTimeout(Blockly.longPid_),Blockly.longPid_=0)};
Blockly.copy_=function(a){var b=Blockly.Xml.blockToDom(a);Blockly.dragMode_!=Blockly.DRAG_FREE&&Blockly.Xml.deleteNext(b);var c=a.getRelativeToSurfaceXY();b.setAttribute("x",a.RTL?-c.x:c.x);b.setAttribute("y",c.y);Blockly.clipboardXml_=b;Blockly.clipboardSource_=a.workspace};Blockly.duplicate_=function(a){var b=Blockly.clipboardXml_,c=Blockly.clipboardSource_;Blockly.copy_(a);a.workspace.paste(Blockly.clipboardXml_);Blockly.clipboardXml_=b;Blockly.clipboardSource_=c};
Blockly.onContextMenu_=function(a){Blockly.isTargetInput_(a)||a.preventDefault()};Blockly.hideChaff=function(a){Blockly.Tooltip.hide();Blockly.WidgetDiv.hide();a||(a=Blockly.getMainWorkspace(),a.toolbox_&&a.toolbox_.flyout_&&a.toolbox_.flyout_.autoClose&&a.toolbox_.clearSelection())};
Blockly.getMainWorkspaceMetrics_=function(){var a=Blockly.svgSize(this.getParentSvg());if(this.toolbox_)if(this.toolboxPosition==Blockly.TOOLBOX_AT_TOP||this.toolboxPosition==Blockly.TOOLBOX_AT_BOTTOM)a.height-=this.toolbox_.getHeight();else if(this.toolboxPosition==Blockly.TOOLBOX_AT_LEFT||this.toolboxPosition==Blockly.TOOLBOX_AT_RIGHT)a.width-=this.toolbox_.getWidth();var b=Blockly.Flyout.prototype.CORNER_RADIUS-1,c=a.width-b,d=a.height-b,e=this.getBlocksBoundingBox(),f=e.width*this.scale,g=e.height*
diff --git a/blocks/lists.js b/blocks/lists.js
index af0f6624a..0d23db05f 100644
--- a/blocks/lists.js
+++ b/blocks/lists.js
@@ -300,7 +300,9 @@ Blockly.Blocks['lists_indexOf'] = {
this.appendValueInput('FIND')
.appendField(new Blockly.FieldDropdown(OPERATORS), 'END');
this.setInputsInline(true);
- this.setTooltip(Blockly.Msg.LISTS_INDEX_OF_TOOLTIP);
+ var tooltip = Blockly.Msg.LISTS_INDEX_OF_TOOLTIP
+ .replace('%1', Blockly.Blocks.ONE_BASED_INDEXING ? '0' : '-1');
+ this.setTooltip(tooltip);
}
};
@@ -343,9 +345,58 @@ Blockly.Blocks['lists_getIndex'] = {
// Assign 'this' to a variable for use in the tooltip closure below.
var thisBlock = this;
this.setTooltip(function() {
- var combo = thisBlock.getFieldValue('MODE') + '_' +
- thisBlock.getFieldValue('WHERE');
- return Blockly.Msg['LISTS_GET_INDEX_TOOLTIP_' + combo];
+ var mode = thisBlock.getFieldValue('MODE');
+ var where = thisBlock.getFieldValue('WHERE');
+ var tooltip = '';
+ switch (mode + ' ' + where) {
+ case 'GET FROM_START':
+ case 'GET FROM_END':
+ tooltip = Blockly.Msg.LISTS_GET_INDEX_TOOLTIP_GET_FROM;
+ break;
+ case 'GET FIRST':
+ tooltip = Blockly.Msg.LISTS_GET_INDEX_TOOLTIP_GET_FIRST;
+ break;
+ case 'GET LAST':
+ tooltip = Blockly.Msg.LISTS_GET_INDEX_TOOLTIP_GET_LAST;
+ break;
+ case 'GET RANDOM':
+ tooltip = Blockly.Msg.LISTS_GET_INDEX_TOOLTIP_GET_RANDOM;
+ break;
+ case 'GET_REMOVE FROM_START':
+ case 'GET_REMOVE FROM_END':
+ tooltip = Blockly.Msg.LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM;
+ break;
+ case 'GET_REMOVE FIRST':
+ tooltip = Blockly.Msg.LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FIRST;
+ break;
+ case 'GET_REMOVE LAST':
+ tooltip = Blockly.Msg.LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_LAST;
+ break;
+ case 'GET_REMOVE RANDOM':
+ tooltip = Blockly.Msg.LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_RANDOM;
+ break;
+ case 'REMOVE FROM_START':
+ case 'REMOVE FROM_END':
+ tooltip = Blockly.Msg.LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM;
+ break;
+ case 'REMOVE FIRST':
+ tooltip = Blockly.Msg.LISTS_GET_INDEX_TOOLTIP_REMOVE_FIRST;
+ break;
+ case 'REMOVE LAST':
+ tooltip = Blockly.Msg.LISTS_GET_INDEX_TOOLTIP_REMOVE_LAST;
+ break;
+ case 'REMOVE RANDOM':
+ tooltip = Blockly.Msg.LISTS_GET_INDEX_TOOLTIP_REMOVE_RANDOM;
+ break;
+ }
+ if (where == 'FROM_START') {
+ tooltip += ' ' + Blockly.Msg.LISTS_INDEX_FROM_START_TOOLTIP
+ .replace('%1', Blockly.Blocks.ONE_BASED_INDEXING ? '#1' : '#0');
+ } else if (where == 'FROM_END') {
+ tooltip += ' ' + Blockly.Msg.LISTS_INDEX_FROM_END_TOOLTIP
+ .replace('%1', '#1'); // The end is always 1-indexed.
+ }
+ return tooltip;
});
},
/**
@@ -470,9 +521,45 @@ Blockly.Blocks['lists_setIndex'] = {
// Assign 'this' to a variable for use in the tooltip closure below.
var thisBlock = this;
this.setTooltip(function() {
- var combo = thisBlock.getFieldValue('MODE') + '_' +
- thisBlock.getFieldValue('WHERE');
- return Blockly.Msg['LISTS_SET_INDEX_TOOLTIP_' + combo];
+ var mode = thisBlock.getFieldValue('MODE');
+ var where = thisBlock.getFieldValue('WHERE');
+ var tooltip = '';
+ switch (mode + ' ' + where) {
+ case 'SET FROM_START':
+ case 'SET FROM_END':
+ tooltip = Blockly.Msg.LISTS_SET_INDEX_TOOLTIP_SET_FROM;
+ break;
+ case 'SET FIRST':
+ tooltip = Blockly.Msg.LISTS_SET_INDEX_TOOLTIP_SET_FIRST;
+ break;
+ case 'SET LAST':
+ tooltip = Blockly.Msg.LISTS_SET_INDEX_TOOLTIP_SET_LAST;
+ break;
+ case 'SET RANDOM':
+ tooltip = Blockly.Msg.LISTS_SET_INDEX_TOOLTIP_SET_RANDOM;
+ break;
+ case 'INSERT FROM_START':
+ case 'INSERT FROM_END':
+ tooltip = Blockly.Msg.LISTS_SET_INDEX_TOOLTIP_INSERT_FROM;
+ break;
+ case 'INSERT FIRST':
+ tooltip = Blockly.Msg.LISTS_SET_INDEX_TOOLTIP_INSERT_FIRST;
+ break;
+ case 'INSERT LAST':
+ tooltip = Blockly.Msg.LISTS_SET_INDEX_TOOLTIP_INSERT_LAST;
+ break;
+ case 'INSERT RANDOM':
+ tooltip = Blockly.Msg.LISTS_SET_INDEX_TOOLTIP_INSERT_RANDOM;
+ break;
+ }
+ if (where == 'FROM_START') {
+ tooltip += ' ' + Blockly.Msg.LISTS_INDEX_FROM_START_TOOLTIP
+ .replace('%1', Blockly.Blocks.ONE_BASED_INDEXING ? '#1' : '#0');
+ } else if (where == 'FROM_END') {
+ tooltip += ' ' + Blockly.Msg.LISTS_INDEX_FROM_END_TOOLTIP
+ .replace('%1', '#1'); // The end is always 1-indexed.
+ }
+ return tooltip;
});
},
/**
diff --git a/blocks/procedures.js b/blocks/procedures.js
index f6b25bcd6..82b383b51 100644
--- a/blocks/procedures.js
+++ b/blocks/procedures.js
@@ -59,16 +59,6 @@ Blockly.Blocks['procedures_defnoreturn'] = {
this.setStatements_(true);
this.statementConnection_ = null;
},
- /**
- * Initialization of the block has completed, clean up anything that may be
- * inconsistent as a result of the XML loading.
- * @this Blockly.Block
- */
- validate: function() {
- var name = Blockly.Procedures.findLegalName(
- this.getFieldValue('NAME'), this);
- this.setFieldValue(name, 'NAME');
- },
/**
* Add or remove the statement block from this function definition.
* @param {boolean} hasStatements True if a statement block is needed.
@@ -120,8 +110,11 @@ Blockly.Blocks['procedures_defnoreturn'] = {
// The params field is deterministic based on the mutation,
// no need to fire a change event.
Blockly.Events.disable();
- this.setFieldValue(paramString, 'PARAMS');
- Blockly.Events.enable();
+ try {
+ this.setFieldValue(paramString, 'PARAMS');
+ } finally {
+ Blockly.Events.enable();
+ }
},
/**
* Create XML to represent the argument inputs.
@@ -244,16 +237,6 @@ Blockly.Blocks['procedures_defnoreturn'] = {
}
}
},
- /**
- * Dispose of any callers.
- * @this Blockly.Block
- */
- dispose: function() {
- var name = this.getFieldValue('NAME');
- Blockly.Procedures.disposeCallers(name, this.workspace);
- // Call parent's destructor.
- this.constructor.prototype.dispose.apply(this, arguments);
- },
/**
* Return the signature of this procedure definition.
* @return {!Array} Tuple containing three elements:
@@ -371,13 +354,11 @@ Blockly.Blocks['procedures_defreturn'] = {
this.statementConnection_ = null;
},
setStatements_: Blockly.Blocks['procedures_defnoreturn'].setStatements_,
- validate: Blockly.Blocks['procedures_defnoreturn'].validate,
updateParams_: Blockly.Blocks['procedures_defnoreturn'].updateParams_,
mutationToDom: Blockly.Blocks['procedures_defnoreturn'].mutationToDom,
domToMutation: Blockly.Blocks['procedures_defnoreturn'].domToMutation,
decompose: Blockly.Blocks['procedures_defnoreturn'].decompose,
compose: Blockly.Blocks['procedures_defnoreturn'].compose,
- dispose: Blockly.Blocks['procedures_defnoreturn'].dispose,
/**
* Return the signature of this procedure definition.
* @return {!Array} Tuple containing three elements:
@@ -589,8 +570,11 @@ Blockly.Blocks['procedures_callnoreturn'] = {
// The argument name field is deterministic based on the mutation,
// no need to fire a change event.
Blockly.Events.disable();
- field.setValue(this.arguments_[i]);
- Blockly.Events.enable();
+ try {
+ field.setValue(this.arguments_[i]);
+ } finally {
+ Blockly.Events.enable();
+ }
} else {
// Add new input.
field = new Blockly.FieldLabel(this.arguments_[i]);
@@ -668,6 +652,72 @@ Blockly.Blocks['procedures_callnoreturn'] = {
}
}
},
+ /**
+ * Procedure calls cannot exist without the corresponding procedure
+ * definition. Enforce this link whenever an event is fired.
+ * @this Blockly.Block
+ */
+ onchange: function(event) {
+ if (!this.workspace || this.workspace.isFlyout) {
+ // Block is deleted or is in a flyout.
+ return;
+ }
+ if (event.type == Blockly.Events.CREATE &&
+ event.ids.indexOf(this.id) != -1) {
+ // Look for the case where a procedure call was created (usually through
+ // paste) and there is no matching definition. In this case, create
+ // an empty definition block with the correct signature.
+ var name = this.getProcedureCall();
+ var def = Blockly.Procedures.getDefinition(name, this.workspace);
+ if (def && (def.type != this.defType_ ||
+ JSON.stringify(def.arguments_) != JSON.stringify(this.arguments_))) {
+ // The signatures don't match.
+ def = null;
+ }
+ if (!def) {
+ Blockly.Events.setGroup(event.group);
+ /**
+ * Create matching definition block.
+ *
+ *
+ *
+ *
+ *
+ * test
+ *
+ *
+ */
+ var xml = goog.dom.createDom('xml');
+ var block = goog.dom.createDom('block');
+ block.setAttribute('type', this.defType_);
+ var xy = this.getRelativeToSurfaceXY();
+ var x = xy.x + Blockly.SNAP_RADIUS * (this.RTL ? -1 : 1);
+ var y = xy.y + Blockly.SNAP_RADIUS * 2;
+ block.setAttribute('x', x);
+ block.setAttribute('y', y);
+ var mutation = this.mutationToDom();
+ block.appendChild(mutation);
+ var field = goog.dom.createDom('field');
+ field.setAttribute('name', 'NAME');
+ field.appendChild(document.createTextNode(this.getProcedureCall()));
+ block.appendChild(field);
+ xml.appendChild(block);
+ Blockly.Xml.domToWorkspace(xml, this.workspace);
+ Blockly.Events.setGroup(false);
+ }
+ } else if (event.type == Blockly.Events.DELETE) {
+ // Look for the case where a procedure definition has been deleted,
+ // leaving this block (a procedure call) orphaned. In this case, delete
+ // the orphan.
+ var name = this.getProcedureCall();
+ var def = Blockly.Procedures.getDefinition(name, this.workspace);
+ if (!def) {
+ Blockly.Events.setGroup(event.group);
+ this.dispose(true, false);
+ Blockly.Events.setGroup(false);
+ }
+ }
+ },
/**
* Add menu option to find the definition block for this call.
* @param {!Array} options List of menu options to add to.
@@ -683,7 +733,8 @@ Blockly.Blocks['procedures_callnoreturn'] = {
def && def.select();
};
options.push(option);
- }
+ },
+ defType_: 'procedures_defnoreturn'
};
Blockly.Blocks['procedures_callreturn'] = {
@@ -710,7 +761,10 @@ Blockly.Blocks['procedures_callreturn'] = {
mutationToDom: Blockly.Blocks['procedures_callnoreturn'].mutationToDom,
domToMutation: Blockly.Blocks['procedures_callnoreturn'].domToMutation,
renameVar: Blockly.Blocks['procedures_callnoreturn'].renameVar,
- customContextMenu: Blockly.Blocks['procedures_callnoreturn'].customContextMenu
+ onchange: Blockly.Blocks['procedures_callnoreturn'].onchange,
+ customContextMenu:
+ Blockly.Blocks['procedures_callnoreturn'].customContextMenu,
+ defType_: 'procedures_defreturn'
};
Blockly.Blocks['procedures_ifreturn'] = {
diff --git a/blocks/text.js b/blocks/text.js
index 030940add..23ff52b32 100644
--- a/blocks/text.js
+++ b/blocks/text.js
@@ -322,7 +322,9 @@ Blockly.Blocks['text_indexOf'] = {
this.appendDummyInput().appendField(Blockly.Msg.TEXT_INDEXOF_TAIL);
}
this.setInputsInline(true);
- this.setTooltip(Blockly.Msg.TEXT_INDEXOF_TOOLTIP);
+ var tooltip = Blockly.Msg.TEXT_INDEXOF_TOOLTIP
+ .replace('%1', Blockly.Blocks.ONE_BASED_INDEXING ? '0' : '-1');
+ this.setTooltip(tooltip);
}
};
diff --git a/blocks_compressed.js b/blocks_compressed.js
index 8661a8aae..91e2f0f39 100644
--- a/blocks_compressed.js
+++ b/blocks_compressed.js
@@ -5,7 +5,7 @@
// Copyright 2012 Google Inc. Apache License 2.0
Blockly.Blocks.lists={};Blockly.Blocks.lists.HUE=260;Blockly.Blocks.lists_create_empty={init:function(){this.jsonInit({message0:Blockly.Msg.LISTS_CREATE_EMPTY_TITLE,output:"Array",colour:Blockly.Blocks.lists.HUE,tooltip:Blockly.Msg.LISTS_CREATE_EMPTY_TOOLTIP,helpUrl:Blockly.Msg.LISTS_CREATE_EMPTY_HELPURL})}};
Blockly.Blocks.lists_create_with={init:function(){this.setHelpUrl(Blockly.Msg.LISTS_CREATE_WITH_HELPURL);this.setColour(Blockly.Blocks.lists.HUE);this.itemCount_=3;this.updateShape_();this.setOutput(!0,"Array");this.setMutator(new Blockly.Mutator(["lists_create_with_item"]));this.setTooltip(Blockly.Msg.LISTS_CREATE_WITH_TOOLTIP)},mutationToDom:function(){var a=document.createElement("mutation");a.setAttribute("items",this.itemCount_);return a},domToMutation:function(a){this.itemCount_=parseInt(a.getAttribute("items"),
-10);this.updateShape_()},decompose:function(a){var b=a.newBlock("lists_create_with_container");b.initSvg();for(var c=b.getInput("STACK").connection,d=0;d","LT"],["\u2265","LTE"],["<","GT"],["\u2264","GTE"]],b=[["=","EQ"],["\u2260","NEQ"],["<","LT"],["\u2264","LTE"],[">","GT"],["\u2265","GTE"]],a=this.RTL?a:b;this.setHelpUrl(Blockly.Msg.LOGIC_COMPARE_HELPURL);this.setColour(Blockly.Blocks.logic.HUE);this.setOutput(!0,"Boolean");this.appendValueInput("A");this.appendValueInput("B").appendField(new Blockly.FieldDropdown(a),"OP");this.setInputsInline(!0);var c=this;this.setTooltip(function(){var a=
c.getFieldValue("OP");return{EQ:Blockly.Msg.LOGIC_COMPARE_TOOLTIP_EQ,NEQ:Blockly.Msg.LOGIC_COMPARE_TOOLTIP_NEQ,LT:Blockly.Msg.LOGIC_COMPARE_TOOLTIP_LT,LTE:Blockly.Msg.LOGIC_COMPARE_TOOLTIP_LTE,GT:Blockly.Msg.LOGIC_COMPARE_TOOLTIP_GT,GTE:Blockly.Msg.LOGIC_COMPARE_TOOLTIP_GTE}[a]});this.prevBlocks_=[null,null]},onchange:function(a){var b=this.getInputTargetBlock("A"),c=this.getInputTargetBlock("B");if(b&&c&&!b.outputConnection.checkType_(c.outputConnection)){Blockly.Events.setGroup(a.group);for(a=0;a<
-this.prevBlocks_.length;a++){var d=this.prevBlocks_[a];if(d===b||d===c)d.unplug(),d.bumpNeighbours_()}Blockly.Events.setGroup(!1)}this.prevBlocks_[0]=b;this.prevBlocks_[1]=c}};
+this.prevBlocks_.length;a++){var e=this.prevBlocks_[a];if(e===b||e===c)e.unplug(),e.bumpNeighbours_()}Blockly.Events.setGroup(!1)}this.prevBlocks_[0]=b;this.prevBlocks_[1]=c}};
Blockly.Blocks.logic_operation={init:function(){var a=[[Blockly.Msg.LOGIC_OPERATION_AND,"AND"],[Blockly.Msg.LOGIC_OPERATION_OR,"OR"]];this.setHelpUrl(Blockly.Msg.LOGIC_OPERATION_HELPURL);this.setColour(Blockly.Blocks.logic.HUE);this.setOutput(!0,"Boolean");this.appendValueInput("A").setCheck("Boolean");this.appendValueInput("B").setCheck("Boolean").appendField(new Blockly.FieldDropdown(a),"OP");this.setInputsInline(!0);var b=this;this.setTooltip(function(){var a=b.getFieldValue("OP");return{AND:Blockly.Msg.LOGIC_OPERATION_TOOLTIP_AND,
OR:Blockly.Msg.LOGIC_OPERATION_TOOLTIP_OR}[a]})}};Blockly.Blocks.logic_negate={init:function(){this.jsonInit({message0:Blockly.Msg.LOGIC_NEGATE_TITLE,args0:[{type:"input_value",name:"BOOL",check:"Boolean"}],output:"Boolean",colour:Blockly.Blocks.logic.HUE,tooltip:Blockly.Msg.LOGIC_NEGATE_TOOLTIP,helpUrl:Blockly.Msg.LOGIC_NEGATE_HELPURL})}};
Blockly.Blocks.logic_boolean={init:function(){this.jsonInit({message0:"%1",args0:[{type:"field_dropdown",name:"BOOL",options:[[Blockly.Msg.LOGIC_BOOLEAN_TRUE,"TRUE"],[Blockly.Msg.LOGIC_BOOLEAN_FALSE,"FALSE"]]}],output:"Boolean",colour:Blockly.Blocks.logic.HUE,tooltip:Blockly.Msg.LOGIC_BOOLEAN_TOOLTIP,helpUrl:Blockly.Msg.LOGIC_BOOLEAN_HELPURL})}};
Blockly.Blocks.logic_null={init:function(){this.jsonInit({message0:Blockly.Msg.LOGIC_NULL,output:null,colour:Blockly.Blocks.logic.HUE,tooltip:Blockly.Msg.LOGIC_NULL_TOOLTIP,helpUrl:Blockly.Msg.LOGIC_NULL_HELPURL})}};
Blockly.Blocks.logic_ternary={init:function(){this.setHelpUrl(Blockly.Msg.LOGIC_TERNARY_HELPURL);this.setColour(Blockly.Blocks.logic.HUE);this.appendValueInput("IF").setCheck("Boolean").appendField(Blockly.Msg.LOGIC_TERNARY_CONDITION);this.appendValueInput("THEN").appendField(Blockly.Msg.LOGIC_TERNARY_IF_TRUE);this.appendValueInput("ELSE").appendField(Blockly.Msg.LOGIC_TERNARY_IF_FALSE);this.setOutput(!0);this.setTooltip(Blockly.Msg.LOGIC_TERNARY_TOOLTIP);this.prevParentConnection_=null},onchange:function(a){var b=
-this.getInputTargetBlock("THEN"),c=this.getInputTargetBlock("ELSE"),d=this.outputConnection.targetConnection;if((b||c)&&d)for(var e=0;2>e;e++){var f=1==e?b:c;f&&!f.outputConnection.checkType_(d)&&(Blockly.Events.setGroup(a.group),d===this.prevParentConnection_?(this.unplug(),d.getSourceBlock().bumpNeighbours_()):(f.unplug(),f.bumpNeighbours_()),Blockly.Events.setGroup(!1))}this.prevParentConnection_=d}};
\ No newline at end of file
+this.getInputTargetBlock("THEN"),c=this.getInputTargetBlock("ELSE"),e=this.outputConnection.targetConnection;if((b||c)&&e)for(var d=0;2>d;d++){var f=1==d?b:c;f&&!f.outputConnection.checkType_(e)&&(Blockly.Events.setGroup(a.group),e===this.prevParentConnection_?(this.unplug(),e.getSourceBlock().bumpNeighbours_()):(f.unplug(),f.bumpNeighbours_()),Blockly.Events.setGroup(!1))}this.prevParentConnection_=e}};
\ No newline at end of file
diff --git a/core/block.js b/core/block.js
index 92b533be8..beb411a9d 100644
--- a/core/block.js
+++ b/core/block.js
@@ -204,39 +204,42 @@ Blockly.Block.prototype.dispose = function(healStack) {
}
Blockly.Events.disable();
- // This block is now at the top of the workspace.
- // Remove this block from the workspace's list of top-most blocks.
- if (this.workspace) {
- this.workspace.removeTopBlock(this);
- // Remove from block database.
- delete this.workspace.blockDB_[this.id];
- this.workspace = null;
- }
-
- // Just deleting this block from the DOM would result in a memory leak as
- // well as corruption of the connection database. Therefore we must
- // methodically step through the blocks and carefully disassemble them.
-
- // First, dispose of all my children.
- for (var i = this.childBlocks_.length - 1; i >= 0; i--) {
- this.childBlocks_[i].dispose(false);
- }
- // Then dispose of myself.
- // Dispose of all inputs and their fields.
- for (var i = 0, input; input = this.inputList[i]; i++) {
- input.dispose();
- }
- this.inputList.length = 0;
- // Dispose of any remaining connections (next/previous/output).
- var connections = this.getConnections_(true);
- for (var i = 0; i < connections.length; i++) {
- var connection = connections[i];
- if (connection.isConnected()) {
- connection.disconnect();
+ try {
+ // This block is now at the top of the workspace.
+ // Remove this block from the workspace's list of top-most blocks.
+ if (this.workspace) {
+ this.workspace.removeTopBlock(this);
+ // Remove from block database.
+ delete this.workspace.blockDB_[this.id];
+ this.workspace = null;
}
- connections[i].dispose();
+
+ // Just deleting this block from the DOM would result in a memory leak as
+ // well as corruption of the connection database. Therefore we must
+ // methodically step through the blocks and carefully disassemble them.
+
+ // First, dispose of all my children.
+ for (var i = this.childBlocks_.length - 1; i >= 0; i--) {
+ this.childBlocks_[i].dispose(false);
+ }
+ // Then dispose of myself.
+ // Dispose of all inputs and their fields.
+ for (var i = 0, input; input = this.inputList[i]; i++) {
+ input.dispose();
+ }
+ this.inputList.length = 0;
+ // Dispose of any remaining connections (next/previous/output).
+ var connections = this.getConnections_(true);
+ for (var i = 0; i < connections.length; i++) {
+ var connection = connections[i];
+ if (connection.isConnected()) {
+ connection.disconnect();
+ }
+ connections[i].dispose();
+ }
+ } finally {
+ Blockly.Events.enable();
}
- Blockly.Events.enable();
};
/**
@@ -1071,61 +1074,65 @@ Blockly.Block.prototype.interpolate_ = function(message, args, lastDummyAlign) {
var input = null;
do {
var altRepeat = false;
- switch (element['type']) {
- case 'input_value':
- input = this.appendValueInput(element['name']);
- break;
- case 'input_statement':
- input = this.appendStatementInput(element['name']);
- break;
- case 'input_dummy':
- input = this.appendDummyInput(element['name']);
- break;
- case 'field_label':
- field = new Blockly.FieldLabel(element['text'], element['class']);
- break;
- case 'field_input':
- field = new Blockly.FieldTextInput(element['text']);
- if (typeof element['spellcheck'] == 'boolean') {
- field.setSpellcheck(element['spellcheck']);
- }
- break;
- case 'field_angle':
- field = new Blockly.FieldAngle(element['angle']);
- break;
- case 'field_checkbox':
- field = new Blockly.FieldCheckbox(
- element['checked'] ? 'TRUE' : 'FALSE');
- break;
- case 'field_colour':
- field = new Blockly.FieldColour(element['colour']);
- break;
- case 'field_variable':
- field = new Blockly.FieldVariable(element['variable']);
- break;
- case 'field_dropdown':
- field = new Blockly.FieldDropdown(element['options']);
- break;
- case 'field_image':
- field = new Blockly.FieldImage(element['src'],
- element['width'], element['height'], element['alt']);
- break;
- case 'field_number':
- field = new Blockly.FieldNumber(element['value'],
- element['min'], element['max'], element['precision']);
- break;
- case 'field_date':
- if (Blockly.FieldDate) {
- field = new Blockly.FieldDate(element['date']);
+ if (typeof element == 'string') {
+ field = new Blockly.FieldLabel(element);
+ } else {
+ switch (element['type']) {
+ case 'input_value':
+ input = this.appendValueInput(element['name']);
break;
- }
- // Fall through if FieldDate is not compiled in.
- default:
- // Unknown field.
- if (element['alt']) {
- element = element['alt'];
- altRepeat = true;
- }
+ case 'input_statement':
+ input = this.appendStatementInput(element['name']);
+ break;
+ case 'input_dummy':
+ input = this.appendDummyInput(element['name']);
+ break;
+ case 'field_label':
+ field = new Blockly.FieldLabel(element['text'], element['class']);
+ break;
+ case 'field_input':
+ field = new Blockly.FieldTextInput(element['text']);
+ if (typeof element['spellcheck'] == 'boolean') {
+ field.setSpellcheck(element['spellcheck']);
+ }
+ break;
+ case 'field_angle':
+ field = new Blockly.FieldAngle(element['angle']);
+ break;
+ case 'field_checkbox':
+ field = new Blockly.FieldCheckbox(
+ element['checked'] ? 'TRUE' : 'FALSE');
+ break;
+ case 'field_colour':
+ field = new Blockly.FieldColour(element['colour']);
+ break;
+ case 'field_variable':
+ field = new Blockly.FieldVariable(element['variable']);
+ break;
+ case 'field_dropdown':
+ field = new Blockly.FieldDropdown(element['options']);
+ break;
+ case 'field_image':
+ field = new Blockly.FieldImage(element['src'],
+ element['width'], element['height'], element['alt']);
+ break;
+ case 'field_number':
+ field = new Blockly.FieldNumber(element['value'],
+ element['min'], element['max'], element['precision']);
+ break;
+ case 'field_date':
+ if (Blockly.FieldDate) {
+ field = new Blockly.FieldDate(element['date']);
+ break;
+ }
+ // Fall through if FieldDate is not compiled in.
+ default:
+ // Unknown field.
+ if (element['alt']) {
+ element = element['alt'];
+ altRepeat = true;
+ }
+ }
}
} while (altRepeat);
if (field) {
diff --git a/core/block_svg.js b/core/block_svg.js
index 036de42f6..af19bb4a1 100644
--- a/core/block_svg.js
+++ b/core/block_svg.js
@@ -156,8 +156,11 @@ Blockly.BlockSvg.prototype.select = function() {
oldId = Blockly.selected.id;
// Unselect any previously selected block.
Blockly.Events.disable();
- Blockly.selected.unselect();
- Blockly.Events.enable();
+ try {
+ Blockly.selected.unselect();
+ } finally {
+ Blockly.Events.enable();
+ }
}
var event = new Blockly.Events.Ui(null, 'selected', oldId, this.id);
event.workspaceId = this.workspace.id;
@@ -998,11 +1001,14 @@ Blockly.BlockSvg.prototype.dispose = function(healStack, animate) {
this.rendered = false;
Blockly.Events.disable();
- var icons = this.getIcons();
- for (var i = 0; i < icons.length; i++) {
- icons[i].dispose();
+ try {
+ var icons = this.getIcons();
+ for (var i = 0; i < icons.length; i++) {
+ icons[i].dispose();
+ }
+ } finally {
+ Blockly.Events.enable();
}
- Blockly.Events.enable();
Blockly.BlockSvg.superClass_.dispose.call(this, healStack);
goog.dom.removeNode(this.svgGroup_);
@@ -1407,7 +1413,12 @@ Blockly.BlockSvg.prototype.addSelect = function() {
Blockly.addClass_(/** @type {!Element} */ (this.svgGroup_),
'blocklySelected');
// Move the selected block to the top of the stack.
- this.svgGroup_.parentNode.appendChild(this.svgGroup_);
+ var block = this;
+ do {
+ var root = block.getSvgRoot();
+ root.parentNode.appendChild(root);
+ block = block.getParent();
+ } while (block);
};
/**
diff --git a/core/blockly.js b/core/blockly.js
index cda45992e..c01e94a25 100644
--- a/core/blockly.js
+++ b/core/blockly.js
@@ -106,9 +106,9 @@ Blockly.clipboardSource_ = null;
/**
* Is the mouse dragging a block?
- * 0 - No drag operation.
- * 1 - Still inside the sticky DRAG_RADIUS.
- * 2 - Freely draggable.
+ * DRAG_NONE - No drag operation.
+ * DRAG_STICKY - Still inside the sticky DRAG_RADIUS.
+ * DRAG_FREE - Freely draggable.
* @private
*/
Blockly.dragMode_ = Blockly.DRAG_NONE;
@@ -190,7 +190,7 @@ Blockly.svgResize = function(workspace) {
Blockly.onMouseUp_ = function(e) {
var workspace = Blockly.getMainWorkspace();
Blockly.Css.setCursor(Blockly.Css.Cursor.OPEN);
- workspace.isScrolling = false;
+ workspace.dragMode_ = Blockly.DRAG_NONE;
// Unbind the touch event if it exists.
if (Blockly.onTouchUpWrapper_) {
Blockly.unbindEvent_(Blockly.onTouchUpWrapper_);
@@ -212,7 +212,7 @@ Blockly.onMouseMove_ = function(e) {
return; // Multi-touch gestures won't have e.clientX.
}
var workspace = Blockly.getMainWorkspace();
- if (workspace.isScrolling) {
+ if (workspace.dragMode_ != Blockly.DRAG_NONE) {
var dx = e.clientX - workspace.startDragMouseX;
var dy = e.clientY - workspace.startDragMouseY;
var metrics = workspace.startDragMetrics;
@@ -231,6 +231,7 @@ Blockly.onMouseMove_ = function(e) {
// Cancel the long-press if the drag has moved too far.
if (Math.sqrt(dx * dx + dy * dy) > Blockly.DRAG_RADIUS) {
Blockly.longStop_();
+ workspace.dragMode_ = Blockly.DRAG_FREE;
}
e.stopPropagation();
e.preventDefault();
@@ -277,7 +278,9 @@ Blockly.onKeyDown_ = function(e) {
if (e.keyCode == 86) {
// 'v' for paste.
if (Blockly.clipboardXml_) {
+ Blockly.Events.setGroup(true);
Blockly.clipboardSource_.paste(Blockly.clipboardXml_);
+ Blockly.Events.setGroup(false);
}
} else if (e.keyCode == 90) {
// 'z' for undo 'Z' is for redo.
diff --git a/core/blocks.js b/core/blocks.js
index 606ef3f0b..d6932ceb9 100644
--- a/core/blocks.js
+++ b/core/blocks.js
@@ -25,3 +25,9 @@
'use strict';
goog.provide('Blockly.Blocks');
+
+/**
+ * Allow for switching between one and zero based indexing for lists and text,
+ * one based by default.
+ */
+Blockly.Blocks.ONE_BASED_INDEXING = true;
diff --git a/core/constants.js b/core/constants.js
index f082905d5..0f327e2d9 100644
--- a/core/constants.js
+++ b/core/constants.js
@@ -154,7 +154,14 @@ Blockly.DRAG_NONE = 0;
Blockly.DRAG_STICKY = 1;
/**
- * ENUM for freely draggable.
+ * ENUM for inside the non-sticky DRAG_RADIUS, for differentiating between
+ * clicks and drags.
+ * @const
+ */
+Blockly.DRAG_BEGIN = 1;
+
+/**
+ * ENUM for freely draggable (outside the DRAG_RADIUS, if one applies).
* @const
*/
Blockly.DRAG_FREE = 2;
diff --git a/core/contextmenu.js b/core/contextmenu.js
index af92cf6e2..462ad0b2c 100644
--- a/core/contextmenu.js
+++ b/core/contextmenu.js
@@ -126,17 +126,20 @@ Blockly.ContextMenu.hide = function() {
Blockly.ContextMenu.callbackFactory = function(block, xml) {
return function() {
Blockly.Events.disable();
- var newBlock = Blockly.Xml.domToBlock(xml, block.workspace);
- // Move the new block next to the old block.
- var xy = block.getRelativeToSurfaceXY();
- if (block.RTL) {
- xy.x -= Blockly.SNAP_RADIUS;
- } else {
- xy.x += Blockly.SNAP_RADIUS;
+ try {
+ var newBlock = Blockly.Xml.domToBlock(xml, block.workspace);
+ // Move the new block next to the old block.
+ var xy = block.getRelativeToSurfaceXY();
+ if (block.RTL) {
+ xy.x -= Blockly.SNAP_RADIUS;
+ } else {
+ xy.x += Blockly.SNAP_RADIUS;
+ }
+ xy.y += Blockly.SNAP_RADIUS * 2;
+ newBlock.moveBy(xy.x, xy.y);
+ } finally {
+ Blockly.Events.enable();
}
- xy.y += Blockly.SNAP_RADIUS * 2;
- newBlock.moveBy(xy.x, xy.y);
- Blockly.Events.enable();
if (Blockly.Events.isEnabled() && !newBlock.isShadow()) {
Blockly.Events.fire(new Blockly.Events.Create(newBlock));
}
diff --git a/core/field_angle.js b/core/field_angle.js
index 00b0c16a4..422191730 100644
--- a/core/field_angle.js
+++ b/core/field_angle.js
@@ -154,15 +154,15 @@ Blockly.FieldAngle.prototype.showEditor_ = function() {
'y1': Blockly.FieldAngle.HALF,
'class': 'blocklyAngleLine'}, svg);
// Draw markers around the edge.
- for (var a = 0; a < 360; a += 15) {
+ for (var angle = 0; angle < 360; angle += 15) {
Blockly.createSvgElement('line', {
'x1': Blockly.FieldAngle.HALF + Blockly.FieldAngle.RADIUS,
'y1': Blockly.FieldAngle.HALF,
'x2': Blockly.FieldAngle.HALF + Blockly.FieldAngle.RADIUS -
- (a % 45 == 0 ? 10 : 5),
+ (angle % 45 == 0 ? 10 : 5),
'y2': Blockly.FieldAngle.HALF,
'class': 'blocklyAngleMarks',
- 'transform': 'rotate(' + a + ',' +
+ 'transform': 'rotate(' + angle + ',' +
Blockly.FieldAngle.HALF + ',' + Blockly.FieldAngle.HALF + ')'
}, svg);
}
@@ -205,7 +205,7 @@ Blockly.FieldAngle.prototype.onMouseMove = function(e) {
angle = Math.round(angle / Blockly.FieldAngle.ROUND) *
Blockly.FieldAngle.ROUND;
}
- angle = Blockly.FieldAngle.angleValidator(angle);
+ angle = Blockly.FieldAngle.classValidator(angle);
Blockly.FieldTextInput.htmlInput_.value = angle;
this.setValue(angle);
this.validate_();
diff --git a/core/field_dropdown.js b/core/field_dropdown.js
index 1e62cf50c..ec3dd4f5a 100644
--- a/core/field_dropdown.js
+++ b/core/field_dropdown.js
@@ -122,9 +122,9 @@ Blockly.FieldDropdown.prototype.showEditor_ = function() {
var menu = new goog.ui.Menu();
menu.setRightToLeft(this.sourceBlock_.RTL);
var options = this.getOptions_();
- for (var x = 0; x < options.length; x++) {
- var text = options[x][0]; // Human-readable text.
- var value = options[x][1]; // Language-neutral value.
+ for (var i = 0; i < options.length; i++) {
+ var text = options[i][0]; // Human-readable text.
+ var value = options[i][1]; // Language-neutral value.
var menuItem = new goog.ui.MenuItem(text);
menuItem.setRightToLeft(this.sourceBlock_.RTL);
menuItem.setValue(value);
@@ -223,11 +223,11 @@ Blockly.FieldDropdown.prototype.trimOptions_ = function() {
}
// Remove the prefix and suffix from the options.
var newOptions = [];
- for (var x = 0; x < options.length; x++) {
- var text = options[x][0];
- var value = options[x][1];
+ for (var i = 0; i < options.length; i++) {
+ var text = options[i][0];
+ var value = options[i][1];
text = text.substring(prefixLength, text.length - suffixLength);
- newOptions[x] = [text, value];
+ newOptions[i] = [text, value];
}
this.menuGenerator_ = newOptions;
};
@@ -268,10 +268,10 @@ Blockly.FieldDropdown.prototype.setValue = function(newValue) {
this.value_ = newValue;
// Look up and display the human-readable text.
var options = this.getOptions_();
- for (var x = 0; x < options.length; x++) {
+ for (var i = 0; i < options.length; i++) {
// Options are tuples of human-readable text and language-neutral values.
- if (options[x][1] == newValue) {
- this.setText(options[x][0]);
+ if (options[i][1] == newValue) {
+ this.setText(options[i][0]);
return;
}
}
diff --git a/core/field_number.js b/core/field_number.js
index b580d737a..cd773cb87 100644
--- a/core/field_number.js
+++ b/core/field_number.js
@@ -44,6 +44,7 @@ goog.require('goog.math');
*/
Blockly.FieldNumber =
function(value, opt_min, opt_max, opt_precision, opt_validator) {
+ value = String(value);
Blockly.FieldNumber.superClass_.constructor.call(this, value, opt_validator);
this.setConstraints(opt_min, opt_max, opt_precision);
};
diff --git a/core/field_variable.js b/core/field_variable.js
index e93ad2ecf..1ce8ca396 100644
--- a/core/field_variable.js
+++ b/core/field_variable.js
@@ -114,8 +114,8 @@ Blockly.FieldVariable.dropdownCreate = function() {
// Variables are not language-specific, use the name as both the user-facing
// text and the internal representation.
var options = [];
- for (var x = 0; x < variableList.length; x++) {
- options[x] = [variableList[x], variableList[x]];
+ for (var i = 0; i < variableList.length; i++) {
+ options[i] = [variableList[i], variableList[i]];
}
return options;
};
diff --git a/core/flyout.js b/core/flyout.js
index 942b0be38..b5af41cce 100644
--- a/core/flyout.js
+++ b/core/flyout.js
@@ -157,9 +157,9 @@ Blockly.Flyout.prototype.height_ = 0;
/**
* Is the flyout dragging (scrolling)?
- * 0 - DRAG_NONE - no drag is ongoing or state is undetermined.
- * 1 - DRAG_STICKY - still within the sticky drag radius.
- * 2 - DRAG_FREE - in scroll mode (never create a new block).
+ * DRAG_NONE - no drag is ongoing or state is undetermined.
+ * DRAG_STICKY - still within the sticky drag radius.
+ * DRAG_FREE - in scroll mode (never create a new block).
* @private
*/
Blockly.Flyout.prototype.dragMode_ = Blockly.DRAG_NONE;
@@ -990,8 +990,11 @@ Blockly.Flyout.prototype.createBlockFunc_ = function(originBlock) {
return;
}
Blockly.Events.disable();
- var block = flyout.placeNewBlock_(originBlock);
- Blockly.Events.enable();
+ try {
+ var block = flyout.placeNewBlock_(originBlock);
+ } finally {
+ Blockly.Events.enable();
+ }
if (Blockly.Events.isEnabled()) {
Blockly.Events.setGroup(true);
Blockly.Events.fire(new Blockly.Events.Create(block));
diff --git a/core/generator.js b/core/generator.js
index 8ee110f86..fecc35531 100644
--- a/core/generator.js
+++ b/core/generator.js
@@ -132,7 +132,7 @@ Blockly.Generator.prototype.workspaceToCode = function(workspace) {
* @return {string} The prefixed lines of code.
*/
Blockly.Generator.prototype.prefixLines = function(text, prefix) {
- return prefix + text.replace(/\n(.)/g, '\n' + prefix + '$1');
+ return prefix + text.replace(/(?!\n$)\n/g, '\n' + prefix);
};
/**
@@ -143,8 +143,8 @@ Blockly.Generator.prototype.prefixLines = function(text, prefix) {
Blockly.Generator.prototype.allNestedComments = function(block) {
var comments = [];
var blocks = block.getDescendants();
- for (var x = 0; x < blocks.length; x++) {
- var comment = blocks[x].getCommentText();
+ for (var i = 0; i < blocks.length; i++) {
+ var comment = blocks[i].getCommentText();
if (comment) {
comments.push(comment);
}
diff --git a/core/input.js b/core/input.js
index 346b053cb..4b4eb1df9 100644
--- a/core/input.js
+++ b/core/input.js
@@ -222,8 +222,8 @@ Blockly.Input.prototype.init = function() {
if (!this.sourceBlock_.workspace.rendered) {
return; // Headless blocks don't need fields initialized.
}
- for (var x = 0; x < this.fieldRow.length; x++) {
- this.fieldRow[x].init();
+ for (var i = 0; i < this.fieldRow.length; i++) {
+ this.fieldRow[i].init();
}
};
diff --git a/core/procedures.js b/core/procedures.js
index f98fbd92a..beb4a17b8 100644
--- a/core/procedures.js
+++ b/core/procedures.js
@@ -89,7 +89,7 @@ Blockly.Procedures.findLegalName = function(name, block) {
// Flyouts can have multiple procedures called 'do something'.
return name;
}
- while (!Blockly.Procedures.isLegalName(name, block.workspace, block)) {
+ while (!Blockly.Procedures.isLegalName_(name, block.workspace, block)) {
// Collision with another procedure.
var r = name.match(/^(.*?)(\d+)$/);
if (!r) {
@@ -109,8 +109,9 @@ Blockly.Procedures.findLegalName = function(name, block) {
* @param {Blockly.Block=} opt_exclude Optional block to exclude from
* comparisons (one doesn't want to collide with oneself).
* @return {boolean} True if the name is legal.
+ * @private
*/
-Blockly.Procedures.isLegalName = function(name, workspace, opt_exclude) {
+Blockly.Procedures.isLegalName_ = function(name, workspace, opt_exclude) {
var blocks = workspace.getAllBlocks();
// Iterate through every block and check the name.
for (var i = 0; i < blocks.length; i++) {
@@ -129,24 +130,27 @@ Blockly.Procedures.isLegalName = function(name, workspace, opt_exclude) {
/**
* Rename a procedure. Called by the editable field.
- * @param {string} text The proposed new name.
+ * @param {string} name The proposed new name.
* @return {string} The accepted name.
* @this {!Blockly.Field}
*/
-Blockly.Procedures.rename = function(text) {
+Blockly.Procedures.rename = function(name) {
// Strip leading and trailing whitespace. Beyond this, all names are legal.
- text = text.replace(/^[\s\xa0]+|[\s\xa0]+$/g, '');
+ name = name.replace(/^[\s\xa0]+|[\s\xa0]+$/g, '');
// Ensure two identically-named procedures don't exist.
- text = Blockly.Procedures.findLegalName(text, this.sourceBlock_);
- // Rename any callers.
- var blocks = this.sourceBlock_.workspace.getAllBlocks();
- for (var i = 0; i < blocks.length; i++) {
- if (blocks[i].renameProcedure) {
- blocks[i].renameProcedure(this.text_, text);
+ var legalName = Blockly.Procedures.findLegalName(name, this.sourceBlock_);
+ var oldName = this.text_;
+ if (oldName != name && oldName != legalName) {
+ // Rename any callers.
+ var blocks = this.sourceBlock_.workspace.getAllBlocks();
+ for (var i = 0; i < blocks.length; i++) {
+ if (blocks[i].renameProcedure) {
+ blocks[i].renameProcedure(oldName, legalName);
+ }
}
}
- return text;
+ return legalName;
};
/**
@@ -197,9 +201,9 @@ Blockly.Procedures.flyoutCategory = function(workspace) {
var mutation = goog.dom.createDom('mutation');
mutation.setAttribute('name', name);
block.appendChild(mutation);
- for (var t = 0; t < args.length; t++) {
+ for (var j = 0; j < args.length; j++) {
var arg = goog.dom.createDom('arg');
- arg.setAttribute('name', args[t]);
+ arg.setAttribute('name', args[j]);
mutation.appendChild(arg);
}
xmlList.push(block);
@@ -234,19 +238,6 @@ Blockly.Procedures.getCallers = function(name, workspace) {
return callers;
};
-/**
- * When a procedure definition is disposed of, find and dispose of all its
- * callers.
- * @param {string} name Name of deleted procedure definition.
- * @param {!Blockly.Workspace} workspace The workspace to delete callers from.
- */
-Blockly.Procedures.disposeCallers = function(name, workspace) {
- var callers = Blockly.Procedures.getCallers(name, workspace);
- for (var i = 0; i < callers.length; i++) {
- callers[i].dispose(true, false);
- }
-};
-
/**
* When a procedure definition changes its parameters, find and edit all its
* callers.
@@ -282,7 +273,8 @@ Blockly.Procedures.mutateCallers = function(defBlock) {
* @return {Blockly.Block} The procedure definition block, or null not found.
*/
Blockly.Procedures.getDefinition = function(name, workspace) {
- var blocks = workspace.getAllBlocks();
+ // Assume that a procedure definition is a top block.
+ var blocks = workspace.getTopBlocks(false);
for (var i = 0; i < blocks.length; i++) {
if (blocks[i].getProcedureDef) {
var tuple = blocks[i].getProcedureDef();
diff --git a/core/rendered_connection.js b/core/rendered_connection.js
index ef7130dc6..552248526 100644
--- a/core/rendered_connection.js
+++ b/core/rendered_connection.js
@@ -234,8 +234,8 @@ Blockly.RenderedConnection.prototype.unhideAll = function() {
// Show all connections of this block.
connections = block.getConnections_(true);
}
- for (var c = 0; c < connections.length; c++) {
- renderList.push.apply(renderList, connections[c].unhideAll());
+ for (var i = 0; i < connections.length; i++) {
+ renderList.push.apply(renderList, connections[i].unhideAll());
}
if (!renderList.length) {
// Leaf block.
@@ -275,17 +275,17 @@ Blockly.RenderedConnection.prototype.hideAll = function() {
this.setHidden(true);
if (this.targetConnection) {
var blocks = this.targetBlock().getDescendants();
- for (var b = 0; b < blocks.length; b++) {
- var block = blocks[b];
+ for (var i = 0; i < blocks.length; i++) {
+ var block = blocks[i];
// Hide all connections of all children.
var connections = block.getConnections_(true);
- for (var c = 0; c < connections.length; c++) {
- connections[c].setHidden(true);
+ for (var j = 0; j < connections.length; j++) {
+ connections[j].setHidden(true);
}
// Close all bubbles of all children.
var icons = block.getIcons();
- for (var i = 0; i < icons.length; i++) {
- icons[i].setVisible(false);
+ for (var j = 0; j < icons.length; j++) {
+ icons[j].setVisible(false);
}
}
}
diff --git a/core/toolbox.js b/core/toolbox.js
index 3f715ed3a..f429b3b45 100644
--- a/core/toolbox.js
+++ b/core/toolbox.js
@@ -265,85 +265,12 @@ Blockly.Toolbox.prototype.position = function() {
* @private
*/
Blockly.Toolbox.prototype.populate_ = function(newTree) {
- var rootOut = this.tree_;
- var that = this;
- rootOut.removeChildren(); // Delete any existing content.
- rootOut.blocks = [];
- var hasColours = false;
- function syncTrees(treeIn, treeOut, pathToMedia) {
- var lastElement = null;
- for (var i = 0, childIn; childIn = treeIn.childNodes[i]; i++) {
- if (!childIn.tagName) {
- // Skip over text.
- continue;
- }
- switch (childIn.tagName.toUpperCase()) {
- case 'CATEGORY':
- var childOut = rootOut.createNode(childIn.getAttribute('name'));
- childOut.blocks = [];
- treeOut.add(childOut);
- var custom = childIn.getAttribute('custom');
- if (custom) {
- // Variables and procedures are special dynamic categories.
- childOut.blocks = custom;
- } else {
- syncTrees(childIn, childOut, pathToMedia);
- }
- var colour = childIn.getAttribute('colour');
- if (goog.isString(colour)) {
- if (colour.match(/^#[0-9a-fA-F]{6}$/)) {
- childOut.hexColour = colour;
- } else {
- childOut.hexColour = Blockly.hueToRgb(colour);
- }
- hasColours = true;
- } else {
- childOut.hexColour = '';
- }
- if (childIn.getAttribute('expanded') == 'true') {
- if (childOut.blocks.length) {
- rootOut.setSelectedItem(childOut);
- }
- childOut.setExpanded(true);
- } else {
- childOut.setExpanded(false);
- }
- lastElement = childIn;
- break;
- case 'SEP':
- if (lastElement) {
- if (lastElement.tagName.toUpperCase() == 'CATEGORY') {
- // Separator between two categories.
- //
- treeOut.add(new Blockly.Toolbox.TreeSeparator(
- that.treeSeparatorConfig_));
- } else {
- // Change the gap between two blocks.
- //
- // The default gap is 24, can be set larger or smaller.
- // Note that a deprecated method is to add a gap to a block.
- //
- var newGap = parseFloat(childIn.getAttribute('gap'));
- if (!isNaN(newGap)) {
- var oldGap = parseFloat(lastElement.getAttribute('gap'));
- var gap = isNaN(oldGap) ? newGap : oldGap + newGap;
- lastElement.setAttribute('gap', gap);
- }
- }
- }
- break;
- case 'BLOCK':
- case 'SHADOW':
- treeOut.blocks.push(childIn);
- lastElement = childIn;
- break;
- }
- }
- }
- syncTrees(newTree, this.tree_, this.workspace_.options.pathToMedia);
- this.hasColours_ = hasColours;
+ this.tree_.removeChildren(); // Delete any existing content.
+ this.tree_.blocks = [];
+ this.hasColours_ = false;
+ this.syncTrees_(newTree, this.tree_, this.workspace_.options.pathToMedia);
- if (rootOut.blocks.length) {
+ if (this.tree_.blocks.length) {
throw 'Toolbox cannot have both blocks and categories in the root level.';
}
@@ -351,6 +278,84 @@ Blockly.Toolbox.prototype.populate_ = function(newTree) {
Blockly.resizeSvgContents(this.workspace_);
};
+/**
+ * Sync trees of the toolbox.
+ * @param {Node} treeIn DOM tree of blocks, or null.
+ * @param {Blockly.Toolbox.TreeControl} treeOut
+ * @param {string} pathToMedia
+ * @private
+ */
+Blockly.Toolbox.prototype.syncTrees_ = function(treeIn, treeOut, pathToMedia) {
+ var lastElement = null;
+ for (var i = 0, childIn; childIn = treeIn.childNodes[i]; i++) {
+ if (!childIn.tagName) {
+ // Skip over text.
+ continue;
+ }
+ switch (childIn.tagName.toUpperCase()) {
+ case 'CATEGORY':
+ var childOut = this.tree_.createNode(childIn.getAttribute('name'));
+ childOut.blocks = [];
+ treeOut.add(childOut);
+ var custom = childIn.getAttribute('custom');
+ if (custom) {
+ // Variables and procedures are special dynamic categories.
+ childOut.blocks = custom;
+ } else {
+ this.syncTrees_(childIn, childOut, pathToMedia);
+ }
+ var colour = childIn.getAttribute('colour');
+ if (goog.isString(colour)) {
+ if (colour.match(/^#[0-9a-fA-F]{6}$/)) {
+ childOut.hexColour = colour;
+ } else {
+ childOut.hexColour = Blockly.hueToRgb(colour);
+ }
+ this.hasColours_ = true;
+ } else {
+ childOut.hexColour = '';
+ }
+ if (childIn.getAttribute('expanded') == 'true') {
+ if (childOut.blocks.length) {
+ this.tree_.setSelectedItem(childOut);
+ }
+ childOut.setExpanded(true);
+ } else {
+ childOut.setExpanded(false);
+ }
+ lastElement = childIn;
+ break;
+ case 'SEP':
+ if (lastElement) {
+ if (lastElement.tagName.toUpperCase() == 'CATEGORY') {
+ // Separator between two categories.
+ //
+ treeOut.add(new Blockly.Toolbox.TreeSeparator(
+ this.treeSeparatorConfig_));
+ } else {
+ // Change the gap between two blocks.
+ //
+ // The default gap is 24, can be set larger or smaller.
+ // Note that a deprecated method is to add a gap to a block.
+ //
+ var newGap = parseFloat(childIn.getAttribute('gap'));
+ if (!isNaN(newGap)) {
+ var oldGap = parseFloat(lastElement.getAttribute('gap'));
+ var gap = isNaN(oldGap) ? newGap : oldGap + newGap;
+ lastElement.setAttribute('gap', gap);
+ }
+ }
+ }
+ break;
+ case 'BLOCK':
+ case 'SHADOW':
+ treeOut.blocks.push(childIn);
+ lastElement = childIn;
+ break;
+ }
+ }
+};
+
/**
* Recursively add colours to this toolbox.
* @param {Blockly.Toolbox.TreeNode} opt_tree Starting point of tree.
@@ -462,6 +467,7 @@ Blockly.Toolbox.TreeControl.prototype.enterDocument = function() {
this.handleTouchEvent_);
}
};
+
/**
* Handles touch events.
* @param {!goog.events.BrowserEvent} e The browser event.
diff --git a/core/workspace_svg.js b/core/workspace_svg.js
index d02243551..8196474b5 100644
--- a/core/workspace_svg.js
+++ b/core/workspace_svg.js
@@ -84,9 +84,12 @@ Blockly.WorkspaceSvg.prototype.isFlyout = false;
/**
* Is this workspace currently being dragged around?
- * @type {boolean}
+ * DRAG_NONE - No drag operation.
+ * DRAG_BEGIN - Still inside the initial DRAG_RADIUS.
+ * DRAG_FREE - Workspace has been dragged further than DRAG_RADIUS.
+ * @private
*/
-Blockly.WorkspaceSvg.prototype.isScrolling = false;
+Blockly.WorkspaceSvg.prototype.dragMode_ = Blockly.DRAG_NONE;
/**
* Current horizontal scrolling offset.
@@ -538,51 +541,54 @@ Blockly.WorkspaceSvg.prototype.paste = function(xmlBlock) {
}
Blockly.terminateDrag_(); // Dragging while pasting? No.
Blockly.Events.disable();
- var block = Blockly.Xml.domToBlock(xmlBlock, this);
- // Move the duplicate to original position.
- var blockX = parseInt(xmlBlock.getAttribute('x'), 10);
- var blockY = parseInt(xmlBlock.getAttribute('y'), 10);
- if (!isNaN(blockX) && !isNaN(blockY)) {
- if (this.RTL) {
- blockX = -blockX;
- }
- // Offset block until not clobbering another block and not in connection
- // distance with neighbouring blocks.
- do {
- var collide = false;
- var allBlocks = this.getAllBlocks();
- for (var i = 0, otherBlock; otherBlock = allBlocks[i]; i++) {
- var otherXY = otherBlock.getRelativeToSurfaceXY();
- if (Math.abs(blockX - otherXY.x) <= 1 &&
- Math.abs(blockY - otherXY.y) <= 1) {
- collide = true;
- break;
- }
+ try {
+ var block = Blockly.Xml.domToBlock(xmlBlock, this);
+ // Move the duplicate to original position.
+ var blockX = parseInt(xmlBlock.getAttribute('x'), 10);
+ var blockY = parseInt(xmlBlock.getAttribute('y'), 10);
+ if (!isNaN(blockX) && !isNaN(blockY)) {
+ if (this.RTL) {
+ blockX = -blockX;
}
- if (!collide) {
- // Check for blocks in snap range to any of its connections.
- var connections = block.getConnections_(false);
- for (var i = 0, connection; connection = connections[i]; i++) {
- var neighbour = connection.closest(Blockly.SNAP_RADIUS,
- new goog.math.Coordinate(blockX, blockY));
- if (neighbour.connection) {
+ // Offset block until not clobbering another block and not in connection
+ // distance with neighbouring blocks.
+ do {
+ var collide = false;
+ var allBlocks = this.getAllBlocks();
+ for (var i = 0, otherBlock; otherBlock = allBlocks[i]; i++) {
+ var otherXY = otherBlock.getRelativeToSurfaceXY();
+ if (Math.abs(blockX - otherXY.x) <= 1 &&
+ Math.abs(blockY - otherXY.y) <= 1) {
collide = true;
break;
}
}
- }
- if (collide) {
- if (this.RTL) {
- blockX -= Blockly.SNAP_RADIUS;
- } else {
- blockX += Blockly.SNAP_RADIUS;
+ if (!collide) {
+ // Check for blocks in snap range to any of its connections.
+ var connections = block.getConnections_(false);
+ for (var i = 0, connection; connection = connections[i]; i++) {
+ var neighbour = connection.closest(Blockly.SNAP_RADIUS,
+ new goog.math.Coordinate(blockX, blockY));
+ if (neighbour.connection) {
+ collide = true;
+ break;
+ }
+ }
}
- blockY += Blockly.SNAP_RADIUS * 2;
- }
- } while (collide);
- block.moveBy(blockX, blockY);
+ if (collide) {
+ if (this.RTL) {
+ blockX -= Blockly.SNAP_RADIUS;
+ } else {
+ blockX += Blockly.SNAP_RADIUS;
+ }
+ blockY += Blockly.SNAP_RADIUS * 2;
+ }
+ } while (collide);
+ block.moveBy(blockX, blockY);
+ }
+ } finally {
+ Blockly.Events.enable();
}
- Blockly.Events.enable();
if (Blockly.Events.isEnabled() && !block.isShadow()) {
Blockly.Events.fire(new Blockly.Events.Create(block));
}
@@ -669,9 +675,7 @@ Blockly.WorkspaceSvg.prototype.onMouseDown_ = function(e) {
// Right-click.
this.showContextMenu_(e);
} else if (this.scrollbar) {
- // If the workspace is editable, only allow scrolling when gripping empty
- // space. Otherwise, allow scrolling when gripping anywhere.
- this.isScrolling = true;
+ this.dragMode_ = Blockly.DRAG_BEGIN;
// Record the current mouse position.
this.startDragMouseX = e.clientX;
this.startDragMouseY = e.clientY;
@@ -731,7 +735,8 @@ Blockly.WorkspaceSvg.prototype.moveDrag = function(e) {
* @return {boolean} True if currently dragging or scrolling.
*/
Blockly.WorkspaceSvg.prototype.isDragging = function() {
- return Blockly.dragMode_ == Blockly.DRAG_FREE || this.isScrolling;
+ return Blockly.dragMode_ == Blockly.DRAG_FREE ||
+ this.dragMode_ == Blockly.DRAG_FREE;
};
/**
@@ -756,7 +761,7 @@ Blockly.WorkspaceSvg.prototype.onMouseWheel_ = function(e) {
* containing the blocks on the workspace.
*/
Blockly.WorkspaceSvg.prototype.getBlocksBoundingBox = function() {
- var topBlocks = this.getTopBlocks();
+ var topBlocks = this.getTopBlocks(false);
// There are no blocks, return empty rectangle.
if (!topBlocks.length) {
return {x: 0, y: 0, width: 0, height: 0};
diff --git a/core/xml.js b/core/xml.js
index b2636b823..959526e67 100644
--- a/core/xml.js
+++ b/core/xml.js
@@ -334,32 +334,35 @@ Blockly.Xml.domToBlock = function(xmlBlock, workspace) {
}
// Create top-level block.
Blockly.Events.disable();
- var topBlock = Blockly.Xml.domToBlockHeadless_(xmlBlock, workspace);
- if (workspace.rendered) {
- // Hide connections to speed up assembly.
- topBlock.setConnectionsHidden(true);
- // Generate list of all blocks.
- var blocks = topBlock.getDescendants();
- // Render each block.
- for (var i = blocks.length - 1; i >= 0; i--) {
- blocks[i].initSvg();
- }
- for (var i = blocks.length - 1; i >= 0; i--) {
- blocks[i].render(false);
- }
- // Populating the connection database may be defered until after the blocks
- // have renderend.
- setTimeout(function() {
- if (topBlock.workspace) { // Check that the block hasn't been deleted.
- topBlock.setConnectionsHidden(false);
+ try {
+ var topBlock = Blockly.Xml.domToBlockHeadless_(xmlBlock, workspace);
+ if (workspace.rendered) {
+ // Hide connections to speed up assembly.
+ topBlock.setConnectionsHidden(true);
+ // Generate list of all blocks.
+ var blocks = topBlock.getDescendants();
+ // Render each block.
+ for (var i = blocks.length - 1; i >= 0; i--) {
+ blocks[i].initSvg();
}
- }, 1);
- topBlock.updateDisabled();
- // Allow the scrollbars to resize and move based on the new contents.
- // TODO(@picklesrus): #387. Remove when domToBlock avoids resizing.
- Blockly.resizeSvgContents(workspace);
+ for (var i = blocks.length - 1; i >= 0; i--) {
+ blocks[i].render(false);
+ }
+ // Populating the connection database may be defered until after the
+ // blocks have rendered.
+ setTimeout(function() {
+ if (topBlock.workspace) { // Check that the block hasn't been deleted.
+ topBlock.setConnectionsHidden(false);
+ }
+ }, 1);
+ topBlock.updateDisabled();
+ // Allow the scrollbars to resize and move based on the new contents.
+ // TODO(@picklesrus): #387. Remove when domToBlock avoids resizing.
+ Blockly.resizeSvgContents(workspace);
+ }
+ } finally {
+ Blockly.Events.enable();
}
- Blockly.Events.enable();
if (Blockly.Events.isEnabled()) {
Blockly.Events.fire(new Blockly.Events.Create(topBlock));
}
@@ -534,10 +537,6 @@ Blockly.Xml.domToBlockHeadless_ = function(xmlBlock, workspace) {
}
block.setShadow(true);
}
- // Give the block a chance to clean up any initial inputs.
- if (block.validate) {
- block.validate();
- }
return block;
};
diff --git a/dart_compressed.js b/dart_compressed.js
index c94ce1633..3ae042761 100644
--- a/dart_compressed.js
+++ b/dart_compressed.js
@@ -4,27 +4,32 @@
// Copyright 2014 Google Inc. Apache License 2.0
Blockly.Dart=new Blockly.Generator("Dart");Blockly.Dart.addReservedWords("assert,break,case,catch,class,const,continue,default,do,else,enum,extends,false,final,finally,for,if,in,is,new,null,rethrow,return,super,switch,this,throw,true,try,var,void,while,with,print,identityHashCode,identical,BidirectionalIterator,Comparable,double,Function,int,Invocation,Iterable,Iterator,List,Map,Match,num,Pattern,RegExp,Set,StackTrace,String,StringSink,Type,bool,DateTime,Deprecated,Duration,Expando,Null,Object,RuneIterator,Runes,Stopwatch,StringBuffer,Symbol,Uri,Comparator,AbstractClassInstantiationError,ArgumentError,AssertionError,CastError,ConcurrentModificationError,CyclicInitializationError,Error,Exception,FallThroughError,FormatException,IntegerDivisionByZeroException,NoSuchMethodError,NullThrownError,OutOfMemoryError,RangeError,StackOverflowError,StateError,TypeError,UnimplementedError,UnsupportedError");
-Blockly.Dart.ORDER_ATOMIC=0;Blockly.Dart.ORDER_UNARY_POSTFIX=1;Blockly.Dart.ORDER_UNARY_PREFIX=2;Blockly.Dart.ORDER_MULTIPLICATIVE=3;Blockly.Dart.ORDER_ADDITIVE=4;Blockly.Dart.ORDER_SHIFT=5;Blockly.Dart.ORDER_BITWISE_AND=6;Blockly.Dart.ORDER_BITWISE_XOR=7;Blockly.Dart.ORDER_BITWISE_OR=8;Blockly.Dart.ORDER_RELATIONAL=9;Blockly.Dart.ORDER_EQUALITY=10;Blockly.Dart.ORDER_LOGICAL_AND=11;Blockly.Dart.ORDER_LOGICAL_OR=12;Blockly.Dart.ORDER_CONDITIONAL=13;Blockly.Dart.ORDER_CASCADE=14;
-Blockly.Dart.ORDER_ASSIGNMENT=15;Blockly.Dart.ORDER_NONE=99;
+Blockly.Dart.ORDER_ATOMIC=0;Blockly.Dart.ORDER_UNARY_POSTFIX=1;Blockly.Dart.ORDER_UNARY_PREFIX=2;Blockly.Dart.ORDER_MULTIPLICATIVE=3;Blockly.Dart.ORDER_ADDITIVE=4;Blockly.Dart.ORDER_SHIFT=5;Blockly.Dart.ORDER_BITWISE_AND=6;Blockly.Dart.ORDER_BITWISE_XOR=7;Blockly.Dart.ORDER_BITWISE_OR=8;Blockly.Dart.ORDER_RELATIONAL=9;Blockly.Dart.ORDER_EQUALITY=10;Blockly.Dart.ORDER_LOGICAL_AND=11;Blockly.Dart.ORDER_LOGICAL_OR=12;Blockly.Dart.ORDER_IF_NULL=13;Blockly.Dart.ORDER_CONDITIONAL=14;
+Blockly.Dart.ORDER_CASCADE=15;Blockly.Dart.ORDER_ASSIGNMENT=16;Blockly.Dart.ORDER_NONE=99;Blockly.Dart.ONE_BASED_INDEXING=!0;
Blockly.Dart.init=function(a){Blockly.Dart.definitions_=Object.create(null);Blockly.Dart.functionNames_=Object.create(null);Blockly.Dart.variableDB_?Blockly.Dart.variableDB_.reset():Blockly.Dart.variableDB_=new Blockly.Names(Blockly.Dart.RESERVED_WORDS_);var b=[];a=a.variableList;if(a.length){for(var c=0;cc&&(a=a+" - "+-c,g=Blockly.Dart.ORDER_ADDITIVE);d&&(a=
+c?"-("+a+")":"-"+a,g=Blockly.Dart.ORDER_UNARY_PREFIX);g=Math.floor(g);e=Math.floor(e);g&&e>=g&&(a="("+a+")")}return a};Blockly.Dart.lists={};Blockly.Dart.addReservedWords("Math");Blockly.Dart.lists_create_empty=function(a){return["[]",Blockly.Dart.ORDER_ATOMIC]};Blockly.Dart.lists_create_with=function(a){for(var b=Array(a.itemCount_),c=0;c direction * a.compareTo(b),',' "TEXT": (a, b) => direction * a.toString().compareTo(b.toString()),',' "IGNORE_CASE": '," (a, b) => direction * ",
+Blockly.Dart.lists_isEmpty=function(a){return[(Blockly.Dart.valueToCode(a,"VALUE",Blockly.Dart.ORDER_UNARY_POSTFIX)||"[]")+".isEmpty",Blockly.Dart.ORDER_UNARY_POSTFIX]};
+Blockly.Dart.lists_indexOf=function(a){var b="FIRST"==a.getFieldValue("END")?"indexOf":"lastIndexOf",c=Blockly.Dart.valueToCode(a,"FIND",Blockly.Dart.ORDER_NONE)||"''";a=(Blockly.Dart.valueToCode(a,"VALUE",Blockly.Dart.ORDER_UNARY_POSTFIX)||"[]")+"."+b+"("+c+")";return Blockly.Dart.ONE_BASED_INDEXING?[a+" + 1",Blockly.Dart.ORDER_ADDITIVE]:[a,Blockly.Dart.ORDER_UNARY_POSTFIX]};
+Blockly.Dart.lists_getIndex=function(a){function b(){var a=Blockly.Dart.variableDB_.getDistinctName("tmp_list",Blockly.Variables.NAME_TYPE),b="List "+a+" = "+e+";\n";e=a;return b}var c=a.getFieldValue("MODE")||"GET",d=a.getFieldValue("WHERE")||"FROM_START",e=Blockly.Dart.valueToCode(a,"VALUE","RANDOM"==d||"FROM_END"==d?Blockly.Dart.ORDER_NONE:Blockly.Dart.ORDER_UNARY_POSTFIX)||"[]";if(("RANDOM"!=d||"REMOVE"!=c)&&"FROM_END"!=d||e.match(/^\w+$/))switch(d){case "FIRST":if("GET"==c)return[e+".first",
+Blockly.Dart.ORDER_UNARY_POSTFIX];if("GET_REMOVE"==c)return[e+".removeAt(0)",Blockly.Dart.ORDER_UNARY_POSTFIX];if("REMOVE"==c)return e+".removeAt(0);\n";break;case "LAST":if("GET"==c)return[e+".last",Blockly.Dart.ORDER_UNARY_POSTFIX];if("GET_REMOVE"==c)return[e+".removeLast()",Blockly.Dart.ORDER_UNARY_POSTFIX];if("REMOVE"==c)return e+".removeLast();\n";break;case "FROM_START":d=Blockly.Dart.getAdjusted(a,"AT");if("GET"==c)return[e+"["+d+"]",Blockly.Dart.ORDER_UNARY_POSTFIX];if("GET_REMOVE"==c)return[e+
+".removeAt("+d+")",Blockly.Dart.ORDER_UNARY_POSTFIX];if("REMOVE"==c)return e+".removeAt("+d+");\n";break;case "FROM_END":d=Blockly.Dart.getAdjusted(a,"AT",1,!1,Blockly.Dart.ORDER_ADDITIVE);if("GET"==c)return[e+"["+e+".length - "+d+"]",Blockly.Dart.ORDER_UNARY_POSTFIX];if("GET_REMOVE"==c||"REMOVE"==c){a=e+".removeAt("+e+".length - "+d+")";if("GET_REMOVE"==c)return[a,Blockly.Dart.ORDER_UNARY_POSTFIX];if("REMOVE"==c)return a+";\n"}break;case "RANDOM":Blockly.Dart.definitions_.import_dart_math="import 'dart:math' as Math;";
+if("REMOVE"==c)return c=Blockly.Dart.variableDB_.getDistinctName("tmp_x",Blockly.Variables.NAME_TYPE),"int "+c+" = new Math.Random().nextInt("+e+".length);\n"+(e+".removeAt("+c+");\n");if("GET"==c)return c=Blockly.Dart.provideFunction_("lists_get_random_item",["dynamic "+Blockly.Dart.FUNCTION_NAME_PLACEHOLDER_+"(List my_list) {"," int x = new Math.Random().nextInt(my_list.length);"," return my_list[x];","}"]),[c+"("+e+")",Blockly.Dart.ORDER_UNARY_POSTFIX];if("GET_REMOVE"==c)return c=Blockly.Dart.provideFunction_("lists_remove_random_item",
+["dynamic "+Blockly.Dart.FUNCTION_NAME_PLACEHOLDER_+"(List my_list) {"," int x = new Math.Random().nextInt(my_list.length);"," return my_list.removeAt(x);","}"]),[c+"("+e+")",Blockly.Dart.ORDER_UNARY_POSTFIX]}else{if("RANDOM"==d)return Blockly.Dart.definitions_.import_dart_math="import 'dart:math' as Math;",a=b(),c=Blockly.Dart.variableDB_.getDistinctName("tmp_x",Blockly.Variables.NAME_TYPE),a+("int "+c+" = new Math.Random().nextInt("+e+".length);\n")+(e+".removeAt("+c+");\n");if("REMOVE"==c)return d=
+Blockly.Dart.getAdjusted(a,"AT",1,!1,Blockly.Dart.ORDER_ADDITIVE),a=b(),a+=e+".removeAt("+e+".length - "+d+");\n";if("GET"==c)return d=Blockly.Dart.getAdjusted(a,"AT",1),c=Blockly.Dart.provideFunction_("lists_get_from_end",["dynamic "+Blockly.Dart.FUNCTION_NAME_PLACEHOLDER_+"(List my_list, num x) {"," x = my_list.length - x;"," return my_list[x];","}"]),[c+"("+e+", "+d+")",Blockly.Dart.ORDER_UNARY_POSTFIX];if("GET_REMOVE"==c)return d=Blockly.Dart.getAdjusted(a,"AT",1),c=Blockly.Dart.provideFunction_("lists_remove_from_end",
+["dynamic "+Blockly.Dart.FUNCTION_NAME_PLACEHOLDER_+"(List my_list, num x) {"," x = my_list.length - x;"," return my_list.removeAt(x);","}"]),[c+"("+e+", "+d+")",Blockly.Dart.ORDER_UNARY_POSTFIX]}throw"Unhandled combination (lists_getIndex).";};
+Blockly.Dart.lists_setIndex=function(a){function b(){if(e.match(/^\w+$/))return"";var a=Blockly.Dart.variableDB_.getDistinctName("tmp_list",Blockly.Variables.NAME_TYPE),b="List "+a+" = "+e+";\n";e=a;return b}var c=a.getFieldValue("MODE")||"GET",d=a.getFieldValue("WHERE")||"FROM_START",e=Blockly.Dart.valueToCode(a,"LIST",Blockly.Dart.ORDER_UNARY_POSTFIX)||"[]",f=Blockly.Dart.valueToCode(a,"TO",Blockly.Dart.ORDER_ASSIGNMENT)||"null";switch(d){case "FIRST":if("SET"==c)return e+"[0] = "+f+";\n";if("INSERT"==
+c)return e+".insert(0, "+f+");\n";break;case "LAST":if("SET"==c)return a=b(),a+(e+"["+e+".length - 1] = "+f+";\n");if("INSERT"==c)return e+".add("+f+");\n";break;case "FROM_START":d=Blockly.Dart.getAdjusted(a,"AT");if("SET"==c)return e+"["+d+"] = "+f+";\n";if("INSERT"==c)return e+".insert("+d+", "+f+");\n";break;case "FROM_END":d=Blockly.Dart.getAdjusted(a,"AT",1,!1,Blockly.Dart.ORDER_ADDITIVE);a=b();if("SET"==c)return a+(e+"["+e+".length - "+d+"] = "+f+";\n");if("INSERT"==c)return a+(e+".insert("+
+e+".length - "+d+", "+f+");\n");break;case "RANDOM":Blockly.Dart.definitions_.import_dart_math="import 'dart:math' as Math;";a=b();d=Blockly.Dart.variableDB_.getDistinctName("tmp_x",Blockly.Variables.NAME_TYPE);a+="int "+d+" = new Math.Random().nextInt("+e+".length);\n";if("SET"==c)return a+(e+"["+d+"] = "+f+";\n");if("INSERT"==c)return a+(e+".insert("+d+", "+f+");\n")}throw"Unhandled combination (lists_setIndex).";};
+Blockly.Dart.lists_getSublist=function(a){var b=Blockly.Dart.valueToCode(a,"LIST",Blockly.Dart.ORDER_UNARY_POSTFIX)||"[]",c=a.getFieldValue("WHERE1"),d=a.getFieldValue("WHERE2");if(b.match(/^\w+$/)||"FROM_END"!=c&&"FROM_START"==d){switch(c){case "FROM_START":var e=Blockly.Dart.getAdjusted(a,"AT1");break;case "FROM_END":e=Blockly.Dart.getAdjusted(a,"AT1",1,!1,Blockly.Dart.ORDER_ADDITIVE);e=b+".length - "+e;break;case "FIRST":e="0";break;default:throw"Unhandled option (lists_getSublist).";}switch(d){case "FROM_START":var f=
+Blockly.Dart.getAdjusted(a,"AT2",1);break;case "FROM_END":f=Blockly.Dart.getAdjusted(a,"AT2",0,!1,Blockly.Dart.ORDER_ADDITIVE);f=b+".length - "+f;break;case "LAST":break;default:throw"Unhandled option (lists_getSublist).";}a="LAST"==d?b+".sublist("+e+")":b+".sublist("+e+", "+f+")"}else e=Blockly.Dart.getAdjusted(a,"AT1"),f=Blockly.Dart.getAdjusted(a,"AT2"),a=Blockly.Dart.provideFunction_("lists_get_sublist",["List "+Blockly.Dart.FUNCTION_NAME_PLACEHOLDER_+"(list, where1, at1, where2, at2) {"," int getAt(where, at) {",
+" if (where == 'FROM_END') {"," at = list.length - 1 - at;"," } else if (where == 'FIRST') {"," at = 0;"," } else if (where == 'LAST') {"," at = list.length - 1;"," } else if (where != 'FROM_START') {"," throw 'Unhandled option (lists_getSublist).';"," }"," return at;"," }"," at1 = getAt(where1, at1);"," at2 = getAt(where2, at2) + 1;"," return list.sublist(at1, at2);","}"])+"("+b+", '"+c+"', "+e+", '"+d+"', "+f+")";return[a,Blockly.Dart.ORDER_UNARY_POSTFIX]};
+Blockly.Dart.lists_sort=function(a){var b=Blockly.Dart.valueToCode(a,"LIST",Blockly.Dart.ORDER_NONE)||"[]",c="1"===a.getFieldValue("DIRECTION")?1:-1;a=a.getFieldValue("TYPE");return[Blockly.Dart.provideFunction_("lists_sort",["List "+Blockly.Dart.FUNCTION_NAME_PLACEHOLDER_+"(list, type, direction) {"," var compareFuncs = {",' "NUMERIC": (a, b) => direction * a.compareTo(b),',' "TEXT": (a, b) => direction * a.toString().compareTo(b.toString()),',' "IGNORE_CASE": '," (a, b) => direction * ",
" a.toString().toLowerCase().compareTo(b.toString().toLowerCase())"," };"," list = new List.from(list);"," var compare = compareFuncs[type];"," list.sort(compare);"," return list;","}"])+"("+b+', "'+a+'", '+c+")",Blockly.Dart.ORDER_UNARY_POSTFIX]};
Blockly.Dart.lists_split=function(a){var b=Blockly.Dart.valueToCode(a,"INPUT",Blockly.Dart.ORDER_UNARY_POSTFIX),c=Blockly.Dart.valueToCode(a,"DELIM",Blockly.Dart.ORDER_NONE)||"''";a=a.getFieldValue("MODE");if("SPLIT"==a)b||(b="''"),a="split";else if("JOIN"==a)b||(b="[]"),a="join";else throw"Unknown mode: "+a;return[b+"."+a+"("+c+")",Blockly.Dart.ORDER_UNARY_POSTFIX]};Blockly.Dart.math={};Blockly.Dart.addReservedWords("Math");Blockly.Dart.math_number=function(a){a=parseFloat(a.getFieldValue("NUM"));var b;Infinity==a?(a="double.INFINITY",b=Blockly.Dart.ORDER_UNARY_POSTFIX):-Infinity==a?(a="-double.INFINITY",b=Blockly.Dart.ORDER_UNARY_PREFIX):b=0>a?Blockly.Dart.ORDER_UNARY_PREFIX:Blockly.Dart.ORDER_ATOMIC;return[a,b]};
Blockly.Dart.math_arithmetic=function(a){var b={ADD:[" + ",Blockly.Dart.ORDER_ADDITIVE],MINUS:[" - ",Blockly.Dart.ORDER_ADDITIVE],MULTIPLY:[" * ",Blockly.Dart.ORDER_MULTIPLICATIVE],DIVIDE:[" / ",Blockly.Dart.ORDER_MULTIPLICATIVE],POWER:[null,Blockly.Dart.ORDER_NONE]}[a.getFieldValue("OP")],c=b[0],b=b[1],d=Blockly.Dart.valueToCode(a,"A",b)||"0";a=Blockly.Dart.valueToCode(a,"B",b)||"0";return c?[d+c+a,b]:(Blockly.Dart.definitions_.import_dart_math="import 'dart:math' as Math;",["Math.pow("+d+", "+a+
@@ -40,11 +45,11 @@ Blockly.Dart.math_number_property=function(a){var b=Blockly.Dart.valueToCode(a,"
Blockly.Dart.math_change=function(a){var b=Blockly.Dart.valueToCode(a,"DELTA",Blockly.Dart.ORDER_ADDITIVE)||"0";a=Blockly.Dart.variableDB_.getName(a.getFieldValue("VAR"),Blockly.Variables.NAME_TYPE);return a+" = ("+a+" is num ? "+a+" : 0) + "+b+";\n"};Blockly.Dart.math_round=Blockly.Dart.math_single;Blockly.Dart.math_trig=Blockly.Dart.math_single;
Blockly.Dart.math_on_list=function(a){var b=a.getFieldValue("OP");a=Blockly.Dart.valueToCode(a,"LIST",Blockly.Dart.ORDER_NONE)||"[]";switch(b){case "SUM":b=Blockly.Dart.provideFunction_("math_sum",["num "+Blockly.Dart.FUNCTION_NAME_PLACEHOLDER_+"(List myList) {"," num sumVal = 0;"," myList.forEach((num entry) {sumVal += entry;});"," return sumVal;","}"]);b=b+"("+a+")";break;case "MIN":Blockly.Dart.definitions_.import_dart_math="import 'dart:math' as Math;";b=Blockly.Dart.provideFunction_("math_min",
["num "+Blockly.Dart.FUNCTION_NAME_PLACEHOLDER_+"(List myList) {"," if (myList.isEmpty) return null;"," num minVal = myList[0];"," myList.forEach((num entry) {minVal = Math.min(minVal, entry);});"," return minVal;","}"]);b=b+"("+a+")";break;case "MAX":Blockly.Dart.definitions_.import_dart_math="import 'dart:math' as Math;";b=Blockly.Dart.provideFunction_("math_max",["num "+Blockly.Dart.FUNCTION_NAME_PLACEHOLDER_+"(List myList) {"," if (myList.isEmpty) return null;"," num maxVal = myList[0];",
-" myList.forEach((num entry) {maxVal = Math.max(maxVal, entry);});"," return maxVal;","}"]);b=b+"("+a+")";break;case "AVERAGE":b=Blockly.Dart.provideFunction_("math_mean",["num "+Blockly.Dart.FUNCTION_NAME_PLACEHOLDER_+"(List myList) {"," // First filter list for numbers only."," List localList = new List.from(myList);"," localList.removeMatching((a) => a is! num);"," if (localList.isEmpty) return null;"," num sumVal = 0;"," localList.forEach((num entry) {sumVal += entry;});"," return sumVal / localList.length;",
-"}"]);b=b+"("+a+")";break;case "MEDIAN":b=Blockly.Dart.provideFunction_("math_median",["num "+Blockly.Dart.FUNCTION_NAME_PLACEHOLDER_+"(List myList) {"," // First filter list for numbers only, then sort, then return middle value"," // or the average of two middle values if list has an even number of elements."," List localList = new List.from(myList);"," localList.removeMatching((a) => a is! num);"," if (localList.isEmpty) return null;"," localList.sort((a, b) => (a - b));"," int index = localList.length ~/ 2;",
+" myList.forEach((num entry) {maxVal = Math.max(maxVal, entry);});"," return maxVal;","}"]);b=b+"("+a+")";break;case "AVERAGE":b=Blockly.Dart.provideFunction_("math_mean",["num "+Blockly.Dart.FUNCTION_NAME_PLACEHOLDER_+"(List myList) {"," // First filter list for numbers only."," List localList = new List.from(myList);"," localList.removeWhere((a) => a is! num);"," if (localList.isEmpty) return null;"," num sumVal = 0;"," localList.forEach((num entry) {sumVal += entry;});"," return sumVal / localList.length;",
+"}"]);b=b+"("+a+")";break;case "MEDIAN":b=Blockly.Dart.provideFunction_("math_median",["num "+Blockly.Dart.FUNCTION_NAME_PLACEHOLDER_+"(List myList) {"," // First filter list for numbers only, then sort, then return middle value"," // or the average of two middle values if list has an even number of elements."," List localList = new List.from(myList);"," localList.removeWhere((a) => a is! num);"," if (localList.isEmpty) return null;"," localList.sort((a, b) => (a - b));"," int index = localList.length ~/ 2;",
" if (localList.length % 2 == 1) {"," return localList[index];"," } else {"," return (localList[index - 1] + localList[index]) / 2;"," }","}"]);b=b+"("+a+")";break;case "MODE":Blockly.Dart.definitions_.import_dart_math="import 'dart:math' as Math;";b=Blockly.Dart.provideFunction_("math_modes",["List "+Blockly.Dart.FUNCTION_NAME_PLACEHOLDER_+"(List values) {"," List modes = [];"," List counts = [];"," int maxCount = 0;"," for (int i = 0; i < values.length; i++) {"," var value = values[i];",
" bool found = false;"," int thisCount;"," for (int j = 0; j < counts.length; j++) {"," if (counts[j][0] == value) {"," thisCount = ++counts[j][1];"," found = true;"," break;"," }"," }"," if (!found) {"," counts.add([value, 1]);"," thisCount = 1;"," }"," maxCount = Math.max(thisCount, maxCount);"," }"," for (int j = 0; j < counts.length; j++) {"," if (counts[j][1] == maxCount) {"," modes.add(counts[j][0]);"," }"," }"," return modes;",
-"}"]);b=b+"("+a+")";break;case "STD_DEV":Blockly.Dart.definitions_.import_dart_math="import 'dart:math' as Math;";b=Blockly.Dart.provideFunction_("math_standard_deviation",["num "+Blockly.Dart.FUNCTION_NAME_PLACEHOLDER_+"(List myList) {"," // First filter list for numbers only."," List numbers = new List.from(myList);"," numbers.removeMatching((a) => a is! num);"," if (numbers.isEmpty) return null;"," num n = numbers.length;"," num sum = 0;"," numbers.forEach((x) => sum += x);"," num mean = sum / n;",
+"}"]);b=b+"("+a+")";break;case "STD_DEV":Blockly.Dart.definitions_.import_dart_math="import 'dart:math' as Math;";b=Blockly.Dart.provideFunction_("math_standard_deviation",["num "+Blockly.Dart.FUNCTION_NAME_PLACEHOLDER_+"(List myList) {"," // First filter list for numbers only."," List numbers = new List.from(myList);"," numbers.removeWhere((a) => a is! num);"," if (numbers.isEmpty) return null;"," num n = numbers.length;"," num sum = 0;"," numbers.forEach((x) => sum += x);"," num mean = sum / n;",
" num sumSquare = 0;"," numbers.forEach((x) => sumSquare += Math.pow(x - mean, 2));"," return Math.sqrt(sumSquare / n);","}"]);b=b+"("+a+")";break;case "RANDOM":Blockly.Dart.definitions_.import_dart_math="import 'dart:math' as Math;";b=Blockly.Dart.provideFunction_("math_random_item",["dynamic "+Blockly.Dart.FUNCTION_NAME_PLACEHOLDER_+"(List myList) {"," int x = new Math.Random().nextInt(myList.length);"," return myList[x];","}"]);b=b+"("+a+")";break;default:throw"Unknown operator: "+b;}return[b,
Blockly.Dart.ORDER_UNARY_POSTFIX]};Blockly.Dart.math_modulo=function(a){var b=Blockly.Dart.valueToCode(a,"DIVIDEND",Blockly.Dart.ORDER_MULTIPLICATIVE)||"0";a=Blockly.Dart.valueToCode(a,"DIVISOR",Blockly.Dart.ORDER_MULTIPLICATIVE)||"0";return[b+" % "+a,Blockly.Dart.ORDER_MULTIPLICATIVE]};
Blockly.Dart.math_constrain=function(a){Blockly.Dart.definitions_.import_dart_math="import 'dart:math' as Math;";var b=Blockly.Dart.valueToCode(a,"VALUE",Blockly.Dart.ORDER_NONE)||"0",c=Blockly.Dart.valueToCode(a,"LOW",Blockly.Dart.ORDER_NONE)||"0";a=Blockly.Dart.valueToCode(a,"HIGH",Blockly.Dart.ORDER_NONE)||"double.INFINITY";return["Math.min(Math.max("+b+", "+c+"), "+a+")",Blockly.Dart.ORDER_UNARY_POSTFIX]};
@@ -61,16 +66,18 @@ d+";\n");for(var e=d?"dynamic":"void",f=[],g=0;g list = str.split(exp);"," final title = new StringBuffer();"," for (String part in list) {"," if (part.length > 0) {",
-" title.write(part[0].toUpperCase());"," if (part.length > 0) {"," title.write(part.substring(1).toLowerCase());"," }"," }"," }"," return title.toString();","}"]),a=Blockly.Dart.valueToCode(a,"TEXT",Blockly.Dart.ORDER_NONE)||"''",a=b+"("+a+")");return[a,Blockly.Dart.ORDER_UNARY_POSTFIX]};
+Blockly.Dart.text_join=function(a){switch(a.itemCount_){case 0:return["''",Blockly.Dart.ORDER_ATOMIC];case 1:return[(Blockly.Dart.valueToCode(a,"ADD0",Blockly.Dart.ORDER_UNARY_POSTFIX)||"''")+".toString()",Blockly.Dart.ORDER_UNARY_POSTFIX];default:for(var b=Array(a.itemCount_),c=0;c list = str.split(exp);"," final title = new StringBuffer();"," for (String part in list) {",
+" if (part.length > 0) {"," title.write(part[0].toUpperCase());"," if (part.length > 0) {"," title.write(part.substring(1).toLowerCase());"," }"," }"," }"," return title.toString();","}"])+"("+a+")",Blockly.Dart.ORDER_UNARY_POSTFIX]};
Blockly.Dart.text_trim=function(a){var b={LEFT:".replaceFirst(new RegExp(r'^\\s+'), '')",RIGHT:".replaceFirst(new RegExp(r'\\s+$'), '')",BOTH:".trim()"}[a.getFieldValue("MODE")];return[(Blockly.Dart.valueToCode(a,"TEXT",Blockly.Dart.ORDER_UNARY_POSTFIX)||"''")+b,Blockly.Dart.ORDER_UNARY_POSTFIX]};Blockly.Dart.text_print=function(a){return"print("+(Blockly.Dart.valueToCode(a,"TEXT",Blockly.Dart.ORDER_NONE)||"''")+");\n"};
Blockly.Dart.text_prompt_ext=function(a){Blockly.Dart.definitions_.import_dart_html="import 'dart:html' as Html;";var b="Html.window.prompt("+(a.getField("TEXT")?Blockly.Dart.quote_(a.getFieldValue("TEXT")):Blockly.Dart.valueToCode(a,"TEXT",Blockly.Dart.ORDER_NONE)||"''")+", '')";"NUMBER"==a.getFieldValue("TYPE")&&(Blockly.Dart.definitions_.import_dart_math="import 'dart:math' as Math;",b="Math.parseDouble("+b+")");return[b,Blockly.Dart.ORDER_UNARY_POSTFIX]};Blockly.Dart.text_prompt=Blockly.Dart.text_prompt_ext;Blockly.Dart.loops={};
Blockly.Dart.controls_repeat_ext=function(a){var b=a.getField("TIMES")?String(Number(a.getFieldValue("TIMES"))):Blockly.Dart.valueToCode(a,"TIMES",Blockly.Dart.ORDER_ASSIGNMENT)||"0",c=Blockly.Dart.statementToCode(a,"DO"),c=Blockly.Dart.addLoopTrap(c,a.id);a="";var d=Blockly.Dart.variableDB_.getDistinctName("count",Blockly.Variables.NAME_TYPE),e=b;b.match(/^\w+$/)||Blockly.isNumber(b)||(e=Blockly.Dart.variableDB_.getDistinctName("repeat_end",Blockly.Variables.NAME_TYPE),a+="var "+e+" = "+b+";\n");
diff --git a/demos/blockfactory/blocks.js b/demos/blockfactory/blocks.js
index 5008e6a20..db14b1d90 100644
--- a/demos/blockfactory/blocks.js
+++ b/demos/blockfactory/blocks.js
@@ -243,6 +243,32 @@ Blockly.Blocks['field_input'] = {
}
};
+Blockly.Blocks['field_number'] = {
+ // Numeric input.
+ init: function() {
+ this.setColour(160);
+ this.appendDummyInput()
+ .appendField('numeric input')
+ .appendField(new Blockly.FieldNumber(0), 'VALUE')
+ .appendField(',')
+ .appendField(new Blockly.FieldTextInput('NAME'), 'FIELDNAME');
+ this.appendDummyInput()
+ .appendField('min')
+ .appendField(new Blockly.FieldNumber(-Infinity), 'MIN')
+ .appendField('max')
+ .appendField(new Blockly.FieldNumber(Infinity), 'MAX')
+ .appendField('precision')
+ .appendField(new Blockly.FieldNumber(0, 0), 'PRECISION');
+ this.setPreviousStatement(true, 'Field');
+ this.setNextStatement(true, 'Field');
+ this.setTooltip('An input field for the user to enter a number.');
+ this.setHelpUrl('https://www.youtube.com/watch?v=s2_xaEvcVI0#t=319');
+ },
+ onchange: function() {
+ fieldNameCheck(this);
+ }
+};
+
Blockly.Blocks['field_angle'] = {
// Angle input.
init: function() {
@@ -505,13 +531,13 @@ Blockly.Blocks['type_group'] = {
// Parse XML to restore the group of types.
this.typeCount_ = parseInt(container.getAttribute('types'), 10);
this.updateShape_();
- for (var x = 0; x < this.typeCount_; x++) {
- this.removeInput('TYPE' + x);
+ for (var i = 0; i < this.typeCount_; i++) {
+ this.removeInput('TYPE' + i);
}
- for (var x = 0; x < this.typeCount_; x++) {
- var input = this.appendValueInput('TYPE' + x)
+ for (var i = 0; i < this.typeCount_; i++) {
+ var input = this.appendValueInput('TYPE' + i)
.setCheck('Type');
- if (x == 0) {
+ if (i == 0) {
input.appendField('any of');
}
}
diff --git a/demos/blockfactory/factory.js b/demos/blockfactory/factory.js
index 3e1cf16a0..4af5ff28a 100644
--- a/demos/blockfactory/factory.js
+++ b/demos/blockfactory/factory.js
@@ -309,10 +309,31 @@ function getFieldsJs_(block) {
escapeString(block.getFieldValue('TEXT')) + '), ' +
escapeString(block.getFieldValue('FIELDNAME')));
break;
+ case 'field_number':
+ // Result: new Blockly.FieldNumber(10, 0, 100, 1), 'NUMBER'
+ var args = [
+ Number(block.getFieldValue('VALUE')),
+ Number(block.getFieldValue('MIN')),
+ Number(block.getFieldValue('MAX')),
+ Number(block.getFieldValue('PRECISION'))
+ ];
+ // Remove any trailing arguments that aren't needed.
+ if (args[3] == 0) {
+ args.pop();
+ if (args[2] == Infinity) {
+ args.pop();
+ if (args[1] == -Infinity) {
+ args.pop();
+ }
+ }
+ }
+ fields.push('new Blockly.FieldNumber(' + args.join(', ') + '), ' +
+ escapeString(block.getFieldValue('FIELDNAME')));
+ break;
case 'field_angle':
// Result: new Blockly.FieldAngle(90), 'ANGLE'
fields.push('new Blockly.FieldAngle(' +
- parseFloat(block.getFieldValue('ANGLE')) + '), ' +
+ Number(block.getFieldValue('ANGLE')) + '), ' +
escapeString(block.getFieldValue('FIELDNAME')));
break;
case 'field_checkbox':
@@ -354,7 +375,7 @@ function getFieldsJs_(block) {
}
break;
case 'field_image':
- // Result: new Blockly.FieldImage('http://...', 80, 60)
+ // Result: new Blockly.FieldImage('http://...', 80, 60, '*')
var src = escapeString(block.getFieldValue('SRC'));
var width = Number(block.getFieldValue('WIDTH'));
var height = Number(block.getFieldValue('HEIGHT'));
@@ -391,6 +412,26 @@ function getFieldsJson_(block) {
text: block.getFieldValue('TEXT')
});
break;
+ case 'field_number':
+ var obj = {
+ type: block.type,
+ name: block.getFieldValue('FIELDNAME'),
+ value: parseFloat(block.getFieldValue('VALUE'))
+ };
+ var min = parseFloat(block.getFieldValue('MIN'));
+ if (min > -Infinity) {
+ obj.min = min;
+ }
+ var max = parseFloat(block.getFieldValue('MAX'));
+ if (max < Infinity) {
+ obj.max = max;
+ }
+ var precision = parseFloat(block.getFieldValue('PRECISION'));
+ if (precision) {
+ obj.precision = precision;
+ }
+ fields.push(obj);
+ break;
case 'field_angle':
fields.push({
type: block.type,
@@ -501,8 +542,8 @@ function getTypesFrom_(block, name) {
types = [escapeString(typeBlock.getFieldValue('TYPE'))];
} else if (typeBlock.type == 'type_group') {
types = [];
- for (var n = 0; n < typeBlock.typeCount_; n++) {
- types = types.concat(getTypesFrom_(typeBlock, 'TYPE' + n));
+ for (var i = 0; i < typeBlock.typeCount_; i++) {
+ types = types.concat(getTypesFrom_(typeBlock, 'TYPE' + i));
}
// Remove duplicates.
var hash = Object.create(null);
@@ -562,6 +603,9 @@ function updateGenerator(block) {
} else if (field instanceof Blockly.FieldDropdown) {
code.push(makeVar('dropdown', name) +
" = block.getFieldValue('" + name + "');");
+ } else if (field instanceof Blockly.FieldNumber) {
+ code.push(makeVar('number', name) +
+ " = block.getFieldValue('" + name + "');");
} else if (field instanceof Blockly.FieldTextInput) {
code.push(makeVar('text', name) +
" = block.getFieldValue('" + name + "');");
diff --git a/demos/blockfactory/index.html b/demos/blockfactory/index.html
index 0377bc587..ce87f88f8 100644
--- a/demos/blockfactory/index.html
+++ b/demos/blockfactory/index.html
@@ -192,6 +192,7 @@
+
diff --git a/generators/dart.js b/generators/dart.js
index cb91dbfd9..644144bcc 100644
--- a/generators/dart.js
+++ b/generators/dart.js
@@ -45,16 +45,28 @@ Blockly.Dart = new Blockly.Generator('Dart');
Blockly.Dart.addReservedWords(
// https://www.dartlang.org/docs/spec/latest/dart-language-specification.pdf
// Section 16.1.1
- 'assert,break,case,catch,class,const,continue,default,do,else,enum,extends,false,final,finally,for,if,in,is,new,null,rethrow,return,super,switch,this,throw,true,try,var,void,while,with,' +
+ 'assert,break,case,catch,class,const,continue,default,do,else,enum,' +
+ 'extends,false,final,finally,for,if,in,is,new,null,rethrow,return,super,' +
+ 'switch,this,throw,true,try,var,void,while,with,' +
// https://api.dartlang.org/dart_core.html
- 'print,identityHashCode,identical,BidirectionalIterator,Comparable,double,Function,int,Invocation,Iterable,Iterator,List,Map,Match,num,Pattern,RegExp,Set,StackTrace,String,StringSink,Type,bool,DateTime,Deprecated,Duration,Expando,Null,Object,RuneIterator,Runes,Stopwatch,StringBuffer,Symbol,Uri,Comparator,AbstractClassInstantiationError,ArgumentError,AssertionError,CastError,ConcurrentModificationError,CyclicInitializationError,Error,Exception,FallThroughError,FormatException,IntegerDivisionByZeroException,NoSuchMethodError,NullThrownError,OutOfMemoryError,RangeError,StackOverflowError,StateError,TypeError,UnimplementedError,UnsupportedError');
+ 'print,identityHashCode,identical,BidirectionalIterator,Comparable,' +
+ 'double,Function,int,Invocation,Iterable,Iterator,List,Map,Match,num,' +
+ 'Pattern,RegExp,Set,StackTrace,String,StringSink,Type,bool,DateTime,' +
+ 'Deprecated,Duration,Expando,Null,Object,RuneIterator,Runes,Stopwatch,' +
+ 'StringBuffer,Symbol,Uri,Comparator,AbstractClassInstantiationError,' +
+ 'ArgumentError,AssertionError,CastError,ConcurrentModificationError,' +
+ 'CyclicInitializationError,Error,Exception,FallThroughError,' +
+ 'FormatException,IntegerDivisionByZeroException,NoSuchMethodError,' +
+ 'NullThrownError,OutOfMemoryError,RangeError,StackOverflowError,' +
+ 'StateError,TypeError,UnimplementedError,UnsupportedError'
+);
/**
* Order of operation ENUMs.
* https://www.dartlang.org/docs/dart-up-and-running/ch02.html#operator_table
*/
Blockly.Dart.ORDER_ATOMIC = 0; // 0 "" ...
-Blockly.Dart.ORDER_UNARY_POSTFIX = 1; // expr++ expr-- () [] .
+Blockly.Dart.ORDER_UNARY_POSTFIX = 1; // expr++ expr-- () [] . ?.
Blockly.Dart.ORDER_UNARY_PREFIX = 2; // -expr !expr ~expr ++expr --expr
Blockly.Dart.ORDER_MULTIPLICATIVE = 3; // * / % ~/
Blockly.Dart.ORDER_ADDITIVE = 4; // + -
@@ -66,11 +78,18 @@ Blockly.Dart.ORDER_RELATIONAL = 9; // >= > <= < as is is!
Blockly.Dart.ORDER_EQUALITY = 10; // == !=
Blockly.Dart.ORDER_LOGICAL_AND = 11; // &&
Blockly.Dart.ORDER_LOGICAL_OR = 12; // ||
-Blockly.Dart.ORDER_CONDITIONAL = 13; // expr ? expr : expr
-Blockly.Dart.ORDER_CASCADE = 14; // ..
-Blockly.Dart.ORDER_ASSIGNMENT = 15; // = *= /= ~/= %= += -= <<= >>= &= ^= |=
+Blockly.Dart.ORDER_IF_NULL = 13; // ??
+Blockly.Dart.ORDER_CONDITIONAL = 14; // expr ? expr : expr
+Blockly.Dart.ORDER_CASCADE = 15; // ..
+Blockly.Dart.ORDER_ASSIGNMENT = 16; // = *= /= ~/= %= += -= <<= >>= &= ^= |=
Blockly.Dart.ORDER_NONE = 99; // (...)
+/**
+ * Allow for switching between one and zero based indexing for lists and text,
+ * one based by default.
+ */
+Blockly.Dart.ONE_BASED_INDEXING = true;
+
/**
* Initialise the database of variable names.
* @param {!Blockly.Workspace} workspace Workspace to generate code from.
@@ -182,9 +201,9 @@ Blockly.Dart.scrub_ = function(block, code) {
}
// Collect comments for all value arguments.
// Don't collect comments for nested statements.
- for (var x = 0; x < block.inputList.length; x++) {
- if (block.inputList[x].type == Blockly.INPUT_VALUE) {
- var childBlock = block.inputList[x].connection.targetBlock();
+ for (var i = 0; i < block.inputList.length; i++) {
+ if (block.inputList[i].type == Blockly.INPUT_VALUE) {
+ var childBlock = block.inputList[i].connection.targetBlock();
if (childBlock) {
var comment = Blockly.Dart.allNestedComments(childBlock);
if (comment) {
@@ -198,3 +217,63 @@ Blockly.Dart.scrub_ = function(block, code) {
var nextCode = Blockly.Dart.blockToCode(nextBlock);
return commentCode + code + nextCode;
};
+
+/**
+ * Gets a property and adjusts the value while taking into account indexing.
+ * @param {!Blockly.Block} block The block.
+ * @param {string} atId The property ID of the element to get.
+ * @param {number=} opt_delta Value to add.
+ * @param {boolean=} opt_negate Whether to negate the value.
+ * @param {number=} opt_order The highest order acting on this value.
+ * @return {string|number}
+ */
+Blockly.Dart.getAdjusted = function(block, atId, opt_delta, opt_negate,
+ opt_order) {
+ var delta = opt_delta || 0;
+ var order = opt_order || Blockly.Dart.ORDER_NONE;
+ if (Blockly.Dart.ONE_BASED_INDEXING) {
+ delta--;
+ }
+ var defaultAtIndex = Blockly.Dart.ONE_BASED_INDEXING ? '1' : '0';
+ if (delta) {
+ var at = Blockly.Dart.valueToCode(block, atId,
+ Blockly.Dart.ORDER_ADDITIVE) || defaultAtIndex;
+ } else if (opt_negate) {
+ var at = Blockly.Dart.valueToCode(block, atId,
+ Blockly.Dart.ORDER_UNARY_PREFIX) || defaultAtIndex;
+ } else {
+ var at = Blockly.Dart.valueToCode(block, atId, order) ||
+ defaultAtIndex;
+ }
+
+ if (Blockly.isNumber(at)) {
+ // If the index is a naked number, adjust it right now.
+ at = parseInt(at, 10) + delta;
+ if (opt_negate) {
+ at = -at;
+ }
+ } else {
+ // If the index is dynamic, adjust it in code.
+ if (delta > 0) {
+ at = at + ' + ' + delta;
+ var innerOrder = Blockly.Dart.ORDER_ADDITIVE;
+ } else if (delta < 0) {
+ at = at + ' - ' + -delta;
+ var innerOrder = Blockly.Dart.ORDER_ADDITIVE;
+ }
+ if (opt_negate) {
+ if (delta) {
+ at = '-(' + at + ')';
+ } else {
+ at = '-' + at;
+ }
+ var innerOrder = Blockly.Dart.ORDER_UNARY_PREFIX;
+ }
+ innerOrder = Math.floor(innerOrder);
+ order = Math.floor(order);
+ if (innerOrder && order >= innerOrder) {
+ at = '(' + at + ')';
+ }
+ }
+ return at;
+};
diff --git a/generators/dart/colour.js b/generators/dart/colour.js
index d73415522..7ded91419 100644
--- a/generators/dart/colour.js
+++ b/generators/dart/colour.js
@@ -43,13 +43,13 @@ Blockly.Dart['colour_random'] = function(block) {
'import \'dart:math\' as Math;';
var functionName = Blockly.Dart.provideFunction_(
'colour_random',
- [ 'String ' + Blockly.Dart.FUNCTION_NAME_PLACEHOLDER_ + '() {',
- ' String hex = \'0123456789abcdef\';',
- ' var rnd = new Math.Random();',
- ' return \'#${hex[rnd.nextInt(16)]}${hex[rnd.nextInt(16)]}\'',
- ' \'${hex[rnd.nextInt(16)]}${hex[rnd.nextInt(16)]}\'',
- ' \'${hex[rnd.nextInt(16)]}${hex[rnd.nextInt(16)]}\';',
- '}']);
+ ['String ' + Blockly.Dart.FUNCTION_NAME_PLACEHOLDER_ + '() {',
+ ' String hex = \'0123456789abcdef\';',
+ ' var rnd = new Math.Random();',
+ ' return \'#${hex[rnd.nextInt(16)]}${hex[rnd.nextInt(16)]}\'',
+ ' \'${hex[rnd.nextInt(16)]}${hex[rnd.nextInt(16)]}\'',
+ ' \'${hex[rnd.nextInt(16)]}${hex[rnd.nextInt(16)]}\';',
+ '}']);
var code = functionName + '()';
return [code, Blockly.Dart.ORDER_UNARY_POSTFIX];
};
@@ -67,22 +67,22 @@ Blockly.Dart['colour_rgb'] = function(block) {
'import \'dart:math\' as Math;';
var functionName = Blockly.Dart.provideFunction_(
'colour_rgb',
- [ 'String ' + Blockly.Dart.FUNCTION_NAME_PLACEHOLDER_ +
+ ['String ' + Blockly.Dart.FUNCTION_NAME_PLACEHOLDER_ +
'(num r, num g, num b) {',
- ' num rn = (Math.max(Math.min(r, 1), 0) * 255).round();',
- ' String rs = rn.toInt().toRadixString(16);',
- ' rs = \'0$rs\';',
- ' rs = rs.substring(rs.length - 2);',
- ' num gn = (Math.max(Math.min(g, 1), 0) * 255).round();',
- ' String gs = gn.toInt().toRadixString(16);',
- ' gs = \'0$gs\';',
- ' gs = gs.substring(gs.length - 2);',
- ' num bn = (Math.max(Math.min(b, 1), 0) * 255).round();',
- ' String bs = bn.toInt().toRadixString(16);',
- ' bs = \'0$bs\';',
- ' bs = bs.substring(bs.length - 2);',
- ' return \'#$rs$gs$bs\';',
- '}']);
+ ' num rn = (Math.max(Math.min(r, 1), 0) * 255).round();',
+ ' String rs = rn.toInt().toRadixString(16);',
+ ' rs = \'0$rs\';',
+ ' rs = rs.substring(rs.length - 2);',
+ ' num gn = (Math.max(Math.min(g, 1), 0) * 255).round();',
+ ' String gs = gn.toInt().toRadixString(16);',
+ ' gs = \'0$gs\';',
+ ' gs = gs.substring(gs.length - 2);',
+ ' num bn = (Math.max(Math.min(b, 1), 0) * 255).round();',
+ ' String bs = bn.toInt().toRadixString(16);',
+ ' bs = \'0$bs\';',
+ ' bs = bs.substring(bs.length - 2);',
+ ' return \'#$rs$gs$bs\';',
+ '}']);
var code = functionName + '(' + red + ', ' + green + ', ' + blue + ')';
return [code, Blockly.Dart.ORDER_UNARY_POSTFIX];
};
@@ -100,29 +100,29 @@ Blockly.Dart['colour_blend'] = function(block) {
'import \'dart:math\' as Math;';
var functionName = Blockly.Dart.provideFunction_(
'colour_blend',
- [ 'String ' + Blockly.Dart.FUNCTION_NAME_PLACEHOLDER_ +
+ ['String ' + Blockly.Dart.FUNCTION_NAME_PLACEHOLDER_ +
'(String c1, String c2, num ratio) {',
- ' ratio = Math.max(Math.min(ratio, 1), 0);',
- ' int r1 = int.parse(\'0x${c1.substring(1, 3)}\');',
- ' int g1 = int.parse(\'0x${c1.substring(3, 5)}\');',
- ' int b1 = int.parse(\'0x${c1.substring(5, 7)}\');',
- ' int r2 = int.parse(\'0x${c2.substring(1, 3)}\');',
- ' int g2 = int.parse(\'0x${c2.substring(3, 5)}\');',
- ' int b2 = int.parse(\'0x${c2.substring(5, 7)}\');',
- ' num rn = (r1 * (1 - ratio) + r2 * ratio).round();',
- ' String rs = rn.toInt().toRadixString(16);',
- ' num gn = (g1 * (1 - ratio) + g2 * ratio).round();',
- ' String gs = gn.toInt().toRadixString(16);',
- ' num bn = (b1 * (1 - ratio) + b2 * ratio).round();',
- ' String bs = bn.toInt().toRadixString(16);',
- ' rs = \'0$rs\';',
- ' rs = rs.substring(rs.length - 2);',
- ' gs = \'0$gs\';',
- ' gs = gs.substring(gs.length - 2);',
- ' bs = \'0$bs\';',
- ' bs = bs.substring(bs.length - 2);',
- ' return \'#$rs$gs$bs\';',
- '}']);
+ ' ratio = Math.max(Math.min(ratio, 1), 0);',
+ ' int r1 = int.parse(\'0x${c1.substring(1, 3)}\');',
+ ' int g1 = int.parse(\'0x${c1.substring(3, 5)}\');',
+ ' int b1 = int.parse(\'0x${c1.substring(5, 7)}\');',
+ ' int r2 = int.parse(\'0x${c2.substring(1, 3)}\');',
+ ' int g2 = int.parse(\'0x${c2.substring(3, 5)}\');',
+ ' int b2 = int.parse(\'0x${c2.substring(5, 7)}\');',
+ ' num rn = (r1 * (1 - ratio) + r2 * ratio).round();',
+ ' String rs = rn.toInt().toRadixString(16);',
+ ' num gn = (g1 * (1 - ratio) + g2 * ratio).round();',
+ ' String gs = gn.toInt().toRadixString(16);',
+ ' num bn = (b1 * (1 - ratio) + b2 * ratio).round();',
+ ' String bs = bn.toInt().toRadixString(16);',
+ ' rs = \'0$rs\';',
+ ' rs = rs.substring(rs.length - 2);',
+ ' gs = \'0$gs\';',
+ ' gs = gs.substring(gs.length - 2);',
+ ' bs = \'0$bs\';',
+ ' bs = bs.substring(bs.length - 2);',
+ ' return \'#$rs$gs$bs\';',
+ '}']);
var code = functionName + '(' + c1 + ', ' + c2 + ', ' + ratio + ')';
return [code, Blockly.Dart.ORDER_UNARY_POSTFIX];
};
diff --git a/generators/dart/lists.js b/generators/dart/lists.js
index 24fcd2243..ae5ecc20e 100644
--- a/generators/dart/lists.js
+++ b/generators/dart/lists.js
@@ -38,49 +38,52 @@ Blockly.Dart['lists_create_empty'] = function(block) {
Blockly.Dart['lists_create_with'] = function(block) {
// Create a list with any number of elements of any type.
- var code = new Array(block.itemCount_);
- for (var n = 0; n < block.itemCount_; n++) {
- code[n] = Blockly.Dart.valueToCode(block, 'ADD' + n,
+ var elements = new Array(block.itemCount_);
+ for (var i = 0; i < block.itemCount_; i++) {
+ elements[i] = Blockly.Dart.valueToCode(block, 'ADD' + i,
Blockly.Dart.ORDER_NONE) || 'null';
}
- code = '[' + code.join(', ') + ']';
+ var code = '[' + elements.join(', ') + ']';
return [code, Blockly.Dart.ORDER_ATOMIC];
};
Blockly.Dart['lists_repeat'] = function(block) {
// Create a list with one element repeated.
- var argument0 = Blockly.Dart.valueToCode(block, 'ITEM',
- Blockly.Dart.ORDER_NONE) || 'null';
- var argument1 = Blockly.Dart.valueToCode(block, 'NUM',
- Blockly.Dart.ORDER_NONE) || '0';
- var code = 'new List.filled(' + argument1 + ', ' + argument0 + ')';
+ var element = Blockly.Dart.valueToCode(block, 'ITEM',
+ Blockly.Dart.ORDER_NONE) || 'null';
+ var repeatCount = Blockly.Dart.valueToCode(block, 'NUM',
+ Blockly.Dart.ORDER_NONE) || '0';
+ var code = 'new List.filled(' + repeatCount + ', ' + element + ')';
return [code, Blockly.Dart.ORDER_UNARY_POSTFIX];
};
Blockly.Dart['lists_length'] = function(block) {
// String or array length.
- var argument0 = Blockly.Dart.valueToCode(block, 'VALUE',
+ var list = Blockly.Dart.valueToCode(block, 'VALUE',
Blockly.Dart.ORDER_UNARY_POSTFIX) || '[]';
- return [argument0 + '.length', Blockly.Dart.ORDER_UNARY_POSTFIX];
+ return [list + '.length', Blockly.Dart.ORDER_UNARY_POSTFIX];
};
Blockly.Dart['lists_isEmpty'] = function(block) {
// Is the string null or array empty?
- var argument0 = Blockly.Dart.valueToCode(block, 'VALUE',
+ var list = Blockly.Dart.valueToCode(block, 'VALUE',
Blockly.Dart.ORDER_UNARY_POSTFIX) || '[]';
- return [argument0 + '.isEmpty', Blockly.Dart.ORDER_UNARY_POSTFIX];
+ return [list + '.isEmpty', Blockly.Dart.ORDER_UNARY_POSTFIX];
};
Blockly.Dart['lists_indexOf'] = function(block) {
// Find an item in the list.
var operator = block.getFieldValue('END') == 'FIRST' ?
'indexOf' : 'lastIndexOf';
- var argument0 = Blockly.Dart.valueToCode(block, 'FIND',
+ var item = Blockly.Dart.valueToCode(block, 'FIND',
Blockly.Dart.ORDER_NONE) || '\'\'';
- var argument1 = Blockly.Dart.valueToCode(block, 'VALUE',
+ var list = Blockly.Dart.valueToCode(block, 'VALUE',
Blockly.Dart.ORDER_UNARY_POSTFIX) || '[]';
- var code = argument1 + '.' + operator + '(' + argument0 + ') + 1';
- return [code, Blockly.Dart.ORDER_ADDITIVE];
+ var code = list + '.' + operator + '(' + item + ')';
+ if (Blockly.Dart.ONE_BASED_INDEXING) {
+ return [code + ' + 1', Blockly.Dart.ORDER_ADDITIVE];
+ }
+ return [code, Blockly.Dart.ORDER_UNARY_POSTFIX];
};
Blockly.Dart['lists_getIndex'] = function(block) {
@@ -88,94 +91,156 @@ Blockly.Dart['lists_getIndex'] = function(block) {
// Note: Until January 2013 this block did not have MODE or WHERE inputs.
var mode = block.getFieldValue('MODE') || 'GET';
var where = block.getFieldValue('WHERE') || 'FROM_START';
- var at = Blockly.Dart.valueToCode(block, 'AT',
- Blockly.Dart.ORDER_UNARY_PREFIX) || '1';
- var list = Blockly.Dart.valueToCode(block, 'VALUE',
- Blockly.Dart.ORDER_UNARY_POSTFIX) || '[]';
+ var listOrder = (where == 'RANDOM' || where == 'FROM_END') ?
+ Blockly.Dart.ORDER_NONE : Blockly.Dart.ORDER_UNARY_POSTFIX;
+ var list = Blockly.Dart.valueToCode(block, 'VALUE', listOrder) || '[]';
+ // Cache non-trivial values to variables to prevent repeated look-ups.
+ // Closure, which accesses and modifies 'list'.
+ function cacheList() {
+ var listVar = Blockly.Dart.variableDB_.getDistinctName(
+ 'tmp_list', Blockly.Variables.NAME_TYPE);
+ var code = 'List ' + listVar + ' = ' + list + ';\n';
+ list = listVar;
+ return code;
+ }
+ // If `list` would be evaluated more than once (which is the case for
+ // RANDOM REMOVE and FROM_END) and is non-trivial, make sure to access it
+ // only once.
+ if (((where == 'RANDOM' && mode == 'REMOVE') || where == 'FROM_END') &&
+ !list.match(/^\w+$/)) {
+ // `list` is an expression, so we may not evaluate it more than once.
+ if (where == 'RANDOM') {
+ Blockly.Dart.definitions_['import_dart_math'] =
+ 'import \'dart:math\' as Math;';
+ // We can use multiple statements.
+ var code = cacheList();
+ var xVar = Blockly.Dart.variableDB_.getDistinctName(
+ 'tmp_x', Blockly.Variables.NAME_TYPE);
+ code += 'int ' + xVar + ' = new Math.Random().nextInt(' + list +
+ '.length);\n';
+ code += list + '.removeAt(' + xVar + ');\n';
+ return code;
+ } else { // where == 'FROM_END'
+ if (mode == 'REMOVE') {
+ // We can use multiple statements.
+ var at = Blockly.Dart.getAdjusted(block, 'AT', 1, false,
+ Blockly.Dart.ORDER_ADDITIVE);
+ var code = cacheList();
+ code += list + '.removeAt(' + list + '.length' + ' - ' + at + ');\n';
+ return code;
- if (where == 'FIRST') {
- if (mode == 'GET') {
- var code = list + '.first';
- return [code, Blockly.Dart.ORDER_UNARY_POSTFIX];
- } else if (mode == 'GET_REMOVE') {
- var code = list + '.removeAt(0)';
- return [code, Blockly.Dart.ORDER_UNARY_POSTFIX];
- } else if (mode == 'REMOVE') {
- return list + '.removeAt(0);\n';
- }
- } else if (where == 'LAST') {
- if (mode == 'GET') {
- var code = list + '.last';
- return [code, Blockly.Dart.ORDER_UNARY_POSTFIX];
- } else if (mode == 'GET_REMOVE') {
- var code = list + '.removeLast()';
- return [code, Blockly.Dart.ORDER_UNARY_POSTFIX];
- } else if (mode == 'REMOVE') {
- return list + '.removeLast();\n';
- }
- } else if (where == 'FROM_START') {
- // Blockly uses one-based indicies.
- if (Blockly.isNumber(at)) {
- // If the index is a naked number, decrement it right now.
- at = parseInt(at, 10) - 1;
- } else {
- // If the index is dynamic, decrement it in code.
- at += ' - 1';
- }
- if (mode == 'GET') {
- var code = list + '[' + at + ']';
- return [code, Blockly.Dart.ORDER_UNARY_POSTFIX];
- } else if (mode == 'GET_REMOVE') {
- var code = list + '.removeAt(' + at + ')';
- return [code, Blockly.Dart.ORDER_UNARY_POSTFIX];
- } else if (mode == 'REMOVE') {
- return list + '.removeAt(' + at + ');\n';
- }
- } else if (where == 'FROM_END') {
- if (mode == 'GET') {
- var functionName = Blockly.Dart.provideFunction_(
- 'lists_get_from_end',
- [ 'dynamic ' + Blockly.Dart.FUNCTION_NAME_PLACEHOLDER_ +
- '(List myList, num x) {',
- ' x = myList.length - x;',
- ' return myList.removeAt(x);',
- '}']);
- code = functionName + '(' + list + ', ' + at + ')';
- return [code, Blockly.Dart.ORDER_UNARY_POSTFIX];
- } else if (mode == 'GET_REMOVE' || mode == 'REMOVE') {
- var functionName = Blockly.Dart.provideFunction_(
- 'lists_remove_from_end',
- [ 'dynamic ' + Blockly.Dart.FUNCTION_NAME_PLACEHOLDER_ +
- '(List myList, num x) {',
- ' x = myList.length - x;',
- ' return myList.removeAt(x);',
- '}']);
- code = functionName + '(' + list + ', ' + at + ')';
- if (mode == 'GET_REMOVE') {
+ } else if (mode == 'GET') {
+ var at = Blockly.Dart.getAdjusted(block, 'AT', 1);
+ // We need to create a procedure to avoid reevaluating values.
+ var functionName = Blockly.Dart.provideFunction_(
+ 'lists_get_from_end',
+ ['dynamic ' + Blockly.Dart.FUNCTION_NAME_PLACEHOLDER_ +
+ '(List my_list, num x) {',
+ ' x = my_list.length - x;',
+ ' return my_list[x];',
+ '}']);
+ var code = functionName + '(' + list + ', ' + at + ')';
+ return [code, Blockly.Dart.ORDER_UNARY_POSTFIX];
+ } else if (mode == 'GET_REMOVE') {
+ var at = Blockly.Dart.getAdjusted(block, 'AT', 1);
+ // We need to create a procedure to avoid reevaluating values.
+ var functionName = Blockly.Dart.provideFunction_(
+ 'lists_remove_from_end',
+ ['dynamic ' + Blockly.Dart.FUNCTION_NAME_PLACEHOLDER_ +
+ '(List my_list, num x) {',
+ ' x = my_list.length - x;',
+ ' return my_list.removeAt(x);',
+ '}']);
+ var code = functionName + '(' + list + ', ' + at + ')';
return [code, Blockly.Dart.ORDER_UNARY_POSTFIX];
- } else if (mode == 'REMOVE') {
- return code + ';\n';
}
}
- } else if (where == 'RANDOM') {
- Blockly.Dart.definitions_['import_dart_math'] =
- 'import \'dart:math\' as Math;';
- var functionName = Blockly.Dart.provideFunction_(
- 'lists_get_random_item',
- [ 'dynamic ' + Blockly.Dart.FUNCTION_NAME_PLACEHOLDER_ +
- '(List myList, bool remove) {',
- ' int x = new Math.Random().nextInt(myList.length);',
- ' if (remove) {',
- ' return myList.removeAt(x);',
- ' } else {',
- ' return myList[x];',
- ' }',
- '}']);
- code = functionName + '(' + list + ', ' + (mode != 'GET') + ')';
- if (mode == 'GET' || mode == 'GET_REMOVE') {
- return [code, Blockly.Dart.ORDER_UNARY_POSTFIX];
- } else if (mode == 'REMOVE') {
- return code + ';\n';
+ } else {
+ // Either `list` is a simple variable, or we only need to refer to `list`
+ // once.
+ switch (where) {
+ case 'FIRST':
+ if (mode == 'GET') {
+ var code = list + '.first';
+ return [code, Blockly.Dart.ORDER_UNARY_POSTFIX];
+ } else if (mode == 'GET_REMOVE') {
+ var code = list + '.removeAt(0)';
+ return [code, Blockly.Dart.ORDER_UNARY_POSTFIX];
+ } else if (mode == 'REMOVE') {
+ return list + '.removeAt(0);\n';
+ }
+ break;
+ case 'LAST':
+ if (mode == 'GET') {
+ var code = list + '.last';
+ return [code, Blockly.Dart.ORDER_UNARY_POSTFIX];
+ } else if (mode == 'GET_REMOVE') {
+ var code = list + '.removeLast()';
+ return [code, Blockly.Dart.ORDER_UNARY_POSTFIX];
+ } else if (mode == 'REMOVE') {
+ return list + '.removeLast();\n';
+ }
+ break;
+ case 'FROM_START':
+ var at = Blockly.Dart.getAdjusted(block, 'AT');
+ if (mode == 'GET') {
+ var code = list + '[' + at + ']';
+ return [code, Blockly.Dart.ORDER_UNARY_POSTFIX];
+ } else if (mode == 'GET_REMOVE') {
+ var code = list + '.removeAt(' + at + ')';
+ return [code, Blockly.Dart.ORDER_UNARY_POSTFIX];
+ } else if (mode == 'REMOVE') {
+ return list + '.removeAt(' + at + ');\n';
+ }
+ break;
+ case 'FROM_END':
+ var at = Blockly.Dart.getAdjusted(block, 'AT', 1, false,
+ Blockly.Dart.ORDER_ADDITIVE);
+ if (mode == 'GET') {
+ var code = list + '[' + list + '.length - ' + at + ']';
+ return [code, Blockly.Dart.ORDER_UNARY_POSTFIX];
+ } else if (mode == 'GET_REMOVE' || mode == 'REMOVE') {
+ var code = list + '.removeAt(' + list + '.length - ' + at + ')';
+ if (mode == 'GET_REMOVE') {
+ return [code, Blockly.Dart.ORDER_UNARY_POSTFIX];
+ } else if (mode == 'REMOVE') {
+ return code + ';\n';
+ }
+ }
+ break;
+ case 'RANDOM':
+ Blockly.Dart.definitions_['import_dart_math'] =
+ 'import \'dart:math\' as Math;';
+ if (mode == 'REMOVE') {
+ // We can use multiple statements.
+ var xVar = Blockly.Dart.variableDB_.getDistinctName(
+ 'tmp_x', Blockly.Variables.NAME_TYPE);
+ var code = 'int ' + xVar + ' = new Math.Random().nextInt(' + list +
+ '.length);\n';
+ code += list + '.removeAt(' + xVar + ');\n';
+ return code;
+ } else if (mode == 'GET') {
+ var functionName = Blockly.Dart.provideFunction_(
+ 'lists_get_random_item',
+ ['dynamic ' + Blockly.Dart.FUNCTION_NAME_PLACEHOLDER_ +
+ '(List my_list) {',
+ ' int x = new Math.Random().nextInt(my_list.length);',
+ ' return my_list[x];',
+ '}']);
+ var code = functionName + '(' + list + ')';
+ return [code, Blockly.Dart.ORDER_UNARY_POSTFIX];
+ } else if (mode == 'GET_REMOVE') {
+ var functionName = Blockly.Dart.provideFunction_(
+ 'lists_remove_random_item',
+ ['dynamic ' + Blockly.Dart.FUNCTION_NAME_PLACEHOLDER_ +
+ '(List my_list) {',
+ ' int x = new Math.Random().nextInt(my_list.length);',
+ ' return my_list.removeAt(x);',
+ '}']);
+ var code = functionName + '(' + list + ')';
+ return [code, Blockly.Dart.ORDER_UNARY_POSTFIX];
+ }
+ break;
}
}
throw 'Unhandled combination (lists_getIndex).';
@@ -184,12 +249,10 @@ Blockly.Dart['lists_getIndex'] = function(block) {
Blockly.Dart['lists_setIndex'] = function(block) {
// Set element at index.
// Note: Until February 2013 this block did not have MODE or WHERE inputs.
- var list = Blockly.Dart.valueToCode(block, 'LIST',
- Blockly.Dart.ORDER_UNARY_POSTFIX) || '[]';
var mode = block.getFieldValue('MODE') || 'GET';
var where = block.getFieldValue('WHERE') || 'FROM_START';
- var at = Blockly.Dart.valueToCode(block, 'AT',
- Blockly.Dart.ORDER_ADDITIVE) || '1';
+ var list = Blockly.Dart.valueToCode(block, 'LIST',
+ Blockly.Dart.ORDER_UNARY_POSTFIX) || '[]';
var value = Blockly.Dart.valueToCode(block, 'TO',
Blockly.Dart.ORDER_ASSIGNMENT) || 'null';
// Cache non-trivial values to variables to prevent repeated look-ups.
@@ -204,59 +267,61 @@ Blockly.Dart['lists_setIndex'] = function(block) {
list = listVar;
return code;
}
- if (where == 'FIRST') {
- if (mode == 'SET') {
- return list + '[0] = ' + value + ';\n';
- } else if (mode == 'INSERT') {
- return list + '.insert(0, ' + value + ');\n';
- }
- } else if (where == 'LAST') {
- if (mode == 'SET') {
+ switch (where) {
+ case 'FIRST':
+ if (mode == 'SET') {
+ return list + '[0] = ' + value + ';\n';
+ } else if (mode == 'INSERT') {
+ return list + '.insert(0, ' + value + ');\n';
+ }
+ break;
+ case 'LAST':
+ if (mode == 'SET') {
+ var code = cacheList();
+ code += list + '[' + list + '.length - 1] = ' + value + ';\n';
+ return code;
+ } else if (mode == 'INSERT') {
+ return list + '.add(' + value + ');\n';
+ }
+ break;
+ case 'FROM_START':
+ var at = Blockly.Dart.getAdjusted(block, 'AT');
+ if (mode == 'SET') {
+ return list + '[' + at + '] = ' + value + ';\n';
+ } else if (mode == 'INSERT') {
+ return list + '.insert(' + at + ', ' + value + ');\n';
+ }
+ break;
+ case 'FROM_END':
+ var at = Blockly.Dart.getAdjusted(block, 'AT', 1, false,
+ Blockly.Dart.ORDER_ADDITIVE);
var code = cacheList();
- code += list + '[' + list + '.length - 1] = ' + value + ';\n';
- return code;
- } else if (mode == 'INSERT') {
- return list + '.add(' + value + ');\n';
- }
- } else if (where == 'FROM_START') {
- // Blockly uses one-based indicies.
- if (Blockly.isNumber(at)) {
- // If the index is a naked number, decrement it right now.
- at = parseInt(at, 10) - 1;
- } else {
- // If the index is dynamic, decrement it in code.
- at += ' - 1';
- }
- if (mode == 'SET') {
- return list + '[' + at + '] = ' + value + ';\n';
- } else if (mode == 'INSERT') {
- return list + '.insert(' + at + ', ' + value + ');\n';
- }
- } else if (where == 'FROM_END') {
- var code = cacheList();
- if (mode == 'SET') {
- code += list + '[' + list + '.length - ' + at + '] = ' + value + ';\n';
- return code;
- } else if (mode == 'INSERT') {
- code += list + '.insert(' + list + '.length - ' + at + ', ' +
- value + ');\n';
- return code;
- }
- } else if (where == 'RANDOM') {
- Blockly.Dart.definitions_['import_dart_math'] =
- 'import \'dart:math\' as Math;';
- var code = cacheList();
- var xVar = Blockly.Dart.variableDB_.getDistinctName(
- 'tmp_x', Blockly.Variables.NAME_TYPE);
- code += 'int ' + xVar +
- ' = new Math.Random().nextInt(' + list + '.length);';
- if (mode == 'SET') {
- code += list + '[' + xVar + '] = ' + value + ';\n';
- return code;
- } else if (mode == 'INSERT') {
- code += list + '.insert(' + xVar + ', ' + value + ');\n';
- return code;
- }
+ if (mode == 'SET') {
+ code += list + '[' + list + '.length - ' + at + '] = ' + value +
+ ';\n';
+ return code;
+ } else if (mode == 'INSERT') {
+ code += list + '.insert(' + list + '.length - ' + at + ', ' +
+ value + ');\n';
+ return code;
+ }
+ break;
+ case 'RANDOM':
+ Blockly.Dart.definitions_['import_dart_math'] =
+ 'import \'dart:math\' as Math;';
+ var code = cacheList();
+ var xVar = Blockly.Dart.variableDB_.getDistinctName(
+ 'tmp_x', Blockly.Variables.NAME_TYPE);
+ code += 'int ' + xVar +
+ ' = new Math.Random().nextInt(' + list + '.length);\n';
+ if (mode == 'SET') {
+ code += list + '[' + xVar + '] = ' + value + ';\n';
+ return code;
+ } else if (mode == 'INSERT') {
+ code += list + '.insert(' + xVar + ', ' + value + ');\n';
+ return code;
+ }
+ break;
}
throw 'Unhandled combination (lists_setIndex).';
};
@@ -267,43 +332,67 @@ Blockly.Dart['lists_getSublist'] = function(block) {
Blockly.Dart.ORDER_UNARY_POSTFIX) || '[]';
var where1 = block.getFieldValue('WHERE1');
var where2 = block.getFieldValue('WHERE2');
- var at1 = Blockly.Dart.valueToCode(block, 'AT1',
- Blockly.Dart.ORDER_NONE) || '1';
- var at2 = Blockly.Dart.valueToCode(block, 'AT2',
- Blockly.Dart.ORDER_NONE) || '1';
- if ((where1 == 'FIRST' || where1 == 'FROM_START' && Blockly.isNumber(at1)) &&
- (where2 == 'LAST' || where2 == 'FROM_START' && Blockly.isNumber(at2))) {
- // Simple case that can be done inline.
- at1 = where1 == 'FIRST' ? 0 : parseInt(at1, 10) - 1;
+ if (list.match(/^\w+$/) || (where1 != 'FROM_END' && where2 == 'FROM_START')) {
+ // If the list is a is a variable or doesn't require a call for length,
+ // don't generate a helper function.
+ switch (where1) {
+ case 'FROM_START':
+ var at1 = Blockly.Dart.getAdjusted(block, 'AT1');
+ break;
+ case 'FROM_END':
+ var at1 = Blockly.Dart.getAdjusted(block, 'AT1', 1, false,
+ Blockly.Dart.ORDER_ADDITIVE);
+ at1 = list + '.length - ' + at1;
+ break;
+ case 'FIRST':
+ var at1 = '0';
+ break;
+ default:
+ throw 'Unhandled option (lists_getSublist).';
+ }
+ switch (where2) {
+ case 'FROM_START':
+ var at2 = Blockly.Dart.getAdjusted(block, 'AT2', 1);
+ break;
+ case 'FROM_END':
+ var at2 = Blockly.Dart.getAdjusted(block, 'AT2', 0, false,
+ Blockly.Dart.ORDER_ADDITIVE);
+ at2 = list + '.length - ' + at2;
+ break;
+ case 'LAST':
+ // There is no second index if LAST option is chosen.
+ break;
+ default:
+ throw 'Unhandled option (lists_getSublist).';
+ }
if (where2 == 'LAST') {
- code = list + '.sublist(' + at1 + ')';
+ var code = list + '.sublist(' + at1 + ')';
} else {
- at2 = parseInt(at2, 10);
- code = list + '.sublist(' + at1 + ', ' + at2 + ')';
+ var code = list + '.sublist(' + at1 + ', ' + at2 + ')';
}
} else {
+ var at1 = Blockly.Dart.getAdjusted(block, 'AT1');
+ var at2 = Blockly.Dart.getAdjusted(block, 'AT2');
var functionName = Blockly.Dart.provideFunction_(
'lists_get_sublist',
- [ 'List ' + Blockly.Dart.FUNCTION_NAME_PLACEHOLDER_ +
+ ['List ' + Blockly.Dart.FUNCTION_NAME_PLACEHOLDER_ +
'(list, where1, at1, where2, at2) {',
- ' int getAt(where, at) {',
- ' if (where == \'FROM_START\') {',
- ' at--;',
- ' } else if (where == \'FROM_END\') {',
- ' at = list.length - at;',
- ' } else if (where == \'FIRST\') {',
- ' at = 0;',
- ' } else if (where == \'LAST\') {',
- ' at = list.length - 1;',
- ' } else {',
- ' throw \'Unhandled option (lists_getSublist).\';',
- ' }',
- ' return at;',
- ' }',
- ' at1 = getAt(where1, at1);',
- ' at2 = getAt(where2, at2) + 1;',
- ' return list.sublist(at1, at2);',
- '}']);
+ ' int getAt(where, at) {',
+ ' if (where == \'FROM_END\') {',
+ ' at = list.length - 1 - at;',
+ ' } else if (where == \'FIRST\') {',
+ ' at = 0;',
+ ' } else if (where == \'LAST\') {',
+ ' at = list.length - 1;',
+ ' } else if (where != \'FROM_START\') {',
+ ' throw \'Unhandled option (lists_getSublist).\';',
+ ' }',
+ ' return at;',
+ ' }',
+ ' at1 = getAt(where1, at1);',
+ ' at2 = getAt(where2, at2) + 1;',
+ ' return list.sublist(at1, at2);',
+ '}']);
var code = functionName + '(' + list + ', \'' +
where1 + '\', ' + at1 + ', \'' + where2 + '\', ' + at2 + ')';
}
@@ -312,51 +401,52 @@ Blockly.Dart['lists_getSublist'] = function(block) {
Blockly.Dart['lists_sort'] = function(block) {
// Block for sorting a list.
- var listCode = Blockly.Dart.valueToCode(block, 'LIST',
- Blockly.Dart.ORDER_UNARY_POSTFIX) || '[]';
+ var list = Blockly.Dart.valueToCode(block, 'LIST',
+ Blockly.Dart.ORDER_NONE) || '[]';
var direction = block.getFieldValue('DIRECTION') === '1' ? 1 : -1;
var type = block.getFieldValue('TYPE');
var sortFunctionName = Blockly.Dart.provideFunction_(
- 'lists_sort',
- ['List ' + Blockly.Dart.FUNCTION_NAME_PLACEHOLDER_ +
- '(list, type, direction) {',
- ' var compareFuncs = {',
- ' "NUMERIC": (a, b) => direction * a.compareTo(b),',
- ' "TEXT": (a, b) => direction * a.toString().compareTo(b.toString()),',
- ' "IGNORE_CASE": ',
- ' (a, b) => direction * ',
- ' a.toString().toLowerCase().compareTo(b.toString().toLowerCase())',
- ' };',
- ' list = new List.from(list);', // Clone the list.
- ' var compare = compareFuncs[type];',
- ' list.sort(compare);',
- ' return list;',
- '}']);
- return [sortFunctionName + '(' + listCode + ', ' +
+ 'lists_sort',
+ ['List ' + Blockly.Dart.FUNCTION_NAME_PLACEHOLDER_ +
+ '(list, type, direction) {',
+ ' var compareFuncs = {',
+ ' "NUMERIC": (a, b) => direction * a.compareTo(b),',
+ ' "TEXT": (a, b) => direction * ' +
+ 'a.toString().compareTo(b.toString()),',
+ ' "IGNORE_CASE": ',
+ ' (a, b) => direction * ',
+ ' a.toString().toLowerCase().compareTo(b.toString().toLowerCase())',
+ ' };',
+ ' list = new List.from(list);', // Clone the list.
+ ' var compare = compareFuncs[type];',
+ ' list.sort(compare);',
+ ' return list;',
+ '}']);
+ return [sortFunctionName + '(' + list + ', ' +
'"' + type + '", ' + direction + ')',
Blockly.Dart.ORDER_UNARY_POSTFIX];
};
Blockly.Dart['lists_split'] = function(block) {
// Block for splitting text into a list, or joining a list into text.
- var value_input = Blockly.Dart.valueToCode(block, 'INPUT',
+ var input = Blockly.Dart.valueToCode(block, 'INPUT',
Blockly.Dart.ORDER_UNARY_POSTFIX);
- var value_delim = Blockly.Dart.valueToCode(block, 'DELIM',
+ var delimiter = Blockly.Dart.valueToCode(block, 'DELIM',
Blockly.Dart.ORDER_NONE) || '\'\'';
var mode = block.getFieldValue('MODE');
if (mode == 'SPLIT') {
- if (!value_input) {
- value_input = '\'\'';
+ if (!input) {
+ input = '\'\'';
}
var functionName = 'split';
} else if (mode == 'JOIN') {
- if (!value_input) {
- value_input = '[]';
+ if (!input) {
+ input = '[]';
}
var functionName = 'join';
} else {
throw 'Unknown mode: ' + mode;
}
- var code = value_input + '.' + functionName + '(' + value_delim + ')';
+ var code = input + '.' + functionName + '(' + delimiter + ')';
return [code, Blockly.Dart.ORDER_UNARY_POSTFIX];
};
diff --git a/generators/dart/math.js b/generators/dart/math.js
index 2f7c8027a..867822beb 100644
--- a/generators/dart/math.js
+++ b/generators/dart/math.js
@@ -200,25 +200,25 @@ Blockly.Dart['math_number_property'] = function(block) {
'import \'dart:math\' as Math;';
var functionName = Blockly.Dart.provideFunction_(
'math_isPrime',
- [ 'bool ' + Blockly.Dart.FUNCTION_NAME_PLACEHOLDER_ + '(n) {',
- ' // https://en.wikipedia.org/wiki/Primality_test#Naive_methods',
- ' if (n == 2 || n == 3) {',
- ' return true;',
- ' }',
- ' // False if n is null, negative, is 1, or not whole.',
- ' // And false if n is divisible by 2 or 3.',
- ' if (n == null || n <= 1 || n % 1 != 0 || n % 2 == 0 ||' +
+ ['bool ' + Blockly.Dart.FUNCTION_NAME_PLACEHOLDER_ + '(n) {',
+ ' // https://en.wikipedia.org/wiki/Primality_test#Naive_methods',
+ ' if (n == 2 || n == 3) {',
+ ' return true;',
+ ' }',
+ ' // False if n is null, negative, is 1, or not whole.',
+ ' // And false if n is divisible by 2 or 3.',
+ ' if (n == null || n <= 1 || n % 1 != 0 || n % 2 == 0 ||' +
' n % 3 == 0) {',
- ' return false;',
- ' }',
- ' // Check all the numbers of form 6k +/- 1, up to sqrt(n).',
- ' for (var x = 6; x <= Math.sqrt(n) + 1; x += 6) {',
- ' if (n % (x - 1) == 0 || n % (x + 1) == 0) {',
- ' return false;',
- ' }',
- ' }',
- ' return true;',
- '}']);
+ ' return false;',
+ ' }',
+ ' // Check all the numbers of form 6k +/- 1, up to sqrt(n).',
+ ' for (var x = 6; x <= Math.sqrt(n) + 1; x += 6) {',
+ ' if (n % (x - 1) == 0 || n % (x + 1) == 0) {',
+ ' return false;',
+ ' }',
+ ' }',
+ ' return true;',
+ '}']);
code = functionName + '(' + number_to_check + ')';
return [code, Blockly.Dart.ORDER_UNARY_POSTFIX];
}
@@ -275,12 +275,12 @@ Blockly.Dart['math_on_list'] = function(block) {
case 'SUM':
var functionName = Blockly.Dart.provideFunction_(
'math_sum',
- [ 'num ' + Blockly.Dart.FUNCTION_NAME_PLACEHOLDER_ +
+ ['num ' + Blockly.Dart.FUNCTION_NAME_PLACEHOLDER_ +
'(List myList) {',
- ' num sumVal = 0;',
- ' myList.forEach((num entry) {sumVal += entry;});',
- ' return sumVal;',
- '}']);
+ ' num sumVal = 0;',
+ ' myList.forEach((num entry) {sumVal += entry;});',
+ ' return sumVal;',
+ '}']);
code = functionName + '(' + list + ')';
break;
case 'MIN':
@@ -288,14 +288,14 @@ Blockly.Dart['math_on_list'] = function(block) {
'import \'dart:math\' as Math;';
var functionName = Blockly.Dart.provideFunction_(
'math_min',
- [ 'num ' + Blockly.Dart.FUNCTION_NAME_PLACEHOLDER_ +
+ ['num ' + Blockly.Dart.FUNCTION_NAME_PLACEHOLDER_ +
'(List myList) {',
- ' if (myList.isEmpty) return null;',
- ' num minVal = myList[0];',
- ' myList.forEach((num entry) ' +
+ ' if (myList.isEmpty) return null;',
+ ' num minVal = myList[0];',
+ ' myList.forEach((num entry) ' +
'{minVal = Math.min(minVal, entry);});',
- ' return minVal;',
- '}']);
+ ' return minVal;',
+ '}']);
code = functionName + '(' + list + ')';
break;
case 'MAX':
@@ -303,14 +303,14 @@ Blockly.Dart['math_on_list'] = function(block) {
'import \'dart:math\' as Math;';
var functionName = Blockly.Dart.provideFunction_(
'math_max',
- [ 'num ' + Blockly.Dart.FUNCTION_NAME_PLACEHOLDER_ +
+ ['num ' + Blockly.Dart.FUNCTION_NAME_PLACEHOLDER_ +
'(List myList) {',
- ' if (myList.isEmpty) return null;',
- ' num maxVal = myList[0];',
- ' myList.forEach((num entry) ' +
- '{maxVal = Math.max(maxVal, entry);});',
- ' return maxVal;',
- '}']);
+ ' if (myList.isEmpty) return null;',
+ ' num maxVal = myList[0];',
+ ' myList.forEach((num entry) ' +
+ '{maxVal = Math.max(maxVal, entry);});',
+ ' return maxVal;',
+ '}']);
code = functionName + '(' + list + ')';
break;
case 'AVERAGE':
@@ -318,38 +318,38 @@ Blockly.Dart['math_on_list'] = function(block) {
// math_mean([null,null,"aString",1,9]) == 5.0.
var functionName = Blockly.Dart.provideFunction_(
'math_mean',
- [ 'num ' + Blockly.Dart.FUNCTION_NAME_PLACEHOLDER_ +
+ ['num ' + Blockly.Dart.FUNCTION_NAME_PLACEHOLDER_ +
'(List myList) {',
- ' // First filter list for numbers only.',
- ' List localList = new List.from(myList);',
- ' localList.removeMatching((a) => a is! num);',
- ' if (localList.isEmpty) return null;',
- ' num sumVal = 0;',
- ' localList.forEach((num entry) {sumVal += entry;});',
- ' return sumVal / localList.length;',
- '}']);
+ ' // First filter list for numbers only.',
+ ' List localList = new List.from(myList);',
+ ' localList.removeWhere((a) => a is! num);',
+ ' if (localList.isEmpty) return null;',
+ ' num sumVal = 0;',
+ ' localList.forEach((num entry) {sumVal += entry;});',
+ ' return sumVal / localList.length;',
+ '}']);
code = functionName + '(' + list + ')';
break;
case 'MEDIAN':
var functionName = Blockly.Dart.provideFunction_(
'math_median',
- [ 'num ' + Blockly.Dart.FUNCTION_NAME_PLACEHOLDER_ +
+ ['num ' + Blockly.Dart.FUNCTION_NAME_PLACEHOLDER_ +
'(List myList) {',
- ' // First filter list for numbers only, then sort, ' +
+ ' // First filter list for numbers only, then sort, ' +
'then return middle value',
- ' // or the average of two middle values if list has an ' +
+ ' // or the average of two middle values if list has an ' +
'even number of elements.',
- ' List localList = new List.from(myList);',
- ' localList.removeMatching((a) => a is! num);',
- ' if (localList.isEmpty) return null;',
- ' localList.sort((a, b) => (a - b));',
- ' int index = localList.length ~/ 2;',
- ' if (localList.length % 2 == 1) {',
- ' return localList[index];',
- ' } else {',
- ' return (localList[index - 1] + localList[index]) / 2;',
- ' }',
- '}']);
+ ' List localList = new List.from(myList);',
+ ' localList.removeWhere((a) => a is! num);',
+ ' if (localList.isEmpty) return null;',
+ ' localList.sort((a, b) => (a - b));',
+ ' int index = localList.length ~/ 2;',
+ ' if (localList.length % 2 == 1) {',
+ ' return localList[index];',
+ ' } else {',
+ ' return (localList[index - 1] + localList[index]) / 2;',
+ ' }',
+ '}']);
code = functionName + '(' + list + ')';
break;
case 'MODE':
@@ -360,35 +360,35 @@ Blockly.Dart['math_on_list'] = function(block) {
// Mode of [3, 'x', 'x', 1, 1, 2, '3'] -> ['x', 1].
var functionName = Blockly.Dart.provideFunction_(
'math_modes',
- [ 'List ' + Blockly.Dart.FUNCTION_NAME_PLACEHOLDER_ +
+ ['List ' + Blockly.Dart.FUNCTION_NAME_PLACEHOLDER_ +
'(List values) {',
- ' List modes = [];',
- ' List counts = [];',
- ' int maxCount = 0;',
- ' for (int i = 0; i < values.length; i++) {',
- ' var value = values[i];',
- ' bool found = false;',
- ' int thisCount;',
- ' for (int j = 0; j < counts.length; j++) {',
- ' if (counts[j][0] == value) {',
- ' thisCount = ++counts[j][1];',
- ' found = true;',
- ' break;',
- ' }',
- ' }',
- ' if (!found) {',
- ' counts.add([value, 1]);',
- ' thisCount = 1;',
- ' }',
- ' maxCount = Math.max(thisCount, maxCount);',
- ' }',
- ' for (int j = 0; j < counts.length; j++) {',
- ' if (counts[j][1] == maxCount) {',
- ' modes.add(counts[j][0]);',
- ' }',
- ' }',
- ' return modes;',
- '}']);
+ ' List modes = [];',
+ ' List counts = [];',
+ ' int maxCount = 0;',
+ ' for (int i = 0; i < values.length; i++) {',
+ ' var value = values[i];',
+ ' bool found = false;',
+ ' int thisCount;',
+ ' for (int j = 0; j < counts.length; j++) {',
+ ' if (counts[j][0] == value) {',
+ ' thisCount = ++counts[j][1];',
+ ' found = true;',
+ ' break;',
+ ' }',
+ ' }',
+ ' if (!found) {',
+ ' counts.add([value, 1]);',
+ ' thisCount = 1;',
+ ' }',
+ ' maxCount = Math.max(thisCount, maxCount);',
+ ' }',
+ ' for (int j = 0; j < counts.length; j++) {',
+ ' if (counts[j][1] == maxCount) {',
+ ' modes.add(counts[j][0]);',
+ ' }',
+ ' }',
+ ' return modes;',
+ '}']);
code = functionName + '(' + list + ')';
break;
case 'STD_DEV':
@@ -396,21 +396,21 @@ Blockly.Dart['math_on_list'] = function(block) {
'import \'dart:math\' as Math;';
var functionName = Blockly.Dart.provideFunction_(
'math_standard_deviation',
- [ 'num ' + Blockly.Dart.FUNCTION_NAME_PLACEHOLDER_ +
+ ['num ' + Blockly.Dart.FUNCTION_NAME_PLACEHOLDER_ +
'(List myList) {',
- ' // First filter list for numbers only.',
- ' List numbers = new List.from(myList);',
- ' numbers.removeMatching((a) => a is! num);',
- ' if (numbers.isEmpty) return null;',
- ' num n = numbers.length;',
- ' num sum = 0;',
- ' numbers.forEach((x) => sum += x);',
- ' num mean = sum / n;',
- ' num sumSquare = 0;',
- ' numbers.forEach((x) => sumSquare += ' +
- 'Math.pow(x - mean, 2));',
- ' return Math.sqrt(sumSquare / n);',
- '}']);
+ ' // First filter list for numbers only.',
+ ' List numbers = new List.from(myList);',
+ ' numbers.removeWhere((a) => a is! num);',
+ ' if (numbers.isEmpty) return null;',
+ ' num n = numbers.length;',
+ ' num sum = 0;',
+ ' numbers.forEach((x) => sum += x);',
+ ' num mean = sum / n;',
+ ' num sumSquare = 0;',
+ ' numbers.forEach((x) => sumSquare += ' +
+ 'Math.pow(x - mean, 2));',
+ ' return Math.sqrt(sumSquare / n);',
+ '}']);
code = functionName + '(' + list + ')';
break;
case 'RANDOM':
@@ -418,11 +418,11 @@ Blockly.Dart['math_on_list'] = function(block) {
'import \'dart:math\' as Math;';
var functionName = Blockly.Dart.provideFunction_(
'math_random_item',
- [ 'dynamic ' + Blockly.Dart.FUNCTION_NAME_PLACEHOLDER_ +
+ ['dynamic ' + Blockly.Dart.FUNCTION_NAME_PLACEHOLDER_ +
'(List myList) {',
- ' int x = new Math.Random().nextInt(myList.length);',
- ' return myList[x];',
- '}']);
+ ' int x = new Math.Random().nextInt(myList.length);',
+ ' return myList[x];',
+ '}']);
code = functionName + '(' + list + ')';
break;
default:
@@ -466,15 +466,15 @@ Blockly.Dart['math_random_int'] = function(block) {
Blockly.Dart.ORDER_NONE) || '0';
var functionName = Blockly.Dart.provideFunction_(
'math_random_int',
- [ 'int ' + Blockly.Dart.FUNCTION_NAME_PLACEHOLDER_ + '(num a, num b) {',
- ' if (a > b) {',
- ' // Swap a and b to ensure a is smaller.',
- ' num c = a;',
- ' a = b;',
- ' b = c;',
- ' }',
- ' return new Math.Random().nextInt(b - a + 1) + a;',
- '}']);
+ ['int ' + Blockly.Dart.FUNCTION_NAME_PLACEHOLDER_ + '(num a, num b) {',
+ ' if (a > b) {',
+ ' // Swap a and b to ensure a is smaller.',
+ ' num c = a;',
+ ' a = b;',
+ ' b = c;',
+ ' }',
+ ' return new Math.Random().nextInt(b - a + 1) + a;',
+ '}']);
var code = functionName + '(' + argument0 + ', ' + argument1 + ')';
return [code, Blockly.Dart.ORDER_UNARY_POSTFIX];
};
diff --git a/generators/dart/procedures.js b/generators/dart/procedures.js
index 0085c6bf6..ad2550cc7 100644
--- a/generators/dart/procedures.js
+++ b/generators/dart/procedures.js
@@ -50,8 +50,8 @@ Blockly.Dart['procedures_defreturn'] = function(block) {
}
var returnType = returnValue ? 'dynamic' : 'void';
var args = [];
- for (var x = 0; x < block.arguments_.length; x++) {
- args[x] = Blockly.Dart.variableDB_.getName(block.arguments_[x],
+ for (var i = 0; i < block.arguments_.length; i++) {
+ args[i] = Blockly.Dart.variableDB_.getName(block.arguments_[i],
Blockly.Variables.NAME_TYPE);
}
var code = returnType + ' ' + funcName + '(' + args.join(', ') + ') {\n' +
@@ -71,8 +71,8 @@ Blockly.Dart['procedures_callreturn'] = function(block) {
var funcName = Blockly.Dart.variableDB_.getName(block.getFieldValue('NAME'),
Blockly.Procedures.NAME_TYPE);
var args = [];
- for (var x = 0; x < block.arguments_.length; x++) {
- args[x] = Blockly.Dart.valueToCode(block, 'ARG' + x,
+ for (var i = 0; i < block.arguments_.length; i++) {
+ args[i] = Blockly.Dart.valueToCode(block, 'ARG' + i,
Blockly.Dart.ORDER_NONE) || 'null';
}
var code = funcName + '(' + args.join(', ') + ')';
@@ -84,8 +84,8 @@ Blockly.Dart['procedures_callnoreturn'] = function(block) {
var funcName = Blockly.Dart.variableDB_.getName(block.getFieldValue('NAME'),
Blockly.Procedures.NAME_TYPE);
var args = [];
- for (var x = 0; x < block.arguments_.length; x++) {
- args[x] = Blockly.Dart.valueToCode(block, 'ARG' + x,
+ for (var i = 0; i < block.arguments_.length; i++) {
+ args[i] = Blockly.Dart.valueToCode(block, 'ARG' + i,
Blockly.Dart.ORDER_NONE) || 'null';
}
var code = funcName + '(' + args.join(', ') + ');\n';
diff --git a/generators/dart/text.js b/generators/dart/text.js
index ba5a75cb0..5cdbb03ec 100644
--- a/generators/dart/text.js
+++ b/generators/dart/text.js
@@ -39,22 +39,22 @@ Blockly.Dart['text'] = function(block) {
Blockly.Dart['text_join'] = function(block) {
// Create a string made up of any number of elements of any type.
- var code;
- if (block.itemCount_ == 0) {
- return ['\'\'', Blockly.Dart.ORDER_ATOMIC];
- } else if (block.itemCount_ == 1) {
- var argument0 = Blockly.Dart.valueToCode(block, 'ADD0',
- Blockly.Dart.ORDER_UNARY_POSTFIX) || '\'\'';
- code = argument0 + '.toString()';
- return [code, Blockly.Dart.ORDER_UNARY_POSTFIX];
- } else {
- code = new Array(block.itemCount_);
- for (var n = 0; n < block.itemCount_; n++) {
- code[n] = Blockly.Dart.valueToCode(block, 'ADD' + n,
- Blockly.Dart.ORDER_NONE) || '\'\'';
- }
- code = '[' + code.join(',') + '].join()';
- return [code, Blockly.Dart.ORDER_UNARY_POSTFIX];
+ switch (block.itemCount_) {
+ case 0:
+ return ['\'\'', Blockly.Dart.ORDER_ATOMIC];
+ case 1:
+ var element = Blockly.Dart.valueToCode(block, 'ADD0',
+ Blockly.Dart.ORDER_UNARY_POSTFIX) || '\'\'';
+ var code = element + '.toString()';
+ return [code, Blockly.Dart.ORDER_UNARY_POSTFIX];
+ default:
+ var elements = new Array(block.itemCount_);
+ for (var i = 0; i < block.itemCount_; i++) {
+ elements[i] = Blockly.Dart.valueToCode(block, 'ADD' + i,
+ Blockly.Dart.ORDER_NONE) || '\'\'';
+ }
+ var code = '[' + elements.join(',') + '].join()';
+ return [code, Blockly.Dart.ORDER_UNARY_POSTFIX];
}
};
@@ -62,43 +62,44 @@ Blockly.Dart['text_append'] = function(block) {
// Append to a variable in place.
var varName = Blockly.Dart.variableDB_.getName(block.getFieldValue('VAR'),
Blockly.Variables.NAME_TYPE);
- var argument0 = Blockly.Dart.valueToCode(block, 'TEXT',
- Blockly.Dart.ORDER_UNARY_POSTFIX) || '\'\'';
- return varName + ' = [' + varName + ', ' + argument0 + '].join();\n';
+ var value = Blockly.Dart.valueToCode(block, 'TEXT',
+ Blockly.Dart.ORDER_NONE) || '\'\'';
+ return varName + ' = [' + varName + ', ' + value + '].join();\n';
};
Blockly.Dart['text_length'] = function(block) {
// String or array length.
- var argument0 = Blockly.Dart.valueToCode(block, 'VALUE',
+ var text = Blockly.Dart.valueToCode(block, 'VALUE',
Blockly.Dart.ORDER_UNARY_POSTFIX) || '\'\'';
- return [argument0 + '.length', Blockly.Dart.ORDER_UNARY_POSTFIX];
+ return [text + '.length', Blockly.Dart.ORDER_UNARY_POSTFIX];
};
Blockly.Dart['text_isEmpty'] = function(block) {
// Is the string null or array empty?
- var argument0 = Blockly.Dart.valueToCode(block, 'VALUE',
+ var text = Blockly.Dart.valueToCode(block, 'VALUE',
Blockly.Dart.ORDER_UNARY_POSTFIX) || '\'\'';
- return [argument0 + '.isEmpty', Blockly.Dart.ORDER_UNARY_POSTFIX];
+ return [text + '.isEmpty', Blockly.Dart.ORDER_UNARY_POSTFIX];
};
Blockly.Dart['text_indexOf'] = function(block) {
// Search the text for a substring.
var operator = block.getFieldValue('END') == 'FIRST' ?
'indexOf' : 'lastIndexOf';
- var argument0 = Blockly.Dart.valueToCode(block, 'FIND',
+ var substring = Blockly.Dart.valueToCode(block, 'FIND',
Blockly.Dart.ORDER_NONE) || '\'\'';
- var argument1 = Blockly.Dart.valueToCode(block, 'VALUE',
+ var text = Blockly.Dart.valueToCode(block, 'VALUE',
Blockly.Dart.ORDER_UNARY_POSTFIX) || '\'\'';
- var code = argument1 + '.' + operator + '(' + argument0 + ') + 1';
- return [code, Blockly.Dart.ORDER_ADDITIVE];
+ var code = text + '.' + operator + '(' + substring + ')';
+ if (Blockly.Dart.ONE_BASED_INDEXING) {
+ return [code + ' + 1', Blockly.Dart.ORDER_ADDITIVE];
+ }
+ return [code, Blockly.Dart.ORDER_UNARY_POSTFIX];
};
Blockly.Dart['text_charAt'] = function(block) {
// Get letter at index.
// Note: Until January 2013 this block did not have the WHERE input.
var where = block.getFieldValue('WHERE') || 'FROM_START';
- var at = Blockly.Dart.valueToCode(block, 'AT',
- Blockly.Dart.ORDER_NONE) || '1';
var text = Blockly.Dart.valueToCode(block, 'VALUE',
Blockly.Dart.ORDER_UNARY_POSTFIX) || '\'\'';
switch (where) {
@@ -106,26 +107,20 @@ Blockly.Dart['text_charAt'] = function(block) {
var code = text + '[0]';
return [code, Blockly.Dart.ORDER_UNARY_POSTFIX];
case 'FROM_START':
- // Blockly uses one-based indicies.
- if (at.match(/^-?\d+$/)) {
- // If the index is a naked number, decrement it right now.
- at = parseInt(at, 10) - 1;
- } else {
- // If the index is dynamic, decrement it in code.
- at += ' - 1';
- }
+ var at = Blockly.Dart.getAdjusted(block, 'AT');
var code = text + '[' + at + ']';
return [code, Blockly.Dart.ORDER_UNARY_POSTFIX];
case 'LAST':
at = 1;
// Fall through.
case 'FROM_END':
+ var at = Blockly.Dart.getAdjusted(block, 'AT', 1);
var functionName = Blockly.Dart.provideFunction_(
'text_get_from_end',
- [ 'String ' + Blockly.Dart.FUNCTION_NAME_PLACEHOLDER_ +
+ ['String ' + Blockly.Dart.FUNCTION_NAME_PLACEHOLDER_ +
'(String text, num x) {',
- ' return text[text.length - x];',
- '}']);
+ ' return text[text.length - x];',
+ '}']);
code = functionName + '(' + text + ', ' + at + ')';
return [code, Blockly.Dart.ORDER_UNARY_POSTFIX];
case 'RANDOM':
@@ -133,11 +128,11 @@ Blockly.Dart['text_charAt'] = function(block) {
'import \'dart:math\' as Math;';
var functionName = Blockly.Dart.provideFunction_(
'text_random_letter',
- [ 'String ' + Blockly.Dart.FUNCTION_NAME_PLACEHOLDER_ +
+ ['String ' + Blockly.Dart.FUNCTION_NAME_PLACEHOLDER_ +
'(String text) {',
- ' int x = new Math.Random().nextInt(text.length);',
- ' return text[x];',
- '}']);
+ ' int x = new Math.Random().nextInt(text.length);',
+ ' return text[x];',
+ '}']);
code = functionName + '(' + text + ')';
return [code, Blockly.Dart.ORDER_UNARY_POSTFIX];
}
@@ -150,35 +145,69 @@ Blockly.Dart['text_getSubstring'] = function(block) {
Blockly.Dart.ORDER_UNARY_POSTFIX) || '\'\'';
var where1 = block.getFieldValue('WHERE1');
var where2 = block.getFieldValue('WHERE2');
- var at1 = Blockly.Dart.valueToCode(block, 'AT1',
- Blockly.Dart.ORDER_NONE) || '1';
- var at2 = Blockly.Dart.valueToCode(block, 'AT2',
- Blockly.Dart.ORDER_NONE) || '1';
if (where1 == 'FIRST' && where2 == 'LAST') {
var code = text;
+ } else if (text.match(/^'?\w+'?$/) ||
+ (where1 != 'FROM_END' && where2 == 'FROM_START')) {
+ // If the text is a variable or literal or doesn't require a call for
+ // length, don't generate a helper function.
+ switch (where1) {
+ case 'FROM_START':
+ var at1 = Blockly.Dart.getAdjusted(block, 'AT1');
+ break;
+ case 'FROM_END':
+ var at1 = Blockly.Dart.getAdjusted(block, 'AT1', 1, false,
+ Blockly.Dart.ORDER_ADDITIVE);
+ at1 = text + '.length - ' + at1;
+ break;
+ case 'FIRST':
+ var at1 = '0';
+ break;
+ default:
+ throw 'Unhandled option (text_getSubstring).';
+ }
+ switch (where2) {
+ case 'FROM_START':
+ var at2 = Blockly.Dart.getAdjusted(block, 'AT2', 1);
+ break;
+ case 'FROM_END':
+ var at2 = Blockly.Dart.getAdjusted(block, 'AT2', 0, false,
+ Blockly.Dart.ORDER_ADDITIVE);
+ at2 = text + '.length - ' + at2;
+ break;
+ case 'LAST':
+ break;
+ default:
+ throw 'Unhandled option (text_getSubstring).';
+ }
+ if (where2 == 'LAST') {
+ var code = text + '.substring(' + at1 + ')';
+ } else {
+ var code = text + '.substring(' + at1 + ', ' + at2 + ')';
+ }
} else {
+ var at1 = Blockly.Dart.getAdjusted(block, 'AT1');
+ var at2 = Blockly.Dart.getAdjusted(block, 'AT2');
var functionName = Blockly.Dart.provideFunction_(
'text_get_substring',
- [ 'function ' + Blockly.Dart.FUNCTION_NAME_PLACEHOLDER_ +
+ ['List ' + Blockly.Dart.FUNCTION_NAME_PLACEHOLDER_ +
'(text, where1, at1, where2, at2) {',
- ' function getAt(where, at) {',
- ' if (where == \'FROM_START\') {',
- ' at--;',
- ' } else if (where == \'FROM_END\') {',
- ' at = text.length - at;',
- ' } else if (where == \'FIRST\') {',
- ' at = 0;',
- ' } else if (where == \'LAST\') {',
- ' at = text.length - 1;',
- ' } else {',
- ' throw \'Unhandled option (text_getSubstring).\';',
- ' }',
- ' return at;',
- ' }',
- ' at1 = getAt(where1, at1);',
- ' at2 = getAt(where2, at2) + 1;',
- ' return text.substring(at1, at2);',
- '}']);
+ ' int getAt(where, at) {',
+ ' if (where == \'FROM_END\') {',
+ ' at = text.length - 1 - at;',
+ ' } else if (where == \'FIRST\') {',
+ ' at = 0;',
+ ' } else if (where == \'LAST\') {',
+ ' at = text.length - 1;',
+ ' } else if (where != \'FROM_START\') {',
+ ' throw \'Unhandled option (text_getSubstring).\';',
+ ' }',
+ ' return at;',
+ ' }',
+ ' at1 = getAt(where1, at1);',
+ ' at2 = getAt(where2, at2) + 1;',
+ ' return text.substring(at1, at2);',
+ '}']);
var code = functionName + '(' + text + ', \'' +
where1 + '\', ' + at1 + ', \'' + where2 + '\', ' + at2 + ')';
}
@@ -193,34 +222,32 @@ Blockly.Dart['text_changeCase'] = function(block) {
'TITLECASE': null
};
var operator = OPERATORS[block.getFieldValue('CASE')];
- var code;
+ var textOrder = operator ? Blockly.Dart.ORDER_UNARY_POSTFIX :
+ Blockly.Dart.ORDER_NONE;
+ var text = Blockly.Dart.valueToCode(block, 'TEXT', textOrder) || '\'\'';
if (operator) {
// Upper and lower case are functions built into Dart.
- var argument0 = Blockly.Dart.valueToCode(block, 'TEXT',
- Blockly.Dart.ORDER_UNARY_POSTFIX) || '\'\'';
- code = argument0 + operator;
+ var code = text + operator;
} else {
// Title case is not a native Dart function. Define one.
var functionName = Blockly.Dart.provideFunction_(
'text_toTitleCase',
- [ 'String ' + Blockly.Dart.FUNCTION_NAME_PLACEHOLDER_ +
+ ['String ' + Blockly.Dart.FUNCTION_NAME_PLACEHOLDER_ +
'(String str) {',
- ' RegExp exp = new RegExp(r\'\\b\');',
- ' List list = str.split(exp);',
- ' final title = new StringBuffer();',
- ' for (String part in list) {',
- ' if (part.length > 0) {',
- ' title.write(part[0].toUpperCase());',
- ' if (part.length > 0) {',
- ' title.write(part.substring(1).toLowerCase());',
- ' }',
- ' }',
- ' }',
- ' return title.toString();',
- '}']);
- var argument0 = Blockly.Dart.valueToCode(block, 'TEXT',
- Blockly.Dart.ORDER_NONE) || '\'\'';
- code = functionName + '(' + argument0 + ')';
+ ' RegExp exp = new RegExp(r\'\\b\');',
+ ' List list = str.split(exp);',
+ ' final title = new StringBuffer();',
+ ' for (String part in list) {',
+ ' if (part.length > 0) {',
+ ' title.write(part[0].toUpperCase());',
+ ' if (part.length > 0) {',
+ ' title.write(part.substring(1).toLowerCase());',
+ ' }',
+ ' }',
+ ' }',
+ ' return title.toString();',
+ '}']);
+ var code = functionName + '(' + text + ')';
}
return [code, Blockly.Dart.ORDER_UNARY_POSTFIX];
};
@@ -233,16 +260,16 @@ Blockly.Dart['text_trim'] = function(block) {
'BOTH': '.trim()'
};
var operator = OPERATORS[block.getFieldValue('MODE')];
- var argument0 = Blockly.Dart.valueToCode(block, 'TEXT',
+ var text = Blockly.Dart.valueToCode(block, 'TEXT',
Blockly.Dart.ORDER_UNARY_POSTFIX) || '\'\'';
- return [argument0 + operator, Blockly.Dart.ORDER_UNARY_POSTFIX];
+ return [text + operator, Blockly.Dart.ORDER_UNARY_POSTFIX];
};
Blockly.Dart['text_print'] = function(block) {
// Print statement.
- var argument0 = Blockly.Dart.valueToCode(block, 'TEXT',
+ var msg = Blockly.Dart.valueToCode(block, 'TEXT',
Blockly.Dart.ORDER_NONE) || '\'\'';
- return 'print(' + argument0 + ');\n';
+ return 'print(' + msg + ');\n';
};
Blockly.Dart['text_prompt_ext'] = function(block) {
diff --git a/generators/javascript.js b/generators/javascript.js
index ff50db982..a1043abe8 100644
--- a/generators/javascript.js
+++ b/generators/javascript.js
@@ -135,8 +135,8 @@ Blockly.JavaScript.ORDER_OVERRIDES = [
];
/**
- * Allow for switching between one and zero based indexing, one based by
- * default.
+ * Allow for switching between one and zero based indexing for lists and text,
+ * one based by default.
*/
Blockly.JavaScript.ONE_BASED_INDEXING = true;
@@ -229,7 +229,7 @@ Blockly.JavaScript.scrub_ = function(block, code) {
if (!block.outputConnection || !block.outputConnection.targetConnection) {
// Collect comment for this block.
var comment = block.getCommentText();
- comment = Blockly.utils.wrap(comment, this.COMMENT_WRAP - 3);
+ comment = Blockly.utils.wrap(comment, Blockly.JavaScript.COMMENT_WRAP - 3);
if (comment) {
if (block.getProcedureDef) {
// Use a comment block for function comments.
@@ -258,3 +258,66 @@ Blockly.JavaScript.scrub_ = function(block, code) {
var nextCode = Blockly.JavaScript.blockToCode(nextBlock);
return commentCode + code + nextCode;
};
+
+/**
+ * Gets a property and adjusts the value while taking into account indexing.
+ * @param {!Blockly.Block} block The block.
+ * @param {string} atId The property ID of the element to get.
+ * @param {number=} opt_delta Value to add.
+ * @param {boolean=} opt_negate Whether to negate the value.
+ * @param {number=} opt_order The highest order acting on this value.
+ * @return {string|number}
+ */
+Blockly.JavaScript.getAdjusted = function(block, atId, opt_delta, opt_negate,
+ opt_order) {
+ var delta = opt_delta || 0;
+ var order = opt_order || Blockly.JavaScript.ORDER_NONE;
+ if (Blockly.JavaScript.ONE_BASED_INDEXING) {
+ delta--;
+ }
+ var defaultAtIndex = Blockly.JavaScript.ONE_BASED_INDEXING ? '1' : '0';
+ if (delta > 0) {
+ var at = Blockly.JavaScript.valueToCode(block, atId,
+ Blockly.JavaScript.ORDER_ADDITION) || defaultAtIndex;
+ } else if (delta < 0) {
+ var at = Blockly.JavaScript.valueToCode(block, atId,
+ Blockly.JavaScript.ORDER_SUBTRACTION) || defaultAtIndex;
+ } else if (opt_negate) {
+ var at = Blockly.JavaScript.valueToCode(block, atId,
+ Blockly.JavaScript.ORDER_UNARY_NEGATION) || defaultAtIndex;
+ } else {
+ var at = Blockly.JavaScript.valueToCode(block, atId, order) ||
+ defaultAtIndex;
+ }
+
+ if (Blockly.isNumber(at)) {
+ // If the index is a naked number, adjust it right now.
+ at = parseFloat(at) + delta;
+ if (opt_negate) {
+ at = -at;
+ }
+ } else {
+ // If the index is dynamic, adjust it in code.
+ if (delta > 0) {
+ at = at + ' + ' + delta;
+ var innerOrder = Blockly.JavaScript.ORDER_ADDITION;
+ } else if (delta < 0) {
+ at = at + ' - ' + -delta;
+ var innerOrder = Blockly.JavaScript.ORDER_SUBTRACTION;
+ }
+ if (opt_negate) {
+ if (delta) {
+ at = '-(' + at + ')';
+ } else {
+ at = '-' + at;
+ }
+ var innerOrder = Blockly.JavaScript.ORDER_UNARY_NEGATION;
+ }
+ innerOrder = Math.floor(innerOrder);
+ order = Math.floor(order);
+ if (innerOrder && order >= innerOrder) {
+ at = '(' + at + ')';
+ }
+ }
+ return at;
+};
diff --git a/generators/javascript/colour.js b/generators/javascript/colour.js
index b8e290360..21b372e9c 100644
--- a/generators/javascript/colour.js
+++ b/generators/javascript/colour.js
@@ -39,7 +39,7 @@ Blockly.JavaScript['colour_random'] = function(block) {
// Generate a random colour.
var functionName = Blockly.JavaScript.provideFunction_(
'colourRandom',
- [ 'function ' + Blockly.JavaScript.FUNCTION_NAME_PLACEHOLDER_ + '() {',
+ ['function ' + Blockly.JavaScript.FUNCTION_NAME_PLACEHOLDER_ + '() {',
' var num = Math.floor(Math.random() * Math.pow(2, 24));',
' return \'#\' + (\'00000\' + num.toString(16)).substr(-6);',
'}']);
@@ -57,16 +57,16 @@ Blockly.JavaScript['colour_rgb'] = function(block) {
Blockly.JavaScript.ORDER_COMMA) || 0;
var functionName = Blockly.JavaScript.provideFunction_(
'colourRgb',
- [ 'function ' + Blockly.JavaScript.FUNCTION_NAME_PLACEHOLDER_ +
+ ['function ' + Blockly.JavaScript.FUNCTION_NAME_PLACEHOLDER_ +
'(r, g, b) {',
- ' r = Math.max(Math.min(Number(r), 100), 0) * 2.55;',
- ' g = Math.max(Math.min(Number(g), 100), 0) * 2.55;',
- ' b = Math.max(Math.min(Number(b), 100), 0) * 2.55;',
- ' r = (\'0\' + (Math.round(r) || 0).toString(16)).slice(-2);',
- ' g = (\'0\' + (Math.round(g) || 0).toString(16)).slice(-2);',
- ' b = (\'0\' + (Math.round(b) || 0).toString(16)).slice(-2);',
- ' return \'#\' + r + g + b;',
- '}']);
+ ' r = Math.max(Math.min(Number(r), 100), 0) * 2.55;',
+ ' g = Math.max(Math.min(Number(g), 100), 0) * 2.55;',
+ ' b = Math.max(Math.min(Number(b), 100), 0) * 2.55;',
+ ' r = (\'0\' + (Math.round(r) || 0).toString(16)).slice(-2);',
+ ' g = (\'0\' + (Math.round(g) || 0).toString(16)).slice(-2);',
+ ' b = (\'0\' + (Math.round(b) || 0).toString(16)).slice(-2);',
+ ' return \'#\' + r + g + b;',
+ '}']);
var code = functionName + '(' + red + ', ' + green + ', ' + blue + ')';
return [code, Blockly.JavaScript.ORDER_FUNCTION_CALL];
};
@@ -81,23 +81,23 @@ Blockly.JavaScript['colour_blend'] = function(block) {
Blockly.JavaScript.ORDER_COMMA) || 0.5;
var functionName = Blockly.JavaScript.provideFunction_(
'colourBlend',
- [ 'function ' + Blockly.JavaScript.FUNCTION_NAME_PLACEHOLDER_ +
+ ['function ' + Blockly.JavaScript.FUNCTION_NAME_PLACEHOLDER_ +
'(c1, c2, ratio) {',
- ' ratio = Math.max(Math.min(Number(ratio), 1), 0);',
- ' var r1 = parseInt(c1.substring(1, 3), 16);',
- ' var g1 = parseInt(c1.substring(3, 5), 16);',
- ' var b1 = parseInt(c1.substring(5, 7), 16);',
- ' var r2 = parseInt(c2.substring(1, 3), 16);',
- ' var g2 = parseInt(c2.substring(3, 5), 16);',
- ' var b2 = parseInt(c2.substring(5, 7), 16);',
- ' var r = Math.round(r1 * (1 - ratio) + r2 * ratio);',
- ' var g = Math.round(g1 * (1 - ratio) + g2 * ratio);',
- ' var b = Math.round(b1 * (1 - ratio) + b2 * ratio);',
- ' r = (\'0\' + (r || 0).toString(16)).slice(-2);',
- ' g = (\'0\' + (g || 0).toString(16)).slice(-2);',
- ' b = (\'0\' + (b || 0).toString(16)).slice(-2);',
- ' return \'#\' + r + g + b;',
- '}']);
+ ' ratio = Math.max(Math.min(Number(ratio), 1), 0);',
+ ' var r1 = parseInt(c1.substring(1, 3), 16);',
+ ' var g1 = parseInt(c1.substring(3, 5), 16);',
+ ' var b1 = parseInt(c1.substring(5, 7), 16);',
+ ' var r2 = parseInt(c2.substring(1, 3), 16);',
+ ' var g2 = parseInt(c2.substring(3, 5), 16);',
+ ' var b2 = parseInt(c2.substring(5, 7), 16);',
+ ' var r = Math.round(r1 * (1 - ratio) + r2 * ratio);',
+ ' var g = Math.round(g1 * (1 - ratio) + g2 * ratio);',
+ ' var b = Math.round(b1 * (1 - ratio) + b2 * ratio);',
+ ' r = (\'0\' + (r || 0).toString(16)).slice(-2);',
+ ' g = (\'0\' + (g || 0).toString(16)).slice(-2);',
+ ' b = (\'0\' + (b || 0).toString(16)).slice(-2);',
+ ' return \'#\' + r + g + b;',
+ '}']);
var code = functionName + '(' + c1 + ', ' + c2 + ', ' + ratio + ')';
return [code, Blockly.JavaScript.ORDER_FUNCTION_CALL];
};
diff --git a/generators/javascript/lists.js b/generators/javascript/lists.js
index 4bb6aac20..d1e66a0ed 100644
--- a/generators/javascript/lists.js
+++ b/generators/javascript/lists.js
@@ -36,12 +36,12 @@ Blockly.JavaScript['lists_create_empty'] = function(block) {
Blockly.JavaScript['lists_create_with'] = function(block) {
// Create a list with any number of elements of any type.
- var code = new Array(block.itemCount_);
- for (var n = 0; n < block.itemCount_; n++) {
- code[n] = Blockly.JavaScript.valueToCode(block, 'ADD' + n,
+ var elements = new Array(block.itemCount_);
+ for (var i = 0; i < block.itemCount_; i++) {
+ elements[i] = Blockly.JavaScript.valueToCode(block, 'ADD' + i,
Blockly.JavaScript.ORDER_COMMA) || 'null';
}
- code = '[' + code.join(', ') + ']';
+ var code = '[' + elements.join(', ') + ']';
return [code, Blockly.JavaScript.ORDER_ATOMIC];
};
@@ -49,46 +49,49 @@ Blockly.JavaScript['lists_repeat'] = function(block) {
// Create a list with one element repeated.
var functionName = Blockly.JavaScript.provideFunction_(
'listsRepeat',
- [ 'function ' + Blockly.JavaScript.FUNCTION_NAME_PLACEHOLDER_ +
+ ['function ' + Blockly.JavaScript.FUNCTION_NAME_PLACEHOLDER_ +
'(value, n) {',
- ' var array = [];',
- ' for (var i = 0; i < n; i++) {',
- ' array[i] = value;',
- ' }',
- ' return array;',
- '}']);
- var argument0 = Blockly.JavaScript.valueToCode(block, 'ITEM',
+ ' var array = [];',
+ ' for (var i = 0; i < n; i++) {',
+ ' array[i] = value;',
+ ' }',
+ ' return array;',
+ '}']);
+ var element = Blockly.JavaScript.valueToCode(block, 'ITEM',
Blockly.JavaScript.ORDER_COMMA) || 'null';
- var argument1 = Blockly.JavaScript.valueToCode(block, 'NUM',
+ var repeatCount = Blockly.JavaScript.valueToCode(block, 'NUM',
Blockly.JavaScript.ORDER_COMMA) || '0';
- var code = functionName + '(' + argument0 + ', ' + argument1 + ')';
+ var code = functionName + '(' + element + ', ' + repeatCount + ')';
return [code, Blockly.JavaScript.ORDER_FUNCTION_CALL];
};
Blockly.JavaScript['lists_length'] = function(block) {
// String or array length.
- var argument0 = Blockly.JavaScript.valueToCode(block, 'VALUE',
- Blockly.JavaScript.ORDER_FUNCTION_CALL) || '[]';
- return [argument0 + '.length', Blockly.JavaScript.ORDER_MEMBER];
+ var list = Blockly.JavaScript.valueToCode(block, 'VALUE',
+ Blockly.JavaScript.ORDER_MEMBER) || '[]';
+ return [list + '.length', Blockly.JavaScript.ORDER_MEMBER];
};
Blockly.JavaScript['lists_isEmpty'] = function(block) {
// Is the string null or array empty?
- var argument0 = Blockly.JavaScript.valueToCode(block, 'VALUE',
+ var list = Blockly.JavaScript.valueToCode(block, 'VALUE',
Blockly.JavaScript.ORDER_MEMBER) || '[]';
- return ['!' + argument0 + '.length', Blockly.JavaScript.ORDER_LOGICAL_NOT];
+ return ['!' + list + '.length', Blockly.JavaScript.ORDER_LOGICAL_NOT];
};
Blockly.JavaScript['lists_indexOf'] = function(block) {
// Find an item in the list.
var operator = block.getFieldValue('END') == 'FIRST' ?
'indexOf' : 'lastIndexOf';
- var argument0 = Blockly.JavaScript.valueToCode(block, 'FIND',
+ var item = Blockly.JavaScript.valueToCode(block, 'FIND',
Blockly.JavaScript.ORDER_NONE) || '\'\'';
- var argument1 = Blockly.JavaScript.valueToCode(block, 'VALUE',
+ var list = Blockly.JavaScript.valueToCode(block, 'VALUE',
Blockly.JavaScript.ORDER_MEMBER) || '[]';
- var code = argument1 + '.' + operator + '(' + argument0 + ') + 1';
- return [code, Blockly.JavaScript.ORDER_ADDITION];
+ var code = list + '.' + operator + '(' + item + ')';
+ if (Blockly.JavaScript.ONE_BASED_INDEXING) {
+ return [code + ' + 1', Blockly.JavaScript.ORDER_ADDITION];
+ }
+ return [code, Blockly.JavaScript.ORDER_FUNCTION_CALL];
};
Blockly.JavaScript['lists_getIndex'] = function(block) {
@@ -96,86 +99,76 @@ Blockly.JavaScript['lists_getIndex'] = function(block) {
// Note: Until January 2013 this block did not have MODE or WHERE inputs.
var mode = block.getFieldValue('MODE') || 'GET';
var where = block.getFieldValue('WHERE') || 'FROM_START';
- var at = Blockly.JavaScript.valueToCode(block, 'AT',
- Blockly.JavaScript.ORDER_UNARY_NEGATION) || '1';
- var list = Blockly.JavaScript.valueToCode(block, 'VALUE',
- Blockly.JavaScript.ORDER_MEMBER) || '[]';
+ var listOrder = (where == 'RANDOM') ? Blockly.JavaScript.ORDER_COMMA :
+ Blockly.JavaScript.ORDER_MEMBER;
+ var list = Blockly.JavaScript.valueToCode(block, 'VALUE', listOrder) || '[]';
- if (where == 'FIRST') {
- if (mode == 'GET') {
- var code = list + '[0]';
- return [code, Blockly.JavaScript.ORDER_MEMBER];
- } else if (mode == 'GET_REMOVE') {
- var code = list + '.shift()';
- return [code, Blockly.JavaScript.ORDER_MEMBER];
- } else if (mode == 'REMOVE') {
- return list + '.shift();\n';
- }
- } else if (where == 'LAST') {
- if (mode == 'GET') {
- var code = list + '.slice(-1)[0]';
- return [code, Blockly.JavaScript.ORDER_MEMBER];
- } else if (mode == 'GET_REMOVE') {
- var code = list + '.pop()';
- return [code, Blockly.JavaScript.ORDER_MEMBER];
- } else if (mode == 'REMOVE') {
- return list + '.pop();\n';
- }
- } else if (where == 'FROM_START') {
- // Blockly uses one-based indicies.
- if (Blockly.isNumber(at)) {
- // If the index is a naked number, decrement it right now.
- at = parseFloat(at) - 1;
- } else {
- // If the index is dynamic, decrement it in code.
- at += ' - 1';
- }
- if (mode == 'GET') {
- var code = list + '[' + at + ']';
- return [code, Blockly.JavaScript.ORDER_MEMBER];
- } else if (mode == 'GET_REMOVE') {
- var code = list + '.splice(' + at + ', 1)[0]';
- return [code, Blockly.JavaScript.ORDER_FUNCTION_CALL];
- } else if (mode == 'REMOVE') {
- return list + '.splice(' + at + ', 1);\n';
- }
- } else if (where == 'FROM_END') {
- if (mode == 'GET') {
- var code = list + '.slice(-' + at + ')[0]';
- return [code, Blockly.JavaScript.ORDER_FUNCTION_CALL];
- } else if (mode == 'GET_REMOVE' || mode == 'REMOVE') {
+ switch (where) {
+ case ('FIRST'):
+ if (mode == 'GET') {
+ var code = list + '[0]';
+ return [code, Blockly.JavaScript.ORDER_MEMBER];
+ } else if (mode == 'GET_REMOVE') {
+ var code = list + '.shift()';
+ return [code, Blockly.JavaScript.ORDER_MEMBER];
+ } else if (mode == 'REMOVE') {
+ return list + '.shift();\n';
+ }
+ break;
+ case ('LAST'):
+ if (mode == 'GET') {
+ var code = list + '.slice(-1)[0]';
+ return [code, Blockly.JavaScript.ORDER_MEMBER];
+ } else if (mode == 'GET_REMOVE') {
+ var code = list + '.pop()';
+ return [code, Blockly.JavaScript.ORDER_MEMBER];
+ } else if (mode == 'REMOVE') {
+ return list + '.pop();\n';
+ }
+ break;
+ case ('FROM_START'):
+ var at = Blockly.JavaScript.getAdjusted(block, 'AT');
+ if (mode == 'GET') {
+ var code = list + '[' + at + ']';
+ return [code, Blockly.JavaScript.ORDER_MEMBER];
+ } else if (mode == 'GET_REMOVE') {
+ var code = list + '.splice(' + at + ', 1)[0]';
+ return [code, Blockly.JavaScript.ORDER_FUNCTION_CALL];
+ } else if (mode == 'REMOVE') {
+ return list + '.splice(' + at + ', 1);\n';
+ }
+ break;
+ case ('FROM_END'):
+ var at = Blockly.JavaScript.getAdjusted(block, 'AT', 1, true);
+ if (mode == 'GET') {
+ var code = list + '.slice(' + at + ')[0]';
+ return [code, Blockly.JavaScript.ORDER_FUNCTION_CALL];
+ } else if (mode == 'GET_REMOVE') {
+ var code = list + '.splice(' + at + ', 1)[0]';
+ return [code, Blockly.JavaScript.ORDER_FUNCTION_CALL];
+ } else if (mode == 'REMOVE') {
+ return list + '.splice(' + at + ', 1);';
+ }
+ break;
+ case ('RANDOM'):
var functionName = Blockly.JavaScript.provideFunction_(
- 'listsRemoveFromEnd',
- [ 'function ' + Blockly.JavaScript.FUNCTION_NAME_PLACEHOLDER_ +
- '(list, x) {',
- ' x = list.length - x;',
- ' return list.splice(x, 1)[0];',
- '}']);
- code = functionName + '(' + list + ', ' + at + ')';
- if (mode == 'GET_REMOVE') {
+ 'listsGetRandomItem',
+ ['function ' + Blockly.JavaScript.FUNCTION_NAME_PLACEHOLDER_ +
+ '(list, remove) {',
+ ' var x = Math.floor(Math.random() * list.length);',
+ ' if (remove) {',
+ ' return list.splice(x, 1)[0];',
+ ' } else {',
+ ' return list[x];',
+ ' }',
+ '}']);
+ code = functionName + '(' + list + ', ' + (mode != 'GET') + ')';
+ if (mode == 'GET' || mode == 'GET_REMOVE') {
return [code, Blockly.JavaScript.ORDER_FUNCTION_CALL];
} else if (mode == 'REMOVE') {
return code + ';\n';
}
- }
- } else if (where == 'RANDOM') {
- var functionName = Blockly.JavaScript.provideFunction_(
- 'listsGetRandomItem',
- [ 'function ' + Blockly.JavaScript.FUNCTION_NAME_PLACEHOLDER_ +
- '(list, remove) {',
- ' var x = Math.floor(Math.random() * list.length);',
- ' if (remove) {',
- ' return list.splice(x, 1)[0];',
- ' } else {',
- ' return list[x];',
- ' }',
- '}']);
- code = functionName + '(' + list + ', ' + (mode != 'GET') + ')';
- if (mode == 'GET' || mode == 'GET_REMOVE') {
- return [code, Blockly.JavaScript.ORDER_FUNCTION_CALL];
- } else if (mode == 'REMOVE') {
- return code + ';\n';
- }
+ break;
}
throw 'Unhandled combination (lists_getIndex).';
};
@@ -187,8 +180,6 @@ Blockly.JavaScript['lists_setIndex'] = function(block) {
Blockly.JavaScript.ORDER_MEMBER) || '[]';
var mode = block.getFieldValue('MODE') || 'GET';
var where = block.getFieldValue('WHERE') || 'FROM_START';
- var at = Blockly.JavaScript.valueToCode(block, 'AT',
- Blockly.JavaScript.ORDER_NONE) || '1';
var value = Blockly.JavaScript.valueToCode(block, 'TO',
Blockly.JavaScript.ORDER_ASSIGNMENT) || 'null';
// Cache non-trivial values to variables to prevent repeated look-ups.
@@ -198,155 +189,206 @@ Blockly.JavaScript['lists_setIndex'] = function(block) {
return '';
}
var listVar = Blockly.JavaScript.variableDB_.getDistinctName(
- 'tmp_list', Blockly.Variables.NAME_TYPE);
+ 'tmpList', Blockly.Variables.NAME_TYPE);
var code = 'var ' + listVar + ' = ' + list + ';\n';
list = listVar;
return code;
}
- if (where == 'FIRST') {
- if (mode == 'SET') {
- return list + '[0] = ' + value + ';\n';
- } else if (mode == 'INSERT') {
- return list + '.unshift(' + value + ');\n';
- }
- } else if (where == 'LAST') {
- if (mode == 'SET') {
+ switch (where) {
+ case ('FIRST'):
+ if (mode == 'SET') {
+ return list + '[0] = ' + value + ';\n';
+ } else if (mode == 'INSERT') {
+ return list + '.unshift(' + value + ');\n';
+ }
+ break;
+ case ('LAST'):
+ if (mode == 'SET') {
+ var code = cacheList();
+ code += list + '[' + list + '.length - 1] = ' + value + ';\n';
+ return code;
+ } else if (mode == 'INSERT') {
+ return list + '.push(' + value + ');\n';
+ }
+ break;
+ case ('FROM_START'):
+ var at = Blockly.JavaScript.getAdjusted(block, 'AT');
+ if (mode == 'SET') {
+ return list + '[' + at + '] = ' + value + ';\n';
+ } else if (mode == 'INSERT') {
+ return list + '.splice(' + at + ', 0, ' + value + ');\n';
+ }
+ break;
+ case ('FROM_END'):
+ var at = Blockly.JavaScript.getAdjusted(block, 'AT', 1, false,
+ Blockly.JavaScript.ORDER_SUBTRACTION);
var code = cacheList();
- code += list + '[' + list + '.length - 1] = ' + value + ';\n';
- return code;
- } else if (mode == 'INSERT') {
- return list + '.push(' + value + ');\n';
- }
- } else if (where == 'FROM_START') {
- // Blockly uses one-based indicies.
- if (Blockly.isNumber(at)) {
- // If the index is a naked number, decrement it right now.
- at = parseFloat(at) - 1;
- } else {
- // If the index is dynamic, decrement it in code.
- at += ' - 1';
- }
- if (mode == 'SET') {
- return list + '[' + at + '] = ' + value + ';\n';
- } else if (mode == 'INSERT') {
- return list + '.splice(' + at + ', 0, ' + value + ');\n';
- }
- } else if (where == 'FROM_END') {
- var code = cacheList();
- if (mode == 'SET') {
- code += list + '[' + list + '.length - ' + at + '] = ' + value + ';\n';
- return code;
- } else if (mode == 'INSERT') {
- code += list + '.splice(' + list + '.length - ' + at + ', 0, ' + value +
- ');\n';
- return code;
- }
- } else if (where == 'RANDOM') {
- var code = cacheList();
- var xVar = Blockly.JavaScript.variableDB_.getDistinctName(
- 'tmp_x', Blockly.Variables.NAME_TYPE);
- code += 'var ' + xVar + ' = Math.floor(Math.random() * ' + list +
- '.length);\n';
- if (mode == 'SET') {
- code += list + '[' + xVar + '] = ' + value + ';\n';
- return code;
- } else if (mode == 'INSERT') {
- code += list + '.splice(' + xVar + ', 0, ' + value + ');\n';
- return code;
- }
+ if (mode == 'SET') {
+ code += list + '[' + list + '.length - ' + at + '] = ' + value + ';\n';
+ return code;
+ } else if (mode == 'INSERT') {
+ code += list + '.splice(' + list + '.length - ' + at + ', 0, ' + value +
+ ');\n';
+ return code;
+ }
+ break;
+ case ('RANDOM'):
+ var code = cacheList();
+ var xVar = Blockly.JavaScript.variableDB_.getDistinctName(
+ 'tmpX', Blockly.Variables.NAME_TYPE);
+ code += 'var ' + xVar + ' = Math.floor(Math.random() * ' + list +
+ '.length);\n';
+ if (mode == 'SET') {
+ code += list + '[' + xVar + '] = ' + value + ';\n';
+ return code;
+ } else if (mode == 'INSERT') {
+ code += list + '.splice(' + xVar + ', 0, ' + value + ');\n';
+ return code;
+ }
+ break;
}
throw 'Unhandled combination (lists_setIndex).';
};
+/**
+ * Returns an expression calculating the index into a list.
+ * @private
+ * @param {string} listName Name of the list, used to calculate length.
+ * @param {string} where The method of indexing, selected by dropdown in Blockly
+ * @param {string=} opt_at The optional offset when indexing from start/end.
+ * @return {string} Index expression.
+ */
+Blockly.JavaScript.lists.getIndex_ = function(listName, where, opt_at) {
+ if (where == 'FIRST') {
+ return '0';
+ } else if (where == 'FROM_END') {
+ return listName + '.length - 1 - ' + opt_at;
+ } else if (where == 'LAST') {
+ return listName + '.length - 1';
+ } else {
+ return opt_at;
+ }
+};
+
Blockly.JavaScript['lists_getSublist'] = function(block) {
// Get sublist.
var list = Blockly.JavaScript.valueToCode(block, 'LIST',
Blockly.JavaScript.ORDER_MEMBER) || '[]';
var where1 = block.getFieldValue('WHERE1');
var where2 = block.getFieldValue('WHERE2');
- var at1 = Blockly.JavaScript.valueToCode(block, 'AT1',
- Blockly.JavaScript.ORDER_NONE) || '1';
- var at2 = Blockly.JavaScript.valueToCode(block, 'AT2',
- Blockly.JavaScript.ORDER_NONE) || '1';
if (where1 == 'FIRST' && where2 == 'LAST') {
- var code = list + '.concat()';
+ var code = list + '.slice(0)';
+ } else if (list.match(/^\w+$/) ||
+ (where1 != 'FROM_END' && where2 == 'FROM_START')) {
+ // If the list is a variable or doesn't require a call for length, don't
+ // generate a helper function.
+ switch (where1) {
+ case 'FROM_START':
+ var at1 = Blockly.JavaScript.getAdjusted(block, 'AT1');
+ break;
+ case 'FROM_END':
+ var at1 = Blockly.JavaScript.getAdjusted(block, 'AT1', 1, false,
+ Blockly.JavaScript.ORDER_SUBTRACTION);
+ at1 = list + '.length - ' + at1;
+ break;
+ case 'FIRST':
+ var at1 = '0';
+ break;
+ default:
+ throw 'Unhandled option (lists_getSublist).';
+ }
+ switch (where2) {
+ case 'FROM_START':
+ var at2 = Blockly.JavaScript.getAdjusted(block, 'AT2', 1);
+ break;
+ case 'FROM_END':
+ var at2 = Blockly.JavaScript.getAdjusted(block, 'AT2', 0, false,
+ Blockly.JavaScript.ORDER_SUBTRACTION);
+ at2 = list + '.length - ' + at2;
+ break;
+ case 'LAST':
+ var at2 = list + '.length';
+ break;
+ default:
+ throw 'Unhandled option (lists_getSublist).';
+ }
+ code = list + '.slice(' + at1 + ', ' + at2 + ')';
} else {
+ var at1 = Blockly.JavaScript.getAdjusted(block, 'AT1');
+ var at2 = Blockly.JavaScript.getAdjusted(block, 'AT2');
+ var getIndex_ = Blockly.JavaScript.lists.getIndex_;
+ var wherePascalCase = {'FIRST': 'First', 'LAST': 'Last',
+ 'FROM_START': 'FromStart', 'FROM_END': 'FromEnd'};
var functionName = Blockly.JavaScript.provideFunction_(
- 'listsGetSublist',
- [ 'function ' + Blockly.JavaScript.FUNCTION_NAME_PLACEHOLDER_ +
- '(list, where1, at1, where2, at2) {',
- ' function getAt(where, at) {',
- ' if (where == \'FROM_START\') {',
- ' at--;',
- ' } else if (where == \'FROM_END\') {',
- ' at = list.length - at;',
- ' } else if (where == \'FIRST\') {',
- ' at = 0;',
- ' } else if (where == \'LAST\') {',
- ' at = list.length - 1;',
- ' } else {',
- ' throw \'Unhandled option (lists_getSublist).\';',
- ' }',
- ' return at;',
- ' }',
- ' at1 = getAt(where1, at1);',
- ' at2 = getAt(where2, at2) + 1;',
- ' return list.slice(at1, at2);',
+ 'subsequence' + wherePascalCase[where1] + wherePascalCase[where2],
+ ['function ' + Blockly.JavaScript.FUNCTION_NAME_PLACEHOLDER_ +
+ '(sequence' +
+ // The value for 'FROM_END' and'FROM_START' depends on `at` so
+ // we add it as a parameter.
+ ((where1 == 'FROM_END' || where1 == 'FROM_START') ? ', at1' : '') +
+ ((where2 == 'FROM_END' || where2 == 'FROM_START') ? ', at2' : '') +
+ ') {',
+ ' var start = ' + getIndex_('sequence', where1, 'at1') + ';',
+ ' var end = ' + getIndex_('sequence', where2, 'at2') + ' + 1;',
+ ' return sequence.slice(start, end);',
'}']);
- var code = functionName + '(' + list + ', \'' +
- where1 + '\', ' + at1 + ', \'' + where2 + '\', ' + at2 + ')';
+ var code = functionName + '(' + list +
+ // The value for 'FROM_END' and 'FROM_START' depends on `at` so we
+ // pass it.
+ ((where1 == 'FROM_END' || where1 == 'FROM_START') ? ', ' + at1 : '') +
+ ((where2 == 'FROM_END' || where2 == 'FROM_START') ? ', ' + at2 : '') +
+ ')';
}
return [code, Blockly.JavaScript.ORDER_FUNCTION_CALL];
};
Blockly.JavaScript['lists_sort'] = function(block) {
// Block for sorting a list.
- var listCode = Blockly.JavaScript.valueToCode(
- block, 'LIST',
+ var list = Blockly.JavaScript.valueToCode(block, 'LIST',
Blockly.JavaScript.ORDER_FUNCTION_CALL) || '[]';
var direction = block.getFieldValue('DIRECTION') === '1' ? 1 : -1;
var type = block.getFieldValue('TYPE');
var getCompareFunctionName = Blockly.JavaScript.provideFunction_(
- 'listsGetSortCompare',
- ['function ' + Blockly.JavaScript.FUNCTION_NAME_PLACEHOLDER_ +
- '(type, direction) {',
- ' var compareFuncs = {',
- ' "NUMERIC": function(a, b) {',
- ' return parseFloat(a) - parseFloat(b); },',
- ' "TEXT": function(a, b) {',
- ' return a.toString() > b.toString() ? 1 : -1; },',
- ' "IGNORE_CASE": function(a, b) {',
- ' return a.toString().toLowerCase() > ' +
- 'b.toString().toLowerCase() ? 1 : -1; },',
- ' };',
- ' var compare = compareFuncs[type];',
- ' return function(a, b) { return compare(a, b) * direction; }',
- '}']);
- return ['(' + listCode + ').slice().sort(' +
+ 'listsGetSortCompare',
+ ['function ' + Blockly.JavaScript.FUNCTION_NAME_PLACEHOLDER_ +
+ '(type, direction) {',
+ ' var compareFuncs = {',
+ ' "NUMERIC": function(a, b) {',
+ ' return parseFloat(a) - parseFloat(b); },',
+ ' "TEXT": function(a, b) {',
+ ' return a.toString() > b.toString() ? 1 : -1; },',
+ ' "IGNORE_CASE": function(a, b) {',
+ ' return a.toString().toLowerCase() > ' +
+ 'b.toString().toLowerCase() ? 1 : -1; },',
+ ' };',
+ ' var compare = compareFuncs[type];',
+ ' return function(a, b) { return compare(a, b) * direction; }',
+ '}']);
+ return [list + '.slice().sort(' +
getCompareFunctionName + '("' + type + '", ' + direction + '))',
Blockly.JavaScript.ORDER_FUNCTION_CALL];
};
Blockly.JavaScript['lists_split'] = function(block) {
// Block for splitting text into a list, or joining a list into text.
- var value_input = Blockly.JavaScript.valueToCode(block, 'INPUT',
+ var input = Blockly.JavaScript.valueToCode(block, 'INPUT',
Blockly.JavaScript.ORDER_MEMBER);
- var value_delim = Blockly.JavaScript.valueToCode(block, 'DELIM',
+ var delimiter = Blockly.JavaScript.valueToCode(block, 'DELIM',
Blockly.JavaScript.ORDER_NONE) || '\'\'';
var mode = block.getFieldValue('MODE');
if (mode == 'SPLIT') {
- if (!value_input) {
- value_input = '\'\'';
+ if (!input) {
+ input = '\'\'';
}
var functionName = 'split';
} else if (mode == 'JOIN') {
- if (!value_input) {
- value_input = '[]';
+ if (!input) {
+ input = '[]';
}
var functionName = 'join';
} else {
throw 'Unknown mode: ' + mode;
}
- var code = value_input + '.' + functionName + '(' + value_delim + ')';
+ var code = input + '.' + functionName + '(' + delimiter + ')';
return [code, Blockly.JavaScript.ORDER_FUNCTION_CALL];
};
diff --git a/generators/javascript/math.js b/generators/javascript/math.js
index 0a7d14621..a31b94392 100644
--- a/generators/javascript/math.js
+++ b/generators/javascript/math.js
@@ -168,25 +168,25 @@ Blockly.JavaScript['math_number_property'] = function(block) {
// Prime is a special case as it is not a one-liner test.
var functionName = Blockly.JavaScript.provideFunction_(
'mathIsPrime',
- [ 'function ' + Blockly.JavaScript.FUNCTION_NAME_PLACEHOLDER_ + '(n) {',
- ' // https://en.wikipedia.org/wiki/Primality_test#Naive_methods',
- ' if (n == 2 || n == 3) {',
- ' return true;',
- ' }',
- ' // False if n is NaN, negative, is 1, or not whole.',
- ' // And false if n is divisible by 2 or 3.',
- ' if (isNaN(n) || n <= 1 || n % 1 != 0 || n % 2 == 0 ||' +
+ ['function ' + Blockly.JavaScript.FUNCTION_NAME_PLACEHOLDER_ + '(n) {',
+ ' // https://en.wikipedia.org/wiki/Primality_test#Naive_methods',
+ ' if (n == 2 || n == 3) {',
+ ' return true;',
+ ' }',
+ ' // False if n is NaN, negative, is 1, or not whole.',
+ ' // And false if n is divisible by 2 or 3.',
+ ' if (isNaN(n) || n <= 1 || n % 1 != 0 || n % 2 == 0 ||' +
' n % 3 == 0) {',
- ' return false;',
- ' }',
- ' // Check all the numbers of form 6k +/- 1, up to sqrt(n).',
- ' for (var x = 6; x <= Math.sqrt(n) + 1; x += 6) {',
- ' if (n % (x - 1) == 0 || n % (x + 1) == 0) {',
- ' return false;',
- ' }',
- ' }',
- ' return true;',
- '}']);
+ ' return false;',
+ ' }',
+ ' // Check all the numbers of form 6k +/- 1, up to sqrt(n).',
+ ' for (var x = 6; x <= Math.sqrt(n) + 1; x += 6) {',
+ ' if (n % (x - 1) == 0 || n % (x + 1) == 0) {',
+ ' return false;',
+ ' }',
+ ' }',
+ ' return true;',
+ '}']);
code = functionName + '(' + number_to_check + ')';
return [code, Blockly.JavaScript.ORDER_FUNCTION_CALL];
}
@@ -254,7 +254,7 @@ Blockly.JavaScript['math_on_list'] = function(block) {
// mathMean([null,null,1,3]) == 2.0.
var functionName = Blockly.JavaScript.provideFunction_(
'mathMean',
- [ 'function ' + Blockly.JavaScript.FUNCTION_NAME_PLACEHOLDER_ +
+ ['function ' + Blockly.JavaScript.FUNCTION_NAME_PLACEHOLDER_ +
'(myList) {',
' return myList.reduce(function(x, y) {return x + y;}) / ' +
'myList.length;',
@@ -267,7 +267,7 @@ Blockly.JavaScript['math_on_list'] = function(block) {
// mathMedian([null,null,1,3]) == 2.0.
var functionName = Blockly.JavaScript.provideFunction_(
'mathMedian',
- [ 'function ' + Blockly.JavaScript.FUNCTION_NAME_PLACEHOLDER_ +
+ ['function ' + Blockly.JavaScript.FUNCTION_NAME_PLACEHOLDER_ +
'(myList) {',
' var localList = myList.filter(function (x) ' +
'{return typeof x == \'number\';});',
@@ -290,7 +290,7 @@ Blockly.JavaScript['math_on_list'] = function(block) {
// Mode of [3, 'x', 'x', 1, 1, 2, '3'] -> ['x', 1].
var functionName = Blockly.JavaScript.provideFunction_(
'mathModes',
- [ 'function ' + Blockly.JavaScript.FUNCTION_NAME_PLACEHOLDER_ +
+ ['function ' + Blockly.JavaScript.FUNCTION_NAME_PLACEHOLDER_ +
'(values) {',
' var modes = [];',
' var counts = [];',
@@ -326,7 +326,7 @@ Blockly.JavaScript['math_on_list'] = function(block) {
case 'STD_DEV':
var functionName = Blockly.JavaScript.provideFunction_(
'mathStandardDeviation',
- [ 'function ' + Blockly.JavaScript.FUNCTION_NAME_PLACEHOLDER_ +
+ ['function ' + Blockly.JavaScript.FUNCTION_NAME_PLACEHOLDER_ +
'(numbers) {',
' var n = numbers.length;',
' if (!n) return null;',
@@ -345,7 +345,7 @@ Blockly.JavaScript['math_on_list'] = function(block) {
case 'RANDOM':
var functionName = Blockly.JavaScript.provideFunction_(
'mathRandomList',
- [ 'function ' + Blockly.JavaScript.FUNCTION_NAME_PLACEHOLDER_ +
+ ['function ' + Blockly.JavaScript.FUNCTION_NAME_PLACEHOLDER_ +
'(list) {',
' var x = Math.floor(Math.random() * list.length);',
' return list[x];',
@@ -391,16 +391,16 @@ Blockly.JavaScript['math_random_int'] = function(block) {
Blockly.JavaScript.ORDER_COMMA) || '0';
var functionName = Blockly.JavaScript.provideFunction_(
'mathRandomInt',
- [ 'function ' + Blockly.JavaScript.FUNCTION_NAME_PLACEHOLDER_ +
+ ['function ' + Blockly.JavaScript.FUNCTION_NAME_PLACEHOLDER_ +
'(a, b) {',
- ' if (a > b) {',
- ' // Swap a and b to ensure a is smaller.',
- ' var c = a;',
- ' a = b;',
- ' b = c;',
- ' }',
- ' return Math.floor(Math.random() * (b - a + 1) + a);',
- '}']);
+ ' if (a > b) {',
+ ' // Swap a and b to ensure a is smaller.',
+ ' var c = a;',
+ ' a = b;',
+ ' b = c;',
+ ' }',
+ ' return Math.floor(Math.random() * (b - a + 1) + a);',
+ '}']);
var code = functionName + '(' + argument0 + ', ' + argument1 + ')';
return [code, Blockly.JavaScript.ORDER_FUNCTION_CALL];
};
diff --git a/generators/javascript/text.js b/generators/javascript/text.js
index 86befb9ef..9ecfdc387 100644
--- a/generators/javascript/text.js
+++ b/generators/javascript/text.js
@@ -37,29 +37,29 @@ Blockly.JavaScript['text'] = function(block) {
Blockly.JavaScript['text_join'] = function(block) {
// Create a string made up of any number of elements of any type.
- var code;
- if (block.itemCount_ == 0) {
- return ['\'\'', Blockly.JavaScript.ORDER_ATOMIC];
- } else if (block.itemCount_ == 1) {
- var argument0 = Blockly.JavaScript.valueToCode(block, 'ADD0',
- Blockly.JavaScript.ORDER_NONE) || '\'\'';
- code = 'String(' + argument0 + ')';
- return [code, Blockly.JavaScript.ORDER_FUNCTION_CALL];
- } else if (block.itemCount_ == 2) {
- var argument0 = Blockly.JavaScript.valueToCode(block, 'ADD0',
- Blockly.JavaScript.ORDER_NONE) || '\'\'';
- var argument1 = Blockly.JavaScript.valueToCode(block, 'ADD1',
- Blockly.JavaScript.ORDER_NONE) || '\'\'';
- code = 'String(' + argument0 + ') + String(' + argument1 + ')';
- return [code, Blockly.JavaScript.ORDER_ADDITION];
- } else {
- code = new Array(block.itemCount_);
- for (var n = 0; n < block.itemCount_; n++) {
- code[n] = Blockly.JavaScript.valueToCode(block, 'ADD' + n,
- Blockly.JavaScript.ORDER_COMMA) || '\'\'';
- }
- code = '[' + code.join(',') + '].join(\'\')';
- return [code, Blockly.JavaScript.ORDER_FUNCTION_CALL];
+ switch (block.itemCount_) {
+ case 0:
+ return ['\'\'', Blockly.JavaScript.ORDER_ATOMIC];
+ case 1:
+ var element = Blockly.JavaScript.valueToCode(block, 'ADD0',
+ Blockly.JavaScript.ORDER_NONE) || '\'\'';
+ var code = 'String(' + element + ')';
+ return [code, Blockly.JavaScript.ORDER_FUNCTION_CALL];
+ case 2:
+ var element0 = Blockly.JavaScript.valueToCode(block, 'ADD0',
+ Blockly.JavaScript.ORDER_NONE) || '\'\'';
+ var element1 = Blockly.JavaScript.valueToCode(block, 'ADD1',
+ Blockly.JavaScript.ORDER_NONE) || '\'\'';
+ var code = 'String(' + element0 + ') + String(' + element1 + ')';
+ return [code, Blockly.JavaScript.ORDER_ADDITION];
+ default:
+ var elements = new Array(block.itemCount_);
+ for (var i = 0; i < block.itemCount_; i++) {
+ elements[i] = Blockly.JavaScript.valueToCode(block, 'ADD' + i,
+ Blockly.JavaScript.ORDER_COMMA) || '\'\'';
+ }
+ var code = '[' + elements.join(',') + '].join(\'\')';
+ return [code, Blockly.JavaScript.ORDER_FUNCTION_CALL];
}
};
@@ -67,45 +67,49 @@ Blockly.JavaScript['text_append'] = function(block) {
// Append to a variable in place.
var varName = Blockly.JavaScript.variableDB_.getName(
block.getFieldValue('VAR'), Blockly.Variables.NAME_TYPE);
- var argument0 = Blockly.JavaScript.valueToCode(block, 'TEXT',
+ var value = Blockly.JavaScript.valueToCode(block, 'TEXT',
Blockly.JavaScript.ORDER_NONE) || '\'\'';
- return varName + ' = String(' + varName + ') + String(' + argument0 + ');\n';
+ return varName + ' = String(' + varName + ') + String(' + value + ');\n';
};
Blockly.JavaScript['text_length'] = function(block) {
// String or array length.
- var argument0 = Blockly.JavaScript.valueToCode(block, 'VALUE',
+ var text = Blockly.JavaScript.valueToCode(block, 'VALUE',
Blockly.JavaScript.ORDER_FUNCTION_CALL) || '\'\'';
- return [argument0 + '.length', Blockly.JavaScript.ORDER_MEMBER];
+ return [text + '.length', Blockly.JavaScript.ORDER_MEMBER];
};
Blockly.JavaScript['text_isEmpty'] = function(block) {
// Is the string null or array empty?
- var argument0 = Blockly.JavaScript.valueToCode(block, 'VALUE',
+ var text = Blockly.JavaScript.valueToCode(block, 'VALUE',
Blockly.JavaScript.ORDER_MEMBER) || '\'\'';
- return ['!' + argument0 + '.length', Blockly.JavaScript.ORDER_LOGICAL_NOT];
+ return ['!' + text + '.length', Blockly.JavaScript.ORDER_LOGICAL_NOT];
};
Blockly.JavaScript['text_indexOf'] = function(block) {
// Search the text for a substring.
var operator = block.getFieldValue('END') == 'FIRST' ?
'indexOf' : 'lastIndexOf';
- var argument0 = Blockly.JavaScript.valueToCode(block, 'FIND',
+ var substring = Blockly.JavaScript.valueToCode(block, 'FIND',
Blockly.JavaScript.ORDER_NONE) || '\'\'';
- var argument1 = Blockly.JavaScript.valueToCode(block, 'VALUE',
+ var text = Blockly.JavaScript.valueToCode(block, 'VALUE',
Blockly.JavaScript.ORDER_MEMBER) || '\'\'';
- var code = argument1 + '.' + operator + '(' + argument0 + ') + 1';
- return [code, Blockly.JavaScript.ORDER_ADDITION];
+ var code = text + '.' + operator + '(' + substring + ')';
+ // Adjust index if using one-based indices.
+ if (Blockly.JavaScript.ONE_BASED_INDEXING) {
+ return [code + ' + 1', Blockly.JavaScript.ORDER_ADDITION];
+ }
+ return [code, Blockly.JavaScript.ORDER_FUNCTION_CALL];
};
Blockly.JavaScript['text_charAt'] = function(block) {
// Get letter at index.
// Note: Until January 2013 this block did not have the WHERE input.
var where = block.getFieldValue('WHERE') || 'FROM_START';
- var at = Blockly.JavaScript.valueToCode(block, 'AT',
- Blockly.JavaScript.ORDER_UNARY_NEGATION) || '1';
+ var textOrder = (where == 'RANDOM') ? Blockly.JavaScript.ORDER_NONE :
+ Blockly.JavaScript.ORDER_MEMBER;
var text = Blockly.JavaScript.valueToCode(block, 'VALUE',
- Blockly.JavaScript.ORDER_MEMBER) || '\'\'';
+ textOrder) || '\'\'';
switch (where) {
case 'FIRST':
var code = text + '.charAt(0)';
@@ -114,70 +118,117 @@ Blockly.JavaScript['text_charAt'] = function(block) {
var code = text + '.slice(-1)';
return [code, Blockly.JavaScript.ORDER_FUNCTION_CALL];
case 'FROM_START':
- // Blockly uses one-based indicies.
- if (Blockly.isNumber(at)) {
- // If the index is a naked number, decrement it right now.
- at = parseFloat(at) - 1;
- } else {
- // If the index is dynamic, decrement it in code.
- at += ' - 1';
- }
+ var at = Blockly.JavaScript.getAdjusted(block, 'AT');
+ // Adjust index if using one-based indices.
var code = text + '.charAt(' + at + ')';
return [code, Blockly.JavaScript.ORDER_FUNCTION_CALL];
case 'FROM_END':
- var code = text + '.slice(-' + at + ').charAt(0)';
+ var at = Blockly.JavaScript.getAdjusted(block, 'AT', 1, true);
+ var code = text + '.slice(' + at + ').charAt(0)';
return [code, Blockly.JavaScript.ORDER_FUNCTION_CALL];
case 'RANDOM':
var functionName = Blockly.JavaScript.provideFunction_(
'textRandomLetter',
- [ 'function ' + Blockly.JavaScript.FUNCTION_NAME_PLACEHOLDER_ +
+ ['function ' + Blockly.JavaScript.FUNCTION_NAME_PLACEHOLDER_ +
'(text) {',
- ' var x = Math.floor(Math.random() * text.length);',
- ' return text[x];',
- '}']);
- code = functionName + '(' + text + ')';
+ ' var x = Math.floor(Math.random() * text.length);',
+ ' return text[x];',
+ '}']);
+ var code = functionName + '(' + text + ')';
return [code, Blockly.JavaScript.ORDER_FUNCTION_CALL];
}
throw 'Unhandled option (text_charAt).';
};
+/**
+ * Returns an expression calculating the index into a string.
+ * @private
+ * @param {string} stringName Name of the string, used to calculate length.
+ * @param {string} where The method of indexing, selected by dropdown in Blockly
+ * @param {string=} opt_at The optional offset when indexing from start/end.
+ * @return {string} Index expression.
+ */
+Blockly.JavaScript.text.getIndex_ = function(stringName, where, opt_at) {
+ if (where == 'FIRST') {
+ return '0';
+ } else if (where == 'FROM_END') {
+ return stringName + '.length - 1 - ' + opt_at;
+ } else if (where == 'LAST') {
+ return stringName + '.length - 1';
+ } else {
+ return opt_at;
+ }
+};
+
Blockly.JavaScript['text_getSubstring'] = function(block) {
// Get substring.
var text = Blockly.JavaScript.valueToCode(block, 'STRING',
- Blockly.JavaScript.ORDER_MEMBER) || '\'\'';
+ Blockly.JavaScript.ORDER_FUNCTION_CALL) || '\'\'';
var where1 = block.getFieldValue('WHERE1');
var where2 = block.getFieldValue('WHERE2');
- var at1 = Blockly.JavaScript.valueToCode(block, 'AT1',
- Blockly.JavaScript.ORDER_NONE) || '1';
- var at2 = Blockly.JavaScript.valueToCode(block, 'AT2',
- Blockly.JavaScript.ORDER_NONE) || '1';
if (where1 == 'FIRST' && where2 == 'LAST') {
var code = text;
+ } else if (text.match(/^'?\w+'?$/) ||
+ (where1 != 'FROM_END' && where1 != 'LAST' &&
+ where2 != 'FROM_END' && where2 != 'LAST')) {
+ // If the text is a variable or literal or doesn't require a call for
+ // length, don't generate a helper function.
+ switch (where1) {
+ case 'FROM_START':
+ var at1 = Blockly.JavaScript.getAdjusted(block, 'AT1');
+ break;
+ case 'FROM_END':
+ var at1 = Blockly.JavaScript.getAdjusted(block, 'AT1', 1, false,
+ Blockly.JavaScript.ORDER_SUBTRACTION);
+ at1 = text + '.length - ' + at1;
+ break;
+ case 'FIRST':
+ var at1 = '0';
+ break;
+ default:
+ throw 'Unhandled option (text_getSubstring).';
+ }
+ switch (where2) {
+ case 'FROM_START':
+ var at2 = Blockly.JavaScript.getAdjusted(block, 'AT2', 1);
+ break;
+ case 'FROM_END':
+ var at2 = Blockly.JavaScript.getAdjusted(block, 'AT2', 0, false,
+ Blockly.JavaScript.ORDER_SUBTRACTION);
+ at2 = text + '.length - ' + at2;
+ break;
+ case 'LAST':
+ var at2 = text + '.length';
+ break;
+ default:
+ throw 'Unhandled option (text_getSubstring).';
+ }
+ code = text + '.slice(' + at1 + ', ' + at2 + ')';
} else {
+ var at1 = Blockly.JavaScript.getAdjusted(block, 'AT1');
+ var at2 = Blockly.JavaScript.getAdjusted(block, 'AT2');
+ var getIndex_ = Blockly.JavaScript.text.getIndex_;
+ var wherePascalCase = {'FIRST': 'First', 'LAST': 'Last',
+ 'FROM_START': 'FromStart', 'FROM_END': 'FromEnd'};
var functionName = Blockly.JavaScript.provideFunction_(
- 'textGetSubstring',
- [ 'function ' + Blockly.JavaScript.FUNCTION_NAME_PLACEHOLDER_ +
- '(text, where1, at1, where2, at2) {',
- ' function getAt(where, at) {',
- ' if (where == \'FROM_START\') {',
- ' at--;',
- ' } else if (where == \'FROM_END\') {',
- ' at = text.length - at;',
- ' } else if (where == \'FIRST\') {',
- ' at = 0;',
- ' } else if (where == \'LAST\') {',
- ' at = text.length - 1;',
- ' } else {',
- ' throw \'Unhandled option (text_getSubstring).\';',
- ' }',
- ' return at;',
- ' }',
- ' at1 = getAt(where1, at1);',
- ' at2 = getAt(where2, at2) + 1;',
- ' return text.slice(at1, at2);',
+ 'subsequence' + wherePascalCase[where1] + wherePascalCase[where2],
+ ['function ' + Blockly.JavaScript.FUNCTION_NAME_PLACEHOLDER_ +
+ '(sequence' +
+ // The value for 'FROM_END' and'FROM_START' depends on `at` so
+ // we add it as a parameter.
+ ((where1 == 'FROM_END' || where1 == 'FROM_START') ? ', at1' : '') +
+ ((where2 == 'FROM_END' || where2 == 'FROM_START') ? ', at2' : '') +
+ ') {',
+ ' var start = ' + getIndex_('sequence', where1, 'at1') + ';',
+ ' var end = ' + getIndex_('sequence', where2, 'at2') + ' + 1;',
+ ' return sequence.slice(start, end);',
'}']);
- var code = functionName + '(' + text + ', \'' +
- where1 + '\', ' + at1 + ', \'' + where2 + '\', ' + at2 + ')';
+ var code = functionName + '(' + text +
+ // The value for 'FROM_END' and 'FROM_START' depends on `at` so we
+ // pass it.
+ ((where1 == 'FROM_END' || where1 == 'FROM_START') ? ', ' + at1 : '') +
+ ((where2 == 'FROM_END' || where2 == 'FROM_START') ? ', ' + at2 : '') +
+ ')';
}
return [code, Blockly.JavaScript.ORDER_FUNCTION_CALL];
};
@@ -190,25 +241,24 @@ Blockly.JavaScript['text_changeCase'] = function(block) {
'TITLECASE': null
};
var operator = OPERATORS[block.getFieldValue('CASE')];
- var code;
+ var textOrder = operator ? Blockly.JavaScript.ORDER_MEMBER :
+ Blockly.JavaScript.ORDER_NONE;
+ var text = Blockly.JavaScript.valueToCode(block, 'TEXT',
+ textOrder) || '\'\'';
if (operator) {
// Upper and lower case are functions built into JavaScript.
- var argument0 = Blockly.JavaScript.valueToCode(block, 'TEXT',
- Blockly.JavaScript.ORDER_MEMBER) || '\'\'';
- code = argument0 + operator;
+ var code = text + operator;
} else {
// Title case is not a native JavaScript function. Define one.
var functionName = Blockly.JavaScript.provideFunction_(
'textToTitleCase',
- [ 'function ' +
- Blockly.JavaScript.FUNCTION_NAME_PLACEHOLDER_ + '(str) {',
- ' return str.replace(/\\S+/g,',
- ' function(txt) {return txt[0].toUpperCase() + ' +
- 'txt.substring(1).toLowerCase();});',
- '}']);
- var argument0 = Blockly.JavaScript.valueToCode(block, 'TEXT',
- Blockly.JavaScript.ORDER_NONE) || '\'\'';
- code = functionName + '(' + argument0 + ')';
+ ['function ' + Blockly.JavaScript.FUNCTION_NAME_PLACEHOLDER_ +
+ '(str) {',
+ ' return str.replace(/\\S+/g,',
+ ' function(txt) {return txt[0].toUpperCase() + ' +
+ 'txt.substring(1).toLowerCase();});',
+ '}']);
+ var code = functionName + '(' + text + ')';
}
return [code, Blockly.JavaScript.ORDER_FUNCTION_CALL];
};
@@ -221,16 +271,16 @@ Blockly.JavaScript['text_trim'] = function(block) {
'BOTH': '.trim()'
};
var operator = OPERATORS[block.getFieldValue('MODE')];
- var argument0 = Blockly.JavaScript.valueToCode(block, 'TEXT',
+ var text = Blockly.JavaScript.valueToCode(block, 'TEXT',
Blockly.JavaScript.ORDER_MEMBER) || '\'\'';
- return [argument0 + operator, Blockly.JavaScript.ORDER_FUNCTION_CALL];
+ return [text + operator, Blockly.JavaScript.ORDER_FUNCTION_CALL];
};
Blockly.JavaScript['text_print'] = function(block) {
// Print statement.
- var argument0 = Blockly.JavaScript.valueToCode(block, 'TEXT',
+ var msg = Blockly.JavaScript.valueToCode(block, 'TEXT',
Blockly.JavaScript.ORDER_NONE) || '\'\'';
- return 'window.alert(' + argument0 + ');\n';
+ return 'window.alert(' + msg + ');\n';
};
Blockly.JavaScript['text_prompt_ext'] = function(block) {
diff --git a/generators/lua.js b/generators/lua.js
index 60a6c0e14..225489641 100644
--- a/generators/lua.js
+++ b/generators/lua.js
@@ -77,7 +77,7 @@ Blockly.Lua.ORDER_ATOMIC = 0; // literals
// The next level was not explicit in documentation and inferred by Ellen.
Blockly.Lua.ORDER_HIGH = 1; // Function calls, tables[]
Blockly.Lua.ORDER_EXPONENTIATION = 2; // ^
-Blockly.Lua.ORDER_UNARY = 3; // not # - ()
+Blockly.Lua.ORDER_UNARY = 3; // not # - ~
Blockly.Lua.ORDER_MULTIPLICATIVE = 4; // * / %
Blockly.Lua.ORDER_ADDITIVE = 5; // + -
Blockly.Lua.ORDER_CONCATENATION = 6; // ..
@@ -86,6 +86,12 @@ Blockly.Lua.ORDER_AND = 8; // and
Blockly.Lua.ORDER_OR = 9; // or
Blockly.Lua.ORDER_NONE = 99;
+/**
+ * Lua is not supporting zero-indexing since the language itself is one-indexed,
+ * so there is not flag for ONE_BASED_INDEXING to indicate which indexing is
+ * used for lists and text.
+ */
+
/**
* Initialise the database of variable names.
* @param {!Blockly.Workspace} workspace Workspace to generate code from.
@@ -164,15 +170,15 @@ Blockly.Lua.scrub_ = function(block, code) {
if (!block.outputConnection || !block.outputConnection.targetConnection) {
// Collect comment for this block.
var comment = block.getCommentText();
- comment = Blockly.utils.wrap(comment, this.COMMENT_WRAP - 3);
+ comment = Blockly.utils.wrap(comment, Blockly.Lua.COMMENT_WRAP - 3);
if (comment) {
commentCode += Blockly.Lua.prefixLines(comment, '-- ') + '\n';
}
// Collect comments for all value arguments.
// Don't collect comments for nested statements.
- for (var x = 0; x < block.inputList.length; x++) {
- if (block.inputList[x].type == Blockly.INPUT_VALUE) {
- var childBlock = block.inputList[x].connection.targetBlock();
+ for (var i = 0; i < block.inputList.length; i++) {
+ if (block.inputList[i].type == Blockly.INPUT_VALUE) {
+ var childBlock = block.inputList[i].connection.targetBlock();
if (childBlock) {
comment = Blockly.Lua.allNestedComments(childBlock);
if (comment) {
diff --git a/generators/lua/lists.js b/generators/lua/lists.js
index 8c89a1bd3..5b7711dbb 100644
--- a/generators/lua/lists.js
+++ b/generators/lua/lists.js
@@ -31,18 +31,17 @@ goog.require('Blockly.Lua');
Blockly.Lua['lists_create_empty'] = function(block) {
// Create an empty list.
- // List literals must be parenthesized before indexing into.
- return ['({})', Blockly.Lua.ORDER_ATOMIC];
+ return ['{}', Blockly.Lua.ORDER_ATOMIC];
};
Blockly.Lua['lists_create_with'] = function(block) {
// Create a list with any number of elements of any type.
- var code = new Array(block.itemCount_);
- for (var n = 0; n < block.itemCount_; n++) {
- code[n] = Blockly.Lua.valueToCode(block, 'ADD' + n,
+ var elements = new Array(block.itemCount_);
+ for (var i = 0; i < block.itemCount_; i++) {
+ elements[i] = Blockly.Lua.valueToCode(block, 'ADD' + i,
Blockly.Lua.ORDER_NONE) || 'None';
}
- code = '({' + code.join(', ') + '})';
+ var code = '{' + elements.join(', ') + '}';
return [code, Blockly.Lua.ORDER_ATOMIC];
};
@@ -57,38 +56,37 @@ Blockly.Lua['lists_repeat'] = function(block) {
' end',
' return t',
'end']);
- var argument0 = Blockly.Lua.valueToCode(block, 'ITEM',
+ var element = Blockly.Lua.valueToCode(block, 'ITEM',
Blockly.Lua.ORDER_NONE) || 'None';
- var argument1 = Blockly.Lua.valueToCode(block, 'NUM',
+ var repeatCount = Blockly.Lua.valueToCode(block, 'NUM',
Blockly.Lua.ORDER_NONE) || '0';
- var code = functionName + '(' + argument0 + ', ' + argument1 + ')';
+ var code = functionName + '(' + element + ', ' + repeatCount + ')';
return [code, Blockly.Lua.ORDER_HIGH];
};
Blockly.Lua['lists_length'] = function(block) {
// String or array length.
- var argument0 = Blockly.Lua.valueToCode(block, 'VALUE',
- Blockly.Lua.ORDER_HIGH) || '({})';
- return ['#' + argument0, Blockly.Lua.ORDER_HIGH];
+ var list = Blockly.Lua.valueToCode(block, 'VALUE',
+ Blockly.Lua.ORDER_UNARY) || '{}';
+ return ['#' + list, Blockly.Lua.ORDER_UNARY];
};
Blockly.Lua['lists_isEmpty'] = function(block) {
// Is the string null or array empty?
- var argument0 = Blockly.Lua.valueToCode(block, 'VALUE',
- Blockly.Lua.ORDER_HIGH) || '({})';
- var code = '#' + argument0 + ' == 0';
+ var list = Blockly.Lua.valueToCode(block, 'VALUE',
+ Blockly.Lua.ORDER_UNARY) || '{}';
+ var code = '#' + list + ' == 0';
return [code, Blockly.Lua.ORDER_RELATIONAL];
};
Blockly.Lua['lists_indexOf'] = function(block) {
// Find an item in the list.
- var argument0 = Blockly.Lua.valueToCode(block, 'FIND',
+ var item = Blockly.Lua.valueToCode(block, 'FIND',
Blockly.Lua.ORDER_NONE) || '\'\'';
- var argument1 = Blockly.Lua.valueToCode(block, 'VALUE',
- Blockly.Lua.ORDER_NONE) || '({})';
- var functionName;
+ var list = Blockly.Lua.valueToCode(block, 'VALUE',
+ Blockly.Lua.ORDER_NONE) || '{}';
if (block.getFieldValue('END') == 'FIRST') {
- functionName = Blockly.Lua.provideFunction_(
+ var functionName = Blockly.Lua.provideFunction_(
'first_index',
['function ' + Blockly.Lua.FUNCTION_NAME_PLACEHOLDER_ + '(t, elem)',
' for k, v in ipairs(t) do',
@@ -99,7 +97,7 @@ Blockly.Lua['lists_indexOf'] = function(block) {
' return 0',
'end']);
} else {
- functionName = Blockly.Lua.provideFunction_(
+ var functionName = Blockly.Lua.provideFunction_(
'last_index',
['function ' + Blockly.Lua.FUNCTION_NAME_PLACEHOLDER_ + '(t, elem)',
' for i = #t, 1, -1 do',
@@ -110,64 +108,40 @@ Blockly.Lua['lists_indexOf'] = function(block) {
' return 0',
'end']);
}
- var code = functionName + '(' + argument1 + ', ' + argument0 + ')';
+ var code = functionName + '(' + list + ', ' + item + ')';
return [code, Blockly.Lua.ORDER_HIGH];
};
/**
* Returns an expression calculating the index into a list.
* @private
- * @param {string} listname Name of the list, used to calculate length.
+ * @param {string} listName Name of the list, used to calculate length.
* @param {string} where The method of indexing, selected by dropdown in Blockly
* @param {string=} opt_at The optional offset when indexing from start/end.
* @return {string} Index expression.
*/
-Blockly.Lua.lists.getIndex_ = function(listname, where, opt_at) {
+Blockly.Lua.lists.getIndex_ = function(listName, where, opt_at) {
if (where == 'FIRST') {
return '1';
} else if (where == 'FROM_END') {
- return '#' + listname + ' + 1 - ' + opt_at;
+ return '#' + listName + ' + 1 - ' + opt_at;
} else if (where == 'LAST') {
- return '#' + listname;
+ return '#' + listName;
} else if (where == 'RANDOM') {
- return 'math.random(#' + listname + ')';
+ return 'math.random(#' + listName + ')';
} else {
return opt_at;
}
};
-/**
- * Counter for generating unique symbols.
- * @private
- * @type {number}
- */
-Blockly.Lua.lists.gensym_counter_ = 0;
-
-/**
- * Generate a unique symbol.
- * @private
- * @return {string} unique symbol, eg 'G123'
- */
-Blockly.Lua.lists.gensym_ = function() {
- return 'G' + Blockly.Lua.lists.gensym_counter_++;
-};
-
Blockly.Lua['lists_getIndex'] = function(block) {
// Get element at index.
// Note: Until January 2013 this block did not have MODE or WHERE inputs.
var mode = block.getFieldValue('MODE') || 'GET';
var where = block.getFieldValue('WHERE') || 'FROM_START';
- var at = Blockly.Lua.valueToCode(block, 'AT',
- Blockly.Lua.ORDER_ADDITIVE) || '1';
- if (mode == 'GET') {
- var order = Blockly.Lua.ORDER_HIGH;
- } else {
- // List will be an argument in a function call.
- var order = Blockly.Lua.ORDER_NONE;
- }
- var list = Blockly.Lua.valueToCode(block, 'VALUE', order) || '({})';
+ var list = Blockly.Lua.valueToCode(block, 'VALUE', Blockly.Lua.ORDER_HIGH) ||
+ '{}';
var getIndex_ = Blockly.Lua.lists.getIndex_;
- var gensym_ = Blockly.Lua.lists.gensym_;
// If `list` would be evaluated more than once (which is the case for LAST,
// FROM_END, and RANDOM) and is non-trivial, make sure to access it only once.
@@ -176,46 +150,59 @@ Blockly.Lua['lists_getIndex'] = function(block) {
// `list` is an expression, so we may not evaluate it more than once.
if (mode == 'REMOVE') {
// We can use multiple statements.
+ var atOrder = (where == 'FROM_END') ? Blockly.Lua.ORDER_ADDITIVE :
+ Blockly.Lua.ORDER_NONE;
+ var at = Blockly.Lua.valueToCode(block, 'AT', atOrder) || '1';
var listVar = Blockly.Lua.variableDB_.getDistinctName(
'tmp_list', Blockly.Variables.NAME_TYPE);
+ at = getIndex_(listVar, where, at);
var code = listVar + ' = ' + list + '\n' +
- 'table.remove(' + listVar + ', ' + getIndex_(listVar, where, at) +
- ')\n';
+ 'table.remove(' + listVar + ', ' + at + ')\n';
return code;
} else {
// We need to create a procedure to avoid reevaluating values.
+ var at = Blockly.Lua.valueToCode(block, 'AT', Blockly.Lua.ORDER_NONE) ||
+ '1';
if (mode == 'GET') {
- // Note that getIndex_() ignores `at` when `where` == 'LAST' or
- // 'RANDOM', so we only need one procedure for each of those 'where'
- // values. The value for 'FROM_END' depends on `at`, so we will
- // generate a unique procedure (name) each time.
var functionName = Blockly.Lua.provideFunction_(
- 'list_get_' + where.toLowerCase() +
- (where == 'FROM_END' ? '_' + gensym_() : ''),
- ['function ' + Blockly.Lua.FUNCTION_NAME_PLACEHOLDER_ + '(t)',
- ' return t[' + getIndex_('t', where, at) + ']',
+ 'list_get_' + where.toLowerCase(),
+ ['function ' + Blockly.Lua.FUNCTION_NAME_PLACEHOLDER_ + '(t' +
+ // The value for 'FROM_END' and'FROM_START' depends on `at` so
+ // we add it as a parameter.
+ ((where == 'FROM_END' || where == 'FROM_START') ?
+ ', at)' : ')'),
+ ' return t[' + getIndex_('t', where, 'at') + ']',
'end']);
- } else { // mode == 'GET_REMOVE'
- // We need to create a procedure.
+ } else { // mode == 'GET_REMOVE'
var functionName = Blockly.Lua.provideFunction_(
- 'list_remove_' + where.toLowerCase() +
- (where == 'FROM_END' ? '_' + gensym_() : ''),
- ['function ' + Blockly.Lua.FUNCTION_NAME_PLACEHOLDER_ + '(t)',
- ' return table.remove(t, ' + getIndex_('t', where, at) + ')',
+ 'list_remove_' + where.toLowerCase(),
+ ['function ' + Blockly.Lua.FUNCTION_NAME_PLACEHOLDER_ + '(t' +
+ // The value for 'FROM_END' and'FROM_START' depends on `at` so
+ // we add it as a parameter.
+ ((where == 'FROM_END' || where == 'FROM_START') ?
+ ', at)' : ')'),
+ ' return table.remove(t, ' + getIndex_('t', where, 'at') + ')',
'end']);
}
- var code = functionName + '(' + list + ')';
+ var code = functionName + '(' + list +
+ // The value for 'FROM_END' and 'FROM_START' depends on `at` so we
+ // pass it.
+ ((where == 'FROM_END' || where == 'FROM_START') ? ', ' + at : '') +
+ ')';
return [code, Blockly.Lua.ORDER_HIGH];
}
} else {
// Either `list` is a simple variable, or we only need to refer to `list`
// once.
+ var atOrder = (mode == 'GET' && where == 'FROM_END') ?
+ Blockly.Lua.ORDER_ADDITIVE : Blockly.Lua.ORDER_NONE;
+ var at = Blockly.Lua.valueToCode(block, 'AT', atOrder) || '1';
+ at = getIndex_(list, where, at);
if (mode == 'GET') {
- var code = list + '[' + getIndex_(list, where, at) + ']';
+ var code = list + '[' + at + ']';
return [code, Blockly.Lua.ORDER_HIGH];
} else {
- var code = 'table.remove(' + list + ', ' + getIndex_(list, where, at) +
- ')';
+ var code = 'table.remove(' + list + ', ' + at + ')';
if (mode == 'GET_REMOVE') {
return [code, Blockly.Lua.ORDER_HIGH];
} else { // `mode` == 'REMOVE'
@@ -229,7 +216,7 @@ Blockly.Lua['lists_setIndex'] = function(block) {
// Set element at index.
// Note: Until February 2013 this block did not have MODE or WHERE inputs.
var list = Blockly.Lua.valueToCode(block, 'LIST',
- Blockly.Lua.ORDER_HIGH) || '({})';
+ Blockly.Lua.ORDER_HIGH) || '{}';
var mode = block.getFieldValue('MODE') || 'SET';
var where = block.getFieldValue('WHERE') || 'FROM_START';
var at = Blockly.Lua.valueToCode(block, 'AT',
@@ -238,97 +225,71 @@ Blockly.Lua['lists_setIndex'] = function(block) {
Blockly.Lua.ORDER_NONE) || 'None';
var getIndex_ = Blockly.Lua.lists.getIndex_;
+ var code = '';
// If `list` would be evaluated more than once (which is the case for LAST,
// FROM_END, and RANDOM) and is non-trivial, make sure to access it only once.
if ((where == 'LAST' || where == 'FROM_END' || where == 'RANDOM') &&
!list.match(/^\w+$/)) {
// `list` is an expression, so we may not evaluate it more than once.
- if (where == 'RANDOM' || where == 'LAST') {
- // In these cases, `at` is implicit. getIndex_() ignores its value.
- if (mode == 'SET') {
- var functionName = Blockly.Lua.provideFunction_(
- 'list_set_' + where.toLowerCase(),
- ['function ' + Blockly.Lua.FUNCTION_NAME_PLACEHOLDER_ + '(t, val)',
- ' t[' + getIndex_('t', where, at) + '] = val',
- 'end']);
- } else { // `mode` == 'INSERT'
- var functionName = Blockly.Lua.provideFunction_(
- 'list_insert_' + where.toLowerCase(),
- ['function ' + Blockly.Lua.FUNCTION_NAME_PLACEHOLDER_ + '(t, val)',
- ' table.insert(t, ' +
- // LAST is a special case, because we want to insert
- // *after* not *before*, the existing last element.
- getIndex_('t', where, at) + (where == 'LAST' ? ' + 1' : '') +
- ', val)',
- 'end']);
- }
- var code = functionName + '(' + list + ', ' + value + ')\n';
- return code;
- } else { // `where` = 'FROM_END'
- if (mode == 'SET') {
- var functionName = Blockly.Lua.provideFunction_(
- 'list_set_from_end',
- ['function ' + Blockly.Lua.FUNCTION_NAME_PLACEHOLDER_ +
- '(t, index, val)',
- ' t[#t + 1 - index] = val',
- 'end']);
- } else { // `mode` == 'INSERT'
- var functionName = Blockly.Lua.provideFunction_(
- 'list_insert_from_end',
- ['function ' + Blockly.Lua.FUNCTION_NAME_PLACEHOLDER_ +
- '(t, index, val)',
- ' table.insert(t, #t + 1 - index, val)',
- 'end']);
- }
- var code = functionName + '(' + list + ', ' + at + ', ' + value + ')\n';
- return code;
- }
- } else {
- // It's okay to have multiple references to the list.
- if (mode == 'SET') {
- var code = list + '[' + getIndex_(list, where, at) + '] = ' + value;
- } else { // `mode` == 'INSERT'
- // LAST is a special case, because we want to insert
- // *after* not *before*, the existing last element.
- var code = 'table.insert(' + list + ', ' +
- (getIndex_(list, where, at) + (where == 'LAST' ? ' + 1' : '')) +
- ', ' + value + ')';
- }
- return code + '\n';
+ // We can use multiple statements.
+ var listVar = Blockly.Lua.variableDB_.getDistinctName(
+ 'tmp_list', Blockly.Variables.NAME_TYPE);
+ code = listVar + ' = ' + list + '\n';
+ list = listVar;
}
+ if (mode == 'SET') {
+ code += list + '[' + getIndex_(list, where, at) + '] = ' + value;
+ } else { // `mode` == 'INSERT'
+ // LAST is a special case, because we want to insert
+ // *after* not *before*, the existing last element.
+ code += 'table.insert(' + list + ', ' +
+ (getIndex_(list, where, at) + (where == 'LAST' ? ' + 1' : '')) +
+ ', ' + value + ')';
+ }
+ return code + '\n';
};
Blockly.Lua['lists_getSublist'] = function(block) {
// Get sublist.
var list = Blockly.Lua.valueToCode(block, 'LIST',
- Blockly.Lua.ORDER_HIGH) || '({})';
+ Blockly.Lua.ORDER_NONE) || '{}';
var where1 = block.getFieldValue('WHERE1');
var where2 = block.getFieldValue('WHERE2');
var at1 = Blockly.Lua.valueToCode(block, 'AT1',
- Blockly.Lua.ORDER_ADDITIVE) || '1';
+ Blockly.Lua.ORDER_NONE) || '1';
var at2 = Blockly.Lua.valueToCode(block, 'AT2',
- Blockly.Lua.ORDER_ADDITIVE) || '1';
+ Blockly.Lua.ORDER_NONE) || '1';
var getIndex_ = Blockly.Lua.lists.getIndex_;
var functionName = Blockly.Lua.provideFunction_(
- 'list_sublist_' + Blockly.Lua.lists.gensym_(),
- ['function ' + Blockly.Lua.FUNCTION_NAME_PLACEHOLDER_ + '(source)',
+ 'list_sublist_' + where1.toLowerCase() + '_' + where2.toLowerCase(),
+ ['function ' + Blockly.Lua.FUNCTION_NAME_PLACEHOLDER_ + '(source' +
+ // The value for 'FROM_END' and'FROM_START' depends on `at` so
+ // we add it as a parameter.
+ ((where1 == 'FROM_END' || where1 == 'FROM_START') ? ', at1' : '') +
+ ((where2 == 'FROM_END' || where2 == 'FROM_START') ? ', at2' : '') +
+ ')',
' local t = {}',
- ' local start = ' + getIndex_('source', where1, at1),
- ' local finish = ' + getIndex_('source', where2, at2),
+ ' local start = ' + getIndex_('source', where1, 'at1'),
+ ' local finish = ' + getIndex_('source', where2, 'at2'),
' for i = start, finish do',
' table.insert(t, source[i])',
' end',
' return t',
'end']);
- var code = functionName + '(' + list + ')';
+ var code = functionName + '(' + list +
+ // The value for 'FROM_END' and 'FROM_START' depends on `at` so we
+ // pass it.
+ ((where1 == 'FROM_END' || where1 == 'FROM_START') ? ', ' + at1 : '') +
+ ((where2 == 'FROM_END' || where2 == 'FROM_START') ? ', ' + at2 : '') +
+ ')';
return [code, Blockly.Lua.ORDER_HIGH];
};
Blockly.Lua['lists_sort'] = function(block) {
// Block for sorting a list.
- var listCode = Blockly.Lua.valueToCode(
- block, 'LIST', Blockly.Lua.ORDER_HIGH) || '({})';
+ var list = Blockly.Lua.valueToCode(
+ block, 'LIST', Blockly.Lua.ORDER_NONE) || '{}';
var direction = block.getFieldValue('DIRECTION') === '1' ? 1 : -1;
var type = block.getFieldValue('TYPE');
@@ -357,26 +318,26 @@ Blockly.Lua['lists_sort'] = function(block) {
'end']);
var code = functionName +
- '(' + listCode + ',"' + type + '", ' + direction + ')';
+ '(' + list + ',"' + type + '", ' + direction + ')';
return [code, Blockly.Lua.ORDER_HIGH];
};
Blockly.Lua['lists_split'] = function(block) {
// Block for splitting text into a list, or joining a list into text.
- var value_input = Blockly.Lua.valueToCode(block, 'INPUT',
+ var input = Blockly.Lua.valueToCode(block, 'INPUT',
Blockly.Lua.ORDER_NONE);
- var value_delim = Blockly.Lua.valueToCode(block, 'DELIM',
+ var delimiter = Blockly.Lua.valueToCode(block, 'DELIM',
Blockly.Lua.ORDER_NONE) || '\'\'';
var mode = block.getFieldValue('MODE');
var functionName;
if (mode == 'SPLIT') {
- if (!value_input) {
- value_input = '\'\'';
+ if (!input) {
+ input = '\'\'';
}
functionName = Blockly.Lua.provideFunction_(
'list_string_split',
['function ' + Blockly.Lua.FUNCTION_NAME_PLACEHOLDER_ +
- '(input, delim)',
+ '(input, delim)',
' local t = {}',
' local pos = 1',
' while true do',
@@ -392,13 +353,13 @@ Blockly.Lua['lists_split'] = function(block) {
' return t',
'end']);
} else if (mode == 'JOIN') {
- if (!value_input) {
- value_input = '({})';
+ if (!input) {
+ input = '{}';
}
functionName = 'table.concat';
} else {
throw 'Unknown mode: ' + mode;
}
- var code = functionName + '(' + value_input + ', ' + value_delim + ')';
+ var code = functionName + '(' + input + ', ' + delimiter + ')';
return [code, Blockly.Lua.ORDER_HIGH];
};
diff --git a/generators/lua/procedures.js b/generators/lua/procedures.js
index 9bdcc416b..b6d6cdda1 100644
--- a/generators/lua/procedures.js
+++ b/generators/lua/procedures.js
@@ -51,8 +51,8 @@ Blockly.Lua['procedures_defreturn'] = function(block) {
branch = '';
}
var args = [];
- for (var x = 0; x < block.arguments_.length; x++) {
- args[x] = Blockly.Lua.variableDB_.getName(block.arguments_[x],
+ for (var i = 0; i < block.arguments_.length; i++) {
+ args[i] = Blockly.Lua.variableDB_.getName(block.arguments_[i],
Blockly.Variables.NAME_TYPE);
}
var code = 'function ' + funcName + '(' + args.join(', ') + ')\n' +
@@ -73,8 +73,8 @@ Blockly.Lua['procedures_callreturn'] = function(block) {
var funcName = Blockly.Lua.variableDB_.getName(
block.getFieldValue('NAME'), Blockly.Procedures.NAME_TYPE);
var args = [];
- for (var x = 0; x < block.arguments_.length; x++) {
- args[x] = Blockly.Lua.valueToCode(block, 'ARG' + x,
+ for (var i = 0; i < block.arguments_.length; i++) {
+ args[i] = Blockly.Lua.valueToCode(block, 'ARG' + i,
Blockly.Lua.ORDER_NONE) || 'nil';
}
var code = funcName + '(' + args.join(', ') + ')';
@@ -86,8 +86,8 @@ Blockly.Lua['procedures_callnoreturn'] = function(block) {
var funcName = Blockly.Lua.variableDB_.getName(
block.getFieldValue('NAME'), Blockly.Procedures.NAME_TYPE);
var args = [];
- for (var x = 0; x < block.arguments_.length; x++) {
- args[x] = Blockly.Lua.valueToCode(block, 'ARG' + x,
+ for (var i = 0; i < block.arguments_.length; i++) {
+ args[i] = Blockly.Lua.valueToCode(block, 'ARG' + i,
Blockly.Lua.ORDER_NONE) || 'nil';
}
var code = funcName + '(' + args.join(', ') + ')\n';
diff --git a/generators/lua/text.js b/generators/lua/text.js
index 8a6a02702..74efba4a2 100644
--- a/generators/lua/text.js
+++ b/generators/lua/text.js
@@ -40,24 +40,24 @@ Blockly.Lua['text_join'] = function(block) {
if (block.itemCount_ == 0) {
return ['\'\'', Blockly.Lua.ORDER_ATOMIC];
} else if (block.itemCount_ == 1) {
- var argument0 = Blockly.Lua.valueToCode(block, 'ADD0',
+ var element = Blockly.Lua.valueToCode(block, 'ADD0',
Blockly.Lua.ORDER_NONE) || '\'\'';
- var code = argument0;
+ var code = 'tostring(' + element + ')';
return [code, Blockly.Lua.ORDER_HIGH];
} else if (block.itemCount_ == 2) {
- var argument0 = Blockly.Lua.valueToCode(block, 'ADD0',
- Blockly.Lua.ORDER_NONE) || '\'\'';
- var argument1 = Blockly.Lua.valueToCode(block, 'ADD1',
- Blockly.Lua.ORDER_NONE) || '\'\'';
- var code = argument0 + ' .. ' + argument1;
- return [code, Blockly.Lua.ORDER_UNARY];
+ var element0 = Blockly.Lua.valueToCode(block, 'ADD0',
+ Blockly.Lua.ORDER_CONCATENATION) || '\'\'';
+ var element1 = Blockly.Lua.valueToCode(block, 'ADD1',
+ Blockly.Lua.ORDER_CONCATENATION) || '\'\'';
+ var code = element0 + ' .. ' + element1;
+ return [code, Blockly.Lua.ORDER_CONCATENATION];
} else {
- var code = [];
- for (var n = 0; n < block.itemCount_; n++) {
- code[n] = Blockly.Lua.valueToCode(block, 'ADD' + n,
+ var elements = [];
+ for (var i = 0; i < block.itemCount_; i++) {
+ elements[i] = Blockly.Lua.valueToCode(block, 'ADD' + i,
Blockly.Lua.ORDER_NONE) || '\'\'';
}
- code = 'table.concat({' + code.join(', ') + '})';
+ var code = 'table.concat({' + elements.join(', ') + '})';
return [code, Blockly.Lua.ORDER_HIGH];
}
};
@@ -66,32 +66,30 @@ Blockly.Lua['text_append'] = function(block) {
// Append to a variable in place.
var varName = Blockly.Lua.variableDB_.getName(
block.getFieldValue('VAR'), Blockly.Variables.NAME_TYPE);
- var argument0 = Blockly.Lua.valueToCode(block, 'TEXT',
- Blockly.Lua.ORDER_NONE) || '\'\'';
- return varName + ' = ' + varName + ' .. ' + argument0 + '\n';
+ var value = Blockly.Lua.valueToCode(block, 'TEXT',
+ Blockly.Lua.ORDER_CONCATENATION) || '\'\'';
+ return varName + ' = ' + varName + ' .. ' + value + '\n';
};
Blockly.Lua['text_length'] = function(block) {
// String or array length.
- var argument0 = Blockly.Lua.valueToCode(block, 'VALUE',
- Blockly.Lua.ORDER_HIGH) || '\'\'';
- return ['#' + argument0, Blockly.Lua.ORDER_HIGH];
+ var text = Blockly.Lua.valueToCode(block, 'VALUE',
+ Blockly.Lua.ORDER_UNARY) || '\'\'';
+ return ['#' + text, Blockly.Lua.ORDER_UNARY];
};
Blockly.Lua['text_isEmpty'] = function(block) {
// Is the string null or array empty?
- var argument0 = Blockly.Lua.valueToCode(block, 'VALUE',
- Blockly.Lua.ORDER_HIGH) || '\'\'';
- return ['#' + argument0 + ' == 0', Blockly.Lua.ORDER_RELATIONAL];
+ var text = Blockly.Lua.valueToCode(block, 'VALUE',
+ Blockly.Lua.ORDER_UNARY) || '\'\'';
+ return ['#' + text + ' == 0', Blockly.Lua.ORDER_RELATIONAL];
};
Blockly.Lua['text_indexOf'] = function(block) {
// Search the text for a substring.
- var operator = block.getFieldValue('END') == 'FIRST' ?
- 'indexOf' : 'lastIndexOf';
- var substr = Blockly.Lua.valueToCode(block, 'FIND',
+ var substring = Blockly.Lua.valueToCode(block, 'FIND',
Blockly.Lua.ORDER_NONE) || '\'\'';
- var str = Blockly.Lua.valueToCode(block, 'VALUE',
+ var text = Blockly.Lua.valueToCode(block, 'VALUE',
Blockly.Lua.ORDER_NONE) || '\'\'';
if (block.getFieldValue('END') == 'FIRST') {
var functionName = Blockly.Lua.provideFunction_(
@@ -118,7 +116,7 @@ Blockly.Lua['text_indexOf'] = function(block) {
' return 0',
'end']);
}
- var code = functionName + '(' + str + ', ' + substr + ')';
+ var code = functionName + '(' + text + ', ' + substring + ')';
return [code, Blockly.Lua.ORDER_HIGH];
};
@@ -126,8 +124,9 @@ Blockly.Lua['text_charAt'] = function(block) {
// Get letter at index.
// Note: Until January 2013 this block did not have the WHERE input.
var where = block.getFieldValue('WHERE') || 'FROM_START';
- var at = Blockly.Lua.valueToCode(block, 'AT',
- Blockly.Lua.ORDER_UNARY) || '1';
+ var atOrder = (where == 'FROM_END') ? Blockly.Lua.ORDER_UNARY :
+ Blockly.Lua.ORDER_NONE;
+ var at = Blockly.Lua.valueToCode(block, 'AT', atOrder) || '1';
var text = Blockly.Lua.valueToCode(block, 'VALUE',
Blockly.Lua.ORDER_NONE) || '\'\'';
var code;
@@ -176,8 +175,9 @@ Blockly.Lua['text_getSubstring'] = function(block) {
// Get start index.
var where1 = block.getFieldValue('WHERE1');
- var at1 = Blockly.Lua.valueToCode(block, 'AT1',
- Blockly.Lua.ORDER_UNARY) || '1';
+ var at1Order = (where1 == 'FROM_END') ? Blockly.Lua.ORDER_UNARY :
+ Blockly.Lua.ORDER_NONE;
+ var at1 = Blockly.Lua.valueToCode(block, 'AT1', at1Order) || '1';
if (where1 == 'FIRST') {
var start = 1;
} else if (where1 == 'FROM_START') {
@@ -190,8 +190,9 @@ Blockly.Lua['text_getSubstring'] = function(block) {
// Get end index.
var where2 = block.getFieldValue('WHERE2');
- var at2 = Blockly.Lua.valueToCode(block, 'AT2',
- Blockly.Lua.ORDER_UNARY) || '1';
+ var at2Order = (where2 == 'FROM_END') ? Blockly.Lua.ORDER_UNARY :
+ Blockly.Lua.ORDER_NONE;
+ var at2 = Blockly.Lua.valueToCode(block, 'AT2', at2Order) || '1';
if (where2 == 'LAST') {
var end = -1;
} else if (where2 == 'FROM_START') {
@@ -208,7 +209,7 @@ Blockly.Lua['text_getSubstring'] = function(block) {
Blockly.Lua['text_changeCase'] = function(block) {
// Change capitalization.
var operator = block.getFieldValue('CASE');
- var argument0 = Blockly.Lua.valueToCode(block, 'TEXT',
+ var text = Blockly.Lua.valueToCode(block, 'TEXT',
Blockly.Lua.ORDER_NONE) || '\'\'';
if (operator == 'UPPERCASE') {
var functionName = 'string.upper';
@@ -238,7 +239,7 @@ Blockly.Lua['text_changeCase'] = function(block) {
' return table.concat(buf)',
'end']);
}
- var code = functionName + '(' + argument0 + ')';
+ var code = functionName + '(' + text + ')';
return [code, Blockly.Lua.ORDER_HIGH];
};
@@ -258,9 +259,9 @@ Blockly.Lua['text_trim'] = function(block) {
Blockly.Lua['text_print'] = function(block) {
// Print statement.
- var argument0 = Blockly.Lua.valueToCode(block, 'TEXT',
+ var msg = Blockly.Lua.valueToCode(block, 'TEXT',
Blockly.Lua.ORDER_NONE) || '\'\'';
- return 'print(' + argument0 + ')\n';
+ return 'print(' + msg + ')\n';
};
Blockly.Lua['text_prompt_ext'] = function(block) {
diff --git a/generators/php.js b/generators/php.js
index d935cda1b..0543a439a 100644
--- a/generators/php.js
+++ b/generators/php.js
@@ -44,44 +44,98 @@ Blockly.PHP = new Blockly.Generator('PHP');
*/
Blockly.PHP.addReservedWords(
// http://php.net/manual/en/reserved.keywords.php
- '__halt_compiler,abstract,and,array,as,break,callable,case,catch,class,clone,const,continue,declare,default,die,do,echo,else,elseif,empty,enddeclare,endfor,endforeach,endif,endswitch,endwhile,eval,exit,extends,final,for,foreach,function,global,goto,if,implements,include,include_once,instanceof,insteadof,interface,isset,list,namespace,new,or,print,private,protected,public,require,require_once,return,static,switch,throw,trait,try,unset,use,var,while,xor,' +
+ '__halt_compiler,abstract,and,array,as,break,callable,case,catch,class,' +
+ 'clone,const,continue,declare,default,die,do,echo,else,elseif,empty,' +
+ 'enddeclare,endfor,endforeach,endif,endswitch,endwhile,eval,exit,extends,' +
+ 'final,for,foreach,function,global,goto,if,implements,include,' +
+ 'include_once,instanceof,insteadof,interface,isset,list,namespace,new,or,' +
+ 'print,private,protected,public,require,require_once,return,static,' +
+ 'switch,throw,trait,try,unset,use,var,while,xor,' +
// http://php.net/manual/en/reserved.constants.php
- 'PHP_VERSION,PHP_MAJOR_VERSION,PHP_MINOR_VERSION,PHP_RELEASE_VERSION,PHP_VERSION_ID,PHP_EXTRA_VERSION,PHP_ZTS,PHP_DEBUG,PHP_MAXPATHLEN,PHP_OS,PHP_SAPI,PHP_EOL,PHP_INT_MAX,PHP_INT_SIZE,DEFAULT_INCLUDE_PATH,PEAR_INSTALL_DIR,PEAR_EXTENSION_DIR,PHP_EXTENSION_DIR,PHP_PREFIX,PHP_BINDIR,PHP_BINARY,PHP_MANDIR,PHP_LIBDIR,PHP_DATADIR,PHP_SYSCONFDIR,PHP_LOCALSTATEDIR,PHP_CONFIG_FILE_PATH,PHP_CONFIG_FILE_SCAN_DIR,PHP_SHLIB_SUFFIX,E_ERROR,E_WARNING,E_PARSE,E_NOTICE,E_CORE_ERROR,E_CORE_WARNING,E_COMPILE_ERROR,E_COMPILE_WARNING,E_USER_ERROR,E_USER_WARNING,E_USER_NOTICE,E_DEPRECATED,E_USER_DEPRECATED,E_ALL,E_STRICT,__COMPILER_HALT_OFFSET__,TRUE,FALSE,NULL,__CLASS__,__DIR__,__FILE__,__FUNCTION__,__LINE__,__METHOD__,__NAMESPACE__,__TRAIT__');
+ 'PHP_VERSION,PHP_MAJOR_VERSION,PHP_MINOR_VERSION,PHP_RELEASE_VERSION,' +
+ 'PHP_VERSION_ID,PHP_EXTRA_VERSION,PHP_ZTS,PHP_DEBUG,PHP_MAXPATHLEN,' +
+ 'PHP_OS,PHP_SAPI,PHP_EOL,PHP_INT_MAX,PHP_INT_SIZE,DEFAULT_INCLUDE_PATH,' +
+ 'PEAR_INSTALL_DIR,PEAR_EXTENSION_DIR,PHP_EXTENSION_DIR,PHP_PREFIX,' +
+ 'PHP_BINDIR,PHP_BINARY,PHP_MANDIR,PHP_LIBDIR,PHP_DATADIR,PHP_SYSCONFDIR,' +
+ 'PHP_LOCALSTATEDIR,PHP_CONFIG_FILE_PATH,PHP_CONFIG_FILE_SCAN_DIR,' +
+ 'PHP_SHLIB_SUFFIX,E_ERROR,E_WARNING,E_PARSE,E_NOTICE,E_CORE_ERROR,' +
+ 'E_CORE_WARNING,E_COMPILE_ERROR,E_COMPILE_WARNING,E_USER_ERROR,' +
+ 'E_USER_WARNING,E_USER_NOTICE,E_DEPRECATED,E_USER_DEPRECATED,E_ALL,' +
+ 'E_STRICT,__COMPILER_HALT_OFFSET__,TRUE,FALSE,NULL,__CLASS__,__DIR__,' +
+ '__FILE__,__FUNCTION__,__LINE__,__METHOD__,__NAMESPACE__,__TRAIT__'
+);
/**
* Order of operation ENUMs.
* http://php.net/manual/en/language.operators.precedence.php
*/
-Blockly.PHP.ORDER_ATOMIC = 0; // 0 "" ...
-Blockly.PHP.ORDER_CLONE = 1; // clone
-Blockly.PHP.ORDER_NEW = 1; // new
-Blockly.PHP.ORDER_MEMBER = 2; // ()
-Blockly.PHP.ORDER_FUNCTION_CALL = 2; // ()
-Blockly.PHP.ORDER_INCREMENT = 3; // ++
-Blockly.PHP.ORDER_DECREMENT = 3; // --
-Blockly.PHP.ORDER_LOGICAL_NOT = 4; // !
-Blockly.PHP.ORDER_BITWISE_NOT = 4; // ~
-Blockly.PHP.ORDER_UNARY_PLUS = 4; // +
-Blockly.PHP.ORDER_UNARY_NEGATION = 4; // -
-Blockly.PHP.ORDER_MULTIPLICATION = 5; // *
-Blockly.PHP.ORDER_DIVISION = 5; // /
-Blockly.PHP.ORDER_MODULUS = 5; // %
-Blockly.PHP.ORDER_ADDITION = 6; // +
-Blockly.PHP.ORDER_SUBTRACTION = 6; // -
-Blockly.PHP.ORDER_BITWISE_SHIFT = 7; // << >> >>>
-Blockly.PHP.ORDER_RELATIONAL = 8; // < <= > >=
-Blockly.PHP.ORDER_IN = 8; // in
-Blockly.PHP.ORDER_INSTANCEOF = 8; // instanceof
-Blockly.PHP.ORDER_EQUALITY = 9; // == != === !==
-Blockly.PHP.ORDER_BITWISE_AND = 10; // &
-Blockly.PHP.ORDER_BITWISE_XOR = 11; // ^
-Blockly.PHP.ORDER_BITWISE_OR = 12; // |
-Blockly.PHP.ORDER_CONDITIONAL = 13; // ?:
-Blockly.PHP.ORDER_ASSIGNMENT = 14; // = += -= *= /= %= <<= >>= ...
-Blockly.PHP.ORDER_LOGICAL_AND = 15; // &&
-Blockly.PHP.ORDER_LOGICAL_OR = 16; // ||
-Blockly.PHP.ORDER_COMMA = 17; // ,
-Blockly.PHP.ORDER_NONE = 99; // (...)
+Blockly.PHP.ORDER_ATOMIC = 0; // 0 "" ...
+Blockly.PHP.ORDER_CLONE = 1; // clone
+Blockly.PHP.ORDER_NEW = 1; // new
+Blockly.PHP.ORDER_MEMBER = 2.1; // []
+Blockly.PHP.ORDER_FUNCTION_CALL = 2.2; // ()
+Blockly.PHP.ORDER_POWER = 3; // **
+Blockly.PHP.ORDER_INCREMENT = 4; // ++
+Blockly.PHP.ORDER_DECREMENT = 4; // --
+Blockly.PHP.ORDER_BITWISE_NOT = 4; // ~
+Blockly.PHP.ORDER_CAST = 4; // (int) (float) (string) (array) ...
+Blockly.PHP.ORDER_SUPPRESS_ERROR = 4; // @
+Blockly.PHP.ORDER_INSTANCEOF = 5; // instanceof
+Blockly.PHP.ORDER_LOGICAL_NOT = 6; // !
+Blockly.PHP.ORDER_UNARY_PLUS = 7.1; // +
+Blockly.PHP.ORDER_UNARY_NEGATION = 7.2; // -
+Blockly.PHP.ORDER_MULTIPLICATION = 8.1; // *
+Blockly.PHP.ORDER_DIVISION = 8.2; // /
+Blockly.PHP.ORDER_MODULUS = 8.3; // %
+Blockly.PHP.ORDER_ADDITION = 9.1; // +
+Blockly.PHP.ORDER_SUBTRACTION = 9.2; // -
+Blockly.PHP.ORDER_STRING_CONCAT = 9.3; // .
+Blockly.PHP.ORDER_BITWISE_SHIFT = 10; // << >>
+Blockly.PHP.ORDER_RELATIONAL = 11; // < <= > >=
+Blockly.PHP.ORDER_EQUALITY = 12; // == != === !== <> <=>
+Blockly.PHP.ORDER_REFERENCE = 13; // &
+Blockly.PHP.ORDER_BITWISE_AND = 13; // &
+Blockly.PHP.ORDER_BITWISE_XOR = 14; // ^
+Blockly.PHP.ORDER_BITWISE_OR = 15; // |
+Blockly.PHP.ORDER_LOGICAL_AND = 16; // &&
+Blockly.PHP.ORDER_LOGICAL_OR = 17; // ||
+Blockly.PHP.ORDER_IF_NULL = 18; // ??
+Blockly.PHP.ORDER_CONDITIONAL = 19; // ?:
+Blockly.PHP.ORDER_ASSIGNMENT = 20; // = += -= *= /= %= <<= >>= ...
+Blockly.PHP.ORDER_LOGICAL_AND_WEAK = 21; // and
+Blockly.PHP.ORDER_LOGICAL_XOR = 22; // xor
+Blockly.PHP.ORDER_LOGICAL_OR_WEAK = 23; // or
+Blockly.PHP.ORDER_COMMA = 24; // ,
+Blockly.PHP.ORDER_NONE = 99; // (...)
+
+/**
+ * List of outer-inner pairings that do NOT require parentheses.
+ * @type {!Array.>}
+ */
+Blockly.PHP.ORDER_OVERRIDES = [
+ // (foo()).bar() -> foo().bar()
+ // (foo())[0] -> foo()[0]
+ [Blockly.PHP.ORDER_MEMBER, Blockly.PHP.ORDER_FUNCTION_CALL],
+ // (foo[0])[1] -> foo[0][1]
+ // (foo.bar).baz -> foo.bar.baz
+ [Blockly.PHP.ORDER_MEMBER, Blockly.PHP.ORDER_MEMBER],
+ // !(!foo) -> !!foo
+ [Blockly.PHP.ORDER_LOGICAL_NOT, Blockly.PHP.ORDER_LOGICAL_NOT],
+ // a * (b * c) -> a * b * c
+ [Blockly.PHP.ORDER_MULTIPLICATION, Blockly.PHP.ORDER_MULTIPLICATION],
+ // a + (b + c) -> a + b + c
+ [Blockly.PHP.ORDER_ADDITION, Blockly.PHP.ORDER_ADDITION],
+ // a && (b && c) -> a && b && c
+ [Blockly.PHP.ORDER_LOGICAL_AND, Blockly.PHP.ORDER_LOGICAL_AND],
+ // a || (b || c) -> a || b || c
+ [Blockly.PHP.ORDER_LOGICAL_OR, Blockly.PHP.ORDER_LOGICAL_OR]
+];
+
+/**
+ * Allow for switching between one and zero based indexing for lists and text,
+ * one based by default.
+ */
+Blockly.PHP.ONE_BASED_INDEXING = true;
/**
* Initialise the database of variable names.
@@ -167,15 +221,15 @@ Blockly.PHP.scrub_ = function(block, code) {
if (!block.outputConnection || !block.outputConnection.targetConnection) {
// Collect comment for this block.
var comment = block.getCommentText();
- comment = Blockly.utils.wrap(comment, this.COMMENT_WRAP - 3);
+ comment = Blockly.utils.wrap(comment, Blockly.PHP.COMMENT_WRAP - 3);
if (comment) {
commentCode += Blockly.PHP.prefixLines(comment, '// ') + '\n';
}
// Collect comments for all value arguments.
// Don't collect comments for nested statements.
- for (var x = 0; x < block.inputList.length; x++) {
- if (block.inputList[x].type == Blockly.INPUT_VALUE) {
- var childBlock = block.inputList[x].connection.targetBlock();
+ for (var i = 0; i < block.inputList.length; i++) {
+ if (block.inputList[i].type == Blockly.INPUT_VALUE) {
+ var childBlock = block.inputList[i].connection.targetBlock();
if (childBlock) {
var comment = Blockly.PHP.allNestedComments(childBlock);
if (comment) {
@@ -189,3 +243,66 @@ Blockly.PHP.scrub_ = function(block, code) {
var nextCode = Blockly.PHP.blockToCode(nextBlock);
return commentCode + code + nextCode;
};
+
+/**
+ * Gets a property and adjusts the value while taking into account indexing.
+ * @param {!Blockly.Block} block The block.
+ * @param {string} atId The property ID of the element to get.
+ * @param {number=} opt_delta Value to add.
+ * @param {boolean=} opt_negate Whether to negate the value.
+ * @param {number=} opt_order The highest order acting on this value.
+ * @return {string|number}
+ */
+Blockly.PHP.getAdjusted = function(block, atId, opt_delta, opt_negate,
+ opt_order) {
+ var delta = opt_delta || 0;
+ var order = opt_order || Blockly.PHP.ORDER_NONE;
+ if (Blockly.PHP.ONE_BASED_INDEXING) {
+ delta--;
+ }
+ var defaultAtIndex = Blockly.PHP.ONE_BASED_INDEXING ? '1' : '0';
+ if (delta > 0) {
+ var at = Blockly.PHP.valueToCode(block, atId,
+ Blockly.PHP.ORDER_ADDITION) || defaultAtIndex;
+ } else if (delta < 0) {
+ var at = Blockly.PHP.valueToCode(block, atId,
+ Blockly.PHP.ORDER_SUBTRACTION) || defaultAtIndex;
+ } else if (opt_negate) {
+ var at = Blockly.PHP.valueToCode(block, atId,
+ Blockly.PHP.ORDER_UNARY_NEGATION) || defaultAtIndex;
+ } else {
+ var at = Blockly.PHP.valueToCode(block, atId, order) ||
+ defaultAtIndex;
+ }
+
+ if (Blockly.isNumber(at)) {
+ // If the index is a naked number, adjust it right now.
+ at = parseFloat(at) + delta;
+ if (opt_negate) {
+ at = -at;
+ }
+ } else {
+ // If the index is dynamic, adjust it in code.
+ if (delta > 0) {
+ at = at + ' + ' + delta;
+ var innerOrder = Blockly.PHP.ORDER_ADDITION;
+ } else if (delta < 0) {
+ at = at + ' - ' + -delta;
+ var innerOrder = Blockly.PHP.ORDER_SUBTRACTION;
+ }
+ if (opt_negate) {
+ if (delta) {
+ at = '-(' + at + ')';
+ } else {
+ at = '-' + at;
+ }
+ var innerOrder = Blockly.PHP.ORDER_UNARY_NEGATION;
+ }
+ innerOrder = Math.floor(innerOrder);
+ order = Math.floor(order);
+ if (innerOrder && order >= innerOrder) {
+ at = '(' + at + ')';
+ }
+ }
+ return at;
+};
diff --git a/generators/php/colour.js b/generators/php/colour.js
index bc1789c35..e73c17a95 100644
--- a/generators/php/colour.js
+++ b/generators/php/colour.js
@@ -39,10 +39,10 @@ Blockly.PHP['colour_random'] = function(block) {
// Generate a random colour.
var functionName = Blockly.PHP.provideFunction_(
'colour_random',
- [ 'function ' + Blockly.PHP.FUNCTION_NAME_PLACEHOLDER_ + '() {',
- ' return \'#\' . str_pad(dechex(mt_rand(0, 0xFFFFFF)), ' +
- '6, \'0\', STR_PAD_LEFT);',
- '}']);
+ ['function ' + Blockly.PHP.FUNCTION_NAME_PLACEHOLDER_ + '() {',
+ ' return \'#\' . str_pad(dechex(mt_rand(0, 0xFFFFFF)), ' +
+ '6, \'0\', STR_PAD_LEFT);',
+ '}']);
var code = functionName + '()';
return [code, Blockly.PHP.ORDER_FUNCTION_CALL];
};
@@ -57,17 +57,17 @@ Blockly.PHP['colour_rgb'] = function(block) {
Blockly.PHP.ORDER_COMMA) || 0;
var functionName = Blockly.PHP.provideFunction_(
'colour_rgb',
- [ 'function ' + Blockly.PHP.FUNCTION_NAME_PLACEHOLDER_ +
+ ['function ' + Blockly.PHP.FUNCTION_NAME_PLACEHOLDER_ +
'($r, $g, $b) {',
- ' $r = round(max(min($r, 100), 0) * 2.55);',
- ' $g = round(max(min($g, 100), 0) * 2.55);',
- ' $b = round(max(min($b, 100), 0) * 2.55);',
- ' $hex = "#";',
- ' $hex .= str_pad(dechex($r), 2, "0", STR_PAD_LEFT);',
- ' $hex .= str_pad(dechex($g), 2, "0", STR_PAD_LEFT);',
- ' $hex .= str_pad(dechex($b), 2, "0", STR_PAD_LEFT);',
- ' return $hex;',
- '}']);
+ ' $r = round(max(min($r, 100), 0) * 2.55);',
+ ' $g = round(max(min($g, 100), 0) * 2.55);',
+ ' $b = round(max(min($b, 100), 0) * 2.55);',
+ ' $hex = \'#\';',
+ ' $hex .= str_pad(dechex($r), 2, \'0\', STR_PAD_LEFT);',
+ ' $hex .= str_pad(dechex($g), 2, \'0\', STR_PAD_LEFT);',
+ ' $hex .= str_pad(dechex($b), 2, \'0\', STR_PAD_LEFT);',
+ ' return $hex;',
+ '}']);
var code = functionName + '(' + red + ', ' + green + ', ' + blue + ')';
return [code, Blockly.PHP.ORDER_FUNCTION_CALL];
};
@@ -82,24 +82,24 @@ Blockly.PHP['colour_blend'] = function(block) {
Blockly.PHP.ORDER_COMMA) || 0.5;
var functionName = Blockly.PHP.provideFunction_(
'colour_blend',
- [ 'function ' + Blockly.PHP.FUNCTION_NAME_PLACEHOLDER_ +
+ ['function ' + Blockly.PHP.FUNCTION_NAME_PLACEHOLDER_ +
'($c1, $c2, $ratio) {',
- ' $ratio = max(min($ratio, 1), 0);',
- ' $r1 = hexdec(substr($c1, 1, 2));',
- ' $g1 = hexdec(substr($c1, 3, 2));',
- ' $b1 = hexdec(substr($c1, 5, 2));',
- ' $r2 = hexdec(substr($c2, 1, 2));',
- ' $g2 = hexdec(substr($c2, 3, 2));',
- ' $b2 = hexdec(substr($c2, 5, 2));',
- ' $r = round($r1 * (1 - $ratio) + $r2 * $ratio);',
- ' $g = round($g1 * (1 - $ratio) + $g2 * $ratio);',
- ' $b = round($b1 * (1 - $ratio) + $b2 * $ratio);',
- ' $hex = "#";',
- ' $hex .= str_pad(dechex($r), 2, "0", STR_PAD_LEFT);',
- ' $hex .= str_pad(dechex($g), 2, "0", STR_PAD_LEFT);',
- ' $hex .= str_pad(dechex($b), 2, "0", STR_PAD_LEFT);',
- ' return $hex;',
- '}']);
+ ' $ratio = max(min($ratio, 1), 0);',
+ ' $r1 = hexdec(substr($c1, 1, 2));',
+ ' $g1 = hexdec(substr($c1, 3, 2));',
+ ' $b1 = hexdec(substr($c1, 5, 2));',
+ ' $r2 = hexdec(substr($c2, 1, 2));',
+ ' $g2 = hexdec(substr($c2, 3, 2));',
+ ' $b2 = hexdec(substr($c2, 5, 2));',
+ ' $r = round($r1 * (1 - $ratio) + $r2 * $ratio);',
+ ' $g = round($g1 * (1 - $ratio) + $g2 * $ratio);',
+ ' $b = round($b1 * (1 - $ratio) + $b2 * $ratio);',
+ ' $hex = \'#\';',
+ ' $hex .= str_pad(dechex($r), 2, \'0\', STR_PAD_LEFT);',
+ ' $hex .= str_pad(dechex($g), 2, \'0\', STR_PAD_LEFT);',
+ ' $hex .= str_pad(dechex($b), 2, \'0\', STR_PAD_LEFT);',
+ ' return $hex;',
+ '}']);
var code = functionName + '(' + c1 + ', ' + c2 + ', ' + ratio + ')';
return [code, Blockly.PHP.ORDER_FUNCTION_CALL];
};
diff --git a/generators/php/lists.js b/generators/php/lists.js
index a406aa6d2..449c31a5e 100644
--- a/generators/php/lists.js
+++ b/generators/php/lists.js
@@ -22,6 +22,17 @@
* @fileoverview Generating PHP for list blocks.
* @author daarond@gmail.com (Daaron Dwyer)
*/
+
+/*
+ * Lists in PHP are known to break when non-variables are passed into blocks
+ * that require a list. PHP, unlike other languages, passes arrays as reference
+ * value instead of value so we are unable to support it to the extent we can
+ * for the other languages.
+ * For example, a ternary operator with two arrays will return the array by
+ * value and that cannot be passed into any of the built-in array functions for
+ * PHP (because only variables can be passed by reference).
+ * ex: end(true ? list1 : list2)
+ */
'use strict';
goog.provide('Blockly.PHP.lists');
@@ -31,37 +42,37 @@ goog.require('Blockly.PHP');
Blockly.PHP['lists_create_empty'] = function(block) {
// Create an empty list.
- return ['array()', Blockly.PHP.ORDER_ATOMIC];
+ return ['array()', Blockly.PHP.ORDER_FUNCTION_CALL];
};
Blockly.PHP['lists_create_with'] = function(block) {
// Create a list with any number of elements of any type.
var code = new Array(block.itemCount_);
- for (var n = 0; n < block.itemCount_; n++) {
- code[n] = Blockly.PHP.valueToCode(block, 'ADD' + n,
+ for (var i = 0; i < block.itemCount_; i++) {
+ code[i] = Blockly.PHP.valueToCode(block, 'ADD' + i,
Blockly.PHP.ORDER_COMMA) || 'null';
}
code = 'array(' + code.join(', ') + ')';
- return [code, Blockly.PHP.ORDER_ATOMIC];
+ return [code, Blockly.PHP.ORDER_FUNCTION_CALL];
};
Blockly.PHP['lists_repeat'] = function(block) {
// Create a list with one element repeated.
var functionName = Blockly.PHP.provideFunction_(
'lists_repeat',
- [ 'function ' + Blockly.PHP.FUNCTION_NAME_PLACEHOLDER_ +
+ ['function ' + Blockly.PHP.FUNCTION_NAME_PLACEHOLDER_ +
'($value, $count) {',
- ' $array = array();',
- ' for ($index = 0; $index < $count; $index++) {',
- ' $array[] = $value;',
- ' }',
- ' return $array;',
- '}']);
- var argument0 = Blockly.PHP.valueToCode(block, 'ITEM',
+ ' $array = array();',
+ ' for ($index = 0; $index < $count; $index++) {',
+ ' $array[] = $value;',
+ ' }',
+ ' return $array;',
+ '}']);
+ var element = Blockly.PHP.valueToCode(block, 'ITEM',
Blockly.PHP.ORDER_COMMA) || 'null';
- var argument1 = Blockly.PHP.valueToCode(block, 'NUM',
+ var repeatCount = Blockly.PHP.valueToCode(block, 'NUM',
Blockly.PHP.ORDER_COMMA) || '0';
- var code = functionName + '(' + argument0 + ', ' + argument1 + ')';
+ var code = functionName + '(' + element + ', ' + repeatCount + ')';
return [code, Blockly.PHP.ORDER_FUNCTION_CALL];
};
@@ -69,16 +80,16 @@ Blockly.PHP['lists_length'] = function(block) {
// String or array length.
var functionName = Blockly.PHP.provideFunction_(
'length',
- [ 'function ' + Blockly.PHP.FUNCTION_NAME_PLACEHOLDER_ + '($value) {',
- ' if (is_string($value)) {',
- ' return strlen($value);',
- ' } else {',
- ' return count($value);',
- ' }',
- '}']);
- var argument0 = Blockly.PHP.valueToCode(block, 'VALUE',
- Blockly.PHP.ORDER_FUNCTION_CALL) || '\'\'';
- return [functionName + '(' + argument0 + ')', Blockly.PHP.ORDER_FUNCTION_CALL];
+ ['function ' + Blockly.PHP.FUNCTION_NAME_PLACEHOLDER_ + '($value) {',
+ ' if (is_string($value)) {',
+ ' return strlen($value);',
+ ' } else {',
+ ' return count($value);',
+ ' }',
+ '}']);
+ var list = Blockly.PHP.valueToCode(block, 'VALUE',
+ Blockly.PHP.ORDER_NONE) || '\'\'';
+ return [functionName + '(' + list + ')', Blockly.PHP.ORDER_FUNCTION_CALL];
};
Blockly.PHP['lists_isEmpty'] = function(block) {
@@ -90,36 +101,42 @@ Blockly.PHP['lists_isEmpty'] = function(block) {
Blockly.PHP['lists_indexOf'] = function(block) {
// Find an item in the list.
- var operator = block.getFieldValue('END') == 'FIRST' ?
- 'indexOf' : 'lastIndexOf';
var argument0 = Blockly.PHP.valueToCode(block, 'FIND',
Blockly.PHP.ORDER_NONE) || '\'\'';
var argument1 = Blockly.PHP.valueToCode(block, 'VALUE',
Blockly.PHP.ORDER_MEMBER) || '[]';
- var functionName;
- if (block.getFieldValue('END') == 'FIRST'){
+ if (Blockly.PHP.ONE_BASED_INDEXING) {
+ var errorIndex = ' 0';
+ var indexAdjustment = ' + 1';
+ } else {
+ var errorIndex = ' -1';
+ var indexAdjustment = '';
+ }
+ if (block.getFieldValue('END') == 'FIRST') {
// indexOf
- functionName = Blockly.PHP.provideFunction_(
+ var functionName = Blockly.PHP.provideFunction_(
'indexOf',
- [ 'function ' + Blockly.PHP.FUNCTION_NAME_PLACEHOLDER_ +
- '($haystack, $needle) {',
- ' for ($index = 0; $index < count($haystack); $index++) {',
- ' if ($haystack[$index] == $needle) return $index + 1;',
- ' }',
- ' return 0;',
- '}']);
+ ['function ' + Blockly.PHP.FUNCTION_NAME_PLACEHOLDER_ +
+ '($haystack, $needle) {',
+ ' for ($index = 0; $index < count($haystack); $index++) {',
+ ' if ($haystack[$index] == $needle) return $index' +
+ indexAdjustment + ';',
+ ' }',
+ ' return ' + errorIndex + ';',
+ '}']);
} else {
// lastIndexOf
- functionName = Blockly.PHP.provideFunction_(
+ var functionName = Blockly.PHP.provideFunction_(
'lastIndexOf',
- [ 'function ' + Blockly.PHP.FUNCTION_NAME_PLACEHOLDER_ +
- '($haystack, $needle) {',
- ' $last = 0;',
- ' for ($index = 0; $index < count($haystack); $index++) {',
- ' if ($haystack[$index] == $needle) $last = $index + 1;',
- ' }',
- ' return $last;',
- '}']);
+ ['function ' + Blockly.PHP.FUNCTION_NAME_PLACEHOLDER_ +
+ '($haystack, $needle) {',
+ ' $last = ' + errorIndex + ';',
+ ' for ($index = 0; $index < count($haystack); $index++) {',
+ ' if ($haystack[$index] == $needle) $last = $index' +
+ indexAdjustment + ';',
+ ' }',
+ ' return $last;',
+ '}']);
}
var code = functionName + '(' + argument1 + ', ' + argument0 + ')';
@@ -130,97 +147,113 @@ Blockly.PHP['lists_getIndex'] = function(block) {
// Get element at index.
var mode = block.getFieldValue('MODE') || 'GET';
var where = block.getFieldValue('WHERE') || 'FROM_START';
- var at = Blockly.PHP.valueToCode(block, 'AT',
- Blockly.PHP.ORDER_UNARY_NEGATION) || '1';
- if (mode == 'GET') {
- var order = Blockly.PHP.ORDER_FUNCTION_CALL;
- } else {
- // List will be an argument in a function call.
- var order = Blockly.PHP.ORDER_COMMA;
- }
- var list = Blockly.PHP.valueToCode(block, 'VALUE', order) || 'array()';
-
- if (where == 'FIRST') {
- if (mode == 'GET') {
- var code = list + '[0]';
- return [code, Blockly.PHP.ORDER_FUNCTION_CALL];
- } else if (mode == 'GET_REMOVE') {
- var code = 'array_shift(' + list + ')';
- return [code, Blockly.PHP.ORDER_FUNCTION_CALL];
- } else if (mode == 'REMOVE') {
- return 'array_shift(' + list + ');\n';
- }
- } else if (where == 'LAST') {
- if (mode == 'GET') {
- var code = 'end(' + list + ')';
- return [code, Blockly.PHP.ORDER_FUNCTION_CALL];
- } else if (mode == 'GET_REMOVE') {
- var code = 'array_pop(' + list + ')';
- return [code, Blockly.PHP.ORDER_FUNCTION_CALL];
- } else if (mode == 'REMOVE') {
- return 'array_pop(' + list + ');\n';
- }
- } else if (where == 'FROM_START') {
- // Blockly uses one-based indicies.
- if (Blockly.isNumber(at)) {
- // If the index is a naked number, decrement it right now.
- at = parseFloat(at) - 1;
- } else {
- // If the index is dynamic, decrement it in code.
- at += ' - 1';
- }
- if (mode == 'GET') {
- var code = list + '[' + at + ']';
- return [code, Blockly.PHP.ORDER_FUNCTION_CALL];
- } else if (mode == 'GET_REMOVE') {
- var code = 'array_splice(' + list + ', ' + at + ', 1)[0]';
- return [code, Blockly.PHP.ORDER_FUNCTION_CALL];
- } else if (mode == 'REMOVE') {
- return 'array_splice(' + list + ', ' + at + ', 1);\n';
- }
- } else if (where == 'FROM_END') {
- if (mode == 'GET') {
- var code = 'array_slice(' + list + ', -' + at + ', 1)[0]';
- return [code, Blockly.PHP.ORDER_FUNCTION_CALL];
- } else if (mode == 'GET_REMOVE' || mode == 'REMOVE') {
- code = 'array_splice(' + list +
- ', count(' + list + ') - ' + at + ', 1)[0]';
- if (mode == 'GET_REMOVE') {
+ switch (where) {
+ case 'FIRST':
+ if (mode == 'GET') {
+ var list = Blockly.PHP.valueToCode(block, 'VALUE',
+ Blockly.PHP.ORDER_MEMBER) || 'array()';
+ var code = list + '[0]';
+ return [code, Blockly.PHP.ORDER_MEMBER];
+ } else if (mode == 'GET_REMOVE') {
+ var list = Blockly.PHP.valueToCode(block, 'VALUE',
+ Blockly.PHP.ORDER_NONE) || 'array()';
+ var code = 'array_shift(' + list + ')';
return [code, Blockly.PHP.ORDER_FUNCTION_CALL];
} else if (mode == 'REMOVE') {
- return code + ';\n';
+ var list = Blockly.PHP.valueToCode(block, 'VALUE',
+ Blockly.PHP.ORDER_NONE) || 'array()';
+ return 'array_shift(' + list + ');\n';
}
- }
- } else if (where == 'RANDOM') {
- if (mode == 'GET'){
- var functionName = Blockly.PHP.provideFunction_(
- 'lists_get_random_item',
- [ 'function ' + Blockly.PHP.FUNCTION_NAME_PLACEHOLDER_ +
- '($list) {',
- ' return $list[rand(0,count($list)-1)];',
- '}']);
- code = functionName + '(' + list + ')';
- return [code, Blockly.PHP.ORDER_FUNCTION_CALL];
- } else if (mode == 'GET_REMOVE'){
- var functionName = Blockly.PHP.provideFunction_(
- 'lists_get_remove_random_item',
- [ 'function ' + Blockly.PHP.FUNCTION_NAME_PLACEHOLDER_ +
- '(&$list) {',
- ' $x = rand(0,count($list)-1);',
- ' unset($list[$x]);',
- ' return array_values($list);',
- '}']);
- code = functionName + '(' + list + ')';
- return [code, Blockly.PHP.ORDER_FUNCTION_CALL];
- } else if (mode == 'REMOVE') {
- var functionName = Blockly.PHP.provideFunction_(
- 'lists_remove_random_item',
- [ 'function ' + Blockly.PHP.FUNCTION_NAME_PLACEHOLDER_ +
- '(&$list) {',
- ' unset($list[rand(0,count($list)-1)]);',
- '}']);
- return functionName + '(' + list + ');\n';
- }
+ break;
+ case 'LAST':
+ if (mode == 'GET') {
+ var list = Blockly.PHP.valueToCode(block, 'VALUE',
+ Blockly.PHP.ORDER_NONE) || 'array()';
+ var code = 'end(' + list + ')';
+ return [code, Blockly.PHP.ORDER_FUNCTION_CALL];
+ } else if (mode == 'GET_REMOVE') {
+ var list = Blockly.PHP.valueToCode(block, 'VALUE',
+ Blockly.PHP.ORDER_NONE) || 'array()';
+ var code = 'array_pop(' + list + ')';
+ return [code, Blockly.PHP.ORDER_FUNCTION_CALL];
+ } else if (mode == 'REMOVE') {
+ var list = Blockly.PHP.valueToCode(block, 'VALUE',
+ Blockly.PHP.ORDER_NONE) || 'array()';
+ return 'array_pop(' + list + ');\n';
+ }
+ break;
+ case 'FROM_START':
+ var at = Blockly.PHP.getAdjusted(block, 'AT');
+ if (mode == 'GET') {
+ var list = Blockly.PHP.valueToCode(block, 'VALUE',
+ Blockly.PHP.ORDER_MEMBER) || 'array()';
+ var code = list + '[' + at + ']';
+ return [code, Blockly.PHP.ORDER_MEMBER];
+ } else if (mode == 'GET_REMOVE') {
+ var list = Blockly.PHP.valueToCode(block, 'VALUE',
+ Blockly.PHP.ORDER_COMMA) || 'array()';
+ var code = 'array_splice(' + list + ', ' + at + ', 1)[0]';
+ return [code, Blockly.PHP.ORDER_FUNCTION_CALL];
+ } else if (mode == 'REMOVE') {
+ var list = Blockly.PHP.valueToCode(block, 'VALUE',
+ Blockly.PHP.ORDER_COMMA) || 'array()';
+ return 'array_splice(' + list + ', ' + at + ', 1);\n';
+ }
+ break;
+ case 'FROM_END':
+ if (mode == 'GET') {
+ var list = Blockly.PHP.valueToCode(block, 'VALUE',
+ Blockly.PHP.ORDER_COMMA) || 'array()';
+ var at = Blockly.PHP.getAdjusted(block, 'AT', 1, true);
+ var code = 'array_slice(' + list + ', ' + at + ', 1)[0]';
+ return [code, Blockly.PHP.ORDER_FUNCTION_CALL];
+ } else if (mode == 'GET_REMOVE' || mode == 'REMOVE') {
+ var list = Blockly.PHP.valueToCode(block, 'VALUE',
+ Blockly.PHP.ORDER_NONE) || 'array()';
+ var at = Blockly.PHP.getAdjusted(block, 'AT', 1, false,
+ Blockly.PHP.ORDER_SUBTRACTION);
+ code = 'array_splice(' + list +
+ ', count(' + list + ') - ' + at + ', 1)[0]';
+ if (mode == 'GET_REMOVE') {
+ return [code, Blockly.PHP.ORDER_FUNCTION_CALL];
+ } else if (mode == 'REMOVE') {
+ return code + ';\n';
+ }
+ }
+ break;
+ case 'RANDOM':
+ var list = Blockly.PHP.valueToCode(block, 'VALUE',
+ Blockly.PHP.ORDER_NONE) || 'array()';
+ if (mode == 'GET') {
+ var functionName = Blockly.PHP.provideFunction_(
+ 'lists_get_random_item',
+ ['function ' + Blockly.PHP.FUNCTION_NAME_PLACEHOLDER_ +
+ '($list) {',
+ ' return $list[rand(0,count($list)-1)];',
+ '}']);
+ code = functionName + '(' + list + ')';
+ return [code, Blockly.PHP.ORDER_FUNCTION_CALL];
+ } else if (mode == 'GET_REMOVE') {
+ var functionName = Blockly.PHP.provideFunction_(
+ 'lists_get_remove_random_item',
+ ['function ' + Blockly.PHP.FUNCTION_NAME_PLACEHOLDER_ +
+ '(&$list) {',
+ ' $x = rand(0,count($list)-1);',
+ ' unset($list[$x]);',
+ ' return array_values($list);',
+ '}']);
+ code = functionName + '(' + list + ')';
+ return [code, Blockly.PHP.ORDER_FUNCTION_CALL];
+ } else if (mode == 'REMOVE') {
+ var functionName = Blockly.PHP.provideFunction_(
+ 'lists_remove_random_item',
+ ['function ' + Blockly.PHP.FUNCTION_NAME_PLACEHOLDER_ +
+ '(&$list) {',
+ ' unset($list[rand(0,count($list)-1)]);',
+ '}']);
+ return functionName + '(' + list + ');\n';
+ }
+ break;
}
throw 'Unhandled combination (lists_getIndex).';
};
@@ -228,18 +261,14 @@ Blockly.PHP['lists_getIndex'] = function(block) {
Blockly.PHP['lists_setIndex'] = function(block) {
// Set element at index.
// Note: Until February 2013 this block did not have MODE or WHERE inputs.
- var list = Blockly.PHP.valueToCode(block, 'LIST',
- Blockly.PHP.ORDER_MEMBER) || 'array()';
var mode = block.getFieldValue('MODE') || 'GET';
var where = block.getFieldValue('WHERE') || 'FROM_START';
- var at = Blockly.PHP.valueToCode(block, 'AT',
- Blockly.PHP.ORDER_NONE) || '1';
var value = Blockly.PHP.valueToCode(block, 'TO',
Blockly.PHP.ORDER_ASSIGNMENT) || 'null';
// Cache non-trivial values to variables to prevent repeated look-ups.
// Closure, which accesses and modifies 'list'.
function cacheList() {
- if (list.match(/^\w+$/)) {
+ if (list.match(/^\$\w+$/)) {
return '';
}
var listVar = Blockly.PHP.variableDB_.getDistinctName(
@@ -248,68 +277,83 @@ Blockly.PHP['lists_setIndex'] = function(block) {
list = listVar;
return code;
}
- if (where == 'FIRST') {
- if (mode == 'SET') {
- return list + '[0] = ' + value + ';\n';
- } else if (mode == 'INSERT') {
- return 'array_unshift(' + list + ', ' + value + ');\n';
- }
- } else if (where == 'LAST') {
- if (mode == 'SET') {
- var functionName = Blockly.PHP.provideFunction_(
- 'lists_set_last_item',
- [ 'function ' + Blockly.PHP.FUNCTION_NAME_PLACEHOLDER_ +
- '(&$list, $value) {',
- ' $list[count($list) - 1] = $value;',
- '}']);
- return functionName + '(' + list + ', ' + value + ');\n';
- } else if (mode == 'INSERT') {
- return 'array_push(' + list + ', ' + value + ');\n';
- }
- } else if (where == 'FROM_START') {
- // Blockly uses one-based indicies.
- if (Blockly.isNumber(at)) {
- // If the index is a naked number, decrement it right now.
- at = parseFloat(at) - 1;
- } else {
- // If the index is dynamic, decrement it in code.
- at += ' - 1';
- }
- if (mode == 'SET') {
- return list + '[' + at + '] = ' + value + ';\n';
- } else if (mode == 'INSERT') {
- return 'array_splice(' + list + ', ' + at + ', 0, ' + value + ');\n';
- }
- } else if (where == 'FROM_END') {
- if (mode == 'SET') {
- var functionName = Blockly.PHP.provideFunction_(
- 'lists_set_from_end',
- [ 'function ' + Blockly.PHP.FUNCTION_NAME_PLACEHOLDER_ +
- '(&$list, $at, $value) {',
- ' $list[count($list) - $at] = $value;',
- '}']);
- return functionName + '(' + list + ', ' + at + ', ' + value + ');\n';
- } else if (mode == 'INSERT') {
- var functionName = Blockly.PHP.provideFunction_(
- 'lists_insert_from_end',
- [ 'function ' + Blockly.PHP.FUNCTION_NAME_PLACEHOLDER_ +
- '(&$list, $at, $value) {',
- ' return array_splice($list, count($list) - $at, 0, $value);',
- '}']);
- return functionName + '(' + list + ', ' + at + ', ' + value + ');\n';
- }
- } else if (where == 'RANDOM') {
- var code = cacheList();
- var xVar = Blockly.PHP.variableDB_.getDistinctName(
- 'tmp_x', Blockly.Variables.NAME_TYPE);
- code += xVar + ' = rand(0, count(' + list + ')-1);\n';
- if (mode == 'SET') {
- code += list + '[' + xVar + '] = ' + value + ';\n';
- return code;
- } else if (mode == 'INSERT') {
- code += 'array_splice(' + list + ', ' + xVar + ', 0, ' + value + ');\n';
- return code;
- }
+ switch (where) {
+ case 'FIRST':
+ if (mode == 'SET') {
+ var list = Blockly.PHP.valueToCode(block, 'LIST',
+ Blockly.PHP.ORDER_MEMBER) || 'array()';
+ return list + '[0] = ' + value + ';\n';
+ } else if (mode == 'INSERT') {
+ var list = Blockly.PHP.valueToCode(block, 'LIST',
+ Blockly.PHP.ORDER_COMMA) || 'array()';
+ return 'array_unshift(' + list + ', ' + value + ');\n';
+ }
+ break;
+ case 'LAST':
+ var list = Blockly.PHP.valueToCode(block, 'LIST',
+ Blockly.PHP.ORDER_COMMA) || 'array()';
+ if (mode == 'SET') {
+ var functionName = Blockly.PHP.provideFunction_(
+ 'lists_set_last_item',
+ ['function ' + Blockly.PHP.FUNCTION_NAME_PLACEHOLDER_ +
+ '(&$list, $value) {',
+ ' $list[count($list) - 1] = $value;',
+ '}']);
+ return functionName + '(' + list + ', ' + value + ');\n';
+ } else if (mode == 'INSERT') {
+ return 'array_push(' + list + ', ' + value + ');\n';
+ }
+ break;
+ case 'FROM_START':
+ var at = Blockly.PHP.getAdjusted(block, 'AT');
+ if (mode == 'SET') {
+ var list = Blockly.PHP.valueToCode(block, 'LIST',
+ Blockly.PHP.ORDER_MEMBER) || 'array()';
+ return list + '[' + at + '] = ' + value + ';\n';
+ } else if (mode == 'INSERT') {
+ var list = Blockly.PHP.valueToCode(block, 'LIST',
+ Blockly.PHP.ORDER_COMMA) || 'array()';
+ return 'array_splice(' + list + ', ' + at + ', 0, ' + value + ');\n';
+ }
+ break;
+ case 'FROM_END':
+ var list = Blockly.PHP.valueToCode(block, 'LIST',
+ Blockly.PHP.ORDER_COMMA) || 'array()';
+ var at = Blockly.PHP.getAdjusted(block, 'AT', 1);
+ if (mode == 'SET') {
+ var functionName = Blockly.PHP.provideFunction_(
+ 'lists_set_from_end',
+ ['function ' + Blockly.PHP.FUNCTION_NAME_PLACEHOLDER_ +
+ '(&$list, $at, $value) {',
+ ' $list[count($list) - $at] = $value;',
+ '}']);
+ return functionName + '(' + list + ', ' + at + ', ' + value + ');\n';
+ } else if (mode == 'INSERT') {
+ var functionName = Blockly.PHP.provideFunction_(
+ 'lists_insert_from_end',
+ ['function ' + Blockly.PHP.FUNCTION_NAME_PLACEHOLDER_ +
+ '(&$list, $at, $value) {',
+ ' return array_splice($list, count($list) - $at, 0, $value);',
+ '}']);
+ return functionName + '(' + list + ', ' + at + ', ' + value + ');\n';
+ }
+ break;
+ case 'RANDOM':
+ var list = Blockly.PHP.valueToCode(block, 'LIST',
+ Blockly.PHP.ORDER_REFERENCE) || 'array()';
+ var code = cacheList();
+ var xVar = Blockly.PHP.variableDB_.getDistinctName(
+ 'tmp_x', Blockly.Variables.NAME_TYPE);
+ code += xVar + ' = rand(0, count(' + list + ')-1);\n';
+ if (mode == 'SET') {
+ code += list + '[' + xVar + '] = ' + value + ';\n';
+ return code;
+ } else if (mode == 'INSERT') {
+ code += 'array_splice(' + list + ', ' + xVar + ', 0, ' + value +
+ ');\n';
+ return code;
+ }
+ break;
}
throw 'Unhandled combination (lists_setIndex).';
};
@@ -317,44 +361,90 @@ Blockly.PHP['lists_setIndex'] = function(block) {
Blockly.PHP['lists_getSublist'] = function(block) {
// Get sublist.
var list = Blockly.PHP.valueToCode(block, 'LIST',
- Blockly.PHP.ORDER_MEMBER) || 'array()';
+ Blockly.PHP.ORDER_COMMA) || 'array()';
var where1 = block.getFieldValue('WHERE1');
var where2 = block.getFieldValue('WHERE2');
- var at1 = Blockly.PHP.valueToCode(block, 'AT1',
- Blockly.PHP.ORDER_NONE) || '1';
- var at2 = Blockly.PHP.valueToCode(block, 'AT2',
- Blockly.PHP.ORDER_NONE) || '1';
if (where1 == 'FIRST' && where2 == 'LAST') {
var code = list;
+ } else if (list.match(/^\$\w+$/) ||
+ (where1 != 'FROM_END' && where2 == 'FROM_START')) {
+ // If the list is a simple value or doesn't require a call for length, don't
+ // generate a helper function.
+ switch (where1) {
+ case 'FROM_START':
+ var at1 = Blockly.PHP.getAdjusted(block, 'AT1');
+ break;
+ case 'FROM_END':
+ var at1 = Blockly.PHP.getAdjusted(block, 'AT1', 1, false,
+ Blockly.PHP.ORDER_SUBTRACTION);
+ at1 = 'count(' + list + ') - ' + at1;
+ break;
+ case 'FIRST':
+ var at1 = '0';
+ break;
+ default:
+ throw 'Unhandled option (lists_getSublist).';
+ }
+ switch (where2) {
+ case 'FROM_START':
+ var at2 = Blockly.PHP.getAdjusted(block, 'AT2', 0, false,
+ Blockly.PHP.ORDER_SUBTRACTION);
+ var length = at2 + ' - ';
+ if (Blockly.isNumber(String(at1)) || String(at1).match(/^\(.+\)$/)) {
+ length += at1;
+ } else {
+ length += '(' + at1 + ')';
+ }
+ length += ' + 1';
+ break;
+ case 'FROM_END':
+ var at2 = Blockly.PHP.getAdjusted(block, 'AT2', 0, false,
+ Blockly.PHP.ORDER_SUBTRACTION);
+ var length = 'count(' + list + ') - ' + at2 + ' - ';
+ if (Blockly.isNumber(String(at1)) || String(at1).match(/^\(.+\)$/)) {
+ length += at1;
+ } else {
+ length += '(' + at1 + ')';
+ }
+ break;
+ case 'LAST':
+ var length = 'count(' + list + ') - ';
+ if (Blockly.isNumber(String(at1)) || String(at1).match(/^\(.+\)$/)) {
+ length += at1;
+ } else {
+ length += '(' + at1 + ')';
+ }
+ break;
+ default:
+ throw 'Unhandled option (lists_getSublist).';
+ }
+ code = 'array_slice(' + list + ', ' + at1 + ', ' + length + ')';
} else {
+ var at1 = Blockly.PHP.getAdjusted(block, 'AT1');
+ var at2 = Blockly.PHP.getAdjusted(block, 'AT2');
var functionName = Blockly.PHP.provideFunction_(
'lists_get_sublist',
- [ 'function ' + Blockly.PHP.FUNCTION_NAME_PLACEHOLDER_ +
+ ['function ' + Blockly.PHP.FUNCTION_NAME_PLACEHOLDER_ +
'($list, $where1, $at1, $where2, $at2) {',
- ' if ($where2 == \'FROM_START\') {',
- ' $at2--;',
- ' } else if ($where2 == \'FROM_END\') {',
- ' $at2 = $at2 - $at1;',
- ' } else if ($where2 == \'FIRST\') {',
- ' $at2 = 0;',
- ' } else if ($where2 == \'LAST\') {',
- ' $at2 = count($list);',
- ' } else {',
- ' throw \'Unhandled option (lists_getSublist).\';',
- ' }',
- ' if ($where1 == \'FROM_START\') {',
- ' $at1--;',
- ' } else if ($where1 == \'FROM_END\') {',
- ' $at1 = count($list) - $at1;',
- ' } else if ($where1 == \'FIRST\') {',
- ' $at1 = 0;',
- ' } else if ($where1 == \'LAST\') {',
- ' $at1 = count($list) - 1;',
- ' } else {',
- ' throw \'Unhandled option (lists_getSublist).\';',
- ' }',
- ' return array_slice($list, $at1, $at2);',
- '}']);
+ ' if ($where1 == \'FROM_END\') {',
+ ' $at1 = count($list) - 1 - $at1;',
+ ' } else if ($where1 == \'FIRST\') {',
+ ' $at1 = 0;',
+ ' } else if ($where1 != \'FROM_START\'){',
+ ' throw new Exception(\'Unhandled option (lists_get_sublist).\');',
+ ' }',
+ ' $length = 0;',
+ ' if ($where2 == \'FROM_START\') {',
+ ' $length = $at2 - $at1 + 1;',
+ ' } else if ($where2 == \'FROM_END\') {',
+ ' $length = count($list) - $at1 - $at2;',
+ ' } else if ($where2 == \'LAST\') {',
+ ' $length = count($list) - $at1;',
+ ' } else {',
+ ' throw new Exception(\'Unhandled option (lists_get_sublist).\');',
+ ' }',
+ ' return array_slice($list, $at1, $length);',
+ '}']);
var code = functionName + '(' + list + ', \'' +
where1 + '\', ' + at1 + ', \'' + where2 + '\', ' + at2 + ')';
}
@@ -364,26 +454,26 @@ Blockly.PHP['lists_getSublist'] = function(block) {
Blockly.PHP['lists_sort'] = function(block) {
// Block for sorting a list.
var listCode = Blockly.PHP.valueToCode(block, 'LIST',
- Blockly.PHP.ORDER_FUNCTION_CALL) || 'array()';
+ Blockly.PHP.ORDER_COMMA) || 'array()';
var direction = block.getFieldValue('DIRECTION') === '1' ? 1 : -1;
var type = block.getFieldValue('TYPE');
var functionName = Blockly.PHP.provideFunction_(
- 'lists_sort', [
- 'function ' + Blockly.PHP.FUNCTION_NAME_PLACEHOLDER_ +
- '($list, $type, $direction) {',
- ' $sortCmpFuncs = array(',
- ' "NUMERIC" => "strnatcasecmp",',
- ' "TEXT" => "strcmp",',
- ' "IGNORE_CASE" => "strcasecmp"',
- ' );',
- ' $sortCmp = $sortCmpFuncs[$type];',
- ' $list2 = $list;', // Clone list.
- ' usort($list2, $sortCmp);',
- ' if ($direction == -1) {',
- ' $list2 = array_reverse($list2);',
- ' }',
- ' return $list2;',
- '}']);
+ 'lists_sort',
+ ['function ' + Blockly.PHP.FUNCTION_NAME_PLACEHOLDER_ +
+ '($list, $type, $direction) {',
+ ' $sortCmpFuncs = array(',
+ ' "NUMERIC" => "strnatcasecmp",',
+ ' "TEXT" => "strcmp",',
+ ' "IGNORE_CASE" => "strcasecmp"',
+ ' );',
+ ' $sortCmp = $sortCmpFuncs[$type];',
+ ' $list2 = $list;', // Clone list.
+ ' usort($list2, $sortCmp);',
+ ' if ($direction == -1) {',
+ ' $list2 = array_reverse($list2);',
+ ' }',
+ ' return $list2;',
+ '}']);
var sortCode = functionName +
'(' + listCode + ', "' + type + '", ' + direction + ')';
return [sortCode, Blockly.PHP.ORDER_FUNCTION_CALL];
@@ -392,9 +482,9 @@ Blockly.PHP['lists_sort'] = function(block) {
Blockly.PHP['lists_split'] = function(block) {
// Block for splitting text into a list, or joining a list into text.
var value_input = Blockly.PHP.valueToCode(block, 'INPUT',
- Blockly.PHP.ORDER_MEMBER);
+ Blockly.PHP.ORDER_COMMA);
var value_delim = Blockly.PHP.valueToCode(block, 'DELIM',
- Blockly.PHP.ORDER_NONE) || '\'\'';
+ Blockly.PHP.ORDER_COMMA) || '\'\'';
var mode = block.getFieldValue('MODE');
if (mode == 'SPLIT') {
if (!value_input) {
diff --git a/generators/php/math.js b/generators/php/math.js
index f0bb9fa79..7789ba8fe 100644
--- a/generators/php/math.js
+++ b/generators/php/math.js
@@ -47,20 +47,14 @@ Blockly.PHP['math_arithmetic'] = function(block) {
'MINUS': [' - ', Blockly.PHP.ORDER_SUBTRACTION],
'MULTIPLY': [' * ', Blockly.PHP.ORDER_MULTIPLICATION],
'DIVIDE': [' / ', Blockly.PHP.ORDER_DIVISION],
- 'POWER': [null, Blockly.PHP.ORDER_COMMA] // Handle power separately.
+ 'POWER': [' ** ', Blockly.PHP.ORDER_POWER]
};
var tuple = OPERATORS[block.getFieldValue('OP')];
var operator = tuple[0];
var order = tuple[1];
var argument0 = Blockly.PHP.valueToCode(block, 'A', order) || '0';
var argument1 = Blockly.PHP.valueToCode(block, 'B', order) || '0';
- var code;
- // Power in PHP requires a special case since it has no operator.
- if (!operator) {
- code = 'pow(' + argument0 + ', ' + argument1 + ')';
- return [code, Blockly.PHP.ORDER_FUNCTION_CALL];
- }
- code = argument0 + operator + argument1;
+ var code = argument0 + operator + argument1;
return [code, order];
};
@@ -172,25 +166,25 @@ Blockly.PHP['math_number_property'] = function(block) {
// Prime is a special case as it is not a one-liner test.
var functionName = Blockly.PHP.provideFunction_(
'math_isPrime',
- [ 'function ' + Blockly.PHP.FUNCTION_NAME_PLACEHOLDER_ + '($n) {',
- ' // https://en.wikipedia.org/wiki/Primality_test#Naive_methods',
- ' if ($n == 2 || $n == 3) {',
- ' return true;',
- ' }',
- ' // False if n is NaN, negative, is 1, or not whole.',
- ' // And false if n is divisible by 2 or 3.',
- ' if (!is_numeric($n) || $n <= 1 || $n % 1 != 0 || $n % 2 == 0 ||' +
- ' $n % 3 == 0) {',
- ' return false;',
- ' }',
- ' // Check all the numbers of form 6k +/- 1, up to sqrt(n).',
- ' for ($x = 6; $x <= sqrt($n) + 1; $x += 6) {',
- ' if ($n % ($x - 1) == 0 || $n % ($x + 1) == 0) {',
- ' return false;',
- ' }',
- ' }',
- ' return true;',
- '}']);
+ ['function ' + Blockly.PHP.FUNCTION_NAME_PLACEHOLDER_ + '($n) {',
+ ' // https://en.wikipedia.org/wiki/Primality_test#Naive_methods',
+ ' if ($n == 2 || $n == 3) {',
+ ' return true;',
+ ' }',
+ ' // False if n is NaN, negative, is 1, or not whole.',
+ ' // And false if n is divisible by 2 or 3.',
+ ' if (!is_numeric($n) || $n <= 1 || $n % 1 != 0 || $n % 2 == 0 ||' +
+ ' $n % 3 == 0) {',
+ ' return false;',
+ ' }',
+ ' // Check all the numbers of form 6k +/- 1, up to sqrt(n).',
+ ' for ($x = 6; $x <= sqrt($n) + 1; $x += 6) {',
+ ' if ($n % ($x - 1) == 0 || $n % ($x + 1) == 0) {',
+ ' return false;',
+ ' }',
+ ' }',
+ ' return true;',
+ '}']);
code = functionName + '(' + number_to_check + ')';
return [code, Blockly.JavaScript.ORDER_FUNCTION_CALL];
}
@@ -256,10 +250,10 @@ Blockly.PHP['math_on_list'] = function(block) {
case 'AVERAGE':
var functionName = Blockly.PHP.provideFunction_(
'math_mean',
- [ 'function ' + Blockly.PHP.FUNCTION_NAME_PLACEHOLDER_ +
+ ['function ' + Blockly.PHP.FUNCTION_NAME_PLACEHOLDER_ +
'($myList) {',
- ' return array_sum($myList) / count($myList);',
- '}']);
+ ' return array_sum($myList) / count($myList);',
+ '}']);
list = Blockly.PHP.valueToCode(block, 'LIST',
Blockly.PHP.ORDER_NONE) || 'array()';
code = functionName + '(' + list + ')';
@@ -267,12 +261,13 @@ Blockly.PHP['math_on_list'] = function(block) {
case 'MEDIAN':
var functionName = Blockly.PHP.provideFunction_(
'math_median',
- [ 'function ' + Blockly.PHP.FUNCTION_NAME_PLACEHOLDER_ +
+ ['function ' + Blockly.PHP.FUNCTION_NAME_PLACEHOLDER_ +
'($arr) {',
- ' sort($arr,SORT_NUMERIC);',
- ' return (count($arr) % 2) ? $arr[floor(count($arr)/2)] : ',
- ' ($arr[floor(count($arr)/2)] + $arr[floor(count($arr)/2) - 1]) / 2;',
- '}']);
+ ' sort($arr,SORT_NUMERIC);',
+ ' return (count($arr) % 2) ? $arr[floor(count($arr)/2)] : ',
+ ' ($arr[floor(count($arr)/2)] + $arr[floor(count($arr)/2)' +
+ ' - 1]) / 2;',
+ '}']);
list = Blockly.PHP.valueToCode(block, 'LIST',
Blockly.PHP.ORDER_NONE) || '[]';
code = functionName + '(' + list + ')';
@@ -283,13 +278,14 @@ Blockly.PHP['math_on_list'] = function(block) {
// Mode of [3, 'x', 'x', 1, 1, 2, '3'] -> ['x', 1].
var functionName = Blockly.PHP.provideFunction_(
'math_modes',
- [ 'function ' + Blockly.PHP.FUNCTION_NAME_PLACEHOLDER_ +
+ ['function ' + Blockly.PHP.FUNCTION_NAME_PLACEHOLDER_ +
'($values) {',
- ' $v = array_count_values($values);',
- ' arsort($v);',
- ' foreach($v as $k => $v){$total = $k; break;}',
- ' return array($total);',
- '}']);
+ ' if (empty($values)) return array();',
+ ' $counts = array_count_values($values);',
+ ' arsort($counts); // Sort counts in descending order',
+ ' $modes = array_keys($counts, current($counts), true);',
+ ' return $modes;',
+ '}']);
list = Blockly.PHP.valueToCode(block, 'LIST',
Blockly.PHP.ORDER_NONE) || '[]';
code = functionName + '(' + list + ')';
@@ -297,14 +293,15 @@ Blockly.PHP['math_on_list'] = function(block) {
case 'STD_DEV':
var functionName = Blockly.PHP.provideFunction_(
'math_standard_deviation',
- [ 'function ' + Blockly.PHP.FUNCTION_NAME_PLACEHOLDER_ +
- '($numbers) {',
- ' $n = count($numbers);',
- ' if (!$n) return null;',
- ' $mean = array_sum($numbers) / count($numbers);',
- ' foreach($numbers as $key => $num) $devs[$key] = pow($num - $mean, 2);',
- ' return sqrt(array_sum($devs) / (count($devs) - 1));',
- '}']);
+ ['function ' + Blockly.PHP.FUNCTION_NAME_PLACEHOLDER_ +
+ '($numbers) {',
+ ' $n = count($numbers);',
+ ' if (!$n) return null;',
+ ' $mean = array_sum($numbers) / count($numbers);',
+ ' foreach($numbers as $key => $num) $devs[$key] = ' +
+ 'pow($num - $mean, 2);',
+ ' return sqrt(array_sum($devs) / (count($devs) - 1));',
+ '}']);
list = Blockly.PHP.valueToCode(block, 'LIST',
Blockly.PHP.ORDER_NONE) || '[]';
code = functionName + '(' + list + ')';
@@ -312,11 +309,11 @@ Blockly.PHP['math_on_list'] = function(block) {
case 'RANDOM':
var functionName = Blockly.PHP.provideFunction_(
'math_random_list',
- [ 'function ' + Blockly.PHP.FUNCTION_NAME_PLACEHOLDER_ +
+ ['function ' + Blockly.PHP.FUNCTION_NAME_PLACEHOLDER_ +
'($list) {',
- ' $x = rand(0, count($list)-1);',
- ' return $list[$x];',
- '}']);
+ ' $x = rand(0, count($list)-1);',
+ ' return $list[$x];',
+ '}']);
list = Blockly.PHP.valueToCode(block, 'LIST',
Blockly.PHP.ORDER_NONE) || '[]';
code = functionName + '(' + list + ')';
@@ -358,13 +355,13 @@ Blockly.PHP['math_random_int'] = function(block) {
Blockly.PHP.ORDER_COMMA) || '0';
var functionName = Blockly.PHP.provideFunction_(
'math_random_int',
- [ 'function ' + Blockly.PHP.FUNCTION_NAME_PLACEHOLDER_ +
+ ['function ' + Blockly.PHP.FUNCTION_NAME_PLACEHOLDER_ +
'($a, $b) {',
- ' if ($a > $b) {',
- ' return rand($b, $a);',
- ' }',
- ' return rand($a, $b);',
- '}']);
+ ' if ($a > $b) {',
+ ' return rand($b, $a);',
+ ' }',
+ ' return rand($a, $b);',
+ '}']);
var code = functionName + '(' + argument0 + ', ' + argument1 + ')';
return [code, Blockly.PHP.ORDER_FUNCTION_CALL];
};
diff --git a/generators/php/procedures.js b/generators/php/procedures.js
index c5ef5ea6d..2131bebde 100644
--- a/generators/php/procedures.js
+++ b/generators/php/procedures.js
@@ -63,8 +63,8 @@ Blockly.PHP['procedures_defreturn'] = function(block) {
returnValue = ' return ' + returnValue + ';\n';
}
var args = [];
- for (var x = 0; x < block.arguments_.length; x++) {
- args[x] = Blockly.PHP.variableDB_.getName(block.arguments_[x],
+ for (var i = 0; i < block.arguments_.length; i++) {
+ args[i] = Blockly.PHP.variableDB_.getName(block.arguments_[i],
Blockly.Variables.NAME_TYPE);
}
var code = 'function ' + funcName + '(' + args.join(', ') + ') {\n' +
@@ -85,8 +85,8 @@ Blockly.PHP['procedures_callreturn'] = function(block) {
var funcName = Blockly.PHP.variableDB_.getName(
block.getFieldValue('NAME'), Blockly.Procedures.NAME_TYPE);
var args = [];
- for (var x = 0; x < block.arguments_.length; x++) {
- args[x] = Blockly.PHP.valueToCode(block, 'ARG' + x,
+ for (var i = 0; i < block.arguments_.length; i++) {
+ args[i] = Blockly.PHP.valueToCode(block, 'ARG' + i,
Blockly.PHP.ORDER_COMMA) || 'null';
}
var code = funcName + '(' + args.join(', ') + ')';
@@ -98,8 +98,8 @@ Blockly.PHP['procedures_callnoreturn'] = function(block) {
var funcName = Blockly.PHP.variableDB_.getName(
block.getFieldValue('NAME'), Blockly.Procedures.NAME_TYPE);
var args = [];
- for (var x = 0; x < block.arguments_.length; x++) {
- args[x] = Blockly.PHP.valueToCode(block, 'ARG' + x,
+ for (var i = 0; i < block.arguments_.length; i++) {
+ args[i] = Blockly.PHP.valueToCode(block, 'ARG' + i,
Blockly.PHP.ORDER_COMMA) || 'null';
}
var code = funcName + '(' + args.join(', ') + ');\n';
diff --git a/generators/php/text.js b/generators/php/text.js
index 3960ab011..efc0f2de3 100644
--- a/generators/php/text.js
+++ b/generators/php/text.js
@@ -37,28 +37,27 @@ Blockly.PHP['text'] = function(block) {
Blockly.PHP['text_join'] = function(block) {
// Create a string made up of any number of elements of any type.
- var code;
if (block.itemCount_ == 0) {
return ['\'\'', Blockly.PHP.ORDER_ATOMIC];
} else if (block.itemCount_ == 1) {
- var argument0 = Blockly.PHP.valueToCode(block, 'ADD0',
+ var element = Blockly.PHP.valueToCode(block, 'ADD0',
Blockly.PHP.ORDER_NONE) || '\'\'';
- code = argument0;
+ var code = element;
return [code, Blockly.PHP.ORDER_FUNCTION_CALL];
} else if (block.itemCount_ == 2) {
- var argument0 = Blockly.PHP.valueToCode(block, 'ADD0',
+ var element0 = Blockly.PHP.valueToCode(block, 'ADD0',
Blockly.PHP.ORDER_NONE) || '\'\'';
- var argument1 = Blockly.PHP.valueToCode(block, 'ADD1',
+ var element1 = Blockly.PHP.valueToCode(block, 'ADD1',
Blockly.PHP.ORDER_NONE) || '\'\'';
- code = argument0 + ' . ' + argument1;
+ var code = element0 + ' . ' + element1;
return [code, Blockly.PHP.ORDER_ADDITION];
} else {
- code = new Array(block.itemCount_);
- for (var n = 0; n < block.itemCount_; n++) {
- code[n] = Blockly.PHP.valueToCode(block, 'ADD' + n,
+ var elements = new Array(block.itemCount_);
+ for (var i = 0; i < block.itemCount_; i++) {
+ elements[i] = Blockly.PHP.valueToCode(block, 'ADD' + i,
Blockly.PHP.ORDER_COMMA) || '\'\'';
}
- code = 'implode(\'\', array(' + code.join(',') + '))';
+ var code = 'implode(\'\', array(' + elements.join(',') + '))';
return [code, Blockly.PHP.ORDER_FUNCTION_CALL];
}
};
@@ -67,89 +66,89 @@ Blockly.PHP['text_append'] = function(block) {
// Append to a variable in place.
var varName = Blockly.PHP.variableDB_.getName(
block.getFieldValue('VAR'), Blockly.Variables.NAME_TYPE);
- var argument0 = Blockly.PHP.valueToCode(block, 'TEXT',
- Blockly.PHP.ORDER_NONE) || '\'\'';
- return varName + ' .= ' + argument0 + ';\n';
+ var value = Blockly.PHP.valueToCode(block, 'TEXT',
+ Blockly.PHP.ORDER_ASSIGNMENT) || '\'\'';
+ return varName + ' .= ' + value + ';\n';
};
Blockly.PHP['text_length'] = function(block) {
// String or array length.
var functionName = Blockly.PHP.provideFunction_(
'length',
- [ 'function ' + Blockly.PHP.FUNCTION_NAME_PLACEHOLDER_ + '($value) {',
- ' if (is_string($value)) {',
- ' return strlen($value);',
- ' } else {',
- ' return count($value);',
- ' }',
- '}']);
- var argument0 = Blockly.PHP.valueToCode(block, 'VALUE',
- Blockly.PHP.ORDER_FUNCTION_CALL) || '\'\'';
- return [functionName + '(' + argument0 + ')', Blockly.PHP.ORDER_FUNCTION_CALL];
+ ['function ' + Blockly.PHP.FUNCTION_NAME_PLACEHOLDER_ + '($value) {',
+ ' if (is_string($value)) {',
+ ' return strlen($value);',
+ ' } else {',
+ ' return count($value);',
+ ' }',
+ '}']);
+ var text = Blockly.PHP.valueToCode(block, 'VALUE',
+ Blockly.PHP.ORDER_NONE) || '\'\'';
+ return [functionName + '(' + text + ')', Blockly.PHP.ORDER_FUNCTION_CALL];
};
Blockly.PHP['text_isEmpty'] = function(block) {
// Is the string null or array empty?
- var argument0 = Blockly.PHP.valueToCode(block, 'VALUE',
- Blockly.PHP.ORDER_FUNCTION_CALL) || '\'\'';
- return ['empty(' + argument0 + ')', Blockly.PHP.ORDER_FUNCTION_CALL];
+ var text = Blockly.PHP.valueToCode(block, 'VALUE',
+ Blockly.PHP.ORDER_NONE) || '\'\'';
+ return ['empty(' + text + ')', Blockly.PHP.ORDER_FUNCTION_CALL];
};
Blockly.PHP['text_indexOf'] = function(block) {
// Search the text for a substring.
var operator = block.getFieldValue('END') == 'FIRST' ?
'strpos' : 'strrpos';
- var argument0 = Blockly.PHP.valueToCode(block, 'FIND',
- Blockly.PHP.ORDER_FUNCTION_CALL) || '\'\'';
- var argument1 = Blockly.PHP.valueToCode(block, 'VALUE',
- Blockly.PHP.ORDER_FUNCTION_CALL) || '\'\'';
-
+ var substring = Blockly.PHP.valueToCode(block, 'FIND',
+ Blockly.PHP.ORDER_NONE) || '\'\'';
+ var text = Blockly.PHP.valueToCode(block, 'VALUE',
+ Blockly.PHP.ORDER_NONE) || '\'\'';
+ if (Blockly.PHP.ONE_BASED_INDEXING) {
+ var errorIndex = ' 0';
+ var indexAdjustment = ' + 1';
+ } else {
+ var errorIndex = ' -1';
+ var indexAdjustment = '';
+ }
var functionName = Blockly.PHP.provideFunction_(
block.getFieldValue('END') == 'FIRST' ?
'text_indexOf' : 'text_lastIndexOf',
- [ 'function ' + Blockly.PHP.FUNCTION_NAME_PLACEHOLDER_ +
+ ['function ' + Blockly.PHP.FUNCTION_NAME_PLACEHOLDER_ +
'($text, $search) {',
- ' $pos = ' + operator + '($text, $search);',
- ' return $pos === false ? 0 : $pos + 1;',
- '}']);
- var code = functionName + '(' + argument1 + ', ' + argument0 + ')';
+ ' $pos = ' + operator + '($text, $search);',
+ ' return $pos === false ? ' + errorIndex + ' : $pos' +
+ indexAdjustment + ';',
+ '}']);
+ var code = functionName + '(' + text + ', ' + substring + ')';
return [code, Blockly.PHP.ORDER_FUNCTION_CALL];
};
Blockly.PHP['text_charAt'] = function(block) {
// Get letter at index.
var where = block.getFieldValue('WHERE') || 'FROM_START';
- var at = Blockly.PHP.valueToCode(block, 'AT',
- Blockly.PHP.ORDER_FUNCTION_CALL) || '0';
- var text = Blockly.PHP.valueToCode(block, 'VALUE',
- Blockly.PHP.ORDER_FUNCTION_CALL) || '\'\'';
+ var textOrder = (where == 'RANDOM') ? Blockly.PHP.ORDER_NONE :
+ Blockly.PHP.ORDER_COMMA;
+ var text = Blockly.PHP.valueToCode(block, 'VALUE', textOrder) || '\'\'';
switch (where) {
case 'FIRST':
- var code = text + '[0]';
+ var code = 'substr(' + text + ', 0, 1)';
return [code, Blockly.PHP.ORDER_FUNCTION_CALL];
case 'LAST':
- var code = 'substr(' + text + ', -1, 1)';
+ var code = 'substr(' + text + ', -1)';
return [code, Blockly.PHP.ORDER_FUNCTION_CALL];
case 'FROM_START':
- // Blockly uses one-based indicies.
- if (Blockly.isNumber(at)) {
- // If the index is a naked number, decrement it right now.
- at = parseFloat(at) - 1;
- } else {
- // If the index is dynamic, decrement it in code.
- at += ' - 1';
- }
+ var at = Blockly.PHP.getAdjusted(block, 'AT');
var code = 'substr(' + text + ', ' + at + ', 1)';
return [code, Blockly.PHP.ORDER_FUNCTION_CALL];
case 'FROM_END':
- var code = 'substr(' + text + ', -' + at + ', 1)';
+ var at = Blockly.PHP.getAdjusted(block, 'AT', 1, true);
+ var code = 'substr(' + text + ', ' + at + ', 1)';
return [code, Blockly.PHP.ORDER_FUNCTION_CALL];
case 'RANDOM':
var functionName = Blockly.PHP.provideFunction_(
'text_random_letter',
- [ 'function ' + Blockly.PHP.FUNCTION_NAME_PLACEHOLDER_ + '($text) {',
- ' return $text[rand(0, strlen($text) - 1)];',
- '}']);
+ ['function ' + Blockly.PHP.FUNCTION_NAME_PLACEHOLDER_ + '($text) {',
+ ' return $text[rand(0, strlen($text) - 1)];',
+ '}']);
code = functionName + '(' + text + ')';
return [code, Blockly.PHP.ORDER_FUNCTION_CALL];
}
@@ -162,37 +161,34 @@ Blockly.PHP['text_getSubstring'] = function(block) {
Blockly.PHP.ORDER_FUNCTION_CALL) || '\'\'';
var where1 = block.getFieldValue('WHERE1');
var where2 = block.getFieldValue('WHERE2');
- var at1 = Blockly.PHP.valueToCode(block, 'AT1',
- Blockly.PHP.ORDER_FUNCTION_CALL) || '0';
- var at2 = Blockly.PHP.valueToCode(block, 'AT2',
- Blockly.PHP.ORDER_FUNCTION_CALL) || '0';
if (where1 == 'FIRST' && where2 == 'LAST') {
var code = text;
} else {
+ var at1 = Blockly.PHP.getAdjusted(block, 'AT1');
+ var at2 = Blockly.PHP.getAdjusted(block, 'AT2');
var functionName = Blockly.PHP.provideFunction_(
'text_get_substring',
- [ 'function ' + Blockly.PHP.FUNCTION_NAME_PLACEHOLDER_ +
+ ['function ' + Blockly.PHP.FUNCTION_NAME_PLACEHOLDER_ +
'($text, $where1, $at1, $where2, $at2) {',
- ' if ($where2 == \'FROM_START\') {',
- ' $at2--;',
- ' } else if ($where2 == \'FROM_END\') {',
- ' $at2 = $at2 - $at1;',
- ' } else if ($where2 == \'FIRST\') {',
- ' $at2 = 0;',
- ' } else if ($where2 == \'LAST\') {',
- ' $at2 = strlen($text);',
- ' } else { $at2 = 0; }',
- ' if ($where1 == \'FROM_START\') {',
- ' $at1--;',
- ' } else if ($where1 == \'FROM_END\') {',
- ' $at1 = strlen($text) - $at1;',
- ' } else if ($where1 == \'FIRST\') {',
- ' $at1 = 0;',
- ' } else if ($where1 == \'LAST\') {',
- ' $at1 = strlen($text) - 1;',
- ' } else { $at1 = 0; }',
- ' return substr($text, $at1, $at2);',
- '}']);
+ ' if ($where1 == \'FROM_END\') {',
+ ' $at1 = strlen($text) - 1 - $at1;',
+ ' } else if ($where1 == \'FIRST\') {',
+ ' $at1 = 0;',
+ ' } else if ($where1 != \'FROM_START\'){',
+ ' throw new Exception(\'Unhandled option (text_get_substring).\');',
+ ' }',
+ ' $length = 0;',
+ ' if ($where2 == \'FROM_START\') {',
+ ' $length = $at2 - $at1 + 1;',
+ ' } else if ($where2 == \'FROM_END\') {',
+ ' $length = strlen($text) - $at1 - $at2;',
+ ' } else if ($where2 == \'LAST\') {',
+ ' $length = strlen($text) - $at1;',
+ ' } else {',
+ ' throw new Exception(\'Unhandled option (text_get_substring).\');',
+ ' }',
+ ' return substr($text, $at1, $length);',
+ '}']);
var code = functionName + '(' + text + ', \'' +
where1 + '\', ' + at1 + ', \'' + where2 + '\', ' + at2 + ')';
}
@@ -201,19 +197,14 @@ Blockly.PHP['text_getSubstring'] = function(block) {
Blockly.PHP['text_changeCase'] = function(block) {
// Change capitalization.
- var code;
+ var text = Blockly.PHP.valueToCode(block, 'TEXT',
+ Blockly.PHP.ORDER_NONE) || '\'\'';
if (block.getFieldValue('CASE') == 'UPPERCASE') {
- var argument0 = Blockly.PHP.valueToCode(block, 'TEXT',
- Blockly.PHP.ORDER_FUNCTION_CALL) || '\'\'';
- code = 'strtoupper(' + argument0 + ')';
+ var code = 'strtoupper(' + text + ')';
} else if (block.getFieldValue('CASE') == 'LOWERCASE') {
- var argument0 = Blockly.PHP.valueToCode(block, 'TEXT',
- Blockly.PHP.ORDER_FUNCTION_CALL) || '\'\'';
- code = 'strtolower(' + argument0 + ')';
+ var code = 'strtolower(' + text + ')';
} else if (block.getFieldValue('CASE') == 'TITLECASE') {
- var argument0 = Blockly.PHP.valueToCode(block, 'TEXT',
- Blockly.PHP.ORDER_FUNCTION_CALL) || '\'\'';
- code = 'ucwords(strtolower(' + argument0 + '))';
+ var code = 'ucwords(strtolower(' + text + '))';
}
return [code, Blockly.PHP.ORDER_FUNCTION_CALL];
};
@@ -226,16 +217,16 @@ Blockly.PHP['text_trim'] = function(block) {
'BOTH': 'trim'
};
var operator = OPERATORS[block.getFieldValue('MODE')];
- var argument0 = Blockly.PHP.valueToCode(block, 'TEXT',
+ var text = Blockly.PHP.valueToCode(block, 'TEXT',
Blockly.PHP.ORDER_NONE) || '\'\'';
- return [ operator + '(' + argument0 + ')', Blockly.PHP.ORDER_FUNCTION_CALL];
+ return [operator + '(' + text + ')', Blockly.PHP.ORDER_FUNCTION_CALL];
};
Blockly.PHP['text_print'] = function(block) {
// Print statement.
- var argument0 = Blockly.PHP.valueToCode(block, 'TEXT',
+ var msg = Blockly.PHP.valueToCode(block, 'TEXT',
Blockly.PHP.ORDER_NONE) || '\'\'';
- return 'print(' + argument0 + ');\n';
+ return 'print(' + msg + ');\n';
};
Blockly.PHP['text_prompt_ext'] = function(block) {
diff --git a/generators/php/variables.js b/generators/php/variables.js
index dd68f4ead..466774b3f 100644
--- a/generators/php/variables.js
+++ b/generators/php/variables.js
@@ -43,4 +43,4 @@ Blockly.PHP['variables_set'] = function(block) {
var varName = Blockly.PHP.variableDB_.getName(
block.getFieldValue('VAR'), Blockly.Variables.NAME_TYPE);
return varName + ' = ' + argument0 + ';\n';
-};
\ No newline at end of file
+};
diff --git a/generators/python.js b/generators/python.js
index 60a654f28..aad958251 100644
--- a/generators/python.js
+++ b/generators/python.js
@@ -46,11 +46,22 @@ Blockly.Python.addReservedWords(
// import keyword
// print ','.join(keyword.kwlist)
// http://docs.python.org/reference/lexical_analysis.html#keywords
- 'and,as,assert,break,class,continue,def,del,elif,else,except,exec,finally,for,from,global,if,import,in,is,lambda,not,or,pass,print,raise,return,try,while,with,yield,' +
+ 'and,as,assert,break,class,continue,def,del,elif,else,except,exec,' +
+ 'finally,for,from,global,if,import,in,is,lambda,not,or,pass,print,raise,' +
+ 'return,try,while,with,yield,' +
//http://docs.python.org/library/constants.html
- 'True,False,None,NotImplemented,Ellipsis,__debug__,quit,exit,copyright,license,credits,' +
+ 'True,False,None,NotImplemented,Ellipsis,__debug__,quit,exit,copyright,' +
+ 'license,credits,' +
// http://docs.python.org/library/functions.html
- 'abs,divmod,input,open,staticmethod,all,enumerate,int,ord,str,any,eval,isinstance,pow,sum,basestring,execfile,issubclass,print,super,bin,file,iter,property,tuple,bool,filter,len,range,type,bytearray,float,list,raw_input,unichr,callable,format,locals,reduce,unicode,chr,frozenset,long,reload,vars,classmethod,getattr,map,repr,xrange,cmp,globals,max,reversed,zip,compile,hasattr,memoryview,round,__import__,complex,hash,min,set,apply,delattr,help,next,setattr,buffer,dict,hex,object,slice,coerce,dir,id,oct,sorted,intern');
+ 'abs,divmod,input,open,staticmethod,all,enumerate,int,ord,str,any,eval,' +
+ 'isinstance,pow,sum,basestring,execfile,issubclass,print,super,bin,file,' +
+ 'iter,property,tuple,bool,filter,len,range,type,bytearray,float,list,' +
+ 'raw_input,unichr,callable,format,locals,reduce,unicode,chr,frozenset,' +
+ 'long,reload,vars,classmethod,getattr,map,repr,xrange,cmp,globals,max,' +
+ 'reversed,zip,compile,hasattr,memoryview,round,__import__,complex,hash,' +
+ 'min,set,apply,delattr,help,next,setattr,buffer,dict,hex,object,slice,' +
+ 'coerce,dir,id,oct,sorted,intern'
+);
/**
* Order of operation ENUMs.
@@ -79,6 +90,12 @@ Blockly.Python.ORDER_CONDITIONAL = 15; // if else
Blockly.Python.ORDER_LAMBDA = 16; // lambda
Blockly.Python.ORDER_NONE = 99; // (...)
+/**
+ * Allow for switching between one and zero based indexing for lists and text,
+ * one based by default.
+ */
+Blockly.Python.ONE_BASED_INDEXING = true;
+
/**
* List of outer-inner pairings that do NOT require parentheses.
* @type {!Array.>}
@@ -202,7 +219,7 @@ Blockly.Python.scrub_ = function(block, code) {
if (!block.outputConnection || !block.outputConnection.targetConnection) {
// Collect comment for this block.
var comment = block.getCommentText();
- comment = Blockly.utils.wrap(comment, this.COMMENT_WRAP - 3);
+ comment = Blockly.utils.wrap(comment, Blockly.Python.COMMENT_WRAP - 3);
if (comment) {
if (block.getProcedureDef) {
// Use a comment block for function comments.
@@ -213,9 +230,9 @@ Blockly.Python.scrub_ = function(block, code) {
}
// Collect comments for all value arguments.
// Don't collect comments for nested statements.
- for (var x = 0; x < block.inputList.length; x++) {
- if (block.inputList[x].type == Blockly.INPUT_VALUE) {
- var childBlock = block.inputList[x].connection.targetBlock();
+ for (var i = 0; i < block.inputList.length; i++) {
+ if (block.inputList[i].type == Blockly.INPUT_VALUE) {
+ var childBlock = block.inputList[i].connection.targetBlock();
if (childBlock) {
var comment = Blockly.Python.allNestedComments(childBlock);
if (comment) {
@@ -229,3 +246,45 @@ Blockly.Python.scrub_ = function(block, code) {
var nextCode = Blockly.Python.blockToCode(nextBlock);
return commentCode + code + nextCode;
};
+
+/**
+ * Gets a property and adjusts the value, taking into account indexing, and
+ * casts to an integer.
+ * @param {!Blockly.Block} block The block.
+ * @param {string} atId The property ID of the element to get.
+ * @param {number=} opt_delta Value to add.
+ * @param {boolean=} opt_negate Whether to negate the value.
+ * @return {string|number}
+ */
+Blockly.Python.getAdjustedInt = function(block, atId, opt_delta, opt_negate) {
+ var delta = opt_delta || 0;
+ if (Blockly.Python.ONE_BASED_INDEXING) {
+ delta--;
+ }
+ var defaultAtIndex = Blockly.Python.ONE_BASED_INDEXING ? '1' : '0';
+ var atOrder = delta ? Blockly.Python.ORDER_ADDITIVE :
+ Blockly.Python.ORDER_NONE;
+ var at = Blockly.Python.valueToCode(block, atId, atOrder) || defaultAtIndex;
+
+ if (Blockly.isNumber(at)) {
+ // If the index is a naked number, adjust it right now.
+ at = parseInt(at, 10) + delta;
+ if (opt_negate) {
+ at = -at;
+ }
+ } else {
+ // If the index is dynamic, adjust it in code.
+ if (delta > 0) {
+ at = 'int(' + at + ' + ' + delta + ')';
+ } else if (delta < 0) {
+ at = 'int(' + at + ' - ' + -delta + ')';
+ } else {
+ at = 'int(' + at + ')';
+ }
+ if (opt_negate) {
+ at = '-' + at;
+ }
+ }
+ return at;
+};
+
diff --git a/generators/python/colour.js b/generators/python/colour.js
index 49505ac86..68666a89b 100644
--- a/generators/python/colour.js
+++ b/generators/python/colour.js
@@ -46,11 +46,11 @@ Blockly.Python['colour_rgb'] = function(block) {
// Compose a colour from RGB components expressed as percentages.
var functionName = Blockly.Python.provideFunction_(
'colour_rgb',
- [ 'def ' + Blockly.Python.FUNCTION_NAME_PLACEHOLDER_ + '(r, g, b):',
- ' r = round(min(100, max(0, r)) * 2.55)',
- ' g = round(min(100, max(0, g)) * 2.55)',
- ' b = round(min(100, max(0, b)) * 2.55)',
- ' return \'#%02x%02x%02x\' % (r, g, b)']);
+ ['def ' + Blockly.Python.FUNCTION_NAME_PLACEHOLDER_ + '(r, g, b):',
+ ' r = round(min(100, max(0, r)) * 2.55)',
+ ' g = round(min(100, max(0, g)) * 2.55)',
+ ' b = round(min(100, max(0, b)) * 2.55)',
+ ' return \'#%02x%02x%02x\' % (r, g, b)']);
var r = Blockly.Python.valueToCode(block, 'RED',
Blockly.Python.ORDER_NONE) || 0;
var g = Blockly.Python.valueToCode(block, 'GREEN',
diff --git a/generators/python/lists.js b/generators/python/lists.js
index e43e31d5e..b831d4d2f 100644
--- a/generators/python/lists.js
+++ b/generators/python/lists.js
@@ -36,66 +36,75 @@ Blockly.Python['lists_create_empty'] = function(block) {
Blockly.Python['lists_create_with'] = function(block) {
// Create a list with any number of elements of any type.
- var code = new Array(block.itemCount_);
- for (var n = 0; n < block.itemCount_; n++) {
- code[n] = Blockly.Python.valueToCode(block, 'ADD' + n,
+ var elements = new Array(block.itemCount_);
+ for (var i = 0; i < block.itemCount_; i++) {
+ elements[i] = Blockly.Python.valueToCode(block, 'ADD' + i,
Blockly.Python.ORDER_NONE) || 'None';
}
- code = '[' + code.join(', ') + ']';
+ var code = '[' + elements.join(', ') + ']';
return [code, Blockly.Python.ORDER_ATOMIC];
};
Blockly.Python['lists_repeat'] = function(block) {
// Create a list with one element repeated.
- var argument0 = Blockly.Python.valueToCode(block, 'ITEM',
+ var item = Blockly.Python.valueToCode(block, 'ITEM',
Blockly.Python.ORDER_NONE) || 'None';
- var argument1 = Blockly.Python.valueToCode(block, 'NUM',
+ var times = Blockly.Python.valueToCode(block, 'NUM',
Blockly.Python.ORDER_MULTIPLICATIVE) || '0';
- var code = '[' + argument0 + '] * ' + argument1;
+ var code = '[' + item + '] * ' + times;
return [code, Blockly.Python.ORDER_MULTIPLICATIVE];
};
Blockly.Python['lists_length'] = function(block) {
// String or array length.
- var argument0 = Blockly.Python.valueToCode(block, 'VALUE',
+ var list = Blockly.Python.valueToCode(block, 'VALUE',
Blockly.Python.ORDER_NONE) || '[]';
- return ['len(' + argument0 + ')', Blockly.Python.ORDER_FUNCTION_CALL];
+ return ['len(' + list + ')', Blockly.Python.ORDER_FUNCTION_CALL];
};
Blockly.Python['lists_isEmpty'] = function(block) {
// Is the string null or array empty?
- var argument0 = Blockly.Python.valueToCode(block, 'VALUE',
+ var list = Blockly.Python.valueToCode(block, 'VALUE',
Blockly.Python.ORDER_NONE) || '[]';
- var code = 'not len(' + argument0 + ')';
+ var code = 'not len(' + list + ')';
return [code, Blockly.Python.ORDER_LOGICAL_NOT];
};
Blockly.Python['lists_indexOf'] = function(block) {
// Find an item in the list.
- var argument0 = Blockly.Python.valueToCode(block, 'FIND',
+ var item = Blockly.Python.valueToCode(block, 'FIND',
Blockly.Python.ORDER_NONE) || '[]';
- var argument1 = Blockly.Python.valueToCode(block, 'VALUE',
- Blockly.Python.ORDER_MEMBER) || '\'\'';
- var code;
+ var list = Blockly.Python.valueToCode(block, 'VALUE',
+ Blockly.Python.ORDER_NONE) || '\'\'';
+ if (Blockly.Python.ONE_BASED_INDEXING) {
+ var errorIndex = ' 0';
+ var firstIndexAdjustment = ' + 1';
+ var lastIndexAdjustment = '';
+ } else {
+ var errorIndex = ' -1';
+ var firstIndexAdjustment = '';
+ var lastIndexAdjustment = ' - 1';
+ }
if (block.getFieldValue('END') == 'FIRST') {
var functionName = Blockly.Python.provideFunction_(
'first_index',
- ['def ' + Blockly.Python.FUNCTION_NAME_PLACEHOLDER_ + '(myList, elem):',
- ' try: theIndex = myList.index(elem) + 1',
- ' except: theIndex = 0',
- ' return theIndex']);
- code = functionName + '(' + argument1 + ', ' + argument0 + ')';
- return [code, Blockly.Python.ORDER_FUNCTION_CALL];
- } else {
- var functionName = Blockly.Python.provideFunction_(
- 'last_index',
- ['def ' + Blockly.Python.FUNCTION_NAME_PLACEHOLDER_ + '(myList, elem):',
- ' try: theIndex = len(myList) - myList[::-1].index(elem)',
- ' except: theIndex = 0',
- ' return theIndex']);
- code = functionName + '(' + argument1 + ', ' + argument0 + ')';
+ ['def ' + Blockly.Python.FUNCTION_NAME_PLACEHOLDER_ +
+ '(my_list, elem):',
+ ' try: index = my_list.index(elem)' + firstIndexAdjustment,
+ ' except: index =' + errorIndex,
+ ' return index']);
+ var code = functionName + '(' + list + ', ' + item + ')';
return [code, Blockly.Python.ORDER_FUNCTION_CALL];
}
+ var functionName = Blockly.Python.provideFunction_(
+ 'last_index',
+ ['def ' + Blockly.Python.FUNCTION_NAME_PLACEHOLDER_ + '(my_list, elem):',
+ ' try: index = len(my_list) - my_list[::-1].index(elem)' +
+ lastIndexAdjustment,
+ ' except: index =' + errorIndex,
+ ' return index']);
+ var code = functionName + '(' + list + ', ' + item + ')';
+ return [code, Blockly.Python.ORDER_FUNCTION_CALL];
};
Blockly.Python['lists_getIndex'] = function(block) {
@@ -103,85 +112,76 @@ Blockly.Python['lists_getIndex'] = function(block) {
// Note: Until January 2013 this block did not have MODE or WHERE inputs.
var mode = block.getFieldValue('MODE') || 'GET';
var where = block.getFieldValue('WHERE') || 'FROM_START';
- var at = Blockly.Python.valueToCode(block, 'AT',
- Blockly.Python.ORDER_UNARY_SIGN) || '1';
- var list = Blockly.Python.valueToCode(block, 'VALUE',
- Blockly.Python.ORDER_MEMBER) || '[]';
+ var listOrder = (where == 'RANDOM') ? Blockly.Python.ORDER_NONE :
+ Blockly.Python.ORDER_MEMBER;
+ var list = Blockly.Python.valueToCode(block, 'VALUE', listOrder) || '[]';
- if (where == 'FIRST') {
- if (mode == 'GET') {
- var code = list + '[0]';
- return [code, Blockly.Python.ORDER_MEMBER];
- } else {
- var code = list + '.pop(0)';
- if (mode == 'GET_REMOVE') {
+ switch (where) {
+ case 'FIRST':
+ if (mode == 'GET') {
+ var code = list + '[0]';
+ return [code, Blockly.Python.ORDER_MEMBER];
+ } else if (mode == 'GET_REMOVE') {
+ var code = list + '.pop(0)';
return [code, Blockly.Python.ORDER_FUNCTION_CALL];
} else if (mode == 'REMOVE') {
- return code + '\n';
+ return list + '.pop(0)\n';
}
- }
- } else if (where == 'LAST') {
- if (mode == 'GET') {
- var code = list + '[-1]';
- return [code, Blockly.Python.ORDER_MEMBER];
- } else {
- var code = list + '.pop()';
- if (mode == 'GET_REMOVE') {
+ break;
+ case 'LAST':
+ if (mode == 'GET') {
+ var code = list + '[-1]';
+ return [code, Blockly.Python.ORDER_MEMBER];
+ } else if (mode == 'GET_REMOVE') {
+ var code = list + '.pop()';
return [code, Blockly.Python.ORDER_FUNCTION_CALL];
} else if (mode == 'REMOVE') {
- return code + '\n';
+ return list + '.pop()\n';
}
- }
- } else if (where == 'FROM_START') {
- // Blockly uses one-based indicies.
- if (Blockly.isNumber(at)) {
- // If the index is a naked number, decrement it right now.
- at = parseInt(at, 10) - 1;
- } else {
- // If the index is dynamic, decrement it in code.
- at = 'int(' + at + ' - 1)';
- }
- if (mode == 'GET') {
- var code = list + '[' + at + ']';
- return [code, Blockly.Python.ORDER_MEMBER];
- } else {
- var code = list + '.pop(' + at + ')';
- if (mode == 'GET_REMOVE') {
+ break;
+ case 'FROM_START':
+ var at = Blockly.Python.getAdjustedInt(block, 'AT');
+ if (mode == 'GET') {
+ var code = list + '[' + at + ']';
+ return [code, Blockly.Python.ORDER_MEMBER];
+ } else if (mode == 'GET_REMOVE') {
+ var code = list + '.pop(' + at + ')';
return [code, Blockly.Python.ORDER_FUNCTION_CALL];
} else if (mode == 'REMOVE') {
- return code + '\n';
+ return list + '.pop(' + at + ')\n';
}
- }
- } else if (where == 'FROM_END') {
- if (mode == 'GET') {
- var code = list + '[-' + at + ']';
- return [code, Blockly.Python.ORDER_MEMBER];
- } else {
- var code = list + '.pop(-' + at + ')';
- if (mode == 'GET_REMOVE') {
+ break;
+ case'FROM_END':
+ var at = Blockly.Python.getAdjustedInt(block, 'AT', 1, true);
+ if (mode == 'GET') {
+ var code = list + '[' + at + ']';
+ return [code, Blockly.Python.ORDER_MEMBER];
+ } else if (mode == 'GET_REMOVE') {
+ var code = list + '.pop(' + at + ')';
return [code, Blockly.Python.ORDER_FUNCTION_CALL];
} else if (mode == 'REMOVE') {
- return code + '\n';
+ return list + '.pop(' + at + ')\n';
}
- }
- } else if (where == 'RANDOM') {
- Blockly.Python.definitions_['import_random'] = 'import random';
- if (mode == 'GET') {
- code = 'random.choice(' + list + ')';
- return [code, Blockly.Python.ORDER_FUNCTION_CALL];
- } else {
- var functionName = Blockly.Python.provideFunction_(
- 'lists_remove_random_item',
- ['def ' + Blockly.Python.FUNCTION_NAME_PLACEHOLDER_ + '(myList):',
- ' x = int(random.random() * len(myList))',
- ' return myList.pop(x)']);
- code = functionName + '(' + list + ')';
- if (mode == 'GET_REMOVE') {
+ break;
+ case 'RANDOM':
+ Blockly.Python.definitions_['import_random'] = 'import random';
+ if (mode == 'GET') {
+ code = 'random.choice(' + list + ')';
return [code, Blockly.Python.ORDER_FUNCTION_CALL];
- } else if (mode == 'REMOVE') {
- return code + '\n';
+ } else {
+ var functionName = Blockly.Python.provideFunction_(
+ 'lists_remove_random_item',
+ ['def ' + Blockly.Python.FUNCTION_NAME_PLACEHOLDER_ + '(myList):',
+ ' x = int(random.random() * len(myList))',
+ ' return myList.pop(x)']);
+ code = functionName + '(' + list + ')';
+ if (mode == 'GET_REMOVE') {
+ return [code, Blockly.Python.ORDER_FUNCTION_CALL];
+ } else if (mode == 'REMOVE') {
+ return code + '\n';
+ }
}
- }
+ break;
}
throw 'Unhandled combination (lists_getIndex).';
};
@@ -193,8 +193,6 @@ Blockly.Python['lists_setIndex'] = function(block) {
Blockly.Python.ORDER_MEMBER) || '[]';
var mode = block.getFieldValue('MODE') || 'GET';
var where = block.getFieldValue('WHERE') || 'FROM_START';
- var at = Blockly.Python.valueToCode(block, 'AT',
- Blockly.Python.ORDER_NONE) || '1';
var value = Blockly.Python.valueToCode(block, 'TO',
Blockly.Python.ORDER_NONE) || 'None';
// Cache non-trivial values to variables to prevent repeated look-ups.
@@ -209,51 +207,52 @@ Blockly.Python['lists_setIndex'] = function(block) {
list = listVar;
return code;
}
- if (where == 'FIRST') {
- if (mode == 'SET') {
- return list + '[0] = ' + value + '\n';
- } else if (mode == 'INSERT') {
- return list + '.insert(0, ' + value + ')\n';
- }
- } else if (where == 'LAST') {
- if (mode == 'SET') {
- return list + '[-1] = ' + value + '\n';
- } else if (mode == 'INSERT') {
- return list + '.append(' + value + ')\n';
- }
- } else if (where == 'FROM_START') {
- // Blockly uses one-based indicies.
- if (Blockly.isNumber(at)) {
- // If the index is a naked number, decrement it right now.
- at = parseInt(at, 10) - 1;
- } else {
- // If the index is dynamic, decrement it in code.
- at = 'int(' + at + ' - 1)';
- }
- if (mode == 'SET') {
- return list + '[' + at + '] = ' + value + '\n';
- } else if (mode == 'INSERT') {
- return list + '.insert(' + at + ', ' + value + ')\n';
- }
- } else if (where == 'FROM_END') {
- if (mode == 'SET') {
- return list + '[-' + at + '] = ' + value + '\n';
- } else if (mode == 'INSERT') {
- return list + '.insert(-' + at + ', ' + value + ')\n';
- }
- } else if (where == 'RANDOM') {
- Blockly.Python.definitions_['import_random'] = 'import random';
- var code = cacheList();
- var xVar = Blockly.Python.variableDB_.getDistinctName(
- 'tmp_x', Blockly.Variables.NAME_TYPE);
- code += xVar + ' = int(random.random() * len(' + list + '))\n';
- if (mode == 'SET') {
- code += list + '[' + xVar + '] = ' + value + '\n';
- return code;
- } else if (mode == 'INSERT') {
- code += list + '.insert(' + xVar + ', ' + value + ')\n';
- return code;
- }
+
+ switch (where) {
+ case 'FIRST':
+ if (mode == 'SET') {
+ return list + '[0] = ' + value + '\n';
+ } else if (mode == 'INSERT') {
+ return list + '.insert(0, ' + value + ')\n';
+ }
+ break;
+ case 'LAST':
+ if (mode == 'SET') {
+ return list + '[-1] = ' + value + '\n';
+ } else if (mode == 'INSERT') {
+ return list + '.append(' + value + ')\n';
+ }
+ break;
+ case 'FROM_START':
+ var at = Blockly.Python.getAdjustedInt(block, 'AT');
+ if (mode == 'SET') {
+ return list + '[' + at + '] = ' + value + '\n';
+ } else if (mode == 'INSERT') {
+ return list + '.insert(' + at + ', ' + value + ')\n';
+ }
+ break;
+ case 'FROM_END':
+ var at = Blockly.Python.getAdjustedInt(block, 'AT', 1, true);
+ if (mode == 'SET') {
+ return list + '[' + at + '] = ' + value + '\n';
+ } else if (mode == 'INSERT') {
+ return list + '.insert(' + at + ', ' + value + ')\n';
+ }
+ break;
+ case 'RANDOM':
+ Blockly.Python.definitions_['import_random'] = 'import random';
+ var code = cacheList();
+ var xVar = Blockly.Python.variableDB_.getDistinctName(
+ 'tmp_x', Blockly.Variables.NAME_TYPE);
+ code += xVar + ' = int(random.random() * len(' + list + '))\n';
+ if (mode == 'SET') {
+ code += list + '[' + xVar + '] = ' + value + '\n';
+ return code;
+ } else if (mode == 'INSERT') {
+ code += list + '.insert(' + xVar + ', ' + value + ')\n';
+ return code;
+ }
+ break;
}
throw 'Unhandled combination (lists_setIndex).';
};
@@ -264,49 +263,42 @@ Blockly.Python['lists_getSublist'] = function(block) {
Blockly.Python.ORDER_MEMBER) || '[]';
var where1 = block.getFieldValue('WHERE1');
var where2 = block.getFieldValue('WHERE2');
- var at1 = Blockly.Python.valueToCode(block, 'AT1',
- Blockly.Python.ORDER_ADDITIVE) || '1';
- var at2 = Blockly.Python.valueToCode(block, 'AT2',
- Blockly.Python.ORDER_ADDITIVE) || '1';
- if (where1 == 'FIRST' || (where1 == 'FROM_START' && at1 == '1')) {
- at1 = '';
- } else if (where1 == 'FROM_START') {
- // Blockly uses one-based indicies.
- if (Blockly.isNumber(at1)) {
- // If the index is a naked number, decrement it right now.
- at1 = parseInt(at1, 10) - 1;
- } else {
- // If the index is dynamic, decrement it in code.
- at1 = 'int(' + at1 + ' - 1)';
- }
- } else if (where1 == 'FROM_END') {
- if (Blockly.isNumber(at1)) {
- at1 = -parseInt(at1, 10);
- } else {
- at1 = '-int(' + at1 + ')';
- }
+ switch (where1) {
+ case 'FROM_START':
+ var at1 = Blockly.Python.getAdjustedInt(block, 'AT1');
+ if (at1 == '0') {
+ at1 = '';
+ }
+ break;
+ case 'FROM_END':
+ var at1 = Blockly.Python.getAdjustedInt(block, 'AT1', 1, true);
+ break;
+ case 'FIRST':
+ var at1 = '';
+ break;
+ default:
+ throw 'Unhandled option (lists_getSublist)';
}
- if (where2 == 'LAST' || (where2 == 'FROM_END' && at2 == '1')) {
- at2 = '';
- } else if (where1 == 'FROM_START') {
- if (Blockly.isNumber(at2)) {
- at2 = parseInt(at2, 10);
- } else {
- at2 = 'int(' + at2 + ')';
- }
- } else if (where1 == 'FROM_END') {
- if (Blockly.isNumber(at2)) {
- // If the index is a naked number, increment it right now.
- // Add special case for -0.
- at2 = 1 - parseInt(at2, 10);
- if (at2 == 0) {
+ switch (where2) {
+ case 'FROM_START':
+ var at2 = Blockly.Python.getAdjustedInt(block, 'AT2', 1);
+ break;
+ case 'FROM_END':
+ var at2 = Blockly.Python.getAdjustedInt(block, 'AT2', 0, true);
+ // Ensure that if the result calculated is 0 that sub-sequence will
+ // include all elements as expected.
+ if (!Blockly.isNumber(String(at2))) {
+ Blockly.Python.definitions_['import_sys'] = 'import sys';
+ at2 += ' or sys.maxsize';
+ } else if (at2 == '0') {
at2 = '';
}
- } else {
- // If the index is dynamic, increment it in code.
- Blockly.Python.definitions_['import_sys'] = 'import sys';
- at2 = 'int(1 - ' + at2 + ') or sys.maxsize';
- }
+ break;
+ case 'LAST':
+ var at2 = '';
+ break;
+ default:
+ throw 'Unhandled option (lists_getSublist)';
}
var code = list + '[' + at1 + ' : ' + at2 + ']';
return [code, Blockly.Python.ORDER_MEMBER];
@@ -314,30 +306,30 @@ Blockly.Python['lists_getSublist'] = function(block) {
Blockly.Python['lists_sort'] = function(block) {
// Block for sorting a list.
- var listCode = (Blockly.Python.valueToCode(block, 'LIST',
- Blockly.Python.ORDER_MEMBER) || '[]');
+ var list = (Blockly.Python.valueToCode(block, 'LIST',
+ Blockly.Python.ORDER_NONE) || '[]');
var type = block.getFieldValue('TYPE');
var reverse = block.getFieldValue('DIRECTION') === '1' ? 'False' : 'True';
var sortFunctionName = Blockly.Python.provideFunction_('lists_sort',
['def ' + Blockly.Python.FUNCTION_NAME_PLACEHOLDER_ +
- '(listv, type, reversev):',
- ' def tryfloat(s):',
+ '(my_list, type, reverse):',
+ ' def try_float(s):',
' try:',
' return float(s)',
' except:',
' return 0',
- ' keyFuncts = {',
- ' "NUMERIC": tryfloat,',
+ ' key_funcs = {',
+ ' "NUMERIC": try_float,',
' "TEXT": str,',
' "IGNORE_CASE": lambda s: str(s).lower()',
' }',
- ' keyv = keyFuncts[type]',
- ' tmp_list = list(listv)', // Clone the list.
- ' return sorted(tmp_list, key=keyv, reverse=reversev)'
+ ' key_func = key_funcs[type]',
+ ' list_cpy = list(my_list)', // Clone the list.
+ ' return sorted(list_cpy, key=key_func, reverse=reverse)'
]);
var code = sortFunctionName +
- '(' + listCode + ', "' + type + '", ' + reverse + ')';
+ '(' + list + ', "' + type + '", ' + reverse + ')';
return [code, Blockly.Python.ORDER_FUNCTION_CALL];
};
diff --git a/generators/python/procedures.js b/generators/python/procedures.js
index 0d000d050..fa938ef0f 100644
--- a/generators/python/procedures.js
+++ b/generators/python/procedures.js
@@ -65,8 +65,8 @@ Blockly.Python['procedures_defreturn'] = function(block) {
branch = Blockly.Python.PASS;
}
var args = [];
- for (var x = 0; x < block.arguments_.length; x++) {
- args[x] = Blockly.Python.variableDB_.getName(block.arguments_[x],
+ for (var i = 0; i < block.arguments_.length; i++) {
+ args[i] = Blockly.Python.variableDB_.getName(block.arguments_[i],
Blockly.Variables.NAME_TYPE);
}
var code = 'def ' + funcName + '(' + args.join(', ') + '):\n' +
@@ -87,8 +87,8 @@ Blockly.Python['procedures_callreturn'] = function(block) {
var funcName = Blockly.Python.variableDB_.getName(block.getFieldValue('NAME'),
Blockly.Procedures.NAME_TYPE);
var args = [];
- for (var x = 0; x < block.arguments_.length; x++) {
- args[x] = Blockly.Python.valueToCode(block, 'ARG' + x,
+ for (var i = 0; i < block.arguments_.length; i++) {
+ args[i] = Blockly.Python.valueToCode(block, 'ARG' + i,
Blockly.Python.ORDER_NONE) || 'None';
}
var code = funcName + '(' + args.join(', ') + ')';
@@ -100,8 +100,8 @@ Blockly.Python['procedures_callnoreturn'] = function(block) {
var funcName = Blockly.Python.variableDB_.getName(block.getFieldValue('NAME'),
Blockly.Procedures.NAME_TYPE);
var args = [];
- for (var x = 0; x < block.arguments_.length; x++) {
- args[x] = Blockly.Python.valueToCode(block, 'ARG' + x,
+ for (var i = 0; i < block.arguments_.length; i++) {
+ args[i] = Blockly.Python.valueToCode(block, 'ARG' + i,
Blockly.Python.ORDER_NONE) || 'None';
}
var code = funcName + '(' + args.join(', ') + ')\n';
diff --git a/generators/python/text.js b/generators/python/text.js
index 3ae0ffc8e..84e19872a 100644
--- a/generators/python/text.js
+++ b/generators/python/text.js
@@ -38,32 +38,35 @@ Blockly.Python['text'] = function(block) {
Blockly.Python['text_join'] = function(block) {
// Create a string made up of any number of elements of any type.
//Should we allow joining by '-' or ',' or any other characters?
- var code;
- if (block.itemCount_ == 0) {
- return ['\'\'', Blockly.Python.ORDER_ATOMIC];
- } else if (block.itemCount_ == 1) {
- var argument0 = Blockly.Python.valueToCode(block, 'ADD0',
- Blockly.Python.ORDER_NONE) || '\'\'';
- code = 'str(' + argument0 + ')';
- return [code, Blockly.Python.ORDER_FUNCTION_CALL];
- } else if (block.itemCount_ == 2) {
- var argument0 = Blockly.Python.valueToCode(block, 'ADD0',
- Blockly.Python.ORDER_NONE) || '\'\'';
- var argument1 = Blockly.Python.valueToCode(block, 'ADD1',
- Blockly.Python.ORDER_NONE) || '\'\'';
- var code = 'str(' + argument0 + ') + str(' + argument1 + ')';
- return [code, Blockly.Python.ORDER_UNARY_SIGN];
- } else {
- var code = [];
- for (var n = 0; n < block.itemCount_; n++) {
- code[n] = Blockly.Python.valueToCode(block, 'ADD' + n,
- Blockly.Python.ORDER_NONE) || '\'\'';
- }
- var tempVar = Blockly.Python.variableDB_.getDistinctName('temp_value',
- Blockly.Variables.NAME_TYPE);
- code = '\'\'.join([str(' + tempVar + ') for ' + tempVar + ' in [' +
- code.join(', ') + ']])';
- return [code, Blockly.Python.ORDER_FUNCTION_CALL];
+ switch (block.itemCount_) {
+ case 0:
+ return ['\'\'', Blockly.Python.ORDER_ATOMIC];
+ break;
+ case 1:
+ var element = Blockly.Python.valueToCode(block, 'ADD0',
+ Blockly.Python.ORDER_NONE) || '\'\'';
+ var code = 'str(' + element + ')';
+ return [code, Blockly.Python.ORDER_FUNCTION_CALL];
+ break;
+ case 2:
+ var element0 = Blockly.Python.valueToCode(block, 'ADD0',
+ Blockly.Python.ORDER_NONE) || '\'\'';
+ var element1 = Blockly.Python.valueToCode(block, 'ADD1',
+ Blockly.Python.ORDER_NONE) || '\'\'';
+ var code = 'str(' + element0 + ') + str(' + element1 + ')';
+ return [code, Blockly.Python.ORDER_ADDITIVE];
+ break;
+ default:
+ var elements = [];
+ for (var i = 0; i < block.itemCount_; i++) {
+ elements[i] = Blockly.Python.valueToCode(block, 'ADD' + i,
+ Blockly.Python.ORDER_NONE) || '\'\'';
+ }
+ var tempVar = Blockly.Python.variableDB_.getDistinctName('x',
+ Blockly.Variables.NAME_TYPE);
+ var code = '\'\'.join([str(' + tempVar + ') for ' + tempVar + ' in [' +
+ elements.join(', ') + ']])';
+ return [code, Blockly.Python.ORDER_FUNCTION_CALL];
}
};
@@ -71,23 +74,23 @@ Blockly.Python['text_append'] = function(block) {
// Append to a variable in place.
var varName = Blockly.Python.variableDB_.getName(block.getFieldValue('VAR'),
Blockly.Variables.NAME_TYPE);
- var argument0 = Blockly.Python.valueToCode(block, 'TEXT',
+ var value = Blockly.Python.valueToCode(block, 'TEXT',
Blockly.Python.ORDER_NONE) || '\'\'';
- return varName + ' = str(' + varName + ') + str(' + argument0 + ')\n';
+ return varName + ' = str(' + varName + ') + str(' + value + ')\n';
};
Blockly.Python['text_length'] = function(block) {
// Is the string null or array empty?
- var argument0 = Blockly.Python.valueToCode(block, 'VALUE',
+ var text = Blockly.Python.valueToCode(block, 'VALUE',
Blockly.Python.ORDER_NONE) || '\'\'';
- return ['len(' + argument0 + ')', Blockly.Python.ORDER_FUNCTION_CALL];
+ return ['len(' + text + ')', Blockly.Python.ORDER_FUNCTION_CALL];
};
Blockly.Python['text_isEmpty'] = function(block) {
// Is the string null or array empty?
- var argument0 = Blockly.Python.valueToCode(block, 'VALUE',
+ var text = Blockly.Python.valueToCode(block, 'VALUE',
Blockly.Python.ORDER_NONE) || '\'\'';
- var code = 'not len(' + argument0 + ')';
+ var code = 'not len(' + text + ')';
return [code, Blockly.Python.ORDER_LOGICAL_NOT];
};
@@ -95,20 +98,21 @@ Blockly.Python['text_indexOf'] = function(block) {
// Search the text for a substring.
// Should we allow for non-case sensitive???
var operator = block.getFieldValue('END') == 'FIRST' ? 'find' : 'rfind';
- var argument0 = Blockly.Python.valueToCode(block, 'FIND',
+ var substring = Blockly.Python.valueToCode(block, 'FIND',
Blockly.Python.ORDER_NONE) || '\'\'';
- var argument1 = Blockly.Python.valueToCode(block, 'VALUE',
+ var text = Blockly.Python.valueToCode(block, 'VALUE',
Blockly.Python.ORDER_MEMBER) || '\'\'';
- var code = argument1 + '.' + operator + '(' + argument0 + ') + 1';
- return [code, Blockly.Python.ORDER_ADDITIVE];
+ var code = text + '.' + operator + '(' + substring + ')';
+ if (Blockly.Python.ONE_BASED_INDEXING) {
+ return [code + ' + 1', Blockly.Python.ORDER_ADDITIVE];
+ }
+ return [code, Blockly.Python.ORDER_FUNCTION_CALL];
};
Blockly.Python['text_charAt'] = function(block) {
// Get letter at index.
// Note: Until January 2013 this block did not have the WHERE input.
var where = block.getFieldValue('WHERE') || 'FROM_START';
- var at = Blockly.Python.valueToCode(block, 'AT',
- Blockly.Python.ORDER_UNARY_SIGN) || '1';
var text = Blockly.Python.valueToCode(block, 'VALUE',
Blockly.Python.ORDER_MEMBER) || '\'\'';
switch (where) {
@@ -119,18 +123,12 @@ Blockly.Python['text_charAt'] = function(block) {
var code = text + '[-1]';
return [code, Blockly.Python.ORDER_MEMBER];
case 'FROM_START':
- // Blockly uses one-based indicies.
- if (Blockly.isNumber(at)) {
- // If the index is a naked number, decrement it right now.
- at = parseInt(at, 10) - 1;
- } else {
- // If the index is dynamic, decrement it in code.
- at = 'int(' + at + ' - 1)';
- }
+ var at = Blockly.Python.getAdjustedInt(block, 'AT');
var code = text + '[' + at + ']';
return [code, Blockly.Python.ORDER_MEMBER];
case 'FROM_END':
- var code = text + '[-' + at + ']';
+ var at = Blockly.Python.getAdjustedInt(block, 'AT', 1, true);
+ var code = text + '[' + at + ']';
return [code, Blockly.Python.ORDER_MEMBER];
case 'RANDOM':
Blockly.Python.definitions_['import_random'] = 'import random';
@@ -147,53 +145,46 @@ Blockly.Python['text_charAt'] = function(block) {
Blockly.Python['text_getSubstring'] = function(block) {
// Get substring.
- var text = Blockly.Python.valueToCode(block, 'STRING',
- Blockly.Python.ORDER_MEMBER) || '\'\'';
var where1 = block.getFieldValue('WHERE1');
var where2 = block.getFieldValue('WHERE2');
- var at1 = Blockly.Python.valueToCode(block, 'AT1',
- Blockly.Python.ORDER_ADDITIVE) || '1';
- var at2 = Blockly.Python.valueToCode(block, 'AT2',
- Blockly.Python.ORDER_ADDITIVE) || '1';
- if (where1 == 'FIRST' || (where1 == 'FROM_START' && at1 == '1')) {
- at1 = '';
- } else if (where1 == 'FROM_START') {
- // Blockly uses one-based indicies.
- if (Blockly.isNumber(at1)) {
- // If the index is a naked number, decrement it right now.
- at1 = parseInt(at1, 10) - 1;
- } else {
- // If the index is dynamic, decrement it in code.
- at1 = 'int(' + at1 + ' - 1)';
- }
- } else if (where1 == 'FROM_END') {
- if (Blockly.isNumber(at1)) {
- at1 = -parseInt(at1, 10);
- } else {
- at1 = '-int(' + at1 + ')';
- }
+ var text = Blockly.Python.valueToCode(block, 'STRING',
+ Blockly.Python.ORDER_MEMBER) || '\'\'';
+ switch (where1) {
+ case 'FROM_START':
+ var at1 = Blockly.Python.getAdjustedInt(block, 'AT1');
+ if (at1 == '0') {
+ at1 = '';
+ }
+ break;
+ case 'FROM_END':
+ var at1 = Blockly.Python.getAdjustedInt(block, 'AT1', 1, true);
+ break;
+ case 'FIRST':
+ var at1 = '';
+ break;
+ default:
+ throw 'Unhandled option (text_getSubstring)';
}
- if (where2 == 'LAST' || (where2 == 'FROM_END' && at2 == '1')) {
- at2 = '';
- } else if (where1 == 'FROM_START') {
- if (Blockly.isNumber(at2)) {
- at2 = parseInt(at2, 10);
- } else {
- at2 = 'int(' + at2 + ')';
- }
- } else if (where1 == 'FROM_END') {
- if (Blockly.isNumber(at2)) {
- // If the index is a naked number, increment it right now.
- at2 = 1 - parseInt(at2, 10);
- if (at2 == 0) {
+ switch (where2) {
+ case 'FROM_START':
+ var at2 = Blockly.Python.getAdjustedInt(block, 'AT2', 1);
+ break;
+ case 'FROM_END':
+ var at2 = Blockly.Python.getAdjustedInt(block, 'AT2', 0, true);
+ // Ensure that if the result calculated is 0 that sub-sequence will
+ // include all elements as expected.
+ if (!Blockly.isNumber(String(at2))) {
+ Blockly.Python.definitions_['import_sys'] = 'import sys';
+ at2 += ' or sys.maxsize';
+ } else if (at2 == '0') {
at2 = '';
}
- } else {
- // If the index is dynamic, increment it in code.
- // Add special case for -0.
- Blockly.Python.definitions_['import_sys'] = 'import sys';
- at2 = 'int(1 - ' + at2 + ') or sys.maxsize';
- }
+ break;
+ case 'LAST':
+ var at2 = '';
+ break;
+ default:
+ throw 'Unhandled option (text_getSubstring)';
}
var code = text + '[' + at1 + ' : ' + at2 + ']';
return [code, Blockly.Python.ORDER_MEMBER];
@@ -207,10 +198,10 @@ Blockly.Python['text_changeCase'] = function(block) {
'TITLECASE': '.title()'
};
var operator = OPERATORS[block.getFieldValue('CASE')];
- var argument0 = Blockly.Python.valueToCode(block, 'TEXT',
+ var text = Blockly.Python.valueToCode(block, 'TEXT',
Blockly.Python.ORDER_MEMBER) || '\'\'';
- var code = argument0 + operator;
- return [code, Blockly.Python.ORDER_MEMBER];
+ var code = text + operator;
+ return [code, Blockly.Python.ORDER_FUNCTION_CALL];
};
Blockly.Python['text_trim'] = function(block) {
@@ -221,17 +212,17 @@ Blockly.Python['text_trim'] = function(block) {
'BOTH': '.strip()'
};
var operator = OPERATORS[block.getFieldValue('MODE')];
- var argument0 = Blockly.Python.valueToCode(block, 'TEXT',
+ var text = Blockly.Python.valueToCode(block, 'TEXT',
Blockly.Python.ORDER_MEMBER) || '\'\'';
- var code = argument0 + operator;
- return [code, Blockly.Python.ORDER_MEMBER];
+ var code = text + operator;
+ return [code, Blockly.Python.ORDER_FUNCTION_CALL];
};
Blockly.Python['text_print'] = function(block) {
// Print statement.
- var argument0 = Blockly.Python.valueToCode(block, 'TEXT',
+ var msg = Blockly.Python.valueToCode(block, 'TEXT',
Blockly.Python.ORDER_NONE) || '\'\'';
- return 'print(' + argument0 + ')\n';
+ return 'print(' + msg + ')\n';
};
Blockly.Python['text_prompt_ext'] = function(block) {
diff --git a/javascript_compressed.js b/javascript_compressed.js
index 5bee7a0cc..c39f206ab 100644
--- a/javascript_compressed.js
+++ b/javascript_compressed.js
@@ -11,23 +11,27 @@ Blockly.JavaScript.ORDER_OVERRIDES=[[Blockly.JavaScript.ORDER_FUNCTION_CALL,Bloc
Blockly.JavaScript.ORDER_ADDITION],[Blockly.JavaScript.ORDER_LOGICAL_AND,Blockly.JavaScript.ORDER_LOGICAL_AND],[Blockly.JavaScript.ORDER_LOGICAL_OR,Blockly.JavaScript.ORDER_LOGICAL_OR]];Blockly.JavaScript.ONE_BASED_INDEXING=!0;
Blockly.JavaScript.init=function(a){Blockly.JavaScript.definitions_=Object.create(null);Blockly.JavaScript.functionNames_=Object.create(null);Blockly.JavaScript.variableDB_?Blockly.JavaScript.variableDB_.reset():Blockly.JavaScript.variableDB_=new Blockly.Names(Blockly.JavaScript.RESERVED_WORDS_);var b=[];a=a.variableList;if(a.length){for(var c=0;cc?Blockly.JavaScript.valueToCode(a,b,Blockly.JavaScript.ORDER_SUBTRACTION)||f:d?Blockly.JavaScript.valueToCode(a,b,Blockly.JavaScript.ORDER_UNARY_NEGATION)||f:Blockly.JavaScript.valueToCode(a,b,e)||f;if(Blockly.isNumber(a))a=parseFloat(a)+
+c,d&&(a=-a);else{if(0c&&(a=a+" - "+-c,g=Blockly.JavaScript.ORDER_SUBTRACTION);d&&(a=c?"-("+a+")":"-"+a,g=Blockly.JavaScript.ORDER_UNARY_NEGATION);g=Math.floor(g);e=Math.floor(e);g&&e>=g&&(a="("+a+")")}return a};Blockly.JavaScript.lists={};Blockly.JavaScript.lists_create_empty=function(a){return["[]",Blockly.JavaScript.ORDER_ATOMIC]};Blockly.JavaScript.lists_create_with=function(a){for(var b=Array(a.itemCount_),c=0;c b.toString() ? 1 : -1; },",
-' "IGNORE_CASE": function(a, b) {'," return a.toString().toLowerCase() > b.toString().toLowerCase() ? 1 : -1; },"," };"," var compare = compareFuncs[type];"," return function(a, b) { return compare(a, b) * direction; }","}"]);return["("+b+").slice().sort("+d+'("'+a+'", '+c+"))",Blockly.JavaScript.ORDER_FUNCTION_CALL]};
+' "IGNORE_CASE": function(a, b) {'," return a.toString().toLowerCase() > b.toString().toLowerCase() ? 1 : -1; },"," };"," var compare = compareFuncs[type];"," return function(a, b) { return compare(a, b) * direction; }","}"]);return[b+".slice().sort("+d+'("'+a+'", '+c+"))",Blockly.JavaScript.ORDER_FUNCTION_CALL]};
Blockly.JavaScript.lists_split=function(a){var b=Blockly.JavaScript.valueToCode(a,"INPUT",Blockly.JavaScript.ORDER_MEMBER),c=Blockly.JavaScript.valueToCode(a,"DELIM",Blockly.JavaScript.ORDER_NONE)||"''";a=a.getFieldValue("MODE");if("SPLIT"==a)b||(b="''"),a="split";else if("JOIN"==a)b||(b="[]"),a="join";else throw"Unknown mode: "+a;return[b+"."+a+"("+c+")",Blockly.JavaScript.ORDER_FUNCTION_CALL]};Blockly.JavaScript.math={};Blockly.JavaScript.math_number=function(a){return[parseFloat(a.getFieldValue("NUM")),Blockly.JavaScript.ORDER_ATOMIC]};
Blockly.JavaScript.math_arithmetic=function(a){var b={ADD:[" + ",Blockly.JavaScript.ORDER_ADDITION],MINUS:[" - ",Blockly.JavaScript.ORDER_SUBTRACTION],MULTIPLY:[" * ",Blockly.JavaScript.ORDER_MULTIPLICATION],DIVIDE:[" / ",Blockly.JavaScript.ORDER_DIVISION],POWER:[null,Blockly.JavaScript.ORDER_COMMA]}[a.getFieldValue("OP")],c=b[0],b=b[1],d=Blockly.JavaScript.valueToCode(a,"A",b)||"0";a=Blockly.JavaScript.valueToCode(a,"B",b)||"0";return c?[d+c+a,b]:["Math.pow("+d+", "+a+")",Blockly.JavaScript.ORDER_FUNCTION_CALL]};
Blockly.JavaScript.math_single=function(a){var b=a.getFieldValue("OP"),c;if("NEG"==b)return a=Blockly.JavaScript.valueToCode(a,"NUM",Blockly.JavaScript.ORDER_UNARY_NEGATION)||"0","-"==a[0]&&(a=" "+a),["-"+a,Blockly.JavaScript.ORDER_UNARY_NEGATION];a="SIN"==b||"COS"==b||"TAN"==b?Blockly.JavaScript.valueToCode(a,"NUM",Blockly.JavaScript.ORDER_DIVISION)||"0":Blockly.JavaScript.valueToCode(a,"NUM",Blockly.JavaScript.ORDER_NONE)||"0";switch(b){case "ABS":c="Math.abs("+a+")";break;case "ROOT":c="Math.sqrt("+
@@ -58,19 +62,20 @@ Blockly.JavaScript.procedures_defreturn=function(a){var b=Blockly.JavaScript.var
Blockly.JavaScript.procedures_callreturn=function(a){for(var b=Blockly.JavaScript.variableDB_.getName(a.getFieldValue("NAME"),Blockly.Procedures.NAME_TYPE),c=[],d=0;da?Blockly.Lua.ORDER_UNARY:Blockly.Lua.ORDER_ATOMIC]};
+" break"," else"," table.insert(t, string.sub(input, pos, next_delim-1))"," pos = next_delim + #delim"," end"," end"," return t","end"]);else if("JOIN"==a)b||(b="{}"),a="table.concat";else throw"Unknown mode: "+a;return[a+"("+b+", "+c+")",Blockly.Lua.ORDER_HIGH]};Blockly.Lua.math={};Blockly.Lua.math_number=function(a){a=parseFloat(a.getFieldValue("NUM"));return[a,0>a?Blockly.Lua.ORDER_UNARY:Blockly.Lua.ORDER_ATOMIC]};
Blockly.Lua.math_arithmetic=function(a){var b={ADD:[" + ",Blockly.Lua.ORDER_ADDITIVE],MINUS:[" - ",Blockly.Lua.ORDER_ADDITIVE],MULTIPLY:[" * ",Blockly.Lua.ORDER_MULTIPLICATIVE],DIVIDE:[" / ",Blockly.Lua.ORDER_MULTIPLICATIVE],POWER:[" ^ ",Blockly.Lua.ORDER_EXPONENTIATION]}[a.getFieldValue("OP")],c=b[0],b=b[1],d=Blockly.Lua.valueToCode(a,"A",b)||"0";a=Blockly.Lua.valueToCode(a,"B",b)||"0";return[d+c+a,b]};
Blockly.Lua.math_single=function(a){var b=a.getFieldValue("OP");if("NEG"==b)return a=Blockly.Lua.valueToCode(a,"NUM",Blockly.Lua.ORDER_UNARY)||"0",["-"+a,Blockly.Lua.ORDER_UNARY];a="SIN"==b||"COS"==b||"TAN"==b?Blockly.Lua.valueToCode(a,"NUM",Blockly.Lua.ORDER_MULTIPLICATIVE)||"0":Blockly.Lua.valueToCode(a,"NUM",Blockly.Lua.ORDER_NONE)||"0";switch(b){case "ABS":b="math.abs("+a+")";break;case "ROOT":b="math.sqrt("+a+")";break;case "LN":b="math.log("+a+")";break;case "LOG10":b="math.log10("+a+")";break;
case "EXP":b="math.exp("+a+")";break;case "POW10":b="math.pow(10,"+a+")";break;case "ROUND":b="math.floor("+a+" + .5)";break;case "ROUNDUP":b="math.ceil("+a+")";break;case "ROUNDDOWN":b="math.floor("+a+")";break;case "SIN":b="math.sin(math.rad("+a+"))";break;case "COS":b="math.cos(math.rad("+a+"))";break;case "TAN":b="math.tan(math.rad("+a+"))";break;case "ASIN":b="math.deg(math.asin("+a+"))";break;case "ACOS":b="math.deg(math.acos("+a+"))";break;case "ATAN":b="math.deg(math.atan("+a+"))";break;default:throw"Unknown math operator: "+
@@ -51,15 +50,15 @@ c||(c="");for(var e=[],f=0;f",
- "lastupdated": "2016-07-07 13:57:36.962843",
+ "lastupdated": "2016-07-15 13:05:42.680472",
"locale": "en",
"messagedocumentation" : "qqq"
},
@@ -26,9 +26,6 @@
"HELP": "Help",
"UNDO": "Undo",
"REDO": "Redo",
- "CHAT": "Chat with your collaborator by typing in this box!",
- "AUTH": "Please authorize this app to enable your work to be saved and to allow it to be shared by you.",
- "ME": "Me",
"CHANGE_VALUE_TITLE": "Change value:",
"NEW_VARIABLE": "New variable...",
"NEW_VARIABLE_TITLE": "New variable name:",
@@ -212,7 +209,7 @@
"TEXT_ISEMPTY_TITLE": "%1 is empty",
"TEXT_ISEMPTY_TOOLTIP": "Returns true if the provided text is empty.",
"TEXT_INDEXOF_HELPURL": "https://github.com/google/blockly/wiki/Text#finding-text",
- "TEXT_INDEXOF_TOOLTIP": "Returns the index of the first/last occurrence of the first text in the second text. Returns 0 if text is not found.",
+ "TEXT_INDEXOF_TOOLTIP": "Returns the index of the first/last occurrence of the first text in the second text. Returns %1 if text is not found.",
"TEXT_INDEXOF_INPUT_INTEXT": "in text",
"TEXT_INDEXOF_OPERATOR_FIRST": "find first occurrence of text",
"TEXT_INDEXOF_OPERATOR_LAST": "find last occurrence of text",
@@ -276,7 +273,7 @@
"LISTS_INDEX_OF_HELPURL": "https://github.com/google/blockly/wiki/Lists#getting-items-from-a-list",
"LISTS_INDEX_OF_FIRST": "find first occurrence of item",
"LISTS_INDEX_OF_LAST": "find last occurrence of item",
- "LISTS_INDEX_OF_TOOLTIP": "Returns the index of the first/last occurrence of the item in the list. Returns 0 if item is not found.",
+ "LISTS_INDEX_OF_TOOLTIP": "Returns the index of the first/last occurrence of the item in the list. Returns %1 if item is not found.",
"LISTS_GET_INDEX_GET": "get",
"LISTS_GET_INDEX_GET_REMOVE": "get and remove",
"LISTS_GET_INDEX_REMOVE": "remove",
@@ -286,18 +283,17 @@
"LISTS_GET_INDEX_LAST": "last",
"LISTS_GET_INDEX_RANDOM": "random",
"LISTS_GET_INDEX_TAIL": "",
- "LISTS_GET_INDEX_TOOLTIP_GET_FROM_START": "Returns the item at the specified position in a list. #1 is the first item.",
- "LISTS_GET_INDEX_TOOLTIP_GET_FROM_END": "Returns the item at the specified position in a list. #1 is the last item.",
+ "LISTS_INDEX_FROM_START_TOOLTIP": "%1 is the first item.",
+ "LISTS_INDEX_FROM_END_TOOLTIP": "%1 is the last item.",
+ "LISTS_GET_INDEX_TOOLTIP_GET_FROM": "Returns the item at the specified position in a list.",
"LISTS_GET_INDEX_TOOLTIP_GET_FIRST": "Returns the first item in a list.",
"LISTS_GET_INDEX_TOOLTIP_GET_LAST": "Returns the last item in a list.",
"LISTS_GET_INDEX_TOOLTIP_GET_RANDOM": "Returns a random item in a list.",
- "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM_START": "Removes and returns the item at the specified position in a list. #1 is the first item.",
- "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM_END": "Removes and returns the item at the specified position in a list. #1 is the last item.",
+ "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM": "Removes and returns the item at the specified position in a list.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FIRST": "Removes and returns the first item in a list.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_LAST": "Removes and returns the last item in a list.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_RANDOM": "Removes and returns a random item in a list.",
- "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM_START": "Removes the item at the specified position in a list. #1 is the first item.",
- "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM_END": "Removes the item at the specified position in a list. #1 is the last item.",
+ "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM": "Removes the item at the specified position in a list.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_FIRST": "Removes the first item in a list.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_LAST": "Removes the last item in a list.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_RANDOM": "Removes a random item in a list.",
@@ -305,13 +301,11 @@
"LISTS_SET_INDEX_SET": "set",
"LISTS_SET_INDEX_INSERT": "insert at",
"LISTS_SET_INDEX_INPUT_TO": "as",
- "LISTS_SET_INDEX_TOOLTIP_SET_FROM_START": "Sets the item at the specified position in a list. #1 is the first item.",
- "LISTS_SET_INDEX_TOOLTIP_SET_FROM_END": "Sets the item at the specified position in a list. #1 is the last item.",
+ "LISTS_SET_INDEX_TOOLTIP_SET_FROM": "Sets the item at the specified position in a list.",
"LISTS_SET_INDEX_TOOLTIP_SET_FIRST": "Sets the first item in a list.",
"LISTS_SET_INDEX_TOOLTIP_SET_LAST": "Sets the last item in a list.",
"LISTS_SET_INDEX_TOOLTIP_SET_RANDOM": "Sets a random item in a list.",
- "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_START": "Inserts the item at the specified position in a list. #1 is the first item.",
- "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_END": "Inserts the item at the specified position in a list. #1 is the last item.",
+ "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM": "Inserts the item at the specified position in a list.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_FIRST": "Inserts the item at the start of a list.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_LAST": "Append the item to the end of a list.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_RANDOM": "Inserts the item randomly in a list.",
diff --git a/msg/json/es.json b/msg/json/es.json
index 4afd5e793..d976c56f1 100644
--- a/msg/json/es.json
+++ b/msg/json/es.json
@@ -31,9 +31,6 @@
"HELP": "Ayuda",
"UNDO": "Deshacer",
"REDO": "Rehacer",
- "CHAT": "¡Chatea con tu colaborador escribiendo en este cuadro!",
- "AUTH": "Autoriza a esta aplicación para guardar tu trabajo y permitir que lo compartas.",
- "ME": "Yo",
"CHANGE_VALUE_TITLE": "Cambiar el valor:",
"NEW_VARIABLE": "Variable nueva…",
"NEW_VARIABLE_TITLE": "Nombre de variable nueva:",
@@ -187,7 +184,7 @@
"TEXT_LENGTH_TOOLTIP": "Devuelve el número de letras (incluyendo espacios) en el texto proporcionado.",
"TEXT_ISEMPTY_TITLE": "%1 está vacío",
"TEXT_ISEMPTY_TOOLTIP": "Devuelve verdadero si el texto proporcionado está vacío.",
- "TEXT_INDEXOF_TOOLTIP": "Devuelve el índice de la primera/última aparición del primer texto en el segundo texto. Devuelve 0 si el texto no se encuentra.",
+ "TEXT_INDEXOF_TOOLTIP": "Devuelve el índice de la primera/última aparición del primer texto en el segundo texto. Devuelve %1 si el texto no se encuentra.",
"TEXT_INDEXOF_INPUT_INTEXT": "en el texto",
"TEXT_INDEXOF_OPERATOR_FIRST": "encontrar la primera aparición del texto",
"TEXT_INDEXOF_OPERATOR_LAST": "encontrar la última aparición del texto",
@@ -237,7 +234,7 @@
"LISTS_INLIST": "en la lista",
"LISTS_INDEX_OF_FIRST": "encontrar la primera aparición del elemento",
"LISTS_INDEX_OF_LAST": "encontrar la última aparición del elemento",
- "LISTS_INDEX_OF_TOOLTIP": "Devuelve el índice de la primera/última aparición del elemento en la lista. Devuelve 0 si el elemento no se encuentra.",
+ "LISTS_INDEX_OF_TOOLTIP": "Devuelve el índice de la primera/última aparición del elemento en la lista. Devuelve %1 si el elemento no se encuentra.",
"LISTS_GET_INDEX_GET": "obtener",
"LISTS_GET_INDEX_GET_REMOVE": "obtener y eliminar",
"LISTS_GET_INDEX_REMOVE": "eliminar",
@@ -245,31 +242,28 @@
"LISTS_GET_INDEX_FIRST": "primero",
"LISTS_GET_INDEX_LAST": "último",
"LISTS_GET_INDEX_RANDOM": "aleatorio",
- "LISTS_GET_INDEX_TOOLTIP_GET_FROM_START": "Devuelve el elemento en la posición especificada en la lista. #1 es el primer elemento.",
- "LISTS_GET_INDEX_TOOLTIP_GET_FROM_END": "Devuelve el elemento en la posición especificada en una lista. #1 es el último elemento.",
+ "LISTS_INDEX_FROM_START_TOOLTIP": "%1 es el primer elemento.",
+ "LISTS_INDEX_FROM_END_TOOLTIP": "%1 es el último elemento.",
+ "LISTS_GET_INDEX_TOOLTIP_GET_FROM": "Devuelve el elemento en la posición especificada en la lista.",
"LISTS_GET_INDEX_TOOLTIP_GET_FIRST": "Devuelve el primer elemento de una lista.",
"LISTS_GET_INDEX_TOOLTIP_GET_LAST": "Devuelve el último elemento de una lista.",
"LISTS_GET_INDEX_TOOLTIP_GET_RANDOM": "Devuelve un elemento aleatorio en una lista.",
- "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM_START": "Elimina y devuelve el elemento en la posición especificada en la lista. #1 es el primer elemento.",
- "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM_END": "Elimina y devuelve el elemento en la posición especificada en la lista. #1 es el último elemento.",
+ "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM": "Elimina y devuelve el elemento en la posición especificada en la lista.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FIRST": "Elimina y devuelve el primer elemento de una lista.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_LAST": "Elimina y devuelve el último elemento de una lista.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_RANDOM": "Elimina y devuelve un elemento aleatorio en una lista.",
- "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM_START": "Elimina el elemento en la posición especificada en la lista. #1 es el primer elemento.",
- "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM_END": "Elimina el elemento en la posición especificada en la lista. #1 es el último elemento.",
+ "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM": "Elimina el elemento en la posición especificada en la lista.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_FIRST": "Elimina el primer elemento de una lista.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_LAST": "Elimina el último elemento de una lista.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_RANDOM": "Elimina un elemento aleatorio en una lista.",
"LISTS_SET_INDEX_SET": "establecer",
"LISTS_SET_INDEX_INSERT": "insertar en",
"LISTS_SET_INDEX_INPUT_TO": "como",
- "LISTS_SET_INDEX_TOOLTIP_SET_FROM_START": "Establece el elemento en la posición especificada en una lista. #1 es el primer elemento.",
- "LISTS_SET_INDEX_TOOLTIP_SET_FROM_END": "Establece el elemento en la posición especificada en una lista. #1 es el último elemento.",
+ "LISTS_SET_INDEX_TOOLTIP_SET_FROM": "Establece el elemento en la posición especificada en una lista.",
"LISTS_SET_INDEX_TOOLTIP_SET_FIRST": "Establece el primer elemento de una lista.",
"LISTS_SET_INDEX_TOOLTIP_SET_LAST": "Establece el último elemento de una lista.",
"LISTS_SET_INDEX_TOOLTIP_SET_RANDOM": "Establece un elemento aleatorio en una lista.",
- "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_START": "Inserta el elemento en la posición especificada en la lista. #1 es el primer elemento.",
- "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_END": "Inserta el elemento en la posición especificada en la lista. #1 es el último elemento.",
+ "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM": "Inserta el elemento en la posición especificada en la lista.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_FIRST": "Inserta el elemento al inicio de una lista.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_LAST": "Añade el elemento al final de una lista.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_RANDOM": "Inserta el elemento aleatoriamente en una lista.",
diff --git a/msg/json/fa.json b/msg/json/fa.json
index fdfdf75f8..ed15b24f2 100644
--- a/msg/json/fa.json
+++ b/msg/json/fa.json
@@ -30,9 +30,6 @@
"HELP": "راهنما",
"UNDO": "واگردانی",
"REDO": "واگردانی",
- "CHAT": "با همکارتان با نوشتن در این کادر چت کنید!",
- "AUTH": "لطفا این اپلیکیشن را ثبت کنید و آثارتان را فعال کنید تا ذخیره شود و اجازهٔ اشتراکگذاری توسط شما داده شود.",
- "ME": "من",
"CHANGE_VALUE_TITLE": "تغییر مقدار:",
"NEW_VARIABLE": "متغیر تازه...",
"NEW_VARIABLE_TITLE": "نام متغیر تازه:",
@@ -185,7 +182,7 @@
"TEXT_LENGTH_TOOLTIP": "بازگرداندن عددی از حروف (شامل فاصلهها) در متن فراهمشده.",
"TEXT_ISEMPTY_TITLE": "%1 خالی است",
"TEXT_ISEMPTY_TOOLTIP": "اضافهکردن صحیح اگر متن فراهمشده خالی است.",
- "TEXT_INDEXOF_TOOLTIP": "شاخصی از اولین آخرین رخداد متن اول در متن دوم بر میگرداند. اگر متن یافت نشد ۰ باز میگرداند.",
+ "TEXT_INDEXOF_TOOLTIP": "شاخصی از اولین آخرین رخداد متن اول در متن دوم بر میگرداند. اگر متن یافت نشد %1 باز میگرداند.",
"TEXT_INDEXOF_INPUT_INTEXT": "در متن",
"TEXT_INDEXOF_OPERATOR_FIRST": "اولین رخداد متن را بیاب",
"TEXT_INDEXOF_OPERATOR_LAST": "آخرین رخداد متن را بیاب",
@@ -234,7 +231,7 @@
"LISTS_INLIST": "در فهرست",
"LISTS_INDEX_OF_FIRST": "یافتن اولین رخداد مورد",
"LISTS_INDEX_OF_LAST": "یافتن آخرین رخداد مورد",
- "LISTS_INDEX_OF_TOOLTIP": "شاخصی از اولین/آخرین رخداد مورد در فهرست را بر میگرداند. ۰ بر میگرداند اگر آیتم موجود نبود.",
+ "LISTS_INDEX_OF_TOOLTIP": "شاخصی از اولین/آخرین رخداد مورد در فهرست را بر میگرداند. %1 بر میگرداند اگر آیتم موجود نبود.",
"LISTS_GET_INDEX_GET": "گرفتن",
"LISTS_GET_INDEX_GET_REMOVE": "گرفتن و حذفکردن",
"LISTS_GET_INDEX_REMOVE": "حذفکردن",
@@ -242,31 +239,28 @@
"LISTS_GET_INDEX_FIRST": "اولین",
"LISTS_GET_INDEX_LAST": "آخرین",
"LISTS_GET_INDEX_RANDOM": "تصادفی",
- "LISTS_GET_INDEX_TOOLTIP_GET_FROM_START": "موردی در محل مشخصشده بر میگرداند. #1 اولین مورد است.",
- "LISTS_GET_INDEX_TOOLTIP_GET_FROM_END": "موردی در محل مشخص در فهرست بر میگرداند. #1 آخرین مورد است.",
+ "LISTS_INDEX_FROM_START_TOOLTIP": "%1 اولین مورد است.",
+ "LISTS_INDEX_FROM_END_TOOLTIP": "%1 آخرین مورد است.",
+ "LISTS_GET_INDEX_TOOLTIP_GET_FROM": "موردی در محل مشخصشده بر میگرداند.",
"LISTS_GET_INDEX_TOOLTIP_GET_FIRST": "اولین مورد یک فهرست را بر میگرداند.",
"LISTS_GET_INDEX_TOOLTIP_GET_LAST": "آخرین مورد در یک فهرست را بر میگرداند.",
"LISTS_GET_INDEX_TOOLTIP_GET_RANDOM": "یک مورد تصادفی در یک فهرست بر میگرداند.",
- "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM_START": "مورد در محل مشخصشده در فهرست را حذف و بر میگرداند. #1 اولین مورد است.",
- "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM_END": "مورد در محل مشخصشده در فهرست را حذف و بر میگرداند. #1 آخرین مورد است.",
+ "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM": "مورد در محل مشخصشده در فهرست را حذف و بر میگرداند.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FIRST": "اولین مورد مشخصشده در فهرست را حذف و بر میگرداند.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_LAST": "آخرین مورد مشخصشده در فهرست را حذف و بر میگرداند.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_RANDOM": "مورد تصادفیای را در فهرست حذف و بر میگرداند.",
- "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM_START": "مورد مشخصشده در موقعیت مشخص در یک فهرست را حذف و بر میگرداند. #1 اولین مورد است.",
- "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM_END": "مورد مشخصشده در موقعیت مشخص در یک فهرست را حذف و بر میگرداند. #1 آخرین مورد است.",
+ "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM": "مورد مشخصشده در موقعیت مشخص در یک فهرست را حذف و بر میگرداند.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_FIRST": "اولین مورد را در یک فهرست حذف میکند.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_LAST": "آخرین مورد را در یک فهرست حذف میکند.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_RANDOM": "یک مورد تصادفی را یک فهرست حذف میکند.",
"LISTS_SET_INDEX_SET": "مجموعه",
"LISTS_SET_INDEX_INSERT": "درج در",
"LISTS_SET_INDEX_INPUT_TO": "به عنوان",
- "LISTS_SET_INDEX_TOOLTIP_SET_FROM_START": "مورد مشخصشده در یک فهرست را قرار میدهد. #1 اولین مورد است.",
- "LISTS_SET_INDEX_TOOLTIP_SET_FROM_END": "مورد مشخصشده در یک فهرست را قرار میدهد. #1 آخرین مورد است.",
+ "LISTS_SET_INDEX_TOOLTIP_SET_FROM": "مورد مشخصشده در یک فهرست را قرار میدهد.",
"LISTS_SET_INDEX_TOOLTIP_SET_FIRST": "اولین مورد در یک فهرست را تعیین میکند.",
"LISTS_SET_INDEX_TOOLTIP_SET_LAST": "آخرین مورد در یک فهرست را تعیین میکند.",
"LISTS_SET_INDEX_TOOLTIP_SET_RANDOM": "یک مورد تصادفی در یک فهرست را تعیین میکند.",
- "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_START": "موردی در موقعیت مشخصشده در یک فهرست اضافه میکند. #1 اولین مورد است.",
- "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_END": "موردی در موقعیت مشخصشده در یک فهرست اضافه میکند. #1 آخرین مورد است.",
+ "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM": "موردی در موقعیت مشخصشده در یک فهرست اضافه میکند.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_FIRST": "موردی به ته فهرست اضافه میکند.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_LAST": "موردی به ته فهرست الحاق میکند.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_RANDOM": "مورد را به صورت تصادفی در یک فهرست میافزاید.",
diff --git a/msg/json/fi.json b/msg/json/fi.json
index d00ae52d3..132c1bb7e 100644
--- a/msg/json/fi.json
+++ b/msg/json/fi.json
@@ -32,9 +32,6 @@
"HELP": "Apua",
"UNDO": "Kumoa",
"REDO": "Tee uudelleen",
- "CHAT": "Keskustele yhteistyökumppanisi kanssa kirjoittamalla tähän kenttään!",
- "AUTH": "Valtuuta tämä ohjelma jotta voit tallettaa työsi ja jakaa sen.",
- "ME": "Minä",
"CHANGE_VALUE_TITLE": "Muuta arvoa:",
"NEW_VARIABLE": "Uusi muuttuja...",
"NEW_VARIABLE_TITLE": "Uuden muuttujan nimi:",
@@ -199,7 +196,7 @@
"TEXT_LENGTH_TOOLTIP": "Palauttaa annetussa tekstissä olevien merkkien määrän (välilyönnit mukaan lukien).",
"TEXT_ISEMPTY_TITLE": "%1 on tyhjä",
"TEXT_ISEMPTY_TOOLTIP": "Palauttaa tosi, jos annettu teksti on tyhjä.",
- "TEXT_INDEXOF_TOOLTIP": "Palauttaa ensin annetun tekstin ensimmäisen/viimeisen esiintymän osoitteen toisessa tekstissä. Palauttaa osoitteen 0 jos tekstiä ei löytynyt.",
+ "TEXT_INDEXOF_TOOLTIP": "Palauttaa ensin annetun tekstin ensimmäisen/viimeisen esiintymän osoitteen toisessa tekstissä. Palauttaa osoitteen %1 jos tekstiä ei löytynyt.",
"TEXT_INDEXOF_INPUT_INTEXT": "tekstistä",
"TEXT_INDEXOF_OPERATOR_FIRST": "etsi ensimmäinen esiintymä merkkijonolle",
"TEXT_INDEXOF_OPERATOR_LAST": "etsi viimeinen esiintymä merkkijonolle",
@@ -248,7 +245,7 @@
"LISTS_INLIST": "listassa",
"LISTS_INDEX_OF_FIRST": "etsi ensimmäinen esiintymä kohteelle",
"LISTS_INDEX_OF_LAST": "etsi viimeinen esiintymä kohteelle",
- "LISTS_INDEX_OF_TOOLTIP": "Palauttaa kohteen ensimmäisen/viimeisen esiintymän kohdan. Palauttaa 0 jos tekstiä ei löydy.",
+ "LISTS_INDEX_OF_TOOLTIP": "Palauttaa kohteen ensimmäisen/viimeisen esiintymän kohdan. Palauttaa %1 jos tekstiä ei löydy.",
"LISTS_GET_INDEX_GET": "hae",
"LISTS_GET_INDEX_GET_REMOVE": "hae ja poista",
"LISTS_GET_INDEX_REMOVE": "poista",
@@ -257,31 +254,28 @@
"LISTS_GET_INDEX_FIRST": "ensimmäinen",
"LISTS_GET_INDEX_LAST": "viimeinen",
"LISTS_GET_INDEX_RANDOM": "satunnainen",
- "LISTS_GET_INDEX_TOOLTIP_GET_FROM_START": "Palauta kohde annetusta kohdasta listaa. Numero 1 tarkoittaa listan ensimmäistä kohdetta.",
- "LISTS_GET_INDEX_TOOLTIP_GET_FROM_END": "Palauta kohde annetusta kohdasta listaa. Numero 1 tarkoittaa listan viimeistä kohdetta.",
+ "LISTS_INDEX_FROM_START_TOOLTIP": "Numero %1 tarkoittaa listan ensimmäistä kohdetta.",
+ "LISTS_INDEX_FROM_END_TOOLTIP": "Numero %1 tarkoittaa listan viimeistä kohdetta.",
+ "LISTS_GET_INDEX_TOOLTIP_GET_FROM": "Palauta kohde annetusta kohdasta listaa.",
"LISTS_GET_INDEX_TOOLTIP_GET_FIRST": "Palauta ensimmäinen kohde listalta.",
"LISTS_GET_INDEX_TOOLTIP_GET_LAST": "Palauttaa listan viimeisen kohteen.",
"LISTS_GET_INDEX_TOOLTIP_GET_RANDOM": "Palauttaa satunnaisen kohteen listalta.",
- "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM_START": "Poistaa ja palauttaa kohteen annetusta kohden listaa. Nro 1 on ensimmäinen kohde.",
- "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM_END": "Poistaa ja palauttaa kohteen annetusta kohden listaa. Nro 1 on ensimmäinen kohde.",
+ "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM": "Poistaa ja palauttaa kohteen listan annetusta kohdasta.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FIRST": "Poistaa ja palauttaa ensimmäisen kohteen listalta.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_LAST": "Poistaa ja palauttaa viimeisen kohteen listalta.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_RANDOM": "Poistaa ja palauttaa satunnaisen kohteen listalta.",
- "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM_START": "Poistaa kohteen listalta annetusta kohtaa. Nro 1 on ensimmäinen kohde.",
- "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM_END": "Poistaa kohteen listalta annetusta kohtaa. Nro 1 on viimeinen kohde.",
+ "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM": "Poistaa kohteen listalta annetusta kohtaa.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_FIRST": "Poistaa ensimmäisen kohteen listalta.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_LAST": "Poistaa viimeisen kohteen listalta.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_RANDOM": "Poistaa satunnaisen kohteen listalta.",
"LISTS_SET_INDEX_SET": "aseta",
"LISTS_SET_INDEX_INSERT": "lisää kohtaan",
"LISTS_SET_INDEX_INPUT_TO": "kohteeksi",
- "LISTS_SET_INDEX_TOOLTIP_SET_FROM_START": "Asettaa kohteen määrättyyn kohtaa listassa. Nro 1 on listan alku.",
- "LISTS_SET_INDEX_TOOLTIP_SET_FROM_END": "Asettaa listan määrätyssä kohtaa olevan kohteen. Nro 1 on listan loppu.",
+ "LISTS_SET_INDEX_TOOLTIP_SET_FROM": "Asettaa kohteen annettuun kohtaan listassa.",
"LISTS_SET_INDEX_TOOLTIP_SET_FIRST": "Asettaa listan ensimmäisen kohteen.",
"LISTS_SET_INDEX_TOOLTIP_SET_LAST": "Asettaa listan viimeisen kohteen.",
"LISTS_SET_INDEX_TOOLTIP_SET_RANDOM": "Asettaa satunnaisen kohteen listassa.",
- "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_START": "Lisää kohteen listan annettuun kohtaan. Nro 1 on listan kärki.",
- "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_END": "Lisää kohteen annettuun kohtaan listaa. Nro 1 on listan häntä.",
+ "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM": "Lisää kohteen annettuun kohtaan listassa.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_FIRST": "Lisää kohteen listan kärkeen.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_LAST": "Lisää kohteen listan loppuun.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_RANDOM": "Lisää kohteen satunnaiseen kohtaan listassa.",
diff --git a/msg/json/fr.json b/msg/json/fr.json
index e4d0b7d73..b826f36bc 100644
--- a/msg/json/fr.json
+++ b/msg/json/fr.json
@@ -31,9 +31,6 @@
"HELP": "Aide",
"UNDO": "Annuler",
"REDO": "Refaire",
- "CHAT": "Discutez avec votre collaborateur en tapant dans cette zone !",
- "AUTH": "Veuillez autoriser cette application à permettre la sauvegarde de votre travail et à l’autoriser d'être partagé par vous.",
- "ME": "Moi",
"CHANGE_VALUE_TITLE": "Modifier la valeur :",
"NEW_VARIABLE": "Nouvelle variable…",
"NEW_VARIABLE_TITLE": "Nouveau nom de la variable :",
@@ -190,7 +187,7 @@
"TEXT_LENGTH_TOOLTIP": "Renvoie le nombre de lettres (espaces compris) dans le texte fourni.",
"TEXT_ISEMPTY_TITLE": "%1 est vide",
"TEXT_ISEMPTY_TOOLTIP": "Renvoie vrai si le texte fourni est vide.",
- "TEXT_INDEXOF_TOOLTIP": "Renvoie l’index de la première/dernière occurrence de la première chaîne dans la seconde. Renvoie 0 si la chaîne n’est pas trouvée.",
+ "TEXT_INDEXOF_TOOLTIP": "Renvoie l’index de la première/dernière occurrence de la première chaîne dans la seconde. Renvoie %1 si la chaîne n’est pas trouvée.",
"TEXT_INDEXOF_INPUT_INTEXT": "dans le texte",
"TEXT_INDEXOF_OPERATOR_FIRST": "trouver la première occurrence de la chaîne",
"TEXT_INDEXOF_OPERATOR_LAST": "trouver la dernière occurrence de la chaîne",
@@ -240,7 +237,7 @@
"LISTS_INLIST": "dans la liste",
"LISTS_INDEX_OF_FIRST": "trouver la première occurrence de l’élément",
"LISTS_INDEX_OF_LAST": "trouver la dernière occurrence de l’élément",
- "LISTS_INDEX_OF_TOOLTIP": "Renvoie l’index de la première/dernière occurrence de l’élément dans la liste. Renvoie 0 si l'élément n'est pas trouvé.",
+ "LISTS_INDEX_OF_TOOLTIP": "Renvoie l’index de la première/dernière occurrence de l’élément dans la liste. Renvoie %1 si l'élément n'est pas trouvé.",
"LISTS_GET_INDEX_GET": "obtenir",
"LISTS_GET_INDEX_GET_REMOVE": "obtenir et supprimer",
"LISTS_GET_INDEX_REMOVE": "supprimer",
@@ -248,31 +245,28 @@
"LISTS_GET_INDEX_FIRST": "premier",
"LISTS_GET_INDEX_LAST": "dernier",
"LISTS_GET_INDEX_RANDOM": "aléatoire",
- "LISTS_GET_INDEX_TOOLTIP_GET_FROM_START": "Renvoie l’élément à la position indiquée dans une liste. #1 est le premier élément.",
- "LISTS_GET_INDEX_TOOLTIP_GET_FROM_END": "Renvoie l’élément à la position indiquée dans une liste. #1 est le dernier élément.",
+ "LISTS_INDEX_FROM_START_TOOLTIP": "%1 est le premier élément.",
+ "LISTS_INDEX_FROM_END_TOOLTIP": "%1 est le dernier élément.",
+ "LISTS_GET_INDEX_TOOLTIP_GET_FROM": "Renvoie l’élément à la position indiquée dans une liste.",
"LISTS_GET_INDEX_TOOLTIP_GET_FIRST": "Renvoie le premier élément dans une liste.",
"LISTS_GET_INDEX_TOOLTIP_GET_LAST": "Renvoie le dernier élément dans une liste.",
"LISTS_GET_INDEX_TOOLTIP_GET_RANDOM": "Renvoie un élément au hasard dans une liste.",
- "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM_START": "Supprime et renvoie l’élément à la position indiquée dans une liste. #1 est le premier élément.",
- "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM_END": "Supprime et renvoie l’élément à la position indiquée dans une liste. #1 est le dernier élément.",
+ "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM": "Supprime et renvoie l’élément à la position indiquée dans une liste.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FIRST": "Supprime et renvoie le premier élément dans une liste.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_LAST": "Supprime et renvoie le dernier élément dans une liste.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_RANDOM": "Supprime et renvoie un élément au hasard dans une liste.",
- "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM_START": "Supprime l’élément à la position indiquée dans une liste. #1 est le premier élément.",
- "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM_END": "Supprime l’élément à la position indiquée dans une liste. #1 est le dernier élément.",
+ "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM": "Supprime l’élément à la position indiquée dans une liste.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_FIRST": "Supprime le premier élément dans une liste.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_LAST": "Supprime le dernier élément dans une liste.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_RANDOM": "Supprime un élément au hasard dans une liste.",
"LISTS_SET_INDEX_SET": "mettre",
"LISTS_SET_INDEX_INSERT": "insérer en",
"LISTS_SET_INDEX_INPUT_TO": "comme",
- "LISTS_SET_INDEX_TOOLTIP_SET_FROM_START": "Fixe l’élément à la position indiquée dans une liste. #1 est le premier élément.",
- "LISTS_SET_INDEX_TOOLTIP_SET_FROM_END": "Fixe l’élément à la position indiquée dans une liste. #1 est le dernier élément.",
+ "LISTS_SET_INDEX_TOOLTIP_SET_FROM": "Met à jour l’élément à la position indiquée dans une liste.",
"LISTS_SET_INDEX_TOOLTIP_SET_FIRST": "Fixe le premier élément dans une liste.",
"LISTS_SET_INDEX_TOOLTIP_SET_LAST": "Fixe le dernier élément dans une liste.",
"LISTS_SET_INDEX_TOOLTIP_SET_RANDOM": "Fixe un élément au hasard dans une liste.",
- "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_START": "Insère l’élément à la position indiquée dans une liste. #1 est le premier élément.",
- "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_END": "Insère l’élément à la position indiquée dans une liste. #1 est le dernier élément.",
+ "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM": "Insère l’élément à la position indiquée dans une liste.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_FIRST": "Insère l’élément au début d’une liste.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_LAST": "Ajouter l’élément à la fin d’une liste.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_RANDOM": "Insère l’élément au hasard dans une liste.",
diff --git a/msg/json/he.json b/msg/json/he.json
index 73ed3b49f..fe2705e07 100644
--- a/msg/json/he.json
+++ b/msg/json/he.json
@@ -34,9 +34,6 @@
"HELP": "עזרה",
"UNDO": "ביטול",
"REDO": "ביצוע חוזר",
- "CHAT": "שוחח עם משתף פעולה שלך על-ידי הקלדה בתיבה זו!",
- "AUTH": "בבקשה נא לאשר את היישום הזה כדי לאפשר לעבודה שלך להישמר וכדי לאפשר את השיתוף על ידיך.",
- "ME": "אותי",
"CHANGE_VALUE_TITLE": "שנה ערך:",
"NEW_VARIABLE": "משתנה חדש...",
"NEW_VARIABLE_TITLE": "שם המשתנה החדש:",
@@ -202,7 +199,7 @@
"LISTS_INLIST": "ברשימה",
"LISTS_INDEX_OF_FIRST": "מחזירה את המיקום הראשון של פריט ברשימה",
"LISTS_INDEX_OF_LAST": "מחזירה את המיקום האחרון של פריט ברשימה",
- "LISTS_INDEX_OF_TOOLTIP": "מחזירה את האינדקס של המופע ראשון/אחרון של הפריט ברשימה. מחזירה 0 אם הפריט אינו נמצא.",
+ "LISTS_INDEX_OF_TOOLTIP": "מחזירה את האינדקס של המופע ראשון/אחרון של הפריט ברשימה. מחזירה %1 אם הפריט אינו נמצא.",
"LISTS_GET_INDEX_GET": "לקבל",
"LISTS_GET_INDEX_GET_REMOVE": "קבל ומחק",
"LISTS_GET_INDEX_REMOVE": "הסרה",
@@ -211,31 +208,28 @@
"LISTS_GET_INDEX_FIRST": "ראשון",
"LISTS_GET_INDEX_LAST": "אחרון",
"LISTS_GET_INDEX_RANDOM": "אקראי",
- "LISTS_GET_INDEX_TOOLTIP_GET_FROM_START": "מחזיר פריט במיקום שצוין ברשימה. #1 הוא הפריט הראשון.",
- "LISTS_GET_INDEX_TOOLTIP_GET_FROM_END": "מחזיר פריט במיקום שצוין ברשימה. #1 הוא הפריט האחרון.",
+ "LISTS_INDEX_FROM_START_TOOLTIP": "%1 הוא הפריט הראשון.",
+ "LISTS_INDEX_FROM_END_TOOLTIP": "%1 הוא הפריט האחרון.",
+ "LISTS_GET_INDEX_TOOLTIP_GET_FROM": "מחזיר פריט במיקום שצוין ברשימה.",
"LISTS_GET_INDEX_TOOLTIP_GET_FIRST": "מחזיר את הפריט הראשון ברשימה.",
"LISTS_GET_INDEX_TOOLTIP_GET_LAST": "מחזיר את הפריט האחרון ברשימה.",
"LISTS_GET_INDEX_TOOLTIP_GET_RANDOM": "מחזיר פריט אקראי מהרשימה.",
- "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM_START": "מסיר ומחזיר את הפריט במיקום שצוין ברשימה. #1 הוא הפריט הראשון.",
- "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM_END": "מסיר ומחזיר את הפריט במיקום שצוין ברשימה. #1 הוא הפריט האחרון.",
+ "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM": "מסיר ומחזיר את הפריט במיקום שצוין ברשימה.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FIRST": "מסיר ומחזיר את הפריט הראשון ברשימה.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_LAST": "מסיר ומחזיר את הפריט האחרון ברשימה.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_RANDOM": "מחק והחזר פריט אקראי מהרשימה.",
- "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM_START": "מחזיר פריט במיקום שצוין ברשימה. #1 הוא הפריט הראשון.",
- "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM_END": "מחזיר פריט במיקום שצוין ברשימה. #1 הוא הפריט האחרון.",
+ "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM": "מחזיר פריט במיקום שצוין ברשימה.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_FIRST": "הסר את הפריט הראשון ברשימה.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_LAST": "הסר את הפריט הראשון ברשימה.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_RANDOM": "הסר פריט אקראי ברשימה.",
"LISTS_SET_INDEX_SET": "הגדר",
"LISTS_SET_INDEX_INSERT": "הכנס ב",
"LISTS_SET_INDEX_INPUT_TO": "כמו",
- "LISTS_SET_INDEX_TOOLTIP_SET_FROM_START": "מגדיר את הפריט במיקום שצוין ברשימה. #1 הוא הפריט הראשון.",
- "LISTS_SET_INDEX_TOOLTIP_SET_FROM_END": "מגדיר את הפריט במיקום שצוין ברשימה. #1 הוא הפריט האחרון.",
+ "LISTS_SET_INDEX_TOOLTIP_SET_FROM": "מגדיר את הפריט במיקום שצוין ברשימה.",
"LISTS_SET_INDEX_TOOLTIP_SET_FIRST": "מגדיר את הפריט הראשון ברשימה.",
"LISTS_SET_INDEX_TOOLTIP_SET_LAST": "מגדיר את הפריט האחרון ברשימה.",
"LISTS_SET_INDEX_TOOLTIP_SET_RANDOM": "מגדיר פריט אקראי ברשימה.",
- "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_START": "מכניס את הפריט במיקום שצוין ברשימה. #1 הוא הפריט הראשון.",
- "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_END": "מכניס את הפריט במיקום שצוין ברשימה. #1 הוא הפריט האחרון.",
+ "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM": "מכניס את הפריט במיקום שצוין ברשימה.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_FIRST": "מכניס את הפריט בתחילת רשימה.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_LAST": "מוסיף את הפריט בסוף רשימה.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_RANDOM": "הוסף פריט באופן אקראי ברשימה.",
diff --git a/msg/json/hi.json b/msg/json/hi.json
index 62f2f7ac0..c7486bff5 100644
--- a/msg/json/hi.json
+++ b/msg/json/hi.json
@@ -23,9 +23,6 @@
"DISABLE_BLOCK": "ब्लॉक को अक्षम करें",
"ENABLE_BLOCK": "ब्लॉक को सक्षम करें",
"HELP": "सहायता",
- "CHAT": "इस सन्दूक में लिखकर हमारे सहयोगी के साथ बातचीत करें!",
- "AUTH": "अपने कार्य को सहेजना सक्षम करने और अपने साथ इसे साझा करने हेतु कृपया इस एप्प को अधिकृत करें।",
- "ME": "मैं",
"CHANGE_VALUE_TITLE": "मान परिवर्तित करें:",
"NEW_VARIABLE": "नया चर...",
"NEW_VARIABLE_TITLE": "नए चर का नाम:",
@@ -206,8 +203,8 @@
"LISTS_GET_INDEX_GET_REMOVE": "प्राप्त करे और हटाए",
"LISTS_GET_INDEX_REMOVE": "निकालें",
"LISTS_GET_INDEX_FROM_END": "अंत से #",
- "LISTS_GET_INDEX_FIRST": "पहला",
- "LISTS_GET_INDEX_LAST": "आखिरी",
+ "LISTS_GET_INDEX_FIRST": "%1 पहला आइटम है।",
+ "LISTS_GET_INDEX_LAST": "%1 आखरी आइटम है।",
"LISTS_GET_INDEX_RANDOM": "रैन्डम",
"LISTS_GET_INDEX_TOOLTIP_GET_FIRST": "सूची का पहला आइटम रिटर्न करता है।",
"LISTS_GET_INDEX_TOOLTIP_GET_LAST": "सूची का आखरी आइटम रिटर्न करता है।",
@@ -219,13 +216,11 @@
"LISTS_GET_INDEX_TOOLTIP_REMOVE_LAST": "सूची का आखरी आइटम निकालता है।",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_RANDOM": "सूची से रैन्डम आइटम निकालता है।",
"LISTS_SET_INDEX_SET": "सैट करें",
- "LISTS_SET_INDEX_TOOLTIP_SET_FROM_START": "सूची मे बताए गये स्थान में आइटम सैट करता है। #1 पहला आइटम है।",
- "LISTS_SET_INDEX_TOOLTIP_SET_FROM_END": "सूची मे बताए गये स्थान में आइटम सैट करता है। #1 आखरी आइटम है।",
+ "LISTS_SET_INDEX_TOOLTIP_SET_FROM": "सूची मे बताए गये स्थान में आइटम सैट करता है।",
"LISTS_SET_INDEX_TOOLTIP_SET_FIRST": "सूची में पहला आइटम सैट करता है।",
"LISTS_SET_INDEX_TOOLTIP_SET_LAST": "सूची में आखरी आइटम सैट करता है।",
"LISTS_SET_INDEX_TOOLTIP_SET_RANDOM": "सूची में रैन्डम आइटम सैट करता है।",
- "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_START": "सूची मे बताए गये स्थान में आइटम इनसर्ट करता है। #1 पहला आइटम है।",
- "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_END": "सूची मे बताए गये स्थान में आइटम इनसर्ट करता है। #1 आखरी आइटम है।",
+ "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM": "सूची मे बताए गये स्थान में आइटम इनसर्ट करता है।",
"LISTS_SET_INDEX_TOOLTIP_INSERT_FIRST": "आइटम को सूची के शुरू में इनसर्ट करता है।",
"LISTS_SET_INDEX_TOOLTIP_INSERT_LAST": "आइटम को सूची के अंत में जोड़ता है।",
"LISTS_SET_INDEX_TOOLTIP_INSERT_RANDOM": "आइटम को सूची में रैन्डम्ली इनसर्ट करता है।",
diff --git a/msg/json/hrx.json b/msg/json/hrx.json
index 39a3f37ad..aaa7c17fd 100644
--- a/msg/json/hrx.json
+++ b/msg/json/hrx.json
@@ -20,9 +20,6 @@
"DISABLE_BLOCK": "Block deaktivieren",
"ENABLE_BLOCK": "Block aktivieren",
"HELP": "Hellef",
- "CHAT": "Sprech mit unsrem Mitoorweiter doorrich renschreiwe von Text hier in den Kaste!",
- "AUTH": "Weart ännre:",
- "ME": "Ich",
"CHANGE_VALUE_TITLE": "Neie Variable...",
"NEW_VARIABLE": "Neie Variable...",
"NEW_VARIABLE_TITLE": "Die neie Variable sei Noome:",
@@ -175,7 +172,7 @@
"TEXT_LENGTH_TOOLTIP": "Die Oonzoohl von Zeiche in enem Text. (inkl. Leerzeiche)",
"TEXT_ISEMPTY_TITLE": "%1 ist leer?",
"TEXT_ISEMPTY_TOOLTIP": "Ist woahr (true), wenn der Text leer ist.",
- "TEXT_INDEXOF_TOOLTIP": "Findt das earste / letzte Voarkommniss von en Suchbegriffes in enem Text. Gebt die Position von dem Begriff orrer 0 zurück.",
+ "TEXT_INDEXOF_TOOLTIP": "Findt das earste / letzte Voarkommniss von en Suchbegriffes in enem Text. Gebt die Position von dem Begriff orrer %1 zurück.",
"TEXT_INDEXOF_INPUT_INTEXT": "im Text",
"TEXT_INDEXOF_OPERATOR_FIRST": "Such der Begriff sein earstes Voarkommniss",
"TEXT_INDEXOF_OPERATOR_LAST": "Suche der Begriff sein letztes Vorkommniss.",
@@ -224,7 +221,7 @@
"LISTS_INLIST": "in der List",
"LISTS_INDEX_OF_FIRST": "Such earstes Voarkommniss",
"LISTS_INDEX_OF_LAST": "Such letztes Voarkommniss",
- "LISTS_INDEX_OF_TOOLTIP": "Sucht die Position (index) von en Element in der List Gebt 0 zurück wenn nixs gefunn woard.",
+ "LISTS_INDEX_OF_TOOLTIP": "Sucht die Position (index) von en Element in der List Gebt %1 zurück wenn nixs gefunn woard.",
"LISTS_GET_INDEX_GET": "Nehm",
"LISTS_GET_INDEX_GET_REMOVE": "Nehm und entfern",
"LISTS_GET_INDEX_REMOVE": "Entfern",
@@ -232,31 +229,28 @@
"LISTS_GET_INDEX_FIRST": "earste",
"LISTS_GET_INDEX_LAST": "letzte",
"LISTS_GET_INDEX_RANDOM": "zufälliches",
- "LISTS_GET_INDEX_TOOLTIP_GET_FROM_START": "Extrahiert das #1te Element von der List.",
- "LISTS_GET_INDEX_TOOLTIP_GET_FROM_END": "Extrahiert das #1te Element der List sei End.",
+ "LISTS_INDEX_FROM_START_TOOLTIP": "%1 ist das earschte Element.",
+ "LISTS_INDEX_FROM_END_TOOLTIP": "%1 ist das letzte Element.",
+ "LISTS_GET_INDEX_TOOLTIP_GET_FROM": "Extrahiert das Element zu en definierte Stell von der List.",
"LISTS_GET_INDEX_TOOLTIP_GET_FIRST": "Extrahiert das earste Element von der List.",
"LISTS_GET_INDEX_TOOLTIP_GET_LAST": "Extrahiert das letzte Element von der List.",
"LISTS_GET_INDEX_TOOLTIP_GET_RANDOM": "Extrahiert en zufälliches Element von der List.",
- "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM_START": "Extrahiert und entfernt das #1te Element von der List.",
- "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM_END": "Extrahiert und entfernt das #1te Element der List sei End.",
+ "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM": "Extrahiert und entfernt das Element zu en definierte Stell von der List.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FIRST": "Extrahiert und entfernt das earste Element von der List.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_LAST": "Extrahiert und entfernt das letzte Element von der List.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_RANDOM": "Extrahiert und entfernt en zufälliches Element von der List.",
- "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM_START": "Entfernt das #1te Element von der List.",
- "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM_END": "Entfernt das #1te Element der List sei End.",
+ "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM": "Entfernt das Element zu en definierte Stell von der List.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_FIRST": "Entfernt das earste Element von der List.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_LAST": "Entfernt das letzte Element von der List.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_RANDOM": "Entfernt en zufälliches Element von der List.",
"LISTS_SET_INDEX_SET": "setz",
"LISTS_SET_INDEX_INSERT": "tue ren setz an",
"LISTS_SET_INDEX_INPUT_TO": "uff",
- "LISTS_SET_INDEX_TOOLTIP_SET_FROM_START": "Setzt das Element zu en definierte Stell in en List. #1 ist das earschte Element.",
- "LISTS_SET_INDEX_TOOLTIP_SET_FROM_END": "Setzt das Element zu en definierte Position an en List. #1 ist das letzte Element.",
+ "LISTS_SET_INDEX_TOOLTIP_SET_FROM": "Setzt das Element zu en definierte Stell in en List.",
"LISTS_SET_INDEX_TOOLTIP_SET_FIRST": "Sets the first item in a list.Setzt das earschte Element an en list.",
"LISTS_SET_INDEX_TOOLTIP_SET_LAST": "Setzt das letzte Element an en List.",
"LISTS_SET_INDEX_TOOLTIP_SET_RANDOM": "Setzt en zufälliches Element an en List.",
- "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_START": "Tut das Element ren setze an en definierte Position an en List. #1 ist das earschte Element.",
- "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_END": "Tut das Element ren setze an en definierte Position an en List. #1 ist das letzte Element.",
+ "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM": "Tut das Element ren setze an en definierte Stell an en List.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_FIRST": "Tut das Element an en Oonfang von en List ren setze.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_LAST": "Oonhängt das Element zu en List sei End.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_RANDOM": "Tut das Element zufällich an en List ren setze.",
diff --git a/msg/json/hu.json b/msg/json/hu.json
index 2f1e38b4f..be22129d5 100644
--- a/msg/json/hu.json
+++ b/msg/json/hu.json
@@ -34,9 +34,6 @@
"HELP": "Súgó",
"UNDO": "Visszavonás",
"REDO": "Újra",
- "CHAT": "Ebben a mezőben tudsz a közreműködőkkel beszélgetni!",
- "AUTH": "Kérjük, engedélyezd az alkalmazásnak munkád elmentését és megosztását.",
- "ME": "Én",
"CHANGE_VALUE_TITLE": "Érték módosítása:",
"NEW_VARIABLE": "Új változó...",
"NEW_VARIABLE_TITLE": "Az új változó neve:",
@@ -189,7 +186,7 @@
"TEXT_LENGTH_TOOLTIP": "A megadott szöveg karaktereinek számát adja eredményül (beleértve a szóközöket).",
"TEXT_ISEMPTY_TITLE": "%1 üres",
"TEXT_ISEMPTY_TOOLTIP": "Igaz, ha a vizsgált szöveg hossza 0.",
- "TEXT_INDEXOF_TOOLTIP": "A keresett szöveg első vagy utolsó előfordulásával tér vissza. 0 esetén a szövegrészlet nem található.",
+ "TEXT_INDEXOF_TOOLTIP": "A keresett szöveg első vagy utolsó előfordulásával tér vissza. %1 esetén a szövegrészlet nem található.",
"TEXT_INDEXOF_INPUT_INTEXT": "A(z)",
"TEXT_INDEXOF_OPERATOR_FIRST": "szövegben az első előfordulásának helye",
"TEXT_INDEXOF_OPERATOR_LAST": "szövegben az utolsó előfordulásának helye",
@@ -241,7 +238,7 @@
"LISTS_INLIST": "A(z)",
"LISTS_INDEX_OF_FIRST": "listában első előfordulásaː",
"LISTS_INDEX_OF_LAST": "listában utolsó előfordulásaː",
- "LISTS_INDEX_OF_TOOLTIP": "A megadott elem első vagy utolsó előfordulásával tér vissza. 0-val tér vissza, ha nem talál ilyen elemet.",
+ "LISTS_INDEX_OF_TOOLTIP": "A megadott elem első vagy utolsó előfordulásával tér vissza. %1-val tér vissza, ha nem talál ilyen elemet.",
"LISTS_GET_INDEX_GET": "listából értéke",
"LISTS_GET_INDEX_GET_REMOVE": "listából kivétele",
"LISTS_GET_INDEX_REMOVE": "listából törlése",
@@ -251,31 +248,28 @@
"LISTS_GET_INDEX_LAST": "az utolsó",
"LISTS_GET_INDEX_RANDOM": "bármely",
"LISTS_GET_INDEX_TAIL": "elemnek",
- "LISTS_GET_INDEX_TOOLTIP_GET_FROM_START": "A lista megadott sorszámú elemét adja eredményül. 1 az első elemet jelenti.",
- "LISTS_GET_INDEX_TOOLTIP_GET_FROM_END": "A lista megadott sorszámú elemét adja eredményül. 1 az utolsó elemet jelenti.",
+ "LISTS_INDEX_FROM_START_TOOLTIP": "%1 az első elemet jelenti.",
+ "LISTS_INDEX_FROM_END_TOOLTIP": "%1 az utolsó elemet jelenti.",
+ "LISTS_GET_INDEX_TOOLTIP_GET_FROM": "A lista megadott sorszámú elemét adja eredményül.",
"LISTS_GET_INDEX_TOOLTIP_GET_FIRST": "A lista első elemét adja eredményül.",
"LISTS_GET_INDEX_TOOLTIP_GET_LAST": "A lista utolsó elemét adja eredményül.",
"LISTS_GET_INDEX_TOOLTIP_GET_RANDOM": "A lista véletlenszerűen választott elemét adja eredményül.",
- "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM_START": "A megadott sorszámú elem kivétele a listából 1 az első elemet jelenti.",
- "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM_END": "A megadott sorszámú elem kivétele a listából 1 az utolsó elemet jelenti.",
+ "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM": "A megadott sorszámú elem kivétele a listából.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FIRST": "Az első elem kivétele a listából.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_LAST": "Az utolsó elem kivétele a listából.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_RANDOM": "Véletlenszerűen választott elem kivétele a listából.",
- "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM_START": "A megadott sorszámú elem törlése a listából 1 az első elemet jelenti.",
- "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM_END": "A megadott sorszámú elem törlése a listából 1 az utolsó elemet jelenti.",
+ "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM": "A megadott sorszámú elem törlése a listából.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_FIRST": "Az első elem törlése a listából.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_LAST": "Az utolsó elem törlése a listából.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_RANDOM": "Véletlenszerűen választott elem törlése a listából.",
"LISTS_SET_INDEX_SET": "listába állítsd be",
"LISTS_SET_INDEX_INSERT": "listába szúrd be",
"LISTS_SET_INDEX_INPUT_TO": "elemkéntː",
- "LISTS_SET_INDEX_TOOLTIP_SET_FROM_START": "A megadott sorszámú elem cseréje a listában. 1 az első elemet jelenti.",
- "LISTS_SET_INDEX_TOOLTIP_SET_FROM_END": "A megadott sorszámú elem cseréje a listában. 1 az utolsó elemet jelenti.",
+ "LISTS_SET_INDEX_TOOLTIP_SET_FROM": "A megadott sorszámú elem cseréje a listában.",
"LISTS_SET_INDEX_TOOLTIP_SET_FIRST": "Az első elem cseréje a listában.",
"LISTS_SET_INDEX_TOOLTIP_SET_LAST": "Az utolsó elem cseréje a listában.",
"LISTS_SET_INDEX_TOOLTIP_SET_RANDOM": "Véletlenszerűen választott elem cseréje a listában.",
- "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_START": "Beszúrás a megadott sorszámú elem elé a listában. 1 az első elemet jelenti.",
- "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_END": "Beszúrás a megadott sorszámú elem elé a listában. 1 az utolsó elemet jelenti.",
+ "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM": "Beszúrás a megadott sorszámú elem elé a listában.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_FIRST": "Beszúrás a lista elejére.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_LAST": "Beszúrás a lista végére.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_RANDOM": "Beszúrás véletlenszerűen választott elem elé a listában.",
diff --git a/msg/json/ia.json b/msg/json/ia.json
index 38fb63381..8ae5b1531 100644
--- a/msg/json/ia.json
+++ b/msg/json/ia.json
@@ -25,9 +25,6 @@
"HELP": "Adjuta",
"UNDO": "Disfacer",
"REDO": "Refacer",
- "CHAT": "Conversa con tu collaborator scribente in iste quadro!",
- "AUTH": "Per favor autorisa iste application pro permitter de salveguardar tu travalio e pro permitter que tu lo divide con alteres.",
- "ME": "Io",
"CHANGE_VALUE_TITLE": "Cambiar valor:",
"NEW_VARIABLE": "Nove variabile...",
"NEW_VARIABLE_TITLE": "Nomine del nove variabile:",
@@ -172,7 +169,7 @@
"TEXT_LENGTH_TOOLTIP": "Retorna le numero de litteras (incluse spatios) in le texto fornite.",
"TEXT_ISEMPTY_TITLE": "%1 es vacue",
"TEXT_ISEMPTY_TOOLTIP": "Retorna ver si le texto fornite es vacue.",
- "TEXT_INDEXOF_TOOLTIP": "Retorna le indice del prime/ultime occurrentia del prime texto in le secunde texto. Retorna 0 si le texto non es trovate.",
+ "TEXT_INDEXOF_TOOLTIP": "Retorna le indice del prime/ultime occurrentia del prime texto in le secunde texto. Retorna %1 si le texto non es trovate.",
"TEXT_INDEXOF_INPUT_INTEXT": "in le texto",
"TEXT_INDEXOF_OPERATOR_FIRST": "cercar le prime occurrentia del texto",
"TEXT_INDEXOF_OPERATOR_LAST": "cercar le ultime occurrentia del texto",
@@ -221,7 +218,7 @@
"LISTS_INLIST": "in lista",
"LISTS_INDEX_OF_FIRST": "cercar le prime occurrentia del elemento",
"LISTS_INDEX_OF_LAST": "cercar le ultime occurrentia del elemento",
- "LISTS_INDEX_OF_TOOLTIP": "Retorna le indice del prime/ultime occurrentia del elemento in le lista. Retorna 0 si le texto non es trovate.",
+ "LISTS_INDEX_OF_TOOLTIP": "Retorna le indice del prime/ultime occurrentia del elemento in le lista. Retorna %1 si le texto non es trovate.",
"LISTS_GET_INDEX_GET": "prender",
"LISTS_GET_INDEX_GET_REMOVE": "prender e remover",
"LISTS_GET_INDEX_REMOVE": "remover",
@@ -229,31 +226,28 @@
"LISTS_GET_INDEX_FIRST": "prime",
"LISTS_GET_INDEX_LAST": "ultime",
"LISTS_GET_INDEX_RANDOM": "aleatori",
- "LISTS_GET_INDEX_TOOLTIP_GET_FROM_START": "Retorna le elemento presente al position specificate in un lista. № 1 es le prime elemento.",
- "LISTS_GET_INDEX_TOOLTIP_GET_FROM_END": "Retorna le elemento presente al position specificate in un lista. № 1 es le ultime elemento.",
+ "LISTS_INDEX_FROM_START_TOOLTIP": "№ %1 es le prime elemento.",
+ "LISTS_INDEX_FROM_END_TOOLTIP": "№ %1 es le ultime elemento.",
+ "LISTS_GET_INDEX_TOOLTIP_GET_FROM": "Retorna le elemento presente al position specificate in un lista.",
"LISTS_GET_INDEX_TOOLTIP_GET_FIRST": "Retorna le prime elemento in un lista.",
"LISTS_GET_INDEX_TOOLTIP_GET_LAST": "Retorna le ultime elemento in un lista.",
"LISTS_GET_INDEX_TOOLTIP_GET_RANDOM": "Retorna un elemento aleatori in un lista.",
- "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM_START": "Remove e retorna le elemento presente al position specificate in un lista. № 1 es le prime elemento.",
- "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM_END": "Remove e retorna le elemento presente al position specificate in un lista. № 1 es le ultime elemento.",
+ "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM": "Remove e retorna le elemento presente al position specificate in un lista.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FIRST": "Remove e retorna le prime elemento in un lista.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_LAST": "Remove e retorna le ultime elemento in un lista.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_RANDOM": "Remove e retorna un elemento aleatori in un lista.",
- "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM_START": "Remove le elemento presente al position specificate in un lista. № 1 es le prime elemento.",
- "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM_END": "Remove le elemento presente al position specificate in un lista. № 1 es le ultime elemento.",
+ "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM": "Remove le elemento presente al position specificate in un lista.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_FIRST": "Remove le prime elemento in un lista.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_LAST": "Remove le ultime elemento in un lista.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_RANDOM": "Remove un elemento aleatori in un lista.",
"LISTS_SET_INDEX_SET": "mitter",
"LISTS_SET_INDEX_INSERT": "inserer in",
"LISTS_SET_INDEX_INPUT_TO": "a",
- "LISTS_SET_INDEX_TOOLTIP_SET_FROM_START": "Defini le valor del elemento al position specificate in un lista. № 1 es le prime elemento.",
- "LISTS_SET_INDEX_TOOLTIP_SET_FROM_END": "Defini le valor del elemento al position specificate in un lista. № 1 es le ultime elemento.",
+ "LISTS_SET_INDEX_TOOLTIP_SET_FROM": "Defini le valor del elemento al position specificate in un lista.",
"LISTS_SET_INDEX_TOOLTIP_SET_FIRST": "Defini le valor del prime elemento in un lista.",
"LISTS_SET_INDEX_TOOLTIP_SET_LAST": "Defini le valor del ultime elemento in un lista.",
"LISTS_SET_INDEX_TOOLTIP_SET_RANDOM": "Defini le valor de un elemento aleatori in un lista.",
- "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_START": "Insere le elemento al position specificate in un lista. № 1 es le prime elemento.",
- "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_END": "Insere le elemento al position specificate in un lista. № 1 es le ultime elemento.",
+ "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM": "Insere le elemento al position specificate in un lista.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_FIRST": "Insere le elemento al initio de un lista.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_LAST": "Adjunge le elemento al fin de un lista.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_RANDOM": "Insere le elemento a un position aleatori in un lista.",
diff --git a/msg/json/id.json b/msg/json/id.json
index 65ded998c..0f47c9747 100644
--- a/msg/json/id.json
+++ b/msg/json/id.json
@@ -29,9 +29,6 @@
"HELP": "Bantuan",
"UNDO": "Urungkan",
"REDO": "Lakukan ulang",
- "CHAT": "Chatting dengan kolaborator anda dengan mengetikkan di kotak ini!",
- "AUTH": "Silakan mengotorisasi aplikasi ini untuk memungkinkan pekerjaan Anda dapat disimpan dan digunakan bersama.",
- "ME": "Saya",
"CHANGE_VALUE_TITLE": "Ubah nilai:",
"NEW_VARIABLE": "Variabel baru...",
"NEW_VARIABLE_TITLE": "Nama variabel baru:",
@@ -199,7 +196,7 @@
"TEXT_LENGTH_TOOLTIP": "Kembalikan sejumlah huruf (termasuk spasi) dari teks yang disediakan.",
"TEXT_ISEMPTY_TITLE": "%1 kosong",
"TEXT_ISEMPTY_TOOLTIP": "Kembalikan benar jika teks yang disediakan kosong.",
- "TEXT_INDEXOF_TOOLTIP": "Kembalikan indeks pertama dan terakhir dari kejadian pertama/terakhir dari teks pertama dalam teks kedua. Kembalikan 0 jika teks tidak ditemukan.",
+ "TEXT_INDEXOF_TOOLTIP": "Kembalikan indeks pertama dan terakhir dari kejadian pertama/terakhir dari teks pertama dalam teks kedua. Kembalikan %1 jika teks tidak ditemukan.",
"TEXT_INDEXOF_INPUT_INTEXT": "dalam teks",
"TEXT_INDEXOF_OPERATOR_FIRST": "temukan kejadian pertama dalam teks",
"TEXT_INDEXOF_OPERATOR_LAST": "temukan kejadian terakhir dalam teks",
@@ -249,7 +246,7 @@
"LISTS_INLIST": "dalam list",
"LISTS_INDEX_OF_FIRST": "cari kejadian pertama item",
"LISTS_INDEX_OF_LAST": "cari kejadian terakhir item",
- "LISTS_INDEX_OF_TOOLTIP": "Kembalikan indeks dari item pertama/terakhir kali muncul dalam list. Kembalikan 0 jika item tidak ditemukan.",
+ "LISTS_INDEX_OF_TOOLTIP": "Kembalikan indeks dari item pertama/terakhir kali muncul dalam list. Kembalikan %1 jika item tidak ditemukan.",
"LISTS_GET_INDEX_GET": "dapatkan",
"LISTS_GET_INDEX_GET_REMOVE": "dapatkan dan hapus",
"LISTS_GET_INDEX_REMOVE": "Hapus",
@@ -258,31 +255,28 @@
"LISTS_GET_INDEX_FIRST": "pertama",
"LISTS_GET_INDEX_LAST": "terakhir",
"LISTS_GET_INDEX_RANDOM": "acak",
- "LISTS_GET_INDEX_TOOLTIP_GET_FROM_START": "Kembalikan item di posisi tertentu dalam list. #1 adalah item pertama.",
- "LISTS_GET_INDEX_TOOLTIP_GET_FROM_END": "Kembalikan item di posisi tertentu dalam list. #1 adalah item terakhir.",
+ "LISTS_INDEX_FROM_START_TOOLTIP": "%1 adalah item pertama.",
+ "LISTS_INDEX_FROM_END_TOOLTIP": "%1 adalah item terakhir.",
+ "LISTS_GET_INDEX_TOOLTIP_GET_FROM": "Kembalikan item di posisi tertentu dalam list.",
"LISTS_GET_INDEX_TOOLTIP_GET_FIRST": "Kembalikan item pertama dalam list.",
"LISTS_GET_INDEX_TOOLTIP_GET_LAST": "Kembalikan item terakhir dalam list.",
"LISTS_GET_INDEX_TOOLTIP_GET_RANDOM": "Kembalikan item acak dalam list.",
- "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM_START": "Hapus dan kembalikan item di posisi tertentu dalam list. #1 adalah item pertama.",
- "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM_END": "Hapus dan kembalikan item di posisi tertentu dalam list. #1 adalah item terakhir.",
+ "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM": "Hapus dan kembalikan item di posisi tertentu dalam list.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FIRST": "Hapus dan kembalikan item pertama dalam list.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_LAST": "Hapus dan kembalikan item terakhir dalam list.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_RANDOM": "Hapus dan kembalikan item acak dalam list.",
- "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM_START": "Hapus item di posisi tertentu dalam list. #1 adalah item pertama.",
- "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM_END": "Hapus item di posisi tertentu dalam list. #1 adalah item terakhir.",
+ "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM": "Hapus item di posisi tertentu dalam list.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_FIRST": "Hapus item pertama dalam list.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_LAST": "Hapus item terakhir dalam list.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_RANDOM": "Hapus sebuah item acak dalam list.",
"LISTS_SET_INDEX_SET": "tetapkan",
"LISTS_SET_INDEX_INSERT": "sisipkan di",
"LISTS_SET_INDEX_INPUT_TO": "sebagai",
- "LISTS_SET_INDEX_TOOLTIP_SET_FROM_START": "Tetapkan item ke dalam posisi yang telah ditentukan di dalam list. #1 adalah item yang pertama.",
- "LISTS_SET_INDEX_TOOLTIP_SET_FROM_END": "Tetapkan item ke dalam posisi yang telah ditentukan di dalam list. #1 adalah item yang terakhir.",
+ "LISTS_SET_INDEX_TOOLTIP_SET_FROM": "Tetapkan item ke dalam posisi yang telah ditentukan di dalam list.",
"LISTS_SET_INDEX_TOOLTIP_SET_FIRST": "Tetapkan item pertama di dalam list.",
"LISTS_SET_INDEX_TOOLTIP_SET_LAST": "Menetapkan item terakhir dalam list.",
"LISTS_SET_INDEX_TOOLTIP_SET_RANDOM": "Tetapkan secara acak sebuah item dalam list.",
- "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_START": "Sisipkan item ke dalam posisi yang telah ditentukan di dalam list. #1 adalah item yang pertama.",
- "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_END": "Sisipkan item ke dalam posisi yang telah ditentukan di dalam list. #1 adalah item yang terakhir.",
+ "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM": "Sisipkan item ke dalam posisi yang telah ditentukan di dalam list.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_FIRST": "Sisipkan item di bagian awal dari list.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_LAST": "Tambahkan item ke bagian akhir list.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_RANDOM": "Sisipkan item secara acak ke dalam list.",
diff --git a/msg/json/is.json b/msg/json/is.json
index 686749d55..6581e84cd 100644
--- a/msg/json/is.json
+++ b/msg/json/is.json
@@ -28,9 +28,6 @@
"HELP": "Hjálp",
"UNDO": "Afturkalla",
"REDO": "Endurtaka",
- "CHAT": "Spjallaðu við félaga með því að skrifa í þennan reit!",
- "AUTH": "Vinsamlegast heimilaðu þetta forrit svo að hægt sé að vista verk þitt og svo að þú megir deila því",
- "ME": "Mig",
"CHANGE_VALUE_TITLE": "Breyta gildi:",
"NEW_VARIABLE": "Ný breyta...",
"NEW_VARIABLE_TITLE": "Heiti nýrrar breytu:",
@@ -210,7 +207,7 @@
"TEXT_ISEMPTY_TITLE": "%1 er tómur",
"TEXT_ISEMPTY_TOOLTIP": "Skilar sönnu ef gefni textinn er tómur.",
"TEXT_INDEXOF_HELPURL": "https://github.com/google/blockly/wiki/Text#finding-text",
- "TEXT_INDEXOF_TOOLTIP": "Finnur fyrsta/síðasta tilfelli fyrri textans í seinni textanum og skilar sæti hans. Skilar 0 ef textinn finnst ekki.",
+ "TEXT_INDEXOF_TOOLTIP": "Finnur fyrsta/síðasta tilfelli fyrri textans í seinni textanum og skilar sæti hans. Skilar %1 ef textinn finnst ekki.",
"TEXT_INDEXOF_INPUT_INTEXT": "í texta",
"TEXT_INDEXOF_OPERATOR_FIRST": "finna fyrsta tilfelli texta",
"TEXT_INDEXOF_OPERATOR_LAST": "finna síðasta tilfelli texta",
@@ -269,7 +266,7 @@
"LISTS_INDEX_OF_HELPURL": "https://github.com/google/blockly/wiki/Lists#getting-items-from-a-list",
"LISTS_INDEX_OF_FIRST": "finna fyrsta tilfelli atriðis",
"LISTS_INDEX_OF_LAST": "finna síðasta tilfelli atriðis",
- "LISTS_INDEX_OF_TOOLTIP": "Finnur hvar atriðið kemur fyrir fyrst/síðast í listanum og skilar sæti þess. Skilar 0 ef atriðið finnst ekki.",
+ "LISTS_INDEX_OF_TOOLTIP": "Finnur hvar atriðið kemur fyrir fyrst/síðast í listanum og skilar sæti þess. Skilar %1 ef atriðið finnst ekki.",
"LISTS_GET_INDEX_GET": "sækja",
"LISTS_GET_INDEX_GET_REMOVE": "sækja og fjarlægja",
"LISTS_GET_INDEX_REMOVE": "fjarlægja",
@@ -278,18 +275,17 @@
"LISTS_GET_INDEX_FIRST": "fyrsta",
"LISTS_GET_INDEX_LAST": "síðasta",
"LISTS_GET_INDEX_RANDOM": "eitthvert",
- "LISTS_GET_INDEX_TOOLTIP_GET_FROM_START": "Skilar atriðinu í hinum tiltekna stað í lista. #1 er fyrsta atriðið.",
- "LISTS_GET_INDEX_TOOLTIP_GET_FROM_END": "Skilar atriðinu á hinum tiltekna stað í lista. #1 er síðasta atriðið.",
+ "LISTS_INDEX_FROM_START_TOOLTIP": "%1 er fyrsta atriðið.",
+ "LISTS_INDEX_FROM_END_TOOLTIP": "%1 er síðasta atriðið.",
+ "LISTS_GET_INDEX_TOOLTIP_GET_FROM": "Skilar atriðinu í hinum tiltekna stað í lista.",
"LISTS_GET_INDEX_TOOLTIP_GET_FIRST": "Skilar fyrsta atriði í lista.",
"LISTS_GET_INDEX_TOOLTIP_GET_LAST": "Skilar síðasta atriði í lista.",
"LISTS_GET_INDEX_TOOLTIP_GET_RANDOM": "Skilar einhverju atriði úr lista.",
- "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM_START": "Fjarlægir og skilar atriðinu á hinum tiltekna stað í lista. #1 er fyrsta atriðið.",
- "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM_END": "Fjarlægir og skilar atriðinu á hinum tiltekna stað í lista. #1 er síðasta atriðið.",
+ "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM": "Fjarlægir og skilar atriðinu á hinum tiltekna stað í lista.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FIRST": "Fjarlægir og skilar fyrsta atriðinu í lista.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_LAST": "Fjarlægir og skilar síðasta atriðinu í lista.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_RANDOM": "Fjarlægir og skilar einhverju atriði úr lista.",
- "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM_START": "Fjarlægir atriðið á hinum tiltekna stað í lista. #1 er fyrsta atriðið.",
- "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM_END": "Fjarlægir atriðið á hinum tiltekna stað í lista. #1 er síðasta atriðið.",
+ "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM": "Fjarlægir atriðið á hinum tiltekna stað í lista.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_FIRST": "Fjarlægir fyrsta atriðið í lista.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_LAST": "Fjarlægir síðasta atriðið í lista.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_RANDOM": "Fjarlægir eitthvert atriði úr lista.",
@@ -297,13 +293,11 @@
"LISTS_SET_INDEX_SET": "setja í",
"LISTS_SET_INDEX_INSERT": "bæta við",
"LISTS_SET_INDEX_INPUT_TO": "sem",
- "LISTS_SET_INDEX_TOOLTIP_SET_FROM_START": "Setur atriðið í tiltekna sætið í listanum. #1 er fyrsta atriðið.",
- "LISTS_SET_INDEX_TOOLTIP_SET_FROM_END": "Setur atriðið í tiltekna sætið í listanum. #1 er síðasta atriðið.",
+ "LISTS_SET_INDEX_TOOLTIP_SET_FROM": "Setur atriðið í tiltekna sætið í listanum.",
"LISTS_SET_INDEX_TOOLTIP_SET_FIRST": "Setur atriðið í fyrsta sæti lista.",
"LISTS_SET_INDEX_TOOLTIP_SET_LAST": "Setur atriðið í síðasta sæti lista.",
"LISTS_SET_INDEX_TOOLTIP_SET_RANDOM": "Setur atriðið í eitthvert sæti lista.",
- "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_START": "Bætir atriðinu í listann á tilteknum stað. #1 er fyrsta atriðið.",
- "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_END": "Bætir atriðinu í listann á tilteknum stað. #1 er síðasta atriðið.",
+ "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM": "Bætir atriðinu í listann á tilteknum stað.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_FIRST": "Bætir atriðinu fremst í listann.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_LAST": "Bætir atriðinu aftan við listann.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_RANDOM": "Bætir atriðinu einhversstaðar við listann.",
diff --git a/msg/json/it.json b/msg/json/it.json
index 2c88866e5..34a30eb3d 100644
--- a/msg/json/it.json
+++ b/msg/json/it.json
@@ -30,9 +30,6 @@
"HELP": "Aiuto",
"UNDO": "Annulla",
"REDO": "Ripeti",
- "CHAT": "Chatta con il tuo collaboratore scrivendo in questo box!",
- "AUTH": "Autorizza questa applicazione per consentire di salvare il tuo lavoro e per essere condiviso.",
- "ME": "Me",
"CHANGE_VALUE_TITLE": "Modifica valore:",
"NEW_VARIABLE": "Nuova variabile...",
"NEW_VARIABLE_TITLE": "Nome della nuova variabile:",
@@ -185,7 +182,7 @@
"TEXT_LENGTH_TOOLTIP": "Restituisce il numero di lettere (inclusi gli spazi) nel testo fornito.",
"TEXT_ISEMPTY_TITLE": "%1 è vuoto",
"TEXT_ISEMPTY_TOOLTIP": "Restituisce vero se il testo fornito è vuoto.",
- "TEXT_INDEXOF_TOOLTIP": "Restituisce l'indice della prima occorrenza del primo testo all'interno del secondo testo. Restituisce 0 se il testo non viene trovato.",
+ "TEXT_INDEXOF_TOOLTIP": "Restituisce l'indice della prima occorrenza del primo testo all'interno del secondo testo. Restituisce %1 se il testo non viene trovato.",
"TEXT_INDEXOF_INPUT_INTEXT": "nel testo",
"TEXT_INDEXOF_OPERATOR_FIRST": "trova la prima occorrenza del testo",
"TEXT_INDEXOF_OPERATOR_LAST": "trova l'ultima occorrenza del testo",
@@ -234,7 +231,7 @@
"LISTS_INLIST": "nella lista",
"LISTS_INDEX_OF_FIRST": "trova la prima occorrenza dell'elemento",
"LISTS_INDEX_OF_LAST": "trova l'ultima occorrenza dell'elemento",
- "LISTS_INDEX_OF_TOOLTIP": "Restituisce l'indice della prima/ultima occorrenza dell'elemento nella lista. Restituisce 0 se l'elemento non viene trovato.",
+ "LISTS_INDEX_OF_TOOLTIP": "Restituisce l'indice della prima/ultima occorrenza dell'elemento nella lista. Restituisce %1 se l'elemento non viene trovato.",
"LISTS_GET_INDEX_GET": "prendi",
"LISTS_GET_INDEX_GET_REMOVE": "prendi e rimuovi",
"LISTS_GET_INDEX_REMOVE": "rimuovi",
@@ -242,31 +239,28 @@
"LISTS_GET_INDEX_FIRST": "primo",
"LISTS_GET_INDEX_LAST": "ultimo",
"LISTS_GET_INDEX_RANDOM": "casuale",
- "LISTS_GET_INDEX_TOOLTIP_GET_FROM_START": "Restituisce l'elemento nella posizione indicata della lista. 1 corrisponde al primo elemento della lista.",
- "LISTS_GET_INDEX_TOOLTIP_GET_FROM_END": "Restituisce l'elemento nella posizione indicata della lista. 1 corrisponde all'ultimo elemento.",
+ "LISTS_INDEX_FROM_START_TOOLTIP": "%1 corrisponde al primo elemento.",
+ "LISTS_INDEX_FROM_END_TOOLTIP": "%1 corrisponde all'ultimo elemento.",
+ "LISTS_GET_INDEX_TOOLTIP_GET_FROM": "Restituisce l'elemento nella posizione indicata della lista.",
"LISTS_GET_INDEX_TOOLTIP_GET_FIRST": "Restituisce il primo elemento in una lista.",
"LISTS_GET_INDEX_TOOLTIP_GET_LAST": "Restituisce l'ultimo elemento in una lista.",
"LISTS_GET_INDEX_TOOLTIP_GET_RANDOM": "Restituisce un elemento casuale in una lista.",
- "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM_START": "Rimuove e restituisce l'elemento nella posizione indicata in una lista. 1 corrisponde al primo elemento.",
- "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM_END": "Rimuove e restituisce l'elemento nella posizione indicata in una lista. 1 corrisponde all'ultimo elemento.",
+ "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM": "Rimuove e restituisce l'elemento nella posizione indicata in una lista.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FIRST": "Rimuove e restituisce il primo elemento in una lista.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_LAST": "Restituisce e rimuove l'ultimo elemento in una lista.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_RANDOM": "Restituisce e rimuove un elemento casuale in una lista.",
- "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM_START": "Rimuove l'elemento nella posizione indicata in una lista. 1 corrisponde al primo elemento.",
- "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM_END": "Rimuove l'elemento nella posizione indicata in una lista. 1 corrisponde all'ultimo elemento.",
+ "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM": "Rimuove l'elemento nella posizione indicata in una lista.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_FIRST": "Rimuove il primo elemento in una lista.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_LAST": "Rimuove l'ultimo elemento in una lista.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_RANDOM": "Rimuove un elemento casuale in una lista.",
"LISTS_SET_INDEX_SET": "imposta",
"LISTS_SET_INDEX_INSERT": "inserisci in",
"LISTS_SET_INDEX_INPUT_TO": "come",
- "LISTS_SET_INDEX_TOOLTIP_SET_FROM_START": "Imposta l'elemento nella posizione indicata di una lista. 1 corrisponde al primo elemento.",
- "LISTS_SET_INDEX_TOOLTIP_SET_FROM_END": "Imposta l'elemento nella posizione indicata di una lista. 1 corrisponde all'ultimo elemento.",
+ "LISTS_SET_INDEX_TOOLTIP_SET_FROM": "Imposta l'elemento nella posizione indicata di una lista.",
"LISTS_SET_INDEX_TOOLTIP_SET_FIRST": "Imposta il primo elemento in una lista.",
"LISTS_SET_INDEX_TOOLTIP_SET_LAST": "Imposta l'ultimo elemento in una lista.",
"LISTS_SET_INDEX_TOOLTIP_SET_RANDOM": "Imposta un elemento casuale in una lista.",
- "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_START": "Inserisci un elemento nella posizione indicata in una lista. #1 corrisponde al primo elemento.",
- "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_END": "Inserisci l'elemento nella posizione indicata in una lista. #1 corrisponde all'ultimo elemento.",
+ "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM": "Inserisci un elemento nella posizione indicata in una lista.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_FIRST": "Inserisci l'elemento all'inizio della lista.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_LAST": "Aggiungi un elemento alla fine di una lista",
"LISTS_SET_INDEX_TOOLTIP_INSERT_RANDOM": "Inserisce l'elemento casualmente in una lista.",
diff --git a/msg/json/ja.json b/msg/json/ja.json
index aaa16422d..fa9ea90d1 100644
--- a/msg/json/ja.json
+++ b/msg/json/ja.json
@@ -28,8 +28,6 @@
"HELP": "ヘルプ",
"UNDO": "取り消し",
"REDO": "やり直し",
- "CHAT": "このボックスに入力して共同編集者とチャットしよう！",
- "ME": "私に",
"CHANGE_VALUE_TITLE": "値を変更します。",
"NEW_VARIABLE": "新しい変数",
"NEW_VARIABLE_TITLE": "新しい変数の、名前",
@@ -199,7 +197,7 @@
"TEXT_LENGTH_TOOLTIP": "指定されたテキストの文字 (スペースを含む) の数を返します。",
"TEXT_ISEMPTY_TITLE": "%1 が空",
"TEXT_ISEMPTY_TOOLTIP": "指定されたテキストが空の場合は、true を返します。",
- "TEXT_INDEXOF_TOOLTIP": "最初のテキストの二番目のてきすとの、最初と最後の、出現したインデックスをかえします。テキストが見つからない場合は 0 を返します。",
+ "TEXT_INDEXOF_TOOLTIP": "最初のテキストの二番目のてきすとの、最初と最後の、出現したインデックスをかえします。テキストが見つからない場合は %1 を返します。",
"TEXT_INDEXOF_INPUT_INTEXT": "テキストで",
"TEXT_INDEXOF_OPERATOR_FIRST": "テキストの最初の出現箇所を検索します。",
"TEXT_INDEXOF_OPERATOR_LAST": "テキストの最後に見つかったを検索します。",
@@ -252,7 +250,7 @@
"LISTS_INLIST": "リストで",
"LISTS_INDEX_OF_FIRST": "最初に見つかった項目を検索します。",
"LISTS_INDEX_OF_LAST": "最後に見つかったアイテムを見つける",
- "LISTS_INDEX_OF_TOOLTIP": "リスト項目の最初/最後に出現するインデックス位置を返します。項目が見つからない場合は 0 を返します。",
+ "LISTS_INDEX_OF_TOOLTIP": "リスト項目の最初/最後に出現するインデックス位置を返します。項目が見つからない場合は %1 を返します。",
"LISTS_GET_INDEX_GET": "取得",
"LISTS_GET_INDEX_GET_REMOVE": "取得と削除",
"LISTS_GET_INDEX_REMOVE": "削除",
@@ -262,31 +260,28 @@
"LISTS_GET_INDEX_LAST": "最後",
"LISTS_GET_INDEX_RANDOM": "ランダム",
"LISTS_GET_INDEX_TAIL": "",
- "LISTS_GET_INDEX_TOOLTIP_GET_FROM_START": "リスト内の指定位置にある項目を返します。＃ 1 は、最初の項目です。",
- "LISTS_GET_INDEX_TOOLTIP_GET_FROM_END": "リスト内の指定位置にある項目を返します。＃ 1 は、最後の項目です。",
+ "LISTS_INDEX_FROM_START_TOOLTIP": "%1 は、最初の項目です。",
+ "LISTS_INDEX_FROM_END_TOOLTIP": "%1 は、最後の項目です。",
+ "LISTS_GET_INDEX_TOOLTIP_GET_FROM": "リスト内の指定位置にある項目を返します。",
"LISTS_GET_INDEX_TOOLTIP_GET_FIRST": "リストの最初の項目を返信します。",
"LISTS_GET_INDEX_TOOLTIP_GET_LAST": "リストの最後の項目を返します。",
"LISTS_GET_INDEX_TOOLTIP_GET_RANDOM": "ランダム アイテム リストを返します。",
- "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM_START": "リスト内の指定位置にある項目を削除し、返します。＃ 1 は、最後の項目です。",
- "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM_END": "リスト内の指定位置にある項目を削除し、返します。＃ 1 は、最後の項目です。",
+ "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM": "リスト内の指定位置にある項目を削除し、返します。",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FIRST": "リスト内の最初の項目を削除したあと返します。",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_LAST": "リスト内の最後の項目を削除したあと返します。",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_RANDOM": "リストのランダムなアイテムを削除し、返します。",
- "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM_START": "リスト内の指定位置にある項目を返します。＃ 1 は、最初の項目です。",
- "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM_END": "リスト内の指定位置にある項目を削除します。＃ 1 は、最後の項目です。",
+ "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM": "リスト内の指定位置にある項目を返します。",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_FIRST": "リスト内の最初の項目を削除します。",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_LAST": "リスト内の最後の項目を削除します。",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_RANDOM": "リスト内にある任意のアイテムを削除します。",
"LISTS_SET_INDEX_SET": "セット",
"LISTS_SET_INDEX_INSERT": "挿入します。",
"LISTS_SET_INDEX_INPUT_TO": "として",
- "LISTS_SET_INDEX_TOOLTIP_SET_FROM_START": "リスト内の指定された位置に項目を設定します。＃ 1 は、最初の項目です。",
- "LISTS_SET_INDEX_TOOLTIP_SET_FROM_END": "リスト内の指定された位置に項目を設定します。＃ 1 は、最後の項目です。",
+ "LISTS_SET_INDEX_TOOLTIP_SET_FROM": "リスト内の指定された位置に項目を設定します。",
"LISTS_SET_INDEX_TOOLTIP_SET_FIRST": "リスト内に最初の項目を設定します。",
"LISTS_SET_INDEX_TOOLTIP_SET_LAST": "リスト内の最後の項目を設定します。",
"LISTS_SET_INDEX_TOOLTIP_SET_RANDOM": "リスト内にランダムなアイテムを設定します。",
- "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_START": "リスト内の指定位置に項目を挿入します。＃ 1 は、最初の項目です。",
- "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_END": "リスト内の指定位置に項目を挿入します。＃ 1 は、最後の項目です。",
+ "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM": "リスト内の指定位置に項目を挿入します。",
"LISTS_SET_INDEX_TOOLTIP_INSERT_FIRST": "リストの先頭に項目を挿入します。",
"LISTS_SET_INDEX_TOOLTIP_INSERT_LAST": "リストの末尾に項目を追加します。",
"LISTS_SET_INDEX_TOOLTIP_INSERT_RANDOM": "リストに項目をランダムに挿入します。",
diff --git a/msg/json/ko.json b/msg/json/ko.json
index 3af02a7ab..c0de5c003 100644
--- a/msg/json/ko.json
+++ b/msg/json/ko.json
@@ -32,9 +32,6 @@
"HELP": "도움말",
"UNDO": "끄르다",
"REDO": "다시 시도",
- "CHAT": "이 상자에 입력하여 당신의 동료와 채팅하세요!",
- "AUTH": "당신의 작업을 저장하고 다른 사람과 공유할 수 있도록 이 애플리케이션을 인증해 주십시오.",
- "ME": "나",
"CHANGE_VALUE_TITLE": "값 바꾸기:",
"NEW_VARIABLE": "새 변수",
"NEW_VARIABLE_TITLE": "새 변수 이름:",
@@ -101,7 +98,7 @@
"LOGIC_OPERATION_TOOLTIP_OR": "적어도 하나의 값이 참일 경우 참을 반환합니다.",
"LOGIC_OPERATION_OR": "또는",
"LOGIC_NEGATE_HELPURL": "https://ko.wikipedia.org/wiki/%EB%B6%80%EC%A0%95",
- "LOGIC_NEGATE_TITLE": "%1 의 반대",
+ "LOGIC_NEGATE_TITLE": "%1가 아닙니다",
"LOGIC_NEGATE_TOOLTIP": "입력값이 거짓이라면 참을 반환합니다. 참이라면 거짓을 반환합니다.",
"LOGIC_BOOLEAN_HELPURL": "https://ko.wikipedia.org/wiki/%EC%A7%84%EB%A6%BF%EA%B0%92",
"LOGIC_BOOLEAN_TRUE": "참",
@@ -114,7 +111,7 @@
"LOGIC_TERNARY_CONDITION": "테스트",
"LOGIC_TERNARY_IF_TRUE": "만약 참이라면",
"LOGIC_TERNARY_IF_FALSE": "만약 거짓이라면",
- "LOGIC_TERNARY_TOOLTIP": "'검사' 를 진행해, 결과가 참(true)이면 '참이면' 부분의 값을 돌려줍니다. ; 결과가 참이 아니면, '거짓이면' 부분의 값을 돌려줍니다.",
+ "LOGIC_TERNARY_TOOLTIP": "'test'의 조건을 검사합니다. 조건이 참이면 'if true' 값을 반환합니다. 거짓이면 'if false' 값을 반환합니다.",
"MATH_NUMBER_HELPURL": "https://en.wikipedia.org/wiki/Number",
"MATH_NUMBER_TOOLTIP": "수",
"MATH_ADDITION_SYMBOL": "+",
@@ -142,12 +139,12 @@
"MATH_SINGLE_TOOLTIP_NEG": "음(-)/양(+), 부호를 반대로 하여 값을 돌려줍니다.",
"MATH_SINGLE_TOOLTIP_LN": "어떤 수의, 자연로그(natural logarithm) 값을 돌려줍니다.(밑 e, 예시 log e x)",
"MATH_SINGLE_TOOLTIP_LOG10": "어떤 수의, 기본로그(logarithm) 값을 돌려줍니다.(밑 10, 예시 log 10 x)",
- "MATH_SINGLE_TOOLTIP_EXP": "e 의, 거듭제곱(power) 값을 돌려줍니다.",
- "MATH_SINGLE_TOOLTIP_POW10": "10 의, 거듭제곱(power) 값을 돌려줍니다.",
+ "MATH_SINGLE_TOOLTIP_EXP": "e의 거듭제곱 값을 반환합니다.",
+ "MATH_SINGLE_TOOLTIP_POW10": "10의 거듭제곱 값을 반환합니다.",
"MATH_TRIG_HELPURL": "https://en.wikipedia.org/wiki/Trigonometric_functions",
- "MATH_TRIG_TOOLTIP_SIN": "어떤 각도(degree, radian 아님)의, sin(sine) 값을 계산해 돌려줍니다.",
- "MATH_TRIG_TOOLTIP_COS": "어떤 각도(degree, radian 아님)의, cos(cosine) 값을 계산해 돌려줍니다.",
- "MATH_TRIG_TOOLTIP_TAN": "어떤 각도(degree, radian 아님)의, tan(tangent) 값을 계산해 돌려줍니다.",
+ "MATH_TRIG_TOOLTIP_SIN": "각도의 사인을 반환합니다. (라디안 아님)",
+ "MATH_TRIG_TOOLTIP_COS": "각도의 코사인을 반환합니다. (라디안 아님)",
+ "MATH_TRIG_TOOLTIP_TAN": "각도의 탄젠트를 반환합니다. (라디안 아님)",
"MATH_TRIG_TOOLTIP_ASIN": "어떤 수에 대한, asin(arcsine) 값을 돌려줍니다.",
"MATH_TRIG_TOOLTIP_ACOS": "어떤 수에 대한, acos(arccosine) 값을 돌려줍니다.",
"MATH_TRIG_TOOLTIP_ATAN": "어떤 수에 대한, atan(arctangent) 값을 돌려줍니다.",
@@ -183,14 +180,14 @@
"MATH_ONLIST_OPERATOR_MODE": "가장 여러 개 있는 값",
"MATH_ONLIST_TOOLTIP_MODE": "리스트에 들어있는 아이템들 중에서, 가장 여러 번 들어있는 아이템들을 리스트로 만들어 돌려줍니다. (최빈값, modes)",
"MATH_ONLIST_OPERATOR_STD_DEV": "표준 편차",
- "MATH_ONLIST_TOOLTIP_STD_DEV": "리스트에 들어있는 수(값)들에 대해, 표준 편차(standard deviation) 를 구해 돌려줍니다.",
+ "MATH_ONLIST_TOOLTIP_STD_DEV": "이 리스트의 표준 편차를 반환합니다.",
"MATH_ONLIST_OPERATOR_RANDOM": "목록의 임의 항목",
"MATH_ONLIST_TOOLTIP_RANDOM": "목록에서 임의의 아이템을 돌려줍니다.",
"MATH_MODULO_HELPURL": "https://en.wikipedia.org/wiki/Modulo_operation",
- "MATH_MODULO_TITLE": "%1 를 %2 로 나눈 나머지",
+ "MATH_MODULO_TITLE": "%1 ÷ %2의 나머지",
"MATH_MODULO_TOOLTIP": "첫 번째 수를 두 번째 수로 나눈, 나머지 값을 돌려줍니다.",
"MATH_CONSTRAIN_HELPURL": "https://ko.wikipedia.org/wiki/%ED%81%B4%EB%9E%A8%ED%95%91_(%EA%B7%B8%EB%9E%98%ED%94%BD)",
- "MATH_CONSTRAIN_TITLE": "%1 의 값을, 최소 %2 최대 %3 으로 조정",
+ "MATH_CONSTRAIN_TITLE": "%1의 값을, 최소 %2 최대 %3으로 조정",
"MATH_CONSTRAIN_TOOLTIP": "어떤 수를, 특정 범위의 값이 되도록 강제로 조정합니다.",
"MATH_RANDOM_INT_HELPURL": "https://en.wikipedia.org/wiki/Random_number_generation",
"MATH_RANDOM_INT_TITLE": "랜덤정수(%1<= n <=%2)",
@@ -209,7 +206,7 @@
"TEXT_APPEND_HELPURL": "https://github.com/google/blockly/wiki/Text#text-modification",
"TEXT_APPEND_TO": "다음",
"TEXT_APPEND_APPENDTEXT": "내용 덧붙이기",
- "TEXT_APPEND_TOOLTIP": "'%1' 의 마지막에 문장을 덧붙입니다.",
+ "TEXT_APPEND_TOOLTIP": "'%1' 변수의 끝에 일부 텍스트를 덧붙입니다.",
"TEXT_LENGTH_HELPURL": "https://github.com/google/blockly/wiki/Text#text-modification",
"TEXT_LENGTH_TITLE": "다음 문장의 문자 개수 %1",
"TEXT_LENGTH_TOOLTIP": "입력된 문장의, 문자 개수를 돌려줍니다.(공백문자 포함)",
@@ -217,7 +214,7 @@
"TEXT_ISEMPTY_TITLE": "%1이 비어 있습니다",
"TEXT_ISEMPTY_TOOLTIP": "입력된 문장이, 빈 문장(\"\")이면 참(true) 값을 돌려줍니다.",
"TEXT_INDEXOF_HELPURL": "https://github.com/google/blockly/wiki/Text#finding-text",
- "TEXT_INDEXOF_TOOLTIP": "어떤 문장이 가장 처음 나타난 위치 또는, 가장 마지막으로 나타난 위치를 찾아 돌려줍니다. 찾는 문장이 없는 경우는 0 값을 돌려줌.",
+ "TEXT_INDEXOF_TOOLTIP": "어떤 문장이 가장 처음 나타난 위치 또는, 가장 마지막으로 나타난 위치를 찾아 돌려줍니다. 찾는 문장이 없는 경우는 %1 값을 돌려줌.",
"TEXT_INDEXOF_INPUT_INTEXT": "문장",
"TEXT_INDEXOF_OPERATOR_FIRST": "에서 다음 문장이 처음으로 나타난 위치 찾기 :",
"TEXT_INDEXOF_OPERATOR_LAST": "에서 다음 문장이 마지막으로 나타난 위치 찾기 :",
@@ -261,7 +258,7 @@
"TEXT_PROMPT_TOOLTIP_TEXT": "문장 입력 받음.",
"LISTS_CREATE_EMPTY_HELPURL": "https://github.com/google/blockly/wiki/Lists#create-empty-list",
"LISTS_CREATE_EMPTY_TITLE": "빈 리스트 생성",
- "LISTS_CREATE_EMPTY_TOOLTIP": "아이템이 없는, 빈 리스트를 만들어 돌려줍니다.",
+ "LISTS_CREATE_EMPTY_TOOLTIP": "데이터 레코드가 없는, 길이가 0인 목록을 반환합니다.",
"LISTS_CREATE_WITH_HELPURL": "https://github.com/google/blockly/wiki/Lists#create-list-with",
"LISTS_CREATE_WITH_TOOLTIP": "원하는 수의 항목들로 목록을 생성합니다.",
"LISTS_CREATE_WITH_INPUT_WITH": "리스트 만들기",
@@ -269,8 +266,8 @@
"LISTS_CREATE_WITH_CONTAINER_TOOLTIP": "섹션을 추가, 제거하거나 순서를 변경하여 이 리스트 블럭을 재구성합니다.",
"LISTS_CREATE_WITH_ITEM_TOOLTIP": "아이템을 리스트에 추가합니다.",
"LISTS_REPEAT_HELPURL": "https://github.com/google/blockly/wiki/Lists#create-list-with",
- "LISTS_REPEAT_TOOLTIP": "원하는 값을, 원하는 갯수 만큼 넣어, 새로운 리스트를 생성합니다.",
- "LISTS_REPEAT_TITLE": "%1 을 %2 번 넣어, 리스트 생성",
+ "LISTS_REPEAT_TOOLTIP": "원하는 값을, 원하는 갯수 만큼 넣어, 목록을 생성합니다.",
+ "LISTS_REPEAT_TITLE": "%1을 %2번 넣어, 리스트 생성",
"LISTS_LENGTH_HELPURL": "https://github.com/google/blockly/wiki/Lists#length-of",
"LISTS_LENGTH_TITLE": "%1의 길이",
"LISTS_LENGTH_TOOLTIP": "목록의 길이를 반환합니다.",
@@ -281,7 +278,7 @@
"LISTS_INDEX_OF_HELPURL": "https://github.com/google/blockly/wiki/Lists#getting-items-from-a-list",
"LISTS_INDEX_OF_FIRST": "처음으로 나타난 위치",
"LISTS_INDEX_OF_LAST": "마지막으로 나타난 위치",
- "LISTS_INDEX_OF_TOOLTIP": "아이템이 나타난 처음 또는 마지막 위치를 찾아 돌려줍니다. 아이템이 없으면 0이 반환됩니다.",
+ "LISTS_INDEX_OF_TOOLTIP": "아이템이 나타난 처음 또는 마지막 위치를 찾아 돌려줍니다. 아이템이 없으면 %1이 반환됩니다.",
"LISTS_GET_INDEX_GET": "가져오기",
"LISTS_GET_INDEX_GET_REMOVE": "잘라 내기",
"LISTS_GET_INDEX_REMOVE": "삭제",
@@ -291,18 +288,17 @@
"LISTS_GET_INDEX_LAST": "마지막",
"LISTS_GET_INDEX_RANDOM": "임의로",
"LISTS_GET_INDEX_TAIL": "",
- "LISTS_GET_INDEX_TOOLTIP_GET_FROM_START": "목록에서 특정 위치의 항목을 반환합니다. #1은 첫 번째 항목입니다.",
- "LISTS_GET_INDEX_TOOLTIP_GET_FROM_END": "목록의 특정 위치의 항목을 반환합니다. #1은 마지막 항목입니다.",
+ "LISTS_INDEX_FROM_START_TOOLTIP": "%1은 첫 번째 항목입니다.",
+ "LISTS_INDEX_FROM_END_TOOLTIP": "%1은 마지막 항목입니다.",
+ "LISTS_GET_INDEX_TOOLTIP_GET_FROM": "목록에서 특정 위치의 항목을 반환합니다.",
"LISTS_GET_INDEX_TOOLTIP_GET_FIRST": "첫 번째 아이템을 찾아 돌려줍니다.",
"LISTS_GET_INDEX_TOOLTIP_GET_LAST": "마지막 아이템을 찾아 돌려줍니다.",
"LISTS_GET_INDEX_TOOLTIP_GET_RANDOM": "리스트의 아이템들 중, 랜덤으로 선택해 돌려줍니다.",
- "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM_START": "목록의 특정 위치에 있는 항목을 제거하고 반환합니다. #1는 첫 번째 항목입니다.",
- "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM_END": "목록의 특정 위치의 항목을 제거하고 반환합니다. #1는 마지막 항목입니다.",
+ "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM": "목록의 특정 위치에 있는 항목을 제거하고 반환합니다.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FIRST": "첫 번째 아이템을 찾아내 돌려주고, 그 아이템을 리스트에서 삭제합니다.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_LAST": "마지막 아이템을 찾아내 돌려주고, 그 아이템을 리스트에서 삭제합니다.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_RANDOM": "목록에서 임의 위치의 아이템을 찾아내 삭제하고 돌려줍니다.",
- "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM_START": "목록에서 특정 위치의 항목을 삭제합니다. #1는 첫 번째 항목입니다.",
- "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM_END": "목록의 특정 위치의 항목을 제거합니다. #1는 마지막 항목입니다.",
+ "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM": "목록에서 특정 위치의 항목을 삭제합니다.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_FIRST": "리스트에서 첫 번째 아이템을 삭제합니다.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_LAST": "리스트에서 마지막 아이템을 찾아 삭제합니다.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_RANDOM": "리스트에서 랜덤하게 아이템을 삭제합니다.",
@@ -310,13 +306,11 @@
"LISTS_SET_INDEX_SET": "에서 설정",
"LISTS_SET_INDEX_INSERT": "에서 원하는 위치에 삽입",
"LISTS_SET_INDEX_INPUT_TO": "에",
- "LISTS_SET_INDEX_TOOLTIP_SET_FROM_START": "목록의 특정 위치에 있는 항목으로 설정합니다. #1는 첫 번째 항목입니다.",
- "LISTS_SET_INDEX_TOOLTIP_SET_FROM_END": "목록의 특정 위치의 항목으로 설정합니다. #1는 마지막 항목입니다.",
+ "LISTS_SET_INDEX_TOOLTIP_SET_FROM": "목록의 특정 위치에 있는 항목으로 설정합니다.",
"LISTS_SET_INDEX_TOOLTIP_SET_FIRST": "첫 번째 위치의 아이템으로 설정합니다.",
"LISTS_SET_INDEX_TOOLTIP_SET_LAST": "마지막 아이템으로 설정합니다.",
"LISTS_SET_INDEX_TOOLTIP_SET_RANDOM": "목록에서 임의 위치의 아이템을 설정합니다.",
- "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_START": "목록의 특정 위치에 항목을 삽입합니다. 첫 번째 항목은 #1입니다.",
- "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_END": "아이템을 리스트의 특정 위치에 삽입합니다. 마지막 아이템은 #1.",
+ "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM": "아이템을 리스트의 특정 위치에 삽입합니다.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_FIRST": "항목을 목록의 처음 위치에 삽입합니다.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_LAST": "리스트의 마지막에 아이템을 추가합니다.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_RANDOM": "목록에서 임의 위치에 아이템을 삽입합니다.",
@@ -328,7 +322,7 @@
"LISTS_GET_SUBLIST_END_FROM_END": "끝에서부터 # 번째로",
"LISTS_GET_SUBLIST_END_LAST": "마지막으로",
"LISTS_GET_SUBLIST_TAIL": "",
- "LISTS_GET_SUBLIST_TOOLTIP": "특정 부분을 복사해 새로운 리스트로 생성합니다.",
+ "LISTS_GET_SUBLIST_TOOLTIP": "목록의 특정 부분에 대한 복사본을 만듭니다.",
"LISTS_SORT_HELPURL": "https://github.com/google/blockly/wiki/Lists#sorting-a-list",
"LISTS_SORT_TITLE": "정렬 %1 %2 %3",
"LISTS_SORT_TOOLTIP": "목록의 사본을 정렬합니다.",
@@ -342,13 +336,13 @@
"LISTS_SPLIT_TEXT_FROM_LIST": "목록에서 텍스트 만들기",
"LISTS_SPLIT_WITH_DELIMITER": "분리와",
"LISTS_SPLIT_TOOLTIP_SPLIT": "각 속보, 텍스트의 목록들에서 텍스트를 분할합니다.",
- "LISTS_SPLIT_TOOLTIP_JOIN": "구분 기호로 분리 된 하나의 텍스트에 텍스트 의 목록을 넣으세요.",
+ "LISTS_SPLIT_TOOLTIP_JOIN": "구분 기호로 구분하여 텍스트 목록을 하나의 텍스트에 병합합니다.",
"ORDINAL_NUMBER_SUFFIX": "",
"VARIABLES_GET_HELPURL": "https://ko.wikipedia.org/wiki/%EB%B3%80%EC%88%98_(%EC%BB%B4%ED%93%A8%ED%84%B0_%EA%B3%BC%ED%95%99)",
"VARIABLES_GET_TOOLTIP": "변수에 저장 되어있는 값을 돌려줍니다.",
"VARIABLES_GET_CREATE_SET": "'집합 %1' 생성",
"VARIABLES_SET_HELPURL": "https://ko.wikipedia.org/wiki/%EB%B3%80%EC%88%98_(%EC%BB%B4%ED%93%A8%ED%84%B0_%EA%B3%BC%ED%95%99)",
- "VARIABLES_SET": "바꾸기 %1 를 다음 값으로 바꾸기 %2",
+ "VARIABLES_SET": "%1를 %2로 설정",
"VARIABLES_SET_TOOLTIP": "변수의 값을 입력한 값으로 변경해 줍니다.",
"VARIABLES_SET_CREATE_GET": "'%1 값 읽기' 블럭 생성",
"PROCEDURES_DEFNORETURN_HELPURL": "https://ko.wikipedia.org/wiki/%ED%95%A8%EC%88%98_%28%ED%94%84%EB%A1%9C%EA%B7%B8%EB%9E%98%EB%B0%8D%29",
diff --git a/msg/json/lb.json b/msg/json/lb.json
index 2f24b62c6..ff82c489b 100644
--- a/msg/json/lb.json
+++ b/msg/json/lb.json
@@ -23,8 +23,6 @@
"HELP": "Hëllef",
"UNDO": "Réckgängeg maachen",
"REDO": "Widderhuelen",
- "CHAT": "Mat ärem Mataarbechter chatten an deem Dir an dës Këscht tippt!",
- "ME": "Mech",
"CHANGE_VALUE_TITLE": "Wäert änneren:",
"NEW_VARIABLE": "Nei Variabel...",
"NEW_VARIABLE_TITLE": "Neie variabelen Numm:",
diff --git a/msg/json/lki.json b/msg/json/lki.json
index 96528f525..4b9e3c3c5 100644
--- a/msg/json/lki.json
+++ b/msg/json/lki.json
@@ -23,9 +23,6 @@
"DISABLE_BLOCK": "إ کار کةتن(غیرفعالسازی) بلاک",
"ENABLE_BLOCK": "إ کارآشتن(فعال)بلاک",
"HELP": "کؤمةک",
- "CHAT": "!وةگةرد هؤمکارةتان وة نام ئئ کادرة گةپ بةن",
- "AUTH": "لطفا ئئ اپلیکیشن را ثبت کةن و آثارتان فعال کةن تا ذخیره بو و اجازهٔ اشتراک نیائن توسط هؤمة بو",
- "ME": "مإ",
"CHANGE_VALUE_TITLE": "تةغییر مقدار:",
"NEW_VARIABLE": "متغیر تازه...",
"NEW_VARIABLE_TITLE": "نام متغیر تازه:",
@@ -178,7 +175,7 @@
"TEXT_LENGTH_TOOLTIP": "بازگرداندن عددی از حروف (شامل فاصلهها) در متن فراهمشده.",
"TEXT_ISEMPTY_TITLE": "%1 خالی است",
"TEXT_ISEMPTY_TOOLTIP": "اضافهکردن صحیح اگر متن فراهمشده خالی است.",
- "TEXT_INDEXOF_TOOLTIP": "شاخصی از اولین آخرین رخداد متن اول در متن دوم بر میگرداند. اگر متن یافت نشد ۰ باز میگرداند.",
+ "TEXT_INDEXOF_TOOLTIP": "شاخصی از اولین آخرین رخداد متن اول در متن دوم بر میگرداند. اگر متن یافت نشد %1 باز میگرداند.",
"TEXT_INDEXOF_INPUT_INTEXT": "در متن",
"TEXT_INDEXOF_OPERATOR_FIRST": "اولین رخداد متن را بیاب",
"TEXT_INDEXOF_OPERATOR_LAST": "آخرین رخداد متن را بیاب",
@@ -227,7 +224,7 @@
"LISTS_INLIST": "در فهرست",
"LISTS_INDEX_OF_FIRST": "یافتن اولین رخداد مورد",
"LISTS_INDEX_OF_LAST": "یافتن آخرین رخداد مورد",
- "LISTS_INDEX_OF_TOOLTIP": "شاخصی از اولین/آخرین رخداد مورد در فهرست را بر میگرداند. ۰ بر میگرداند اگر آیتم موجود نبود.",
+ "LISTS_INDEX_OF_TOOLTIP": "شاخصی از اولین/آخرین رخداد مورد در فهرست را بر میگرداند. %1 بر میگرداند اگر آیتم موجود نبود.",
"LISTS_GET_INDEX_GET": "گِرتِن",
"LISTS_GET_INDEX_GET_REMOVE": "گِرتِن و حةذف کردن",
"LISTS_GET_INDEX_REMOVE": "حةذف کردن",
@@ -235,31 +232,28 @@
"LISTS_GET_INDEX_FIRST": "إژ أؤةل",
"LISTS_GET_INDEX_LAST": "دؤمائن/آخرین",
"LISTS_GET_INDEX_RANDOM": "بةختةکی",
- "LISTS_GET_INDEX_TOOLTIP_GET_FROM_START": "موردی در محل مشخصشده بر میگرداند. #1 اولین مورد است.",
- "LISTS_GET_INDEX_TOOLTIP_GET_FROM_END": "موردی در محل مشخص در فهرست بر میگرداند. #1 آخرین مورد است.",
+ "LISTS_INDEX_FROM_START_TOOLTIP": "%1 اولین مورد است.",
+ "LISTS_INDEX_FROM_END_TOOLTIP": "%1 آخرین مورد است.",
+ "LISTS_GET_INDEX_TOOLTIP_GET_FROM": "موردی در محل مشخصشده بر میگرداند.",
"LISTS_GET_INDEX_TOOLTIP_GET_FIRST": "اولین مورد یک فهرست را بر میگرداند.",
"LISTS_GET_INDEX_TOOLTIP_GET_LAST": "آخرین مورد در یک فهرست را بر میگرداند.",
"LISTS_GET_INDEX_TOOLTIP_GET_RANDOM": "یک مورد تصادفی در یک فهرست بر میگرداند.",
- "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM_START": "مورد در محل مشخصشده در فهرست را حذف و بر میگرداند. #1 اولین مورد است.",
- "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM_END": "مورد در محل مشخصشده در فهرست را حذف و بر میگرداند. #1 آخرین مورد است.",
+ "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM": "مورد در محل مشخصشده در فهرست را حذف و بر میگرداند.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FIRST": "اولین مورد مشخصشده در فهرست را حذف و بر میگرداند.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_LAST": "آخرین مورد مشخصشده در فهرست را حذف و بر میگرداند.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_RANDOM": "مورد تصادفیای را در فهرست حذف و بر میگرداند.",
- "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM_START": "مورد مشخصشده در موقعیت مشخص در یک فهرست را حذف و بر میگرداند. #1 اولین مورد است.",
- "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM_END": "مورد مشخصشده در موقعیت مشخص در یک فهرست را حذف و بر میگرداند. #1 آخرین مورد است.",
+ "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM": "مورد مشخصشده در موقعیت مشخص در یک فهرست را حذف و بر میگرداند.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_FIRST": "اولین مورد را در یک فهرست حذف میکند.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_LAST": "آخرین مورد را در یک فهرست حذف میکند.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_RANDOM": "یک مورد تصادفی را یک فهرست حذف میکند.",
"LISTS_SET_INDEX_SET": "مجموعه",
"LISTS_SET_INDEX_INSERT": "درج در",
"LISTS_SET_INDEX_INPUT_TO": "به عنوان",
- "LISTS_SET_INDEX_TOOLTIP_SET_FROM_START": "مورد مشخصشده در یک فهرست را قرار میدهد. #1 اولین مورد است.",
- "LISTS_SET_INDEX_TOOLTIP_SET_FROM_END": "مورد مشخصشده در یک فهرست را قرار میدهد. #1 آخرین مورد است.",
+ "LISTS_SET_INDEX_TOOLTIP_SET_FROM": "مورد مشخصشده در یک فهرست را قرار میدهد.",
"LISTS_SET_INDEX_TOOLTIP_SET_FIRST": "اولین مورد در یک فهرست را تعیین میکند.",
"LISTS_SET_INDEX_TOOLTIP_SET_LAST": "آخرین مورد در یک فهرست را تعیین میکند.",
"LISTS_SET_INDEX_TOOLTIP_SET_RANDOM": "یک مورد تصادفی در یک فهرست را تعیین میکند.",
- "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_START": "موردی در موقعیت مشخصشده در یک فهرست اضافه میکند. #1 اولین مورد است.",
- "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_END": "موردی در موقعیت مشخصشده در یک فهرست اضافه میکند. #1 آخرین مورد است.",
+ "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM": "موردی در موقعیت مشخصشده در یک فهرست اضافه میکند.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_FIRST": "موردی به ته فهرست اضافه میکند.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_LAST": "موردی به ته فهرست الحاق میکند.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_RANDOM": "مورد را به صورت تصادفی در یک فهرست میافزاید.",
@@ -273,8 +267,6 @@
"LISTS_SPLIT_LIST_FROM_TEXT": "ساخت لیست إژ متن",
"LISTS_SPLIT_TEXT_FROM_LIST": "ساخت متن إژ لیست",
"LISTS_SPLIT_WITH_DELIMITER": "همراه جداساز",
- "LISTS_SPLIT_TOOLTIP_SPLIT": "Split text into a list of texts, breaking at each delimiter.",
- "LISTS_SPLIT_TOOLTIP_JOIN": "Join a list of texts into one text, separated by a delimiter.",
"VARIABLES_GET_TOOLTIP": "مقدار این متغیر را بر میگرداند.",
"VARIABLES_GET_CREATE_SET": "درستکردن «تنظیم %1»",
"VARIABLES_SET": "مجموعه %1 به %2",
diff --git a/msg/json/lrc.json b/msg/json/lrc.json
index 52e432b25..7bbde5d9c 100644
--- a/msg/json/lrc.json
+++ b/msg/json/lrc.json
@@ -20,7 +20,6 @@
"DISABLE_BLOCK": "ناکشتگر کردن برشت",
"ENABLE_BLOCK": "کنشتگر کردن برشت",
"HELP": "هومياری",
- "ME": "مه",
"CHANGE_VALUE_TITLE": "ارزشت آلشت کو:",
"NEW_VARIABLE": "آلشتگر تازه...",
"NEW_VARIABLE_TITLE": "نوم آلشتگر تازه:",
diff --git a/msg/json/lt.json b/msg/json/lt.json
index cf17c429c..58ddf6f43 100644
--- a/msg/json/lt.json
+++ b/msg/json/lt.json
@@ -24,9 +24,6 @@
"DISABLE_BLOCK": "Išjungti bloką",
"ENABLE_BLOCK": "Įjungti bloką",
"HELP": "Pagalba",
- "CHAT": "Galite susirašinėti su projekto bendradarbiais.",
- "AUTH": "Norint išsaugoti (ir dalintis) savo sukurtas programas, reikia prisijungti (autorizuotis).",
- "ME": "Mane",
"CHANGE_VALUE_TITLE": "Keisti reikšmę:",
"NEW_VARIABLE": "Naujas kintamasis...",
"NEW_VARIABLE_TITLE": "Naujo kintamojo pavadinimas:",
@@ -190,7 +187,7 @@
"LISTS_INLIST": "sąraše",
"LISTS_INDEX_OF_FIRST": "rask pirmą reikšmę",
"LISTS_INDEX_OF_LAST": "rask paskutinę reikšmę",
- "LISTS_INDEX_OF_TOOLTIP": "Grąžina pirmos/paskutinės reikšmės eilės nr. sąraše. Grąžina 0, jei reikšmės neranda.",
+ "LISTS_INDEX_OF_TOOLTIP": "Grąžina pirmos/paskutinės reikšmės eilės nr. sąraše. Grąžina %1, jei reikšmės neranda.",
"LISTS_GET_INDEX_GET": "paimk",
"LISTS_GET_INDEX_GET_REMOVE": "paimk ir ištrink",
"LISTS_GET_INDEX_REMOVE": "pašalinti",
diff --git a/msg/json/mk.json b/msg/json/mk.json
index 4cb890cf0..c9f8a866e 100644
--- a/msg/json/mk.json
+++ b/msg/json/mk.json
@@ -20,9 +20,6 @@
"DISABLE_BLOCK": "Исклучи блок",
"ENABLE_BLOCK": "Вклучи блок",
"HELP": "Помош",
- "CHAT": "Разговарајте со вашиот соработник во ова поле!",
- "AUTH": "Овластете го извршников за да можете да ја зачувате вашата работа и да можете да ја споделувате.",
- "ME": "Мене",
"CHANGE_VALUE_TITLE": "Смена на вредност:",
"NEW_VARIABLE": "Нова променлива...",
"NEW_VARIABLE_TITLE": "Назив на новата променлива:",
diff --git a/msg/json/ms.json b/msg/json/ms.json
index 017fa3c27..e559e7a99 100644
--- a/msg/json/ms.json
+++ b/msg/json/ms.json
@@ -23,9 +23,6 @@
"DISABLE_BLOCK": "Matikan Blok",
"ENABLE_BLOCK": "Hidupkan Blok",
"HELP": "Bantuan",
- "CHAT": "Bersembang dengan rakan kerjasama anda dengan menaip di dalam petak ini!",
- "AUTH": "Sila benarkan aplikasi ini untuk membolehkan hasil kerja anda disimpan, malah dikongsikan oleh anda.",
- "ME": "Saya",
"CHANGE_VALUE_TITLE": "Ubah nilai:",
"NEW_VARIABLE": "Pembolehubah baru...",
"NEW_VARIABLE_TITLE": "Nama pembolehubah baru:",
@@ -189,7 +186,7 @@
"TEXT_LENGTH_TOOLTIP": "Kembalikan jumlah huruf (termasuk ruang) dalam teks yang disediakan.",
"TEXT_ISEMPTY_TITLE": "%1 adalah kosong",
"TEXT_ISEMPTY_TOOLTIP": "Kembalikan benar jika teks yang disediakan adalah kosong.",
- "TEXT_INDEXOF_TOOLTIP": "Kembalikan Indeks kejadian pertama/terakhir dari teks pertama ke dalam teks kedua. Kembalikan 0 Jika teks tidak ditemui.",
+ "TEXT_INDEXOF_TOOLTIP": "Kembalikan Indeks kejadian pertama/terakhir dari teks pertama ke dalam teks kedua. Kembalikan %1 Jika teks tidak ditemui.",
"TEXT_INDEXOF_INPUT_INTEXT": "dalam teks",
"TEXT_INDEXOF_OPERATOR_FIRST": "mencari kejadian pertama teks",
"TEXT_INDEXOF_OPERATOR_LAST": "mencari kejadian terakhir teks",
@@ -239,7 +236,7 @@
"LISTS_INLIST": "dalam senarai",
"LISTS_INDEX_OF_FIRST": "cari pertama item kejadian",
"LISTS_INDEX_OF_LAST": "cari kejadian akhir item",
- "LISTS_INDEX_OF_TOOLTIP": "Menyatakan indeks kejadian pertama/terakhir item berkenaan dalam senarai. Menyatakan 0 jika item berkenaan tidak ditemui.",
+ "LISTS_INDEX_OF_TOOLTIP": "Menyatakan indeks kejadian pertama/terakhir item berkenaan dalam senarai. Menyatakan %1 jika item berkenaan tidak ditemui.",
"LISTS_GET_INDEX_GET": "dapatkan",
"LISTS_GET_INDEX_GET_REMOVE": "dapat dan alihkan",
"LISTS_GET_INDEX_REMOVE": "alihkan",
@@ -248,31 +245,28 @@
"LISTS_GET_INDEX_FIRST": "pertama",
"LISTS_GET_INDEX_LAST": "terakhir",
"LISTS_GET_INDEX_RANDOM": "rawak",
- "LISTS_GET_INDEX_TOOLTIP_GET_FROM_START": "Kembalikan item dalam kedudukan yang ditetapkan dalam senarai. #1 ialah item terakhir.",
- "LISTS_GET_INDEX_TOOLTIP_GET_FROM_END": "Kembalikan item dalam kedudukan yang ditetapkan dalam senarai. #1 ialah item terakhir.",
+ "LISTS_INDEX_FROM_START_TOOLTIP": "%1 ialah item pertama.",
+ "LISTS_INDEX_FROM_END_TOOLTIP": "%1 ialah item terakhir.",
+ "LISTS_GET_INDEX_TOOLTIP_GET_FROM": "Kembalikan item dalam kedudukan yang ditetapkan dalam senarai.",
"LISTS_GET_INDEX_TOOLTIP_GET_FIRST": "Kembalikan item pertama dalam senarai.",
"LISTS_GET_INDEX_TOOLTIP_GET_LAST": "Kembalikan item pertama dalam senarai.",
"LISTS_GET_INDEX_TOOLTIP_GET_RANDOM": "Kembalikan item rawak dalam senarai.",
- "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM_START": "Alihkan dan kembalikan item mengikut spesifikasi posisi dalam senarai. #1 ialah item pertama.",
- "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM_END": "Alihkan dan kembalikan item mengikut spesifikasi posisi dalam senarai. #1 ialah item terakhir.",
+ "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM": "Alihkan dan kembalikan item mengikut spesifikasi posisi dalam senarai.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FIRST": "Alihkan dan kembalikan item pertama dalam senarai.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_LAST": "Alihkan dan kembalikan item terakhir dalam senarai.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_RANDOM": "Alihkan dan kembalikan item rawak dalam senarai.",
- "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM_START": "Alihkan item pada posisi mengikut spesifikasi dalam senarai. #1 ialah item pertama.",
- "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM_END": "Alihkan item mengikut spesifikasi posisi dalam senarai. #1 ialah item terakhir.",
+ "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM": "Alihkan item pada posisi mengikut spesifikasi dalam senarai.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_FIRST": "Alihkan item pertama dalam senarai.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_LAST": "Alihkan item terakhir dalam senarai.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_RANDOM": "Alihkan item rawak dalam senarai.",
"LISTS_SET_INDEX_SET": "set",
"LISTS_SET_INDEX_INSERT": "masukkan pada",
"LISTS_SET_INDEX_INPUT_TO": "sebagai",
- "LISTS_SET_INDEX_TOOLTIP_SET_FROM_START": "Masukkan item pada posisi yang ditentukan dalam senarai. #1 ialah item terakhir.",
- "LISTS_SET_INDEX_TOOLTIP_SET_FROM_END": "Masukkan item pada posisi yang ditentukan dalam senarai. #1 ialah item terakhir.",
+ "LISTS_SET_INDEX_TOOLTIP_SET_FROM": "Masukkan item pada posisi yang ditentukan dalam senarai.",
"LISTS_SET_INDEX_TOOLTIP_SET_FIRST": "Set item pertama dalam senarai.",
"LISTS_SET_INDEX_TOOLTIP_SET_LAST": "Set item terakhir dalam senarai.",
"LISTS_SET_INDEX_TOOLTIP_SET_RANDOM": "Set item rawak dalam senarai.",
- "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_START": "Masukkan item pada posisi yand ditentukan dalam senarai. #1 ialah item terakhir.",
- "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_END": "Masukkan item pada posisi yang ditentukan dalam senarai. #1 ialah item terakhir.",
+ "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM": "Masukkan item pada posisi yand ditentukan dalam senarai.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_FIRST": "Selit item pada permulaan senarai.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_LAST": "Tambahkan item dalam senarai akhir.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_RANDOM": "Selit item secara rawak di dalam senarai.",
diff --git a/msg/json/nb.json b/msg/json/nb.json
index 8a9a1f474..088e6e72f 100644
--- a/msg/json/nb.json
+++ b/msg/json/nb.json
@@ -25,9 +25,6 @@
"DISABLE_BLOCK": "Deaktiver blokk",
"ENABLE_BLOCK": "Aktiver blokk",
"HELP": "Hjelp",
- "CHAT": "Chat med din medarbeider ved å skrive i dette feltet!",
- "AUTH": "Vennligst godkjenn at denne appen gjør det mulig for deg å lagre arbeidet slik at du kan dele det.",
- "ME": "Jeg",
"CHANGE_VALUE_TITLE": "Bytt verdi:",
"NEW_VARIABLE": "Ny variabel...",
"NEW_VARIABLE_TITLE": "Nytt variabelnavn:",
@@ -196,7 +193,7 @@
"TEXT_LENGTH_TOOLTIP": "Returnerer antall bokstaver (inkludert mellomrom) i den angitte teksten.",
"TEXT_ISEMPTY_TITLE": "%1 er tom",
"TEXT_ISEMPTY_TOOLTIP": "Returnerer sann hvis den angitte teksten er tom.",
- "TEXT_INDEXOF_TOOLTIP": "Returnerer posisjonen for første/siste forekomsten av den første tekst i den andre teksten. Returnerer 0 hvis teksten ikke blir funnet.",
+ "TEXT_INDEXOF_TOOLTIP": "Returnerer posisjonen for første/siste forekomsten av den første tekst i den andre teksten. Returnerer %1 hvis teksten ikke blir funnet.",
"TEXT_INDEXOF_INPUT_INTEXT": "i tekst",
"TEXT_INDEXOF_OPERATOR_FIRST": "finn første forekomst av tekst",
"TEXT_INDEXOF_OPERATOR_LAST": "finn siste forekomst av tekst",
@@ -249,7 +246,7 @@
"LISTS_INLIST": "i listen",
"LISTS_INDEX_OF_FIRST": "finn første forekomst av elementet",
"LISTS_INDEX_OF_LAST": "finn siste forekomst av elementet",
- "LISTS_INDEX_OF_TOOLTIP": "Returnerer indeksen av den første/siste forekomsten av elementet i lista. Returnerer 0 hvis ikke funnet.",
+ "LISTS_INDEX_OF_TOOLTIP": "Returnerer indeksen av den første/siste forekomsten av elementet i lista. Returnerer %1 hvis ikke funnet.",
"LISTS_GET_INDEX_GET": "hent",
"LISTS_GET_INDEX_GET_REMOVE": "hent og fjern",
"LISTS_GET_INDEX_REMOVE": "fjern",
@@ -259,31 +256,28 @@
"LISTS_GET_INDEX_LAST": "siste",
"LISTS_GET_INDEX_RANDOM": "tilfeldig",
"LISTS_GET_INDEX_TAIL": "",
- "LISTS_GET_INDEX_TOOLTIP_GET_FROM_START": "Returner elementet på den angitte posisjonen i en liste. #1 er det første elementet.",
- "LISTS_GET_INDEX_TOOLTIP_GET_FROM_END": "Returner elementet på den angitte posisjonen i en liste. #1 er det siste elementet.",
+ "LISTS_INDEX_FROM_START_TOOLTIP": "%1 er det første elementet.",
+ "LISTS_INDEX_FROM_END_TOOLTIP": "%1 er det siste elementet.",
+ "LISTS_GET_INDEX_TOOLTIP_GET_FROM": "Returner elementet på den angitte posisjonen i en liste.",
"LISTS_GET_INDEX_TOOLTIP_GET_FIRST": "Returnerer det første elementet i en liste.",
"LISTS_GET_INDEX_TOOLTIP_GET_LAST": "Returnerer det siste elementet i en liste.",
"LISTS_GET_INDEX_TOOLTIP_GET_RANDOM": "Returnerer et tilfeldig element i en liste.",
- "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM_START": "Fjerner og returnerer elementet ved en gitt posisjon i en liste. #1 er det første elementet.",
- "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM_END": "Fjerner og returnerer elementet ved en gitt posisjon i en liste. #1 er det siste elementet.",
+ "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM": "Fjerner og returnerer elementet ved en gitt posisjon i en liste.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FIRST": "Fjerner og returnerer det første elementet i en liste.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_LAST": "Fjerner og returnerer det siste elementet i en liste.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_RANDOM": "Fjerner og returnerer et tilfeldig element i en liste.",
- "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM_START": "Fjerner et element ved en gitt posisjon i en liste. #1 er det første elementet.",
- "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM_END": "Fjerner et element ved en gitt posisjon i en liste. #1 er det siste elementet.",
+ "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM": "Fjerner et element ved en gitt posisjon i en liste.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_FIRST": "Fjerner det første elementet i en liste.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_LAST": "Fjerner det siste elementet i en liste.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_RANDOM": "Fjerner et tilfeldig element i en liste.",
"LISTS_SET_INDEX_SET": "sett",
"LISTS_SET_INDEX_INSERT": "sett inn ved",
"LISTS_SET_INDEX_INPUT_TO": "som",
- "LISTS_SET_INDEX_TOOLTIP_SET_FROM_START": "Setter inn elementet ved den angitte posisjonen i en liste. #1 er det første elementet.",
- "LISTS_SET_INDEX_TOOLTIP_SET_FROM_END": "Setter inn elementet ved den angitte posisjonen i en liste. #1 er det siste elementet.",
+ "LISTS_SET_INDEX_TOOLTIP_SET_FROM": "Setter inn elementet ved den angitte posisjonen i en liste.",
"LISTS_SET_INDEX_TOOLTIP_SET_FIRST": "Angir det første elementet i en liste.",
"LISTS_SET_INDEX_TOOLTIP_SET_LAST": "Angir det siste elementet i en liste.",
"LISTS_SET_INDEX_TOOLTIP_SET_RANDOM": "Angir et tilfeldig element i en liste.",
- "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_START": "Setter inn elementet ved den angitte posisjonen i en liste. #1 er det første elementet.",
- "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_END": "Setter inn elementet ved den angitte posisjonen i en liste. #1 er det siste elementet.",
+ "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM": "Setter inn elementet ved den angitte posisjonen i en liste.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_FIRST": "Setter inn elementet i starten av en liste.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_LAST": "Tilføy elementet til slutten av en liste.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_RANDOM": "Setter inn elementet ved en tilfeldig posisjon i en liste.",
diff --git a/msg/json/nl.json b/msg/json/nl.json
index 323e931d7..828a4ee0b 100644
--- a/msg/json/nl.json
+++ b/msg/json/nl.json
@@ -32,9 +32,6 @@
"HELP": "Hulp",
"UNDO": "Ongedaan maken",
"REDO": "Opnieuw",
- "CHAT": "Chat met iemand die ook aan het werk is via dit venster!",
- "AUTH": "Sta deze app toe om uw werk op te slaan het uw werk te delen.",
- "ME": "Ik",
"CHANGE_VALUE_TITLE": "Waarde wijzigen:",
"NEW_VARIABLE": "Nieuwe variabele...",
"NEW_VARIABLE_TITLE": "Nieuwe variabelenaam:",
@@ -214,7 +211,7 @@
"TEXT_ISEMPTY_TITLE": "%1 is leeg",
"TEXT_ISEMPTY_TOOLTIP": "Geeft \"waar\" terug, als de opgegeven tekst leeg is.",
"TEXT_INDEXOF_HELPURL": "https://github.com/google/blockly/wiki/Text#finding-text",
- "TEXT_INDEXOF_TOOLTIP": "Geeft de index terug van de eerste/laatste aanwezigheid van de eerste tekst in de tweede tekst. Geeft 0 terug als de tekst niet gevonden is.",
+ "TEXT_INDEXOF_TOOLTIP": "Geeft de index terug van de eerste/laatste aanwezigheid van de eerste tekst in de tweede tekst. Geeft %1 terug als de tekst niet gevonden is.",
"TEXT_INDEXOF_INPUT_INTEXT": "in tekst",
"TEXT_INDEXOF_OPERATOR_FIRST": "zoek eerste voorkomen van tekst",
"TEXT_INDEXOF_OPERATOR_LAST": "zoek het laatste voorkomen van tekst",
@@ -273,7 +270,7 @@
"LISTS_INDEX_OF_HELPURL": "https://github.com/google/blockly/wiki/Lists#getting-items-from-a-list",
"LISTS_INDEX_OF_FIRST": "zoek eerste voorkomen van item",
"LISTS_INDEX_OF_LAST": "zoek laatste voorkomen van item",
- "LISTS_INDEX_OF_TOOLTIP": "Geeft de index terug van het eerste of laatste voorkomen van een item in de lijst. Geeft 0 terug als het item niet is gevonden.",
+ "LISTS_INDEX_OF_TOOLTIP": "Geeft de index terug van het eerste of laatste voorkomen van een item in de lijst. Geeft %1 terug als het item niet is gevonden.",
"LISTS_GET_INDEX_GET": "haal op",
"LISTS_GET_INDEX_GET_REMOVE": "haal op en verwijder",
"LISTS_GET_INDEX_REMOVE": "verwijder",
@@ -282,18 +279,17 @@
"LISTS_GET_INDEX_FIRST": "eerste",
"LISTS_GET_INDEX_LAST": "laatste",
"LISTS_GET_INDEX_RANDOM": "willekeurig",
- "LISTS_GET_INDEX_TOOLTIP_GET_FROM_START": "Geeft het item op de opgegeven positie in een lijst. Item 1 is het eerste item.",
- "LISTS_GET_INDEX_TOOLTIP_GET_FROM_END": "Geeft het item op de opgegeven positie in een lijst terug. Item 1 is het laatste item.",
+ "LISTS_INDEX_FROM_START_TOOLTIP": "Item %1 is het eerste item.",
+ "LISTS_INDEX_FROM_END_TOOLTIP": "Item %1 is het laatste item.",
+ "LISTS_GET_INDEX_TOOLTIP_GET_FROM": "Geeft het item op de opgegeven positie in een lijst.",
"LISTS_GET_INDEX_TOOLTIP_GET_FIRST": "Geeft het eerste item in een lijst terug.",
"LISTS_GET_INDEX_TOOLTIP_GET_LAST": "Geeft het laatste item in een lijst terug.",
"LISTS_GET_INDEX_TOOLTIP_GET_RANDOM": "Geeft een willekeurig item uit een lijst.",
- "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM_START": "Geeft het item op de opgegeven positie in een lijst terug en verwijdert het. Item 1 is het eerste item.",
- "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM_END": "Verwijdert en geeft het item op de opgegeven positie in de lijst. Item 1 is het laatste item.",
+ "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM": "Geeft het item op de opgegeven positie in een lijst terug en verwijdert het.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FIRST": "Geeft het laatste item in een lijst terug en verwijdert het.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_LAST": "Geeft het laatste item uit een lijst terug en verwijdert het.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_RANDOM": "Geeft een willekeurig item in een lijst terug en verwijdert het.",
- "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM_START": "Verwijdert het item op de opgegeven positie in een lijst. Item 1 is het eerste item.",
- "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM_END": "Verwijdert een item op de opgegeven positie in een lijst. Item 1 is het laatste item.",
+ "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM": "Verwijdert het item op de opgegeven positie in een lijst.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_FIRST": "Verwijdert het eerste item in een lijst.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_LAST": "Verwijdert het laatste item uit een lijst.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_RANDOM": "Verwijdert een willekeurig item uit een lijst.",
@@ -301,13 +297,11 @@
"LISTS_SET_INDEX_SET": "stel in",
"LISTS_SET_INDEX_INSERT": "tussenvoegen op",
"LISTS_SET_INDEX_INPUT_TO": "als",
- "LISTS_SET_INDEX_TOOLTIP_SET_FROM_START": "Stelt het item op de opgegeven positie in de lijst in. Item 1 is het eerste item.",
- "LISTS_SET_INDEX_TOOLTIP_SET_FROM_END": "Stelt het item op een opgegeven positie in de lijst in. Item 1 is het laatste item.",
+ "LISTS_SET_INDEX_TOOLTIP_SET_FROM": "Stelt het item op de opgegeven positie in de lijst in.",
"LISTS_SET_INDEX_TOOLTIP_SET_FIRST": "Stelt het eerste item in een lijst in.",
"LISTS_SET_INDEX_TOOLTIP_SET_LAST": "Stelt het laatste item van een lijst in.",
"LISTS_SET_INDEX_TOOLTIP_SET_RANDOM": "Stelt een willekeurig item uit de lijst in.",
- "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_START": "Voegt het item op een opgegeven positie in een lijst in. Item 1 is het eerste item.",
- "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_END": "Voegt het item op de opgegeven positie toe aan een lijst in. Item 1 is het laatste item.",
+ "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM": "Voegt het item op een opgegeven positie in een lijst in.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_FIRST": "Voegt het item toe aan het begin van de lijst.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_LAST": "Voeg het item aan het einde van een lijst toe.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_RANDOM": "Voegt het item op een willekeurige positie in de lijst in.",
diff --git a/msg/json/oc.json b/msg/json/oc.json
index 1e505fe20..8a5e5906a 100644
--- a/msg/json/oc.json
+++ b/msg/json/oc.json
@@ -20,7 +20,6 @@
"DISABLE_BLOCK": "Desactivar lo blòt",
"ENABLE_BLOCK": "Activar lo blòt",
"HELP": "Ajuda",
- "ME": "Ieu",
"CHANGE_VALUE_TITLE": "Modificar la valor :",
"NEW_VARIABLE": "Variabla novèla…",
"NEW_VARIABLE_TITLE": "Nom de la novèla variabla :",
diff --git a/msg/json/pl.json b/msg/json/pl.json
index 3c4319840..4771add56 100644
--- a/msg/json/pl.json
+++ b/msg/json/pl.json
@@ -10,7 +10,8 @@
"Mateon1",
"Expert3222",
"Cirasean",
- "Fringoo"
+ "Fringoo",
+ "Chrumps"
]
},
"VARIABLES_DEFAULT_NAME": "element",
@@ -33,9 +34,6 @@
"HELP": "Pomoc",
"UNDO": "Cofnij",
"REDO": "Ponów",
- "CHAT": "Rozmawiaj z swoim współpracownikiem, pisząc w tym polu!",
- "AUTH": "Autoryzuj ten program, aby można było zapisać Twoją pracę i umożliwić Ci dzielenie się nią z innymi.",
- "ME": "Ja",
"CHANGE_VALUE_TITLE": "Zmień wartość:",
"NEW_VARIABLE": "Nowa zmienna...",
"NEW_VARIABLE_TITLE": "Nowa nazwa zmiennej:",
@@ -79,12 +77,12 @@
"CONTROLS_IF_TOOLTIP_3": "Jeśli pierwsza wartość jest prawdziwa, to wykonaj pierwszy blok instrukcji. W przeciwnym razie, jeśli druga wartość jest prawdziwa, to wykonaj drugi blok instrukcji.",
"CONTROLS_IF_TOOLTIP_4": "Jeśli pierwsza wartość jest prawdziwa, wykonaj pierwszy blok instrukcji. W przeciwnym razie jeśli druga wartość jest prawdziwa, wykonaj drugi blok instrukcji. Jeżeli żadna z wartości nie jest prawdziwa, wykonaj ostatni blok instrukcji.",
"CONTROLS_IF_MSG_IF": "jeśli",
- "CONTROLS_IF_MSG_ELSEIF": "w przeciwnym razie jeśli",
+ "CONTROLS_IF_MSG_ELSEIF": "w przeciwnym razie, jeśli",
"CONTROLS_IF_MSG_ELSE": "w przeciwnym razie",
"CONTROLS_IF_IF_TOOLTIP": "Dodaj, usuń lub zmień kolejność bloków, żeby zmodyfikować ten blok „jeśli”.",
"CONTROLS_IF_ELSEIF_TOOLTIP": "Dodaj warunek do bloku „jeśli”.",
"CONTROLS_IF_ELSE_TOOLTIP": "Dodaj ostatni warunek do bloku „jeśli”, gdy żaden wcześniejszy nie był spełniony.",
- "LOGIC_COMPARE_HELPURL": "https://en.wikipedia.org/wiki/Inequality_(mathematics)",
+ "LOGIC_COMPARE_HELPURL": "https://pl.wikipedia.org/wiki/Nierówność",
"LOGIC_COMPARE_TOOLTIP_EQ": "Zwróć \"prawda\", jeśli oba wejścia są sobie równe.",
"LOGIC_COMPARE_TOOLTIP_NEQ": "Zwróć \"prawda\", jeśli oba wejścia są sobie nierówne.",
"LOGIC_COMPARE_TOOLTIP_LT": "Zwróć \"prawda\" jeśli pierwsze wejście jest większe od drugiego.",
@@ -127,7 +125,7 @@
"MATH_ARITHMETIC_TOOLTIP_MULTIPLY": "Zwróć iloczyn dwóch liczb.",
"MATH_ARITHMETIC_TOOLTIP_DIVIDE": "Zwróć iloraz dwóch liczb.",
"MATH_ARITHMETIC_TOOLTIP_POWER": "Zwróć pierwszą liczbę podniesioną do potęgi o wykładniku drugiej liczby.",
- "MATH_SINGLE_HELPURL": "https://en.wikipedia.org/wiki/Square_root",
+ "MATH_SINGLE_HELPURL": "https://pl.wikipedia.org/wiki/Pierwiastek_kwadratowy",
"MATH_SINGLE_OP_ROOT": "pierwiastek kwadratowy",
"MATH_SINGLE_TOOLTIP_ROOT": "Zwróć pierwiastek kwadratowy danej liczby.",
"MATH_SINGLE_OP_ABSOLUTE": "wartość bezwzględna",
@@ -137,14 +135,14 @@
"MATH_SINGLE_TOOLTIP_LOG10": "Zwraca logarytm dziesiętny danej liczby.",
"MATH_SINGLE_TOOLTIP_EXP": "Zwróć e do potęgi danej liczby.",
"MATH_SINGLE_TOOLTIP_POW10": "Zwróć 10 do potęgi danej liczby.",
- "MATH_TRIG_HELPURL": "https://en.wikipedia.org/wiki/Trigonometric_functions",
+ "MATH_TRIG_HELPURL": "https://pl.wikipedia.org/wiki/Funkcje_trygonometryczne",
"MATH_TRIG_TOOLTIP_SIN": "Zwróć wartość sinusa o stopniu (nie w radianach).",
"MATH_TRIG_TOOLTIP_COS": "Zwróć wartość cosinusa o stopniu (nie w radianach).",
"MATH_TRIG_TOOLTIP_TAN": "Zwróć tangens o stopniu (nie w radianach).",
"MATH_TRIG_TOOLTIP_ASIN": "Zwróć arcus sinus danej liczby.",
"MATH_TRIG_TOOLTIP_ACOS": "Zwróć arcus cosinus danej liczby.",
"MATH_TRIG_TOOLTIP_ATAN": "Zwróć arcus tangens danej liczby.",
- "MATH_CONSTANT_HELPURL": "https://en.wikipedia.org/wiki/Mathematical_constant",
+ "MATH_CONSTANT_HELPURL": "https://pl.wikipedia.org/wiki/Stała_(matematyka)",
"MATH_CONSTANT_TOOLTIP": "Zwróć jedną wspólną stałą: π (3.141), e (2.718...), φ (1.618...), sqrt(2) (1.414...), sqrt(½) (0.707...) lub ∞ (nieskończoność).",
"MATH_IS_EVEN": "jest parzysta",
"MATH_IS_ODD": "jest nieparzysta",
@@ -157,7 +155,7 @@
"MATH_CHANGE_HELPURL": "https://en.wikipedia.org/wiki/Programming_idiom#Incrementing_a_counter",
"MATH_CHANGE_TITLE": "zmień %1 o %2",
"MATH_CHANGE_TOOLTIP": "Dodaj liczbę do zmiennej '%1'.",
- "MATH_ROUND_HELPURL": "https://en.wikipedia.org/wiki/Rounding",
+ "MATH_ROUND_HELPURL": "https://pl.wikipedia.org/wiki/Zaokrąglanie",
"MATH_ROUND_TOOLTIP": "Zaokrąglij w górę lub w dół.",
"MATH_ROUND_OPERATOR_ROUND": "zaokrąglij",
"MATH_ROUND_OPERATOR_ROUNDUP": "zaokrąglij w górę",
@@ -179,7 +177,7 @@
"MATH_ONLIST_TOOLTIP_STD_DEV": "Zwróć odchylenie standardowe listy.",
"MATH_ONLIST_OPERATOR_RANDOM": "losowy element z listy",
"MATH_ONLIST_TOOLTIP_RANDOM": "Zwróć losowy element z listy.",
- "MATH_MODULO_HELPURL": "https://en.wikipedia.org/wiki/Modulo_operation",
+ "MATH_MODULO_HELPURL": "https://pl.wikipedia.org/wiki/Modulo",
"MATH_MODULO_TITLE": "reszta z dzielenia %1 przez %2",
"MATH_MODULO_TOOLTIP": "Zwróć resztę z dzielenia dwóch liczb przez siebie.",
"MATH_CONSTRAIN_TITLE": "ogranicz %1 z dołu %2 z góry %3",
@@ -190,7 +188,7 @@
"MATH_RANDOM_FLOAT_HELPURL": "https://en.wikipedia.org/wiki/Random_number_generation",
"MATH_RANDOM_FLOAT_TITLE_RANDOM": "losowy ułamek",
"MATH_RANDOM_FLOAT_TOOLTIP": "Zwróć losowy ułamek między 0.0 (włącznie), a 1.0 (wyłącznie).",
- "TEXT_TEXT_HELPURL": "https://en.wikipedia.org/wiki/String_(computer_science)",
+ "TEXT_TEXT_HELPURL": "https://pl.wikipedia.org/wiki/Tekstowy_typ_danych",
"TEXT_TEXT_TOOLTIP": "Litera, wyraz lub linia tekstu.",
"TEXT_JOIN_TITLE_CREATEWITH": "utwórz tekst z",
"TEXT_JOIN_TOOLTIP": "Tworzy fragment tekstu, łącząc ze sobą dowolną liczbę tekstów.",
@@ -204,7 +202,7 @@
"TEXT_LENGTH_TOOLTIP": "Zwraca liczbę liter (łącznie ze spacjami) w podanym tekście.",
"TEXT_ISEMPTY_TITLE": "%1 jest pusty",
"TEXT_ISEMPTY_TOOLTIP": "Zwraca prawda (true), jeśli podany tekst jest pusty.",
- "TEXT_INDEXOF_TOOLTIP": "Zwraca indeks pierwszego/ostatniego wystąpienia pierwszego tekstu w drugim tekście. Zwraca wartość 0, jeśli tekst nie został znaleziony.",
+ "TEXT_INDEXOF_TOOLTIP": "Zwraca indeks pierwszego/ostatniego wystąpienia pierwszego tekstu w drugim tekście. Zwraca wartość %1, jeśli tekst nie został znaleziony.",
"TEXT_INDEXOF_INPUT_INTEXT": "w tekście",
"TEXT_INDEXOF_OPERATOR_FIRST": "znajdź pierwsze wystąpienie tekstu",
"TEXT_INDEXOF_OPERATOR_LAST": "znajdź ostatnie wystąpienie tekstu",
@@ -257,7 +255,7 @@
"LISTS_INLIST": "na liście",
"LISTS_INDEX_OF_FIRST": "znaleźć pierwsze wystąpienie elementu",
"LISTS_INDEX_OF_LAST": "znajduje ostatanie wystąpienie elementu",
- "LISTS_INDEX_OF_TOOLTIP": "Zwraca indeks pierwszego/ostatniego wystąpienia elementu na liście. Zwraca wartość 0, jeśli tekst nie zostanie znaleziony.",
+ "LISTS_INDEX_OF_TOOLTIP": "Zwraca indeks pierwszego/ostatniego wystąpienia elementu na liście. Zwraca wartość %1, jeśli tekst nie zostanie znaleziony.",
"LISTS_GET_INDEX_GET": "pobierz",
"LISTS_GET_INDEX_GET_REMOVE": "Pobierz i usuń",
"LISTS_GET_INDEX_REMOVE": "usuń",
@@ -267,31 +265,28 @@
"LISTS_GET_INDEX_LAST": "ostatni",
"LISTS_GET_INDEX_RANDOM": "losowy",
"LISTS_GET_INDEX_TAIL": "",
- "LISTS_GET_INDEX_TOOLTIP_GET_FROM_START": "Zwraca element z konkretnej pozycji na liście. #1 to pierwszy element.",
- "LISTS_GET_INDEX_TOOLTIP_GET_FROM_END": "Zwraca element z określonej pozycji na liście. #1 to ostatni element.",
+ "LISTS_INDEX_FROM_START_TOOLTIP": "%1 to pierwszy element.",
+ "LISTS_INDEX_FROM_END_TOOLTIP": "%1 to ostatni element.",
+ "LISTS_GET_INDEX_TOOLTIP_GET_FROM": "Zwraca element z konkretnej pozycji na liście.",
"LISTS_GET_INDEX_TOOLTIP_GET_FIRST": "Zwraca pierwszy element z listy.",
"LISTS_GET_INDEX_TOOLTIP_GET_LAST": "Zwraca ostatni element z listy.",
"LISTS_GET_INDEX_TOOLTIP_GET_RANDOM": "Zwraca losowy element z listy.",
- "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM_START": "Usuwa i zwraca element z określonej pozycji na liście. #1 to pierwszy element.",
- "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM_END": "Usuwa i zwraca element z określonej pozycji na liście. #1 to ostatni element.",
+ "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM": "Usuwa i zwraca element z określonej pozycji na liście.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FIRST": "Usuwa i zwraca pierwszy element z listy.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_LAST": "Usuwa i zwraca ostatni element z listy.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_RANDOM": "Usuwa i zwraca losowy element z listy.",
- "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM_START": "Usuwa element z określonej pozycji na liście. #1 to pierwszy element.",
- "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM_END": "Usuwa element z określonej pozycji na liście. #1 to ostatni element.",
+ "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM": "Usuwa element z określonej pozycji na liście.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_FIRST": "Usuwa pierwszy element z listy.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_LAST": "Usuwa ostatni element z listy.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_RANDOM": "Usuwa losowy element z listy.",
"LISTS_SET_INDEX_SET": "ustaw",
"LISTS_SET_INDEX_INSERT": "wstaw w",
"LISTS_SET_INDEX_INPUT_TO": "jako",
- "LISTS_SET_INDEX_TOOLTIP_SET_FROM_START": "Ustawia element w określonym miejscu na liście. #1 to pierwszy element.",
- "LISTS_SET_INDEX_TOOLTIP_SET_FROM_END": "Ustawia element w określonym miejscu na liście. #1 to ostatni element.",
+ "LISTS_SET_INDEX_TOOLTIP_SET_FROM": "Ustawia element w określonym miejscu na liście.",
"LISTS_SET_INDEX_TOOLTIP_SET_FIRST": "Ustawia pierwszy element na liście.",
"LISTS_SET_INDEX_TOOLTIP_SET_LAST": "Ustawia ostatni element na liście.",
"LISTS_SET_INDEX_TOOLTIP_SET_RANDOM": "Ustawia losowy element na liście.",
- "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_START": "Wstawia element w odpowiednim miejscu na liście. #1 to pierwszy element.",
- "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_END": "Wstawia element w odpowiednim miejscu na liście. #1 to ostatni element.",
+ "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM": "Wstawia element w odpowiednim miejscu na liście.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_FIRST": "Wstawia element na początku listy.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_LAST": "Dodaj element na koniec listy.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_RANDOM": "Wstawia element w losowym miejscu na liście.",
@@ -303,6 +298,14 @@
"LISTS_GET_SUBLIST_END_LAST": "do ostatniego",
"LISTS_GET_SUBLIST_TAIL": "",
"LISTS_GET_SUBLIST_TOOLTIP": "Tworzy kopię z określoną część listy.",
+ "LISTS_SORT_HELPURL": "https://github.com/google/blockly/wiki/Lists#sorting-a-list",
+ "LISTS_SORT_TITLE": "sortuj %1 %2 %3",
+ "LISTS_SORT_TOOLTIP": "Sortuj kopię listy.",
+ "LISTS_SORT_ORDER_ASCENDING": "rosnąco",
+ "LISTS_SORT_ORDER_DESCENDING": "malejąco",
+ "LISTS_SORT_TYPE_NUMERIC": "numerycznie",
+ "LISTS_SORT_TYPE_TEXT": "alfabetycznie",
+ "LISTS_SORT_TYPE_IGNORECASE": "alfabetycznie, bez uwzględniania wielkości liter",
"LISTS_SPLIT_LIST_FROM_TEXT": "stwórz listę z tekstu",
"LISTS_SPLIT_TEXT_FROM_LIST": "stwórz tekst z listy",
"LISTS_SPLIT_WITH_DELIMITER": "z separatorem",
@@ -327,9 +330,9 @@
"PROCEDURES_DEFRETURN_TOOLTIP": "Tworzy funkcję z wynikiem.",
"PROCEDURES_ALLOW_STATEMENTS": "zezwól na instrukcje",
"PROCEDURES_DEF_DUPLICATE_WARNING": "Uwaga: Ta funkcja ma powtórzone parametry.",
- "PROCEDURES_CALLNORETURN_HELPURL": "https://en.wikipedia.org/wiki/Procedure_%28computer_science%29",
+ "PROCEDURES_CALLNORETURN_HELPURL": "https://pl.wikipedia.org/wiki/Podprogram",
"PROCEDURES_CALLNORETURN_TOOLTIP": "Uruchom funkcję zdefiniowaną przez użytkownika '%1'.",
- "PROCEDURES_CALLRETURN_HELPURL": "https://en.wikipedia.org/wiki/Procedure_%28computer_science%29",
+ "PROCEDURES_CALLRETURN_HELPURL": "https://pl.wikipedia.org/wiki/Podprogram",
"PROCEDURES_CALLRETURN_TOOLTIP": "Uruchom funkcję zdefiniowaną przez użytkownika '%1' i skorzystaj z jej wyniku.",
"PROCEDURES_MUTATORCONTAINER_TITLE": "wejścia",
"PROCEDURES_MUTATORCONTAINER_TOOLTIP": "Dodaj, usuń lub zmień kolejność danych wejściowych dla tej funkcji.",
diff --git a/msg/json/pms.json b/msg/json/pms.json
index 17ed9bf6e..826589f71 100644
--- a/msg/json/pms.json
+++ b/msg/json/pms.json
@@ -24,9 +24,6 @@
"HELP": "Agiut",
"UNDO": "Anulé",
"REDO": "Fé torna",
- "CHAT": "Ch'a ciaciara con sò colaborator an scrivend an costa casela!",
- "AUTH": "Për piasì, ch'a autorisa costa aplicassion a përmëtte ëd salvé sò travaj e a autoriselo a esse partagià da chiel.",
- "ME": "Mi",
"CHANGE_VALUE_TITLE": "Modifiché ël valor:",
"NEW_VARIABLE": "Neuva variàbil...",
"NEW_VARIABLE_TITLE": "Nòm ëd la neuva variàbil:",
@@ -179,7 +176,7 @@
"TEXT_LENGTH_TOOLTIP": "A smon ël nùmer ëd litre (spassi comprèis) ant ël test fornì.",
"TEXT_ISEMPTY_TITLE": "%1 a l'é veuid",
"TEXT_ISEMPTY_TOOLTIP": "A smon ver se ël test fornì a l'é veuid.",
- "TEXT_INDEXOF_TOOLTIP": "A smon l'ìndes dla prima/ùltima ocorensa dël prim test ant ël second test. A smon 0 se ël test a l'é nen trovà.",
+ "TEXT_INDEXOF_TOOLTIP": "A smon l'ìndes dla prima/ùltima ocorensa dël prim test ant ël second test. A smon %1 se ël test a l'é nen trovà.",
"TEXT_INDEXOF_INPUT_INTEXT": "ant ël test",
"TEXT_INDEXOF_OPERATOR_FIRST": "trové la prima ocorensa dël test",
"TEXT_INDEXOF_OPERATOR_LAST": "trové l'ùltima ocorensa dël test",
@@ -229,7 +226,7 @@
"LISTS_INLIST": "ant la lista",
"LISTS_INDEX_OF_FIRST": "trové la prima ocorensa dl'element",
"LISTS_INDEX_OF_LAST": "trové l'ùltima ocorensa dl'element",
- "LISTS_INDEX_OF_TOOLTIP": "A smon l'ìndes ëd la prima/ùltima ocorensa dl'element ant la lista. A smon 0 se l'element a l'é nen trovà.",
+ "LISTS_INDEX_OF_TOOLTIP": "A smon l'ìndes ëd la prima/ùltima ocorensa dl'element ant la lista. A smon %1 se l'element a l'é nen trovà.",
"LISTS_GET_INDEX_GET": "oten-e",
"LISTS_GET_INDEX_GET_REMOVE": "oten-e e eliminé",
"LISTS_GET_INDEX_REMOVE": "eliminé",
@@ -237,31 +234,28 @@
"LISTS_GET_INDEX_FIRST": "prim",
"LISTS_GET_INDEX_LAST": "ùltim",
"LISTS_GET_INDEX_RANDOM": "a l'ancàpit",
- "LISTS_GET_INDEX_TOOLTIP_GET_FROM_START": "A smon l'element a la posission ëspessificà an na lista. #1 a l'é ël prim element.",
- "LISTS_GET_INDEX_TOOLTIP_GET_FROM_END": "A smon l'element a la posission ëspessificà an na lista. #1 a l'é l'ùltim element.",
+ "LISTS_INDEX_FROM_START_TOOLTIP": "%1 a l'é ël prim element.",
+ "LISTS_INDEX_FROM_END_TOOLTIP": "%1 a l'é l'ùltim element.",
+ "LISTS_GET_INDEX_TOOLTIP_GET_FROM": "A smon l'element a la posission ëspessificà an na lista.",
"LISTS_GET_INDEX_TOOLTIP_GET_FIRST": "A smon ël prim element an na lista.",
"LISTS_GET_INDEX_TOOLTIP_GET_LAST": "A smon l'ùltim element an na lista.",
"LISTS_GET_INDEX_TOOLTIP_GET_RANDOM": "A smon n'element a l'ancàpit an na lista.",
- "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM_START": "A gava e a smon l'element a la posission ëspessificà an na lista. #1 a l'é 'l prim element.",
- "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM_END": "A gava e a smon l'element a la posission ëspessificà an na lista. #1 a l'é l'ùltim element.",
+ "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM": "A gava e a smon l'element a la posission ëspessificà an na lista.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FIRST": "A gava e a smon ël prim element an na lista.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_LAST": "A gava e a smon l'ùltim element an na lista.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_RANDOM": "A gava e a smon n'element a l'ancàpit an na lista.",
- "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM_START": "A gava l'element a la posission ëspessificà an na lista. #1 a l'é ël prim element.",
- "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM_END": "A gava l'element a la posission ëspessificà an na lista. #1 a l'é l'ùltim element.",
+ "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM": "A gava l'element a la posission ëspessificà an na lista.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_FIRST": "A gava ël prim element an na lista.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_LAST": "A gava l'ùltim element an na lista.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_RANDOM": "A gava n'element a l'ancàpit da na lista.",
"LISTS_SET_INDEX_SET": "buté",
"LISTS_SET_INDEX_INSERT": "anserì an",
"LISTS_SET_INDEX_INPUT_TO": "tanme",
- "LISTS_SET_INDEX_TOOLTIP_SET_FROM_START": "A fissa l'element a la posission ëspessificà an na lista. #1 a l'é ël prim element.",
- "LISTS_SET_INDEX_TOOLTIP_SET_FROM_END": "A fissa l'element a la posission ëspessificà an na lista. #1 a l'é l'ùltim element.",
+ "LISTS_SET_INDEX_TOOLTIP_SET_FROM": "A fissa l'element a la posission ëspessificà an na lista.",
"LISTS_SET_INDEX_TOOLTIP_SET_FIRST": "A fissa ël prim element an na lista.",
"LISTS_SET_INDEX_TOOLTIP_SET_LAST": "A fissa l'ùltim element an na lista.",
"LISTS_SET_INDEX_TOOLTIP_SET_RANDOM": "A fissa n'element a l'ancàpit an na lista.",
- "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_START": "A anseriss l'element a la posission ëspessificà an na lista. #1 a l'é ël prim element.",
- "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_END": "A anseriss l'element a la posission ëspessificà an na lista. #1 a l'é l'ùltim element.",
+ "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM": "A anseriss l'element a la posission ëspessificà an na lista.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_FIRST": "A anseriss l'element al prinsipi ëd na lista.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_LAST": "Gionté l'element a la fin ëd na lista.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_RANDOM": "A anseriss l'element a l'ancàpit an na lista.",
diff --git a/msg/json/pt-br.json b/msg/json/pt-br.json
index 26b3c98c7..be8e8f426 100644
--- a/msg/json/pt-br.json
+++ b/msg/json/pt-br.json
@@ -37,9 +37,6 @@
"HELP": "Ajuda",
"UNDO": "Desfazer",
"REDO": "Refazer",
- "CHAT": "Converse com o seu colaborador digitando nesta caixa!",
- "AUTH": "Por favor autorize este aplicativo para permitir que o seu trabalho seja gravado e que ele seja compartilhado por você.",
- "ME": "Eu",
"CHANGE_VALUE_TITLE": "Mudar valor:",
"NEW_VARIABLE": "Nova variável...",
"NEW_VARIABLE_TITLE": "Nome da nova variável:",
@@ -192,7 +189,7 @@
"TEXT_LENGTH_TOOLTIP": "Retorna o número de letras (incluindo espaços) no texto fornecido.",
"TEXT_ISEMPTY_TITLE": "%1 é vazio",
"TEXT_ISEMPTY_TOOLTIP": "Retorna verdadeiro se o texto fornecido for vazio.",
- "TEXT_INDEXOF_TOOLTIP": "Retorna a posição da primeira/última ocorrência do primeiro texto no segundo texto. Retorna 0 se o texto não for encontrado.",
+ "TEXT_INDEXOF_TOOLTIP": "Retorna a posição da primeira/última ocorrência do primeiro texto no segundo texto. Retorna %1 se o texto não for encontrado.",
"TEXT_INDEXOF_INPUT_INTEXT": "no texto",
"TEXT_INDEXOF_OPERATOR_FIRST": "encontre a primeira ocorrência do item",
"TEXT_INDEXOF_OPERATOR_LAST": "encontre a última ocorrência do texto",
@@ -241,7 +238,7 @@
"LISTS_INLIST": "na lista",
"LISTS_INDEX_OF_FIRST": "encontre a primeira ocorrência do item",
"LISTS_INDEX_OF_LAST": "encontre a última ocorrência do item",
- "LISTS_INDEX_OF_TOOLTIP": "Retorna o índice da primeira/última ocorrência do item na lista. Retorna 0 se o item não for encontrado.",
+ "LISTS_INDEX_OF_TOOLTIP": "Retorna o índice da primeira/última ocorrência do item na lista. Retorna %1 se o item não for encontrado.",
"LISTS_GET_INDEX_GET": "obter",
"LISTS_GET_INDEX_GET_REMOVE": "obter e remover",
"LISTS_GET_INDEX_REMOVE": "remover",
@@ -250,31 +247,28 @@
"LISTS_GET_INDEX_FIRST": "primeiro",
"LISTS_GET_INDEX_LAST": "último",
"LISTS_GET_INDEX_RANDOM": "aleatório",
- "LISTS_GET_INDEX_TOOLTIP_GET_FROM_START": "Retorna o item da lista na posição especificada. #1 é o primeiro item.",
- "LISTS_GET_INDEX_TOOLTIP_GET_FROM_END": "Retorna o item da lista na posição especificada. #1 é o último item.",
+ "LISTS_INDEX_FROM_START_TOOLTIP": "%1 é o primeiro item.",
+ "LISTS_INDEX_FROM_END_TOOLTIP": "%1 é o último item.",
+ "LISTS_GET_INDEX_TOOLTIP_GET_FROM": "Retorna o item da lista na posição especificada.",
"LISTS_GET_INDEX_TOOLTIP_GET_FIRST": "Retorna o primeiro item em uma lista.",
"LISTS_GET_INDEX_TOOLTIP_GET_LAST": "Retorna o último item em uma lista.",
"LISTS_GET_INDEX_TOOLTIP_GET_RANDOM": "Retorna um item aleatório de uma lista.",
- "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM_START": "Remove e retorna o item na posição especificada em uma lista. #1 é o primeiro item.",
- "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM_END": "Remove e retorna o item na posição especificada em uma lista. #1 é o último item.",
+ "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM": "Remove e retorna o item na posição especificada em uma lista.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FIRST": "Remove e retorna o primeiro item de uma lista.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_LAST": "Remove e retorna o último item de uma lista.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_RANDOM": "Remove e retorna um item aleatório de uma lista.",
- "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM_START": "Remove o item na posição especificada em uma lista. #1 é o primeiro item.",
- "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM_END": "Remove o item na posição especificada em uma lista. #1 é o último item.",
+ "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM": "Remove o item na posição especificada em uma lista.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_FIRST": "Remove o primeiro item de uma lista.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_LAST": "Remove o último item de uma lista.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_RANDOM": "Remove um item aleatório de uma lista.",
"LISTS_SET_INDEX_SET": "definir",
"LISTS_SET_INDEX_INSERT": "inserir em",
"LISTS_SET_INDEX_INPUT_TO": "como",
- "LISTS_SET_INDEX_TOOLTIP_SET_FROM_START": "Define o item da posição especificada de uma lista. #1 é o primeiro item.",
- "LISTS_SET_INDEX_TOOLTIP_SET_FROM_END": "Define o item da posição especificada de uma lista. #1 é o último item.",
+ "LISTS_SET_INDEX_TOOLTIP_SET_FROM": "Define o item da posição especificada de uma lista.",
"LISTS_SET_INDEX_TOOLTIP_SET_FIRST": "Define o primeiro item de uma lista.",
"LISTS_SET_INDEX_TOOLTIP_SET_LAST": "Define o último item de uma lista.",
"LISTS_SET_INDEX_TOOLTIP_SET_RANDOM": "Define um item aleatório de uma lista.",
- "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_START": "Insere o item na posição especificada em uma lista. #1 é o primeiro item.",
- "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_END": "Insere o item na posição especificada em uma lista. #1 é o último item.",
+ "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM": "Insere o item na posição especificada em uma lista.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_FIRST": "Insere o item no início de uma lista.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_LAST": "Insere o item no final de uma lista.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_RANDOM": "Insere o item em uma posição qualquer de uma lista.",
diff --git a/msg/json/pt.json b/msg/json/pt.json
index 58b5d43ad..1098cf152 100644
--- a/msg/json/pt.json
+++ b/msg/json/pt.json
@@ -7,7 +7,8 @@
"아라",
"Nicola Nascimento",
"Önni",
- "Diniscoelho"
+ "Diniscoelho",
+ "Fúlvio"
]
},
"VARIABLES_DEFAULT_NAME": "item",
@@ -29,9 +30,7 @@
"ENABLE_BLOCK": "Habilitar Bloco",
"HELP": "Ajuda",
"UNDO": "Desfazer",
- "CHAT": "Converse com o seu colaborador, ao digitar nesta caixa!",
- "AUTH": "Por favor autorize esta aplicação para permitir que o seu trabalho seja gravado e que o possa partilhar.",
- "ME": "Eu",
+ "REDO": "Refazer",
"CHANGE_VALUE_TITLE": "Alterar valor:",
"NEW_VARIABLE": "Nova variável...",
"NEW_VARIABLE_TITLE": "Nome da nova variável:",
@@ -199,7 +198,7 @@
"TEXT_LENGTH_TOOLTIP": "Devolve o número de letras (incluindo espaços) do texto fornecido.",
"TEXT_ISEMPTY_TITLE": "%1 está vazio",
"TEXT_ISEMPTY_TOOLTIP": "Retorna verdadeiro se o texto fornecido estiver vazio.",
- "TEXT_INDEXOF_TOOLTIP": "Retorna a posição da primeira/última ocorrência do primeiro texto no segundo texto. Retorna 0 se o texto não for encontrado.",
+ "TEXT_INDEXOF_TOOLTIP": "Retorna a posição da primeira/última ocorrência do primeiro texto no segundo texto. Retorna %1 se o texto não for encontrado.",
"TEXT_INDEXOF_INPUT_INTEXT": "no texto",
"TEXT_INDEXOF_OPERATOR_FIRST": "primeira ocorrência do texto",
"TEXT_INDEXOF_OPERATOR_LAST": "última ocorrência do texto",
@@ -249,7 +248,7 @@
"LISTS_INLIST": "na lista",
"LISTS_INDEX_OF_FIRST": "encontre a primeira ocorrência do item",
"LISTS_INDEX_OF_LAST": "encontre a última ocorrência do item",
- "LISTS_INDEX_OF_TOOLTIP": "Retorna a posição da primeira/última ocorrência do item na lista. Retorna 0 se o item não for encontrado.",
+ "LISTS_INDEX_OF_TOOLTIP": "Retorna a posição da primeira/última ocorrência do item na lista. Retorna %1 se o item não for encontrado.",
"LISTS_GET_INDEX_GET": "obter",
"LISTS_GET_INDEX_GET_REMOVE": "obter e remover",
"LISTS_GET_INDEX_REMOVE": "remover",
@@ -258,31 +257,28 @@
"LISTS_GET_INDEX_FIRST": "primeiro",
"LISTS_GET_INDEX_LAST": "último",
"LISTS_GET_INDEX_RANDOM": "aleatório",
- "LISTS_GET_INDEX_TOOLTIP_GET_FROM_START": "Retorna o item na posição especificada da lista . #1 é o primeiro item.",
- "LISTS_GET_INDEX_TOOLTIP_GET_FROM_END": "Retorna o item da lista na posição especificada. #1 é o último item.",
+ "LISTS_INDEX_FROM_START_TOOLTIP": "%1 é o primeiro item.",
+ "LISTS_INDEX_FROM_END_TOOLTIP": "%1 é o último item.",
+ "LISTS_GET_INDEX_TOOLTIP_GET_FROM": "Retorna o item na posição especificada da lista.",
"LISTS_GET_INDEX_TOOLTIP_GET_FIRST": "Retorna o primeiro item de uma lista.",
"LISTS_GET_INDEX_TOOLTIP_GET_LAST": "Retorna o último item de uma lista.",
"LISTS_GET_INDEX_TOOLTIP_GET_RANDOM": "Retorna um item aleatório de uma lista.",
- "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM_START": "Remove e retorna o item na posição especificada de uma lista. #1 é o primeiro item.",
- "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM_END": "Remove e retorna o item na posição especificada de uma lista. #1 é o último item.",
+ "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM": "Remove e retorna o item na posição especificada de uma lista.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FIRST": "Remove e retorna o primeiro item de uma lista.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_LAST": "Remove e retorna o último item de uma lista.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_RANDOM": "Remove e retorna um item aleatório de uma lista.",
- "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM_START": "Remove o item de uma posição especifica da lista. #1 é o primeiro item.",
- "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM_END": "Remove o item na posição especificada de uma lista. #1 é o ultimo item.",
+ "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM": "Remove o item de uma posição especifica da lista.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_FIRST": "Remove o primeiro item de uma lista.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_LAST": "Remove o último item de uma lista.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_RANDOM": "Remove um item aleatório de uma lista.",
"LISTS_SET_INDEX_SET": "definir",
"LISTS_SET_INDEX_INSERT": "inserir em",
"LISTS_SET_INDEX_INPUT_TO": "como",
- "LISTS_SET_INDEX_TOOLTIP_SET_FROM_START": "Define o item na posição especificada de uma lista. #1 é o primeiro item.",
- "LISTS_SET_INDEX_TOOLTIP_SET_FROM_END": "Define o item na posição especificada de uma lista. #1 é o último item.",
+ "LISTS_SET_INDEX_TOOLTIP_SET_FROM": "Define o item na posição especificada de uma lista.",
"LISTS_SET_INDEX_TOOLTIP_SET_FIRST": "Define o primeiro item de uma lista.",
"LISTS_SET_INDEX_TOOLTIP_SET_LAST": "Define o último item de uma lista.",
"LISTS_SET_INDEX_TOOLTIP_SET_RANDOM": "Define um item aleatório de uma lista.",
- "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_START": "Insere o item numa posição especificada numa lista. #1 é o primeiro item.",
- "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_END": "Insere o item numa posição especificada de uma lista. #1 é o último item.",
+ "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM": "Insere o item numa posição especificada numa lista.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_FIRST": "Insere o item no início da lista.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_LAST": "Insere o item no final da lista.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_RANDOM": "Insere o item numa posição aleatória de uma lista.",
diff --git a/msg/json/qqq.json b/msg/json/qqq.json
index 6efcd822e..763fa60cd 100644
--- a/msg/json/qqq.json
+++ b/msg/json/qqq.json
@@ -20,9 +20,6 @@
"HELP": "context menu - Provide helpful information about the selected block.\n{{Identical|Help}}",
"UNDO": "context menu - Undo the previous action.\n{{Identical|Undo}}",
"REDO": "context menu - Undo the previous undo action.\n{{Identical|Redo}}",
- "CHAT": "collaboration instruction - Tell the user that they can talk with other users.",
- "AUTH": "authorization instruction - Ask the user to authorize this app so it can be saved and shared by them.",
- "ME": "First person singular - objective case",
"CHANGE_VALUE_TITLE": "prompt - This message is only seen in the Opera browser. With most browsers, users can edit numeric values in blocks by just clicking and typing. Opera does not allows this, so we have to open a new window and prompt users with this message to chanage a value.",
"NEW_VARIABLE": "dropdown choice - When the user clicks on a variable block, this is one of the dropdown menu choices. It is used to define a new variable. See [https://github.com/google/blockly/wiki/Variables#dropdown-menu https://github.com/google/blockly/wiki/Variables#dropdown-menu].",
"NEW_VARIABLE_TITLE": "prompt - Prompts the user to enter the name for a new variable. See [https://github.com/google/blockly/wiki/Variables#dropdown-menu https://github.com/google/blockly/wiki/Variables#dropdown-menu].",
@@ -206,7 +203,7 @@
"TEXT_ISEMPTY_TITLE": "block text - See [https://github.com/google/blockly/wiki/Text#checking-for-empty-text https://github.com/google/blockly/wiki/Text#checking-for-empty-text]. \n\nParameters:\n* %1 - the piece of text to test for emptiness",
"TEXT_ISEMPTY_TOOLTIP": "tooltip - See [https://github.com/google/blockly/wiki/Text#checking-for-empty-text https://github.com/google/blockly/wiki/Text#checking-for-empty-text].",
"TEXT_INDEXOF_HELPURL": "url - Information about finding a character in a piece of text.",
- "TEXT_INDEXOF_TOOLTIP": "tooltip - See [https://github.com/google/blockly/wiki/Text#finding-text https://github.com/google/blockly/wiki/Text#finding-text].",
+ "TEXT_INDEXOF_TOOLTIP": "tooltip - %1 will be replaced by either the number 0 or -1 depending on the indexing mode. See [https://github.com/google/blockly/wiki/Text#finding-text https://github.com/google/blockly/wiki/Text#finding-text].",
"TEXT_INDEXOF_INPUT_INTEXT": "block text - Title of blocks allowing users to find text. See [https://github.com/google/blockly/wiki/Text#finding-text https://github.com/google/blockly/wiki/Text#finding-text]. [[File:Blockly-find-text.png]].",
"TEXT_INDEXOF_OPERATOR_FIRST": "dropdown - See [https://github.com/google/blockly/wiki/Text#finding-text https://github.com/google/blockly/wiki/Text#finding-text]. [[File:Blockly-find-text.png]].",
"TEXT_INDEXOF_OPERATOR_LAST": "dropdown - See [https://github.com/google/blockly/wiki/Text#finding-text https://github.com/google/blockly/wiki/Text#finding-text]. This would replace 'find first occurrence of text' below. (For more information on how common text is factored out of dropdown menus, see [https://translatewiki.net/wiki/Translating:Blockly#Drop-Down_Menus https://translatewiki.net/wiki/Translating:Blockly#Drop-Down_Menus)].) [[File:Blockly-find-text.png]].",
@@ -270,7 +267,7 @@
"LISTS_INDEX_OF_HELPURL": "url - See [https://github.com/google/blockly/wiki/Lists#getting-items-from-a-list https://github.com/google/blockly/wiki/Lists#getting-items-from-a-list].",
"LISTS_INDEX_OF_FIRST": "dropdown - See [https://github.com/google/blockly/wiki/Lists#finding-items-in-a-list Lists#finding-items-in-a-list]. [[File:Blockly-list-find.png]]",
"LISTS_INDEX_OF_LAST": "dropdown - See [https://github.com/google/blockly/wiki/Lists#finding-items-in-a-list https://github.com/google/blockly/wiki/Lists#finding-items-in-a-list]. [[File:Blockly-list-find.png]]",
- "LISTS_INDEX_OF_TOOLTIP": "dropdown - See [https://github.com/google/blockly/wiki/Lists#finding-items-in-a-list https://github.com/google/blockly/wiki/Lists#finding-items-in-a-list]. [[File:Blockly-list-find.png]]",
+ "LISTS_INDEX_OF_TOOLTIP": "tooltip - %1 will be replaced by either the number 0 or -1 depending on the indexing mode. See [https://github.com/google/blockly/wiki/Lists#finding-items-in-a-list https://github.com/google/blockly/wiki/Lists#finding-items-in-a-list]. [[File:Blockly-list-find.png]]",
"LISTS_GET_INDEX_GET": "dropdown - Indicates that the user wishes to [https://github.com/google/blockly/wiki/Lists#getting-a-single-item get an item from a list] without removing it from the list.",
"LISTS_GET_INDEX_GET_REMOVE": "dropdown - Indicates that the user wishes to [https://github.com/google/blockly/wiki/Lists#getting-a-single-item get and remove an item from a list], as opposed to merely getting it without modifying the list.",
"LISTS_GET_INDEX_REMOVE": "dropdown - Indicates that the user wishes to [https://github.com/google/blockly/wiki/Lists#removing-an-item remove an item from a list].\n{{Identical|Remove}}",
@@ -280,18 +277,17 @@
"LISTS_GET_INDEX_LAST": "dropdown - Indicates that the '''last''' item should be [https://github.com/google/blockly/wiki/Lists#getting-a-single-item accessed in a list]. [[File:Blockly-list-get-item.png]]",
"LISTS_GET_INDEX_RANDOM": "dropdown - Indicates that a '''random''' item should be [https://github.com/google/blockly/wiki/Lists#getting-a-single-item accessed in a list]. [[File:Blockly-list-get-item.png]]",
"LISTS_GET_INDEX_TAIL": "block text - Text that should go after the rightmost block/dropdown when [https://github.com/google/blockly/wiki/Lists#getting-a-single-item accessing an item from a list]. In most languages, this will be the empty string. [[File:Blockly-list-get-item.png]]",
- "LISTS_GET_INDEX_TOOLTIP_GET_FROM_START": "tooltip - See [https://github.com/google/blockly/wiki/Lists#getting-a-single-item https://github.com/google/blockly/wiki/Lists#getting-a-single-item] for more information.",
- "LISTS_GET_INDEX_TOOLTIP_GET_FROM_END": "tooltip - See [https://github.com/google/blockly/wiki/Lists#getting-a-single-item https://github.com/google/blockly/wiki/Lists#getting-a-single-item] for more information.",
+ "LISTS_INDEX_FROM_START_TOOLTIP": "tooltip - Indicates the ordinal number that the first item in a list is referenced by. %1 will be replaced by either '#0' or '#1' depending on the indexing mode.",
+ "LISTS_INDEX_FROM_END_TOOLTIP": "tooltip - Indicates the ordinal number that the last item in a list is referenced by. %1 will be replaced by either '#0' or '#1' depending on the indexing mode.",
+ "LISTS_GET_INDEX_TOOLTIP_GET_FROM": "tooltip - See [https://github.com/google/blockly/wiki/Lists#getting-a-single-item https://github.com/google/blockly/wiki/Lists#getting-a-single-item] for more information.",
"LISTS_GET_INDEX_TOOLTIP_GET_FIRST": "tooltip - See [https://github.com/google/blockly/wiki/Lists#getting-a-single-item https://github.com/google/blockly/wiki/Lists#getting-a-single-item] for more information.",
"LISTS_GET_INDEX_TOOLTIP_GET_LAST": "tooltip - See [https://github.com/google/blockly/wiki/Lists#getting-a-single-item https://github.com/google/blockly/wiki/Lists#getting-a-single-item] for more information.",
"LISTS_GET_INDEX_TOOLTIP_GET_RANDOM": "tooltip - See [https://github.com/google/blockly/wiki/Lists#getting-a-single-item https://github.com/google/blockly/wiki/Lists#getting-a-single-item] for more information.",
- "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM_START": "tooltip - See [https://github.com/google/blockly/wiki/Lists#getting-and-removing-an-item] (for remove and return) and [https://github.com/google/blockly/wiki/Lists#getting-a-single-item] for '# from start'.",
- "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM_END": "tooltip - See [https://github.com/google/blockly/wiki/Lists#getting-and-removing-an-item] (for remove and return) and [https://github.com/google/blockly/wiki/Lists#getting-a-single-item] for '# from end'.",
+ "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM": "tooltip - See [https://github.com/google/blockly/wiki/Lists#getting-and-removing-an-item] (for remove and return) and [https://github.com/google/blockly/wiki/Lists#getting-a-single-item] for '#' or '# from end'.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FIRST": "tooltip - See [https://github.com/google/blockly/wiki/Lists#getting-and-removing-an-item] (for remove and return) and [https://github.com/google/blockly/wiki/Lists#getting-a-single-item] for 'first'.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_LAST": "tooltip - See [https://github.com/google/blockly/wiki/Lists#getting-and-removing-an-item] (for remove and return) and [https://github.com/google/blockly/wiki/Lists#getting-a-single-item] for 'last'.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_RANDOM": "tooltip - See [https://github.com/google/blockly/wiki/Lists#getting-and-removing-an-item] (for remove and return) and [https://github.com/google/blockly/wiki/Lists#getting-a-single-item] for 'random'.",
- "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM_START": "tooltip - See [https://github.com/google/blockly/wiki/Lists#getting-and-removing-an-item] (for remove and return) and [https://github.com/google/blockly/wiki/Lists#getting-a-single-item] for '# from start'.",
- "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM_END": "tooltip - See [https://github.com/google/blockly/wiki/Lists#getting-and-removing-an-item] (for remove and return) and [https://github.com/google/blockly/wiki/Lists#getting-a-single-item] for '# from end'.",
+ "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM": "tooltip - See [https://github.com/google/blockly/wiki/Lists#getting-and-removing-an-item] (for remove and return) and [https://github.com/google/blockly/wiki/Lists#getting-a-single-item] for '#' or '# from end'.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_FIRST": "tooltip - See [https://github.com/google/blockly/wiki/Lists#getting-and-removing-an-item] (for remove and return) and [https://github.com/google/blockly/wiki/Lists#getting-a-single-item] for 'first'.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_LAST": "tooltip - See [https://github.com/google/blockly/wiki/Lists#getting-and-removing-an-item] (for remove and return) and [https://github.com/google/blockly/wiki/Lists#getting-a-single-item] for 'last'.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_RANDOM": "tooltip - See [https://github.com/google/blockly/wiki/Lists#getting-and-removing-an-item] (for remove and return) and [https://github.com/google/blockly/wiki/Lists#getting-a-single-item] for 'random'.",
@@ -299,13 +295,11 @@
"LISTS_SET_INDEX_SET": "block text - [https://github.com/google/blockly/wiki/Lists#in-list--set Replaces an item in a list]. [[File:Blockly-in-list-set-insert.png]]",
"LISTS_SET_INDEX_INSERT": "block text - [https://github.com/google/blockly/wiki/Lists#in-list--insert-at Inserts an item into a list]. [[File:Blockly-in-list-set-insert.png]]",
"LISTS_SET_INDEX_INPUT_TO": "block text - The word(s) after the position in the list and before the item to be set/inserted. [[File:Blockly-in-list-set-insert.png]]",
- "LISTS_SET_INDEX_TOOLTIP_SET_FROM_START": "tooltip - See [https://github.com/google/blockly/wiki/Lists#getting-a-single-item} (even though the page describes the 'get' block, the idea is the same for the 'set' block).",
- "LISTS_SET_INDEX_TOOLTIP_SET_FROM_END": "tooltip - See [https://github.com/google/blockly/wiki/Lists#getting-a-single-item} (even though the page describes the 'get' block, the idea is the same for the 'set' block).",
+ "LISTS_SET_INDEX_TOOLTIP_SET_FROM": "tooltip - See [https://github.com/google/blockly/wiki/Lists#getting-a-single-item} (even though the page describes the 'get' block, the idea is the same for the 'set' block).",
"LISTS_SET_INDEX_TOOLTIP_SET_FIRST": "tooltip - See [https://github.com/google/blockly/wiki/Lists#getting-a-single-item} (even though the page describes the 'get' block, the idea is the same for the 'set' block).",
"LISTS_SET_INDEX_TOOLTIP_SET_LAST": "tooltip - See [https://github.com/google/blockly/wiki/Lists#getting-a-single-item} (even though the page describes the 'get' block, the idea is the same for the 'set' block).",
"LISTS_SET_INDEX_TOOLTIP_SET_RANDOM": "tooltip - See [https://github.com/google/blockly/wiki/Lists#getting-a-single-item} (even though the page describes the 'get' block, the idea is the same for the 'set' block).",
- "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_START": "tooltip - See [https://github.com/google/blockly/wiki/Lists#getting-a-single-item} (even though the page describes the 'get' block, the idea is the same for the 'insert' block).",
- "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_END": "tooltip - See [https://github.com/google/blockly/wiki/Lists#getting-a-single-item} (even though the page describes the 'get' block, the idea is the same for the 'insert' block).",
+ "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM": "tooltip - See [https://github.com/google/blockly/wiki/Lists#getting-a-single-item} (even though the page describes the 'get' block, the idea is the same for the 'insert' block).",
"LISTS_SET_INDEX_TOOLTIP_INSERT_FIRST": "tooltip - See [https://github.com/google/blockly/wiki/Lists#getting-a-single-item} (even though the page describes the 'get' block, the idea is the same for the 'insert' block).",
"LISTS_SET_INDEX_TOOLTIP_INSERT_LAST": "tooltip - See [https://github.com/google/blockly/wiki/Lists#getting-a-single-item} (even though the page describes the 'get' block, the idea is the same for the 'insert' block).",
"LISTS_SET_INDEX_TOOLTIP_INSERT_RANDOM": "tooltip - See [https://github.com/google/blockly/wiki/Lists#getting-a-single-item} (even though the page describes the 'get' block, the idea is the same for the 'insert' block).",
diff --git a/msg/json/ro.json b/msg/json/ro.json
index b3ad25bdb..42171d7ff 100644
--- a/msg/json/ro.json
+++ b/msg/json/ro.json
@@ -24,9 +24,6 @@
"DISABLE_BLOCK": "Dezactivaţi bloc",
"ENABLE_BLOCK": "Permite bloc",
"HELP": "Ajutor",
- "CHAT": "Discută cu colaboratorul tău tastând în cadrul acestei zone!",
- "AUTH": "Va rugăm să autorizați această aplicație să permită salvarea activității dumneavoastră și să permită distribuirea acesteia de către dumneavoastră.",
- "ME": "Eu",
"CHANGE_VALUE_TITLE": "Schimbaţi valoarea:",
"NEW_VARIABLE": "Variabilă nouă...",
"NEW_VARIABLE_TITLE": "Noul nume de variabilă:",
@@ -194,7 +191,7 @@
"TEXT_LENGTH_TOOLTIP": "Returnează numărul de litere (inclusiv spaţiile) în textul furnizat.",
"TEXT_ISEMPTY_TITLE": "%1 este gol",
"TEXT_ISEMPTY_TOOLTIP": "Returnează adevărat dacă textul furnizat este gol.",
- "TEXT_INDEXOF_TOOLTIP": "Returnează indicele primei/ultimei apariţii din primul text în al doilea text. Returnează 0 dacă textul nu este găsit.",
+ "TEXT_INDEXOF_TOOLTIP": "Returnează indicele primei/ultimei apariţii din primul text în al doilea text. Returnează %1 dacă textul nu este găsit.",
"TEXT_INDEXOF_INPUT_INTEXT": "în text",
"TEXT_INDEXOF_OPERATOR_FIRST": "găseşte prima apariţie a textului",
"TEXT_INDEXOF_OPERATOR_LAST": "găseşte ultima apariţie a textului",
@@ -244,7 +241,7 @@
"LISTS_INLIST": "în listă",
"LISTS_INDEX_OF_FIRST": "Găseşte prima apariţie a elementului",
"LISTS_INDEX_OF_LAST": "găseşte ultima apariţie a elementului",
- "LISTS_INDEX_OF_TOOLTIP": "Revine la indexul de la prima/ultima apariție a elementului din listă. Returnează 0 dacă elementul nu este găsit.",
+ "LISTS_INDEX_OF_TOOLTIP": "Revine la indexul de la prima/ultima apariție a elementului din listă. Returnează %1 dacă elementul nu este găsit.",
"LISTS_GET_INDEX_GET": "obţine",
"LISTS_GET_INDEX_GET_REMOVE": "obţine şi elimină",
"LISTS_GET_INDEX_REMOVE": "elimină",
@@ -253,31 +250,28 @@
"LISTS_GET_INDEX_FIRST": "primul",
"LISTS_GET_INDEX_LAST": "ultimul",
"LISTS_GET_INDEX_RANDOM": "aleator",
- "LISTS_GET_INDEX_TOOLTIP_GET_FROM_START": "Returneaza elementul la poziţia specificată într-o listă. #1 este primul element.",
- "LISTS_GET_INDEX_TOOLTIP_GET_FROM_END": "Returneaza elementul la poziţia specificată într-o listă. #1 este ultimul element.",
+ "LISTS_INDEX_FROM_START_TOOLTIP": "%1 este primul element.",
+ "LISTS_INDEX_FROM_END_TOOLTIP": "%1 este ultimul element.",
+ "LISTS_GET_INDEX_TOOLTIP_GET_FROM": "Returneaza elementul la poziţia specificată într-o listă.",
"LISTS_GET_INDEX_TOOLTIP_GET_FIRST": "Returnează primul element dintr-o listă.",
"LISTS_GET_INDEX_TOOLTIP_GET_LAST": "Returnează ultimul element într-o listă.",
"LISTS_GET_INDEX_TOOLTIP_GET_RANDOM": "Returneaza un element aleatoriu într-o listă.",
- "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM_START": "Elimină şi returneaza elementul la poziţia specificată într-o listă. #1 este primul element.",
- "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM_END": "Elimină şi returneaza elementul la poziţia specificată într-o listă. #1 este ultimul element.",
+ "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM": "Elimină şi returneaza elementul la poziţia specificată într-o listă.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FIRST": "Elimină şi returnează primul element într-o listă.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_LAST": "Elimină şi returnează ultimul element într-o listă.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_RANDOM": "Elimină şi returnează un element aleatoriu într-o listă.",
- "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM_START": "Elimină elementul la poziţia specificată într-o listă. #1 este primul element.",
- "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM_END": "Elimină elementul la poziţia specificată într-o listă. #1 este ultimul element.",
+ "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM": "Elimină elementul la poziţia specificată într-o listă.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_FIRST": "Elimină primul element într-o listă.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_LAST": "Elimină ultimul element într-o listă.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_RANDOM": "Elimină un element aleatoriu într-o listă.",
"LISTS_SET_INDEX_SET": "seteaza",
"LISTS_SET_INDEX_INSERT": "introduceţi la",
"LISTS_SET_INDEX_INPUT_TO": "ca",
- "LISTS_SET_INDEX_TOOLTIP_SET_FROM_START": "Setează elementul la poziţia specificată într-o listă. #1 este primul element.",
- "LISTS_SET_INDEX_TOOLTIP_SET_FROM_END": "Setează elementul la poziţia specificată într-o listă. #1 este ultimul element.",
+ "LISTS_SET_INDEX_TOOLTIP_SET_FROM": "Setează elementul la poziţia specificată într-o listă.",
"LISTS_SET_INDEX_TOOLTIP_SET_FIRST": "Setează primul element într-o listă.",
"LISTS_SET_INDEX_TOOLTIP_SET_LAST": "Setează ultimul element într-o listă.",
"LISTS_SET_INDEX_TOOLTIP_SET_RANDOM": "Setează un element aleator într-o listă.",
- "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_START": "Inserează elementul la poziţia specificată într-o listă. #1 este primul element.",
- "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_END": "Inserează elementul la poziţia specificată într-o listă. #1 este ultimul element.",
+ "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM": "Inserează elementul la poziţia specificată într-o listă.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_FIRST": "Inserează elementul la începutul unei liste.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_LAST": "Adăugă elementul la sfârşitul unei liste.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_RANDOM": "Inserează elementul aleatoriu într-o listă.",
diff --git a/msg/json/ru.json b/msg/json/ru.json
index 0fe1eab96..c1341e9b6 100644
--- a/msg/json/ru.json
+++ b/msg/json/ru.json
@@ -4,7 +4,8 @@
"Espertus",
"MS",
"Okras",
- "RedFox"
+ "RedFox",
+ "Mailman"
]
},
"VARIABLES_DEFAULT_NAME": "элемент",
@@ -27,9 +28,6 @@
"HELP": "Справка",
"UNDO": "Отменить",
"REDO": "Повторить",
- "CHAT": "Общайтесь со своим коллегой, печатая в этом поле!",
- "AUTH": "Пожалуйста, авторизуйте это приложение, чтоб можно было сохранять вашу работу и чтобы дать возможность вам делиться ей.",
- "ME": "Мне",
"CHANGE_VALUE_TITLE": "Измените значение:",
"NEW_VARIABLE": "Новая переменная…",
"NEW_VARIABLE_TITLE": "Имя новой переменной:",
@@ -76,10 +74,10 @@
"CONTROLS_IF_IF_TOOLTIP": "Добавьте, удалите, переставьте фрагменты для переделки блока \"если\".",
"CONTROLS_IF_ELSEIF_TOOLTIP": "Добавляет условие к блоку \"если\"",
"CONTROLS_IF_ELSE_TOOLTIP": "Добавить заключительный подблок для случая, когда все условия ложны.",
- "LOGIC_COMPARE_HELPURL": "https://ru.wikipedia.org/wiki/%D0%9D%D0%B5%D1%80%D0%B0%D0%B2%D0%B5%D0%BD%D1%81%D1%82%D0%B2%D0%BE",
- "LOGIC_COMPARE_TOOLTIP_EQ": "Возвращает значение истина, если вставки равны.",
- "LOGIC_COMPARE_TOOLTIP_NEQ": "Возвращает значение истина, если вставки не равны.",
- "LOGIC_COMPARE_TOOLTIP_LT": "Возвращает значение истина, если первая вставка меньше второй.",
+ "LOGIC_COMPARE_HELPURL": "https://ru.wikipedia.org/wiki/Неравенство",
+ "LOGIC_COMPARE_TOOLTIP_EQ": "Возвращает положительное значение, если вводы равны.",
+ "LOGIC_COMPARE_TOOLTIP_NEQ": "Возвращает положительное значение, если вводы не равны.",
+ "LOGIC_COMPARE_TOOLTIP_LT": "Возвращает положительное значение, если первый ввод меньше второго.",
"LOGIC_COMPARE_TOOLTIP_LTE": "Возвращает значение истина, если первая вставка меньше или равна второй.",
"LOGIC_COMPARE_TOOLTIP_GT": "Возвращает значение истина, если первая вставка больше второй.",
"LOGIC_COMPARE_TOOLTIP_GTE": "Возвращает значение истина, если первая вставка больше или равна второй.",
@@ -184,7 +182,7 @@
"TEXT_LENGTH_TOOLTIP": "Возвращает число символов (включая пробелы) в заданном тексте.",
"TEXT_ISEMPTY_TITLE": "%1 пуст",
"TEXT_ISEMPTY_TOOLTIP": "Возвращает значение истина, если предоставленный текст пуст.",
- "TEXT_INDEXOF_TOOLTIP": "Возвращает номер позиции первого/последнего вхождения первого текста во втором. Возвращает 0, если текст не найден.",
+ "TEXT_INDEXOF_TOOLTIP": "Возвращает номер позиции первого/последнего вхождения первого текста во втором. Возвращает %1, если текст не найден.",
"TEXT_INDEXOF_INPUT_INTEXT": "в тексте",
"TEXT_INDEXOF_OPERATOR_FIRST": "найти первое вхождение текста",
"TEXT_INDEXOF_OPERATOR_LAST": "найти последнее вхождение текста",
@@ -234,7 +232,7 @@
"LISTS_INLIST": "в списке",
"LISTS_INDEX_OF_FIRST": "найти первое вхождение элемента",
"LISTS_INDEX_OF_LAST": "найти последнее вхождение элемента",
- "LISTS_INDEX_OF_TOOLTIP": "Возвращает номер позиции первого/последнего вхождения элемента в списке. Возвращает 0, если элемент не найден.",
+ "LISTS_INDEX_OF_TOOLTIP": "Возвращает номер позиции первого/последнего вхождения элемента в списке. Возвращает %1, если элемент не найден.",
"LISTS_GET_INDEX_GET": "взять",
"LISTS_GET_INDEX_GET_REMOVE": "взять и удалить",
"LISTS_GET_INDEX_REMOVE": "удалить",
@@ -242,31 +240,28 @@
"LISTS_GET_INDEX_FIRST": "первый",
"LISTS_GET_INDEX_LAST": "последний",
"LISTS_GET_INDEX_RANDOM": "произвольный",
- "LISTS_GET_INDEX_TOOLTIP_GET_FROM_START": "Возвращает элемент в указанной позиции списка (№1 - первый элемент).",
- "LISTS_GET_INDEX_TOOLTIP_GET_FROM_END": "Возвращает элемент в указанной позиции списка (№1 - последний элемент).",
+ "LISTS_INDEX_FROM_START_TOOLTIP": "%1 - первый элемент.",
+ "LISTS_INDEX_FROM_END_TOOLTIP": "%1 - последний элемент.",
+ "LISTS_GET_INDEX_TOOLTIP_GET_FROM": "Возвращает элемент в указанной позиции списка.",
"LISTS_GET_INDEX_TOOLTIP_GET_FIRST": "Возвращает первый элемент списка.",
"LISTS_GET_INDEX_TOOLTIP_GET_LAST": "Возвращает последний элемент списка.",
"LISTS_GET_INDEX_TOOLTIP_GET_RANDOM": "Возвращает случайный элемент списка.",
- "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM_START": "Удаляет и возвращает элемент в указанной позиции списка (№1 - первый элемент).",
- "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM_END": "Удаляет и возвращает элемент в указанной позиции списка (№1 - последний элемент).",
+ "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM": "Удаляет и возвращает элемент в указанной позиции списка.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FIRST": "Удаляет и возвращает первый элемент списка.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_LAST": "Удаляет и возвращает последний элемент списка.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_RANDOM": "Удаляет и возвращает случайный элемент списка.",
- "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM_START": "Удаляет элемент в указанной позиции списка (№1 - первый элемент).",
- "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM_END": "Удаляет элемент в указанной позиции списка (№1 - последний элемент).",
+ "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM": "Удаляет элемент в указанной позиции списка.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_FIRST": "Удаляет первый элемент списка.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_LAST": "Удаляет последний элемент списка.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_RANDOM": "Удаляет случайный элемент списка.",
"LISTS_SET_INDEX_SET": "присвоить",
"LISTS_SET_INDEX_INSERT": "вставить в",
"LISTS_SET_INDEX_INPUT_TO": "=",
- "LISTS_SET_INDEX_TOOLTIP_SET_FROM_START": "Присваивает значение элементу в указанной позиции списка (№1 - первый элемент).",
- "LISTS_SET_INDEX_TOOLTIP_SET_FROM_END": "Присваивает значение элементу в указанной позиции списка (№1 - последний элемент).",
+ "LISTS_SET_INDEX_TOOLTIP_SET_FROM": "Присваивает значение элементу в указанной позиции списка.",
"LISTS_SET_INDEX_TOOLTIP_SET_FIRST": "Присваивает значение первому элементу списка.",
"LISTS_SET_INDEX_TOOLTIP_SET_LAST": "Присваивает значение последнему элементу списка.",
"LISTS_SET_INDEX_TOOLTIP_SET_RANDOM": "Присваивает значение случайному элементу списка.",
- "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_START": "Вставляет элемент в указанной позиции списка (№1 - первый элемент).",
- "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_END": "Вставляет элемент в указанной позиции списка (№1 - последний элемент).",
+ "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM": "Вставляет элемент в указанной позиции списка.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_FIRST": "Вставляет элемент в начало списка.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_LAST": "Добавляет элемент в конец списка.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_RANDOM": "Вставляет элемент в случайное место в списке.",
diff --git a/msg/json/sc.json b/msg/json/sc.json
index ea088b0f2..d70b43a0c 100644
--- a/msg/json/sc.json
+++ b/msg/json/sc.json
@@ -24,9 +24,6 @@
"DISABLE_BLOCK": "Disabìlita Blocu",
"ENABLE_BLOCK": "Abìlita Blocu",
"HELP": "Agiudu",
- "CHAT": "Faedda cun su cumpàngiu tuo iscriende inoghe!",
- "AUTH": "Permiti a custa app de sarvare su traballu tuo e de ti lu fàghere cumpartzire.",
- "ME": "Deo",
"CHANGE_VALUE_TITLE": "Muda valori:",
"NEW_VARIABLE": "Variabili noa...",
"NEW_VARIABLE_TITLE": "Nòmini de sa variabili noa:",
@@ -179,7 +176,7 @@
"TEXT_LENGTH_TOOLTIP": "Torrat su numeru de lìteras (cun is spàtzius) in su testu giau.",
"TEXT_ISEMPTY_TITLE": "%1 est buidu",
"TEXT_ISEMPTY_TOOLTIP": "Torrat berus si su testu giau est buidu.",
- "TEXT_INDEXOF_TOOLTIP": "Torrat s'indixi de sa primu/urtima ocasioni de su primu testu in su segundu testu. Torrat 0 si su testu no ddu agatat.",
+ "TEXT_INDEXOF_TOOLTIP": "Torrat s'indixi de sa primu/urtima ocasioni de su primu testu in su segundu testu. Torrat %1 si su testu no ddu agatat.",
"TEXT_INDEXOF_INPUT_INTEXT": "in su testu",
"TEXT_INDEXOF_OPERATOR_FIRST": "circa prima ocasioni de su testu",
"TEXT_INDEXOF_OPERATOR_LAST": "circa urtima ocasioni de su testu",
@@ -228,7 +225,7 @@
"LISTS_INLIST": "in lista",
"LISTS_INDEX_OF_FIRST": "circa prima ocasioni de s'item",
"LISTS_INDEX_OF_LAST": "circa urtima ocasioni de s'item",
- "LISTS_INDEX_OF_TOOLTIP": "Torrat s'indixi de sa primu/urtima ocasioni de s'item in sa lista. Torrat 0 si s'item non s'agatat.",
+ "LISTS_INDEX_OF_TOOLTIP": "Torrat s'indixi de sa primu/urtima ocasioni de s'item in sa lista. Torrat %1 si s'item non s'agatat.",
"LISTS_GET_INDEX_GET": "piga",
"LISTS_GET_INDEX_GET_REMOVE": "piga e fùlia",
"LISTS_GET_INDEX_REMOVE": "fùlia",
@@ -236,31 +233,28 @@
"LISTS_GET_INDEX_FIRST": "primu",
"LISTS_GET_INDEX_LAST": "urtimu",
"LISTS_GET_INDEX_RANDOM": "a brìtiu (random)",
- "LISTS_GET_INDEX_TOOLTIP_GET_FROM_START": "Torrat s'elementu de su postu inditau de una lista. #1 est po su primu elementu.",
- "LISTS_GET_INDEX_TOOLTIP_GET_FROM_END": "Torrat s'elementu de su postu inditau de una lista. Postu #1 est po s'urtimu elementu.",
+ "LISTS_INDEX_FROM_START_TOOLTIP": "%1 est po su primu elementu.",
+ "LISTS_INDEX_FROM_END_TOOLTIP": "%1 est po s'urtimu elementu.",
+ "LISTS_GET_INDEX_TOOLTIP_GET_FROM": "Torrat s'elementu de su postu inditau de una lista.",
"LISTS_GET_INDEX_TOOLTIP_GET_FIRST": "Torrat su primu elementu de una lista.",
"LISTS_GET_INDEX_TOOLTIP_GET_LAST": "Torrat s'urtimu elementu de una lista.",
"LISTS_GET_INDEX_TOOLTIP_GET_RANDOM": "Torrat un'elementu a brìtiu de una lista.",
- "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM_START": "Fùliat e torrat s'elementu de su postu inditau de una lista. #1 est po su primu elementu.",
- "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM_END": "Fùliat e torrat s'elementu de su postu inditau de una lista. #1 est po s'urtimu elementu.",
+ "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM": "Fùliat e torrat s'elementu de su postu inditau de una lista.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FIRST": "Fùliat e torrat su primu elementu de una lista.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_LAST": "Fùliat e torrat s'urtimu elementu de una lista.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_RANDOM": "Fùliat e torrat un'elementu a brìtiu de una lista.",
- "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM_START": "Fùliat s'elementu de su postu inditau de una lista. #1 est po su primu elementu.",
- "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM_END": "Fùliat s'elementu de su postu inditau de una lista. #1 est po s'urtimu elementu.",
+ "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM": "Fùliat s'elementu de su postu inditau de una lista.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_FIRST": "Fùliat su primu elementu de una lista.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_LAST": "Fùliat s'urtimu elementu de una lista.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_RANDOM": "Fùliat unu elementu a brìtiu de una lista.",
"LISTS_SET_INDEX_SET": "imposta",
"LISTS_SET_INDEX_INSERT": "inserta a",
"LISTS_SET_INDEX_INPUT_TO": "a",
- "LISTS_SET_INDEX_TOOLTIP_SET_FROM_START": "Impostat s'elementu in su postu inditau de una lista. Postu 1 est po su primu elementu.",
- "LISTS_SET_INDEX_TOOLTIP_SET_FROM_END": "Impostat s'elementu in su postu inditau de una lista. Postu #1 est po s'urtimu elementu.",
+ "LISTS_SET_INDEX_TOOLTIP_SET_FROM": "Impostat s'elementu in su postu inditau de una lista.",
"LISTS_SET_INDEX_TOOLTIP_SET_FIRST": "Impostat su primu elementu in una lista.",
"LISTS_SET_INDEX_TOOLTIP_SET_LAST": "Impostat s'urtimu elementu in una lista.",
"LISTS_SET_INDEX_TOOLTIP_SET_RANDOM": "Impostat unu elementu random in una lista.",
- "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_START": "Insertat s'elementu in su postu inditau in una lista. Postu #1 est po su primu elementu.",
- "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_END": "Insertat s'elementu in su postu inditau de una lista. Postu #1 est po s'urtimu elementu.",
+ "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM": "Insertat s'elementu in su postu inditau in una lista.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_FIRST": "Insertat s'elementu a su cumintzu de sa lista.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_LAST": "Aciungit s'elementu a sa fini de sa lista.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_RANDOM": "Aciungit s'elementu a brítiu in sa lista.",
diff --git a/msg/json/sd.json b/msg/json/sd.json
index 87d7f520d..9263ada28 100644
--- a/msg/json/sd.json
+++ b/msg/json/sd.json
@@ -21,8 +21,6 @@
"DISABLE_BLOCK": "بلاڪ کي غيرفعال بڻايو",
"ENABLE_BLOCK": "بلاڪ کي فعال بڻايو",
"HELP": "مدد",
- "CHAT": "هن دٻيءَ ۾ ٽائيپ ڪري پنهنجي ساٿاريءَ سان ڳالهايو",
- "ME": "آئون",
"CHANGE_VALUE_TITLE": "قدر بدلايو",
"NEW_VARIABLE": "نئون ڦرڻو",
"NEW_VARIABLE_TITLE": "ڦرڻي جو نئون نالو:",
diff --git a/msg/json/shn.json b/msg/json/shn.json
index 9fa21e1f3..0f747e58a 100644
--- a/msg/json/shn.json
+++ b/msg/json/shn.json
@@ -20,9 +20,6 @@
"DISABLE_BLOCK": "ဢမ်ႇၸၢင်ႈပလွၵ်ႉ",
"ENABLE_BLOCK": "ၵမ်ႉထႅမ်ပၼ် ပလွၵ်ႉ",
"HELP": "ၸွႆႈထႅမ်",
- "CHAT": "ပေႃႉလိၵ်ႈ ၼႂ်းလွၵ်းၼႆႉသေ ၶျၢတ်ႉၸူး ၵေႃႉႁူမ်ႈႁဵတ်းႁူမ်ႈသၢင်ႈ ၸဝ်ႈၵဝ်ႇ",
- "AUTH": "ၶွပ်ႈၸႂ် ပၼ်ၶႂၢင်ႉႁပ်ႉဢဝ် ဢႅပ်ႉၼႆႉ တီႈၼႂ်းၵၢၼ်ၸဝ်ႈၵဝ်ႇသေယဝ်ႉ ၸဝ်ႈၵဝ်ႇ ႁႂ်ႈလႆႈသိမ်း ႁႂ်ႈလႆႈပိုၼ်ပၼ်သေၵမ်း",
- "ME": "ၸဝ်ႈၵဝ်ႇ",
"CHANGE_VALUE_TITLE": "လႅၵ်ႈလၢႆႈၼမ်ႉၵတ်ႉ",
"NEW_VARIABLE": "လၢႆႈဢၼ်မႂ်ႇ",
"NEW_VARIABLE_TITLE": "ၸိုဝ်ႈဢၼ်လၢႆႈမႂ်ႇ",
diff --git a/msg/json/sk.json b/msg/json/sk.json
index 8ddb2604f..19efa0e38 100644
--- a/msg/json/sk.json
+++ b/msg/json/sk.json
@@ -24,9 +24,6 @@
"DISABLE_BLOCK": "Vypnúť blok",
"ENABLE_BLOCK": "Povoliť blok",
"HELP": "Pomoc",
- "CHAT": "Písaním do tohto políčka komunikujte so spolupracovníkmi!",
- "AUTH": "Autorizujte prosím túto aplikáciu, aby ste mohli uložiť a zdieľať vašu prácu.",
- "ME": "Ja",
"CHANGE_VALUE_TITLE": "Zmeniť hodnotu:",
"NEW_VARIABLE": "Nová premenná...",
"NEW_VARIABLE_TITLE": "Názov novej premennej:",
@@ -182,7 +179,7 @@
"TEXT_LENGTH_TOOLTIP": "Vráti počet písmen (s medzerami) v zadanom texte.",
"TEXT_ISEMPTY_TITLE": "%1 je prázdny",
"TEXT_ISEMPTY_TOOLTIP": "Vráti hodnotu pravda, ak zadaný text je prázdny.",
- "TEXT_INDEXOF_TOOLTIP": "Vráti index prvého/posledného výskytu prvého textu v druhom texte. Ak nenájde, vráti 0.",
+ "TEXT_INDEXOF_TOOLTIP": "Vráti index prvého/posledného výskytu prvého textu v druhom texte. Ak nenájde, vráti %1.",
"TEXT_INDEXOF_INPUT_INTEXT": "v texte",
"TEXT_INDEXOF_OPERATOR_FIRST": "nájdi prvý výskyt textu",
"TEXT_INDEXOF_OPERATOR_LAST": "nájdi posledný výskyt textu",
@@ -232,7 +229,7 @@
"LISTS_INLIST": "v zozname",
"LISTS_INDEX_OF_FIRST": "nájdi prvý výskyt prvku",
"LISTS_INDEX_OF_LAST": "nájdi posledný výskyt prvku",
- "LISTS_INDEX_OF_TOOLTIP": "Vráti index prvého/posledného výskytu prvku v zozname. Ak sa nič nenašlo, vráti 0.",
+ "LISTS_INDEX_OF_TOOLTIP": "Vráti index prvého/posledného výskytu prvku v zozname. Ak sa nič nenašlo, vráti %1.",
"LISTS_GET_INDEX_GET": "zisti",
"LISTS_GET_INDEX_GET_REMOVE": "zisti a odstráň",
"LISTS_GET_INDEX_REMOVE": "odstráň",
@@ -240,31 +237,28 @@
"LISTS_GET_INDEX_FIRST": "prvý",
"LISTS_GET_INDEX_LAST": "posledný",
"LISTS_GET_INDEX_RANDOM": "náhodný",
- "LISTS_GET_INDEX_TOOLTIP_GET_FROM_START": "Vráti prvok na určenej pozícii v zozname. #1 je počiatočný prvok.",
- "LISTS_GET_INDEX_TOOLTIP_GET_FROM_END": "Vráti prvok na určenej pozícii v zozname. #1 je posledný prvok.",
+ "LISTS_INDEX_FROM_START_TOOLTIP": "%1 je počiatočný prvok.",
+ "LISTS_INDEX_FROM_END_TOOLTIP": "%1 je posledný prvok.",
+ "LISTS_GET_INDEX_TOOLTIP_GET_FROM": "Vráti prvok na určenej pozícii v zozname.",
"LISTS_GET_INDEX_TOOLTIP_GET_FIRST": "Vráti počiatočný prvok zoznamu.",
"LISTS_GET_INDEX_TOOLTIP_GET_LAST": "Vráti posledný prvok zoznamu.",
"LISTS_GET_INDEX_TOOLTIP_GET_RANDOM": "Vráti náhodný prvok zoznamu.",
- "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM_START": "Odstráni a vráti prvok z určenej pozície v zozname. #1 je prvý prvok.",
- "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM_END": "Odstráni a vráti prvok z určenej pozície v zozname. #1 je posledný prvok.",
+ "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM": "Odstráni a vráti prvok z určenej pozície v zozname.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FIRST": "Odstráni a vráti prvý prvok v zozname.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_LAST": "Odstráni a vráti posledný prvok v zozname.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_RANDOM": "Odstráni a vráti náhodný prvok v zozname.",
- "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM_START": "Odstráni prvok na určenej pozícii v zozname. #1 je prvý prvok.",
- "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM_END": "Odstráni prvok na určenej pozícii v zozname. #1 je posledný prvok.",
+ "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM": "Odstráni prvok na určenej pozícii v zozname.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_FIRST": "Odstráni prvý prvok v zozname.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_LAST": "Odstráni posledný prvok v zozname.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_RANDOM": "Odstráni náhodný prvok v zozname.",
"LISTS_SET_INDEX_SET": "nastaviť",
"LISTS_SET_INDEX_INSERT": "vložiť na",
"LISTS_SET_INDEX_INPUT_TO": "ako",
- "LISTS_SET_INDEX_TOOLTIP_SET_FROM_START": "Nastaví prvok na určenej pozícii v zozname. #1 je prvý prvok.",
- "LISTS_SET_INDEX_TOOLTIP_SET_FROM_END": "Nastaví prvok na určenej pozícii v zozname. #1 je posledný prvok.",
+ "LISTS_SET_INDEX_TOOLTIP_SET_FROM": "Nastaví prvok na určenej pozícii v zozname.",
"LISTS_SET_INDEX_TOOLTIP_SET_FIRST": "Nastaví prvý prvok v zozname.",
"LISTS_SET_INDEX_TOOLTIP_SET_LAST": "Nastaví posledný prvok v zozname.",
"LISTS_SET_INDEX_TOOLTIP_SET_RANDOM": "Nastaví posledný prvok v zozname.",
- "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_START": "Vsunie prvok na určenú pozíciu v zozname. #1 je prvý prvok.",
- "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_END": "Vsunie prvok na určenú pozíciu v zozname. #1 je posledný prvok.",
+ "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM": "Vsunie prvok na určenú pozíciu v zozname.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_FIRST": "Vsunie prvok na začiatok zoznamu.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_LAST": "Pripojí prvok na koniec zoznamu.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_RANDOM": "Vsunie prvok na náhodné miesto v zozname.",
diff --git a/msg/json/sl.json b/msg/json/sl.json
index cca493eeb..e47304291 100644
--- a/msg/json/sl.json
+++ b/msg/json/sl.json
@@ -26,9 +26,6 @@
"HELP": "Pomoč",
"UNDO": "Razveljavi",
"REDO": "Ponovi",
- "CHAT": "Klepetaj s sodelavcem tako, da tipkaš v to okno!",
- "AUTH": "Prosimo, avtoriziraj to aplikacijo, da boš lahko svoje delo shranil(-a) in delil(-a) z drugimi.",
- "ME": "Jaz",
"CHANGE_VALUE_TITLE": "Spremeni vrednost:",
"NEW_VARIABLE": "Nova spremenljivka...",
"NEW_VARIABLE_TITLE": "Ime nove spremenljivke:",
@@ -210,7 +207,7 @@
"TEXT_ISEMPTY_TITLE": "%1 je prazno",
"TEXT_ISEMPTY_TOOLTIP": "Vrne resnično, če je določeno besedilo prazno.",
"TEXT_INDEXOF_HELPURL": "https://github.com/google/blockly/wiki/Text#finding-text",
- "TEXT_INDEXOF_TOOLTIP": "Vrne mesto (indeks) prve/zadnje pojavitve drugega besedila v prvem besedilu. Če besedila ne najde, vrne 0.",
+ "TEXT_INDEXOF_TOOLTIP": "Vrne mesto (indeks) prve/zadnje pojavitve drugega besedila v prvem besedilu. Če besedila ne najde, vrne %1.",
"TEXT_INDEXOF_INPUT_INTEXT": "v besedilu",
"TEXT_INDEXOF_OPERATOR_FIRST": "najdi prvo pojavitev besedila",
"TEXT_INDEXOF_OPERATOR_LAST": "najdi zadnjo pojavitev besedila",
@@ -271,7 +268,7 @@
"LISTS_INDEX_OF_HELPURL": "https://github.com/google/blockly/wiki/Lists#getting-items-from-a-list",
"LISTS_INDEX_OF_FIRST": "najdi prvo pojavitev elementa",
"LISTS_INDEX_OF_LAST": "najdi zadnjo pojavitev elementa",
- "LISTS_INDEX_OF_TOOLTIP": "Vrne mesto (indeks) prve/zadnje pojavitve elementa v seznamu. Če elementa ne najde, vrne 0.",
+ "LISTS_INDEX_OF_TOOLTIP": "Vrne mesto (indeks) prve/zadnje pojavitve elementa v seznamu. Če elementa ne najde, vrne %1.",
"LISTS_GET_INDEX_GET": "vrni",
"LISTS_GET_INDEX_GET_REMOVE": "odstrani in vrni",
"LISTS_GET_INDEX_REMOVE": "odstrani",
@@ -280,18 +277,17 @@
"LISTS_GET_INDEX_FIRST": "prvo mesto",
"LISTS_GET_INDEX_LAST": "zadnje mesto",
"LISTS_GET_INDEX_RANDOM": "naključno mesto",
- "LISTS_GET_INDEX_TOOLTIP_GET_FROM_START": "Vrne element na določenem mestu v seznamu. Prvi element je št. 1.",
- "LISTS_GET_INDEX_TOOLTIP_GET_FROM_END": "Vrne element na določenem mestu v seznamu. Zadnji element je št. 1.",
+ "LISTS_INDEX_FROM_START_TOOLTIP": "Prvi element je št. %1.",
+ "LISTS_INDEX_FROM_END_TOOLTIP": "Zadnji element je št. %1.",
+ "LISTS_GET_INDEX_TOOLTIP_GET_FROM": "Vrne element na določenem mestu v seznamu.",
"LISTS_GET_INDEX_TOOLTIP_GET_FIRST": "Vrne prvi element seznama.",
"LISTS_GET_INDEX_TOOLTIP_GET_LAST": "Vrne zadnji element seznama.",
"LISTS_GET_INDEX_TOOLTIP_GET_RANDOM": "Vrne naključni element seznama.",
- "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM_START": "Odstrani in vrne element na določenem mestu v seznamu. Prvi element je št. 1.",
- "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM_END": "Odstrani in vrne element na določenem mestu v seznamu. Zadnji element je št. 1.",
+ "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM": "Odstrani in vrne element na določenem mestu v seznamu.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FIRST": "Odstrani in vrne prvi element seznama.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_LAST": "Odstrani in vrne zadnji element seznama.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_RANDOM": "Odstrani in vrne naključni element seznama.",
- "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM_START": "Odstrani element na določenem mestu v seznamu. Prvi element je št. 1.",
- "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM_END": "Odstrani element na določenem mestu v seznamu. Zadnji element je št. 1.",
+ "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM": "Odstrani element na določenem mestu v seznamu.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_FIRST": "Odstrani prvi element seznama.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_LAST": "Odstrani zadnji element seznama.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_RANDOM": "Odstrani naključni element seznama.",
@@ -299,13 +295,11 @@
"LISTS_SET_INDEX_SET": "nastavi na",
"LISTS_SET_INDEX_INSERT": "vstavi na",
"LISTS_SET_INDEX_INPUT_TO": "element",
- "LISTS_SET_INDEX_TOOLTIP_SET_FROM_START": "Nastavi element na določenem mestu v seznamu. Prvi element je št. 1.",
- "LISTS_SET_INDEX_TOOLTIP_SET_FROM_END": "Nastavi element na določenem mestu v seznamu. Zadnji element je št. 1.",
+ "LISTS_SET_INDEX_TOOLTIP_SET_FROM": "Nastavi element na določenem mestu v seznamu.",
"LISTS_SET_INDEX_TOOLTIP_SET_FIRST": "Nastavi prvi element seznama.",
"LISTS_SET_INDEX_TOOLTIP_SET_LAST": "Nastavi zadnji element seznama.",
"LISTS_SET_INDEX_TOOLTIP_SET_RANDOM": "Nastavi naključni element seznama.",
- "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_START": "Vstavi element na določeno mesto v seznamu. Prvi element je št. 1.",
- "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_END": "Vstavi element na določeno mesto v seznamu. Zadnji element je št. 1.",
+ "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM": "Vstavi element na določeno mesto v seznamu.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_FIRST": "Vstavi element na začetek seznama.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_LAST": "Doda element na konec seznama.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_RANDOM": "Vstavi element na naključno mesto v seznamu.",
diff --git a/msg/json/sq.json b/msg/json/sq.json
index 74b05558e..30d4e1db7 100644
--- a/msg/json/sq.json
+++ b/msg/json/sq.json
@@ -186,7 +186,7 @@
"TEXT_LENGTH_TOOLTIP": "Pergjigjet me nje numer shkronjash (duke perfshire hapesire) ne tekstin e dhene.",
"TEXT_ISEMPTY_TITLE": "%1 eshte bosh",
"TEXT_ISEMPTY_TOOLTIP": "Kthehet e vertete neqoftese teksti i dhene eshte bosh.",
- "TEXT_INDEXOF_TOOLTIP": "Pergjigjet me indeksin e pare/fundit te rastisjes se tekstit te pare ne tekstin e dyte. Pergjigjet me 0 ne qofte se teksti nuk u gjet.",
+ "TEXT_INDEXOF_TOOLTIP": "Pergjigjet me indeksin e pare/fundit te rastisjes se tekstit te pare ne tekstin e dyte. Pergjigjet me %1 ne qofte se teksti nuk u gjet.",
"TEXT_INDEXOF_INPUT_INTEXT": "ne tekst",
"TEXT_INDEXOF_OPERATOR_FIRST": "gjej rastisjen e pare te tekstit",
"TEXT_INDEXOF_OPERATOR_LAST": "gjej rastisjen e fundit te tekstit",
@@ -236,7 +236,7 @@
"LISTS_INLIST": "në listë",
"LISTS_INDEX_OF_FIRST": "gjen ndodhjen e parë të sendit",
"LISTS_INDEX_OF_LAST": "gjen ndodhjen e fundit të sendit",
- "LISTS_INDEX_OF_TOOLTIP": "Kthen indeksin e ndodhjes së parë/fudit të sendit në listë. Kthen 0 nëse teksti nuk është gjetur.",
+ "LISTS_INDEX_OF_TOOLTIP": "Kthen indeksin e ndodhjes së parë/fudit të sendit në listë. Kthen %1 nëse teksti nuk është gjetur.",
"LISTS_GET_INDEX_GET": "merr",
"LISTS_GET_INDEX_GET_REMOVE": "merr dhe fshij",
"LISTS_GET_INDEX_REMOVE": "largo",
@@ -245,31 +245,28 @@
"LISTS_GET_INDEX_FIRST": "i parë",
"LISTS_GET_INDEX_LAST": "i fundit",
"LISTS_GET_INDEX_RANDOM": "i rastësishëm",
- "LISTS_GET_INDEX_TOOLTIP_GET_FROM_START": "Kthen një send në pozicionin e specifikuar në listë. #1 është sendi i parë.",
- "LISTS_GET_INDEX_TOOLTIP_GET_FROM_END": "Kthen një send në pozicionin e specifikuar në listë. #1 është sendi i fundit.",
+ "LISTS_INDEX_FROM_START_TOOLTIP": "%1 është sendi i parë.",
+ "LISTS_INDEX_FROM_END_TOOLTIP": "%1 është sendi i fundit.",
+ "LISTS_GET_INDEX_TOOLTIP_GET_FROM": "Kthen një send në pozicionin e specifikuar në listë.",
"LISTS_GET_INDEX_TOOLTIP_GET_FIRST": "Rikthen tek artikulli i par në list.",
"LISTS_GET_INDEX_TOOLTIP_GET_LAST": "Kthen artikullin e fundit në list.",
"LISTS_GET_INDEX_TOOLTIP_GET_RANDOM": "Kthen një send të rastësishëm në listë.",
- "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM_START": "Fshin dhe kthen sendin në pozicionin e specifikuar në listë. #1 është sendi i parë.",
- "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM_END": "Fshin dhe kthen sendin në pozicionin e specifikuar në listë. #1 është sendi i fundit.",
+ "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM": "Fshin dhe kthen sendin në pozicionin e specifikuar në listë.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FIRST": "Fshin dhe kthen sendin e parë në listë.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_LAST": "Fshin dhe kthen sendin e fundit në listë.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_RANDOM": "Fshin dhe kthen një send të rastësishëm në listë.",
- "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM_START": "Fshin sendin në pozicionin e specifikuar në listë. #1 është sendi i parë.",
- "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM_END": "Fshin sendin në pozicionin e specifikuar në listë. #1 është sendi i fundit.",
+ "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM": "Fshin sendin në pozicionin e specifikuar në listë.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_FIRST": "Fshin sendin e parë në listë.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_LAST": "Fshin sendin e fundit në listë.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_RANDOM": "Kthen një send të rastësishëm në listë.",
"LISTS_SET_INDEX_SET": "vendos",
"LISTS_SET_INDEX_INSERT": "fut në",
"LISTS_SET_INDEX_INPUT_TO": "sikurse",
- "LISTS_SET_INDEX_TOOLTIP_SET_FROM_START": "Vendos sendin në pozicionin e specifikuar në listë. #1 është sendi i parë.",
- "LISTS_SET_INDEX_TOOLTIP_SET_FROM_END": "Vendos sendin ne pozicionin e specifikuar në listë. #1 është sendi i fundit.",
+ "LISTS_SET_INDEX_TOOLTIP_SET_FROM": "Vendos sendin në pozicionin e specifikuar në listë.",
"LISTS_SET_INDEX_TOOLTIP_SET_FIRST": "Vendos sendin e parë në listë.",
"LISTS_SET_INDEX_TOOLTIP_SET_LAST": "Vendos sendin e fundit në listë.",
"LISTS_SET_INDEX_TOOLTIP_SET_RANDOM": "Vendos një send të rastësishëm në listë.",
- "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_START": "Fut sendin në pozicionin e specifikuar të listës. #1 është sendi i parë.",
- "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_END": "Fut sendin në pozicionin e specifikuar të listës. #1 është sendi i fundit.",
+ "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM": "Fut sendin në pozicionin e specifikuar të listës.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_FIRST": "Fut sendin në fillim të listës.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_LAST": "Bashkangjit sendin në fund të listës.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_RANDOM": "Fut sendin rastësisht në listë.",
diff --git a/msg/json/sr.json b/msg/json/sr.json
index f1af6fdb5..49066920d 100644
--- a/msg/json/sr.json
+++ b/msg/json/sr.json
@@ -26,9 +26,6 @@
"HELP": "Помоћ",
"UNDO": "Опозови",
"REDO": "Понови",
- "CHAT": "Комуницирају са својим колегом, уносећи у то поље!",
- "AUTH": "Пријавите се молим то је апликација да се окрену свој посао, да побегне и да му се омогући да буде заједничко за вас.",
- "ME": "Ми",
"CHANGE_VALUE_TITLE": "Промените вредност:",
"NEW_VARIABLE": "Нова променљива…",
"NEW_VARIABLE_TITLE": "Име нове променљиве:",
@@ -197,7 +194,7 @@
"TEXT_LENGTH_TOOLTIP": "Враћа број слова (уклјучујући размаке) у датом тексту.",
"TEXT_ISEMPTY_TITLE": "%1 је празан",
"TEXT_ISEMPTY_TOOLTIP": "Враћа тачно ако је доставлјени текст празан.",
- "TEXT_INDEXOF_TOOLTIP": "Враћа однос првог/заднјег појавлјиванја текста у другом тексту. Врађа 0 ако текст није пронађен.",
+ "TEXT_INDEXOF_TOOLTIP": "Враћа однос првог/заднјег појавлјиванја текста у другом тексту. Врађа %1 ако текст није пронађен.",
"TEXT_INDEXOF_INPUT_INTEXT": "у тексту",
"TEXT_INDEXOF_OPERATOR_FIRST": "пронађи прво појављивање текста",
"TEXT_INDEXOF_OPERATOR_LAST": "пронађи последње појављивање текста",
@@ -250,7 +247,7 @@
"LISTS_INLIST": "на списку",
"LISTS_INDEX_OF_FIRST": "пронађи прво појављивање ставке",
"LISTS_INDEX_OF_LAST": "пронађи последње појављивање ставке",
- "LISTS_INDEX_OF_TOOLTIP": "Враћа број првог и/последњег уласка елемента у листу. Враћа 0 Ако елемент није пронађен.",
+ "LISTS_INDEX_OF_TOOLTIP": "Враћа број првог и/последњег уласка елемента у листу. Враћа %1 Ако елемент није пронађен.",
"LISTS_GET_INDEX_GET": "преузми",
"LISTS_GET_INDEX_GET_REMOVE": "преузми и уклони",
"LISTS_GET_INDEX_REMOVE": "уклони",
@@ -260,31 +257,28 @@
"LISTS_GET_INDEX_LAST": "последња",
"LISTS_GET_INDEX_RANDOM": "случајна",
"LISTS_GET_INDEX_TAIL": "",
- "LISTS_GET_INDEX_TOOLTIP_GET_FROM_START": "Враћа ставку на одређену позицију на листи. #1 је прва ставка.",
- "LISTS_GET_INDEX_TOOLTIP_GET_FROM_END": "Враћа ставку на одређену позицију на листи. #1 је последња ставка.",
+ "LISTS_INDEX_FROM_START_TOOLTIP": "%1 је прва ставка.",
+ "LISTS_INDEX_FROM_END_TOOLTIP": "%1 је последња ставка.",
+ "LISTS_GET_INDEX_TOOLTIP_GET_FROM": "Враћа ставку на одређену позицију на листи.",
"LISTS_GET_INDEX_TOOLTIP_GET_FIRST": "Враћа прву ставку на списку.",
"LISTS_GET_INDEX_TOOLTIP_GET_LAST": "Враћа последњу ставку на списку.",
"LISTS_GET_INDEX_TOOLTIP_GET_RANDOM": "Враћа случајну ставку са списка.",
- "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM_START": "Уклања и враћа ставку са одређеног положаја на списку. #1 је прва ставка.",
- "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM_END": "Уклања и враћа ставку са одређеног положаја на списку. #1 је последња ставка.",
+ "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM": "Уклања и враћа ставку са одређеног положаја на списку.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FIRST": "Уклања и враћа прву ставку са списка.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_LAST": "Уклања и враћа последњу ставку са списка.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_RANDOM": "Уклања и враћа случајну ставку са списка.",
- "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM_START": "Уклања ставку са одређеног положаја на списку. #1 је прва ставка.",
- "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM_END": "Уклања ставку са одређеног положаја на списку. #1 је последња ставка.",
+ "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM": "Уклања ставку са одређеног положаја на списку.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_FIRST": "Уклања прву ставку са списка.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_LAST": "Уклања последњу ставку са списка.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_RANDOM": "Уклања случајну ставку са списка.",
"LISTS_SET_INDEX_SET": "постави",
"LISTS_SET_INDEX_INSERT": "убаци на",
"LISTS_SET_INDEX_INPUT_TO": "као",
- "LISTS_SET_INDEX_TOOLTIP_SET_FROM_START": "Поставља ставку на одређени положај на списку. #1 је прва ставка.",
- "LISTS_SET_INDEX_TOOLTIP_SET_FROM_END": "Поставља ставку на одређени положај на списку. #1 је последња ставка.",
+ "LISTS_SET_INDEX_TOOLTIP_SET_FROM": "Поставља ставку на одређени положај на списку.",
"LISTS_SET_INDEX_TOOLTIP_SET_FIRST": "Поставља прву ставку на списку.",
"LISTS_SET_INDEX_TOOLTIP_SET_LAST": "Поставља последњу ставку на списку.",
"LISTS_SET_INDEX_TOOLTIP_SET_RANDOM": "Поставља случајну ставку на списку.",
- "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_START": "Убацује ставку на одређени положај на списку. #1 је прва ставка.",
- "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_END": "Убацује ставку на одређени положај на списку. #1 је последња ставка.",
+ "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM": "Убацује ставку на одређени положај на списку.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_FIRST": "Убацује ставку на почетак списка.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_LAST": "Додајте ставку на крај списка.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_RANDOM": "Убацује ставку на случајно место на списку.",
diff --git a/msg/json/sv.json b/msg/json/sv.json
index ed8acb30f..a9de875cb 100644
--- a/msg/json/sv.json
+++ b/msg/json/sv.json
@@ -28,9 +28,6 @@
"HELP": "Hjälp",
"UNDO": "Ångra",
"REDO": "Gör om",
- "CHAT": "Chatta med din medarbetare genom att skriva i detta fält.",
- "AUTH": "Var god godkänn denna app för att du ska kunna spara och dela den.",
- "ME": "Jag",
"CHANGE_VALUE_TITLE": "Ändra värde:",
"NEW_VARIABLE": "Ny variabel...",
"NEW_VARIABLE_TITLE": "Nytt variabelnamn:",
@@ -198,7 +195,7 @@
"TEXT_LENGTH_TOOLTIP": "Ger tillbaka antalet bokstäver (inklusive mellanslag) i den angivna texten.",
"TEXT_ISEMPTY_TITLE": "%1 är tom",
"TEXT_ISEMPTY_TOOLTIP": "Returnerar sant om den angivna texten är tom.",
- "TEXT_INDEXOF_TOOLTIP": "Ger tillbaka indexet för den första/sista förekomsten av första texten i den andra texten. Ger tillbaka 0 om texten inte hittas.",
+ "TEXT_INDEXOF_TOOLTIP": "Ger tillbaka indexet för den första/sista förekomsten av första texten i den andra texten. Ger tillbaka %1 om texten inte hittas.",
"TEXT_INDEXOF_INPUT_INTEXT": "i texten",
"TEXT_INDEXOF_OPERATOR_FIRST": "hitta första förekomsten av texten",
"TEXT_INDEXOF_OPERATOR_LAST": "hitta sista förekomsten av texten",
@@ -249,7 +246,7 @@
"LISTS_INLIST": "i listan",
"LISTS_INDEX_OF_FIRST": "hitta första förekomsten av objektet",
"LISTS_INDEX_OF_LAST": "hitta sista förekomsten av objektet",
- "LISTS_INDEX_OF_TOOLTIP": "Ger tillbaka den första/sista förekomsten av objektet i listan. Ger tillbaka 0 om objektet inte hittas.",
+ "LISTS_INDEX_OF_TOOLTIP": "Ger tillbaka den första/sista förekomsten av objektet i listan. Returnerar %1 om objektet inte hittas.",
"LISTS_GET_INDEX_GET": "hämta",
"LISTS_GET_INDEX_GET_REMOVE": "hämta och ta bort",
"LISTS_GET_INDEX_REMOVE": "ta bort",
@@ -258,31 +255,28 @@
"LISTS_GET_INDEX_FIRST": "första",
"LISTS_GET_INDEX_LAST": "sista",
"LISTS_GET_INDEX_RANDOM": "slumpad",
- "LISTS_GET_INDEX_TOOLTIP_GET_FROM_START": "Ger tillbaka objektet på den efterfrågade positionen i en lista. #1 är det första objektet.",
- "LISTS_GET_INDEX_TOOLTIP_GET_FROM_END": "Ger tillbaka objektet på den efterfrågade positionen i en lista. #1 är det sista objektet.",
+ "LISTS_INDEX_FROM_START_TOOLTIP": "%1 är det första objektet.",
+ "LISTS_INDEX_FROM_END_TOOLTIP": "%1 är det sista objektet.",
+ "LISTS_GET_INDEX_TOOLTIP_GET_FROM": "Ger tillbaka objektet på den efterfrågade positionen i en lista.",
"LISTS_GET_INDEX_TOOLTIP_GET_FIRST": "Returnerar det första objektet i en lista.",
"LISTS_GET_INDEX_TOOLTIP_GET_LAST": "Returnerar det sista objektet i en lista.",
"LISTS_GET_INDEX_TOOLTIP_GET_RANDOM": "Returnerar ett slumpmässigt objekt i en lista.",
- "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM_START": "Tar bort och återställer objektet på den specificerade positionen i en lista. #1 är det första objektet.",
- "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM_END": "Tar bort och återställer objektet på den specificerade positionen i en lista. #1 är det sista objektet.",
+ "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM": "Tar bort och återställer objektet på den specificerade positionen i en lista.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FIRST": "Tar bort och återställer det första objektet i en lista.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_LAST": "Tar bort och återställer det sista objektet i en lista.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_RANDOM": "Tar bort och återställer ett slumpmässigt objekt i en lista.",
- "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM_START": "Tar bort objektet på den specificerade positionen i en lista. #1 är det första objektet.",
- "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM_END": "Tar bort objektet på den efterfrågade positionen i en lista. #1 är det sista objektet.",
+ "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM": "Tar bort objektet på den specificerade positionen i en lista.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_FIRST": "Tar bort det första objektet i en lista.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_LAST": "Tar bort det sista objektet i en lista.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_RANDOM": "Tar bort en slumpmässig post i en lista.",
"LISTS_SET_INDEX_SET": "ange",
"LISTS_SET_INDEX_INSERT": "Sätt in vid",
"LISTS_SET_INDEX_INPUT_TO": "som",
- "LISTS_SET_INDEX_TOOLTIP_SET_FROM_START": "Sätter in objektet vid en specificerad position i en lista. #1 är det första objektet.",
- "LISTS_SET_INDEX_TOOLTIP_SET_FROM_END": "Sätter in objektet vid en specificerad position i en lista. #1 är det sista objektet.",
+ "LISTS_SET_INDEX_TOOLTIP_SET_FROM": "Sätter in objektet vid en specificerad position i en lista.",
"LISTS_SET_INDEX_TOOLTIP_SET_FIRST": "Anger det första objektet i en lista.",
"LISTS_SET_INDEX_TOOLTIP_SET_LAST": "Anger det sista elementet i en lista.",
"LISTS_SET_INDEX_TOOLTIP_SET_RANDOM": "Sätter in ett slumpat objekt i en lista.",
- "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_START": "Sätter in objektet vid en specificerad position i en lista. #1 är det första objektet.",
- "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_END": "sätter in objektet vid en specificerad position i en lista. #1 är det sista objektet.",
+ "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM": "Sätter in objektet vid en specificerad position i en lista.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_FIRST": "sätter in objektet i början av en lista.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_LAST": "Lägg till objektet i slutet av en lista.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_RANDOM": "sätter in objektet på en slumpad position i en lista.",
diff --git a/msg/json/ta.json b/msg/json/ta.json
index 03b31352e..bddb09675 100644
--- a/msg/json/ta.json
+++ b/msg/json/ta.json
@@ -25,9 +25,6 @@
"DISABLE_BLOCK": "உறுப்பை இயங்காது செய்",
"ENABLE_BLOCK": "உறுப்பை இயங்குமாரு செய்",
"HELP": "உதவி",
- "CHAT": "இந்தப் பெட்டியில் தட்டச்சு செய்வதன் மூலம் கூட்டுப்பணியாளருடன் உரையாடலாம்!",
- "AUTH": "தயவுச்செய்து இச்செயலியை அங்கீகரித்து உங்கள் வேலையைச் சேமித்து பகிரரும்படி அனுமதிக்கவும்.",
- "ME": "எனக்கு",
"CHANGE_VALUE_TITLE": "மதிப்பை மாற்றவும்:",
"NEW_VARIABLE": "புதிய மாறிலி...",
"NEW_VARIABLE_TITLE": "புதிய மாறிலியின் பெயர்:",
@@ -179,7 +176,6 @@
"TEXT_LENGTH_TOOLTIP": "தொடரில் உள்ள எழுத்துக்களின் (இடைவெளிகளையும் சேர்த்து) எண்ணிகையை பின்கொடு.",
"TEXT_ISEMPTY_TITLE": "%1 காலியானது",
"TEXT_ISEMPTY_TOOLTIP": "காலியானது என்றால் மெய் மதிப்பை பின்கொடு",
- "TEXT_INDEXOF_TOOLTIP": "இரண்டாவது உரையில் முதல் உரையின் முதல்/கடை இருக்கை குறிஎண்ணை பின்கொடு.",
"TEXT_INDEXOF_INPUT_INTEXT": "உரையில்",
"TEXT_INDEXOF_OPERATOR_FIRST": "உரையில் முதல் தோற்ற இடத்தை பின்கொடு",
"TEXT_INDEXOF_OPERATOR_LAST": "உரையில் கடைசி தோற்ற இடத்தை பின்கொடு",
@@ -228,7 +224,7 @@
"LISTS_INLIST": "பட்டியலில் உள்ள",
"LISTS_INDEX_OF_FIRST": "உரையில் முதல் தோற்ற இடத்தை காட்டு",
"LISTS_INDEX_OF_LAST": "உரையில் கடைசி தோற்ற இடத்தை காட்டு",
- "LISTS_INDEX_OF_TOOLTIP": "பட்டியலில் மதிப்பின் முதல், கடைசி தோற்ற இடத்தை பின்கொடு. காணாவிட்டால் 0 பின்கொடு.",
+ "LISTS_INDEX_OF_TOOLTIP": "பட்டியலில் மதிப்பின் முதல், கடைசி தோற்ற இடத்தை பின்கொடு. காணாவிட்டால் %1 பின்கொடு.",
"LISTS_GET_INDEX_GET": "எடு",
"LISTS_GET_INDEX_GET_REMOVE": "பெற்று நீக்குக",
"LISTS_GET_INDEX_REMOVE": "நீக்குக",
@@ -236,31 +232,28 @@
"LISTS_GET_INDEX_FIRST": "முதல்",
"LISTS_GET_INDEX_LAST": "கடைசி",
"LISTS_GET_INDEX_RANDOM": "ஏதோ ஒன்று",
- "LISTS_GET_INDEX_TOOLTIP_GET_FROM_START": "பட்டியலில் இடத்தில் உருப்படி பின்கொடு. #1 முதல் உருப்படி.",
- "LISTS_GET_INDEX_TOOLTIP_GET_FROM_END": "பட்டியலில் இடத்தில் உருப்படி பின்கொடு. #1 முதல் உருப்படி.",
+ "LISTS_INDEX_FROM_START_TOOLTIP": "%1 முதல் உருப்படி.",
+ "LISTS_INDEX_FROM_END_TOOLTIP": "%1 கடைசி உருப்படி.ி",
+ "LISTS_GET_INDEX_TOOLTIP_GET_FROM": "பட்டியலில் இடத்தில் உருப்படி பின்கொடு.",
"LISTS_GET_INDEX_TOOLTIP_GET_FIRST": "பட்டியல் முதல் உருப்படியை பின்கொடு,",
"LISTS_GET_INDEX_TOOLTIP_GET_LAST": "பட்டியல் கடைசி உருப்படியை பின்கொடு,",
"LISTS_GET_INDEX_TOOLTIP_GET_RANDOM": "பட்டியல் சீரற்ற உருப்படியை பின்கொடு,",
- "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM_START": "பட்டியலில் கேட்ட இடத்தின் உருப்படி நீக்கி பின்கொடு. #1 கடைசி உருப்படி.",
- "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM_END": "பட்டியலில் கேட்ட இடத்தின் உருப்படி நீக்கி பின்கொடு. #1 கடைசி உருப்படி.",
+ "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM": "பட்டியலில் கேட்ட இடத்தின் உருப்படி நீக்கி பின்கொடு.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FIRST": "பட்டியல் முதல் உருப்படியை நீக்கியபின் பின்கொடு,",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_LAST": "பட்டியல் இறுதி உருப்படியை நீக்கியபின் பின்கொடு,",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_RANDOM": "பட்டியல் சீரற்ற உருப்படியை நீக்கியபின் பின்கொடு,",
- "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM_START": "பட்டியலில் கேட்ட இடத்தின் உருப்படி நீக்கு. #1 முதல் உருப்படி.",
- "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM_END": "பட்டியலில் கேட்ட இடத்தின் உருப்படியை நீக்கு. #1 கடைசி உருப்படி.",
+ "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM": "பட்டியலில் கேட்ட இடத்தின் உருப்படி நீக்கு.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_FIRST": "பட்டியலில் முதல் உருப்படியை நீக்கு",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_LAST": "பட்டியலில் கடைசி உருப்படியை நீக்கு",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_RANDOM": "பட்டியல் சீரற்ற உருப்படியை நீக்கு,",
"LISTS_SET_INDEX_SET": "நியமி",
"LISTS_SET_INDEX_INSERT": "அவ்விடத்தில் நுழை",
"LISTS_SET_INDEX_INPUT_TO": "இதுபொல",
- "LISTS_SET_INDEX_TOOLTIP_SET_FROM_START": "பட்டியலில் கேட்ட இடத்தில் உருப்படியை வை. #1, முதல் உருப்படி.",
- "LISTS_SET_INDEX_TOOLTIP_SET_FROM_END": "பட்டியலில் கேட்ட இடத்தில் உருப்படியை வை. #1, கடைசி உருப்படி.",
+ "LISTS_SET_INDEX_TOOLTIP_SET_FROM": "பட்டியலில் கேட்ட இடத்தில் உருப்படியை வை.",
"LISTS_SET_INDEX_TOOLTIP_SET_FIRST": "மதிப்பை பட்டியலில் முதல் உருப்படியில் வை",
"LISTS_SET_INDEX_TOOLTIP_SET_LAST": "மதிப்பை பட்டியலில் கடைசி உருப்படியில் வை",
"LISTS_SET_INDEX_TOOLTIP_SET_RANDOM": "மதிப்பை பட்டியலில் சீரற்ற உருப்படியில் வை",
- "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_START": "பட்டியலில் கேட்ட இடத்தில் உருப்படியை நுழை. #1, முதல் உருப்படி.",
- "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_END": "பட்டியலில் கேட்ட இடத்தில் உருப்படியை நுழை. #1, கடைசி உருப்படி.",
+ "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM": "பட்டியலில் கேட்ட இடத்தில் உருப்படியை நுழை.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_FIRST": "மதிப்பை பட்டியலின் முதலில் நுழை",
"LISTS_SET_INDEX_TOOLTIP_INSERT_LAST": "மதிப்பை பட்டியலின் முடிவில் நுழை",
"LISTS_SET_INDEX_TOOLTIP_INSERT_RANDOM": "மதிப்பை பட்டியலின் சீற்ற இடத்தில் நுழை",
diff --git a/msg/json/tcy.json b/msg/json/tcy.json
index 279dca556..8194895ad 100644
--- a/msg/json/tcy.json
+++ b/msg/json/tcy.json
@@ -25,9 +25,6 @@
"HELP": "ಸಹಾಯೊ",
"UNDO": "ದುಂಬುದಲೆಕೊ",
"REDO": "ಪಿರವುದಂಚ",
- "CHAT": "ನಿಕ್ಲೆನ ಸಹಬೋಗಿನೊಟ್ಟುಗೆ ಈ ಪೆಟ್ಟಿಗೆಡ್ ಚಾಟಿಂಗ್ ನಮೂದು ಮಲ್ಪುಲೆ",
- "AUTH": "ಈರೆನ ಕೆಲಸೊನು ಒರಿಪಾಯರೆ ಬುಕ್ಕೊ ಈರೆನಟ್ಟುಗು ಪಟ್ಟೊನುಯರೆ ಅವಕಾಸೊ.",
- "ME": "ಯಾನ್",
"CHANGE_VALUE_TITLE": "ಮೌಲ್ಯೊದ ಬದಲಾವಣೆ",
"NEW_VARIABLE": "ಪೊಸ ಬದಲಾವಣೆ",
"NEW_VARIABLE_TITLE": "ಪುದರ್ದ ಪೊಸ ಬದಲಾವಣೆ:",
@@ -178,7 +175,7 @@
"TEXT_LENGTH_TOOLTIP": "ಕೊರ್ನ ಪಟ್ಯೊದ ಅಕ್ಷರೊಲೆನ(ಅಂತರೊಲು ಸೇರ್ನಂಚ) ಸಂಖ್ಯೆನ್ ಪಿರಕೊರು.",
"TEXT_ISEMPTY_TITLE": "%1 ಕಾಲಿ",
"TEXT_ISEMPTY_TOOLTIP": "ಕೊರ್ನ ಪಟ್ಯೊ ಕಾಲಿಂದ್ ಸತ್ಯೊ ಆಂಡ ಪಿರಕೊರು",
- "TEXT_INDEXOF_TOOLTIP": "ಸುರುತ ಪಟ್ಯೊದ ಸೂಚ್ಯಿ/ಅಕೇರಿಟ್ ಸಂಭವಿಸವುನ ಸುರುತ ಪಟ್ಟಯೊದುಲಯಿದ ರಡ್ಡನೆ ಪಟ್ಯೊನು ಪಿರಕೊರು. ೦ ಪಟ್ಯೊ ತಿಕಂದಿತ್ತ್ಂಡ ಪಿರಕೊರು.",
+ "TEXT_INDEXOF_TOOLTIP": "ಸುರುತ ಪಟ್ಯೊದ ಸೂಚ್ಯಿ/ಅಕೇರಿಟ್ ಸಂಭವಿಸವುನ ಸುರುತ ಪಟ್ಟಯೊದುಲಯಿದ ರಡ್ಡನೆ ಪಟ್ಯೊನು ಪಿರಕೊರು. %1 ಪಟ್ಯೊ ತಿಕಂದಿತ್ತ್ಂಡ ಪಿರಕೊರು.",
"TEXT_INDEXOF_INPUT_INTEXT": "ಪಟ್ಯೊಡು",
"TEXT_INDEXOF_OPERATOR_FIRST": "ಸುರುಟು ಸಂಭವಿಸಯಿನ ಪಟ್ಯೊನು ನಾಡ್ಲ",
"TEXT_INDEXOF_OPERATOR_LAST": "ದುಂಬು ಕರಿನ ಪಟ್ಯೊನು ನಾಡ್ಲೆ",
@@ -227,7 +224,7 @@
"LISTS_INLIST": "ಪಟ್ಟಿಡ್",
"LISTS_INDEX_OF_FIRST": "ದುಂಬು ಕರಿನ ಪಟ್ಯೊನು ನಾಡ್ಲೆ",
"LISTS_INDEX_OF_LAST": "ಅಕೆರಿಗ್ ಕರಿನ ಪಟ್ಯೊನು ನಾಡ್ಲೆ",
- "LISTS_INDEX_OF_TOOLTIP": "ಸುರುತ ಪಟ್ಯೊದ ಸೂಚ್ಯಿ/ಅಕೇರಿಟ್ ಸಂಭವಿಸವುನ ಸುರುತ ಪಟ್ಟಯೊದುಲಯಿದ ರಡ್ಡನೆ ಪಟ್ಯೊನು ಪಿರಕೊರು. ೦ ಪಟ್ಯೊ ತಿಕಂದಿತ್ತ್ಂಡ ಪಿರಕೊರು.",
+ "LISTS_INDEX_OF_TOOLTIP": "ಸುರುತ ಪಟ್ಯೊದ ಸೂಚ್ಯಿ/ಅಕೇರಿಟ್ ಸಂಭವಿಸವುನ ಸುರುತ ಪಟ್ಟಯೊದುಲಯಿದ ರಡ್ಡನೆ ಪಟ್ಯೊನು ಪಿರಕೊರು. %1 ಪಟ್ಯೊ ತಿಕಂದಿತ್ತ್ಂಡ ಪಿರಕೊರು.",
"LISTS_GET_INDEX_GET": "ದೆತೊನು",
"LISTS_GET_INDEX_GET_REMOVE": "ದೆತೊನಿಯರ ಬುಕ್ಕೊ ದೆಪ್ಪೆರೆ",
"LISTS_GET_INDEX_REMOVE": "ದೆಪ್ಪುಲೆ",
@@ -235,31 +232,28 @@
"LISTS_GET_INDEX_FIRST": "ಸುರುತ",
"LISTS_GET_INDEX_LAST": "ಕಡೆತ",
"LISTS_GET_INDEX_RANDOM": "ಗೊತ್ತು ಗುರಿದಾಂತಿನ",
- "LISTS_GET_INDEX_TOOLTIP_GET_FROM_START": "ನಿರ್ದಿಷ್ಟ ಜಾಗೆಡುಪ್ಪುನ ಅಂಸೊಲೆ ಪಟ್ಟಿನ್ ಪಿರಕೊರು #1 ಸುರುತ ಅಂಸೊ",
- "LISTS_GET_INDEX_TOOLTIP_GET_FROM_END": "ನಿರ್ದಿಷ್ಟ ಜಾಗೆಡುಪ್ಪುನ ಅಂಸೊಲೆ ಪಟ್ಟಿನ್ ಪಿರಕೊರು #1 ಸುರುತ ಅಂಸೊ",
+ "LISTS_INDEX_FROM_START_TOOLTIP": "%1 ಸುರುತ ಅಂಸ",
+ "LISTS_INDEX_FROM_END_TOOLTIP": "%1 ಅಕೇರಿತ ಅಂಸ",
+ "LISTS_GET_INDEX_TOOLTIP_GET_FROM": "ನಿರ್ದಿಷ್ಟ ಜಾಗೆಡುಪ್ಪುನ ಅಂಸೊಲೆ ಪಟ್ಟಿನ್ ಪಿರಕೊರು",
"LISTS_GET_INDEX_TOOLTIP_GET_FIRST": "ಸುರುತ ಅಂಸೊಲೆನ ಪಟ್ಟಿನ್ ಪಿರಕೊರು.",
"LISTS_GET_INDEX_TOOLTIP_GET_LAST": "ಅಕೇರಿದ ಅಂಸೊಲೆನ ಪಟ್ಟಿನ್ ಪಿರಕೊರು.",
"LISTS_GET_INDEX_TOOLTIP_GET_RANDOM": "ಗೊತ್ತುಗುರಿದಾಂತಿನ ಅಂಸೊಲೆನ ಪಟ್ಟಿನ್ ಪಿರಕೊರು.",
- "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM_START": "ನಿರ್ದಿಷ್ಟ ಜಾಗೆಡುಪ್ಪುನ ಅಂಸೊಲೆ ಪಟ್ಟಿನ್ ದೆಪ್ಪು ಅತ್ತಂಡ ಪಿರಕೊರು #1 ಸುರುತ ಅಂಸೊ",
- "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM_END": "ನಿರ್ದಿಷ್ಟ ಜಾಗೆಡುಪ್ಪುನ ಅಂಸೊಲೆ ಪಟ್ಟಿನ್ ದೆಪ್ಪು ಅತ್ತಂಡ ಪಿರಕೊರು #1 ಅಕೇರಿದ ಅಂಸೊ",
+ "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM": "ನಿರ್ದಿಷ್ಟ ಜಾಗೆಡುಪ್ಪುನ ಅಂಸೊಲೆ ಪಟ್ಟಿನ್ ದೆಪ್ಪು ಅತ್ತಂಡ ಪಿರಕೊರು",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FIRST": "ಸುರುತ ಅಂಸೊಲೆನ ಪಟ್ಟಿನ್ ದೆಪ್ಪು ಅತ್ತಂಡ ಪಿರಕೊರು.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_LAST": "ಅಕೇರಿದ ಅಂಸೊಲೆನ ಪಟ್ಟಿನ್ ದೆಪ್ಪು ಅತ್ತಂಡ ಪಿರಕೊರು.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_RANDOM": "ಗೊತ್ತುಗುರಿದಾಂತಿನ ಅಂಸೊಲೆನ ಪಟ್ಟಿನ್ ದೆಪ್ಪು ಅತ್ತಂಡ ಪಿರಕೊರು.",
- "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM_START": "ನಿರ್ದಿಷ್ಟ ಜಾಗೆಡುಪ್ಪುನ ಅಂಸೊಲೆ ಪಟ್ಟಿನ್ ದೆಪ್ಪುಲೆ #1 ಸುರುತ ಅಂಸೊ",
- "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM_END": "ನಿರ್ದಿಷ್ಟ ಜಾಗೆಡುಪ್ಪುನ ಅಂಸೊಲೆ ಪಟ್ಟಿನ್ ದೆಪ್ಪು #1 ಅಕೇರಿದ ಅಂಸೊ",
+ "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM": "ನಿರ್ದಿಷ್ಟ ಜಾಗೆಡುಪ್ಪುನ ಅಂಸೊಲೆ ಪಟ್ಟಿನ್ ದೆಪ್ಪುಲೆ",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_FIRST": "ಸುರುತ ಅಂಸೊಲೆನ ಪಟ್ಟಿನ್ ದೆಪ್ಪು.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_LAST": "ಅಕೇರಿದ ಅಂಸೊಲೆನ ಪಟ್ಟಿನ್ ದೆಪ್ಪು.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_RANDOM": "ಗೊತ್ತುಗುರಿದಾಂತಿನ ಅಂಸೊಲೆನ ಪಟ್ಟಿನ್ ದೆಪ್ಪು.",
"LISTS_SET_INDEX_SET": "ಮಾಲ್ಪು",
"LISTS_SET_INDEX_INSERT": "ಸೇರಲ",
"LISTS_SET_INDEX_INPUT_TO": "ಅಂಚ",
- "LISTS_SET_INDEX_TOOLTIP_SET_FROM_START": "ನಿರ್ದಿಷ್ಟ ಜಾಗೆಡುಪ್ಪುನ ಅಂಸೊಲೆ ಪಟ್ಟಿನ್ ಮಾಲ್ಪು #1 ಸುರುತ ಅಂಸೊ",
- "LISTS_SET_INDEX_TOOLTIP_SET_FROM_END": "ನಿರ್ದಿಷ್ಟ ಜಾಗೆಡುಪ್ಪುನ ಅಂಸೊಲೆ ಪಟ್ಟಿನ್ ಮಾಲ್ಪು #1 ಅಕೇರಿತ ಅಂಸೊ",
+ "LISTS_SET_INDEX_TOOLTIP_SET_FROM": "ನಿರ್ದಿಷ್ಟ ಜಾಗೆಡುಪ್ಪುನ ಅಂಸೊಲೆ ಪಟ್ಟಿನ್ ಮಾಲ್ಪು",
"LISTS_SET_INDEX_TOOLTIP_SET_FIRST": "ಸುರುತ ಅಂಸೊಲೆನ ಪಟ್ಟಿನ್ ಮಾಲ್ಪು.",
"LISTS_SET_INDEX_TOOLTIP_SET_LAST": "ಅಕೇರಿದ ಅಂಸೊಲೆನ ಪಟ್ಟಿನ್ ಮಾಲ್ಪು.",
"LISTS_SET_INDEX_TOOLTIP_SET_RANDOM": "ಗೊತ್ತುಗುರಿದಾಂತಿನ ಅಂಸೊಲೆನ ಪಟ್ಟಿನ್ ಮಾಲ್ಪು.",
- "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_START": "ನಿರ್ದಿಷ್ಟ ಜಾಗೆಡುಪ್ಪುನ ಅಂಸೊಲೆ ಪಟ್ಟಿನ್ ಸೇರಲ #1 ಸುರುತ ಅಂಸೊ",
- "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_END": "ನಿರ್ದಿಷ್ಟ ಜಾಗೆಡುಪ್ಪುನ ಅಂಸೊಲೆ ಪಟ್ಟಿನ್ ಸೇರಲ #1 ಅಕೇರಿತ ಅಂಸೊ",
+ "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM": "ನಿರ್ದಿಷ್ಟ ಜಾಗೆಡುಪ್ಪುನ ಅಂಸೊಲೆ ಪಟ್ಟಿನ್ ಸೇರಲ",
"LISTS_SET_INDEX_TOOLTIP_INSERT_FIRST": "ಸುರುತ ಅಂಸೊಲೆ ಪಟ್ಟಿನ್ ಸೇರಲ.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_LAST": "ಪಟ್ಟಿದ ಅಕೇರಿಗ್ ಈ ಅಂಸೊಲೆನ್ ಸೇರಲ.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_RANDOM": "ಪಟ್ಟಿಗ್ ಗೊತ್ತುಗುರಿದಾಂತೆ ಅಂಸೊಲೆನ್ ಸೇರಲ.",
diff --git a/msg/json/th.json b/msg/json/th.json
index b42784c78..52b6e47a3 100644
--- a/msg/json/th.json
+++ b/msg/json/th.json
@@ -23,9 +23,6 @@
"DISABLE_BLOCK": "ปิดใช้งานบล็อก",
"ENABLE_BLOCK": "เปิดใช้งานบล็อก",
"HELP": "ช่วยเหลือ",
- "CHAT": "คุยกับผู้ร่วมงานของคุณโดยพิมพ์ลงในกล่องนี้!",
- "AUTH": "กรุณาอนุญาตแอปนี้เพื่อเปิดใช้งาน การบันทึกงานของคุณ และยินยอมให้คุณแบ่งปันงานของคุณได้",
- "ME": "ฉัน",
"CHANGE_VALUE_TITLE": "เปลี่ยนค่า:",
"NEW_VARIABLE": "สร้างตัวแปร...",
"NEW_VARIABLE_TITLE": "ชื่อตัวแปรใหม่:",
@@ -178,7 +175,7 @@
"TEXT_LENGTH_TOOLTIP": "คืนค่าความยาวของข้อความ (รวมช่องว่าง)",
"TEXT_ISEMPTY_TITLE": "%1 ว่าง",
"TEXT_ISEMPTY_TOOLTIP": "คืนค่าจริง ถ้าข้อความยังว่าง",
- "TEXT_INDEXOF_TOOLTIP": "คืนค่าตำแหน่งที่พบข้อความแรกอยู่ในข้อความที่สอง คืนค่า 0 ถ้าหาไม่พบ",
+ "TEXT_INDEXOF_TOOLTIP": "คืนค่าตำแหน่งที่พบข้อความแรกอยู่ในข้อความที่สอง คืนค่า %1 ถ้าหาไม่พบ",
"TEXT_INDEXOF_INPUT_INTEXT": "ในข้อความ",
"TEXT_INDEXOF_OPERATOR_FIRST": "หาข้อความแรกที่พบ",
"TEXT_INDEXOF_OPERATOR_LAST": "หาข้อความสุดท้ายที่พบ",
@@ -227,7 +224,7 @@
"LISTS_INLIST": "ในรายการ",
"LISTS_INDEX_OF_FIRST": "หาอันแรกที่พบ",
"LISTS_INDEX_OF_LAST": "หาอันสุดท้ายที่พบ",
- "LISTS_INDEX_OF_TOOLTIP": "คืนค่าตำแหน่งของไอเท็มอันแรก/สุดท้ายที่พบในรายการ คืนค่า 0 ถ้าหาไม่พบ",
+ "LISTS_INDEX_OF_TOOLTIP": "คืนค่าตำแหน่งของไอเท็มอันแรก/สุดท้ายที่พบในรายการ คืนค่า %1 ถ้าหาไม่พบ",
"LISTS_GET_INDEX_GET": "เรียกดู",
"LISTS_GET_INDEX_GET_REMOVE": "เรียกดูและเอาออก",
"LISTS_GET_INDEX_REMOVE": "เอาออก",
@@ -235,31 +232,28 @@
"LISTS_GET_INDEX_FIRST": "แรกสุด",
"LISTS_GET_INDEX_LAST": "ท้ายสุด",
"LISTS_GET_INDEX_RANDOM": "สุ่ม",
- "LISTS_GET_INDEX_TOOLTIP_GET_FROM_START": "คืนค่าเป็นไอเท็มตามตำแหน่งที่ระบุ #1 คือไอเท็มอันแรกสุด",
- "LISTS_GET_INDEX_TOOLTIP_GET_FROM_END": "คืนค่าเป็นไอเท็มตามตำแหน่งที่ระบุ #1 คือไอเท็มอันท้ายสุด",
+ "LISTS_INDEX_FROM_START_TOOLTIP": "%1 คือไอเท็มอันแรกสุด",
+ "LISTS_INDEX_FROM_END_TOOLTIP": "%1 คือไอเท็มอันท้ายสุด",
+ "LISTS_GET_INDEX_TOOLTIP_GET_FROM": "คืนค่าเป็นไอเท็มตามตำแหน่งที่ระบุ",
"LISTS_GET_INDEX_TOOLTIP_GET_FIRST": "คืนค่าไอเท็มอันแรกในรายการ",
"LISTS_GET_INDEX_TOOLTIP_GET_LAST": "คืนค่าไอเท็มอันสุดท้ายในรายการ",
"LISTS_GET_INDEX_TOOLTIP_GET_RANDOM": "คืนค่าไอเท็มแบบสุ่มจากรายการ",
- "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM_START": "เอาออก และคืนค่าไอเท็มในตำแหน่งที่ระบุจากรายการ #1 คือไอเท็มอันแรก",
- "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM_END": "เอาออก และคืนค่าไอเท็มในตำแหน่งที่ระบุจากรายการ #1 คือไอเท็มอันสุดท้าย",
+ "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM": "เอาออก และคืนค่าไอเท็มในตำแหน่งที่ระบุจากรายการ",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FIRST": "เอาออก และคืนค่าไอเท็มอันแรกในรายการ",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_LAST": "เอาออก และคืนค่าไอเท็มอันสุดท้ายในรายการ",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_RANDOM": "เอาออก และคืนค่าไอเท็มแบบสุ่มจากรายการ",
- "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM_START": "คืนค่าเป็นไอเท็มตามตำแหน่งที่ระบุ #1 คือไอเท็มอันแรกสุด",
- "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM_END": "คืนค่าเป็นไอเท็มตามตำแหน่งที่ระบุ #1 คือไอเท็มอันท้ายสุด",
+ "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM": "คืนค่าเป็นไอเท็มตามตำแหน่งที่ระบุ",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_FIRST": "เอาไอเท็มแรกสุดในรายการออก",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_LAST": "เอาไอเท็มอันท้ายสุดในรายการออก",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_RANDOM": "เอาไอเท็มแบบสุ่มจากรายการออก",
"LISTS_SET_INDEX_SET": "กำหนด",
"LISTS_SET_INDEX_INSERT": "แทรกที่",
"LISTS_SET_INDEX_INPUT_TO": "เป็น",
- "LISTS_SET_INDEX_TOOLTIP_SET_FROM_START": "กำหนดไอเท็มในตำแหน่งที่ระบุในรายการ #1 คือไอเท็มอันแรกสุด",
- "LISTS_SET_INDEX_TOOLTIP_SET_FROM_END": "กำหนดไอเท็มในตำแหน่งที่ระบุในรายการ #1 คือไอเท็มอันท้ายสุด",
+ "LISTS_SET_INDEX_TOOLTIP_SET_FROM": "กำหนดไอเท็มในตำแหน่งที่ระบุในรายการ",
"LISTS_SET_INDEX_TOOLTIP_SET_FIRST": "กำหนดไอเท็มอันแรกในรายการ",
"LISTS_SET_INDEX_TOOLTIP_SET_LAST": "กำหนดไอเท็มอันสุดท้ายในรายการ",
"LISTS_SET_INDEX_TOOLTIP_SET_RANDOM": "กำหนดไอเท็มแบบสุ่มในรายการ",
- "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_START": "แทรกไอเท็มเข้าไปในตำแหน่งที่กำหนด #1 คือไอเท็มอันแรก",
- "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_END": "แทรกไอเท็มเข้าไปในตำแหน่งที่กำหนด #1 คือไอเท็มอันสุดท้าย",
+ "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM": "แทรกไอเท็มเข้าไปในตำแหน่งที่กำหนด",
"LISTS_SET_INDEX_TOOLTIP_INSERT_FIRST": "แทรกไอเท็มเข้าไปเป็นอันแรกสุดของรายการ",
"LISTS_SET_INDEX_TOOLTIP_INSERT_LAST": "เพิ่มไอเท็มเข้าไปท้ายสุดของรายการ",
"LISTS_SET_INDEX_TOOLTIP_INSERT_RANDOM": "เพิ่มไอเท็มเข้าไปในรายการแบบสุ่ม",
diff --git a/msg/json/tl.json b/msg/json/tl.json
index 5c1233b99..0e78f101e 100644
--- a/msg/json/tl.json
+++ b/msg/json/tl.json
@@ -186,7 +186,7 @@
"TEXT_LENGTH_TOOLTIP": "Returns the number of letters (including spaces) in the provided text.",
"TEXT_ISEMPTY_TITLE": "%1 is empty",
"TEXT_ISEMPTY_TOOLTIP": "Returns true if the provided text is empty.",
- "TEXT_INDEXOF_TOOLTIP": "Returns the index of the first/last occurrence of first text in the second text. Returns 0 if text is not found.",
+ "TEXT_INDEXOF_TOOLTIP": "Returns the index of the first/last occurrence of first text in the second text. Returns %1 if text is not found.",
"TEXT_INDEXOF_INPUT_INTEXT": "in text",
"TEXT_INDEXOF_OPERATOR_FIRST": "find first occurrence of text",
"TEXT_INDEXOF_OPERATOR_LAST": "find last occurrence of text",
@@ -236,7 +236,7 @@
"LISTS_INLIST": "sa list",
"LISTS_INDEX_OF_FIRST": "Hanapin ang unang pangyayari ng item",
"LISTS_INDEX_OF_LAST": "hanapin ang huling pangyayari ng item",
- "LISTS_INDEX_OF_TOOLTIP": "Pagbalik ng index ng una/huli pangyayari ng item sa list. Pagbalik ng 0 kung ang item ay hindi makita.",
+ "LISTS_INDEX_OF_TOOLTIP": "Pagbalik ng index ng una/huli pangyayari ng item sa list. Pagbalik ng %1 kung ang item ay hindi makita.",
"LISTS_GET_INDEX_GET": "kunin",
"LISTS_GET_INDEX_GET_REMOVE": "kunin at tanggalin",
"LISTS_GET_INDEX_REMOVE": "tanggalin",
@@ -245,31 +245,28 @@
"LISTS_GET_INDEX_FIRST": "Una",
"LISTS_GET_INDEX_LAST": "huli",
"LISTS_GET_INDEX_RANDOM": "nang hindi pinipili",
- "LISTS_GET_INDEX_TOOLTIP_GET_FROM_START": "Ibalik ang item sa itinakdang posisyon sa list. #1 ay ang unang item.",
- "LISTS_GET_INDEX_TOOLTIP_GET_FROM_END": "Ibalik ang item sa tinakdang posisyon sa list. #1 ay ang huling item.",
+ "LISTS_INDEX_FROM_START_TOOLTIP": "%1 ay ang unang item.",
+ "LISTS_INDEX_FROM_END_TOOLTIP": "%1 ay ang huling item.",
+ "LISTS_GET_INDEX_TOOLTIP_GET_FROM": "Ibalik ang item sa itinakdang posisyon sa list.",
"LISTS_GET_INDEX_TOOLTIP_GET_FIRST": "Ibalik ang unang item sa list.",
"LISTS_GET_INDEX_TOOLTIP_GET_LAST": "Ibalik ang huling item sa list.",
"LISTS_GET_INDEX_TOOLTIP_GET_RANDOM": "Nag babalik ng hindi pinipiling item sa list.",
- "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM_START": "Nag tatanggal at nag babalik ng mga items sa tinukoy na posisyon sa list. #1 ang unang item.",
- "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM_END": "Nag tatanggal at nag babalik ng items sa tinukoy na posisyon sa list. #1 ay ang huling item.",
+ "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM": "Nag tatanggal at nag babalik ng mga items sa tinukoy na posisyon sa list.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FIRST": "Nag tatanggal at nag babalik ng mga unang item sa list.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_LAST": "Nag tatanggal at nag babalik ng huling item sa list.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_RANDOM": "Nag tatanggal at nag babalik ng mga hindi pinipiling item sa list.",
- "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM_START": "Nag tatanggal ng item sa tinukoy na posisyon sa list. #1 ay ang unang item.",
- "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM_END": "Nag tatanggal ng item sa tinukoy na posisyon sa list. #1 ay ang huling item.",
+ "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM": "Nag tatanggal ng item sa tinukoy na posisyon sa list.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_FIRST": "Nag tatanggal ng unang item sa list.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_LAST": "Nag tatanggal ng huling item sa list.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_RANDOM": "Nag tatanggal ng item mula sa walang pinipiling list.",
"LISTS_SET_INDEX_SET": "set",
"LISTS_SET_INDEX_INSERT": "isingit sa",
"LISTS_SET_INDEX_INPUT_TO": "gaya ng",
- "LISTS_SET_INDEX_TOOLTIP_SET_FROM_START": "Pag set ng item sa tinukoy na position sa isang list. #1 ay ang unang item.",
- "LISTS_SET_INDEX_TOOLTIP_SET_FROM_END": "Pag set ng item sa tinukoy na posisyon sa isang list. #1 ay ang huling item.",
+ "LISTS_SET_INDEX_TOOLTIP_SET_FROM": "Pag set ng item sa tinukoy na position sa isang list.",
"LISTS_SET_INDEX_TOOLTIP_SET_FIRST": "Pag set ng unang item sa isang list.",
"LISTS_SET_INDEX_TOOLTIP_SET_LAST": "Pag set sa huling item sa isang list.",
"LISTS_SET_INDEX_TOOLTIP_SET_RANDOM": "Pag set ng walang pinipiling item sa isang list.",
- "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_START": "Nag singit ng item sa tinukoy na posistion sa list. #1 ay ang unang item.",
- "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_END": "Nag singit ng item sa tinukoy na posisyon sa list. #1 ay ang huling item.",
+ "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM": "Nag singit ng item sa tinukoy na posistion sa list.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_FIRST": "Nag singit ng item sa simula ng list.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_LAST": "Idagdag ang item sa huli ng isang list.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_RANDOM": "Isingit ang item ng walang pinipili sa isang list.",
diff --git a/msg/json/tlh.json b/msg/json/tlh.json
index 4413dfd46..8be1d1dac 100644
--- a/msg/json/tlh.json
+++ b/msg/json/tlh.json
@@ -25,8 +25,6 @@
"HELP": "QaH",
"UNDO": "vangHa'",
"REDO": "vangqa'",
- "CHAT": "beqpu'lI'vaD bIjawmeH naDev yIrI'!",
- "AUTH": "ngogh nablIj DapollaHmeH qoj latlhvaD DangeHlaHmeH chaw' yInob.",
"CHANGE_VALUE_TITLE": "choH:",
"NEW_VARIABLE": "lIw chu'...",
"NEW_VARIABLE_TITLE": "lIw chu' pong:",
diff --git a/msg/json/tr.json b/msg/json/tr.json
index 884540337..fbf7e6482 100644
--- a/msg/json/tr.json
+++ b/msg/json/tr.json
@@ -35,9 +35,6 @@
"HELP": "Yardım",
"UNDO": "Geri al",
"REDO": "Yinele",
- "CHAT": "Bu kutuya yazarak iş birlikçin ile sohbet et!",
- "AUTH": "Çalışmanızın kaydedilmesi ve sizinle paylaşılmasına izin verilmesi için lütfen bu uygulamaya yetki verin.",
- "ME": "Beni",
"CHANGE_VALUE_TITLE": "Değeri değiştir:",
"NEW_VARIABLE": "Yeni değişken...",
"NEW_VARIABLE_TITLE": "Yeni değişken ismi :",
@@ -206,7 +203,7 @@
"TEXT_LENGTH_TOOLTIP": "Yazı içerisinde verilen harflerin ( harf arasındaki boşluklar dahil) sayısını verir .",
"TEXT_ISEMPTY_TITLE": "%1 boş",
"TEXT_ISEMPTY_TOOLTIP": "Verilen metin boşsa true(doğru) değerini verir.",
- "TEXT_INDEXOF_TOOLTIP": "İlk metnin ikinci metnin içindeki ilk ve son varoluşlarının indeksini döndürür.Metin bulunamadıysa 0 döndürür.",
+ "TEXT_INDEXOF_TOOLTIP": "İlk metnin ikinci metnin içindeki ilk ve son varoluşlarının indeksini döndürür.Metin bulunamadıysa %1 döndürür.",
"TEXT_INDEXOF_INPUT_INTEXT": "metinde",
"TEXT_INDEXOF_OPERATOR_FIRST": "Metnin ilk varolduğu yeri bul",
"TEXT_INDEXOF_OPERATOR_LAST": "Metnin son varolduğu yeri bul",
@@ -259,7 +256,7 @@
"LISTS_INLIST": "Listede",
"LISTS_INDEX_OF_FIRST": "Öğenin ilk varolduğu yeri bul",
"LISTS_INDEX_OF_LAST": "Öğenin son varolduğu yeri bul",
- "LISTS_INDEX_OF_TOOLTIP": "Listedeki öğenin ilk/son oluşumunun indeksini döndürür. Eğer öğe bulunamaz ise 0 döndürür.",
+ "LISTS_INDEX_OF_TOOLTIP": "Listedeki öğenin ilk/son oluşumunun indeksini döndürür. Eğer öğe bulunamaz ise %1 döndürür.",
"LISTS_GET_INDEX_GET": "Al",
"LISTS_GET_INDEX_GET_REMOVE": "al ve kaldır",
"LISTS_GET_INDEX_REMOVE": "kaldır",
@@ -269,31 +266,28 @@
"LISTS_GET_INDEX_LAST": "son",
"LISTS_GET_INDEX_RANDOM": "rastgele",
"LISTS_GET_INDEX_TAIL": "",
- "LISTS_GET_INDEX_TOOLTIP_GET_FROM_START": "Listede belirli pozisyondaki bir öğeyi verir.#1 ilk öğedir.",
- "LISTS_GET_INDEX_TOOLTIP_GET_FROM_END": "Listede belirli pozisyondaki bir öğeyi verir.#1 son öğedir.",
+ "LISTS_INDEX_FROM_START_TOOLTIP": "%1 ilk öğedir.",
+ "LISTS_INDEX_FROM_END_TOOLTIP": "%1 son öğedir.",
+ "LISTS_GET_INDEX_TOOLTIP_GET_FROM": "Listede belirli pozisyondaki bir öğeyi verir.",
"LISTS_GET_INDEX_TOOLTIP_GET_FIRST": "Listedeki ilk öğeyi verir.",
"LISTS_GET_INDEX_TOOLTIP_GET_LAST": "Listedeki son öğeyi verir.",
"LISTS_GET_INDEX_TOOLTIP_GET_RANDOM": "Listedeki rastgele bir öğeyi verir.",
- "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM_START": "Kaldırır ve listede belirtilen konumdaki bir öğeyi döndürür. #1 son öğedir.",
- "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM_END": "Kaldırır ve listede belirtilen konumdaki bir ögeyi döndürür. #1 son ögedir.",
+ "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM": "Kaldırır ve listede belirtilen konumdaki bir öğeyi döndürür.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FIRST": "Kaldırır ve listedeki ilk öğeyi döndürür.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_LAST": "Kaldırır ve listedeki son öğeyi döndürür.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_RANDOM": "Kaldırır ve listedeki rastgele bir öğeyi verir.",
- "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM_START": "Bir liste içerisinde , tanımlanan pozisyonda ki öğeyi kaldırır.#1 ilk öğedir.",
- "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM_END": "Liste içerisinde , tanımlanan pozisyondaki bir öğeyi kaldırır . #1 son öğe dir .",
+ "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM": "Bir liste içerisinde , tanımlanan pozisyonda ki öğeyi kaldırır.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_FIRST": "Listedeki ilk nesneyi kaldırır.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_LAST": "Listedeki son nesneyi kaldırır.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_RANDOM": "Listedeki rastgele bir nesneyi kaldırır.",
"LISTS_SET_INDEX_SET": "yerleştir",
"LISTS_SET_INDEX_INSERT": "e yerleştir",
"LISTS_SET_INDEX_INPUT_TO": "olarak",
- "LISTS_SET_INDEX_TOOLTIP_SET_FROM_START": "Bir öğeyi belirtilen yere göre listeye yerleştirir . #1 ilk öğedir .",
- "LISTS_SET_INDEX_TOOLTIP_SET_FROM_END": "Bir öğeyi belirtilen yere göre listeye yerleştirir . #1 son öğedir .",
+ "LISTS_SET_INDEX_TOOLTIP_SET_FROM": "Bir öğeyi belirtilen yere göre listeye yerleştirir .",
"LISTS_SET_INDEX_TOOLTIP_SET_FIRST": "Bir listenin ilk öğesini yerleştirir .",
"LISTS_SET_INDEX_TOOLTIP_SET_LAST": "Bir listedeki son öğeyi yerleştirir .",
"LISTS_SET_INDEX_TOOLTIP_SET_RANDOM": "Listeye rast gele bir öğe yerleştirir .",
- "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_START": "Bir öğeyi belirtilen pozisyona göre listeye yerleştirir . #1 ilk öğedir .",
- "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_END": "Bir öğeyi , belirtilen yer pozisyonuna göre , listeye yerleştirir . #1 son öğedir .",
+ "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM": "Bir öğeyi belirtilen pozisyona göre listeye yerleştirir .",
"LISTS_SET_INDEX_TOOLTIP_INSERT_FIRST": "Nesneyi listenin başlangıcına ekler.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_LAST": "Öğeyi listenin sonuna ekle .",
"LISTS_SET_INDEX_TOOLTIP_INSERT_RANDOM": "Bir öğeyi listeye rast gele ekler .",
diff --git a/msg/json/uk.json b/msg/json/uk.json
index 4d2b609d3..708c02444 100644
--- a/msg/json/uk.json
+++ b/msg/json/uk.json
@@ -29,9 +29,6 @@
"HELP": "Довідка",
"UNDO": "Скасувати",
"REDO": "Повторити",
- "CHAT": "Спілкуйтеся з вашими співавторами, набираючи у цьому полі!",
- "AUTH": "Будь ласка, авторизуйте цю програму, аби можна було зберігати вашу роботу і для надання можливості вам поширювати її.",
- "ME": "Я",
"CHANGE_VALUE_TITLE": "Змінити значення:",
"NEW_VARIABLE": "Нова змінна...",
"NEW_VARIABLE_TITLE": "Нова назва змінної:",
@@ -190,7 +187,7 @@
"TEXT_LENGTH_TOOLTIP": "Повертає число символів (включно з пропусками) у даному тексті.",
"TEXT_ISEMPTY_TITLE": "%1 є порожнім",
"TEXT_ISEMPTY_TOOLTIP": "Повертає істину, якщо вказаний текст порожній.",
- "TEXT_INDEXOF_TOOLTIP": "Повертає індекс першого/останнього входження першого тексту в другий. Повертає 0, якщо текст не знайдено.",
+ "TEXT_INDEXOF_TOOLTIP": "Повертає індекс першого/останнього входження першого тексту в другий. Повертає %1, якщо текст не знайдено.",
"TEXT_INDEXOF_INPUT_INTEXT": "у тексті",
"TEXT_INDEXOF_OPERATOR_FIRST": "знайти перше входження тексту",
"TEXT_INDEXOF_OPERATOR_LAST": "знайти останнє входження тексту",
@@ -244,7 +241,7 @@
"LISTS_INLIST": "у списку",
"LISTS_INDEX_OF_FIRST": "знайти перше входження елемента",
"LISTS_INDEX_OF_LAST": "знайти останнє входження елемента",
- "LISTS_INDEX_OF_TOOLTIP": "Повертає індекс першого/останнього входження елемента у списку. Повертає 0, якщо елемент не знайдено.",
+ "LISTS_INDEX_OF_TOOLTIP": "Повертає індекс першого/останнього входження елемента у списку. Повертає %1, якщо елемент не знайдено.",
"LISTS_GET_INDEX_GET": "отримати",
"LISTS_GET_INDEX_GET_REMOVE": "отримати і вилучити",
"LISTS_GET_INDEX_REMOVE": "вилучити",
@@ -254,31 +251,28 @@
"LISTS_GET_INDEX_LAST": "останній",
"LISTS_GET_INDEX_RANDOM": "випадковий",
"LISTS_GET_INDEX_TAIL": "-ий.",
- "LISTS_GET_INDEX_TOOLTIP_GET_FROM_START": "Повертає елемент у заданій позиції у списку. #1 - це перший елемент.",
- "LISTS_GET_INDEX_TOOLTIP_GET_FROM_END": "Повертає елемент у заданій позиції у списку. #1 - це останній елемент.",
+ "LISTS_INDEX_FROM_START_TOOLTIP": "%1 - це перший елемент.",
+ "LISTS_INDEX_FROM_END_TOOLTIP": "%1 - це останній елемент.",
+ "LISTS_GET_INDEX_TOOLTIP_GET_FROM": "Повертає елемент у заданій позиції у списку.",
"LISTS_GET_INDEX_TOOLTIP_GET_FIRST": "Повертає перший елемент списку.",
"LISTS_GET_INDEX_TOOLTIP_GET_LAST": "Повертає останній елемент списку.",
"LISTS_GET_INDEX_TOOLTIP_GET_RANDOM": "Повертає випадковий елемент списку.",
- "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM_START": "Видаляє і повертає елемент у заданій позиції у списку. #1 - це перший елемент.",
- "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM_END": "Видаляє і повертає елемент у заданій позиції у списку. #1 - це останній елемент.",
+ "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM": "Видаляє і повертає елемент у заданій позиції у списку.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FIRST": "Видаляє і повертає перший елемент списку.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_LAST": "Видаляє і повертає останній елемент списку.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_RANDOM": "Видаляє і повертає випадковий елемент списоку.",
- "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM_START": "Вилучає зі списку елемент у вказаній позиції. #1 - це перший елемент.",
- "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM_END": "Вилучає зі списку елемент у вказаній позиції. #1 - це останній елемент.",
+ "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM": "Вилучає зі списку елемент у вказаній позиції.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_FIRST": "Вилучає перший елемент списку.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_LAST": "Вилучає останній елемент списку.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_RANDOM": "Вилучає випадковий елемент списку.",
"LISTS_SET_INDEX_SET": "встановити",
"LISTS_SET_INDEX_INSERT": "вставити в",
"LISTS_SET_INDEX_INPUT_TO": "як",
- "LISTS_SET_INDEX_TOOLTIP_SET_FROM_START": "Задає елемент списку у вказаній позиції. #1 - це перший елемент.",
- "LISTS_SET_INDEX_TOOLTIP_SET_FROM_END": "Задає елемент списку у вказаній позиції. #1 - це останній елемент.",
+ "LISTS_SET_INDEX_TOOLTIP_SET_FROM": "Задає елемент списку у вказаній позиції.",
"LISTS_SET_INDEX_TOOLTIP_SET_FIRST": "Задає перший елемент списку.",
"LISTS_SET_INDEX_TOOLTIP_SET_LAST": "Задає останній елемент списку.",
"LISTS_SET_INDEX_TOOLTIP_SET_RANDOM": "Задає випадковий елемент у списку.",
- "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_START": "Вставка елемента у вказану позицію списку. #1 - перший елемент.",
- "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_END": "Вставляє елемент у вказану позицію списку. #1 - це останній елемент.",
+ "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM": "Вставка елемента у вказану позицію списку.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_FIRST": "Вставляє елемент на початок списку.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_LAST": "Додає елемент у кінці списку.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_RANDOM": "Випадковим чином вставляє елемент у список.",
diff --git a/msg/json/vi.json b/msg/json/vi.json
index dba6f3618..e2c729c99 100644
--- a/msg/json/vi.json
+++ b/msg/json/vi.json
@@ -24,9 +24,6 @@
"DISABLE_BLOCK": "Ngưng Tác Dụng",
"ENABLE_BLOCK": "Phục Hồi Tác Dụng",
"HELP": "Trợ Giúp",
- "CHAT": "Trò chuyện với cộng tác viên của bạn bằng cách gõ vào hộp này!",
- "AUTH": "Vui lòng cho phép ứng dụng được lưu dữ liệu của bạn và tự động chia sẻ bằng tên của bạn",
- "ME": "Tôi",
"CHANGE_VALUE_TITLE": "Thay giá trị thành:",
"NEW_VARIABLE": "Biến mới...",
"NEW_VARIABLE_TITLE": "Tên của biến mới:",
@@ -181,7 +178,7 @@
"TEXT_LENGTH_TOOLTIP": "Hoàn trả số lượng ký tự (kể cả khoảng trắng) trong văn bản đầu vào.",
"TEXT_ISEMPTY_TITLE": "%1 trống không",
"TEXT_ISEMPTY_TOOLTIP": "Hoàn trả “đúng nếu văn bản không có ký tự nào.",
- "TEXT_INDEXOF_TOOLTIP": "Hoàn trả vị trí xuất hiện đầu/cuối của văn bản thứ nhất trong văn bản thứ hai. Nếu không tìm thấy thì hoàn trả số 0.",
+ "TEXT_INDEXOF_TOOLTIP": "Hoàn trả vị trí xuất hiện đầu/cuối của văn bản thứ nhất trong văn bản thứ hai. Nếu không tìm thấy thì hoàn trả số %1.",
"TEXT_INDEXOF_INPUT_INTEXT": "trong văn bản",
"TEXT_INDEXOF_OPERATOR_FIRST": "tìm sự có mặt đầu tiên của",
"TEXT_INDEXOF_OPERATOR_LAST": "tìm sự có mặt cuối cùng của",
@@ -232,7 +229,7 @@
"LISTS_INLIST": "trong dánh sách",
"LISTS_INDEX_OF_FIRST": "tìm sự có mặt đầu tiên của vật",
"LISTS_INDEX_OF_LAST": "tìm sự có mặt cuối cùng của vật",
- "LISTS_INDEX_OF_TOOLTIP": "Hoàn trả vị trí xuất hiện đầu/cuối của vật trong danh sách. Nếu không tìm thấy thì hoàn trả số 0.",
+ "LISTS_INDEX_OF_TOOLTIP": "Hoàn trả vị trí xuất hiện đầu/cuối của vật trong danh sách. Nếu không tìm thấy thì hoàn trả số %1.",
"LISTS_GET_INDEX_GET": "lấy thành tố",
"LISTS_GET_INDEX_GET_REMOVE": "lấy và xóa thành tố",
"LISTS_GET_INDEX_REMOVE": "xóa thành tố",
@@ -241,31 +238,28 @@
"LISTS_GET_INDEX_FIRST": "đầu tiên",
"LISTS_GET_INDEX_LAST": "cuối cùng",
"LISTS_GET_INDEX_RANDOM": "bất kỳ",
- "LISTS_GET_INDEX_TOOLTIP_GET_FROM_START": "Hoàn trả thành tố trong danh sách ở vị trí ấn định. Số 1 là thành tố đầu tiên.",
- "LISTS_GET_INDEX_TOOLTIP_GET_FROM_END": "Hoàn trả thành tố trong danh sách ở vị trí ấn định. Số 1 là thành tố cuối cùng.",
+ "LISTS_INDEX_FROM_START_TOOLTIP": "%1 là thành tố đầu tiên.",
+ "LISTS_INDEX_FROM_END_TOOLTIP": "%1 là thành tố cuối cùng.",
+ "LISTS_GET_INDEX_TOOLTIP_GET_FROM": "Hoàn trả thành tố trong danh sách ở vị trí ấn định.",
"LISTS_GET_INDEX_TOOLTIP_GET_FIRST": "Hoàn trả thành tố đầu tiên trong danh sách.",
"LISTS_GET_INDEX_TOOLTIP_GET_LAST": "Hoàn trả thành tố cuối cùng trong danh sách.",
"LISTS_GET_INDEX_TOOLTIP_GET_RANDOM": "Hoàn trả một thành tố bất kỳ trong danh sách.",
- "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM_START": "Hoàn trả và xóa thành tố trong danh sách ở vị trí ấn định. Số 1 là thành tố đầu tiên.",
- "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM_END": "Hoàn trả và xóa thành tố trong danh sách ở vị trí ấn định. Số 1 là thành tố cuối cùng.",
+ "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM": "Hoàn trả và xóa thành tố trong danh sách ở vị trí ấn định.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FIRST": "Hoàn trả và xóa thành tố đầu tiên trong danh sách.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_LAST": "Hoàn trả và xóa thành tố cuối cùng trong danh sách.",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_RANDOM": "Hoàn trả và xóa mộtthành tố bất kỳ trong danh sách.",
- "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM_START": "Xóa thành tố trong danh sách ở vị trí ấn định. Số 1 là thành tố đầu tiên.",
- "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM_END": "Xóa thành tố trong danh sách ở vị trí ấn định. Số 1 là thành tố cuối cùng.",
+ "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM": "Xóa thành tố trong danh sách ở vị trí ấn định.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_FIRST": "Xóa thành tố đầu tiên trong danh sách.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_LAST": "Xóa thành tố cuối cùng trong danh sách.",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_RANDOM": "Xóa thành tố bất kỳ trong danh sách.",
"LISTS_SET_INDEX_SET": "đặt thành tố",
"LISTS_SET_INDEX_INSERT": "gắn chèn vào vị trí",
"LISTS_SET_INDEX_INPUT_TO": "giá trị",
- "LISTS_SET_INDEX_TOOLTIP_SET_FROM_START": "Đặt giá trị của thành tố ở vị trí ấn định trong một danh sách. #1 là thành tố đầu tiên.",
- "LISTS_SET_INDEX_TOOLTIP_SET_FROM_END": "Đặt giá trị của thành tố trong một danh sách ở vị trí ấn định từ phía cuối. #1 là thành tố cuối cùng.",
+ "LISTS_SET_INDEX_TOOLTIP_SET_FROM": "Đặt giá trị của thành tố ở vị trí ấn định trong một danh sách.",
"LISTS_SET_INDEX_TOOLTIP_SET_FIRST": "Đặt giá trị của thành tố đầu tiên trong danh sách.",
"LISTS_SET_INDEX_TOOLTIP_SET_LAST": "Đặt giá trị của thành tố cuối cùng trong danh sách.",
"LISTS_SET_INDEX_TOOLTIP_SET_RANDOM": "Đặt giá trị của thành tố ngẫu nhiên trong danh sách.",
- "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_START": "Gắn chèn vật vào danh sách theo vị trí ấn định. #1 là thành tố đầu tiên.",
- "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_END": "Gắn chèn vật vào danh sách theo vị trí ấn định từ phía cuối. #1 là thành tố cuối cùng.",
+ "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM": "Gắn chèn vật vào danh sách theo vị trí ấn định.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_FIRST": "Gắn chèn vật vào đầu danh sách.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_LAST": "Gắn thêm vật vào cuối danh sách.",
"LISTS_SET_INDEX_TOOLTIP_INSERT_RANDOM": "Gắn chèn vật vào danh sách ở vị trí ngẫu nhiên.",
diff --git a/msg/json/zh-hans.json b/msg/json/zh-hans.json
index a99ce5379..33f576791 100644
--- a/msg/json/zh-hans.json
+++ b/msg/json/zh-hans.json
@@ -32,9 +32,6 @@
"HELP": "帮助",
"UNDO": "撤销",
"REDO": "重做",
- "CHAT": "通过在此框输入与您的合作者沟通！",
- "AUTH": "请授权这个应用程序以保存您的作品并共享。",
- "ME": "我",
"CHANGE_VALUE_TITLE": "更改值：",
"NEW_VARIABLE": "新变量...",
"NEW_VARIABLE_TITLE": "新变量的名称：",
@@ -189,7 +186,7 @@
"TEXT_LENGTH_TOOLTIP": "返回提供文本的字母数（包括空格）。",
"TEXT_ISEMPTY_TITLE": "%1是空的",
"TEXT_ISEMPTY_TOOLTIP": "如果提供的文本为空，则返回真。",
- "TEXT_INDEXOF_TOOLTIP": "返回在第二个字串中的第一/最后一个匹配项的索引值。如果未找到则返回 0。",
+ "TEXT_INDEXOF_TOOLTIP": "返回在第二个字串中的第一/最后一个匹配项的索引值。如果未找到则返回%1。",
"TEXT_INDEXOF_INPUT_INTEXT": "自文本",
"TEXT_INDEXOF_OPERATOR_FIRST": "寻找第一个出现的文本",
"TEXT_INDEXOF_OPERATOR_LAST": "寻找最后一个出现的文本",
@@ -243,7 +240,7 @@
"LISTS_INLIST": "在列表中",
"LISTS_INDEX_OF_FIRST": "找出第一个项出现",
"LISTS_INDEX_OF_LAST": "找出最后一个项出现",
- "LISTS_INDEX_OF_TOOLTIP": "返回在列表中的第一/最后一个匹配项的索引值。如果找不到项目则返回0。",
+ "LISTS_INDEX_OF_TOOLTIP": "返回在列表中的第一/最后一个匹配项的索引值。如果找不到项目则返回%1。",
"LISTS_GET_INDEX_GET": "获得",
"LISTS_GET_INDEX_GET_REMOVE": "取出并移除",
"LISTS_GET_INDEX_REMOVE": "移除",
@@ -253,31 +250,28 @@
"LISTS_GET_INDEX_LAST": "最后",
"LISTS_GET_INDEX_RANDOM": "随机",
"LISTS_GET_INDEX_TAIL": "空白",
- "LISTS_GET_INDEX_TOOLTIP_GET_FROM_START": "返回在列表中的指定位置的项。#1是第一个项目。",
- "LISTS_GET_INDEX_TOOLTIP_GET_FROM_END": "返回在列表中的指定位置的项。#1是最后一项。",
+ "LISTS_INDEX_FROM_START_TOOLTIP": "%1是第一个项目。",
+ "LISTS_INDEX_FROM_END_TOOLTIP": "%1是最后一项。",
+ "LISTS_GET_INDEX_TOOLTIP_GET_FROM": "返回在列表中的指定位置的项。",
"LISTS_GET_INDEX_TOOLTIP_GET_FIRST": "返回列表中的第一个项目。",
"LISTS_GET_INDEX_TOOLTIP_GET_LAST": "返回列表中的最后一项。",
"LISTS_GET_INDEX_TOOLTIP_GET_RANDOM": "随机返回列表中的一个项目。",
- "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM_START": "移除并返回列表中的指定位置的项。#1 是第一项。",
- "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM_END": "移除并返回列表中的指定位置的项。#1 是最后一项。",
+ "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM": "移除并返回列表中的指定位置的项。",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FIRST": "移除并返回列表中的第一个项目。",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_LAST": "移除并返回列表中的最后一个项目。",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_RANDOM": "移除并返回列表中的一个随机项目中。",
- "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM_START": "移除在列表中的指定位置的项。#1 是第一项。",
- "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM_END": "删除在列表中的指定位置的项。#1是最后一项。",
+ "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM": "移除在列表中的指定位置的项。",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_FIRST": "移除列表中的第一项",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_LAST": "移除列表中的最后一项",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_RANDOM": "删除列表中的一个随机的项。",
"LISTS_SET_INDEX_SET": "设置",
"LISTS_SET_INDEX_INSERT": "插入在",
"LISTS_SET_INDEX_INPUT_TO": "为",
- "LISTS_SET_INDEX_TOOLTIP_SET_FROM_START": "设置在列表中指定位置的项。#1是第一项。",
- "LISTS_SET_INDEX_TOOLTIP_SET_FROM_END": "设置在列表中指定位置的项。#1是最后一项。",
+ "LISTS_SET_INDEX_TOOLTIP_SET_FROM": "设置在列表中指定位置的项。",
"LISTS_SET_INDEX_TOOLTIP_SET_FIRST": "设置列表中的第一个项目。",
"LISTS_SET_INDEX_TOOLTIP_SET_LAST": "设置列表中的最后一项。",
"LISTS_SET_INDEX_TOOLTIP_SET_RANDOM": "设置列表中一个随机的项目。",
- "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_START": "插入在列表中指定位置的项。#1是第一项。",
- "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_END": "插入在列表中的指定位置的项。#1是最后一项。",
+ "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM": "插入在列表中指定位置的项。",
"LISTS_SET_INDEX_TOOLTIP_INSERT_FIRST": "在列表的起始处添加该项。",
"LISTS_SET_INDEX_TOOLTIP_INSERT_LAST": "将该项追加到列表的末尾。",
"LISTS_SET_INDEX_TOOLTIP_INSERT_RANDOM": "在列表中随机插入项。",
diff --git a/msg/json/zh-hant.json b/msg/json/zh-hant.json
index 55dcaf179..74ebe31a8 100644
--- a/msg/json/zh-hant.json
+++ b/msg/json/zh-hant.json
@@ -30,9 +30,6 @@
"HELP": "說明",
"UNDO": "還原",
"REDO": "重試",
- "CHAT": "與您的合作者洽談藉由在此框輸入！",
- "AUTH": "請授權這個應用程式以保存您的作品並共享。",
- "ME": "我",
"CHANGE_VALUE_TITLE": "修改值:",
"NEW_VARIABLE": "新變數...",
"NEW_VARIABLE_TITLE": "新變數名稱:",
@@ -186,7 +183,7 @@
"TEXT_LENGTH_TOOLTIP": "返回這串文字的字元數（含空格） 。",
"TEXT_ISEMPTY_TITLE": "%1 為空",
"TEXT_ISEMPTY_TOOLTIP": "如果提供的字串為空，則返回 真。",
- "TEXT_INDEXOF_TOOLTIP": "返回在第二個字串中的第一個/最後一個匹配項目的索引值。如果未找到則返回 0。",
+ "TEXT_INDEXOF_TOOLTIP": "返回在第二個字串中的第一個/最後一個匹配項目的索引值。如果未找到則返回 %1。",
"TEXT_INDEXOF_INPUT_INTEXT": "在字串",
"TEXT_INDEXOF_OPERATOR_FIRST": "尋找 第一個 出現的字串",
"TEXT_INDEXOF_OPERATOR_LAST": "尋找 最後一個 出現的字串",
@@ -236,7 +233,7 @@
"LISTS_INLIST": "自列表",
"LISTS_INDEX_OF_FIRST": "找出 第一個 項目出現",
"LISTS_INDEX_OF_LAST": "找出 最後一個 項目出現",
- "LISTS_INDEX_OF_TOOLTIP": "返回在列表中的第一個/最後一個匹配項目的索引值。如果未找到則返回 0。",
+ "LISTS_INDEX_OF_TOOLTIP": "返回在列表中的第一個/最後一個匹配項目的索引值。如果未找到則返回 %1。",
"LISTS_GET_INDEX_GET": "取值",
"LISTS_GET_INDEX_GET_REMOVE": "取出並移除",
"LISTS_GET_INDEX_REMOVE": "移除",
@@ -244,31 +241,28 @@
"LISTS_GET_INDEX_FIRST": "第一筆",
"LISTS_GET_INDEX_LAST": "最後一筆",
"LISTS_GET_INDEX_RANDOM": "隨機",
- "LISTS_GET_INDEX_TOOLTIP_GET_FROM_START": "返回在列表中的指定位置的項目。#1 是第一個項目。",
- "LISTS_GET_INDEX_TOOLTIP_GET_FROM_END": "返回在列表中的指定位置的項目。#1 是最後一個項目。",
+ "LISTS_INDEX_FROM_START_TOOLTIP": "%1 是第一個項目。",
+ "LISTS_INDEX_FROM_END_TOOLTIP": "%1 是最後一個項目。",
+ "LISTS_GET_INDEX_TOOLTIP_GET_FROM": "返回在列表中的指定位置的項目。",
"LISTS_GET_INDEX_TOOLTIP_GET_FIRST": "返回列表中的第一個項目",
"LISTS_GET_INDEX_TOOLTIP_GET_LAST": "返回列表中的最後一個項目",
"LISTS_GET_INDEX_TOOLTIP_GET_RANDOM": "返回列表中隨機的一個項目",
- "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM_START": "移除並返回列表中的指定位置的項目。#1 是第一個項目。",
- "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM_END": "移除並返回列表中的指定位置的項目。#1 是最後一個項目。",
+ "LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM": "移除並返回列表中的指定位置的項目。",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FIRST": "移除並返回列表中的第一個項目",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_LAST": "移除並返回列表中的最後一個項目",
"LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_RANDOM": "移除並返回列表中的隨機一個項目",
- "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM_START": "移除在列表中的指定位置的項目。#1 是第一個項目。",
- "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM_END": "移除在列表中的指定位置的項目。#1 是最後一個項目。",
+ "LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM": "移除在列表中的指定位置的項目。",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_FIRST": "移除列表中的第一個項目",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_LAST": "移除列表中的最後一個項目",
"LISTS_GET_INDEX_TOOLTIP_REMOVE_RANDOM": "移除列表中隨機的一個項目",
"LISTS_SET_INDEX_SET": "設定",
"LISTS_SET_INDEX_INSERT": "插入在",
"LISTS_SET_INDEX_INPUT_TO": "為",
- "LISTS_SET_INDEX_TOOLTIP_SET_FROM_START": "設定在列表中的指定位置的項目。#1 是第一個項目。",
- "LISTS_SET_INDEX_TOOLTIP_SET_FROM_END": "設定在列表中的指定位置的項目。#1 是最後一個項目。",
+ "LISTS_SET_INDEX_TOOLTIP_SET_FROM": "設定在列表中的指定位置的項目。",
"LISTS_SET_INDEX_TOOLTIP_SET_FIRST": "設定列表中的第一個項目",
"LISTS_SET_INDEX_TOOLTIP_SET_LAST": "設定列表中的最後一個項目",
"LISTS_SET_INDEX_TOOLTIP_SET_RANDOM": "設定列表中隨機的一個項目",
- "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_START": "插入在列表中的指定位置的項目。#1 是第一個項目。",
- "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_END": "插入在列表中的指定位置的項目。#1 是最後一個項目。",
+ "LISTS_SET_INDEX_TOOLTIP_INSERT_FROM": "插入在列表中的指定位置的項目。",
"LISTS_SET_INDEX_TOOLTIP_INSERT_FIRST": "在列表的起始處添加一個項目",
"LISTS_SET_INDEX_TOOLTIP_INSERT_LAST": "在列表的尾端加入一個項目",
"LISTS_SET_INDEX_TOOLTIP_INSERT_RANDOM": "在列表中隨機插入項目",
diff --git a/msg/messages.js b/msg/messages.js
index 46789474f..2649a5c39 100644
--- a/msg/messages.js
+++ b/msg/messages.js
@@ -95,14 +95,6 @@ Blockly.Msg.UNDO = 'Undo';
/// context menu - Undo the previous undo action.\n{{Identical|Redo}}
Blockly.Msg.REDO = 'Redo';
-// Realtime collaboration.
-/// collaboration instruction - Tell the user that they can talk with other users.
-Blockly.Msg.CHAT = 'Chat with your collaborator by typing in this box!';
-/// authorization instruction - Ask the user to authorize this app so it can be saved and shared by them.
-Blockly.Msg.AUTH = 'Please authorize this app to enable your work to be saved and to allow it to be shared by you.';
-/// First person singular - objective case
-Blockly.Msg.ME = 'Me';
-
// Variable renaming.
/// prompt - This message is only seen in the Opera browser. With most browsers, users can edit numeric values in blocks by just clicking and typing. Opera does not allows this, so we have to open a new window and prompt users with this message to chanage a value.
Blockly.Msg.CHANGE_VALUE_TITLE = 'Change value:';
@@ -549,8 +541,8 @@ Blockly.Msg.TEXT_ISEMPTY_TOOLTIP = 'Returns true if the provided text is empty.'
/// url - Information about finding a character in a piece of text.
Blockly.Msg.TEXT_INDEXOF_HELPURL = 'https://github.com/google/blockly/wiki/Text#finding-text';
-/// tooltip - See [https://github.com/google/blockly/wiki/Text#finding-text https://github.com/google/blockly/wiki/Text#finding-text].
-Blockly.Msg.TEXT_INDEXOF_TOOLTIP = 'Returns the index of the first/last occurrence of the first text in the second text. Returns 0 if text is not found.';
+/// tooltip - %1 will be replaced by either the number 0 or -1 depending on the indexing mode. See [https://github.com/google/blockly/wiki/Text#finding-text https://github.com/google/blockly/wiki/Text#finding-text].
+Blockly.Msg.TEXT_INDEXOF_TOOLTIP = 'Returns the index of the first/last occurrence of the first text in the second text. Returns %1 if text is not found.';
/// block text - Title of blocks allowing users to find text. See
/// [https://github.com/google/blockly/wiki/Text#finding-text
/// https://github.com/google/blockly/wiki/Text#finding-text].
@@ -811,10 +803,10 @@ Blockly.Msg.LISTS_INDEX_OF_FIRST = 'find first occurrence of item';
/// https://github.com/google/blockly/wiki/Lists#finding-items-in-a-list].
/// [[File:Blockly-list-find.png]]
Blockly.Msg.LISTS_INDEX_OF_LAST = 'find last occurrence of item';
-/// dropdown - See [https://github.com/google/blockly/wiki/Lists#finding-items-in-a-list
+/// tooltip - %1 will be replaced by either the number 0 or -1 depending on the indexing mode. See [https://github.com/google/blockly/wiki/Lists#finding-items-in-a-list
/// https://github.com/google/blockly/wiki/Lists#finding-items-in-a-list].
/// [[File:Blockly-list-find.png]]
-Blockly.Msg.LISTS_INDEX_OF_TOOLTIP = 'Returns the index of the first/last occurrence of the item in the list. Returns 0 if item is not found.';
+Blockly.Msg.LISTS_INDEX_OF_TOOLTIP = 'Returns the index of the first/last occurrence of the item in the list. Returns %1 if item is not found.';
Blockly.Msg.LISTS_GET_INDEX_HELPURL = Blockly.Msg.LISTS_INDEX_OF_HELPURL;
/// dropdown - Indicates that the user wishes to
@@ -859,37 +851,28 @@ Blockly.Msg.LISTS_GET_INDEX_RANDOM = 'random';
/// [[File:Blockly-list-get-item.png]]
Blockly.Msg.LISTS_GET_INDEX_TAIL = '';
Blockly.Msg.LISTS_GET_INDEX_INPUT_IN_LIST = Blockly.Msg.LISTS_INLIST;
-/// tooltip - See [https://github.com/google/blockly/wiki/Lists#getting-a-single-item
-/// https://github.com/google/blockly/wiki/Lists#getting-a-single-item] for more information.
-Blockly.Msg.LISTS_GET_INDEX_TOOLTIP_GET_FROM_START = 'Returns the item at the specified position in a list. #1 is the first item.';
-/// tooltip - See [https://github.com/google/blockly/wiki/Lists#getting-a-single-item
-/// https://github.com/google/blockly/wiki/Lists#getting-a-single-item] for more information.
-Blockly.Msg.LISTS_GET_INDEX_TOOLTIP_GET_FROM_END = 'Returns the item at the specified position in a list. #1 is the last item.';
-/// tooltip - See [https://github.com/google/blockly/wiki/Lists#getting-a-single-item
-/// https://github.com/google/blockly/wiki/Lists#getting-a-single-item] for more information.
+/// tooltip - Indicates the ordinal number that the first item in a list is referenced by. %1 will be replaced by either "#0" or "#1" depending on the indexing mode.
+Blockly.Msg.LISTS_INDEX_FROM_START_TOOLTIP = '%1 is the first item.';
+/// tooltip - Indicates the ordinal number that the last item in a list is referenced by. %1 will be replaced by either "#0" or "#1" depending on the indexing mode.
+Blockly.Msg.LISTS_INDEX_FROM_END_TOOLTIP = '%1 is the last item.';
+/// tooltip - See [https://github.com/google/blockly/wiki/Lists#getting-a-single-item https://github.com/google/blockly/wiki/Lists#getting-a-single-item] for more information.
+Blockly.Msg.LISTS_GET_INDEX_TOOLTIP_GET_FROM = 'Returns the item at the specified position in a list.';
+/// tooltip - See [https://github.com/google/blockly/wiki/Lists#getting-a-single-item https://github.com/google/blockly/wiki/Lists#getting-a-single-item] for more information.
Blockly.Msg.LISTS_GET_INDEX_TOOLTIP_GET_FIRST = 'Returns the first item in a list.';
-/// tooltip - See [https://github.com/google/blockly/wiki/Lists#getting-a-single-item
-/// https://github.com/google/blockly/wiki/Lists#getting-a-single-item] for more information.
+/// tooltip - See [https://github.com/google/blockly/wiki/Lists#getting-a-single-item https://github.com/google/blockly/wiki/Lists#getting-a-single-item] for more information.
Blockly.Msg.LISTS_GET_INDEX_TOOLTIP_GET_LAST = 'Returns the last item in a list.';
-/// tooltip - See [https://github.com/google/blockly/wiki/Lists#getting-a-single-item
-/// https://github.com/google/blockly/wiki/Lists#getting-a-single-item] for more information.
+/// tooltip - See [https://github.com/google/blockly/wiki/Lists#getting-a-single-item https://github.com/google/blockly/wiki/Lists#getting-a-single-item] for more information.
Blockly.Msg.LISTS_GET_INDEX_TOOLTIP_GET_RANDOM = 'Returns a random item in a list.';
-/// tooltip - See [https://github.com/google/blockly/wiki/Lists#getting-and-removing-an-item]
-/// (for remove and return) and
-/// [https://github.com/google/blockly/wiki/Lists#getting-a-single-item] for '# from start'.
-Blockly.Msg.LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM_START = 'Removes and returns the item at the specified position in a list. #1 is the first item.';
-/// tooltip - See [https://github.com/google/blockly/wiki/Lists#getting-and-removing-an-item] (for remove and return) and [https://github.com/google/blockly/wiki/Lists#getting-a-single-item] for '# from end'.
-Blockly.Msg.LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM_END = 'Removes and returns the item at the specified position in a list. #1 is the last item.';
+/// tooltip - See [https://github.com/google/blockly/wiki/Lists#getting-and-removing-an-item] (for remove and return) and [https://github.com/google/blockly/wiki/Lists#getting-a-single-item] for '#' or '# from end'.
+Blockly.Msg.LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM = 'Removes and returns the item at the specified position in a list.';
/// tooltip - See [https://github.com/google/blockly/wiki/Lists#getting-and-removing-an-item] (for remove and return) and [https://github.com/google/blockly/wiki/Lists#getting-a-single-item] for 'first'.
Blockly.Msg.LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FIRST = 'Removes and returns the first item in a list.';
/// tooltip - See [https://github.com/google/blockly/wiki/Lists#getting-and-removing-an-item] (for remove and return) and [https://github.com/google/blockly/wiki/Lists#getting-a-single-item] for 'last'.
Blockly.Msg.LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_LAST = 'Removes and returns the last item in a list.';
/// tooltip - See [https://github.com/google/blockly/wiki/Lists#getting-and-removing-an-item] (for remove and return) and [https://github.com/google/blockly/wiki/Lists#getting-a-single-item] for 'random'.
Blockly.Msg.LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_RANDOM = 'Removes and returns a random item in a list.';
-/// tooltip - See [https://github.com/google/blockly/wiki/Lists#getting-and-removing-an-item] (for remove and return) and [https://github.com/google/blockly/wiki/Lists#getting-a-single-item] for '# from start'.
-Blockly.Msg.LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM_START = 'Removes the item at the specified position in a list. #1 is the first item.';
-/// tooltip - See [https://github.com/google/blockly/wiki/Lists#getting-and-removing-an-item] (for remove and return) and [https://github.com/google/blockly/wiki/Lists#getting-a-single-item] for '# from end'.
-Blockly.Msg.LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM_END = 'Removes the item at the specified position in a list. #1 is the last item.';
+/// tooltip - See [https://github.com/google/blockly/wiki/Lists#getting-and-removing-an-item] (for remove and return) and [https://github.com/google/blockly/wiki/Lists#getting-a-single-item] for '#' or '# from end'.
+Blockly.Msg.LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM = 'Removes the item at the specified position in a list.';
/// tooltip - See [https://github.com/google/blockly/wiki/Lists#getting-and-removing-an-item] (for remove and return) and [https://github.com/google/blockly/wiki/Lists#getting-a-single-item] for 'first'.
Blockly.Msg.LISTS_GET_INDEX_TOOLTIP_REMOVE_FIRST = 'Removes the first item in a list.';
/// tooltip - See [https://github.com/google/blockly/wiki/Lists#getting-and-removing-an-item] (for remove and return) and [https://github.com/google/blockly/wiki/Lists#getting-a-single-item] for 'last'.
@@ -911,9 +894,7 @@ Blockly.Msg.LISTS_SET_INDEX_INSERT = 'insert at';
/// [[File:Blockly-in-list-set-insert.png]]
Blockly.Msg.LISTS_SET_INDEX_INPUT_TO = 'as';
/// tooltip - See [https://github.com/google/blockly/wiki/Lists#getting-a-single-item} (even though the page describes the "get" block, the idea is the same for the "set" block).
-Blockly.Msg.LISTS_SET_INDEX_TOOLTIP_SET_FROM_START = 'Sets the item at the specified position in a list. #1 is the first item.';
-/// tooltip - See [https://github.com/google/blockly/wiki/Lists#getting-a-single-item} (even though the page describes the "get" block, the idea is the same for the "set" block).
-Blockly.Msg.LISTS_SET_INDEX_TOOLTIP_SET_FROM_END = 'Sets the item at the specified position in a list. #1 is the last item.';
+Blockly.Msg.LISTS_SET_INDEX_TOOLTIP_SET_FROM = 'Sets the item at the specified position in a list.';
/// tooltip - See [https://github.com/google/blockly/wiki/Lists#getting-a-single-item} (even though the page describes the "get" block, the idea is the same for the "set" block).
Blockly.Msg.LISTS_SET_INDEX_TOOLTIP_SET_FIRST = 'Sets the first item in a list.';
/// tooltip - See [https://github.com/google/blockly/wiki/Lists#getting-a-single-item} (even though the page describes the "get" block, the idea is the same for the "set" block).
@@ -921,9 +902,7 @@ Blockly.Msg.LISTS_SET_INDEX_TOOLTIP_SET_LAST = 'Sets the last item in a list.';
/// tooltip - See [https://github.com/google/blockly/wiki/Lists#getting-a-single-item} (even though the page describes the "get" block, the idea is the same for the "set" block).
Blockly.Msg.LISTS_SET_INDEX_TOOLTIP_SET_RANDOM = 'Sets a random item in a list.';
/// tooltip - See [https://github.com/google/blockly/wiki/Lists#getting-a-single-item} (even though the page describes the "get" block, the idea is the same for the "insert" block).
-Blockly.Msg.LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_START = 'Inserts the item at the specified position in a list. #1 is the first item.';
-/// tooltip - See [https://github.com/google/blockly/wiki/Lists#getting-a-single-item} (even though the page describes the "get" block, the idea is the same for the "insert" block).
-Blockly.Msg.LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_END = 'Inserts the item at the specified position in a list. #1 is the last item.';
+Blockly.Msg.LISTS_SET_INDEX_TOOLTIP_INSERT_FROM = 'Inserts the item at the specified position in a list.';
/// tooltip - See [https://github.com/google/blockly/wiki/Lists#getting-a-single-item} (even though the page describes the "get" block, the idea is the same for the "insert" block).
Blockly.Msg.LISTS_SET_INDEX_TOOLTIP_INSERT_FIRST = 'Inserts the item at the start of a list.';
/// tooltip - See [https://github.com/google/blockly/wiki/Lists#getting-a-single-item} (even though the page describes the "get" block, the idea is the same for the "insert" block).
diff --git a/php_compressed.js b/php_compressed.js
index 1a4a5147b..f77843760 100644
--- a/php_compressed.js
+++ b/php_compressed.js
@@ -4,33 +4,39 @@
// Copyright 2015 Google Inc. Apache License 2.0
Blockly.PHP=new Blockly.Generator("PHP");Blockly.PHP.addReservedWords("__halt_compiler,abstract,and,array,as,break,callable,case,catch,class,clone,const,continue,declare,default,die,do,echo,else,elseif,empty,enddeclare,endfor,endforeach,endif,endswitch,endwhile,eval,exit,extends,final,for,foreach,function,global,goto,if,implements,include,include_once,instanceof,insteadof,interface,isset,list,namespace,new,or,print,private,protected,public,require,require_once,return,static,switch,throw,trait,try,unset,use,var,while,xor,PHP_VERSION,PHP_MAJOR_VERSION,PHP_MINOR_VERSION,PHP_RELEASE_VERSION,PHP_VERSION_ID,PHP_EXTRA_VERSION,PHP_ZTS,PHP_DEBUG,PHP_MAXPATHLEN,PHP_OS,PHP_SAPI,PHP_EOL,PHP_INT_MAX,PHP_INT_SIZE,DEFAULT_INCLUDE_PATH,PEAR_INSTALL_DIR,PEAR_EXTENSION_DIR,PHP_EXTENSION_DIR,PHP_PREFIX,PHP_BINDIR,PHP_BINARY,PHP_MANDIR,PHP_LIBDIR,PHP_DATADIR,PHP_SYSCONFDIR,PHP_LOCALSTATEDIR,PHP_CONFIG_FILE_PATH,PHP_CONFIG_FILE_SCAN_DIR,PHP_SHLIB_SUFFIX,E_ERROR,E_WARNING,E_PARSE,E_NOTICE,E_CORE_ERROR,E_CORE_WARNING,E_COMPILE_ERROR,E_COMPILE_WARNING,E_USER_ERROR,E_USER_WARNING,E_USER_NOTICE,E_DEPRECATED,E_USER_DEPRECATED,E_ALL,E_STRICT,__COMPILER_HALT_OFFSET__,TRUE,FALSE,NULL,__CLASS__,__DIR__,__FILE__,__FUNCTION__,__LINE__,__METHOD__,__NAMESPACE__,__TRAIT__");
-Blockly.PHP.ORDER_ATOMIC=0;Blockly.PHP.ORDER_CLONE=1;Blockly.PHP.ORDER_NEW=1;Blockly.PHP.ORDER_MEMBER=2;Blockly.PHP.ORDER_FUNCTION_CALL=2;Blockly.PHP.ORDER_INCREMENT=3;Blockly.PHP.ORDER_DECREMENT=3;Blockly.PHP.ORDER_LOGICAL_NOT=4;Blockly.PHP.ORDER_BITWISE_NOT=4;Blockly.PHP.ORDER_UNARY_PLUS=4;Blockly.PHP.ORDER_UNARY_NEGATION=4;Blockly.PHP.ORDER_MULTIPLICATION=5;Blockly.PHP.ORDER_DIVISION=5;Blockly.PHP.ORDER_MODULUS=5;Blockly.PHP.ORDER_ADDITION=6;Blockly.PHP.ORDER_SUBTRACTION=6;
-Blockly.PHP.ORDER_BITWISE_SHIFT=7;Blockly.PHP.ORDER_RELATIONAL=8;Blockly.PHP.ORDER_IN=8;Blockly.PHP.ORDER_INSTANCEOF=8;Blockly.PHP.ORDER_EQUALITY=9;Blockly.PHP.ORDER_BITWISE_AND=10;Blockly.PHP.ORDER_BITWISE_XOR=11;Blockly.PHP.ORDER_BITWISE_OR=12;Blockly.PHP.ORDER_CONDITIONAL=13;Blockly.PHP.ORDER_ASSIGNMENT=14;Blockly.PHP.ORDER_LOGICAL_AND=15;Blockly.PHP.ORDER_LOGICAL_OR=16;Blockly.PHP.ORDER_COMMA=17;Blockly.PHP.ORDER_NONE=99;
+Blockly.PHP.ORDER_ATOMIC=0;Blockly.PHP.ORDER_CLONE=1;Blockly.PHP.ORDER_NEW=1;Blockly.PHP.ORDER_MEMBER=2.1;Blockly.PHP.ORDER_FUNCTION_CALL=2.2;Blockly.PHP.ORDER_POWER=3;Blockly.PHP.ORDER_INCREMENT=4;Blockly.PHP.ORDER_DECREMENT=4;Blockly.PHP.ORDER_BITWISE_NOT=4;Blockly.PHP.ORDER_CAST=4;Blockly.PHP.ORDER_SUPPRESS_ERROR=4;Blockly.PHP.ORDER_INSTANCEOF=5;Blockly.PHP.ORDER_LOGICAL_NOT=6;Blockly.PHP.ORDER_UNARY_PLUS=7.1;Blockly.PHP.ORDER_UNARY_NEGATION=7.2;Blockly.PHP.ORDER_MULTIPLICATION=8.1;
+Blockly.PHP.ORDER_DIVISION=8.2;Blockly.PHP.ORDER_MODULUS=8.3;Blockly.PHP.ORDER_ADDITION=9.1;Blockly.PHP.ORDER_SUBTRACTION=9.2;Blockly.PHP.ORDER_STRING_CONCAT=9.3;Blockly.PHP.ORDER_BITWISE_SHIFT=10;Blockly.PHP.ORDER_RELATIONAL=11;Blockly.PHP.ORDER_EQUALITY=12;Blockly.PHP.ORDER_REFERENCE=13;Blockly.PHP.ORDER_BITWISE_AND=13;Blockly.PHP.ORDER_BITWISE_XOR=14;Blockly.PHP.ORDER_BITWISE_OR=15;Blockly.PHP.ORDER_LOGICAL_AND=16;Blockly.PHP.ORDER_LOGICAL_OR=17;Blockly.PHP.ORDER_IF_NULL=18;
+Blockly.PHP.ORDER_CONDITIONAL=19;Blockly.PHP.ORDER_ASSIGNMENT=20;Blockly.PHP.ORDER_LOGICAL_AND_WEAK=21;Blockly.PHP.ORDER_LOGICAL_XOR=22;Blockly.PHP.ORDER_LOGICAL_OR_WEAK=23;Blockly.PHP.ORDER_COMMA=24;Blockly.PHP.ORDER_NONE=99;
+Blockly.PHP.ORDER_OVERRIDES=[[Blockly.PHP.ORDER_MEMBER,Blockly.PHP.ORDER_FUNCTION_CALL],[Blockly.PHP.ORDER_MEMBER,Blockly.PHP.ORDER_MEMBER],[Blockly.PHP.ORDER_LOGICAL_NOT,Blockly.PHP.ORDER_LOGICAL_NOT],[Blockly.PHP.ORDER_MULTIPLICATION,Blockly.PHP.ORDER_MULTIPLICATION],[Blockly.PHP.ORDER_ADDITION,Blockly.PHP.ORDER_ADDITION],[Blockly.PHP.ORDER_LOGICAL_AND,Blockly.PHP.ORDER_LOGICAL_AND],[Blockly.PHP.ORDER_LOGICAL_OR,Blockly.PHP.ORDER_LOGICAL_OR]];Blockly.PHP.ONE_BASED_INDEXING=!0;
Blockly.PHP.init=function(a){Blockly.PHP.definitions_=Object.create(null);Blockly.PHP.functionNames_=Object.create(null);Blockly.PHP.variableDB_?Blockly.PHP.variableDB_.reset():Blockly.PHP.variableDB_=new Blockly.Names(Blockly.PHP.RESERVED_WORDS_,"$");var b=[];a=Blockly.Variables.allVariables(a);for(var c=0;cc?Blockly.PHP.valueToCode(a,b,Blockly.PHP.ORDER_SUBTRACTION)||g:d?Blockly.PHP.valueToCode(a,b,Blockly.PHP.ORDER_UNARY_NEGATION)||g:Blockly.PHP.valueToCode(a,b,e)||g;if(Blockly.isNumber(a))a=parseFloat(a)+c,d&&(a=-a);else{if(0c&&
+(a=a+" - "+-c,f=Blockly.PHP.ORDER_SUBTRACTION);d&&(a=c?"-("+a+")":"-"+a,f=Blockly.PHP.ORDER_UNARY_NEGATION);f=Math.floor(f);e=Math.floor(e);f&&e>=f&&(a="("+a+")")}return a};Blockly.PHP.lists={};Blockly.PHP.lists_create_empty=function(a){return["array()",Blockly.PHP.ORDER_FUNCTION_CALL]};Blockly.PHP.lists_create_with=function(a){for(var b=Array(a.itemCount_),c=0;c "strnatcasecmp",',' "TEXT" => "strcmp",',' "IGNORE_CASE" => "strcasecmp"'," );"," $sortCmp = $sortCmpFuncs[$type];"," $list2 = $list;",
-" usort($list2, $sortCmp);"," if ($direction == -1) {"," $list2 = array_reverse($list2);"," }"," return $list2;","}"])+"("+b+', "'+a+'", '+c+")",Blockly.PHP.ORDER_FUNCTION_CALL]};
-Blockly.PHP.lists_split=function(a){var b=Blockly.PHP.valueToCode(a,"INPUT",Blockly.PHP.ORDER_MEMBER),c=Blockly.PHP.valueToCode(a,"DELIM",Blockly.PHP.ORDER_NONE)||"''";a=a.getFieldValue("MODE");if("SPLIT"==a)b||(b="''"),a="explode";else if("JOIN"==a)b||(b="array()"),a="implode";else throw"Unknown mode: "+a;return[a+"("+c+", "+b+")",Blockly.PHP.ORDER_FUNCTION_CALL]};Blockly.PHP.math={};Blockly.PHP.math_number=function(a){a=parseFloat(a.getFieldValue("NUM"));Infinity==a?a="INF":-Infinity==a&&(a="-INF");return[a,Blockly.PHP.ORDER_ATOMIC]};
-Blockly.PHP.math_arithmetic=function(a){var b={ADD:[" + ",Blockly.PHP.ORDER_ADDITION],MINUS:[" - ",Blockly.PHP.ORDER_SUBTRACTION],MULTIPLY:[" * ",Blockly.PHP.ORDER_MULTIPLICATION],DIVIDE:[" / ",Blockly.PHP.ORDER_DIVISION],POWER:[null,Blockly.PHP.ORDER_COMMA]}[a.getFieldValue("OP")],c=b[0],b=b[1],d=Blockly.PHP.valueToCode(a,"A",b)||"0";a=Blockly.PHP.valueToCode(a,"B",b)||"0";return c?[d+c+a,b]:["pow("+d+", "+a+")",Blockly.PHP.ORDER_FUNCTION_CALL]};
+Blockly.PHP.lists_indexOf=function(a){var b=Blockly.PHP.valueToCode(a,"FIND",Blockly.PHP.ORDER_NONE)||"''",c=Blockly.PHP.valueToCode(a,"VALUE",Blockly.PHP.ORDER_MEMBER)||"[]";if(Blockly.PHP.ONE_BASED_INDEXING)var d=" 0",e=" + 1";else d=" -1",e="";return[("FIRST"==a.getFieldValue("END")?Blockly.PHP.provideFunction_("indexOf",["function "+Blockly.PHP.FUNCTION_NAME_PLACEHOLDER_+"($haystack, $needle) {"," for ($index = 0; $index < count($haystack); $index++) {"," if ($haystack[$index] == $needle) return $index"+
+e+";"," }"," return "+d+";","}"]):Blockly.PHP.provideFunction_("lastIndexOf",["function "+Blockly.PHP.FUNCTION_NAME_PLACEHOLDER_+"($haystack, $needle) {"," $last = "+d+";"," for ($index = 0; $index < count($haystack); $index++) {"," if ($haystack[$index] == $needle) $last = $index"+e+";"," }"," return $last;","}"]))+"("+c+", "+b+")",Blockly.PHP.ORDER_FUNCTION_CALL]};
+Blockly.PHP.lists_getIndex=function(a){var b=a.getFieldValue("MODE")||"GET";switch(a.getFieldValue("WHERE")||"FROM_START"){case "FIRST":if("GET"==b){var c=Blockly.PHP.valueToCode(a,"VALUE",Blockly.PHP.ORDER_MEMBER)||"array()";return[c+"[0]",Blockly.PHP.ORDER_MEMBER]}if("GET_REMOVE"==b)return c=Blockly.PHP.valueToCode(a,"VALUE",Blockly.PHP.ORDER_NONE)||"array()",["array_shift("+c+")",Blockly.PHP.ORDER_FUNCTION_CALL];if("REMOVE"==b)return c=Blockly.PHP.valueToCode(a,"VALUE",Blockly.PHP.ORDER_NONE)||
+"array()","array_shift("+c+");\n";break;case "LAST":if("GET"==b)return c=Blockly.PHP.valueToCode(a,"VALUE",Blockly.PHP.ORDER_NONE)||"array()",["end("+c+")",Blockly.PHP.ORDER_FUNCTION_CALL];if("GET_REMOVE"==b)return c=Blockly.PHP.valueToCode(a,"VALUE",Blockly.PHP.ORDER_NONE)||"array()",["array_pop("+c+")",Blockly.PHP.ORDER_FUNCTION_CALL];if("REMOVE"==b)return c=Blockly.PHP.valueToCode(a,"VALUE",Blockly.PHP.ORDER_NONE)||"array()","array_pop("+c+");\n";break;case "FROM_START":var d=Blockly.PHP.getAdjusted(a,
+"AT");if("GET"==b)return c=Blockly.PHP.valueToCode(a,"VALUE",Blockly.PHP.ORDER_MEMBER)||"array()",[c+"["+d+"]",Blockly.PHP.ORDER_MEMBER];if("GET_REMOVE"==b)return c=Blockly.PHP.valueToCode(a,"VALUE",Blockly.PHP.ORDER_COMMA)||"array()",["array_splice("+c+", "+d+", 1)[0]",Blockly.PHP.ORDER_FUNCTION_CALL];if("REMOVE"==b)return c=Blockly.PHP.valueToCode(a,"VALUE",Blockly.PHP.ORDER_COMMA)||"array()","array_splice("+c+", "+d+", 1);\n";break;case "FROM_END":if("GET"==b)return c=Blockly.PHP.valueToCode(a,
+"VALUE",Blockly.PHP.ORDER_COMMA)||"array()",d=Blockly.PHP.getAdjusted(a,"AT",1,!0),["array_slice("+c+", "+d+", 1)[0]",Blockly.PHP.ORDER_FUNCTION_CALL];if("GET_REMOVE"==b||"REMOVE"==b){c=Blockly.PHP.valueToCode(a,"VALUE",Blockly.PHP.ORDER_NONE)||"array()";d=Blockly.PHP.getAdjusted(a,"AT",1,!1,Blockly.PHP.ORDER_SUBTRACTION);c="array_splice("+c+", count("+c+") - "+d+", 1)[0]";if("GET_REMOVE"==b)return[c,Blockly.PHP.ORDER_FUNCTION_CALL];if("REMOVE"==b)return c+";\n"}break;case "RANDOM":c=Blockly.PHP.valueToCode(a,
+"VALUE",Blockly.PHP.ORDER_NONE)||"array()";if("GET"==b)return b=Blockly.PHP.provideFunction_("lists_get_random_item",["function "+Blockly.PHP.FUNCTION_NAME_PLACEHOLDER_+"($list) {"," return $list[rand(0,count($list)-1)];","}"]),[b+"("+c+")",Blockly.PHP.ORDER_FUNCTION_CALL];if("GET_REMOVE"==b)return b=Blockly.PHP.provideFunction_("lists_get_remove_random_item",["function "+Blockly.PHP.FUNCTION_NAME_PLACEHOLDER_+"(&$list) {"," $x = rand(0,count($list)-1);"," unset($list[$x]);"," return array_values($list);",
+"}"]),[b+"("+c+")",Blockly.PHP.ORDER_FUNCTION_CALL];if("REMOVE"==b)return b=Blockly.PHP.provideFunction_("lists_remove_random_item",["function "+Blockly.PHP.FUNCTION_NAME_PLACEHOLDER_+"(&$list) {"," unset($list[rand(0,count($list)-1)]);","}"]),b+"("+c+");\n"}throw"Unhandled combination (lists_getIndex).";};
+Blockly.PHP.lists_setIndex=function(a){var b=a.getFieldValue("MODE")||"GET",c=a.getFieldValue("WHERE")||"FROM_START",d=Blockly.PHP.valueToCode(a,"TO",Blockly.PHP.ORDER_ASSIGNMENT)||"null";switch(c){case "FIRST":if("SET"==b)return c=Blockly.PHP.valueToCode(a,"LIST",Blockly.PHP.ORDER_MEMBER)||"array()",c+"[0] = "+d+";\n";if("INSERT"==b)return c=Blockly.PHP.valueToCode(a,"LIST",Blockly.PHP.ORDER_COMMA)||"array()","array_unshift("+c+", "+d+");\n";break;case "LAST":c=Blockly.PHP.valueToCode(a,"LIST",Blockly.PHP.ORDER_COMMA)||
+"array()";if("SET"==b)return b=Blockly.PHP.provideFunction_("lists_set_last_item",["function "+Blockly.PHP.FUNCTION_NAME_PLACEHOLDER_+"(&$list, $value) {"," $list[count($list) - 1] = $value;","}"]),b+"("+c+", "+d+");\n";if("INSERT"==b)return"array_push("+c+", "+d+");\n";break;case "FROM_START":var e=Blockly.PHP.getAdjusted(a,"AT");if("SET"==b)return c=Blockly.PHP.valueToCode(a,"LIST",Blockly.PHP.ORDER_MEMBER)||"array()",c+"["+e+"] = "+d+";\n";if("INSERT"==b)return c=Blockly.PHP.valueToCode(a,"LIST",
+Blockly.PHP.ORDER_COMMA)||"array()","array_splice("+c+", "+e+", 0, "+d+");\n";break;case "FROM_END":c=Blockly.PHP.valueToCode(a,"LIST",Blockly.PHP.ORDER_COMMA)||"array()";e=Blockly.PHP.getAdjusted(a,"AT",1);if("SET"==b)return b=Blockly.PHP.provideFunction_("lists_set_from_end",["function "+Blockly.PHP.FUNCTION_NAME_PLACEHOLDER_+"(&$list, $at, $value) {"," $list[count($list) - $at] = $value;","}"]),b+"("+c+", "+e+", "+d+");\n";if("INSERT"==b)return b=Blockly.PHP.provideFunction_("lists_insert_from_end",
+["function "+Blockly.PHP.FUNCTION_NAME_PLACEHOLDER_+"(&$list, $at, $value) {"," return array_splice($list, count($list) - $at, 0, $value);","}"]),b+"("+c+", "+e+", "+d+");\n";break;case "RANDOM":c=Blockly.PHP.valueToCode(a,"LIST",Blockly.PHP.ORDER_REFERENCE)||"array()";c.match(/^\$\w+$/)?a="":(a=Blockly.PHP.variableDB_.getDistinctName("tmp_list",Blockly.Variables.NAME_TYPE),e=a+" = &"+c+";\n",c=a,a=e);e=Blockly.PHP.variableDB_.getDistinctName("tmp_x",Blockly.Variables.NAME_TYPE);a+=e+" = rand(0, count("+
+c+")-1);\n";if("SET"==b)return a+(c+"["+e+"] = "+d+";\n");if("INSERT"==b)return a+("array_splice("+c+", "+e+", 0, "+d+");\n")}throw"Unhandled combination (lists_setIndex).";};
+Blockly.PHP.lists_getSublist=function(a){var b=Blockly.PHP.valueToCode(a,"LIST",Blockly.PHP.ORDER_COMMA)||"array()",c=a.getFieldValue("WHERE1"),d=a.getFieldValue("WHERE2");if("FIRST"!=c||"LAST"!=d)if(b.match(/^\$\w+$/)||"FROM_END"!=c&&"FROM_START"==d){switch(c){case "FROM_START":var e=Blockly.PHP.getAdjusted(a,"AT1");break;case "FROM_END":e=Blockly.PHP.getAdjusted(a,"AT1",1,!1,Blockly.PHP.ORDER_SUBTRACTION);e="count("+b+") - "+e;break;case "FIRST":e="0";break;default:throw"Unhandled option (lists_getSublist).";
+}switch(d){case "FROM_START":a=Blockly.PHP.getAdjusted(a,"AT2",0,!1,Blockly.PHP.ORDER_SUBTRACTION);c=a+" - ";c=Blockly.isNumber(String(e))||String(e).match(/^\(.+\)$/)?c+e:c+("("+e+")");c+=" + 1";break;case "FROM_END":a=Blockly.PHP.getAdjusted(a,"AT2",0,!1,Blockly.PHP.ORDER_SUBTRACTION);c="count("+b+") - "+a+" - ";c=Blockly.isNumber(String(e))||String(e).match(/^\(.+\)$/)?c+e:c+("("+e+")");break;case "LAST":c="count("+b+") - ";c=Blockly.isNumber(String(e))||String(e).match(/^\(.+\)$/)?c+e:c+("("+
+e+")");break;default:throw"Unhandled option (lists_getSublist).";}b="array_slice("+b+", "+e+", "+c+")"}else e=Blockly.PHP.getAdjusted(a,"AT1"),a=Blockly.PHP.getAdjusted(a,"AT2"),b=Blockly.PHP.provideFunction_("lists_get_sublist",["function "+Blockly.PHP.FUNCTION_NAME_PLACEHOLDER_+"($list, $where1, $at1, $where2, $at2) {"," if ($where1 == 'FROM_END') {"," $at1 = count($list) - 1 - $at1;"," } else if ($where1 == 'FIRST') {"," $at1 = 0;"," } else if ($where1 != 'FROM_START'){"," throw new Exception('Unhandled option (lists_get_sublist).');",
+" }"," $length = 0;"," if ($where2 == 'FROM_START') {"," $length = $at2 - $at1 + 1;"," } else if ($where2 == 'FROM_END') {"," $length = count($list) - $at1 - $at2;"," } else if ($where2 == 'LAST') {"," $length = count($list) - $at1;"," } else {"," throw new Exception('Unhandled option (lists_get_sublist).');"," }"," return array_slice($list, $at1, $length);","}"])+"("+b+", '"+c+"', "+e+", '"+d+"', "+a+")";return[b,Blockly.PHP.ORDER_FUNCTION_CALL]};
+Blockly.PHP.lists_sort=function(a){var b=Blockly.PHP.valueToCode(a,"LIST",Blockly.PHP.ORDER_COMMA)||"array()",c="1"===a.getFieldValue("DIRECTION")?1:-1;a=a.getFieldValue("TYPE");return[Blockly.PHP.provideFunction_("lists_sort",["function "+Blockly.PHP.FUNCTION_NAME_PLACEHOLDER_+"($list, $type, $direction) {"," $sortCmpFuncs = array(",' "NUMERIC" => "strnatcasecmp",',' "TEXT" => "strcmp",',' "IGNORE_CASE" => "strcasecmp"'," );"," $sortCmp = $sortCmpFuncs[$type];"," $list2 = $list;"," usort($list2, $sortCmp);",
+" if ($direction == -1) {"," $list2 = array_reverse($list2);"," }"," return $list2;","}"])+"("+b+', "'+a+'", '+c+")",Blockly.PHP.ORDER_FUNCTION_CALL]};Blockly.PHP.lists_split=function(a){var b=Blockly.PHP.valueToCode(a,"INPUT",Blockly.PHP.ORDER_COMMA),c=Blockly.PHP.valueToCode(a,"DELIM",Blockly.PHP.ORDER_COMMA)||"''";a=a.getFieldValue("MODE");if("SPLIT"==a)b||(b="''"),a="explode";else if("JOIN"==a)b||(b="array()"),a="implode";else throw"Unknown mode: "+a;return[a+"("+c+", "+b+")",Blockly.PHP.ORDER_FUNCTION_CALL]};Blockly.PHP.math={};Blockly.PHP.math_number=function(a){a=parseFloat(a.getFieldValue("NUM"));Infinity==a?a="INF":-Infinity==a&&(a="-INF");return[a,Blockly.PHP.ORDER_ATOMIC]};
+Blockly.PHP.math_arithmetic=function(a){var b={ADD:[" + ",Blockly.PHP.ORDER_ADDITION],MINUS:[" - ",Blockly.PHP.ORDER_SUBTRACTION],MULTIPLY:[" * ",Blockly.PHP.ORDER_MULTIPLICATION],DIVIDE:[" / ",Blockly.PHP.ORDER_DIVISION],POWER:[" ** ",Blockly.PHP.ORDER_POWER]}[a.getFieldValue("OP")],c=b[0],b=b[1],d=Blockly.PHP.valueToCode(a,"A",b)||"0";a=Blockly.PHP.valueToCode(a,"B",b)||"0";return[d+c+a,b]};
Blockly.PHP.math_single=function(a){var b=a.getFieldValue("OP"),c;if("NEG"==b)return a=Blockly.PHP.valueToCode(a,"NUM",Blockly.PHP.ORDER_UNARY_NEGATION)||"0","-"==a[0]&&(a=" "+a),["-"+a,Blockly.PHP.ORDER_UNARY_NEGATION];a="SIN"==b||"COS"==b||"TAN"==b?Blockly.PHP.valueToCode(a,"NUM",Blockly.PHP.ORDER_DIVISION)||"0":Blockly.PHP.valueToCode(a,"NUM",Blockly.PHP.ORDER_NONE)||"0";switch(b){case "ABS":c="abs("+a+")";break;case "ROOT":c="sqrt("+a+")";break;case "LN":c="log("+a+")";break;case "EXP":c="exp("+
a+")";break;case "POW10":c="pow(10,"+a+")";break;case "ROUND":c="round("+a+")";break;case "ROUNDUP":c="ceil("+a+")";break;case "ROUNDDOWN":c="floor("+a+")";break;case "SIN":c="sin("+a+" / 180 * pi())";break;case "COS":c="cos("+a+" / 180 * pi())";break;case "TAN":c="tan("+a+" / 180 * pi())"}if(c)return[c,Blockly.PHP.ORDER_FUNCTION_CALL];switch(b){case "LOG10":c="log("+a+") / log(10)";break;case "ASIN":c="asin("+a+") / pi() * 180";break;case "ACOS":c="acos("+a+") / pi() * 180";break;case "ATAN":c="atan("+
a+") / pi() * 180";break;default:throw"Unknown math operator: "+b;}return[c,Blockly.PHP.ORDER_DIVISION]};Blockly.PHP.math_constant=function(a){return{PI:["M_PI",Blockly.PHP.ORDER_ATOMIC],E:["M_E",Blockly.PHP.ORDER_ATOMIC],GOLDEN_RATIO:["(1 + sqrt(5)) / 2",Blockly.PHP.ORDER_DIVISION],SQRT2:["M_SQRT2",Blockly.PHP.ORDER_ATOMIC],SQRT1_2:["M_SQRT1_2",Blockly.PHP.ORDER_ATOMIC],INFINITY:["INF",Blockly.PHP.ORDER_ATOMIC]}[a.getFieldValue("CONSTANT")]};
@@ -39,33 +45,31 @@ Blockly.PHP.math_number_property=function(a){var b=Blockly.PHP.valueToCode(a,"NU
b+" > 0";break;case "NEGATIVE":d=b+" < 0";break;case "DIVISIBLE_BY":a=Blockly.PHP.valueToCode(a,"DIVISOR",Blockly.PHP.ORDER_MODULUS)||"0",d=b+" % "+a+" == 0"}return[d,Blockly.PHP.ORDER_EQUALITY]};Blockly.PHP.math_change=function(a){var b=Blockly.PHP.valueToCode(a,"DELTA",Blockly.PHP.ORDER_ADDITION)||"0";return Blockly.PHP.variableDB_.getName(a.getFieldValue("VAR"),Blockly.Variables.NAME_TYPE)+" += "+b+";\n"};Blockly.PHP.math_round=Blockly.PHP.math_single;Blockly.PHP.math_trig=Blockly.PHP.math_single;
Blockly.PHP.math_on_list=function(a){var b=a.getFieldValue("OP");switch(b){case "SUM":a=Blockly.PHP.valueToCode(a,"LIST",Blockly.PHP.ORDER_FUNCTION_CALL)||"array()";a="array_sum("+a+")";break;case "MIN":a=Blockly.PHP.valueToCode(a,"LIST",Blockly.PHP.ORDER_FUNCTION_CALL)||"array()";a="min("+a+")";break;case "MAX":a=Blockly.PHP.valueToCode(a,"LIST",Blockly.PHP.ORDER_FUNCTION_CALL)||"array()";a="max("+a+")";break;case "AVERAGE":b=Blockly.PHP.provideFunction_("math_mean",["function "+Blockly.PHP.FUNCTION_NAME_PLACEHOLDER_+
"($myList) {"," return array_sum($myList) / count($myList);","}"]);a=Blockly.PHP.valueToCode(a,"LIST",Blockly.PHP.ORDER_NONE)||"array()";a=b+"("+a+")";break;case "MEDIAN":b=Blockly.PHP.provideFunction_("math_median",["function "+Blockly.PHP.FUNCTION_NAME_PLACEHOLDER_+"($arr) {"," sort($arr,SORT_NUMERIC);"," return (count($arr) % 2) ? $arr[floor(count($arr)/2)] : "," ($arr[floor(count($arr)/2)] + $arr[floor(count($arr)/2) - 1]) / 2;","}"]);a=Blockly.PHP.valueToCode(a,"LIST",Blockly.PHP.ORDER_NONE)||
-"[]";a=b+"("+a+")";break;case "MODE":b=Blockly.PHP.provideFunction_("math_modes",["function "+Blockly.PHP.FUNCTION_NAME_PLACEHOLDER_+"($values) {"," $v = array_count_values($values);"," arsort($v);"," foreach($v as $k => $v){$total = $k; break;}"," return array($total);","}"]);a=Blockly.PHP.valueToCode(a,"LIST",Blockly.PHP.ORDER_NONE)||"[]";a=b+"("+a+")";break;case "STD_DEV":b=Blockly.PHP.provideFunction_("math_standard_deviation",["function "+Blockly.PHP.FUNCTION_NAME_PLACEHOLDER_+"($numbers) {",
-" $n = count($numbers);"," if (!$n) return null;"," $mean = array_sum($numbers) / count($numbers);"," foreach($numbers as $key => $num) $devs[$key] = pow($num - $mean, 2);"," return sqrt(array_sum($devs) / (count($devs) - 1));","}"]);a=Blockly.PHP.valueToCode(a,"LIST",Blockly.PHP.ORDER_NONE)||"[]";a=b+"("+a+")";break;case "RANDOM":b=Blockly.PHP.provideFunction_("math_random_list",["function "+Blockly.PHP.FUNCTION_NAME_PLACEHOLDER_+"($list) {"," $x = rand(0, count($list)-1);"," return $list[$x];",
-"}"]);a=Blockly.PHP.valueToCode(a,"LIST",Blockly.PHP.ORDER_NONE)||"[]";a=b+"("+a+")";break;default:throw"Unknown operator: "+b;}return[a,Blockly.PHP.ORDER_FUNCTION_CALL]};Blockly.PHP.math_modulo=function(a){var b=Blockly.PHP.valueToCode(a,"DIVIDEND",Blockly.PHP.ORDER_MODULUS)||"0";a=Blockly.PHP.valueToCode(a,"DIVISOR",Blockly.PHP.ORDER_MODULUS)||"0";return[b+" % "+a,Blockly.PHP.ORDER_MODULUS]};
+"[]";a=b+"("+a+")";break;case "MODE":b=Blockly.PHP.provideFunction_("math_modes",["function "+Blockly.PHP.FUNCTION_NAME_PLACEHOLDER_+"($values) {"," if (empty($values)) return array();"," $counts = array_count_values($values);"," arsort($counts); // Sort counts in descending order"," $modes = array_keys($counts, current($counts), true);"," return $modes;","}"]);a=Blockly.PHP.valueToCode(a,"LIST",Blockly.PHP.ORDER_NONE)||"[]";a=b+"("+a+")";break;case "STD_DEV":b=Blockly.PHP.provideFunction_("math_standard_deviation",
+["function "+Blockly.PHP.FUNCTION_NAME_PLACEHOLDER_+"($numbers) {"," $n = count($numbers);"," if (!$n) return null;"," $mean = array_sum($numbers) / count($numbers);"," foreach($numbers as $key => $num) $devs[$key] = pow($num - $mean, 2);"," return sqrt(array_sum($devs) / (count($devs) - 1));","}"]);a=Blockly.PHP.valueToCode(a,"LIST",Blockly.PHP.ORDER_NONE)||"[]";a=b+"("+a+")";break;case "RANDOM":b=Blockly.PHP.provideFunction_("math_random_list",["function "+Blockly.PHP.FUNCTION_NAME_PLACEHOLDER_+
+"($list) {"," $x = rand(0, count($list)-1);"," return $list[$x];","}"]);a=Blockly.PHP.valueToCode(a,"LIST",Blockly.PHP.ORDER_NONE)||"[]";a=b+"("+a+")";break;default:throw"Unknown operator: "+b;}return[a,Blockly.PHP.ORDER_FUNCTION_CALL]};Blockly.PHP.math_modulo=function(a){var b=Blockly.PHP.valueToCode(a,"DIVIDEND",Blockly.PHP.ORDER_MODULUS)||"0";a=Blockly.PHP.valueToCode(a,"DIVISOR",Blockly.PHP.ORDER_MODULUS)||"0";return[b+" % "+a,Blockly.PHP.ORDER_MODULUS]};
Blockly.PHP.math_constrain=function(a){var b=Blockly.PHP.valueToCode(a,"VALUE",Blockly.PHP.ORDER_COMMA)||"0",c=Blockly.PHP.valueToCode(a,"LOW",Blockly.PHP.ORDER_COMMA)||"0";a=Blockly.PHP.valueToCode(a,"HIGH",Blockly.PHP.ORDER_COMMA)||"Infinity";return["min(max("+b+", "+c+"), "+a+")",Blockly.PHP.ORDER_FUNCTION_CALL]};
Blockly.PHP.math_random_int=function(a){var b=Blockly.PHP.valueToCode(a,"FROM",Blockly.PHP.ORDER_COMMA)||"0";a=Blockly.PHP.valueToCode(a,"TO",Blockly.PHP.ORDER_COMMA)||"0";return[Blockly.PHP.provideFunction_("math_random_int",["function "+Blockly.PHP.FUNCTION_NAME_PLACEHOLDER_+"($a, $b) {"," if ($a > $b) {"," return rand($b, $a);"," }"," return rand($a, $b);","}"])+"("+b+", "+a+")",Blockly.PHP.ORDER_FUNCTION_CALL]};
Blockly.PHP.math_random_float=function(a){return["(float)rand()/(float)getrandmax()",Blockly.PHP.ORDER_FUNCTION_CALL]};Blockly.PHP.variables={};Blockly.PHP.variables_get=function(a){return[Blockly.PHP.variableDB_.getName(a.getFieldValue("VAR"),Blockly.Variables.NAME_TYPE),Blockly.PHP.ORDER_ATOMIC]};Blockly.PHP.variables_set=function(a){var b=Blockly.PHP.valueToCode(a,"VALUE",Blockly.PHP.ORDER_ASSIGNMENT)||"0";return Blockly.PHP.variableDB_.getName(a.getFieldValue("VAR"),Blockly.Variables.NAME_TYPE)+" = "+b+";\n"};Blockly.PHP.colour={};Blockly.PHP.colour_picker=function(a){return["'"+a.getFieldValue("COLOUR")+"'",Blockly.PHP.ORDER_ATOMIC]};Blockly.PHP.colour_random=function(a){return[Blockly.PHP.provideFunction_("colour_random",["function "+Blockly.PHP.FUNCTION_NAME_PLACEHOLDER_+"() {"," return '#' . str_pad(dechex(mt_rand(0, 0xFFFFFF)), 6, '0', STR_PAD_LEFT);","}"])+"()",Blockly.PHP.ORDER_FUNCTION_CALL]};
-Blockly.PHP.colour_rgb=function(a){var b=Blockly.PHP.valueToCode(a,"RED",Blockly.PHP.ORDER_COMMA)||0,c=Blockly.PHP.valueToCode(a,"GREEN",Blockly.PHP.ORDER_COMMA)||0;a=Blockly.PHP.valueToCode(a,"BLUE",Blockly.PHP.ORDER_COMMA)||0;return[Blockly.PHP.provideFunction_("colour_rgb",["function "+Blockly.PHP.FUNCTION_NAME_PLACEHOLDER_+"($r, $g, $b) {"," $r = round(max(min($r, 100), 0) * 2.55);"," $g = round(max(min($g, 100), 0) * 2.55);"," $b = round(max(min($b, 100), 0) * 2.55);",' $hex = "#";',' $hex .= str_pad(dechex($r), 2, "0", STR_PAD_LEFT);',
-' $hex .= str_pad(dechex($g), 2, "0", STR_PAD_LEFT);',' $hex .= str_pad(dechex($b), 2, "0", STR_PAD_LEFT);'," return $hex;","}"])+"("+b+", "+c+", "+a+")",Blockly.PHP.ORDER_FUNCTION_CALL]};
+Blockly.PHP.colour_rgb=function(a){var b=Blockly.PHP.valueToCode(a,"RED",Blockly.PHP.ORDER_COMMA)||0,c=Blockly.PHP.valueToCode(a,"GREEN",Blockly.PHP.ORDER_COMMA)||0;a=Blockly.PHP.valueToCode(a,"BLUE",Blockly.PHP.ORDER_COMMA)||0;return[Blockly.PHP.provideFunction_("colour_rgb",["function "+Blockly.PHP.FUNCTION_NAME_PLACEHOLDER_+"($r, $g, $b) {"," $r = round(max(min($r, 100), 0) * 2.55);"," $g = round(max(min($g, 100), 0) * 2.55);"," $b = round(max(min($b, 100), 0) * 2.55);"," $hex = '#';"," $hex .= str_pad(dechex($r), 2, '0', STR_PAD_LEFT);",
+" $hex .= str_pad(dechex($g), 2, '0', STR_PAD_LEFT);"," $hex .= str_pad(dechex($b), 2, '0', STR_PAD_LEFT);"," return $hex;","}"])+"("+b+", "+c+", "+a+")",Blockly.PHP.ORDER_FUNCTION_CALL]};
Blockly.PHP.colour_blend=function(a){var b=Blockly.PHP.valueToCode(a,"COLOUR1",Blockly.PHP.ORDER_COMMA)||"'#000000'",c=Blockly.PHP.valueToCode(a,"COLOUR2",Blockly.PHP.ORDER_COMMA)||"'#000000'";a=Blockly.PHP.valueToCode(a,"RATIO",Blockly.PHP.ORDER_COMMA)||.5;return[Blockly.PHP.provideFunction_("colour_blend",["function "+Blockly.PHP.FUNCTION_NAME_PLACEHOLDER_+"($c1, $c2, $ratio) {"," $ratio = max(min($ratio, 1), 0);"," $r1 = hexdec(substr($c1, 1, 2));"," $g1 = hexdec(substr($c1, 3, 2));"," $b1 = hexdec(substr($c1, 5, 2));",
-" $r2 = hexdec(substr($c2, 1, 2));"," $g2 = hexdec(substr($c2, 3, 2));"," $b2 = hexdec(substr($c2, 5, 2));"," $r = round($r1 * (1 - $ratio) + $r2 * $ratio);"," $g = round($g1 * (1 - $ratio) + $g2 * $ratio);"," $b = round($b1 * (1 - $ratio) + $b2 * $ratio);",' $hex = "#";',' $hex .= str_pad(dechex($r), 2, "0", STR_PAD_LEFT);',' $hex .= str_pad(dechex($g), 2, "0", STR_PAD_LEFT);',' $hex .= str_pad(dechex($b), 2, "0", STR_PAD_LEFT);'," return $hex;","}"])+"("+b+", "+c+", "+a+")",Blockly.PHP.ORDER_FUNCTION_CALL]};Blockly.PHP.procedures={};
-Blockly.PHP.procedures_defreturn=function(a){for(var b=a.workspace.variableList,c=b.length-1;0<=c;c--){var d=b[c];-1==a.arguments_.indexOf(d)?b[c]=Blockly.PHP.variableDB_.getName(d,Blockly.Variables.NAME_TYPE):b.splice(c,1)}b=b.length?" global "+b.join(", ")+";\n":"";c=Blockly.PHP.variableDB_.getName(a.getFieldValue("NAME"),Blockly.Procedures.NAME_TYPE);d=Blockly.PHP.statementToCode(a,"STACK");Blockly.PHP.STATEMENT_PREFIX&&(d=Blockly.PHP.prefixLines(Blockly.PHP.STATEMENT_PREFIX.replace(/%1/g,"'"+
-a.id+"'"),Blockly.PHP.INDENT)+d);Blockly.PHP.INFINITE_LOOP_TRAP&&(d=Blockly.PHP.INFINITE_LOOP_TRAP.replace(/%1/g,"'"+a.id+"'")+d);var e=Blockly.PHP.valueToCode(a,"RETURN",Blockly.PHP.ORDER_NONE)||"";e&&(e=" return "+e+";\n");for(var g=[],f=0;fc?"int("+a+" - "+-c+")":"int("+a+")",d&&(a="-"+a));return a};Blockly.Python.lists={};Blockly.Python.lists_create_empty=function(a){return["[]",Blockly.Python.ORDER_ATOMIC]};Blockly.Python.lists_create_with=function(a){for(var b=Array(a.itemCount_),c=0;ca?Blockly.Python.ORDER_UNARY_SIGN:Blockly.Python.ORDER_ATOMIC;return[a,b]};
Blockly.Python.math_arithmetic=function(a){var b={ADD:[" + ",Blockly.Python.ORDER_ADDITIVE],MINUS:[" - ",Blockly.Python.ORDER_ADDITIVE],MULTIPLY:[" * ",Blockly.Python.ORDER_MULTIPLICATIVE],DIVIDE:[" / ",Blockly.Python.ORDER_MULTIPLICATIVE],POWER:[" ** ",Blockly.Python.ORDER_EXPONENTIATION]}[a.getFieldValue("OP")],c=b[0],b=b[1],d=Blockly.Python.valueToCode(a,"A",b)||"0";a=Blockly.Python.valueToCode(a,"B",b)||"0";return[d+c+a,b]};
Blockly.Python.math_single=function(a){var b=a.getFieldValue("OP"),c;if("NEG"==b)return c=Blockly.Python.valueToCode(a,"NUM",Blockly.Python.ORDER_UNARY_SIGN)||"0",["-"+c,Blockly.Python.ORDER_UNARY_SIGN];Blockly.Python.definitions_.import_math="import math";a="SIN"==b||"COS"==b||"TAN"==b?Blockly.Python.valueToCode(a,"NUM",Blockly.Python.ORDER_MULTIPLICATIVE)||"0":Blockly.Python.valueToCode(a,"NUM",Blockly.Python.ORDER_NONE)||"0";switch(b){case "ABS":c="math.fabs("+a+")";break;case "ROOT":c="math.sqrt("+
@@ -49,28 +49,28 @@ Blockly.Python.colour_rgb=function(a){var b=Blockly.Python.provideFunction_("col
0;return[b+"("+c+", "+d+", "+a+")",Blockly.Python.ORDER_FUNCTION_CALL]};
Blockly.Python.colour_blend=function(a){var b=Blockly.Python.provideFunction_("colour_blend",["def "+Blockly.Python.FUNCTION_NAME_PLACEHOLDER_+"(colour1, colour2, ratio):"," r1, r2 = int(colour1[1:3], 16), int(colour2[1:3], 16)"," g1, g2 = int(colour1[3:5], 16), int(colour2[3:5], 16)"," b1, b2 = int(colour1[5:7], 16), int(colour2[5:7], 16)"," ratio = min(1, max(0, ratio))"," r = round(r1 * (1 - ratio) + r2 * ratio)"," g = round(g1 * (1 - ratio) + g2 * ratio)"," b = round(b1 * (1 - ratio) + b2 * ratio)",
" return '#%02x%02x%02x' % (r, g, b)"]),c=Blockly.Python.valueToCode(a,"COLOUR1",Blockly.Python.ORDER_NONE)||"'#000000'",d=Blockly.Python.valueToCode(a,"COLOUR2",Blockly.Python.ORDER_NONE)||"'#000000'";a=Blockly.Python.valueToCode(a,"RATIO",Blockly.Python.ORDER_NONE)||0;return[b+"("+c+", "+d+", "+a+")",Blockly.Python.ORDER_FUNCTION_CALL]};Blockly.Python.procedures={};
-Blockly.Python.procedures_defreturn=function(a){for(var b=a.workspace.variableList,c=b.length-1;0<=c;c--){var d=b[c];-1==a.arguments_.indexOf(d)?b[c]=Blockly.Python.variableDB_.getName(d,Blockly.Variables.NAME_TYPE):b.splice(c,1)}b=b.length?" global "+b.join(", ")+"\n":"";c=Blockly.Python.variableDB_.getName(a.getFieldValue("NAME"),Blockly.Procedures.NAME_TYPE);d=Blockly.Python.statementToCode(a,"STACK");Blockly.Python.STATEMENT_PREFIX&&(d=Blockly.Python.prefixLines(Blockly.Python.STATEMENT_PREFIX.replace(/%1/g,"'"+
-a.id+"'"),Blockly.Python.INDENT)+d);Blockly.Python.INFINITE_LOOP_TRAP&&(d=Blockly.Python.INFINITE_LOOP_TRAP.replace(/%1/g,'"'+a.id+'"')+d);var e=Blockly.Python.valueToCode(a,"RETURN",Blockly.Python.ORDER_NONE)||"";e?e=" return "+e+"\n":d||(d=Blockly.Python.PASS);for(var g=[],f=0;f= stop:"," yield start"," start -= abs(step)"])};a=function(a,b,c){return"("+a+" <= "+b+") and "+h()+"("+a+", "+b+", "+c+") or "+k()+"("+a+", "+b+", "+c+")"};if(Blockly.isNumber(c)&&Blockly.isNumber(d)&&
-Blockly.isNumber(e))c=parseFloat(c),d=parseFloat(d),e=Math.abs(parseFloat(e)),0===c%1&&0===d%1&&0===e%1?(c<=d?(d++,a=0==c&&1==e?d:c+", "+d,1!=e&&(a+=", "+e)):(d--,a=c+", "+d+", -"+e),a="range("+a+")"):(a=c",GTE:">="}[a.getFieldValue("OP")],c=Blockly.Python.ORDER_RELATIONAL,d=Blockly.Python.valueToCode(a,"A",c)||"0";a=Blockly.Python.valueToCode(a,"B",c)||"0";return[d+" "+b+" "+a,c]};
diff --git a/tests/generators/colour.xml b/tests/generators/colour.xml
index 78ac58516..bae853d4d 100644
--- a/tests/generators/colour.xml
+++ b/tests/generators/colour.xml
@@ -3,7 +3,11 @@
test colour picker
- static colour
+
+
+ static colour
+
+ #ff6600
@@ -21,7 +25,11 @@
test rgb
- from rgb
+
+
+ from rgb
+
+
@@ -88,7 +96,11 @@
- test name
+
+
+ test name
+
+
@@ -105,7 +117,11 @@
- test name
+
+
+ test name
+
+
@@ -137,7 +153,11 @@
- test name
+
+
+ test name
+
+ TRUE
@@ -192,7 +212,11 @@
test blend
- blend
+
+
+ blend
+
+
diff --git a/tests/generators/functions.xml b/tests/generators/functions.xml
index ce450b11a..b189ed355 100644
--- a/tests/generators/functions.xml
+++ b/tests/generators/functions.xml
@@ -8,7 +8,11 @@
- test recurse
+
+
+ test recurse
+
+
@@ -53,7 +57,11 @@
- procedure with global
+
+
+ procedure with global
+
+ proc z
@@ -84,7 +92,11 @@
- procedure no return
+
+
+ procedure no return
+
+ TRUE
@@ -111,7 +123,11 @@
- procedure return
+
+
+ procedure return
+
+ FALSE
@@ -192,7 +208,11 @@
test function
- function with arguments
+
+
+ function with arguments
+
+
@@ -218,7 +238,11 @@
- function with side effect
+
+
+ function with side effect
+
+ func z
@@ -247,7 +271,11 @@
- function with global
+
+
+ function with global
+
+
@@ -267,7 +295,11 @@
- function with scope
+
+
+ function with scope
+
+ func a
@@ -280,7 +312,11 @@
- function return
+
+
+ function return
+
+ TRUE
@@ -296,7 +332,11 @@
- function no return
+
+
+ function no return
+
+ FALSE
diff --git a/tests/generators/index.html b/tests/generators/index.html
index 2038afb9e..d227f60c9 100644
--- a/tests/generators/index.html
+++ b/tests/generators/index.html
@@ -153,17 +153,23 @@ function toXml() {
}
function toJavaScript() {
+ var oneBasedIndexing = document.getElementById('indexing').checked;
+ Blockly.JavaScript.ONE_BASED_INDEXING = oneBasedIndexing;
var code = '\'use strict\';\n\n'
code += Blockly.JavaScript.workspaceToCode(workspace);
setOutput(code);
}
function toPython() {
+ var oneBasedIndexing = document.getElementById('indexing').checked;
+ Blockly.Python.ONE_BASED_INDEXING = oneBasedIndexing;
var code = Blockly.Python.workspaceToCode(workspace);
setOutput(code);
}
function toPhp() {
+ var oneBasedIndexing = document.getElementById('indexing').checked;
+ Blockly.PHP.ONE_BASED_INDEXING = oneBasedIndexing;
var code = Blockly.PHP.workspaceToCode(workspace);
setOutput(code);
}
@@ -174,6 +180,8 @@ function toLua() {
}
function toDart() {
+ var oneBasedIndexing = document.getElementById('indexing').checked;
+ Blockly.Dart.ONE_BASED_INDEXING = oneBasedIndexing;
var code = Blockly.Dart.workspaceToCode(workspace);
setOutput(code);
}
@@ -212,9 +220,22 @@ h1 {
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -304,6 +325,10 @@ h1 {
+