Refactorize, remove text attribute from messages so untranslated labels are easily identified.

pull/763/head
Fredrik Jönsson 2015-02-04 16:10:11 +01:00
parent f991ca0093
commit 644344a6e4
11 changed files with 27 additions and 25 deletions

View File

@ -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

View File

@ -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

View File

@ -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>

View File

@ -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>

View File

@ -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}"/>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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"}

View File

@ -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>