Skip to content
This repository was archived by the owner on Apr 22, 2022. It is now read-only.

Commit a25779d

Browse files
committed
remove localization
1 parent b9b02de commit a25779d

File tree

2 files changed

+198
-168
lines changed

2 files changed

+198
-168
lines changed

src/main/java/authentication/web/AuthenticationServlet.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,11 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
152152
EmailSender emailSender = FrameworkConfiguration.getInstance(getServletContext())
153153
.getDefaultEmailSender();
154154

155+
<<<<<<< HEAD
155156
emailSender.send(email, "Ontos LDIW for ACC registration", "Your login: " + username + ", password: "
157+
=======
158+
emailSender.send(email, "GeoKnow registration", "Your login: " + username + ", password: "
159+
>>>>>>> parent of 9df1f1d... use ACC instead of GeoKnow in e-mails
156160
+ password);
157161
String responseStr = "{\"message\" : \"Your password will be sent to your e-mail address "
158162
+ email + " \"}";
@@ -198,7 +202,11 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
198202
return;
199203
}
200204
EmailSender emailSender = FrameworkConfiguration.getInstance(getServletContext()).getDefaultEmailSender();
205+
<<<<<<< HEAD
201206
emailSender.send(userProfile.getEmail(), "Ontos LDIW for ACC change password", "Your password for the Linked Data Information Workbench account " + username + " was changed.");
207+
=======
208+
emailSender.send(userProfile.getEmail(), "GeoKnow change password", "Your password was changed. Your login: " + username + ", new password: " + newPassword);
209+
>>>>>>> parent of 9df1f1d... use ACC instead of GeoKnow in e-mails
202210

203211
String responseStr = "{\"message\" : \"Your password was changed\"}";
204212
response.getWriter().print(responseStr);
@@ -227,7 +235,11 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
227235
// send new password to user
228236
EmailSender emailSender = FrameworkConfiguration.getInstance(getServletContext())
229237
.getDefaultEmailSender();
238+
<<<<<<< HEAD
230239
emailSender.send(userProfile.getEmail(), "Ontos LDIW for ACC restore password", "Your login: "
240+
=======
241+
emailSender.send(userProfile.getEmail(), "GeoKnow restore password", "Your login: "
242+
>>>>>>> parent of 9df1f1d... use ACC instead of GeoKnow in e-mails
231243
+ username + ", password: " + password);
232244
String responseStr = "{\"message\" : \"New password will be sent to your e-mail address "
233245
+ userProfile.getEmail() + " \"}";

0 commit comments

Comments
 (0)