Modified to use resource bundles. JM-156

git-svn-id: http://svn.igniterealtime.org/svn/repos/messenger/trunk@941 b35dd754-fafc-0310-a699-88a17e54d16e

src/i18n/messenger_i18n_en.properties

@@ -156,4 +156,46 @@ muc.form.conf.owner_roomowners=Room Owners
 
 # Messenger 
 short.title = Jive Messenger
-title = Jive Messenger
+title = Jive Messenger
\ No newline at end of file
+
+# Admin Console Pages below
+# Group Chat Service Properties Page
+groupchat.service.properties.title=Group Chat Service Properties
+groupchat.service.properties.introduction=Use the form below to edit group chat service settings. Note, any changes will require a server restart.
+groupchat.service.properties.saved_successfully=Service properties edited successfully. You must <b>restart</b> the server in order for the changes to take effect (see <a href="index.jsp">Server Status</a>).
+groupchat.service.properties.error_service_name=Error setting the service name.
+groupchat.service.properties.legend=Service Name
+groupchat.service.properties.label_service_name=Group chat service name:
+groupchat.service.properties.error_service_name=Please enter a valid name.
+groupchat.service.properties.save=Save Properties
+
+# Group Chat History Settings Page
+groupchat.history.settings.title=Group Chat History Settings
+groupchat.history.settings.introduction=Group chat rooms can replay conversation histories to provide context to new members joining a room. There are several options for controlling how much history to store for each room.
+groupchat.history.settings.saved_successfully=Settings updated successfully.
+groupchat.history.settings.legend=History Settings
+groupchat.history.settings.label1_no_history=Don't Show History
+groupchat.history.settings.label2_no_history=- Do not show a chat history to users joining a room.
+groupchat.history.settings.label1_entire_history=Show Entire Chat History
+groupchat.history.settings.label2_entire_history=- Show the entire chat history to users joining a room.
+groupchat.history.settings.label1_number_messages=Show a Specific Number of Messages
+groupchat.history.settings.label2_number_messages=- Show a specific number of the most recent messages in the chat. Use the box below to specify that number.
+groupchat.history.settings.messages=messages
+groupchat.history.settings.save=Save Settings
+
+# Group Chat Administrators Page
+groupchat.admins.title=Group Chat Administrators
+groupchat.admins.introduction=Below is the list of system administrators of the group chat service. System administrators can enter any group chat room and their permissions are the same as the room owner.
+groupchat.admins.user_added=User added to the list successfully.
+groupchat.admins.error_adding=Error adding the user. Please verify the JID is correct.
+groupchat.admins.user_removed=User removed from the list successfully.
+groupchat.admins.legend=Administrators
+groupchat.admins.label_add_admin=Add Administrator (JID):
+groupchat.admins.column_user=User
+groupchat.admins.column_remove=Remove
+groupchat.admins.add=Add
+groupchat.admins.no_admins=No administrators specified, use the form above to add one.
+groupchat.admins.dialog.title=Click to delete...
+groupchat.admins.dialog.text=Are you sure you want to remove this user from the list?
+
+

src/web/muc-history-settings.jsp

@@ -88,7 +88,7 @@
 
 <jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
 <%  // Title of this page and breadcrumbs
-    String title = "Group Chat History Settings";
+    String title = LocaleUtils.getLocalizedString("groupchat.history.settings.title");
     pageinfo.setTitle(title);
     pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp"));
     pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Group Chat History", "muc-history-settings.jsp"));
@@ -98,8 +98,7 @@
 <jsp:include page="title.jsp" flush="true" />
 
 <p>
