MAGETWO-64081: Merge branch 'fix/config-field-map-add-button' of github.com:diglin/magento2 into MAGETWO-64081

ishakhsuvarov · ishakhsuvarov · commit 1ad873e6ced8 · 2017-02-02T12:57:19.000+02:00
diff --git a/app/code/Magento/Config/Block/System/Config/Form/Field/FieldArray/AbstractFieldArray.php b/app/code/Magento/Config/Block/System/Config/Form/Field/FieldArray/AbstractFieldArray.php
@@ -279,4 +279,12 @@ public function getColumns()
     {
         return $this->_columns;
     }
+
+    /**
+     * @return string
+     */
+    public function getAddButtonLabel()
+    {
+        return $this->_addButtonLabel;
+    }
 }
diff --git a/app/code/Magento/Config/view/adminhtml/templates/system/config/form/field/array.phtml b/app/code/Magento/Config/view/adminhtml/templates/system/config/form/field/array.phtml
@@ -28,7 +28,7 @@ $_colspan = $block->isAddAfter() ? 2 : 1;
             <tr>
                 <td colspan="<?php echo count($block->getColumns())+$_colspan; ?>" class="col-actions-add">
                     <button id="addToEndBtn<?php /* @escapeNotVerified */ echo $_htmlId; ?>" class="action-add" title="<?php /* @escapeNotVerified */ echo __('Add'); ?>" type="button">
-                        <span><?php /* @escapeNotVerified */ echo $block->getAddButtonLabel(); ?><?php /* @escapeNotVerified */ echo __('Add'); ?></span>
+                        <span><?php /* @escapeNotVerified */ echo $block->getAddButtonLabel(); ?></span>
                     </button>
                 </td>
             </tr>

Original file line number	Diff line number	Diff line change
`@@ -279,4 +279,12 @@ public function getColumns()`
`279`	`279`	`{`
`280`	`280`	`return $this->_columns;`
`281`	`281`	`}`
	`282`	`+`
	`283`	`+ /**`
	`284`	`+ * @return string`
	`285`	`+ */`
	`286`	`+ public function getAddButtonLabel()`
	`287`	`+ {`
	`288`	`+ return $this->_addButtonLabel;`
	`289`	`+ }`
`282`	`290`	`}`