Commit aeb7d5de authored by Guus der Kinderen's avatar Guus der Kinderen

OF-1004 (i18n): Use simpler JSTL construct.

Replaced the 'set this var with this translation' definition for
a functional equivalent but easier-on-the-eyes definition.
parent 1c054a2e
...@@ -302,9 +302,7 @@ ...@@ -302,9 +302,7 @@
</form> </form>
<!-- BEGIN 'Allowed to Connect' --> <!-- BEGIN 'Allowed to Connect' -->
<c:set var="allowedTitle"> <fmt:message key="component.settings.allowed" var="allowedTitle" />
<fmt:message key="component.settings.allowed" />
</c:set>
<admin:contentBox title="${allowedTitle}"> <admin:contentBox title="${allowedTitle}">
<form action="connection-settings-external-components.jsp" method="post"> <form action="connection-settings-external-components.jsp" method="post">
<table cellpadding="3" cellspacing="0" border="0" width="100%" > <table cellpadding="3" cellspacing="0" border="0" width="100%" >
...@@ -402,9 +400,7 @@ ...@@ -402,9 +400,7 @@
<!-- END 'Allowed to Connect' --> <!-- END 'Allowed to Connect' -->
<!-- BEGIN 'Not Allowed to Connect' --> <!-- BEGIN 'Not Allowed to Connect' -->
<c:set var="disallowedTitle"> <fmt:message key="component.settings.disallowed" var="disallowedTitle"/>
<fmt:message key="component.settings.disallowed" />
</c:set>
<admin:contentBox title="${disallowedTitle}"> <admin:contentBox title="${disallowedTitle}">
<p><fmt:message key="component.settings.disallowed.info" /></p> <p><fmt:message key="component.settings.disallowed.info" /></p>
<table class="jive-table" cellpadding="3" cellspacing="0" border="0" > <table class="jive-table" cellpadding="3" cellspacing="0" border="0" >
......
...@@ -166,9 +166,7 @@ ...@@ -166,9 +166,7 @@
</admin:contentBox> </admin:contentBox>
<!-- BEGIN 'Idle Connection Policy' --> <!-- BEGIN 'Idle Connection Policy' -->
<c:set var="idleTitle"> <fmt:message key="client.connections.settings.idle.title" var="idleTitle" />
<fmt:message key="client.connections.settings.idle.title" />
</c:set>
<admin:contentBox title="${idleTitle}"> <admin:contentBox title="${idleTitle}">
<p><fmt:message key="client.connections.settings.idle.info" /></p> <p><fmt:message key="client.connections.settings.idle.info" /></p>
<table cellpadding="3" cellspacing="0" border="0" width="100%"> <table cellpadding="3" cellspacing="0" border="0" width="100%">
...@@ -187,9 +185,7 @@ ...@@ -187,9 +185,7 @@
<label for="IDL02"><fmt:message key="client.connections.settings.idle.enable" /></label> <label for="IDL02"><fmt:message key="client.connections.settings.idle.enable" /></label>
<br /> <br />
<c:if test="${clientIdle gt 0}"> <c:if test="${clientIdle gt 0}">
<c:set var="seconds"> <fmt:parseNumber integerOnly="true" var="seconds">${clientIdle div 1000}</fmt:parseNumber>
<fmt:parseNumber integerOnly="true">${clientIdle div 1000}</fmt:parseNumber>
</c:set>
</c:if> </c:if>
<input type="text" name="clientIdle" value="${clientIdle gt 0 ? seconds : ''}" size="5" maxlength="5">&nbsp;<fmt:message key="global.seconds" /> <input type="text" name="clientIdle" value="${clientIdle gt 0 ? seconds : ''}" size="5" maxlength="5">&nbsp;<fmt:message key="global.seconds" />
<c:if test="${not empty errors['clientIdle']}"> <c:if test="${not empty errors['clientIdle']}">
......
...@@ -289,9 +289,7 @@ ...@@ -289,9 +289,7 @@
<!-- BEGIN 'Idle Connection Settings' --> <!-- BEGIN 'Idle Connection Settings' -->
<form action="connection-settings-socket-s2s.jsp?closeSettings" method="post"> <form action="connection-settings-socket-s2s.jsp?closeSettings" method="post">
<c:set var="idleTitle"> <fmt:message key="server2server.settings.close_settings" var="idleTitle"/>
<fmt:message key="server2server.settings.close_settings" />
</c:set>
<admin:contentBox title="${idleTitle}"> <admin:contentBox title="${idleTitle}">
<table cellpadding="3" cellspacing="0" border="0"> <table cellpadding="3" cellspacing="0" border="0">
<tr valign="middle"> <tr valign="middle">
...@@ -300,9 +298,7 @@ ...@@ -300,9 +298,7 @@
</td> </td>
<td width="99%"> <td width="99%">
<c:if test="${webManager.sessionManager.serverSessionIdleTime gt -1}"> <c:if test="${webManager.sessionManager.serverSessionIdleTime gt -1}">
<c:set var="minutes"> <fmt:parseNumber integerOnly="true" var="minutes">${webManager.sessionManager.serverSessionIdleTime div 60000}</fmt:parseNumber>
<fmt:parseNumber integerOnly="true">${webManager.sessionManager.serverSessionIdleTime div 60000}</fmt:parseNumber>
</c:set>
</c:if> </c:if>
<label for="rb04"><fmt:message key="server2server.settings.close_session" /></label> <label for="rb04"><fmt:message key="server2server.settings.close_session" /></label>
...@@ -329,9 +325,7 @@ ...@@ -329,9 +325,7 @@
<br/> <br/>
<!-- BEGIN 'Allowed to Connect' --> <!-- BEGIN 'Allowed to Connect' -->
<c:set var="allowedTitle"> <fmt:message key="server2server.settings.allowed" var="allowedTitle"/>
<fmt:message key="server2server.settings.allowed" />
</c:set>
<admin:contentBox title="${allowedTitle}"> <admin:contentBox title="${allowedTitle}">
<form action="connection-settings-socket-s2s.jsp" method="post"> <form action="connection-settings-socket-s2s.jsp" method="post">
<table cellpadding="3" cellspacing="0" border="0"> <table cellpadding="3" cellspacing="0" border="0">
...@@ -410,9 +404,7 @@ ...@@ -410,9 +404,7 @@
<!-- END 'Allowed to Connect' --> <!-- END 'Allowed to Connect' -->
<!-- BEGIN 'Not Allowed to Connect' --> <!-- BEGIN 'Not Allowed to Connect' -->
<c:set var="disallowedTitle"> <fmt:message key="server2server.settings.disallowed" var="disallowedTitle"/>
<fmt:message key="server2server.settings.disallowed" />
</c:set>
<admin:contentBox title="${disallowedTitle}"> <admin:contentBox title="${disallowedTitle}">
<table cellpadding="3" cellspacing="1" border="0" width="100%"><tr><td> <table cellpadding="3" cellspacing="1" border="0" width="100%"><tr><td>
<fmt:message key="server2server.settings.disallowed.info" /> <fmt:message key="server2server.settings.disallowed.info" />
......
...@@ -126,7 +126,7 @@ ...@@ -126,7 +126,7 @@
<!-- BEGIN 'Import Certificate' --> <!-- BEGIN 'Import Certificate' -->
<form action="import-truststore-certificate.jsp?connectionType=${connectionType}" method="post"> <form action="import-truststore-certificate.jsp?connectionType=${connectionType}" method="post">
<c:set var="title"><fmt:message key="ssl.import.certificate.truststore.boxtitle"/></c:set> <fmt:message key="ssl.import.certificate.truststore.boxtitle" var="title"/>
<admin:contentBox title="${title}"> <admin:contentBox title="${title}">
<table cellpadding="3" cellspacing="0" border="0"> <table cellpadding="3" cellspacing="0" border="0">
<tr valign="top"> <tr valign="top">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment