From 644344a6e42039ab650a7582df7c51ce34e359e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20J=C3=B6nsson?= <fjo@kth.se>
Date: Wed, 4 Feb 2015 16:10:11 +0100
Subject: [PATCH] Refactorize, remove text attribute from messages so
 untranslated labels are easily identified.

---
 .../src/main/resources/messages_en.properties |  1 +
 .../src/main/resources/messages_sv.properties |  1 +
 .../main/webapp/WEB-INF/tags/aboutContent.tag |  4 ++--
 .../webapp/WEB-INF/tags/contactContent.tag    |  4 ++--
 .../main/webapp/WEB-INF/tags/copyright.tag    |  2 +-
 .../webapp/WEB-INF/tags/landingPageAbout.tag  |  6 +++---
 .../WEB-INF/tags/landingPageContact.tag       |  4 ++--
 .../webapp/WEB-INF/tags/landingPageStats.tag  |  4 ++--
 .../WEB-INF/tags/landingPageWelcome.tag       |  4 ++--
 .../main/webapp/WEB-INF/tags/statsContent.tag |  2 +-
 .../src/main/webapp/WEB-INF/tags/topbar.tag   | 20 +++++++++----------
 11 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/openid-connect-server-webapp/src/main/resources/messages_en.properties b/openid-connect-server-webapp/src/main/resources/messages_en.properties
index fd166f87c..172d8c034 100644
--- a/openid-connect-server-webapp/src/main/resources/messages_en.properties
+++ b/openid-connect-server-webapp/src/main/resources/messages_en.properties
@@ -51,5 +51,6 @@ sidebar.administrative.system_scopes=System Scopes
 sidebar.personal.approved_sites=Manage Approved Sites
 sidebar.personal.active_tokens=Manage Active Tokens
 sidebar.personal.profile_information=View Profile Information
+sidebar.developer=Developer
 sidebar.developer.client_registration=Self-service client registration
 sidebar.developer.resource_registration=Self-service protected resource registration
\ No newline at end of file
diff --git a/openid-connect-server-webapp/src/main/resources/messages_sv.properties b/openid-connect-server-webapp/src/main/resources/messages_sv.properties
index bd6d23e38..1dd78a561 100644
--- a/openid-connect-server-webapp/src/main/resources/messages_sv.properties
+++ b/openid-connect-server-webapp/src/main/resources/messages_sv.properties
@@ -53,5 +53,6 @@ sidebar.administrative.system_scopes=System-scope
 sidebar.personal.approved_sites=Hantera godkända platser
 sidebar.personal.active_tokens=Hantera aktiva biljetter
 sidebar.personal.profile_information=Visa profilinformation
+sidebar.developer=Utvecklare
 sidebar.developer.client_registration=Self-service klientregistering
 sidebar.developer.resource_registration=Self-service registrering av skyddad resurs
\ No newline at end of file
diff --git a/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/aboutContent.tag b/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/aboutContent.tag
index da7f1f66d..4d4ca8bb0 100644
--- a/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/aboutContent.tag
+++ b/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/aboutContent.tag
@@ -1,5 +1,5 @@
 <%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
-<h2><spring:message code="about.title" text="About"/></h2>
+<h2><spring:message code="about.title"/></h2>
 <p>
-<spring:message code="about.body" text="About body"/>
+<spring:message code="about.body"/>
 </p>
\ No newline at end of file
diff --git a/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/contactContent.tag b/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/contactContent.tag
index 8518291d7..4f978c4d3 100644
--- a/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/contactContent.tag
+++ b/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/contactContent.tag
@@ -1,5 +1,5 @@
 <%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
-<h2><spring:message code="contact.title" text="Contact"/></h2>
+<h2><spring:message code="contact.title"/></h2>
 <p>
-<spring:message code="contact.body" text="Contact body"/>
+<spring:message code="contact.body"/>
 </p>
diff --git a/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/copyright.tag b/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/copyright.tag
index 898b992e0..f15cab94d 100644
--- a/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/copyright.tag
+++ b/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/copyright.tag
@@ -1,2 +1,2 @@
 <%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
