Skip to content

Commit 447e70c

Browse files
author
Yu Tang
committed
Merge remote-tracking branch 'mainline/develop' into FearlessKiwis-MAGETWO-44491-Rename-Dispatch-Execute
2 parents cc68d2d + 80c5e2b commit 447e70c

File tree

165 files changed

+8058
-3961
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

165 files changed

+8058
-3961
lines changed

‎app/code/Magento/Backend/i18n/de_DE.csv

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -606,3 +606,11 @@ Tags,Tags
606606
Options,Options
607607
"Magento Admin","Magento Admin"
608608
"Community Edition","Community Edition"
609+
Marketing,Marketing
610+
Communications,Communications
611+
"SEO & Search","SEO & Search"
612+
"User Content","User Content"
613+
"Data Transfer","Data Transfer"
614+
"Import History","Import History"
615+
Extensions,Extensions
616+
"Web Setup Wizard","Web Setup Wizard"

‎app/code/Magento/Backend/i18n/en_US.csv

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -606,3 +606,11 @@ Tags,Tags
606606
Options,Options
607607
"Magento Admin","Magento Admin"
608608
"Community Edition","Community Edition"
609+
Marketing,Marketing
610+
Communications,Communications
611+
"SEO & Search","SEO & Search"
612+
"User Content","User Content"
613+
"Data Transfer","Data Transfer"
614+
"Import History","Import History"
615+
Extensions,Extensions
616+
"Web Setup Wizard","Web Setup Wizard"

‎app/code/Magento/Backend/i18n/es_ES.csv

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -606,3 +606,11 @@ Tags,Tags
606606
Options,Options
607607
"Magento Admin","Magento Admin"
608608
"Community Edition","Community Edition"
609+
Marketing,Marketing
610+
Communications,Communications
611+
"SEO & Search","SEO & Search"
612+
"User Content","User Content"
613+
"Data Transfer","Data Transfer"
614+
"Import History","Import History"
615+
Extensions,Extensions
616+
"Web Setup Wizard","Web Setup Wizard"

‎app/code/Magento/Backend/i18n/fr_FR.csv

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -606,3 +606,11 @@ Tags,Tags
606606
Options,Options
607607
"Magento Admin","Magento Admin"
608608
"Community Edition","Community Edition"
609+
Marketing,Marketing
610+
Communications,Communications
611+
"SEO & Search","SEO & Search"
612+
"User Content","User Content"
613+
"Data Transfer","Data Transfer"
614+
"Import History","Import History"
615+
Extensions,Extensions
616+
"Web Setup Wizard","Web Setup Wizard"

‎app/code/Magento/Backend/i18n/nl_NL.csv

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -606,3 +606,11 @@ Tags,Tags
606606
Options,Options
607607
"Magento Admin","Magento Admin"
608608
"Community Edition","Community Edition"
609+
Marketing,Marketing
610+
Communications,Communications
611+
"SEO & Search","SEO & Search"
612+
"User Content","User Content"
613+
"Data Transfer","Data Transfer"
614+
"Import History","Import History"
615+
Extensions,Extensions
616+
"Web Setup Wizard","Web Setup Wizard"

‎app/code/Magento/Backend/i18n/pt_BR.csv

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -606,3 +606,11 @@ Tags,Tags
606606
Options,Options
607607
"Magento Admin","Magento Admin"
608608
"Community Edition","Community Edition"
609+
Marketing,Marketing
610+
Communications,Communications
611+
"SEO & Search","SEO & Search"
612+
"User Content","User Content"
613+
"Data Transfer","Data Transfer"
614+
"Import History","Import History"
615+
Extensions,Extensions
616+
"Web Setup Wizard","Web Setup Wizard"

‎app/code/Magento/Backend/i18n/zh_Hans_CN.csv

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -606,3 +606,11 @@ Tags,Tags
606606
Options,Options
607607
"Magento Admin","Magento Admin"
608608
"Community Edition","Community Edition"
609+
Marketing,Marketing
610+
Communications,Communications
611+
"SEO & Search","SEO & Search"
612+
"User Content","User Content"
613+
"Data Transfer","Data Transfer"
614+
"Import History","Import History"
615+
Extensions,Extensions
616+
"Web Setup Wizard","Web Setup Wizard"

