diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/form.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/form.phtml
index f6dd2a0033fd45d7a7250aa12069dc4ae90a55aa..7de546bd8780d602760e8b94fb4c43b499b4950d 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/form.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/form.phtml
@@ -40,7 +40,7 @@
<script>
require([
'jquery',
- 'Magento_Catalog/js/price-box'
+ 'priceBox'
], function($){
var priceBoxes = $('[data-role=priceBox]');
diff --git a/app/code/Magento/Ui/view/base/web/js/grid/filters/range.js b/app/code/Magento/Ui/view/base/web/js/grid/filters/range.js
index b068af92aecf6c3b80c8069c516716be14371317..6af90fdf688a7a241dea3019e308570757f533b3 100644
--- a/app/code/Magento/Ui/view/base/web/js/grid/filters/range.js
+++ b/app/code/Magento/Ui/view/base/web/js/grid/filters/range.js
@@ -6,8 +6,9 @@ define([
'underscore',
'uiLayout',
'mageUtils',
- 'Magento_Ui/js/form/components/group'
-], function (_, layout, utils, Group) {
+ 'Magento_Ui/js/form/components/group',
+ 'mage/translate'
+], function (_, layout, utils, Group, $t) {
'use strict';
return Group.extend({
@@ -29,11 +30,11 @@ define([
},
ranges: {
from: {
- label: 'from',
+ label: $t('from'),
dataScope: 'from'
},
to: {
- label: 'to',
+ label: $t('to'),
dataScope: 'to'
}
}
diff --git a/lib/internal/Magento/Framework/View/Element/Template.php b/lib/internal/Magento/Framework/View/Element/Template.php
index 11f31e707a0481655c273435e4bd40b20ebd725f..d1b65b5ea907be657c2261a78ddddb8fafa398bf 100644
--- a/lib/internal/Magento/Framework/View/Element/Template.php
+++ b/lib/internal/Magento/Framework/View/Element/Template.php
@@ -139,7 +139,7 @@ class Template extends AbstractBlock
}
/**
- * Set template context. Sets the object that should represent $this in template
+ * Set template context. Sets the object that should represent $block in template
*
* @param \Magento\Framework\View\Element\BlockInterface $templateContext
* @return void
diff --git a/lib/web/mage/backend/validation.js b/lib/web/mage/backend/validation.js
index ebdad945cd977515f7aa08bbb0a4130719423c67..62f8cf476b808264a59e6592b73a069f127c6ddb 100644
--- a/lib/web/mage/backend/validation.js
+++ b/lib/web/mage/backend/validation.js
@@ -224,7 +224,7 @@
}
return true;
},
- 'Please enter a number greater 0 in this field.'
+ $.mage.__('Please enter a number greater 0 in this field.')
],
'validate-rating': [
function () {
@@ -236,7 +236,7 @@
});
return noError;
},
- 'Please select one of each ratings above.'
+ $.mage.__('Please select one of each ratings above.')
],
'validate-downloadable-file': [
function (v, element) {
@@ -267,7 +267,7 @@
}
return true;
},
- 'Please specify Url.'
+ $.mage.__('Please specify Url.')
]
}, function (rule, i) {
rule.unshift(i);
diff --git a/lib/web/mage/menu.js b/lib/web/mage/menu.js
index 4562285654c70f8b991e89866dfc82977842dd64..f0b67e3fb86657262b39f9354d9dac854f523fd9 100644
--- a/lib/web/mage/menu.js
+++ b/lib/web/mage/menu.js
@@ -275,6 +275,9 @@ define([
if (!target.hasClass('level-top') || !target.has(".ui-menu").length) {
window.location.href = target.find('> a').attr('href');
}
+ },
+ "click .ui-menu-item:has(.ui-state-active)": function (event) {
+ this.collapseAll(event, true);
}
});
@@ -390,6 +393,39 @@ define([
};
return setTimeout(handlerProxy, delay || 0);
+ },
+ expand: function( event ) {
+ var newItem = this.active &&
+ this.active
+ .children( ".ui-menu " )
+ .children( ".ui-menu-item" )
+ .first();
+
+ if ( newItem && newItem.length ) {
+ if (newItem.closest( ".ui-menu" ).is( ":visible" )
+ && newItem.closest( ".ui-menu" ).has( ".all-categories" )
+ ) {
+ return;
+ }
+
+ this._open( newItem.parent() );
+
+ // Delay so Firefox will not hide activedescendant change in expanding submenu from AT
+ this._delay(function() {
+ this.focus( event, newItem );
+ });
+ }
+ },
+ select: function( event ) {
+ this.active = this.active || $( event.target ).closest( ".ui-menu-item" );
+ if (this.active.is( ".all-category" )) {
+ this.active = $( event.target ).closest( ".ui-menu-item" );
+ }
+ var ui = { item: this.active };
+ if ( !this.active.has( ".ui-menu" ).length ) {
+ this.collapseAll( event, true );
+ }
+ this._trigger( "select", event, ui );
}
});
diff --git a/lib/web/mage/validation.js b/lib/web/mage/validation.js
index f61177188bdccc40393099e46defa5ddf4bb7168..6c8deba8164112a31939b11d1ed79b5c23dd7bc0 100644
--- a/lib/web/mage/validation.js
+++ b/lib/web/mage/validation.js
@@ -166,13 +166,13 @@
function (value, element, params) {
return this.optional(element) || $.mage.stripHtml(value).match(/\b\w+\b/g).length < params;
},
- 'Please enter {0} words or less.'
+ $.mage.__('Please enter {0} words or less.')
],
"min-words": [
function (value, element, params) {
return this.optional(element) || $.mage.stripHtml(value).match(/\b\w+\b/g).length >= params;
},
- 'Please enter at least {0} words.'
+ $.mage.__('Please enter at least {0} words.')
],
"range-words": [
function (value, element, params) {
@@ -180,43 +180,43 @@
$.mage.stripHtml(value).match(/\b\w+\b/g).length >= params[0] &&
value.match(/bw+b/g).length < params[1];
},
- 'Please enter between {0} and {1} words.'
+ $.mage.__('Please enter between {0} and {1} words.')
],
"letters-with-basic-punc": [
function (value, element) {
return this.optional(element) || /^[a-z\-.,()'\"\s]+$/i.test(value);
},
- 'Letters or punctuation only please'
+ $.mage.__('Letters or punctuation only please')
],
"alphanumeric": [
function (value, element) {
return this.optional(element) || /^\w+$/i.test(value);
},
- 'Letters, numbers, spaces or underscores only please'
+ $.mage.__('Letters, numbers, spaces or underscores only please')
],
"letters-only": [
function (value, element) {
return this.optional(element) || /^[a-z]+$/i.test(value);
},
- 'Letters only please'
+ $.mage.__('Letters only please')
],
"no-whitespace": [
function (value, element) {
return this.optional(element) || /^\S+$/i.test(value);
},
- 'No white space please'
+ $.mage.__('No white space please')
],
"zip-range": [
function (value, element) {
return this.optional(element) || /^90[2-5]-\d{2}-\d{4}$/.test(value);
},
- 'Your ZIP-code must be in the range 902xx-xxxx to 905-xx-xxxx'
+ $.mage.__('Your ZIP-code must be in the range 902xx-xxxx to 905-xx-xxxx')
],
"integer": [
function (value, element) {
return this.optional(element) || /^-?\d+$/.test(value);
},
- 'A positive or negative non-decimal number please'
+ $.mage.__('A positive or negative non-decimal number please')
],
"vinUS": [
function (v) {
@@ -259,7 +259,7 @@
}
return false;
},
- 'The specified vehicle identification number (VIN) is invalid.'
+ $.mage.__('The specified vehicle identification number (VIN) is invalid.')
],
"dateITA": [
function (value, element) {
@@ -282,7 +282,7 @@
}
return this.optional(element) || check;
},
- 'Please enter a correct date'
+ $.mage.__('Please enter a correct date')
],
"dateNL": [
function (value, element) {
@@ -294,13 +294,13 @@
function (value, element) {
return this.optional(element) || /^([01]\d|2[0-3])(:[0-5]\d){0,2}$/.test(value);
},
- 'Please enter a valid time, between 00:00 and 23:59'
+ $.mage.__('Please enter a valid time, between 00:00 and 23:59')
],
"time12h": [
function (value, element) {
return this.optional(element) || /^((0?[1-9]|1[012])(:[0-5]\d){0,2}(\ [AP]M))$/i.test(value);
},
- 'Please enter a valid time, between 00:00 am and 12:00 pm'
+ $.mage.__('Please enter a valid time, between 00:00 am and 12:00 pm')
],
"phoneUS": [
function (phone_number, element) {
@@ -308,27 +308,27 @@
return this.optional(element) || phone_number.length > 9 &&
phone_number.match(/^(1-?)?(\([2-9]\d{2}\)|[2-9]\d{2})-?[2-9]\d{2}-?\d{4}$/);
},
- 'Please specify a valid phone number'
+ $.mage.__('Please specify a valid phone number')
],
"phoneUK": [
function (phone_number, element) {
return this.optional(element) || phone_number.length > 9 &&
phone_number.match(/^(\(?(0|\+44)[1-9]{1}\d{1,4}?\)?\s?\d{3,4}\s?\d{3,4})$/);
},
- 'Please specify a valid phone number'
+ $.mage.__('Please specify a valid phone number')
],
"mobileUK": [
function (phone_number, element) {
return this.optional(element) || phone_number.length > 9 &&
phone_number.match(/^((0|\+44)7(5|6|7|8|9){1}\d{2}\s?\d{6})$/);
},
- 'Please specify a valid mobile number'
+ $.mage.__('Please specify a valid mobile number')
],
"stripped-min-length": [
function (value, element, param) {
return value.length >= param;
},
- 'Please enter at least {0} characters'
+ $.mage.__('Please enter at least {0} characters')
],
"email2": [
function (value, element) {
@@ -407,25 +407,25 @@
}
return false;
},
- 'Please enter a valid credit card number.'
+ $.mage.__('Please enter a valid credit card number.')
],
"ipv4": [
function (value, element) {
return this.optional(element) || /^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/i.test(value);
},
- 'Please enter a valid IP v4 address.'
+ $.mage.__('Please enter a valid IP v4 address.')
],
"ipv6": [
function (value, element) {
return this.optional(element) || /^((([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}:([0-9A-Fa-f]{1,4}:)?[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){4}:([0-9A-Fa-f]{1,4}:){0,2}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){3}:([0-9A-Fa-f]{1,4}:){0,3}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){2}:([0-9A-Fa-f]{1,4}:){0,4}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(([0-9A-Fa-f]{1,4}:){0,5}:((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(::([0-9A-Fa-f]{1,4}:){0,5}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|([0-9A-Fa-f]{1,4}::([0-9A-Fa-f]{1,4}:){0,5}[0-9A-Fa-f]{1,4})|(::([0-9A-Fa-f]{1,4}:){0,6}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:))$/i.test(value);
},
- 'Please enter a valid IP v6 address.'
+ $.mage.__('Please enter a valid IP v6 address.')
],
"pattern": [
function (value, element, param) {
return this.optional(element) || param.test(value);
},
- 'Invalid format.'
+ $.mage.__('Invalid format.')
],
"allow-container-className": [
function (element) {
@@ -439,67 +439,67 @@
function (value) {
return !/<(\/)?\w+/.test(value);
},
- 'HTML tags are not allowed.'
+ $.mage.__('HTML tags are not allowed.')
],
"validate-select": [
function (value) {
return ((value !== "none") && (value != null) && (value.length !== 0));
},
- 'Please select an option.'
+ $.mage.__('Please select an option.')
],
"validate-no-empty": [
function (value) {
return !$.mage.isEmpty(value);
},
- 'Empty Value.'
+ $.mage.__('Empty Value.')
],
"validate-alphanum-with-spaces": [
function (v) {
return $.mage.isEmptyNoTrim(v) || /^[a-zA-Z0-9 ]+$/.test(v);
},
- 'Please use only letters (a-z or A-Z), numbers (0-9) or spaces only in this field.'
+ $.mage.__('Please use only letters (a-z or A-Z), numbers (0-9) or spaces only in this field.')
],
"validate-data": [
function (v) {
return $.mage.isEmptyNoTrim(v) || /^[A-Za-z]+[A-Za-z0-9_]+$/.test(v);
},
- 'Please use only letters (a-z or A-Z), numbers (0-9) or underscore (_) in this field, and the first character should be a letter.'
+ $.mage.__('Please use only letters (a-z or A-Z), numbers (0-9) or underscore (_) in this field, and the first character should be a letter.')
],
"validate-street": [
function (v) {
return $.mage.isEmptyNoTrim(v) || /^[ \w]{3,}([A-Za-z]\.)?([ \w]*\#\d+)?(\r\n| )[ \w]{3,}/.test(v);
},
- 'Please use only letters (a-z or A-Z), numbers (0-9), spaces and "#" in this field.'
+ $.mage.__('Please use only letters (a-z or A-Z), numbers (0-9), spaces and "#" in this field.')
],
"validate-phoneStrict": [
function (v) {
return $.mage.isEmptyNoTrim(v) || /^(\()?\d{3}(\))?(-|\s)?\d{3}(-|\s)\d{4}$/.test(v);
},
- 'Please enter a valid phone number. For example (123) 456-7890 or 123-456-7890.'
+ $.mage.__('Please enter a valid phone number. For example (123) 456-7890 or 123-456-7890.')
],
"validate-phoneLax": [
function (v) {
return $.mage.isEmptyNoTrim(v) || /^((\d[\-. ]?)?((\(\d{3}\))|\d{3}))?[\-. ]?\d{3}[\-. ]?\d{4}$/.test(v);
},
- 'Please enter a valid phone number. For example (123) 456-7890 or 123-456-7890.'
+ $.mage.__('Please enter a valid phone number. For example (123) 456-7890 or 123-456-7890.')
],
"validate-fax": [
function (v) {
return $.mage.isEmptyNoTrim(v) || /^(\()?\d{3}(\))?(-|\s)?\d{3}(-|\s)\d{4}$/.test(v);
},
- 'Please enter a valid fax number (Ex: 123-456-7890).'
+ $.mage.__('Please enter a valid fax number (Ex: 123-456-7890).')
],
"validate-email": [
function (v) {
return $.mage.isEmptyNoTrim(v) || /^([a-z0-9,!\#\$%&'\*\+\/=\?\^_`\{\|\}~-]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-z0-9,!\#\$%&'\*\+\/=\?\^_`\{\|\}~-]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*@([a-z0-9-]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-z0-9-]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*\.(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]){2,})$/i.test(v);
},
- 'Please enter a valid email address (Ex: johndoe@domain.com).'
+ $.mage.__('Please enter a valid email address (Ex: johndoe@domain.com).')
],
"validate-emailSender": [
function (v) {
return $.mage.isEmptyNoTrim(v) || /^[\S ]+$/.test(v);
},
- 'Please enter a valid email address (Ex: johndoe@domain.com).'
+ $.mage.__('Please enter a valid email address (Ex: johndoe@domain.com).')
],
"validate-password": [
function (v) {
@@ -513,7 +513,7 @@
}
return !(pass.length > 0 && pass.length < 6);
},
- 'Please enter 6 or more characters. Leading and trailing spaces will be ignored.'
+ $.mage.__('Please enter 6 or more characters. Leading and trailing spaces will be ignored.')
],
"validate-admin-password": [
function (v) {
@@ -533,7 +533,7 @@
}
return true;
},
- 'Please enter 7 or more characters, using both numeric and alphabetic.'
+ $.mage.__('Please enter 7 or more characters, using both numeric and alphabetic.')
],
"validate-customer-password": [
function (v, elm) {
@@ -584,35 +584,35 @@
return (/^(http|https|ftp):\/\/(([A-Z0-9]([A-Z0-9_-]*[A-Z0-9]|))(\.[A-Z0-9]([A-Z0-9_-]*[A-Z0-9]|))*)(:(\d+))?(\/[A-Z0-9~](([A-Z0-9_~-]|\.)*[A-Z0-9~]|))*\/?(.*)?$/i).test(v);
},
- 'Please enter a valid URL. Protocol is required (http://, https:// or ftp://).'
+ $.mage.__('Please enter a valid URL. Protocol is required (http://, https:// or ftp://).')
],
"validate-clean-url": [
function (v) {
return $.mage.isEmptyNoTrim(v) || /^(http|https|ftp):\/\/(([A-Z0-9][A-Z0-9_-]*)(\.[A-Z0-9][A-Z0-9_-]*)+.(com|org|net|dk|at|us|tv|info|uk|co.uk|biz|se)$)(:(\d+))?\/?/i.test(v) || /^(www)((\.[A-Z0-9][A-Z0-9_-]*)+.(com|org|net|dk|at|us|tv|info|uk|co.uk|biz|se)$)(:(\d+))?\/?/i.test(v);
},
- 'Please enter a valid URL. For example http://www.example.com or www.example.com.'
+ $.mage.__('Please enter a valid URL. For example http://www.example.com or www.example.com.')
],
"validate-xml-identifier": [
function (v) {
return $.mage.isEmptyNoTrim(v) || /^[A-Z][A-Z0-9_\/-]*$/i.test(v);
},
- 'Please enter a valid XML-identifier (Ex: something_1, block5, id-4).'
+ $.mage.__('Please enter a valid XML-identifier (Ex: something_1, block5, id-4).')
],
"validate-ssn": [
function (v) {
return $.mage.isEmptyNoTrim(v) || /^\d{3}-?\d{2}-?\d{4}$/.test(v);
},
- 'Please enter a valid social security number (Ex: 123-45-6789).'
+ $.mage.__('Please enter a valid social security number (Ex: 123-45-6789).')
],
"validate-zip-us": [
function (v) {
return $.mage.isEmptyNoTrim(v) || /(^\d{5}$)|(^\d{5}-\d{4}$)/.test(v);
},
- 'Please enter a valid zip code (Ex: 90602 or 90602-1234).'
+ $.mage.__('Please enter a valid zip code (Ex: 90602 or 90602-1234).')
],
"validate-date-au": [
function (v) {
@@ -629,14 +629,14 @@
parseInt(RegExp.$3, 10) === d.getFullYear();
},
- 'Please use this date format: dd/mm/yyyy. For example 17/03/2006 for the 17th of March, 2006.'
+ $.mage.__('Please use this date format: dd/mm/yyyy. For example 17/03/2006 for the 17th of March, 2006.')
],
"validate-currency-dollar": [
function (v) {
return $.mage.isEmptyNoTrim(v) || /^\$?\-?([1-9]{1}[0-9]{0,2}(\,[0-9]{3})*(\.[0-9]{0,2})?|[1-9]{1}\d*(\.[0-9]{0,2})?|0(\.[0-9]{0,2})?|(\.[0-9]{1,2})?)$/.test(v);
},
- 'Please enter a valid $ amount. For example $100.00.'
+ $.mage.__('Please enter a valid $ amount. For example $100.00.')
],
"validate-not-negative-number": [
function (v) {
@@ -647,7 +647,7 @@
return !isNaN(v) && v >= 0;
},
- 'Please enter a number 0 or greater in this field.'
+ $.mage.__('Please enter a number 0 or greater in this field.')
],
// validate-not-negative-number should be replaced in all places with this one and then removed
"validate-zero-or-greater": [
@@ -659,7 +659,7 @@
return !isNaN(v) && v >= 0;
},
- 'Please enter a number 0 or greater in this field.'
+ $.mage.__('Please enter a number 0 or greater in this field.')
],
"validate-greater-than-zero": [
function (v) {
@@ -669,7 +669,7 @@
v = $.mage.parseNumber(v);
return !isNaN(v) && v > 0;
},
- 'Please enter a number greater than 0 in this field.'
+ $.mage.__('Please enter a number greater than 0 in this field.')
],
"validate-css-length": [
function (v) {
@@ -678,20 +678,20 @@
}
return true;
},
- 'Please input a valid CSS-length (Ex: 100px, 77pt, 20em, .5ex or 50%).'
+ $.mage.__('Please input a valid CSS-length (Ex: 100px, 77pt, 20em, .5ex or 50%).')
],
/** @description Additional methods */
"validate-number": [
function (v) {
return $.mage.isEmptyNoTrim(v) || (!isNaN($.mage.parseNumber(v)) && /^\s*-?\d*(\.\d*)?\s*$/.test(v));
},
- 'Please enter a valid number in this field.'
+ $.mage.__('Please enter a valid number in this field.')
],
"required-number": [
function (v) {
return !!v.length;
},
- 'Please enter a valid number in this field.'
+ $.mage.__('Please enter a valid number in this field.')
],
"validate-number-range": [
function (v, elm, param) {
@@ -731,14 +731,14 @@
return result;
},
- 'The value is not within the specified range.',
+ $.mage.__('The value is not within the specified range.'),
true
],
"validate-digits": [
function (v) {
return $.mage.isEmptyNoTrim(v) || !/[^\d]/.test(v);
},
- 'Please enter a valid number in this field.'
+ $.mage.__('Please enter a valid number in this field.')
],
"validate-digits-range": [
function (v, elm, param) {
@@ -778,7 +778,7 @@
return result;
},
- 'The value is not within the specified range.',
+ $.mage.__('The value is not within the specified range.'),
true
],
'validate-range': [
@@ -819,31 +819,32 @@
}
return result;
},
- 'The value is not within the specified range.'
+ $.mage.__('The value is not within the specified range.')
],
"validate-alpha": [
function (v) {
return $.mage.isEmptyNoTrim(v) || /^[a-zA-Z]+$/.test(v);
},
- 'Please use letters only (a-z or A-Z) in this field.'
+ $.mage.__('Please use letters only (a-z or A-Z) in this field.')
],
"validate-code": [
function (v) {
return $.mage.isEmptyNoTrim(v) || /^[a-z]+[a-z0-9_]+$/.test(v);
},
- 'Please use only letters (a-z), numbers (0-9) or underscore (_) in this field, and the first character should be a letter.'
+ $.mage.__('Please use only letters (a-z), numbers (0-9) or underscore (_) in this field, and the first character should be a letter.')
],
"validate-alphanum": [
function (v) {
return $.mage.isEmptyNoTrim(v) || /^[a-zA-Z0-9]+$/.test(v);
},
- 'Please use only letters (a-z or A-Z) or numbers (0-9) in this field. No spaces or other characters are allowed.'
+ $.mage.__('Please use only letters (a-z or A-Z) or numbers (0-9) in this field. No spaces or other characters are allowed.')
],
"validate-date": [
function (v) {
var test = new Date(v);
return $.mage.isEmptyNoTrim(v) || !isNaN(test);
- }, 'Please enter a valid date.'
+ },
+ $.mage.__('Please enter a valid date.')
],
"validate-date-range": [
@@ -866,7 +867,7 @@
return !dependentElements.length || $.mage.isEmptyNoTrim(dependentElements[0].value) ||
normalizedTime(v) <= normalizedTime(dependentElements[0].value);
},
- 'Make sure the To Date is later than or the same as the From Date.'
+ $.mage.__('Make sure the To Date is later than or the same as the From Date.')
],
"validate-cpassword": [
function () {
@@ -887,13 +888,13 @@
}
return (pass.val() === conf.val());
},
- 'Please make sure your passwords match.'
+ $.mage.__('Please make sure your passwords match.')
],
"validate-identifier": [
function (v) {
return $.mage.isEmptyNoTrim(v) || /^[a-z0-9][a-z0-9_\/-]+(\.[a-z0-9_-]+)?$/.test(v);
},
- 'Please enter a valid URL Key (Ex: "example-page", "example-page.html" or "anotherlevel/example-page").'
+ $.mage.__('Please enter a valid URL Key (Ex: "example-page", "example-page.html" or "anotherlevel/example-page").')
],
"validate-zip-international": [
/*function(v) {
@@ -903,7 +904,7 @@
function () {
return true;
},
- 'Please enter a valid zip code.'
+ $.mage.__('Please enter a valid zip code.')
],
"validate-one-required": [
function (v, elm) {
@@ -913,13 +914,13 @@
return $(elm).val();
}).length > 0;
},
- 'Please select one of the options above.'
+ $.mage.__('Please select one of the options above.')
],
"validate-state": [
function (v) {
return (v !== 0 || v === '');
},
- 'Please select State/Province.'
+ $.mage.__('Please select State/Province.')
],
"required-file": [
function (v, elm) {
@@ -932,7 +933,7 @@
}
return result;
},
- 'Please select a file.'
+ $.mage.__('Please select a file.')
],
"validate-ajax-error": [
function (v, element) {
@@ -961,7 +962,7 @@
}
return hasWithValue ^ hasWithNoValue;
},
- 'The field isn\'t complete.'
+ $.mage.__('The field isn\'t complete.')
],
"validate-required-datetime": [
function (v, elm, param) {
@@ -973,7 +974,7 @@
}
return true;
},
- 'This is a required field.'
+ $.mage.__('This is a required field.')
],
"validate-one-required-by-name": [
function (v, elm, selector) {
@@ -1024,7 +1025,8 @@
}
}
return true;
- }, "Please enter valid email addresses, separated by commas. For example, johndoe@domain.com, johnsmith@domain.com."
+ },
+ $.mage.__("Please enter valid email addresses, separated by commas. For example, johndoe@domain.com, johnsmith@domain.com.")
],
"validate-cc-type-select": [
@@ -1040,7 +1042,8 @@
return creditCartTypes[value][0].test($(params).val().replace(/\s+/g, ''));
}
return false;
- }, 'Card type does not match credit card number.'
+ },
+ $.mage.__('Card type does not match credit card number.')
],
"validate-cc-number": [
/**
@@ -1053,7 +1056,8 @@
return validateCreditCard(value);
}
return false;
- }, 'Please enter a valid credit card number.'
+ },
+ $.mage.__('Please enter a valid credit card number.')
],
"validate-cc-type": [
/**
@@ -1074,7 +1078,8 @@
}
}
return false;
- }, 'Credit card number does not match credit card type.'
+ },
+ $.mage.__('Credit card number does not match credit card type.')
],
"validate-cc-exp": [
/**
@@ -1095,7 +1100,8 @@
isValid = !year || year > currentYear || (year == currentYear && month >= currentMonth);
}
return isValid;
- }, 'Incorrect credit card expiration date.'
+ },
+ $.mage.__('Incorrect credit card expiration date.')
],
"validate-cc-cvn": [
/**
@@ -1113,7 +1119,8 @@
}
}
return false;
- }, 'Please enter a valid credit card verification number.'
+ },
+ $.mage.__('Please enter a valid credit card verification number.')
],
"validate-cc-ukss": [
/**
@@ -1123,7 +1130,8 @@
*/
function (value) {
return value;
- }, 'Please enter issue number or start date for switch/solo card type.'
+ },
+ $.mage.__('Please enter issue number or start date for switch/solo card type.')
],
"validate-length": [
@@ -1166,7 +1174,7 @@
else
return true;
},
- 'Please enter positive number in this field.'
+ $.mage.__('Please enter positive number in this field.')
],
'validate-per-page-value-list': [
function (v) {
@@ -1179,7 +1187,7 @@
}
return isValid;
},
- 'Please enter a valid value, ex: 10,20,30'
+ $.mage.__('Please enter a valid value, ex: 10,20,30')
],
'validate-per-page-value': [
function (v, elm) {
@@ -1189,7 +1197,7 @@
var values = $('#' + elm.id + '_values').val().split(',');
return values.indexOf(v) != -1;
},
- 'Please enter a valid value from list'
+ $.mage.__('Please enter a valid value from list')
],
'validate-new-password': [
function (v) {
@@ -1202,7 +1210,7 @@
}
return true;
},
- 'Please enter 6 or more characters. Leading and trailing spaces will be ignored.'
+ $.mage.__('Please enter 6 or more characters. Leading and trailing spaces will be ignored.')
],
'required-if-not-specified': [
function (value, element, params) {
@@ -1226,7 +1234,7 @@
return valid;
},
- 'This is a required field.'
+ $.mage.__('This is a required field.')
],
'required-if-all-sku-empty-and-file-not-loaded': [
function (value, element, params) {
@@ -1254,7 +1262,8 @@
});
return valid;
- }, 'Please enter valid SKU key.'
+ },
+ $.mage.__('Please enter valid SKU key.')
],
'required-if-specified': [
function (value, element, params) {
@@ -1279,7 +1288,7 @@
return valid;
},
- 'This is a required field.'
+ $.mage.__('This is a required field.')
],
'required-number-if-specified': [
function (value, element, params) {
@@ -1298,7 +1307,7 @@
return valid ? !!value.length : true;
},
- 'Please enter a valid number.'
+ $.mage.__('Please enter a valid number.')
],
'datetime-validation': [
function (value, element) {
@@ -1311,19 +1320,19 @@
return isValid;
},
- 'This is required field'
+ $.mage.__('This is required field')
],
'required-text-swatch-entry': [
tableSingleValidation,
- 'Admin is a required field in the each row.'
+ $.mage.__('Admin is a required field in the each row.')
],
'required-visual-swatch-entry': [
tableSingleValidation,
- 'Admin is a required field in the each row.'
+ $.mage.__('Admin is a required field in the each row.')
],
'required-dropdown-attribute-entry': [
tableSingleValidation,
- 'Admin is a required field in the each row.'
+ $.mage.__('Admin is a required field in the each row.')
],
'validate-item-quantity': [
function (value, element, params) {
@@ -1357,7 +1366,22 @@
}
});
$.validator.messages = $.extend($.validator.messages, {
- required: $.mage.__('This is a required field.')
+ required: $.mage.__('This is a required field.'),
+ remote: $.mage.__('Please fix this field.'),
+ email: $.mage.__('Please enter a valid email address.'),
+ url: $.mage.__('Please enter a valid URL.'),
+ date: $.mage.__('Please enter a valid date.'),
+ dateISO: $.mage.__('Please enter a valid date (ISO).'),
+ number: $.mage.__('Please enter a valid number.'),
+ digits: $.mage.__('Please enter only digits.'),
+ creditcard: $.mage.__('Please enter a valid credit card number.'),
+ equalTo: $.mage.__('Please enter the same value again.'),
+ maxlength: $.validator.format($.mage.__('Please enter no more than {0} characters.')),
+ minlength: $.validator.format($.mage.__('Please enter at least {0} characters.')),
+ rangelength: $.validator.format($.mage.__('Please enter a value between {0} and {1} characters long.')),
+ range: $.validator.format($.mage.__('Please enter a value between {0} and {1}.')),
+ max: $.validator.format($.mage.__('Please enter a value less than or equal to {0}.')),
+ min: $.validator.format($.mage.__('Please enter a value greater than or equal to {0}.'))
});
if ($.metadata) {
diff --git a/lib/web/mage/validation/validation.js b/lib/web/mage/validation/validation.js
index a60ca5e737b6d1e90d5b10f7661d2ca020cf9f7f..b1c4db994ed2a7d52ec78d45fecdebe6b6360512 100644
--- a/lib/web/mage/validation/validation.js
+++ b/lib/web/mage/validation/validation.js
@@ -36,7 +36,7 @@
});
return result && total > 0;
},
- 'Please specify the quantity of product(s).'
+ $.mage.__('Please specify the quantity of product(s).')
],
'validate-one-checkbox-required-by-name': [
function (value, element, params) {
@@ -60,7 +60,7 @@
return false;
}
},
- 'Please select one of the options.'
+ $.mage.__('Please select one of the options.')
],
'validate-date-between': [
function (value, element, params) {
@@ -89,7 +89,7 @@
yearVal = $(dob).find(params[2]).find('input:text').val(),
dobLength = dayVal.length + monthVal.length + yearVal.length;
if (params[3] && dobLength === 0) {
- this.dobErrorMessage = 'This is a required field.';
+ this.dobErrorMessage = $.mage.__('This is a required field.');
return false;
}
if (!params[3] && dobLength === 0) {
@@ -100,11 +100,11 @@
year = parseInt(yearVal, 10) || 0,
curYear = (new Date()).getFullYear();
if (!day || !month || !year) {
- this.dobErrorMessage = 'Please enter a valid full date.';
+ this.dobErrorMessage = $.mage.__('Please enter a valid full date.');
return false;
}
if (month < 1 || month > 12) {
- this.dobErrorMessage = 'Please enter a valid month (1-12).';
+ this.dobErrorMessage = $.mage.__('Please enter a valid month (1-12).');
return false;
}
if (year < 1900 || year > curYear) {