-<spring:message code="copyright" text="Copyright" arguments="${project.version}"/>
+<spring:message code="copyright" arguments="${project.version}"/>
diff --git a/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/landingPageAbout.tag b/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/landingPageAbout.tag
index eb5a5e634..dd241669a 100644
--- a/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/landingPageAbout.tag
+++ b/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/landingPageAbout.tag
@@ -1,6 +1,6 @@
 <%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
-<h2><spring:message code="home.about" text="About"/></h2>
+<h2><spring:message code="home.about"/></h2>
 
-<p><spring:message code="home.about.body" text="About body"/></p>
+<p><spring:message code="home.about.body"/></p>
 
-<p><a class="btn" href="http://github.com/mitreid-connect/"><spring:message code="home.more" text="More"/> &raquo;</a></p>
+<p><a class="btn" href="http://github.com/mitreid-connect/"><spring:message code="home.more"/> &raquo;</a></p>
diff --git a/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/landingPageContact.tag b/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/landingPageContact.tag
index 77960df92..3692584f4 100644
--- a/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/landingPageContact.tag
+++ b/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/landingPageContact.tag
@@ -1,5 +1,5 @@
 <%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
-<h2><spring:message code="home.contact" text="Contact"/></h2>
+<h2><spring:message code="home.contact"/></h2>
 <p>
-<spring:message code="home.contact.body" text="Contact body"/>
+<spring:message code="home.contact.body"/>
 </p>
diff --git a/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/landingPageStats.tag b/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/landingPageStats.tag
index 085aafcf2..692cfcb02 100644
--- a/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/landingPageStats.tag
+++ b/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/landingPageStats.tag
@@ -1,7 +1,7 @@
 <%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
-<h2><spring:message code="home.statistics" text="Current Statistics"/></h2>
+<h2><spring:message code="home.statistics"/></h2>
 
-<p id="statsloader" class="muted"><spring:message code="home.statistics.loading" text="Loading statistics..."/></p>
+<p id="statsloader" class="muted"><spring:message code="home.statistics.loading"/></p>
 
 <p id="stats">There have been 
 	<span class="label label-info" id="userCount">?</span> <span id="userCountLabel">user</span> 
diff --git a/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/landingPageWelcome.tag b/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/landingPageWelcome.tag
index fc35394cb..5a4a187dd 100644
--- a/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/landingPageWelcome.tag
+++ b/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/landingPageWelcome.tag
@@ -3,7 +3,7 @@
 	<div class="span2 visible-desktop"><img src="resources/images/openid_connect_large.png"/></div>
 	
 	<div class="span10">
-		<h1><spring:message code="home.welcome" text="Welcome!"/></h1>
-		<p><spring:message code="home.welcome.body" text="Welcome body"/></p>
+		<h1><spring:message code="home.welcome"/></h1>
+		<p><spring:message code="home.welcome.body"/></p>
 	</div>
 </div>
\ No newline at end of file
diff --git a/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/statsContent.tag b/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/statsContent.tag
index c6b42fceb..0d3ccc3a0 100644
--- a/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/statsContent.tag
+++ b/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/statsContent.tag
@@ -1,5 +1,5 @@
 <%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
-<h2><spring:message code="statistics.title" text="Statistics"/></h2>
+<h2><spring:message code="statistics.title"/></h2>
 
 <p>There have been 
 	<span class="label label-info">${statsSummary["userCount"]}</span> user${statsSummary["userCount"] == 1 ? "" : "s"} 
diff --git a/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/topbar.tag b/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/topbar.tag
index 5891648ce..79432ec0b 100644
--- a/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/topbar.tag
+++ b/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/topbar.tag
@@ -40,34 +40,34 @@
 					<ul class="nav">
 						<c:choose>
 							<c:when test="${pageName == 'Home'}">