-Group chat rooms can replay conversation histories to provide context to new members joining a room.
-There are several options for controlling how much history to store for each room.
+<fmt:message key="groupchat.history.settings.introduction" />
 </p>
 
 <%  if ("true".equals(request.getParameter("success"))) { %>
@@ -109,7 +108,7 @@ There are several options for controlling how much history to store for each roo
     <tbody>
         <tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td>
         <td class="jive-icon-label">
-        Settings updated successfully.
+        <fmt:message key="groupchat.history.settings.saved_successfully" />
         </td></tr>
     </tbody>
     </table>
@@ -120,7 +119,7 @@ There are several options for controlling how much history to store for each roo
 <form action="muc-history-settings.jsp" method="post">
 
 <fieldset>
-    <legend>History Settings</legend>
+    <legend><fmt:message key="groupchat.history.settings.legend" /></legend>
     <div>
     <table cellpadding="3" cellspacing="0" border="0" width="100%">
     <tbody>
@@ -130,8 +129,8 @@ There are several options for controlling how much history to store for each roo
             </td>
             <td width="99%">
                 <label for="rb01">
-                <b>Don't Show History</b>
-                </label>- Do not show a chat history to users joining a room.
+                <b><fmt:message key="groupchat.history.settings.label1_no_history" /></b>
+                </label><fmt:message key="groupchat.history.settings.label2_no_history" />
             </td>
         </tr>
         <tr valign="middle">
@@ -140,8 +139,8 @@ There are several options for controlling how much history to store for each roo
             </td>
             <td width="99%">
                 <label for="rb02">
-                <b>Show Entire Chat History</b>
-                </label>- Show the entire chat history to users joining a room.
+                <b><fmt:message key="groupchat.history.settings.label1_entire_history" /></b>
+                </label><fmt:message key="groupchat.history.settings.label2_entire_history" />
             </td>
         </tr>
         <tr valign="top">
@@ -150,14 +149,14 @@ There are several options for controlling how much history to store for each roo
             </td>
             <td width="99%">
                 <label for="rb03">
-                <b>Show a Specific Number of Messages</b>
-                </label>- Show a specific number of the most recent messages in the chat. Use the box below to specify that number.
+                <b><fmt:message key="groupchat.history.settings.label1_number_messages" /></b>
+                </label><fmt:message key="groupchat.history.settings.label2_number_messages" />
             </td>
         </tr>
         <tr valign="middle" class="">
             <td width="1%" nowrap>&nbsp;</td>
             <td width="99%">
-                <input type="text" name="numMessages" size="5" maxlength="10" onclick="this.form.policy[2].checked=true;" value="<%= ((numMessages > 0) ? ""+numMessages : "") %>"/> messages
+                <input type="text" name="numMessages" size="5" maxlength="10" onclick="this.form.policy[2].checked=true;" value="<%= ((numMessages > 0) ? ""+numMessages : "") %>"/> <fmt:message key="groupchat.history.settings.messages" />
             </td>
         </tr>
     </tbody>
@@ -167,7 +166,7 @@ There are several options for controlling how much history to store for each roo
 
 <br><br>
 
-<input type="submit" name="update" value="Save Settings"/>
+<input type="submit" name="update" value="<fmt:message key="groupchat.history.settings.save" />"/>
 
 </form>
 

src/web/muc-server-props-edit-form.jsp

@@ -15,11 +15,13 @@
                  org.jivesoftware.messenger.muc.MultiUserChatServer,
                  org.jivesoftware.admin.*,
                  org.jivesoftware.messenger.JiveGlobals,
-                 java.util.*"
+                 java.util.*,
+                 org.jivesoftware.util.LocaleUtils"
     errorPage="error.jsp"
 %>
 
 <%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
 
 <%
    // Handle a cancel
@@ -73,7 +75,7 @@
 
 <jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
 <%  // Title of this page and breadcrumbs
-    String title = "Group Chat Service Properties";
+    String title = LocaleUtils.getLocalizedString("groupchat.service.properties.title");
     pageinfo.setTitle(title);
     pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp"));
     pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "muc-server-props-edit-form.jsp"));
@@ -83,8 +85,7 @@
 <jsp:include page="title.jsp" flush="true" />
 
 <p>