‎app/code/Magento/Braintree/view/frontend/templates/creditcard/edit.phtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
/** @var $block \Magento\Braintree\Block\Creditcard\Management */
1010

1111
echo $block->getLayout()->getMessagesBlock()->getGroupedHtml();
12-
$defaultExpMonth = $block->getTodayMonth();
13-
$defaultExpYear = $block->getTodayYear();
12+
$defaultExpMonth = '';
13+
$defaultExpYear = '';
1414
$countrySpecificCardTypeConfig = $block->getCountrySpecificCardTypeConfig();
1515
$applicableCardTypeConfig = $block->getCcApplicableTypes();
1616
if ($block->isEditMode()) {

‎app/code/Magento/Catalog/i18n/de_DE.csv

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,8 @@ Empty,Leer
161161
"Add New Attribute Set","Neuer Eigenschaftensatz hinzufügen"
162162
"Add New Set","Neuen Satz hinzufügen"
163163
"Attribute Sets","Attribute Sets"
164+
"Product Templates","Product Templates"
165+
"Product Template","Product Template"
164166
"Close Window","Fenster Schließen"
165167
"New Product","Neues Produkt"
166168
"Save & Edit","Save & Edit"
@@ -281,6 +283,7 @@ Categories,Kategorien
281283
"You saved the attribute set.","You saved the attribute set."
282284
"An error occurred while saving the attribute set.","Beim Speichern des Eigenschaftensatzes ist ein Fehler aufgetreten."
283285
"New Attribute Set","New Attribute Set"
286+
"New Product Template","New Product Template"
284287
"The attribute set has been removed.","The attribute set has been removed."
285288
"An error occurred while deleting this set.","An error occurred while deleting this set."
286289
"Search Terms","Search Terms"

‎app/code/Magento/Catalog/i18n/en_US.csv

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,8 @@ Empty,Empty
161161
"Add New Attribute Set","Add New Attribute Set"
162162
"Add New Set","Add New Set"
163163
"Attribute Sets","Attribute Sets"
164+
"Product Templates","Product Templates"
165+
"Product Template","Product Template"
164166
"Close Window","Close Window"
165167
"New Product","New Product"
166168
"Save & Edit","Save & Edit"
@@ -281,6 +283,7 @@ Categories,Categories
281283
"You saved the attribute set.","You saved the attribute set."
282284
"An error occurred while saving the attribute set.","An error occurred while saving the attribute set."
283285
"New Attribute Set","New Attribute Set"
286+
"New Product Template","New Product Template"
284287
"The attribute set has been removed.","The attribute set has been removed."
285288
"An error occurred while deleting this set.","An error occurred while deleting this set."
286289
"Search Terms","Search Terms"

‎app/code/Magento/Catalog/i18n/es_ES.csv

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,8 @@ Empty,Vacío(a)
161161
"Add New Attribute Set","Agregar nuevo conjunto de atributos"
162162
"Add New Set","Agregar nuevo conjunto"
163163
"Attribute Sets","Attribute Sets"
164+
"Product Templates","Product Templates"
165+
"Product Template","Product Template"
164166
"Close Window","Cerrar Ventana"
165167
"New Product","Nuevo producto"
166168
"Save & Edit","Save & Edit"
@@ -281,6 +283,7 @@ Categories,Categorías
281283
"You saved the attribute set.","You saved the attribute set."
282284
"An error occurred while saving the attribute set.","Se produjo un error mientras se guardaba el conjunto de atributos."
283285
"New Attribute Set","New Attribute Set"
286+
"New Product Template","New Product Template"
284287
"The attribute set has been removed.","The attribute set has been removed."
285288
"An error occurred while deleting this set.","An error occurred while deleting this set."
286289
"Search Terms","Search Terms"

‎app/code/Magento/Catalog/i18n/fr_FR.csv

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,8 @@ Empty,Vide
161161
"Add New Attribute Set","Ajouter un nouveau jeu d'attributs"
162162
"Add New Set","Ajouter une nouvelle série"
163163
"Attribute Sets","Attribute Sets"
164+
"Product Templates","Product Templates"
165+
"Product Template","Product Template"
164166
"Close Window","Fermer la fenêtre"
165167
"New Product","Nouveau produit"
166168
"Save & Edit","Save & Edit"
@@ -281,6 +283,7 @@ Categories,catégories
281283
"You saved the attribute set.","You saved the attribute set."
282284
"An error occurred while saving the attribute set.","Une erreur est survenue pendant la sauvegarde de la série d'attributs."
283285
"New Attribute Set","New Attribute Set"
286+
"New Product Template","New Product Template"
284287
"The attribute set has been removed.","The attribute set has been removed."
285288
"An error occurred while deleting this set.","An error occurred while deleting this set."
286289
"Search Terms","Search Terms"

‎app/code/Magento/Catalog/i18n/nl_NL.csv

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,8 @@ Empty,Leeg
161161
"Add New Attribute Set","Voeg Nieuwe Attribuut Set toe"
162162
"Add New Set","Voeg Nieuwe Reeks Toe"
163163
"Attribute Sets","Attribute Sets"
164+
"Product Templates","Product Templates"
165+
"Product Template","Product Template"
164166
"Close Window","Venster Sluiten"
165167
"New Product","Nieuw Product"
166168
"Save & Edit","Save & Edit"
@@ -281,6 +283,7 @@ Categories,Categoriën
281283
"You saved the attribute set.","You saved the attribute set."
282284
"An error occurred while saving the attribute set.","Er is een fout opgetreden tijdens het opslaan van de attribuut set."
283285
"New Attribute Set","New Attribute Set"
286+
"New Product Template","New Product Template"
284287
"The attribute set has been removed.","The attribute set has been removed."
285288
"An error occurred while deleting this set.","An error occurred while deleting this set."
286289
"Search Terms","Search Terms"

‎app/code/Magento/Catalog/i18n/pt_BR.csv

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,8 @@ Empty,Vazio
161161
"Add New Attribute Set","Adicionar Novo Conjunto de Atributos"
162162
"Add New Set","Adicionar Novo Conjunto"
163163
"Attribute Sets","Attribute Sets"
164+
"Product Templates","Product Templates"
165+
"Product Template","Product Template"
164166
"Close Window","Fechar Janela"
165167
"New Product","Novo Produto"
166168
"Save & Edit","Save & Edit"
@@ -281,6 +283,7 @@ Categories,Categorias
281283
"You saved the attribute set.","You saved the attribute set."
282284
"An error occurred while saving the attribute set.","Ocorreu um erro ao salvar o conjunto de atributos."
283285
"New Attribute Set","New Attribute Set"
286+
"New Product Template","New Product Template"
284287
"The attribute set has been removed.","The attribute set has been removed."
285288
"An error occurred while deleting this set.","An error occurred while deleting this set."
286289
"Search Terms","Search Terms"

‎app/code/Magento/Catalog/i18n/zh_Hans_CN.csv

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,8 @@ Empty,空
161161
"Add New Attribute Set",添加新属性集
162162
"Add New Set",添加新集
163163
"Attribute Sets","Attribute Sets"
164+
"Product Templates","Product Templates"
165+
"Product Template","Product Template"
164166
"Close Window",关闭窗口
165167
"New Product",新产品
166168
"Save & Edit","Save & Edit"
@@ -281,6 +283,7 @@ Categories,分类
281283
"You saved the attribute set.","You saved the attribute set."
282284
"An error occurred while saving the attribute set.",保存属性集时发生错误。
283285
"New Attribute Set","New Attribute Set"
286+
"New Product Template","New Product Template"
284287
"The attribute set has been removed.","The attribute set has been removed."
285288
"An error occurred while deleting this set.","An error occurred while deleting this set."
286289
"Search Terms","Search Terms"

‎app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/checkboxes/tree.phtml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@
1010

1111
<?php $_divId = 'tree-div_' . time() ?>
1212
<div id="<?php /* @escapeNotVerified */ echo $_divId ?>" class="tree"></div>
13-
<!--[if IE]>
1413
<script id="ie-deferred-loader" defer="defer" src=""></script>
15-
<![endif]-->
1614
<script>
1715
require([
1816
'jquery',

‎app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/tree.phtml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,7 @@
3535
<div><?php /* @escapeNotVerified */ echo __('This operation can take a long time'); ?></div>
3636
</div>
3737
</div>
38-
<!--[if IE]>
3938
<script id="ie-deferred-loader" defer="defer" src=""></script>
40-
<![endif]-->
4139
<script>
4240
var tree;
4341
require([

‎app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/widget/tree.phtml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,8 @@
1010

1111
<?php $_divId = 'tree' . $block->getId() ?>
1212
<div id="<?php /* @escapeNotVerified */ echo $_divId ?>" class="tree"></div>
13-
<!--[if IE]>
1413
<script id="ie-deferred-loader" defer="defer" src=""></script>
15-
<![endif]-->
14+
<![]-->
1615
<script>
1716
require(['jquery', "prototype", "extjs/ext-tree-checkbox"], function(jQuery){
1817

‎app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/main.phtml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,7 @@
3838
<span class="title"><?php /* @escapeNotVerified */ echo __('Unassigned Attributes') ?></span>
3939
</div>
4040
<div id="tree-div2" class="attribute-set-tree"></div>
41-
<!--[if IE]>
4241
<script id="ie-deferred-loader" defer="defer" src=""></script>
43-
<![endif]-->
4442
<script>
4543
define("tree-panel",
4644
[

‎app/code/Magento/Checkout/view/frontend/web/js/sidebar.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,9 @@ define([
5353
actions: {
5454
confirm: function () {
5555
self._removeItem($(event.currentTarget));
56+
},
57+
always: function (event) {
58+
event.stopImmediatePropagation();
5659
}
5760
}
5861
});

‎app/code/Magento/Checkout/view/frontend/web/template/cart/totals/grand-total.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
-->
77
<tr class="grand totals">
88
<th class="mark" colspan="1" scope="row">
9-
<strong data-bind="text: $t(title)"></strong>
9+
<strong data-bind="text: title"></strong>
1010
</th>
1111
<td class="amount" data-th="Order Total">
1212
<strong><span class="price" data-bind="text: getValue()"></span></strong>

‎app/code/Magento/Checkout/view/frontend/web/template/cart/totals/shipping.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
-->
77
<!-- ko if: isCalculated() -->
88
<tr class="totals shipping excl">
9-
<th class="mark" colspan="1" scope="row" data-bind="text: $t(title) + ' (' + $t(getShippingMethodTitle()) + ')'"></th>
9+
<th class="mark" colspan="1" scope="row" data-bind="text: title + ' (' + getShippingMethodTitle() + ')'"></th>
1010
<td class="amount">
1111
<span class="price" data-bind="text: getValue()"></span>
1212
</td>

‎app/code/Magento/Checkout/view/frontend/web/template/cart/totals/subtotal.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*/
66
-->
77
<tr class="totals sub">
8-
<th class="mark" colspan="1" scope="row" data-bind="text: $t(title)"></th>
8+
<th class="mark" colspan="1" scope="row" data-bind="text: title"></th>
99
<td class="amount" data-th="Subtotal">
1010
<span class="price" data-bind="text: getValue()"></span>
1111
</td>

‎app/code/Magento/Checkout/view/frontend/web/template/estimation.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<div class="opc-estimated-wrapper" data-bind="blockLoader: isLoading">
88
<div class="estimated-block">
99
<span class="estimated-label" data-bind="i18n: 'Estimated Total'"></span>
10-
<span class="estimated-price" data-bind="i18n: getValue()"></span>
10+
<span class="estimated-price" data-bind="text: getValue()"></span>
1111
</div>
1212
<div class="minicart-wrapper">
1313
<button type="button" class="action showcart" data-bind="click: showSidebar" data-toggle="opc-summary">

‎app/code/Magento/Checkout/view/frontend/web/template/payment.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*/
66
-->
77
<li id="payment" role="presentation" class="checkout-payment-method" data-bind="fadeVisible: isVisible">
8-
<div class="step-title" data-bind="i18n: title" data-role="title"></div>
8+
<div class="step-title" data-bind="text: title" data-role="title"></div>
99
<div id="checkout-step-payment"
1010
class="step-content"
1111
data-role="content"

‎app/code/Magento/Checkout/view/frontend/web/template/progress-bar.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<ul class="opc-progress-bar">
88
<!-- ko foreach: { data: steps().sort(sortItems), as: 'item' } -->
99
<li class="opc-progress-bar-item" data-bind="css: item.isVisible() ? '_active' : ($parent.isProcessed(item) ? '_complete' : '')">
10-
<span data-bind="i18n: item.title, click: $parent.navigateTo"></span>
10+
<span data-bind="text: item.title, click: $parent.navigateTo"></span>
1111
</li>
1212
<!-- /ko -->
1313
</ul>

‎app/code/Magento/Checkout/view/frontend/web/template/registration.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@
1313
</form>
1414
<!-- /ko -->
1515
<!-- ko if: accountCreated -->
16-
<p data-bind="i18n: $t('A letter with further instructions will be sent to your email.')"></p>
16+
<p data-bind="i18n: 'A letter with further instructions will be sent to your email.'"></p>
1717
<!-- /ko -->
1818
</div>

‎app/code/Magento/Checkout/view/frontend/web/template/shipping-information.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
</button>
2929
</div>
3030
<div class="shipping-information-content">
31-
<span class="value" data-bind="i18n: getShippingMethodTitle()"></span>
31+
<span class="value" data-bind="text: getShippingMethodTitle()"></span>
3232
</div>
3333
</div>
3434
</div>

‎app/code/Magento/Checkout/view/frontend/web/template/shipping.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,17 +112,17 @@
112112
</td>
113113

114114
<td class="col col-method"
115-
data-bind="i18n: method.method_title, attr: {'id': 'label_method_' + method.method_code + '_' + method.carrier_code}"></td>
115+
data-bind="text: method.method_title, attr: {'id': 'label_method_' + method.method_code + '_' + method.carrier_code}"></td>
116116

117117
<td class="col col-carrier"
118-
data-bind="i18n: method.carrier_title, attr: {'id': 'label_carrier_' + method.method_code + '_' + method.carrier_code}"></td>
118+
data-bind="text: method.carrier_title, attr: {'id': 'label_carrier_' + method.method_code + '_' + method.carrier_code}"></td>
119119
</tr>
120120

121121
<!-- ko if: method.error_message -->
122122
<tr class="row row-error">
123123
<td class="col col-error" colspan="4">
124124
<div class="message error">
125-
<div data-bind="i18n: method.error_message"></div>
125+
<div data-bind="text: method.error_message"></div>
126126
</div>
127127
<span class="no-display">
128128
<input name="shipping_method" type="radio" data-bind="attr: {'value' : method.method_code, 'id': 's_method_' + method.method_code}"/>
@@ -143,7 +143,7 @@
143143
</div>
144144
<!-- ko if: errorValidationMessage().length > 0 -->
145145
<div class="message notice">
146-
<span><!-- ko i18n: errorValidationMessage()--><!-- /ko --></span>
146+
<span><!-- ko text: errorValidationMessage()--><!-- /ko --></span>
147147
</div>
148148
<!-- /ko -->
149149
<div class="actions-toolbar" id="shipping-method-buttons-container">

‎app/code/Magento/Checkout/view/frontend/web/template/summary/grand-total.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
-->
77
<!-- ko if: isDisplayed() -->
88
<tr>
9-
<td colspan="2" data-bind="i18n: title"></td>
9+
<td colspan="2" data-bind="text: title"></td>
1010
<td class="col grandtotal">
11-
<span data-bind ="text: getValue(), attr:{'data-label': $t(title)}"></span>
11+
<span data-bind ="text: getValue(), attr:{'data-label': title}"></span>
1212
<!-- ko foreach: elems() -->
1313
<!-- ko template: getTemplate() --><!-- /ko -->
1414
<!-- /ko -->

‎app/code/Magento/Checkout/view/frontend/web/template/summary/item/details.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
<div class="product-item-inner">
1414
<div class="product-item-name-block">
15-
<strong class="product-item-name" data-bind="i18n: $parent.name"></strong>
15+
<strong class="product-item-name" data-bind="text: $parent.name"></strong>
1616
<div class="details-qty">
1717
<span class="label"><!-- ko i18n: 'Qty' --><!-- /ko --></span>
1818
<span class="value" data-bind="text: $parent.qty"></span>
@@ -30,7 +30,7 @@
3030
<strong class="subtitle"><!-- ko i18n: 'Options Details' --><!-- /ko --></strong>
3131
<dl class="item-options">
3232
<!--ko foreach: JSON.parse($parent.options)-->
33-
<dt class="label" data-bind="i18n: label"></dt>
33+
<dt class="label" data-bind="text: label"></dt>
3434
<!-- ko if: ($data.full_view)-->
3535
<dd class="values" data-bind="html: full_view"></dd>
3636
<!-- /ko -->

0 commit comments

Comments
 (0)