OF-1450: Small i18n fixes. (#957)

* OF-1450: Replaced hardcoded text with i18n-property in logviewer.

* OF-1450: Replaced hardcoded text with i18n-property in email settings.

* OF-1450: Replaced hardcoded text with i18n-property in TLS/SSL menu.

* OF-1450: Replaced hardcoded text with i18n-property in test email settings.

src/i18n/openfire_i18n_en.properties

@@ -529,6 +529,12 @@ tab.server.descr=Click to manage server settings
         sidebar.transfer-proxy=File Transfer Settings
         sidebar.transfer-proxy.descr=Click to view file tranfer settings
     sidebar.sidebar-certificates=TLS/SSL Certificates
+        sidebar.certificate-stores=Certificate Stores
+        sidebar.certificate-stores.descr=Manage Openfire Certificate stores
+        sidebar.identity-store=Identity Store
+        sidebar.identity-store.descr=Contains key and certificate that serve as identification of Openfire.
+        sidebar.trust-store=Trust Store
+        sidebar.trust-store.descr=Contains certificates that are used to verify the identity of peers.
         sidebar.sidebar-certificates-keys=Openfire Certificates
         sidebar.sidebar-certificates-keys-submenu=Connectivity Type
             sidebar.security-keystore-socket=Socket
@@ -1135,7 +1141,6 @@ logviewer.normal=Normal
 logviewer.reverse=Reverse
 logviewer.modified=Last Modified:
 logviewer.line=Lines:
-logviewer.all=All
 logviewer.log_dir=Log dir
 logviewer.confirm=Are you sure you want to clear this log file?
 logviewer.alt_clear=Clear Log
@@ -1144,6 +1149,7 @@ logviewer.alt_mark=Mark Log
 logviewer.mark=Mark
 logviewer.debug_log=Debug Log
 logviewer.enabled=Enabled
+logviewer.disabled=Disabled
 
 # Muc create permission Page
 
@@ -2845,6 +2851,9 @@ system.email.restart_possible=may require appserver restart
 system.email.valid_host_name=Please enter a valid host name.
 system.email.server_port=Server Port (Optional)
 system.email.mail_debugging=Mail Debugging
+system.email.mail_debugging.enabled=On
+system.email.mail_debugging.disabled=Off
+
 system.email.server_username=Server Username (Optional)
 system.email.server_password=Server Password (Optional)
 system.email.ssl=Use SSL (Optional)
@@ -2872,6 +2881,7 @@ system.emailtest.subject=Subject
 system.emailtest.body=Body
 system.emailtest.send=Send
 system.emailtest.cancel=Cancel/Go Back
+system.emailtest.update-address=Update Address
 
 # System SMS
 

src/resources/jar/admin-sidebar.xml

@@ -142,79 +142,79 @@
         <!-- TLS / SSL-->
         <sidebar id="sidebar-certificates" name="${sidebar.sidebar-certificates}">
 
-            <item id="security-certificate-store-management" name="Certificate Stores"
+            <item id="security-certificate-store-management" name="${sidebar.certificate-stores}"
                   url="security-certificate-store-management.jsp"
-                  description="Manage Openfire Certificate stores">
+                  description="${sidebar.certificate-stores.descr}">
 
                 <sidebar id="sidebar-certificate-store-socket-c2s" name="${sidebar.client-connections-settings}">
 
-                    <item id="sidebar-certificate-store-socket_c2s-identity-store" name="Identity Store"
+                    <item id="sidebar-certificate-store-socket_c2s-identity-store" name="${sidebar.identity-store}"
                           url="security-keystore.jsp?connectionType=SOCKET_C2S"
-                          description="Contains key and certificate that serve as identification of Openfire."/>
+                          description="${sidebar.identity-store.descr"/>
 
-                    <item id="sidebar-certificate-store-socket_c2s-trust-store" name="Trust Store"
+                    <item id="sidebar-certificate-store-socket_c2s-trust-store" name="${sidebar.trust-store}"
                           url="security-truststore.jsp?connectionType=SOCKET_C2S"
-                          description="Contains certificates that are used to verify the identity of peers."/>
+                          description="${sidebar.trust-store.descr}"/>
 
                 </sidebar>
 
                 <sidebar id="sidebar-certificate-store-socket-s2s" name="${sidebar.server2server-settings}">
 
-                    <item id="sidebar-certificate-store-socket_s2s-identity-store" name="Identity Store"
+                    <item id="sidebar-certificate-store-socket_s2s-identity-store" name="${sidebar.identity-store}"
                           url="security-keystore.jsp?connectionType=SOCKET_S2S"
-                          description="Contains key and certificate that serve as identification of Openfire."/>
+                          description="${sidebar.identity-store.descr"/>
 
-                    <item id="sidebar-certificate-store-socket_s2s-trust-store" name="Trust Store"
+                    <item id="sidebar-certificate-store-socket_s2s-trust-store" name="${sidebar.trust-store}"
                           url="security-truststore.jsp?connectionType=SOCKET_S2S"
-                          description="Contains certificates that are used to verify the identity of peers."/>
+                          description="${sidebar.trust-store.descr"/>
 
                 </sidebar>
 
                 <sidebar id="sidebar-certificate-store-bosh-c2s" name="${sidebar.http-bind}">
 
-                    <item id="sidebar-certificate-store-bosh_c2s-identity-store" name="Identity Store"
+                    <item id="sidebar-certificate-store-bosh_c2s-identity-store" name="${sidebar.identity-store}"
                           url="security-keystore.jsp?connectionType=BOSH_C2S"
-                          description="Contains key and certificate that serve as identification of Openfire."/>
+                          description="${sidebar.identity-store.descr"/>
 
-                    <item id="sidebar-certificate-store-bosh_c2s-trust-store" name="Trust Store"
+                    <item id="sidebar-certificate-store-bosh_c2s-trust-store" name="${sidebar.trust-store}"
                           url="security-truststore.jsp?connectionType=BOSH_C2S"
-                          description="Contains certificates that are used to verify the identity of peers."/>
+                          description="${sidebar.trust-store.descr"/>
 
                 </sidebar>
 
                 <sidebar id="sidebar-certificate-store-component" name="${sidebar.external-components-settings}">
 
-                    <item id="sidebar-certificate-store-component-identity-store" name="Identity Store"
+                    <item id="sidebar-certificate-store-component-identity-store" name="${sidebar.identity-store}"
                           url="security-keystore.jsp?connectionType=COMPONENT"
-                          description="Contains key and certificate that serve as identification of Openfire."/>
+                          description="${sidebar.identity-store.descr"/>
 
-                    <item id="sidebar-certificate-store-component-trust-store" name="Trust Store"
+                    <item id="sidebar-certificate-store-component-trust-store" name="${sidebar.trust-store}"
                           url="security-truststore.jsp?connectionType=COMPONENT"
-                          description="Contains certificates that are used to verify the identity of peers."/>
+                          description="${sidebar.trust-store.descr"/>
 
                 </sidebar>
 
                 <sidebar id="sidebar-certificate-store-connection-manager" name="${sidebar.connection-managers-settings}">
 
-                    <item id="sidebar-certificate-store-connection_manager-identity-store" name="Identity Store"
+                    <item id="sidebar-certificate-store-connection_manager-identity-store" name="${sidebar.identity-store}"
                           url="security-keystore.jsp?connectionType=CONNECTION_MANAGER"
-                          description="Contains key and certificate that serve as identification of Openfire."/>
+                          description="${sidebar.identity-store.descr"/>
 
-                    <item id="sidebar-certificate-store-connection_manager-trust-store" name="Trust Store"
+                    <item id="sidebar-certificate-store-connection_manager-trust-store" name="${sidebar.trust-store}"
                           url="security-truststore.jsp?connectionType=CONNECTION_MANAGER"
-                          description="Contains certificates that are used to verify the identity of peers."/>
+                          description="${sidebar.trust-store.descr"/>
 
                 </sidebar>
 
                 <sidebar id="sidebar-certificate-store-webadmin" name="${admin.console}">
 
-                    <item id="sidebar-certificate-store-webadmin-identity-store" name="Identity Store"
+                    <item id="sidebar-certificate-store-webadmin-identity-store" name="${sidebar.identity-store}"
                           url="security-keystore.jsp?connectionType=WEBADMIN"
-                          description="Contains key and certificate that serve as identification of Openfire."/>
+                          description="${sidebar.identity-store.descr"/>
 
-                    <item id="sidebar-certificate-store-webadmin-trust-store" name="Trust Store"
+                    <item id="sidebar-certificate-store-webadmin-trust-store" name="${sidebar.trust-store}"
                           url="security-truststore.jsp?connectionType=WEBADMIN"
-                          description="Contains certificates that are used to verify the identity of peers."/>
+                          description="${sidebar.trust-store.descr"/>
 
                 </sidebar>
                 <!--&lt;!&ndash; Certificate key stores ("Openfire Certificates") &ndash;&gt;-->

src/web/logviewer.jsp

@@ -443,7 +443,7 @@ IFRAME {
                                 <input id="de02" type="radio" name="debugEnabled" value="false" <%= debugEnabled ? "" : " checked" %>>
                             </td>
                             <td width="1%" nowrap>
-                                <label for="de02">Disabled</label> &nbsp;
+                                <label for="de02"><fmt:message key="logviewer.disabled" /></label> &nbsp;
                             </td>
                             <td width="1%">
                                 <input type="submit" name="" value="<fmt:message key="global.save_changes" />">

src/web/system-email.jsp

@@ -199,9 +199,9 @@
                 <fmt:message key="system.email.mail_debugging" />:
             </td>
             <td nowrap>
-                <input type="radio" name="debug" value="true"<%= (debug ? " checked" : "") %> id="rb01"> <label for="rb01">On</label>
+                <input type="radio" name="debug" value="true"<%= (debug ? " checked" : "") %> id="rb01"> <label for="rb01"><fmt:message key="system.email.mail_debugging.enabled" /></label>
                 &nbsp;
-                <input type="radio" name="debug" value="false"<%= (debug ? "" : " checked") %> id="rb02"> <label for="rb02">Off</label>
+                <input type="radio" name="debug" value="false"<%= (debug ? "" : " checked") %> id="rb02"> <label for="rb02"><fmt:message key="system.email.mail_debugging.disabled" /></label>
                 &nbsp; (<fmt:message key="system.email.restart_possible" />)
             </td>
         </tr>

src/web/system-emailtest.jsp

@@ -261,7 +261,7 @@ function checkClick(el) {
             <input type="hidden" name="from" value="<%= StringUtils.escapeForXML(from) %>">
             <%= StringUtils.escapeHTMLTags(from) %>
             <span class="jive-description">
-            (<a href="user-edit-form.jsp?username=<%= URLEncoder.encode(user.getUsername())%>">Update Address</a>)
+            (<a href="user-edit-form.jsp?username=<%= URLEncoder.encode(user.getUsername())%>"><fmt:message key="system.emailtest.update-address" /></a>)
             </span>
         </td>
     </tr>