-								<li class="active"><a href="" data-toggle="collapse" data-target=".nav-collapse"><spring:message code="topbar.home" text="Home"/></a></li>
+								<li class="active"><a href="" data-toggle="collapse" data-target=".nav-collapse"><spring:message code="topbar.home"/></a></li>
 							</c:when>
 							<c:otherwise>
-								<li><a href="" data-toggle="collapse" data-target=".nav-collapse"><spring:message code="topbar.home" text="Home"/></a></li>
+								<li><a href="" data-toggle="collapse" data-target=".nav-collapse"><spring:message code="topbar.home"/></a></li>
 							</c:otherwise>
 						</c:choose>
 						<c:choose>
 							<c:when test="${pageName == 'About'}">
-								<li class="active" data-toggle="collapse" data-target=".nav-collapse"><a href=""><spring:message code="topbar.about" text="About"/></a></li>
+								<li class="active" data-toggle="collapse" data-target=".nav-collapse"><a href=""><spring:message code="topbar.about"/></a></li>
 							</c:when>
 							<c:otherwise>
-								<li><a href="about" data-toggle="collapse" data-target=".nav-collapse"><spring:message code="topbar.about" text="About"/></a></li>
+								<li><a href="about" data-toggle="collapse" data-target=".nav-collapse"><spring:message code="topbar.about"/></a></li>
 							</c:otherwise>
 						</c:choose>
 						<c:choose>
 							<c:when test="${pageName == 'Statistics'}">
-								<li class="active" data-toggle="collapse" data-target=".nav-collapse"><a href=""><spring:message code="topbar.statistics" text="Statistics"/></a></li>
+								<li class="active" data-toggle="collapse" data-target=".nav-collapse"><a href=""><spring:message code="topbar.statistics"/></a></li>
 							</c:when>
 							<c:otherwise>
-								<li><a href="stats" data-toggle="collapse" data-target=".nav-collapse"><spring:message code="topbar.statistics" text="Statistics"/></a></li>
+								<li><a href="stats" data-toggle="collapse" data-target=".nav-collapse"><spring:message code="topbar.statistics"/></a></li>
 							</c:otherwise>
 						</c:choose>
 						<c:choose>
 							<c:when test="${pageName == 'Contact'}">
-								<li class="active" data-toggle="collapse" data-target=".nav-collapse"><a href=""><spring:message code="topbar.contact" text="Contact"/></a></li>
+								<li class="active" data-toggle="collapse" data-target=".nav-collapse"><a href=""><spring:message code="topbar.contact"/></a></li>
 							</c:when>
 							<c:otherwise>
-								<li><a href="contact" data-toggle="collapse" data-target=".nav-collapse"><spring:message code="topbar.contact" text="Contact"/></a></li>
+								<li><a href="contact" data-toggle="collapse" data-target=".nav-collapse"><spring:message code="topbar.contact"/></a></li>
 							</c:otherwise>
 						</c:choose>
 	
@@ -88,13 +88,13 @@
 							<ul class="dropdown-menu pull-right">
 								<li><a href="manage/#user/profile" data-toggle="collapse" data-target=".nav-collapse">${ longName }</a></li>
 								<li class="divider"></li>
-								<li><a href="logout" data-toggle="collapse" data-target=".nav-collapse"><i class="icon-remove"></i> <spring:message code="topbar.logout" text="Log out"/></a></li>
+								<li><a href="logout" data-toggle="collapse" data-target=".nav-collapse"><i class="icon-remove"></i> <spring:message code="topbar.logout"/></a></li>
 							</ul>
 						</li>
 	                    </security:authorize>
 	                    <security:authorize access="!hasRole('ROLE_USER')">
 	                    <li>
-	                    	<a id="loginButton" href="login" data-toggle="collapse" data-target=".nav-collapse"><i class="icon-lock icon-white"></i> <spring:message code="topbar.login" text="Log in"/></a>
+	                    	<a id="loginButton" href="login" data-toggle="collapse" data-target=".nav-collapse"><i class="icon-lock icon-white"></i> <spring:message code="topbar.login"/></a>
 	                    </li>
 	                    </security:authorize>
 	                </ul>