summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
authorahunter2013-05-22 12:09:45 (EDT)
committer kwalker2013-05-22 12:09:45 (EDT)
commit55b16ae0073f8b347465313925667c99c43d14a2 (patch)
treef2b50e3317ff5e21a810e7ac06dd6e5e34853f3e
parent22721fc0563d4ff4ec012b7bbcbdaf9f417a598a (diff)
downloadorg.eclipse.orion.server-55b16ae0073f8b347465313925667c99c43d14a2.zip
org.eclipse.orion.server-55b16ae0073f8b347465313925667c99c43d14a2.tar.gz
org.eclipse.orion.server-55b16ae0073f8b347465313925667c99c43d14a2.tar.bz2
Bug 408714 - Request spelt wrong in password reset actionv20130522-1609
-rw-r--r--bundles/org.eclipse.orion.server.useradmin/src/org/eclipse/orion/server/useradmin/servlets/EmailConfirmationServlet.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/bundles/org.eclipse.orion.server.useradmin/src/org/eclipse/orion/server/useradmin/servlets/EmailConfirmationServlet.java b/bundles/org.eclipse.orion.server.useradmin/src/org/eclipse/orion/server/useradmin/servlets/EmailConfirmationServlet.java
index 353a614..651d5ce 100644
--- a/bundles/org.eclipse.orion.server.useradmin/src/org/eclipse/orion/server/useradmin/servlets/EmailConfirmationServlet.java
+++ b/bundles/org.eclipse.orion.server.useradmin/src/org/eclipse/orion/server/useradmin/servlets/EmailConfirmationServlet.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2012 IBM Corporation and others.
+ * Copyright (c) 2012, 2013 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -165,7 +165,7 @@ public class EmailConfirmationServlet extends OrionServlet {
if (userEmail != null && userEmail.trim().length() > 0) {
if(!user.isEmailConfirmed()){
resp.sendError(HttpServletResponse.SC_BAD_REQUEST, "User " + userLogin + " email has not been yet confirmed."
- + " Please follow the instructions from the confirmation email in your inbox and then reuest password reset again.");
+ + " Please follow the instructions from the confirmation email in your inbox and then request a password reset again.");
return;
}
if (!userEmail.equals(user.getEmail())) {
@@ -184,7 +184,7 @@ public class EmailConfirmationServlet extends OrionServlet {
resp.sendError(HttpServletResponse.SC_NOT_FOUND, "User with email " + userEmail + " not found.");
}else{
resp.sendError(HttpServletResponse.SC_BAD_REQUEST, "Email " + userLogin + " has not been yet confirmed."
- + " Please follow the instructions from the confirmation email in your inbox and then reuest password reset again.");
+ + " Please follow the instructions from the confirmation email in your inbox and then request a password reset again.");
}
return;
}
@@ -219,7 +219,7 @@ public class EmailConfirmationServlet extends OrionServlet {
if(!user.isEmailConfirmed()){
return new ServerStatus(IStatus.ERROR, HttpServletResponse.SC_BAD_REQUEST, "Your email has not been yet confirmed."
- + " Please follow the instructions from the confirmation email in your inbox and then reuest password reset again.", null);
+ + " Please follow the instructions from the confirmation email in your inbox and then request a password reset again.", null);
}
IOrionCredentialsService userAdmin = getUserAdmin();