Modified to pass a parameter to the resource bundle.

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

src/web/session-details.jsp

@@ -82,9 +82,11 @@
 <jsp:include page="title.jsp" flush="true" />
 
 <p>
-<fmt:message key="session.details.info" /> <b><%= address.toString() %></b>. 
-<fmt:message key="session.details.info1" /> <b><%= address.getNode() %></b> 
-<fmt:message key="session.details.info2" />
+<fmt:message key="session.details.info">
+    <fmt:param value="<%= "<b>"+address.toString()+"</b>" %>" />
+    <fmt:param value="<%= "<b>"+address.getNode()+"</b>" %>" />
+</fmt:message>
+
 </p>
 
 <div class="jive-table">

src/web/setup-datasource-jndi.jsp

@@ -78,8 +78,10 @@
 </p>
 
 <p>
-<fmt:message key="setup.datasource.jndi.setting_info" /><fmt:message key="short.title" /> 
-<fmt:message key="setup.datasource.jndi.setting_info1" /> <tt>java:comp/env/jdbc/[DataSourceName]</tt>. <fmt:message key="setup.datasource.jndi.setting_info2" />
+<fmt:message key="setup.datasource.jndi.setting_info">
+    <fmt:param value="<%= LocaleUtils.getLocalizedString("short.title") %>" />
+    <fmt:param value="<tt>java:comp/env/jdbc/[DataSourceName]</tt>" />
+</fmt:message>
 </p>
 
 <%  if (errors.size() > 0 && errors.get("jndiName") == null) { %>

src/web/setup-datasource-settings.jsp

@@ -78,8 +78,9 @@
 </p>
 
 <p>
-<fmt:message key="setup.datasource.settings.info" /> <fmt:message key="short.title" /> 
-<fmt:message key="setup.datasource.settings.info1" />
+<fmt:message key="setup.datasource.settings.info">
+    <fmt:param value="<%= LocaleUtils.getLocalizedString("short.title") %>" />
+</fmt:message>
 </p>
 
 <%  if (errors.size() > 0) { %>

src/web/setup-env-check.jspf

@@ -5,7 +5,8 @@
 --%>
 
 <%@ page import="java.lang.reflect.Method,
-                 java.io.File" %>
+                 java.io.File,
+                 org.jivesoftware.util.LocaleUtils" %>
 
 <%-- note, the loadClass method is defined in setup-global.jspf --%>
 
@@ -81,8 +82,9 @@
         </p>
 
         <p>
-        <fmt:message key="setup.env.check.error_info" /> <fmt:message key="title" /> 
-        <fmt:message key="setup.env.check.error_info1" />
+        <fmt:message key="setup.env.check.error_info">
+            <fmt:param value="<%= LocaleUtils.getLocalizedString("title") %>" />
+        </fmt:message>
         </p>
 
         <ul>

src/web/setup-finished.jsp

@@ -37,7 +37,9 @@
 </p>
 
 <p>
-<fmt:message key="setup.finished.info" /> <fmt:message key="title" /> <fmt:message key="setup.finished.info1" />
+<fmt:message key="setup.finished.info">
+    <fmt:param value="<%= LocaleUtils.getLocalizedString("title") %>" />
+</fmt:message>
 </p>
 
 <ol>

src/web/setup-index.jsp

@@ -63,8 +63,9 @@
 <p>
 
 
-<fmt:message key="setup.index.info" /><fmt:message key="title" />  
-<fmt:message key="setup.index.info1" />
+<fmt:message key="setup.index.info">
+    <fmt:param value="<%= LocaleUtils.getLocalizedString("title") %>" />
+</fmt:message>
 </p>
 
 <%  if (errors.size() > 0) { %>