Skip to content

O
Openfire
Commit 8a74b6de authored by Dave Cridland's avatar Dave Cridland
Browse files
Options

Merge pull request #499 from guusdk/OF-1004 

OF-1004: Apply i18n to admin console
parents 32e36e0c 74a7a188
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 170 additions and 163 deletions
src/i18n/openfire_i18n_en.properties
View file @ 8a74b6de
This diff is collapsed.
src/web/connection-settings-advanced.jsp
View file @ 8a74b6de
This diff is collapsed.
src/web/connection-settings-external-components.jsp
View file @ 8a74b6de
......@@ -260,16 +260,17 @@
<form action="connection-settings-external-components.jsp" method="post">
<admin:contentBox title="Plain-text (with STARTTLS) connections">
<fmt:message key="component.settings.plaintext.boxtitle" var="plaintextboxtitle"/>
<admin:contentBox title="${plaintextboxtitle}">
<p>Openfire can accept plain-text connections, which, depending on the policy that is configured here, can be upgraded to encrypted connections (using the STARTTLS protocol).</p>
<p><fmt:message key="component.settings.plaintext.info"/></p>
<table cellpadding="3" cellspacing="0" border="0">
<tr valign="middle">
<td colspan="2"><input type="checkbox" name="plaintext-enabled" id="plaintext-enabled" onclick="applyDisplayable('plaintext')" ${plaintextConfiguration.enabled ? 'checked' : ''}/><label for="plaintext-enabled">Enabled</label></td>
<td colspan="2"><input type="checkbox" name="plaintext-enabled" id="plaintext-enabled" onclick="applyDisplayable('plaintext')" ${plaintextConfiguration.enabled ? 'checked' : ''}/><label for="plaintext-enabled"><fmt:message key="component.settings.plaintext.label_enable"/></label></td>
</tr>
<tr valign="middle">
<td width="1%" nowrap><label for="plaintext-tcpPort">Port number</label></td>
<td width="1%" nowrap><label for="plaintext-tcpPort"><fmt:message key="ports.port"/></label></td>
<td width="99%"><input type="text" name="plaintext-tcpPort" id="plaintext-tcpPort" value="${plaintextConfiguration.port}"/></td>
</tr>
<tr valign="middle">
......@@ -279,16 +280,17 @@
</admin:contentBox>
<admin:contentBox title="Encrypted (legacy-mode) connections">
<fmt:message key="component.settings.legacymode.boxtitle" var="legacymodeboxtitle"/>
<admin:contentBox title="${legacymodeboxtitle}">
<p>Connections of this type are established using encryption immediately (as opposed to using STARTTLS). This type of connectivity is commonly referred to as the "legacy" method of establishing encrypted communications.</p>
<p><fmt:message key="component.settings.legacymode.info"/></p>
<table cellpadding="3" cellspacing="0" border="0">
<tr valign="middle">
<td colspan="2"><input type="checkbox" name="legacymode-enabled" id="legacymode-enabled" onclick="applyDisplayable('legacymode')" ${legacymodeConfiguration.enabled ? 'checked' : ''}/><label for="legacymode-enabled">Enabled</label></td>
<td colspan="2"><input type="checkbox" name="legacymode-enabled" id="legacymode-enabled" onclick="applyDisplayable('legacymode')" ${legacymodeConfiguration.enabled ? 'checked' : ''}/><label for="legacymode-enabled"><fmt:message key="component.settings.legacymode.label_enable"/></label></td>
</tr>
<tr valign="middle">
<td width="1%" nowrap><label for="legacymode-tcpPort">Port number</label></td>
<td width="1%" nowrap><label for="legacymode-tcpPort"><fmt:message key="ports.port"/></label></td>
<td width="99%"><input type="text" name="legacymode-tcpPort" id="legacymode-tcpPort" value="${legacymodeConfiguration.port}"></td>
</tr>
<tr valign="middle">
......@@ -302,9 +304,7 @@
</form>
<!-- BEGIN 'Allowed to Connect' -->
<c:set var="allowedTitle">
<fmt:message key="component.settings.allowed" />
</c:set>
<fmt:message key="component.settings.allowed" var="allowedTitle" />
<admin:contentBox title="${allowedTitle}">
<form action="connection-settings-external-components.jsp" method="post">
<table cellpadding="3" cellspacing="0" border="0" width="100%" >
......@@ -402,9 +402,7 @@
<!-- END 'Allowed to Connect' -->
<!-- BEGIN 'Not Allowed to Connect' -->
<c:set var="disallowedTitle">
<fmt:message key="component.settings.disallowed" />
</c:set>
<fmt:message key="component.settings.disallowed" var="disallowedTitle"/>
<admin:contentBox title="${disallowedTitle}">
<p><fmt:message key="component.settings.disallowed.info" /></p>
<table class="jive-table" cellpadding="3" cellspacing="0" border="0" >
......
src/web/connection-settings-socket-c2s.jsp
View file @ 8a74b6de
......@@ -127,16 +127,17 @@
<form action="connection-settings-socket-c2s.jsp" method="post">
<admin:contentBox title="Plain-text (with STARTTLS) connections">
<fmt:message key="ssl.settings.client.plaintext.boxtitle" var="plaintextboxtitle"/>
<admin:contentBox title="${plaintextboxtitle}">
<p>Openfire can accept plain-text connections, which, depending on the policy that is configured here, can be upgraded to encrypted connections (using the STARTTLS protocol).</p>
<p><fmt:message key="ssl.settings.client.plaintext.info"/></p>
<table cellpadding="3" cellspacing="0" border="0">
<tr valign="middle">
<td colspan="2"><input type="checkbox" name="plaintext-enabled" id="plaintext-enabled" onclick="applyDisplayable('plaintext')" ${plaintextConfiguration.enabled ? 'checked' : ''}/><label for="plaintext-enabled">Enabled</label></td>
<td colspan="2"><input type="checkbox" name="plaintext-enabled" id="plaintext-enabled" onclick="applyDisplayable('plaintext')" ${plaintextConfiguration.enabled ? 'checked' : ''}/><label for="plaintext-enabled"><fmt:message key="ssl.settings.client.plaintext.label_enable"/></label></td>
</tr>
<tr valign="middle">
<td width="1%" nowrap><label for="plaintext-tcpPort">Port number</label></td>
<td width="1%" nowrap><label for="plaintext-tcpPort"><fmt:message key="ports.port"/></label></td>
<td width="99%"><input type="text" name="plaintext-tcpPort" id="plaintext-tcpPort" value="${plaintextConfiguration.port}"/></td>
</tr>
<tr valign="middle">
......@@ -146,16 +147,17 @@
</admin:contentBox>
<admin:contentBox title="Encrypted (legacy-mode) connections">
<fmt:message key="ssl.settings.client.legacymode.boxtitle" var="legacymodeboxtitle"/>
<admin:contentBox title="${legacymodeboxtitle}">
<p>Connections of this type are established using encryption immediately (as opposed to using STARTTLS). This type of connectivity is commonly referred to as the "legacy" method of establishing encrypted communications.</p>
<p><fmt:message key="ssl.settings.client.legacymode.info"/></p>
<table cellpadding="3" cellspacing="0" border="0">
<tr valign="middle">
<td colspan="2"><input type="checkbox" name="legacymode-enabled" id="legacymode-enabled" onclick="applyDisplayable('legacymode')" ${legacymodeConfiguration.enabled ? 'checked' : ''}/><label for="legacymode-enabled">Enabled</label></td>
<td colspan="2"><input type="checkbox" name="legacymode-enabled" id="legacymode-enabled" onclick="applyDisplayable('legacymode')" ${legacymodeConfiguration.enabled ? 'checked' : ''}/><label for="legacymode-enabled"><fmt:message key="ssl.settings.client.legacymode.label_enable"/></label></td>
</tr>
<tr valign="middle">
<td width="1%" nowrap><label for="legacymode-tcpPort">Port number</label></td>
<td width="1%" nowrap><label for="legacymode-tcpPort"><fmt:message key="ports.port"/></label></td>
<td width="99%"><input type="text" name="legacymode-tcpPort" id="legacymode-tcpPort" value="${legacymodeConfiguration.port}"></td>
</tr>
<tr valign="middle">
......@@ -166,9 +168,7 @@
</admin:contentBox>
<!-- BEGIN 'Idle Connection Policy' -->
<c:set var="idleTitle">
<fmt:message key="client.connections.settings.idle.title" />
</c:set>
<fmt:message key="client.connections.settings.idle.title" var="idleTitle" />
<admin:contentBox title="${idleTitle}">
<p><fmt:message key="client.connections.settings.idle.info" /></p>
<table cellpadding="3" cellspacing="0" border="0" width="100%">
......@@ -187,9 +187,7 @@
<label for="IDL02"><fmt:message key="client.connections.settings.idle.enable" /></label>
<br />
<c:if test="${clientIdle gt 0}">
<c:set var="seconds">
<fmt:parseNumber integerOnly="true">${clientIdle div 1000}</fmt:parseNumber>
</c:set>
<fmt:parseNumber integerOnly="true" var="seconds">${clientIdle div 1000}</fmt:parseNumber>
</c:if>
<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']}">
......
src/web/connection-settings-socket-s2s.jsp
View file @ 8a74b6de
......@@ -263,16 +263,17 @@
<form action="connection-settings-socket-s2s.jsp" method="post">
<admin:contentBox title="Plain-text (with STARTTLS) connections">
<fmt:message key="server2server.settings.boxtitle" var="boxtitle"/>
<admin:contentBox title="${boxtitle}">
<p>Openfire can accept plain-text connections, which, depending on the policy that is configured here, can be upgraded to encrypted connections (using the STARTTLS protocol).</p>
<p><fmt:message key="server2server.settings.boxinfo"/></p>
<table cellpadding="3" cellspacing="0" border="0">
<tr valign="middle">
<td colspan="2"><input type="checkbox" name="plaintext-enabled" id="plaintext-enabled" onclick="applyDisplayable('plaintext')" ${plaintextConfiguration.enabled ? 'checked' : ''}/><label for="plaintext-enabled">Enabled</label></td>
<td colspan="2"><input type="checkbox" name="plaintext-enabled" id="plaintext-enabled" onclick="applyDisplayable('plaintext')" ${plaintextConfiguration.enabled ? 'checked' : ''}/><label for="plaintext-enabled"><fmt:message key="server2server.settings.label_enable"/></label></td>
</tr>
<tr valign="middle">
<td width="1%" nowrap><label for="plaintext-tcpPort">Port number</label></td>
<td width="1%" nowrap><label for="plaintext-tcpPort"><fmt:message key="ports.port"/></label></td>
<td width="99%"><input type="text" name="plaintext-tcpPort" id="plaintext-tcpPort" value="${plaintextConfiguration.port}"/></td>
</tr>
<tr valign="middle">
......@@ -289,9 +290,7 @@
<!-- BEGIN 'Idle Connection Settings' -->
<form action="connection-settings-socket-s2s.jsp?closeSettings" method="post">
<c:set var="idleTitle">
<fmt:message key="server2server.settings.close_settings" />
</c:set>
<fmt:message key="server2server.settings.close_settings" var="idleTitle"/>
<admin:contentBox title="${idleTitle}">
<table cellpadding="3" cellspacing="0" border="0">
<tr valign="middle">
......@@ -300,9 +299,7 @@
</td>
<td width="99%">
<c:if test="${webManager.sessionManager.serverSessionIdleTime gt -1}">
<c:set var="minutes">
<fmt:parseNumber integerOnly="true">${webManager.sessionManager.serverSessionIdleTime div 60000}</fmt:parseNumber>
</c:set>
<fmt:parseNumber integerOnly="true" var="minutes">${webManager.sessionManager.serverSessionIdleTime div 60000}</fmt:parseNumber>
</c:if>
<label for="rb04"><fmt:message key="server2server.settings.close_session" /></label>
......@@ -329,9 +326,7 @@
<br/>
<!-- BEGIN 'Allowed to Connect' -->
<c:set var="allowedTitle">
<fmt:message key="server2server.settings.allowed" />
</c:set>
<fmt:message key="server2server.settings.allowed" var="allowedTitle"/>
<admin:contentBox title="${allowedTitle}">
<form action="connection-settings-socket-s2s.jsp" method="post">
<table cellpadding="3" cellspacing="0" border="0">
......@@ -410,9 +405,7 @@
<!-- END 'Allowed to Connect' -->
<!-- BEGIN 'Not Allowed to Connect' -->
<c:set var="disallowedTitle">
<fmt:message key="server2server.settings.disallowed" />
</c:set>
<fmt:message key="server2server.settings.disallowed" var="disallowedTitle"/>
<admin:contentBox title="${disallowedTitle}">
<table cellpadding="3" cellspacing="1" border="0" width="100%"><tr><td>
<fmt:message key="server2server.settings.disallowed.info" />
......
src/web/import-keystore-certificate.jsp
View file @ 8a74b6de
......@@ -108,9 +108,9 @@
<!-- BEGIN 'Import Private Key and Certificate' -->
<form action="import-keystore-certificate.jsp?connectionType=${connectionType}" method="post">
<c:set var="title">Private Key</c:set>
<c:set var="title"><fmt:message key="ssl.import.certificate.keystore.private-key.title"/></c:set>
<admin:contentBox title="${title}">
<p>Please provide the PEM representation of the private key that should be used to identify Openfire.</p>
<p><fmt:message key="ssl.import.certificate.keystore.private-key.info"/></p>
<table cellpadding="3" cellspacing="0" border="0">
<tr valign="top">
<td width="1%" nowrap class="c1">
......@@ -131,9 +131,9 @@
</table>
</admin:contentBox>
<c:set var="title">Certificate</c:set>
<c:set var="title"><fmt:message key="ssl.import.certificate.keystore.certificate.title"/></c:set>
<admin:contentBox title="${title}">
<p>Please provide the PEM representation of the certificate chain that represents the identity of Openfire. Note that the certificate chain must be based on the private key provided above.</p>
<p><fmt:message key="ssl.import.certificate.keystore.certificate.info"/></p>
<table cellpadding="3" cellspacing="0" border="0">
<tr valign="top">
<td width="1%" nowrap class="c1">
......
src/web/import-truststore-certificate.jsp
View file @ 8a74b6de
......@@ -126,7 +126,7 @@
<!-- BEGIN 'Import Certificate' -->
<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}">
<table cellpadding="3" cellspacing="0" border="0">
<tr valign="top">
......
src/web/security-certificate-store-management.jsp
View file @ 8a74b6de
<%@ page errorPage="error.jsp"%>
<%@ page import="org.jivesoftware.util.ParamUtils" %>
<%@ page import="java.util.Map" %>
<%@ page import="java.util.HashMap" %>
<%@ page import="org.jivesoftware.openfire.spi.ConnectionType" %>
<%@ page import="org.jivesoftware.openfire.keystore.CertificateStoreManager" %>
<%@ page import="org.jivesoftware.openfire.XMPPServer" %>
<%@ taglib uri="admin" prefix="admin" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
......@@ -21,7 +19,7 @@
%>
<html>
<head>
<title>Certificate Stores</title>
<title><fmt:message key="ssl.certificates.store-management.title"/></title>
<meta name="pageID" content="security-certificate-store-management"/>
</head>
<body>
......@@ -30,7 +28,7 @@
<admin:infobox type="error">
<c:choose>
<c:when test="${err.key eq 'template'}">
An unexpected error occurred.
<fmt:message key="admin.error"/>
</c:when>
<c:otherwise>
<c:if test="${not empty err.value}">
......@@ -43,70 +41,35 @@
</c:forEach>
<p>
Certificates are used (through TLS and SSL protocols) to establish secure connections between servers and clients.
When a secured connection is being created, parties can retrieve a certificate from the other party and (amongst
others) examine the issuer of those certificates. If the issuer is trusted, a secured layer of communication can be
established.
<fmt:message key="ssl.certificates.store-management.info-1"/>
</p>
<p>
Certificates are kept in specialized repositories, or 'stores'. Openfire provides two types of stores:
<ul>
<li><em>Identity stores</em> are used to store certificates that identify this instance of Openfire. On request,
they certificates from these stores are transmitted to other parties which use them to identify your server.
</li>
<li><em>Trust stores</em> contain certificates that identify parties that you choose to trust. Trust stores often do
not include the certificate from the remote party directly, but instead holds certificates from organizations
that are trusted to identify the certificate of the remote party. Such organizations are commonly referred to as
"Certificate Authorities".
</li>
</ul>
<fmt:message key="ssl.certificates.store-management.info-2"/>
</p>
<p>
This section of the admin panel is dedicated to management of the various key and trust stores that act as
repositories for sets of security certificates. By default, a small set of stores is re-used for various purposes,
but Openfire allows you to configure a distinct set of stores for each connection type.
</p>
<fmt:message key="ssl.certificates.store-management.info-3"/></p>
<c:forEach items="${connectionTypes}" var="connectionType">
<c:set var="title">
<c:choose>
<c:when test="${connectionType eq 'SOCKET_C2S'}">XMPP Client Stores</c:when>
<c:when test="${connectionType eq 'SOCKET_S2S'}">Server Federation Stores</c:when>
<c:when test="${connectionType eq 'BOSH_C2S'}">BOSH (HTTP Binding) Stores</c:when>
<c:when test="${connectionType eq 'WEBADMIN'}">Admin Console Stores</c:when>
<c:when test="${connectionType eq 'COMPONENT'}">External Component Stores</c:when>
<c:when test="${connectionType eq 'CONNECTION_MANAGER'}">Connection Manager Stores</c:when>
<c:when test="${connectionType eq 'SOCKET_C2S'}"><fmt:message key="ssl.certificates.store-management.socket-c2s-stores.title"/></c:when>
<c:when test="${connectionType eq 'SOCKET_S2S'}"><fmt:message key="ssl.certificates.store-management.socket-s2s-stores.title"/></c:when>
<c:when test="${connectionType eq 'BOSH_C2S'}"><fmt:message key="ssl.certificates.store-management.bosh-c2s-stores.title"/></c:when>
<c:when test="${connectionType eq 'WEBADMIN'}"><fmt:message key="ssl.certificates.store-management.admin-console-stores.title"/></c:when>
<c:when test="${connectionType eq 'COMPONENT'}"><fmt:message key="ssl.certificates.store-management.component-stores.title"/></c:when>
<c:when test="${connectionType eq 'CONNECTION_MANAGER'}"><fmt:message key="ssl.certificates.store-management.connection-manager-stores.title"/></c:when>
</c:choose>
</c:set>
<c:set var="description">
<c:choose>
<c:when test="${connectionType eq 'SOCKET_C2S'}">
These stores are used for regular, TCP-based client-to-server XMPP communication. Two stores are provided:
one identity store and a trust store. Openfire ships with an empty trust store, as in typical
environments, certificate-based authentication of clients is not required.
</c:when>
<c:when test="${connectionType eq 'SOCKET_S2S'}">
These stores are used for erver-to-server XMPP communication, which establishes server federation.
Two stores are provided: one identity store and a trust store. Openfire ships with a trust store filled
with certificates of generally accepted certificate authorities.
</c:when>
<c:when test="${connectionType eq 'BOSH_C2S'}">
These stores are used for BOSH-based XMPP communication. Two stores are provided: an identity store
and a client trust store.
</c:when>
<c:when test="${connectionType eq 'WEBADMIN'}">
These stores are used for the web-based admin console (you're looking at it right now!). Again, two stores are
provided an identity store and a trust store (used for optional authentication of browsers that use the admin
panel).
</c:when>
<c:when test="${connectionType eq 'COMPONENT'}">
These stores are used to establish connections with external components.
</c:when>
<c:when test="${connectionType eq 'CONNECTION_MANAGER'}">
These stores are used to establish connections with Openfire Connection Managers.
</c:when>
<c:when test="${connectionType eq 'SOCKET_C2S'}"><fmt:message key="ssl.certificates.store-management.socket-c2s-stores.info"/></c:when>
<c:when test="${connectionType eq 'SOCKET_S2S'}"><fmt:message key="ssl.certificates.store-management.socket-s2s-stores.info"/></c:when>
<c:when test="${connectionType eq 'BOSH_C2S'}"><fmt:message key="ssl.certificates.store-management.bosh-c2s-stores.info"/></c:when>
<c:when test="${connectionType eq 'WEBADMIN'}"><fmt:message key="ssl.certificates.store-management.admin-console-stores.info"/></c:when>
<c:when test="${connectionType eq 'COMPONENT'}"><fmt:message key="ssl.certificates.store-management.component-stores.info"/></c:when>
<c:when test="${connectionType eq 'CONNECTION_MANAGER'}"><fmt:message key="ssl.certificates.store-management.connection-manager-stores.info"/></c:when>
</c:choose>
</c:set>
......@@ -118,14 +81,14 @@
<table cellpadding="0" cellspacing="0" border="0">
<tbody>
<tr>
<td><label for="loc-key-socket">Identity Store:</label></td>
<td><label for="loc-key-socket"><fmt:message key="ssl.certificates.identity-store"/>:</label></td>
<td><input id="loc-key-socket" name="loc-key-socket" type="text" size="80" readonly value="${certificateStoreManager.getIdentityStore(connectionType).configuration.file}"/></td>
<td><a href="security-keystore.jsp?connectionType=${connectionType}">Manage Store Contents</a></td>
<td><a href="security-keystore.jsp?connectionType=${connectionType}"><fmt:message key="ssl.certificates.store-management.manage"/></a></td>
</tr>
<tr>
<td><label for="loc-trust-socket-c2s">Trust Store:</label></td>
<td><label for="loc-trust-socket-c2s"><fmt:message key="ssl.certificates.trust-store"/>:</label></td>
<td><input id="loc-trust-socket-c2s" name="loc-trust-socket-c2s" type="text" size="80" readonly value="${certificateStoreManager.getTrustStore(connectionType).configuration.file}"/></td>
<td><a href="security-truststore.jsp?connectionType=${connectionType}">Manage Store Contents</a></td>
<td><a href="security-truststore.jsp?connectionType=${connectionType}"><fmt:message key="ssl.certificates.store-management.manage"/></a></td>
</tr>
</tbody>
</table>
......
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

Technounit-GROUP 2023