Fix plural issues.

pull/763/head
Fredrik Jönsson 2015-02-05 09:31:37 +01:00
parent 4dde4fa054
commit bed754dde6
3 changed files with 23 additions and 5 deletions

View File

@ -68,8 +68,12 @@ approve.error.not_granted=Access could not be granted.
approve.required_for=Approval Required for approve.required_for=Approval Required for
approve.dynamically_registered=This client was dynamically registered <span id="registrationTime"></span>. approve.dynamically_registered=This client was dynamically registered <span id="registrationTime"></span>.
approve.caution=Caution approve.caution=Caution
approve.caution.message=This software was dynamically registered <span id="registrationTime" class="label"></span> \ approve.caution.message.none=This software was dynamically registered <span id="registrationTime" class="label"></span> \
and it has been approved <span class="label">{0}</span> {0,choice,0#times|1#time|1<times} previously. and it has never been approved previously.
approve.caution.message.singular=This software was dynamically registered <span id="registrationTime" class="label"></span> \
and it has been approved <span class="label">{0}</span> time previously.
approve.caution.message.plural=This software was dynamically registered <span id="registrationTime" class="label"></span> \
and it has been approved <span class="label">{0}</span> times previously.
approve.more_information=more information approve.more_information=more information
approve.home_page=Home page approve.home_page=Home page
approve.policy=Policy approve.policy=Policy

View File

@ -73,8 +73,12 @@ approve.error.not_granted=Åtkomst kunde inte medges.
approve.required_for=Åtkomst måste medges för approve.required_for=Åtkomst måste medges för
approve.dynamically_registered=Denna klient blev registrerad dynamiskt <span id="registrationTime"></span>. approve.dynamically_registered=Denna klient blev registrerad dynamiskt <span id="registrationTime"></span>.
approve.caution=Försiktigt approve.caution=Försiktigt
approve.caution.message=Denna klient blev registrerad dynamiskt <span id="registrationTime" class="label"></span> \ approve.caution.message.none=Denna klient blev registrerad dynamiskt <span id="registrationTime" class="label"></span> \
och har blivit medgiven åtkomst <span class="label">{0}</span> {0,choice,0#gånger|1#gång|1<gånger} tidigare. och har aldrig tidigare blivit medgiven åtkomst.
approve.caution.message.singular=Denna klient blev registrerad dynamiskt <span id="registrationTime" class="label"></span> \
och har tidigare blivit medgiven åtkomst <span class="label">{0}</span> gång.
approve.caution.message.plural=Denna klient blev registrerad dynamiskt <span id="registrationTime" class="label"></span> \
och har tidigare blivit medgiven åtkomst <span class="label">{0}</span> gånger.
approve.more_information=mer information approve.more_information=mer information
approve.home_page=Hemsida approve.home_page=Hemsida
approve.policy=Policy approve.policy=Policy

View File

@ -52,7 +52,17 @@
<h4> <h4>
<i class="icon-globe"></i> <spring:message code="approve.caution"/>: <i class="icon-globe"></i> <spring:message code="approve.caution"/>:
</h4> </h4>
<spring:message code="approve.caution.message" arguments="${count}"/> <c:choose>
<c:when test="${count == 0}">
<spring:message code="approve.caution.message.none" arguments="${count}"/>
</c:when>
<c:when test="${count == 1}">
<spring:message code="approve.caution.message.singular" arguments="${count}"/>
</c:when>
<c:otherwise>
<spring:message code="approve.caution.message.plural" arguments="${count}"/>
</c:otherwise>
</c:choose>
</div> </div>
</c:otherwise> </c:otherwise>
</c:choose> </c:choose>