Skip to content

Commit 70a15dd

Browse files
committed
ACP2E-3125: Password reset template issue with Admin user
1 parent aa97307 commit 70a15dd

File tree

1 file changed

+18
-13
lines changed

1 file changed

+18
-13
lines changed

app/code/Magento/User/i18n/en_US.csv

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,15 @@ Role,Role
5555
System,System
5656
Permissions,Permissions
5757
"You cannot delete your own account.","You cannot delete your own account."
58-
"You have entered an invalid password for current user.","You have entered an invalid password for current user."
58+
"The password entered for the current user is invalid. Verify the password and try again.","The password entered for the current user is invalid. Verify the password and try again."
5959
"You deleted the user.","You deleted the user."
6060
"We can't find a user to delete.","We can't find a user to delete."
6161
"This user no longer exists.","This user no longer exists."
6262
"Edit User","Edit User"
6363
"You have revoked the user's tokens.","You have revoked the user's tokens."
6464
"We can't find a user to revoke.","We can't find a user to revoke."
6565
"You cannot delete self-assigned roles.","You cannot delete self-assigned roles."
66+
"We can't find a role to delete.","We can't find a role to delete."
6667
"You deleted the role.","You deleted the role."
6768
"An error occurred while deleting this role.","An error occurred while deleting this role."
6869
"Edit Role","Edit Role"
@@ -71,19 +72,21 @@ Permissions,Permissions
7172
"You saved the role.","You saved the role."
7273
"An error occurred while saving this role.","An error occurred while saving this role."
7374
"You saved the user.","You saved the user."
75+
Administrator,Administrator
7476
"A user with the same user name or email already exists.","A user with the same user name or email already exists."
7577
Recommended,Recommended
7678
Forced,Forced
7779
"Sorry, but this password has already been used. Please create another.","Sorry, but this password has already been used. Please create another."
7880
email,email
7981
password,password
8082
username,username
81-
"You did not sign in correctly or your account is temporarily disabled.","You did not sign in correctly or your account is temporarily disabled."
82-
"You need more permissions to access this.","You need more permissions to access this."
83-
"Your account is temporarily disabled.","Your account is temporarily disabled."
84-
"User Name is a required field.","User Name is a required field."
85-
"First Name is a required field.","First Name is a required field."
86-
"Last Name is a required field.","Last Name is a required field."
83+
"The account sign-in was incorrect or your account is disabled temporarily. Please wait and try again later.","The account sign-in was incorrect or your account is disabled temporarily. Please wait and try again later."
84+
"More permissions are needed to access this.","More permissions are needed to access this."
85+
"The password reset token is incorrect. Verify the token and try again.","The password reset token is incorrect. Verify the token and try again."
86+
"Your account is temporarily disabled. Please try again later.","Your account is temporarily disabled. Please try again later."
87+
"""User Name"" is required. Enter and try again.","""User Name"" is required. Enter and try again."
88+
"""First Name"" is required. Enter and try again.","""First Name"" is required. Enter and try again."
89+
"""Last Name"" is required. Enter and try again.","""Last Name"" is required. Enter and try again."
8790
"Please enter a valid email.","Please enter a valid email."
8891
"Password is required field.","Password is required field."
8992
"Your password must be at least %1 characters.","Your password must be at least %1 characters."
@@ -108,32 +111,34 @@ All,All
108111
Resources,Resources
109112
"Warning!<br>This action will remove this user from already assigned role.<br>Are you sure?","Warning!<br>This action will remove this user from already assigned role.<br>Are you sure?"
110113
"Warning!<br>This action will remove those users from already assigned roles.<br>Are you sure?","Warning!<br>This action will remove those users from already assigned roles.<br>Are you sure?"
114+
"New admin user '%user_name' created","New admin user '%user_name' created"
115+
"Hello,","Hello,"
116+
"A new admin account was created for %first_name, %last_name using %email.","A new admin account was created for %first_name, %last_name using %email."
117+
"If you have not authorized this action, please contact us immediately at %store_email","If you have not authorized this action, please contact us immediately at %store_email"
118+
"or call us at %store_phone","or call us at %store_phone"
119+
"Thanks,","Thanks,"
111120
"Password Reset Confirmation for %name","Password Reset Confirmation for %name"
112121
"%name,","%name,"
113122
"There was recently a request to change the password for your account.","There was recently a request to change the password for your account."
114123
"If you requested this change, reset your password here:","If you requested this change, reset your password here:"
115124
"If you did not make this request, you can ignore this email and your password will remain the same.","If you did not make this request, you can ignore this email and your password will remain the same."
116125
"Thank you,","Thank you,"
117126
"New %changes for %user_name","New %changes for %user_name"
118-
"Hello,","Hello,"
119-
"We have received a request to change the following information associated with your account at %store_name: %changes.","We have received a request to change the following information associated with your account at %store_name: %changes."
120127
"We have received a request to reset the %changes associated with your account at %store_name.","We have received a request to reset the %changes associated with your account at %store_name."
121-
"If you have not authorized this action, please contact us immediately at %store_email","If you have not authorized this action, please contact us immediately at %store_email"
122-
"or call us at %store_phone","or call us at %store_phone"
123-
"Thanks,","Thanks,"
124128
"All Users","All Users"
125129
"User Roles","User Roles"
126130
"User Notification Template","User Notification Template"
127131
"Email template chosen based on theme fallback when ""Default"" option is selected.","Email template chosen based on theme fallback when ""Default"" option is selected."
132+
"New User Notification Template","New User Notification Template"
128133
"Maximum Login Failures to Lockout Account","Maximum Login Failures to Lockout Account"
129134
"We will disable this feature if the value is empty.","We will disable this feature if the value is empty."
130135
"Lockout Time (minutes)","Lockout Time (minutes)"
131136
"Password Lifetime (days)","Password Lifetime (days)"
132-
"We will disable this feature if the value is empty. ","We will disable this feature if the value is empty. "
133137
"Password Change","Password Change"
134138
Unlock,Unlock
135139
ID,ID
136140
Username,Username
137141
"Last login","Last login"
138142
Failures,Failures
139143
Unlocked,Unlocked
144+
"Last Logged in","Last Logged in"

0 commit comments

Comments
 (0)