github
/
OpenID-Connect-Java-Spring-Server
mirror of https://github.com/mitreid-connect/OpenID-Connect-Java-Spring-Server
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

internationalized the error and login pages

pull/834/head
Justin Richer 2015-06-01 19:34:43 -04:00
parent 4655650a68
commit 0aabb7226d
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openid-connect-server-webapp/src/main/webapp/WEB-INF/views/error.jsp
View File

@ -10,10 +10,10 @@
<div class="row-fluid"> <div class="row-fluid">
<div class="offset1 span10"> <div class="offset1 span10">
<div class="hero-unit"> <div class="hero-unit">
<h1>Error:</h1> <h1><spring:message code="error.header"/></h1>
<h2 class="text-error"><c:out value="${error.getOAuth2ErrorCode()}" /></h2> <h2 class="text-error"><c:out value="${error.getOAuth2ErrorCode()}" /></h2>
<p> <p>
There was an error processing your request. The server's message was: <spring:message code="error.message"/>
<blockquote class="text-error"><b><c:out value="${error.message}" /></b></blockquote> <blockquote class="text-error"><b><c:out value="${error.message}" /></b></blockquote>
</p> </p>

9
openid-connect-server-webapp/src/main/webapp/WEB-INF/views/login.jsp
View File

@ -1,6 +1,8 @@
<%@ taglib prefix="authz" uri="http://www.springframework.org/security/tags"%> <%@ taglib prefix="authz" uri="http://www.springframework.org/security/tags"%>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
<%@ taglib prefix="o" tagdir="/WEB-INF/tags"%> <%@ taglib prefix="o" tagdir="/WEB-INF/tags"%>
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
<o:header title="Log In" /> <o:header title="Log In" />
<script type="text/javascript"> <script type="text/javascript">
<!-- <!--
@ -15,16 +17,15 @@ $(document).ready(function() {
<o:topbar /> <o:topbar />
<div class="container-fluid main"> <div class="container-fluid main">
<h1>Login with Username and Password</h1> <h1><spring:message code="login.login_with_username_and_password"/></h1>
<c:if test="${ param.error != null }"> <c:if test="${ param.error != null }">
<div class="alert alert-error">The system was unable to log you <div class="alert alert-error"><spring:message code="login.error"/></div>
in. Please try again.</div>
</c:if> </c:if>
<div class="row-fluid"> <div class="row-fluid">
<div class="span4 offset1 well"> <div class="span6 offset1 well">
<form action="<%=request.getContextPath()%>/j_spring_security_check" <form action="<%=request.getContextPath()%>/j_spring_security_check"
method="POST"> method="POST">
<div> <div>

8
openid-connect-server-webapp/src/main/webapp/resources/js/locale/en/messages.json
View File

@ -454,7 +454,13 @@
} }
}, },
"error": { "error": {
"title": "Error" "title": "Error",
"header": "Error:",
"message": "There was an error processing your request. The server''s message was:"
},
"login": {
"login_with_username_and_password": "Login with Username and Password",
"error": "The system was unable to log you in. Please try again."
} }
} }