-Use the form below to edit group chat service settings. Note, any changes will require
-a server restart.
+<fmt:message key="groupchat.service.properties.introduction" />
 </p>
 
 <%  if (success) { %>
@@ -94,8 +95,7 @@ a server restart.
     <tbody>
         <tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td>
         <td class="jive-icon-label">
-            Service properties edited successfully. You must <b>restart</b> the server in order for
-            the changes to take effect (see <a href="index.jsp">Server Status</a>).
+            <fmt:message key="groupchat.service.properties.saved_successfully" />
         </td></tr>
     </tbody>
     </table>
@@ -108,7 +108,7 @@ a server restart.
     <tbody>
         <tr><td class="jive-icon"><img src="images/error-16x16.gif" width="16" height="16" border="0"></td>
         <td class="jive-icon-label">
-        Error setting the service name.
+        <fmt:message key="groupchat.service.properties.error_service_name" />
         </td></tr>
     </tbody>
     </table>
@@ -119,13 +119,13 @@ a server restart.
 <form action="muc-server-props-edit-form.jsp?save" method="post">
 
 <fieldset>
-    <legend>Service Name</legend>
+    <legend><fmt:message key="groupchat.service.properties.legend" /></legend>
     <div>
     <table cellpadding="3" cellspacing="0" border="0">
 
     <tr>
         <td class="c1">
-            Group chat service name:
+           <fmt:message key="groupchat.service.properties.label_service_name" />
         </td>
         <td>
         <input type="text" size="30" maxlength="150" name="mucname"  value="<%= (muc != null ? muc : "") %>">
@@ -133,7 +133,7 @@ a server restart.
         <%  if (errors.get("mucname") != null) { %>
 
             <span class="jive-error-text">
-            <br>Please enter a valid name.
+            <br><fmt:message key="groupchat.service.properties.error_service_name" />
             </span>
 
         <%  } %>
@@ -145,7 +145,7 @@ a server restart.
 
 <br><br>
 
-<input type="submit" value="Save Properties">
+<input type="submit" value="<fmt:message key="groupchat.service.properties.save" />">
 
 </form>
 

src/web/muc-sysadmins.jsp

@@ -18,6 +18,7 @@
 %>
 
 <%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt"%>
 
 <jsp:useBean id="admin" class="org.jivesoftware.util.WebManager" />
 <% admin.init(request, response, session, application, out ); %>
@@ -56,7 +57,7 @@
 
 <jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
 <%  // Title of this page and breadcrumbs
-    String title = "Group Chat Administrators";
+    String title = LocaleUtils.getLocalizedString("groupchat.admins.title");
     pageinfo.setTitle(title);
     pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp"));
     pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Group Chat Admin", "muc-sysadmins.jsp"));
@@ -66,8 +67,7 @@
 <jsp:include page="title.jsp" flush="true" />
 
 <p>
-Below is the list of system administrators of the group chat service. System administrators can
-enter any group chat room and their permissions are the same as the room owner.
+<fmt:message key="groupchat.admins.introduction" />
 </p>
 
 <%  if ("true".equals(request.getParameter("deletesuccess"))) { %>
@@ -77,7 +77,7 @@ enter any group chat room and their permissions are the same as the room owner.
     <tbody>
         <tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td>
         <td class="jive-icon-label">
-        User removed from the list successfully.
+        <fmt:message key="groupchat.admins.user_removed" />
         </td></tr>
     </tbody>
     </table>
@@ -90,7 +90,7 @@ enter any group chat room and their permissions are the same as the room owner.
     <tbody>
         <tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td>
         <td class="jive-icon-label">
-        User added to the list successfully.
+        <fmt:message key="groupchat.admins.user_added" />
         </td></tr>
     </tbody>
     </table>
@@ -103,7 +103,7 @@ enter any group chat room and their permissions are the same as the room owner.
     <tbody>
         <tr><td class="jive-icon"><img src="images/error-16x16.gif" width="16" height="16" border="0"></td>
         <td class="jive-icon-label">
-        Error adding the user. Please verify the JID is correct.
+        <fmt:message key="groupchat.admins.error_adding" />
         </td></tr>
     </tbody>
     </table>
@@ -114,20 +114,20 @@ enter any group chat room and their permissions are the same as the room owner.
 <form action="muc-sysadmins.jsp?add" method="post">
 
 <fieldset>
-    <legend>Administrators</legend>
+    <legend><fmt:message key="groupchat.admins.legend" /></legend>
     <div>
-    <label for="userJIDtf">Add Administrator (JID):</label>
+    <label for="userJIDtf"><fmt:message key="groupchat.admins.label_add_admin" /></label>
     <input type="text" name="userJID" size="30" maxlength="100" value="<%= (userJID != null ? userJID : "") %>"
      id="userJIDtf">
-    <input type="submit"s value="Add">
+    <input type="submit"s value="<fmt:message key="groupchat.admins.add" />">
     <br><br>
 
     <div class="jive-table" style="width:400px;">
     <table cellpadding="0" cellspacing="0" border="0" width="100%">
     <thead>
         <tr>
-            <th width="99%">User</th>
-            <th width="1%">Remove</th>
+            <th width="99%"><fmt:message key="groupchat.admins.column_user" /></th>
+            <th width="1%"><fmt:message key="groupchat.admins.column_remove" /></th>
         </tr>
     </thead>
     <tbody>
@@ -135,7 +135,7 @@ enter any group chat room and their permissions are the same as the room owner.
 
             <tr>
                 <td colspan="2">
-                    No administrators specified, use the form above to add one.
+                    <fmt:message key="groupchat.admins.no_admins" />
                 </td>
             </tr>
 
@@ -149,8 +149,8 @@ enter any group chat room and their permissions are the same as the room owner.
                 </td>
                 <td width="1%" align="center">
                     <a href="muc-sysadmins.jsp?userJID=<%= user %>&delete=true"
-                     title="Click to delete..."
-                     onclick="return confirm('Are you sure you want to remove this user from the list?');"
+                     title="<fmt:message key="groupchat.admins.dialog.title" />"
+                     onclick="return confirm('<fmt:message key="groupchat.admins.dialog.text" />');"
                      ><img src="images/delete-16x16.gif" width="16" height="16" border="0"></a>
                 </td>
             </tr>