Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SIDM-3499 Adjust link caption. #293

Merged
merged 3 commits into from
Dec 4, 2019
Merged

SIDM-3499 Adjust link caption. #293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d5e34f2
Adjust link caption.
dfourn Dec 4, 2019
66b0250
Adjust link caption.
dfourn Dec 4, 2019
5376770
Rename message names.
dfourn Dec 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/main/resources/messages.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,9 @@ public.forgot.password.success.unconnected.account.contact=If you have entered a
public.forgot.password.success.unconnected.account.contact.us.text=contact us
public.forgot.password.success.unconnected.account.contact.end= to create an account.
public.user.password.reset.expired.text=For security, your link is only valid for 48 hours.
public.user.password.reset.expired.link.caption=reset your password again

public.user.password.reset.expired.link.text.start=To reset your password, you need to submit a
public.user.password.reset.expired.link.label=reset password
public.user.password.reset.expired.link.text.end=request again.

#Reset Password
public.reset.password.enter.new.password=Enter new password
Expand Down
7 changes: 4 additions & 3 deletions src/main/webapp/WEB-INF/jsp/expiredPasswordResetLink.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,16 @@
<spring:message code="public.user.password.reset.expired.text"/>
</p>
<p>
<spring:message code="public.user.link.expired.text"/>
<spring:message code="public.user.password.reset.expired.link.text.start"/>
<c:choose>
<c:when test="${empty forgotPasswordLink}">
<spring:message code="public.user.password.reset.expired.link.caption"/>.
<spring:message code="public.user.password.reset.expired.link.label"/>
</c:when>
<c:otherwise>
<a href="${forgotPasswordLink}"><spring:message code="public.user.password.reset.expired.link.caption"/></a>.
<a href="${forgotPasswordLink}"><spring:message code="public.user.password.reset.expired.link.label"/> </a>
</c:otherwise>
</c:choose>
<spring:message code="public.user.password.reset.expired.link.text.end"/>
</p>
</article>
<script>
Expand Down