From 0aabb7226daa36264b837e64275e75de984f4505 Mon Sep 17 00:00:00 2001
From: Justin Richer <jricher@mit.edu>
Date: Mon, 1 Jun 2015 19:34:43 -0400
Subject: [PATCH] internationalized the error and login pages

---
 .../src/main/webapp/WEB-INF/views/error.jsp              | 4 ++--
 .../src/main/webapp/WEB-INF/views/login.jsp              | 9 +++++----
 .../src/main/webapp/resources/js/locale/en/messages.json | 8 +++++++-
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/openid-connect-server-webapp/src/main/webapp/WEB-INF/views/error.jsp b/openid-connect-server-webapp/src/main/webapp/WEB-INF/views/error.jsp
index fa1219a04..6d9ff6446 100644
--- a/openid-connect-server-webapp/src/main/webapp/WEB-INF/views/error.jsp
+++ b/openid-connect-server-webapp/src/main/webapp/WEB-INF/views/error.jsp
@@ -10,10 +10,10 @@
 	<div class="row-fluid">
 		<div class="offset1 span10">
 			<div class="hero-unit">
-				<h1>Error:</h1>
+				<h1><spring:message code="error.header"/></h1>
 				<h2 class="text-error"><c:out value="${error.getOAuth2ErrorCode()}" /></h2>
 				<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>
                 </p>
 				
diff --git a/openid-connect-server-webapp/src/main/webapp/WEB-INF/views/login.jsp b/openid-connect-server-webapp/src/main/webapp/WEB-INF/views/login.jsp
index 7852805aa..64b03d2f1 100644
--- a/openid-connect-server-webapp/src/main/webapp/WEB-INF/views/login.jsp
+++ b/openid-connect-server-webapp/src/main/webapp/WEB-INF/views/login.jsp
@@ -1,6 +1,8 @@
 <%@ taglib prefix="authz" uri="http://www.springframework.org/security/tags"%>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
 <%@ taglib prefix="o" tagdir="/WEB-INF/tags"%>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
+
 <o:header title="Log In" />
 <script type="text/javascript">
 <!--
@@ -15,16 +17,15 @@ $(document).ready(function() {
 <o:topbar />
 <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 }">
-		<div class="alert alert-error">The system was unable to log you
-			in. Please try again.</div>
+		<div class="alert alert-error"><spring:message code="login.error"/></div>
 	</c:if>
 
 
 	<div class="row-fluid">
-		<div class="span4 offset1 well">
+		<div class="span6 offset1 well">
 			<form action="<%=request.getContextPath()%>/j_spring_security_check"
 				method="POST">
 				<div>
diff --git a/openid-connect-server-webapp/src/main/webapp/resources/js/locale/en/messages.json b/openid-connect-server-webapp/src/main/webapp/resources/js/locale/en/messages.json
index f7e23332c..98d51067e 100644
--- a/openid-connect-server-webapp/src/main/webapp/resources/js/locale/en/messages.json
+++ b/openid-connect-server-webapp/src/main/webapp/resources/js/locale/en/messages.json
@@ -454,7 +454,13 @@
 		}
 	},
 	"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."
 	}
 	
 }
\ No newline at end of file