Skip to content

Commit b174de2

Browse files
arnie1947arnie1947
committed
SPM-4-Front-end password protection
- SPM-15-Stabilization - CR fixes
1 parent 4643405 commit b174de2

File tree

6 files changed

+11
-15
lines changed

6 files changed

+11
-15
lines changed

‎app/code/Magento/Customer/Block/Form/Edit.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,6 @@ public function __construct(
4141
CustomerConfigHelper $customerConfigHelper,
4242
array $data = []
4343
) {
44-
$this->customerSession = $customerSession;
45-
$this->subscriberFactory = $subscriberFactory;
46-
$this->customerRepository = $customerRepository;
47-
$this->customerAccountManagement = $customerAccountManagement;
4844
$this->customerConfigHelper = $customerConfigHelper;
4945
parent::__construct(
5046
$context,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ B,B
6363
"Please enter a valid fax number. For example (123) 456-7890 or 123-456-7890.","Please enter a valid fax number. For example (123) 456-7890 or 123-456-7890."
6464
"Please enter a valid email address. For example johndoe@domain.com.","Please enter a valid email address. For example johndoe@domain.com."
6565
"Please use only visible characters and spaces.","Please use only visible characters and spaces."
66-
"Please enter 6 or more characters. Leading or trailing spaces will be ignored.","Please enter 6 or more characters. Leading or trailing spaces will be ignored."
66+
"Please enter 6 or more characters. Leading and trailing spaces will be ignored.","Please enter 6 or more characters. Leading and trailing spaces will be ignored."
6767
"Please enter 7 or more characters. Password should contain both numeric and alphabetic characters.","Please enter 7 or more characters. Password should contain both numeric and alphabetic characters."
6868
"Please enter a valid URL. Protocol is required (http://, https:// or ftp://)","Please enter a valid URL. Protocol is required (http://, https:// or ftp://)"
6969
"Please enter a valid URL Key. For example ""example-page"", ""example-page.html"" or ""anotherlevel/example-page"".","Please enter a valid URL Key. For example ""example-page"", ""example-page.html"" or ""anotherlevel/example-page""."
@@ -145,4 +145,4 @@ Translations,Translations
145145
"Please put your store into maintenance mode and redeploy static files after changing strategy","Please put your store into maintenance mode and redeploy static files after changing strategy"
146146
"Dictionary (Translation on Storefront side)","Dictionary (Translation on Storefront side)"
147147
"Embedded (Translation on Admin side)","Embedded (Translation on Admin side)"
148-
"Minimum length of this field must be equal or greater than %1 symbols. Leading or trailing spaces will be ignored.","Minimum length of this field must be equal or greater than %1 symbols. Leading or trailing spaces will be ignored."
148+
"Minimum length of this field must be equal or greater than %1 symbols. Leading and trailing spaces will be ignored.","Minimum length of this field must be equal or greater than %1 symbols. Leading and trailing spaces will be ignored."

‎app/code/Magento/Ui/view/base/web/js/lib/validation/rules.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,7 @@ define([
397397
}
398398
return !(pass.length > 0 && pass.length < 6);
399399
},
400-
$.mage.__('Please enter 6 or more characters. Leading or trailing spaces will be ignored.')
400+
$.mage.__('Please enter 6 or more characters. Leading and trailing spaces will be ignored.')
401401
],
402402
"validate-admin-password": [
403403
function(value) {
@@ -431,7 +431,7 @@ define([
431431
if (result == false) {
432432
validator.passwordErrorMessage = $.mage.__(
433433
"Minimum length of this field must be equal or greater than %1 symbols." +
434-
" Leading or trailing spaces will be ignored."
434+
" Leading and trailing spaces will be ignored."
435435
).replace('%1', passwordMinLength);
436436
return result;
437437
}
@@ -806,7 +806,7 @@ define([
806806
}
807807
return true;
808808
},
809-
$.mage.__('Please enter 6 or more characters. Leading or trailing spaces will be ignored.')
809+
$.mage.__('Please enter 6 or more characters. Leading and trailing spaces will be ignored.')
810810
],
811811
'validate-item-quantity': [
812812
function (value, params) {

‎lib/web/i18n/en_US.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@ Close,Close
2020
"Please enter a valid day (1-%1).","Please enter a valid day (1-%1)."
2121
"Please enter a date in the past.","Please enter a date in the past."
2222
"Please enter a date between %min and %max.","Please enter a date between %min and %max."
23-
"Minimum length of this field must be equal or greater than %1 symbols. Leading or trailing spaces will be ignored.","Minimum length of this field must be equal or greater than %1 symbols. Leading or trailing spaces will be ignored."
23+
"Minimum length of this field must be equal or greater than %1 symbols. Leading and trailing spaces will be ignored.","Minimum length of this field must be equal or greater than %1 symbols. Leading and trailing spaces will be ignored."

‎lib/web/mage/validation.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -513,7 +513,7 @@
513513
}
514514
return !(pass.length > 0 && pass.length < 6);
515515
},
516-
'Please enter 6 or more characters. Leading or trailing spaces will be ignored.'
516+
'Please enter 6 or more characters. Leading and trailing spaces will be ignored.'
517517
],
518518
"validate-admin-password": [
519519
function (v) {
@@ -547,7 +547,7 @@
547547
if (result == false) {
548548
validator.passwordErrorMessage = $.mage.__(
549549
"Minimum length of this field must be equal or greater than %1 symbols." +
550-
" Leading or trailing spaces will be ignored."
550+
" Leading and trailing spaces will be ignored."
551551
).replace('%1', passwordMinLength);
552552
return result;
553553
}
@@ -1198,7 +1198,7 @@
11981198
}
11991199
return true;
12001200
},
1201-
'Please enter 6 or more characters. Leading or trailing spaces will be ignored.'
1201+
'Please enter 6 or more characters. Leading and trailing spaces will be ignored.'
12021202
],
12031203
'required-if-not-specified': [
12041204
function (value, element, params) {

‎lib/web/prototype/validation.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -565,7 +565,7 @@ Validation.addAllThese([
565565
['validate-emailSender', 'Please use only visible characters and spaces.', function (v) {
566566
return Validation.get('IsEmpty').test(v) || /^[\S ]+$/.test(v)
567567
}],
568-
['validate-password', 'Please enter 6 or more characters. Leading or trailing spaces will be ignored.', function(v) {
568+
['validate-password', 'Please enter 6 or more characters. Leading and trailing spaces will be ignored.', function(v) {
569569
var pass=v.strip(); /*strip leading and trailing spaces*/
570570
return !(pass.length>0 && pass.length < 6);
571571
}],
@@ -693,7 +693,7 @@ Validation.addAllThese([
693693
['validate-state', 'Please select State/Province.', function(v) {
694694
return (v!=0 || v == '');
695695
}],
696-
['validate-new-password', 'Please enter 6 or more characters. Leading or trailing spaces will be ignored.', function(v) {
696+
['validate-new-password', 'Please enter 6 or more characters. Leading and trailing spaces will be ignored.', function(v) {
697697
if (!Validation.get('validate-password').test(v)) return false;
698698
if (Validation.get('IsEmpty').test(v) && v != '') return false;
699699
return true;

0 commit comments

Comments
 (0)