incubator-connectors-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1224918 [2/4] - in /incubator/lcf/branches/CONNECTORS-335/framework: core/src/main/resource/org/apache/manifoldcf/core/i18n/ crawler-ui/src/main/resource/ crawler-ui/src/main/webapp/
Date Tue, 27 Dec 2011 14:48:43 GMT
Modified: incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/webapp/editauthority.jsp
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/webapp/editauthority.jsp?rev=1224918&r1=1224917&r2=1224918&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/webapp/editauthority.jsp (original)
+++ incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/webapp/editauthority.jsp Tue Dec 27 14:48:42 2011
@@ -93,7 +93,7 @@
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<link rel="StyleSheet" href="style.css" type="text/css" media="screen"/>
 	<title>
-		<fmt:message key='editauthority.ApacheManifoldCFEditAuthority' />
+		<%=Messages.getString(pageContext.getRequest().getLocale(),"editauthority.ApacheManifoldCFEditAuthority")%>
 	</title>
 
 	<script type="text/javascript">
@@ -270,13 +270,13 @@
 	  if (description.length() > 0)
 	  {
 %>
-			  <nobr><fmt:message key='editauthority.EditAuthority' /> '<%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%>'</nobr>
+			  <nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editauthority.EditAuthority")%> '<%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%>'</nobr>
 <%
 	  }
 	  else
 	  {
 %>
-		          <nobr><fmt:message key="editauthority.EditAnAuthority" /></nobr>
+		          <nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editauthority.EditAnAuthority")%></nobr>
 <%
 	  }
 %>
@@ -294,7 +294,7 @@
 		    <table class="displaytable">
 			<tr><td class="separator" colspan="5"><hr/></td></tr>
 			<tr>
-				<td class="description"><nobr><fmt:message key='editauthority.Name' /></nobr></td><td class="value" colspan="4">
+				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editauthority.Name")%></nobr></td><td class="value" colspan="4">
 <%
 	    // If the connection doesn't exist yet, we are allowed to change the name.
 	    if (connection == null)
@@ -314,7 +314,7 @@
 				</td>
 			</tr>
 			<tr>
-				<td class="description"><nobr><fmt:message key='editauthority.Description' /></nobr></td><td class="value" colspan="4">
+				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editauthority.Description")%></nobr></td><td class="value" colspan="4">
 					<input type="text" size="50" name="description" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(description)%>'/>
 				</td>
 			</tr>
@@ -338,7 +338,7 @@
 		    <table class="displaytable">
 			<tr><td class="separator" colspan="5"><hr/></td></tr>
 			<tr>
-				<td class="description"><nobr><fmt:message key='editauthority.ConnectionType' /></nobr></td><td class="value" colspan="4">
+				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editauthority.ConnectionType")%></nobr></td><td class="value" colspan="4">
 <%
 	    if (className.length() > 0)
 	    {
@@ -401,7 +401,7 @@
 		    <table class="displaytable">
 			<tr><td class="separator" colspan="5"><hr/></td></tr>
 			<tr>
-				<td class="description"><nobr><fmt:message key='editauthority.MaxConnections' /></nobr><br/><nobr><fmt:message key='editauthority.PerJVM' /></nobr></td>
+				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editauthority.MaxConnections")%></nobr><br/><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editauthority.PerJVM")%></nobr></td>
 				<td class="value" colspan="4"><input type="text" size="6" name="maxconnections" value='<%=Integer.toString(maxConnections)%>'/></td>
 			</tr>
 		    </table>
@@ -425,7 +425,7 @@
 	  if (className.length() > 0)
 	  {
 %>
-			    <input type="button" value="<fmt:message key='editauthority.Save' />" onClick="javascript:Save()" alt="<fmt:message key='editauthority.SaveThisAuthorityConnection' />"/>
+			    <input type="button" value="<%=Messages.getString(pageContext.getRequest().getLocale(),"editauthority.Save")%>" onClick="javascript:Save()" alt="<%=Messages.getString(pageContext.getRequest().getLocale(),"editauthority.SaveThisAuthorityConnection")%>"/>
 <%
 	  }
 	  else
@@ -433,12 +433,12 @@
 		if (tabName.equals(Messages.getString("editauthority.Type")))
 		{
 %>
-			    <input type="button" value="<fmt:message key='editauthority.Continue' />" onClick="javascript:Continue()" alt="<fmt:message key='editauthority.ContinueToNextPage' />"/>
+			    <input type="button" value="<%=Messages.getString(pageContext.getRequest().getLocale(),"editauthority.Continue")%>" onClick="javascript:Continue()" alt="<%=Messages.getString(pageContext.getRequest().getLocale(),"editauthority.ContinueToNextPage")%>"/>
 <%
 		}
 	  }
 %>
-			    &nbsp;<input type="button" value="<fmt:message key='editauthority.Cancel' />" onClick="javascript:Cancel()" alt="<fmt:message key='editauthority.CancelAuthorityEditing' />"/></nobr></td>
+			    &nbsp;<input type="button" value="<%=Messages.getString(pageContext.getRequest().getLocale(),"editauthority.Cancel")%>" onClick="javascript:Cancel()" alt="<%=Messages.getString(pageContext.getRequest().getLocale(),"editauthority.CancelAuthorityEditing")%>"/></nobr></td>
 			</tr>
 		    </table>
 		</td>

Modified: incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/webapp/editconnection.jsp
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/webapp/editconnection.jsp?rev=1224918&r1=1224917&r2=1224918&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/webapp/editconnection.jsp (original)
+++ incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/webapp/editconnection.jsp Tue Dec 27 14:48:42 2011
@@ -110,7 +110,7 @@
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<link rel="StyleSheet" href="style.css" type="text/css" media="screen"/>
 	<title>
-		<fmt:message key='editconnection.ApacheManifoldCFEditConnection' />
+		<%=Messages.getString(pageContext.getRequest().getLocale(),"editconnection.ApacheManifoldCFEditConnection")%>
 	</title>
 
 	<script type="text/javascript">
@@ -310,13 +310,13 @@
 	  if (description.length() > 0)
 	  {
 %>
-			  <nobr><fmt:message key='editconnection.EditConnection' /> '<%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%>'</nobr>
+			  <nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editconnection.EditConnection")%> '<%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%>'</nobr>
 <%
 	  }
 	  else
 	  {
 %>
-		          <nobr><fmt:message key='editconnection.EditAConnection' /></nobr>
+		          <nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editconnection.EditAConnection")%></nobr>
 <%
 	  }
 %>
@@ -333,7 +333,7 @@
 		    <table class="displaytable">
 			<tr><td class="separator" colspan="5"><hr/></td></tr>
 			<tr>
-				<td class="description"><nobr><fmt:message key='editconnection.Name' /></nobr></td><td class="value" colspan="4">
+				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editconnection.Name")%></nobr></td><td class="value" colspan="4">
 <%
 	    // If the connection doesn't exist yet, we are allowed to change the name.
 	    if (connection == null)
@@ -353,7 +353,7 @@
 				</td>
 			</tr>
 			<tr>
-				<td class="description"><nobr><fmt:message key='editconnection.Description' /></nobr></td><td class="value" colspan="4">
+				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editconnection.Description")%></nobr></td><td class="value" colspan="4">
 					<input type="text" size="50" name="description" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(description)%>'/>
 				</td>
 			</tr>
@@ -377,7 +377,7 @@
 		    <table class="displaytable">
 			<tr><td class="separator" colspan="5"><hr/></td></tr>
 			<tr>
-				<td class="description"><nobr><fmt:message key='editconnection.ConnectionType' /></nobr></td><td class="value" colspan="4">
+				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editconnection.ConnectionType")%></nobr></td><td class="value" colspan="4">
 <%
 	    if (className.length() > 0)
 	    {
@@ -422,14 +422,14 @@
 				</td>
 			</tr>
 			<tr>
-				<td class="description"><nobr><fmt:message key='editconnection.Authority' /></nobr></td>
+				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editconnection.Authority")%></nobr></td>
 				<td class="value" colspan="4">
 <%
 	    IAuthorityConnection[] set2 = authConnectionManager.getAllConnections();
 	    int i = 0;
 %>
 					<select name="authorityname" size="1">
-						<option value="_none_" <%=(authorityName==null)?"selected=\"selected\"":""%>><fmt:message key='editconnection.GlobalAuthority' /></option>
+						<option value="_none_" <%=(authorityName==null)?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"editconnection.GlobalAuthority")%></option>
 <%
 	    while (i < set2.length)
 	    {
@@ -470,23 +470,23 @@
 		    <table class="displaytable">
 			<tr><td class="separator" colspan="2"><hr/></td></tr>
 			<tr>
-				<td class="description"><nobr><fmt:message key='editconnection.Maxconnections' /></nobr><br/><nobr><fmt:message key='editconnection.PerJVM' /></nobr></td>
+				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editconnection.Maxconnections")%></nobr><br/><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editconnection.PerJVM")%></nobr></td>
 				<td class="value"><input type="text" size="6" name="maxconnections" value='<%=Integer.toString(maxConnections)%>'/></td>
 			</tr>
 			<tr>
 				<td class="separator" colspan="2"><hr/></td>
 			</tr>
 			<tr>
-				<td class="description" colspan="1"><nobr><fmt:message key='editconnection.Throttling' /></nobr></td>
+				<td class="description" colspan="1"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editconnection.Throttling")%></nobr></td>
 				<td class="boxcell" colspan="4">
 					<input type="hidden" name="throttleop" value="Continue"/>
 					<input type="hidden" name="throttlenumber" value=""/>
 					<table class="formtable">
 					    <tr class="formheaderrow">
 						<td class="formcolumnheader"></td>
-						<td class="formcolumnheader"><nobr><fmt:message key='editconnection.BinRegularExpression' /></nobr></td>
-						<td class="formcolumnheader"><nobr><fmt:message key='editconnection.Description2' /></nobr></td>
-						<td class="formcolumnheader"><nobr><fmt:message key='editconnection.MaxAvgFetchesMin' /></nobr></td>
+						<td class="formcolumnheader"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editconnection.BinRegularExpression")%></nobr></td>
+						<td class="formcolumnheader"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editconnection.Description2")%></nobr></td>
+						<td class="formcolumnheader"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editconnection.MaxAvgFetchesMin")%></nobr></td>
 					    </tr>
 <%
 		int k = 0;
@@ -525,13 +525,13 @@
 		if (k == 0)
 		{
 %>
-					    <tr class="formrow"><td colspan="4" class="formcolumnmessage"><nobr><fmt:message key='editconnection.NoThrottlingSpecified' /></nobr></td></tr>
+					    <tr class="formrow"><td colspan="4" class="formcolumnmessage"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editconnection.NoThrottlingSpecified")%></nobr></td></tr>
 <%
 		}
 %>
 					    <tr class="formrow"><td colspan="4" class="formseparator"><hr/></td></tr>
 					    <tr class="formrow">
-						<td class="formcolumncell"><input type="button" value="<fmt:message key='editconnection.Add' />" alt="Add throttle" onclick="javascript:AddThrottle();"/></td>
+						<td class="formcolumncell"><input type="button" value="<%=Messages.getString(pageContext.getRequest().getLocale(),"editconnection.Add")%>" alt="Add throttle" onclick="javascript:AddThrottle();"/></td>
 						<td class="formcolumncell"><input type="text" name="throttle" size="30" value=""/></td>
 						<td class="formcolumncell"><input type="text" name="throttledesc" size="30" value=""/></td>
 						<td class="formcolumncell"><input type="text" name="throttlevalue" size="5" value=""/></td>
@@ -576,7 +576,7 @@
 	  if (className.length() > 0)
 	  {
 %>
-			    <input type="button" value="<fmt:message key='editconnection.Save' />" onClick="javascript:Save()" alt="<fmt:message key='editconnection.SaveThisAuthorityConnection' />"/>
+			    <input type="button" value="<%=Messages.getString(pageContext.getRequest().getLocale(),"editconnection.Save")%>" onClick="javascript:Save()" alt="<%=Messages.getString(pageContext.getRequest().getLocale(),"editconnection.SaveThisAuthorityConnection")%>"/>
 <%
 	  }
 	  else
@@ -584,12 +584,12 @@
 		if (tabName.equals(Messages.getString("editconnection.Type")))
 		{
 %>
-			    <input type="button" value="<fmt:message key='editconnection.Continue' />" onClick="javascript:Continue()" alt="<fmt:message key='editconnection.ContinueToNextPage' />"/>
+			    <input type="button" value="<%=Messages.getString(pageContext.getRequest().getLocale(),"editconnection.Continue")%>" onClick="javascript:Continue()" alt="<%=Messages.getString(pageContext.getRequest().getLocale(),"editconnection.ContinueToNextPage")%>"/>
 <%
 		}
 	  }
 %>
-			    &nbsp;<input type="button" value="<fmt:message key='editconnection.Cancel' />" onClick="javascript:Cancel()" alt="<fmt:message key='editconnection.CancelConnectionEditing' />"/></nobr></td>
+			    &nbsp;<input type="button" value="<%=Messages.getString(pageContext.getRequest().getLocale(),"editconnection.Cancel")%>" onClick="javascript:Cancel()" alt="<%=Messages.getString(pageContext.getRequest().getLocale(),"editconnection.CancelConnectionEditing")%>"/></nobr></td>
 			</tr>
 		    </table>
 		</td>

Modified: incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/webapp/editjob.jsp
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/webapp/editjob.jsp?rev=1224918&r1=1224917&r2=1224918&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/webapp/editjob.jsp (original)
+++ incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/webapp/editjob.jsp Tue Dec 27 14:48:42 2011
@@ -166,7 +166,7 @@
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<link rel="StyleSheet" href="style.css" type="text/css" media="screen"/>
 	<title>
-		<fmt:message key='editjob.ApacheManifoldCFEditJob' />
+		<%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.ApacheManifoldCFEditJob")%>
 	</title>
 
 	<script type="text/javascript">
@@ -424,15 +424,15 @@
 	if (connList.length == 0)
 	{
 %>
-	<p class="windowtitle"><fmt:message key='editjob.EditaJob' /></p>
-	<table class="displaytable"><tr><td class="message"><fmt:message key='editjob.NoRepositoryConnectionsDefinedCreateOneFirst' /></td></tr></table>
+	<p class="windowtitle"><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.EditaJob")%></p>
+	<table class="displaytable"><tr><td class="message"><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.NoRepositoryConnectionsDefinedCreateOneFirst")%></td></tr></table>
 <%
 	}
 	else if (outputList.length == 0)
 	{
 %>
-	<p class="windowtitle"><fmt:message key='editjob.EditaJob' /></p>
-	<table class="displaytable"><tr><td class="message"><fmt:message key='editjob.NoOutputConnectionsDefinedCreateOneFirst' /></td></tr></table>
+	<p class="windowtitle"><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.EditaJob")%></p>
+	<table class="displaytable"><tr><td class="message"><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.NoOutputConnectionsDefinedCreateOneFirst")%></td></tr></table>
 <%
 	}
 	else
@@ -477,13 +477,13 @@
 	if (description.length() > 0)
 	{
 %>
-			  <nobr><fmt:message key='editjob.EditJob' /> '<%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%>'</nobr>
+			  <nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.EditJob")%> '<%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%>'</nobr>
 <%
 	}
 	else
 	{
 %>
-		          <nobr><fmt:message key='editjob.EditaJob' /></nobr>
+		          <nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.EditaJob")%></nobr>
 <%
 	}
 %>
@@ -503,7 +503,7 @@
 				<td class="separator" colspan="4"><hr/></td>
 			</tr>
 			<tr>
-				<td class="description" colspan="1"><nobr><fmt:message key='editjob.Name' /></nobr></td><td class="value" colspan="3">
+				<td class="description" colspan="1"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.Name")%></nobr></td><td class="value" colspan="3">
 					<input type="text" size="50" name="description" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(description)%>'/>
 				</td>
 			</tr>
@@ -538,7 +538,7 @@
 				mapField = mapValue.toString();
 %>
 			<tr>
-				<td class="description" colspan="1"><nobr><fmt:message key='editjob.MaximumHopCountForType' /> '<%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(relationshipType)%>'<fmt:message key='editjob.semicolon' /></nobr></td>
+				<td class="description" colspan="1"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.MaximumHopCountForType")%> '<%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(relationshipType)%>'<%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.semicolon")%></nobr></td>
 				<td class="value" colspan="3" >
 					<input name='<%="hopmax_"+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(relationshipType)%>' type="text" size="5" value='<%=mapField%>'/>
 				</td>
@@ -548,11 +548,11 @@
 %>
 			<tr><td class="separator" colspan="4"><hr/></td></tr>
 			<tr>
-				<td class="description" colspan="1"><nobr><fmt:message key='editjob.HopCountMode' /></nobr></td>
+				<td class="description" colspan="1"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.HopCountMode")%></nobr></td>
 				<td class="value" colspan="3">
-					<nobr><input type="radio" name="hopcountmode" value='<%=Integer.toString(IJobDescription.HOPCOUNT_ACCURATE)%>' <%=((hopcountMode==IJobDescription.HOPCOUNT_ACCURATE)?"checked=\"true\"":"")%>><fmt:message key='editjob.DeleteUnreachableDocuments' /></input></nobr><br/>
-					<nobr><input type="radio" name="hopcountmode" value='<%=Integer.toString(IJobDescription.HOPCOUNT_NODELETE)%>' <%=((hopcountMode==IJobDescription.HOPCOUNT_NODELETE)?"checked=\"true\"":"")%>><fmt:message key='editjob.KeepUnreachableDocumentsForNow' /></input></nobr><br/>
-					<nobr><input type="radio" name="hopcountmode" value='<%=Integer.toString(IJobDescription.HOPCOUNT_NEVERDELETE)%>' <%=((hopcountMode==IJobDescription.HOPCOUNT_NEVERDELETE)?"checked=\"true\"":"")%>><fmt:message key='editjob.KeepUnreachableDocumentsForever' /></input></nobr><br/>
+					<nobr><input type="radio" name="hopcountmode" value='<%=Integer.toString(IJobDescription.HOPCOUNT_ACCURATE)%>' <%=((hopcountMode==IJobDescription.HOPCOUNT_ACCURATE)?"checked=\"true\"":"")%>><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.DeleteUnreachableDocuments")%></input></nobr><br/>
+					<nobr><input type="radio" name="hopcountmode" value='<%=Integer.toString(IJobDescription.HOPCOUNT_NODELETE)%>' <%=((hopcountMode==IJobDescription.HOPCOUNT_NODELETE)?"checked=\"true\"":"")%>><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.KeepUnreachableDocumentsForNow")%></input></nobr><br/>
+					<nobr><input type="radio" name="hopcountmode" value='<%=Integer.toString(IJobDescription.HOPCOUNT_NEVERDELETE)%>' <%=((hopcountMode==IJobDescription.HOPCOUNT_NEVERDELETE)?"checked=\"true\"":"")%>><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.KeepUnreachableDocumentsForever")%></input></nobr><br/>
 				</td>
 			</tr>
 		  </table>
@@ -595,10 +595,10 @@
 	    if (outputName.length() == 0)
 	    {
 %>
-				<td class="description"><nobr><fmt:message key='editjob.OutputConnection' /></nobr></td>
+				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.OutputConnection")%></nobr></td>
 				<td class="value">
 					<select name="outputname" size="1">
-						<option <%="".equals(outputName)?"selected=\"selected\"":""%> value="">-- <fmt:message key='editjob.NoneSelected' /> --</option>
+						<option <%="".equals(outputName)?"selected=\"selected\"":""%> value="">-- <%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.NoneSelected")%> --</option>
 <%
 		int j = 0;
 		while (j < outputList.length)
@@ -616,7 +616,7 @@
 	    else
 	    {
 %>
-				<td class="description"><nobr><fmt:message key='editjob.OutputConnection' /></nobr></td>
+				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.OutputConnection")%></nobr></td>
 				<td class="value"><input type="hidden" name="outputname" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(outputName)%>'/><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(outputName)%></td>
 <%
 	    }
@@ -626,10 +626,10 @@
 	    if (connectionName.length() == 0)
 	    {
 %>
-				<td class="description"><nobr><fmt:message key='editjob.RepositoryConnection' /></nobr></td>
+				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.RepositoryConnection")%></nobr></td>
 				<td class="value">
 					<select name="connectionname" size="1">
-						<option <%="".equals(connectionName)?"selected=\"selected\"":""%> value="">-- <fmt:message key='editjob.NoneSelected' /> --</option>
+						<option <%="".equals(connectionName)?"selected=\"selected\"":""%> value="">-- <%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.NoneSelected")%> --</option>
 <%
 		int j = 0;
 		while (j < connList.length)
@@ -647,17 +647,17 @@
 	    else
 	    {
 %>
-				<td class="description"><nobr><fmt:message key='editjob.RepositoryConnection' /></nobr></td>
+				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.RepositoryConnection")%></nobr></td>
 				<td class="value"><input type="hidden" name="connectionname" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(connectionName)%>'/><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionName)%></td>
 <%
 	    }
 %>
 			</tr>
 			<tr>
-				<td class="description"><nobr><fmt:message key='editjob.Priority' /></nobr></td>
+				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.Priority")%></nobr></td>
 				<td class="value">
 					<select name="priority" size="1">
-						<option value="1" <%=(priority==1)?"selected=\"selected\"":""%>>1 <fmt:message key='editjob.Highest' /></option>
+						<option value="1" <%=(priority==1)?"selected=\"selected\"":""%>>1 <%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.Highest")%></option>
 						<option value="2" <%=(priority==2)?"selected=\"selected\"":""%>>2</option>
 						<option value="3" <%=(priority==3)?"selected=\"selected\"":""%>>3</option>
 						<option value="4" <%=(priority==4)?"selected=\"selected\"":""%>>4</option>
@@ -666,15 +666,15 @@
 						<option value="7" <%=(priority==7)?"selected=\"selected\"":""%>>7</option>
 						<option value="8" <%=(priority==8)?"selected=\"selected\"":""%>>8</option>
 						<option value="9" <%=(priority==9)?"selected=\"selected\"":""%>>9</option>
-						<option value="10" <%=(priority==10)?"selected=\"selected\"":""%>>10 <fmt:message key='editjob.Lowest' /></option>
+						<option value="10" <%=(priority==10)?"selected=\"selected\"":""%>>10 <%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.Lowest")%></option>
 					</select>
 				</td>
-				<td class="description"><nobr><fmt:message key='editjob.StartMethod' /></nobr></td>
+				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.StartMethod")%></nobr></td>
 				<td class="value">
 					<select name="startmethod" size="1">
-						<option value='<%=IJobDescription.START_WINDOWBEGIN%>' <%=(startMethod==IJobDescription.START_WINDOWBEGIN)?"selected=\"selected\"":""%>><fmt:message key='editjob.StartWhenScheduleWindowStarts' /></option>
-						<option value='<%=IJobDescription.START_WINDOWINSIDE%>' <%=(startMethod==IJobDescription.START_WINDOWINSIDE)?"selected=\"selected\"":""%>><fmt:message key='editjob.StartEvenInsideAScheduleWindow' /></option>
-						<option value='<%=IJobDescription.START_DISABLE%>' <%=(startMethod==IJobDescription.START_DISABLE)?"selected=\"selected\"":""%>><fmt:message key='editjob.DontAutomaticallyStartThisJob' /></option>
+						<option value='<%=IJobDescription.START_WINDOWBEGIN%>' <%=(startMethod==IJobDescription.START_WINDOWBEGIN)?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.StartWhenScheduleWindowStarts")%></option>
+						<option value='<%=IJobDescription.START_WINDOWINSIDE%>' <%=(startMethod==IJobDescription.START_WINDOWINSIDE)?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.StartEvenInsideAScheduleWindow")%></option>
+						<option value='<%=IJobDescription.START_DISABLE%>' <%=(startMethod==IJobDescription.START_DISABLE)?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.DontAutomaticallyStartThisJob")%></option>
 					</select>
 				</td>
 			</tr>
@@ -703,21 +703,21 @@
 				<td class="separator" colspan="4"><hr/></td>
 			</tr>
 			<tr>
-				<td class="description"><nobr><fmt:message key='editjob.ScheduleType' /></nobr></td><td class="value"><select name="scheduletype" size="1">
-					<option value='<%=IJobDescription.TYPE_CONTINUOUS%>' <%=(type==IJobDescription.TYPE_CONTINUOUS)?"selected=\"selected\"":""%>><fmt:message key='editjob.RescanDocumentsDynamically' /></option>
-					<option value='<%=IJobDescription.TYPE_SPECIFIED%>' <%=(type==IJobDescription.TYPE_SPECIFIED)?"selected=\"selected\"":""%>><fmt:message key='editjob.ScanEveryDocumentOnce' /></option>
-				</select></td><td class="description"><nobr><fmt:message key='editjob.RecrawlIntervalIfContinuous' /></nobr></td><td class="value">
-					<nobr><input type="text" size="5" name="recrawlinterval" value='<%=((recrawlInterval==null)?"":recrawlInterval.toString())%>'/> <fmt:message key='editjob.minutesBlankInfinity' /></nobr>
+				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.ScheduleType")%></nobr></td><td class="value"><select name="scheduletype" size="1">
+					<option value='<%=IJobDescription.TYPE_CONTINUOUS%>' <%=(type==IJobDescription.TYPE_CONTINUOUS)?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.RescanDocumentsDynamically")%></option>
+					<option value='<%=IJobDescription.TYPE_SPECIFIED%>' <%=(type==IJobDescription.TYPE_SPECIFIED)?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.ScanEveryDocumentOnce")%></option>
+				</select></td><td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.RecrawlIntervalIfContinuous")%></nobr></td><td class="value">
+					<nobr><input type="text" size="5" name="recrawlinterval" value='<%=((recrawlInterval==null)?"":recrawlInterval.toString())%>'/> <%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.minutesBlankInfinity")%></nobr>
 				</td>
 			</tr>
 			<tr>
-				<td class="description"><nobr><fmt:message key='editjob.ExpirationIntervalIfContinuous' /></nobr></td>
+				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.ExpirationIntervalIfContinuous")%></nobr></td>
 				<td class="value">
-					<nobr><input type="text" size="5" name="expirationinterval" value='<%=((expirationInterval==null)?"":expirationInterval.toString())%>'/> <fmt:message key='editjob.minutesBlankInfinity' /></nobr>
+					<nobr><input type="text" size="5" name="expirationinterval" value='<%=((expirationInterval==null)?"":expirationInterval.toString())%>'/> <%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.minutesBlankInfinity")%></nobr>
 				</td>
-				<td class="description"><nobr><fmt:message key='editjob.ReseedIntervalIfContinuous' /></nobr></td>
+				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.ReseedIntervalIfContinuous")%></nobr></td>
 				<td class="value">
-					<nobr><input type="text" size="5" name="reseedinterval" value='<%=((reseedInterval==null)?"":reseedInterval.toString())%>'/> <fmt:message key='editjob.minutesBlankInfinity' /></nobr>
+					<nobr><input type="text" size="5" name="reseedinterval" value='<%=((reseedInterval==null)?"":reseedInterval.toString())%>'/> <%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.minutesBlankInfinity")%></nobr>
 				</td>
 			</tr>
 <%
@@ -739,7 +739,7 @@
 	    if (scheduleRecords.size() == 0)
 	    {
 %>
-			<tr><td class="message" colspan="4"><fmt:message key='editjob.NoScheduleSpecified' /></td></tr>
+			<tr><td class="message" colspan="4"><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.NoScheduleSpecified")%></td></tr>
 <%
 	    }
 	    else
@@ -768,20 +768,20 @@
 		}
 %>
 			<tr>
-				<td class="description"><nobr><fmt:message key='editjob.ScheduledTime' /></nobr></td>
+				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.ScheduledTime")%></nobr></td>
 				<td colspan="3" class="value">
 				    <select class="schedulepulldown" multiple="true" name='<%="dayofweek"+postFix%>' size="3">
-					<option value="none" <%=(srDayOfWeek==null)?"selected=\"selected\"":""%>><fmt:message key='editjob.AnyDayOfWeek' /></option>
-					<option value="0" <%=(srDayOfWeek!=null&&srDayOfWeek.checkValue(0))?"selected=\"selected\"":""%>><fmt:message key='editjob.Sundays' /></option>
-					<option value="1" <%=(srDayOfWeek!=null&&srDayOfWeek.checkValue(1))?"selected=\"selected\"":""%>><fmt:message key='editjob.Mondays' /></option>
-					<option value="2" <%=(srDayOfWeek!=null&&srDayOfWeek.checkValue(2))?"selected=\"selected\"":""%>><fmt:message key='editjob.Tuesdays' /></option>
-					<option value="3" <%=(srDayOfWeek!=null&&srDayOfWeek.checkValue(3))?"selected=\"selected\"":""%>><fmt:message key='editjob.Wednesdays' /></option>
-					<option value="4" <%=(srDayOfWeek!=null&&srDayOfWeek.checkValue(4))?"selected=\"selected\"":""%>><fmt:message key='editjob.Thursdays' /></option>
-					<option value="5" <%=(srDayOfWeek!=null&&srDayOfWeek.checkValue(5))?"selected=\"selected\"":""%>><fmt:message key='editjob.Fridays' /></option>
-					<option value="6" <%=(srDayOfWeek!=null&&srDayOfWeek.checkValue(6))?"selected=\"selected\"":""%>><fmt:message key='editjob.Saturdays' /></option>
-				    </select> <fmt:message key='editjob.at' /> 
+					<option value="none" <%=(srDayOfWeek==null)?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.AnyDayOfWeek")%></option>
+					<option value="0" <%=(srDayOfWeek!=null&&srDayOfWeek.checkValue(0))?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.Sundays")%></option>
+					<option value="1" <%=(srDayOfWeek!=null&&srDayOfWeek.checkValue(1))?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.Mondays")%></option>
+					<option value="2" <%=(srDayOfWeek!=null&&srDayOfWeek.checkValue(2))?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.Tuesdays")%></option>
+					<option value="3" <%=(srDayOfWeek!=null&&srDayOfWeek.checkValue(3))?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.Wednesdays")%></option>
+					<option value="4" <%=(srDayOfWeek!=null&&srDayOfWeek.checkValue(4))?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.Thursdays")%></option>
+					<option value="5" <%=(srDayOfWeek!=null&&srDayOfWeek.checkValue(5))?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.Fridays")%></option>
+					<option value="6" <%=(srDayOfWeek!=null&&srDayOfWeek.checkValue(6))?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.Saturdays")%></option>
+				    </select> <%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.at")%> 
 				    <select class="schedulepulldown" multiple="true" name='<%="hourofday"+postFix%>' size="3">
-					<option value="none" <%=(srHourOfDay==null)?"selected=\"selected\"":""%>><fmt:message key='editjob.MidnightAnyHourOfDay' /></option>
+					<option value="none" <%=(srHourOfDay==null)?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.MidnightAnyHourOfDay")%></option>
 <%
 					k = 0;
 					while (k < 24)
@@ -804,37 +804,37 @@
 						k++;
 					}
 %>
-				    </select> <fmt:message key='editjob.plus' /> 
+				    </select> <%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.plus")%> 
 				    <select class="schedulepulldown" multiple="true" name='<%="minutesofhour"+postFix%>' size="3">
-					<option value="none" <%=(srMinutesOfHour==null)?"selected=\"selected\"":""%>><fmt:message key='editjob.Nothing' /></option>
+					<option value="none" <%=(srMinutesOfHour==null)?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.Nothing")%></option>
 <%
 					k = 0;
 					while (k < 60)
 					{
 %>
-						<option value='<%=k%>' <%=(srMinutesOfHour!=null&&srMinutesOfHour.checkValue(k))?"selected=\"selected\"":""%>><%=Integer.toString(k)%> <fmt:message key='editjob.minutes' /></option>
+						<option value='<%=k%>' <%=(srMinutesOfHour!=null&&srMinutesOfHour.checkValue(k))?"selected=\"selected\"":""%>><%=Integer.toString(k)%> <%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.minutes")%></option>
 <%
 						k++;
 					}
 %>
-				    </select> <fmt:message key='editjob.in' /> 
+				    </select> <%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.in")%> 
 				    <select class="schedulepulldown" multiple="true" name='<%="monthofyear"+postFix%>' size="3">
-					<option value="none" <%=(srMonthOfYear==null)?"selected=\"selected\"":""%>><fmt:message key='editjob.EveryMonthOfYear' /></option>
-					<option value="0" <%=(srMonthOfYear!=null&&srMonthOfYear.checkValue(0))?"selected=\"selected\"":""%>><fmt:message key='editjob.January' /></option>
-					<option value="1" <%=(srMonthOfYear!=null&&srMonthOfYear.checkValue(1))?"selected=\"selected\"":""%>><fmt:message key='editjob.February' /></option>
-					<option value="2" <%=(srMonthOfYear!=null&&srMonthOfYear.checkValue(2))?"selected=\"selected\"":""%>><fmt:message key='editjob.March' /></option>
-					<option value="3" <%=(srMonthOfYear!=null&&srMonthOfYear.checkValue(3))?"selected=\"selected\"":""%>><fmt:message key='editjob.April' /></option>
-					<option value="4" <%=(srMonthOfYear!=null&&srMonthOfYear.checkValue(4))?"selected=\"selected\"":""%>><fmt:message key='editjob.May' /></option>
-					<option value="5" <%=(srMonthOfYear!=null&&srMonthOfYear.checkValue(5))?"selected=\"selected\"":""%>><fmt:message key='editjob.June' /></option>
-					<option value="6" <%=(srMonthOfYear!=null&&srMonthOfYear.checkValue(6))?"selected=\"selected\"":""%>><fmt:message key='editjob.July' /></option>
-					<option value="7" <%=(srMonthOfYear!=null&&srMonthOfYear.checkValue(7))?"selected=\"selected\"":""%>><fmt:message key='editjob.August' /></option>
-					<option value="8" <%=(srMonthOfYear!=null&&srMonthOfYear.checkValue(8))?"selected=\"selected\"":""%>><fmt:message key='editjob.September' /></option>
-					<option value="9" <%=(srMonthOfYear!=null&&srMonthOfYear.checkValue(9))?"selected=\"selected\"":""%>><fmt:message key='editjob.October' /></option>
-					<option value="10" <%=(srMonthOfYear!=null&&srMonthOfYear.checkValue(10))?"selected=\"selected\"":""%>><fmt:message key='editjob.November' /></option>
-					<option value="11" <%=(srMonthOfYear!=null&&srMonthOfYear.checkValue(11))?"selected=\"selected\"":""%>><fmt:message key='editjob.December' /></option>
-				    </select> <fmt:message key='editjob.on' />
+					<option value="none" <%=(srMonthOfYear==null)?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.EveryMonthOfYear")%></option>
+					<option value="0" <%=(srMonthOfYear!=null&&srMonthOfYear.checkValue(0))?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.January")%></option>
+					<option value="1" <%=(srMonthOfYear!=null&&srMonthOfYear.checkValue(1))?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.February")%></option>
+					<option value="2" <%=(srMonthOfYear!=null&&srMonthOfYear.checkValue(2))?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.March")%></option>
+					<option value="3" <%=(srMonthOfYear!=null&&srMonthOfYear.checkValue(3))?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.April")%></option>
+					<option value="4" <%=(srMonthOfYear!=null&&srMonthOfYear.checkValue(4))?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.May")%></option>
+					<option value="5" <%=(srMonthOfYear!=null&&srMonthOfYear.checkValue(5))?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.June")%></option>
+					<option value="6" <%=(srMonthOfYear!=null&&srMonthOfYear.checkValue(6))?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.July")%></option>
+					<option value="7" <%=(srMonthOfYear!=null&&srMonthOfYear.checkValue(7))?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.August")%></option>
+					<option value="8" <%=(srMonthOfYear!=null&&srMonthOfYear.checkValue(8))?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.September")%></option>
+					<option value="9" <%=(srMonthOfYear!=null&&srMonthOfYear.checkValue(9))?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.October")%></option>
+					<option value="10" <%=(srMonthOfYear!=null&&srMonthOfYear.checkValue(10))?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.November")%></option>
+					<option value="11" <%=(srMonthOfYear!=null&&srMonthOfYear.checkValue(11))?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.December")%></option>
+				    </select> <%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.on")%>
 				    <select class="schedulepulldown" multiple="true" name='<%="dayofmonth"+postFix%>' size="3">
-					<option value="none" <%=(srDayOfMonth==null)?"selected=\"selected\"":""%>><fmt:message key='editjob.AnyDayOfMonth' /></option>
+					<option value="none" <%=(srDayOfMonth==null)?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.AnyDayOfMonth")%></option>
 <%
 					k = 0;
 					while (k < 31)
@@ -859,13 +859,13 @@
 				</td>
 			</tr>
 			<tr>
-				<td class="description"><nobr><fmt:message key='editjob.MaximumRunTime' /></nobr></td><td colspan="3" class="value">
-					<input type="text" size="5" name='<%="duration"+postFix%>' value='<%=((srDuration==null)?"":new Long(srDuration.longValue()/60000L).toString())%>'/> <fmt:message key='editjob.minutes' />
+				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.MaximumRunTime")%></nobr></td><td colspan="3" class="value">
+					<input type="text" size="5" name='<%="duration"+postFix%>' value='<%=((srDuration==null)?"":new Long(srDuration.longValue()/60000L).toString())%>'/> <%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.minutes")%>
 				</td>
 			</tr>
 			<tr>
 				<td class="message" colspan="4">
-					<a name='<%="remove_schedule_"+Integer.toString(l)%>'><input type="button" value="<fmt:message key='editjob.RemoveSchedule' />" onClick='<%="Javascript:RemoveSchedule("+Integer.toString(l)+")"%>' alt='<%="Remove schedule record #"+Integer.toString(l)%>'/></a>
+					<a name='<%="remove_schedule_"+Integer.toString(l)%>'><input type="button" value="<%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.RemoveSchedule")%>" onClick='<%="Javascript:RemoveSchedule("+Integer.toString(l)+")"%>' alt='<%="Remove schedule record #"+Integer.toString(l)%>'/></a>
 					<input type="hidden" name='<%="recordop"+postFix%>' value=""/>
 				</td>
 			</tr>
@@ -879,20 +879,20 @@
 				<td class="separator" colspan="4"><hr/></td>
 			</tr>
 			<tr>
-				<td class="description"><nobr><fmt:message key='editjob.ScheduledTime' /></nobr></td>
+				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.ScheduledTime")%></nobr></td>
 				<td colspan="3" class="value">
 				    <select class="schedulepulldown" multiple="true" name="dayofweek" size="3">
-					<option value="none" <%=(dayOfWeek==null)?"selected=\"selected\"":""%>><fmt:message key='editjob.AnyDayOfWeek' /></option>
-					<option value="0" <%=(dayOfWeek!=null&&dayOfWeek.checkValue(0))?"selected=\"selected\"":""%>><fmt:message key='editjob.Sundays' /></option>
-					<option value="1" <%=(dayOfWeek!=null&&dayOfWeek.checkValue(1))?"selected=\"selected\"":""%>><fmt:message key='editjob.Mondays' /></option>
-					<option value="2" <%=(dayOfWeek!=null&&dayOfWeek.checkValue(2))?"selected=\"selected\"":""%>><fmt:message key='editjob.Tuesdays' /></option>
-					<option value="3" <%=(dayOfWeek!=null&&dayOfWeek.checkValue(3))?"selected=\"selected\"":""%>><fmt:message key='editjob.Wednesdays' /></option>
-					<option value="4" <%=(dayOfWeek!=null&&dayOfWeek.checkValue(4))?"selected=\"selected\"":""%>><fmt:message key='editjob.Thursdays' /></option>
-					<option value="5" <%=(dayOfWeek!=null&&dayOfWeek.checkValue(5))?"selected=\"selected\"":""%>><fmt:message key='editjob.Fridays' /></option>
-					<option value="6" <%=(dayOfWeek!=null&&dayOfWeek.checkValue(6))?"selected=\"selected\"":""%>><fmt:message key='editjob.Saturdays' /></option>
-				    </select> <fmt:message key='editjob.at' /> 
+					<option value="none" <%=(dayOfWeek==null)?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.AnyDayOfWeek")%></option>
+					<option value="0" <%=(dayOfWeek!=null&&dayOfWeek.checkValue(0))?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.Sundays")%></option>
+					<option value="1" <%=(dayOfWeek!=null&&dayOfWeek.checkValue(1))?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.Mondays")%></option>
+					<option value="2" <%=(dayOfWeek!=null&&dayOfWeek.checkValue(2))?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.Tuesdays")%></option>
+					<option value="3" <%=(dayOfWeek!=null&&dayOfWeek.checkValue(3))?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.Wednesdays")%></option>
+					<option value="4" <%=(dayOfWeek!=null&&dayOfWeek.checkValue(4))?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.Thursdays")%></option>
+					<option value="5" <%=(dayOfWeek!=null&&dayOfWeek.checkValue(5))?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.Fridays")%></option>
+					<option value="6" <%=(dayOfWeek!=null&&dayOfWeek.checkValue(6))?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.Saturdays")%></option>
+				    </select> <%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.at")%> 
 				    <select class="schedulepulldown" multiple="true" name="hourofday" size="3">
-					<option value="none" <%=(hourOfDay==null)?"selected=\"selected\"":""%>><fmt:message key='editjob.MidnightAnyHourOfDay' /></option>
+					<option value="none" <%=(hourOfDay==null)?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.MidnightAnyHourOfDay")%></option>
 <%
 					int k = 0;
 					while (k < 24)
@@ -915,37 +915,37 @@
 						k++;
 					}
 %>
-				    </select> <fmt:message key='editjob.plus' /> 
+				    </select> <%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.plus")%> 
 				    <select class="schedulepulldown" multiple="true" name="minutesofhour" size="3">
-					<option value="none" <%=(minutesOfHour==null)?"selected=\"selected\"":""%>><fmt:message key='editjob.Nothing' /></option>
+					<option value="none" <%=(minutesOfHour==null)?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.Nothing")%></option>
 <%
 					k = 0;
 					while (k < 60)
 					{
 %>
-						<option value='<%=k%>' <%=(minutesOfHour!=null&&minutesOfHour.checkValue(k))?"selected=\"selected\"":""%>><%=Integer.toString(k)%> <fmt:message key='editjob.minutes' /></option>
+						<option value='<%=k%>' <%=(minutesOfHour!=null&&minutesOfHour.checkValue(k))?"selected=\"selected\"":""%>><%=Integer.toString(k)%> <%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.minutes")%></option>
 <%
 						k++;
 					}
 %>
-				    </select> <fmt:message key='editjob.in' /> 
+				    </select> <%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.in")%> 
 				    <select class="schedulepulldown" multiple="true" name="monthofyear" size="3">
-					<option value="none" <%=(monthOfYear==null)?"selected=\"selected\"":""%>><fmt:message key='editjob.EveryMonthOfYear' /></option>
-					<option value="0" <%=(monthOfYear!=null&&monthOfYear.checkValue(0))?"selected=\"selected\"":""%>><fmt:message key='editjob.January' /></option>
-					<option value="1" <%=(monthOfYear!=null&&monthOfYear.checkValue(1))?"selected=\"selected\"":""%>><fmt:message key='editjob.February' /></option>
-					<option value="2" <%=(monthOfYear!=null&&monthOfYear.checkValue(2))?"selected=\"selected\"":""%>><fmt:message key='editjob.March' /></option>
-					<option value="3" <%=(monthOfYear!=null&&monthOfYear.checkValue(3))?"selected=\"selected\"":""%>><fmt:message key='editjob.April' /></option>
-					<option value="4" <%=(monthOfYear!=null&&monthOfYear.checkValue(4))?"selected=\"selected\"":""%>><fmt:message key='editjob.May' /></option>
-					<option value="5" <%=(monthOfYear!=null&&monthOfYear.checkValue(5))?"selected=\"selected\"":""%>><fmt:message key='editjob.June' /></option>
-					<option value="6" <%=(monthOfYear!=null&&monthOfYear.checkValue(6))?"selected=\"selected\"":""%>><fmt:message key='editjob.July' /></option>
-					<option value="7" <%=(monthOfYear!=null&&monthOfYear.checkValue(7))?"selected=\"selected\"":""%>><fmt:message key='editjob.August' /></option>
-					<option value="8" <%=(monthOfYear!=null&&monthOfYear.checkValue(8))?"selected=\"selected\"":""%>><fmt:message key='editjob.September' /></option>
-					<option value="9" <%=(monthOfYear!=null&&monthOfYear.checkValue(9))?"selected=\"selected\"":""%>><fmt:message key='editjob.October' /></option>
-					<option value="10" <%=(monthOfYear!=null&&monthOfYear.checkValue(10))?"selected=\"selected\"":""%>><fmt:message key='editjob.November' /></option>
-					<option value="11" <%=(monthOfYear!=null&&monthOfYear.checkValue(11))?"selected=\"selected\"":""%>><fmt:message key='editjob.December' /></option>
-				    </select> <fmt:message key='editjob.on' /> 
+					<option value="none" <%=(monthOfYear==null)?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.EveryMonthOfYear")%></option>
+					<option value="0" <%=(monthOfYear!=null&&monthOfYear.checkValue(0))?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.January")%></option>
+					<option value="1" <%=(monthOfYear!=null&&monthOfYear.checkValue(1))?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.February")%></option>
+					<option value="2" <%=(monthOfYear!=null&&monthOfYear.checkValue(2))?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.March")%></option>
+					<option value="3" <%=(monthOfYear!=null&&monthOfYear.checkValue(3))?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.April")%></option>
+					<option value="4" <%=(monthOfYear!=null&&monthOfYear.checkValue(4))?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.May")%></option>
+					<option value="5" <%=(monthOfYear!=null&&monthOfYear.checkValue(5))?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.June")%></option>
+					<option value="6" <%=(monthOfYear!=null&&monthOfYear.checkValue(6))?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.July")%></option>
+					<option value="7" <%=(monthOfYear!=null&&monthOfYear.checkValue(7))?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.August")%></option>
+					<option value="8" <%=(monthOfYear!=null&&monthOfYear.checkValue(8))?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.September")%></option>
+					<option value="9" <%=(monthOfYear!=null&&monthOfYear.checkValue(9))?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.October")%></option>
+					<option value="10" <%=(monthOfYear!=null&&monthOfYear.checkValue(10))?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.November")%></option>
+					<option value="11" <%=(monthOfYear!=null&&monthOfYear.checkValue(11))?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.December")%></option>
+				    </select> <%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.on")%> 
 				    <select class="schedulepulldown" multiple="true" name="dayofmonth" size="3">
-					<option value="none" <%=(dayOfMonth==null)?"selected=\"selected\"":""%>><fmt:message key='editjob.AnyDayOfMonth' /></option>
+					<option value="none" <%=(dayOfMonth==null)?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.AnyDayOfMonth")%></option>
 <%
 					k = 0;
 					while (k < 31)
@@ -970,14 +970,14 @@
 				</td>
 			</tr>
 			<tr>
-				<td class="description"><nobr><fmt:message key='editjob.MaximumRunTime' /></nobr></td><td colspan="3" class="value">
-					<input type="text" size="5" name="duration" value='<%=((duration==null)?"":duration.toString())%>'/> <fmt:message key='editjob.minutes' />
+				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.MaximumRunTime")%></nobr></td><td colspan="3" class="value">
+					<input type="text" size="5" name="duration" value='<%=((duration==null)?"":duration.toString())%>'/> <%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.minutes")%>
 				</td>
 			</tr>
 			<tr>
 				<td class="message" colspan="4">
 					<input type="hidden" name="recordop" value=""/>
-					<a name="add_schedule"><input type="button" value="<fmt:message key='editjob.AddScheduledTime' />" onClick="javascript:AddScheduledTime()" alt="<fmt:message key='editjob.AddNewScheduleRecord' />"/></a>
+					<a name="add_schedule"><input type="button" value="<%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.AddScheduledTime")%>" onClick="javascript:AddScheduledTime()" alt="<%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.AddNewScheduleRecord")%>"/></a>
 				</td>
 			</tr>
 		  </table>
@@ -1149,7 +1149,7 @@
 	if (connectionName.length() > 0 && outputName.length() > 0)
 	{
 %>
-			<input type="button" value="<fmt:message key='editjob.Save' />" onClick="javascript:Save()" alt="<fmt:message key='editjob.SaveThisJob' />"/>
+			<input type="button" value="<%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.Save")%>" onClick="javascript:Save()" alt="<%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.SaveThisJob")%>"/>
 <%
 	}
 	else
@@ -1157,12 +1157,12 @@
 		if (tabName.equals(Messages.getString("editjob.Connection")))
 		{
 %>
-			<input type="button" value="<fmt:message key='editjob.Continue' />" onClick="javascript:Continue()" alt="<fmt:message key='editjob.ContinueToNextScreen' />"/>
+			<input type="button" value="<%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.Continue")%>" onClick="javascript:Continue()" alt="<%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.ContinueToNextScreen")%>"/>
 <%
 		}
 	}
 %>
-			&nbsp;<input type="button" value="<fmt:message key='editjob.cancel' />" onClick="javascript:Cancel()" alt="<fmt:message key='editjob.CancelJobEditing' />"/>
+			&nbsp;<input type="button" value="<%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.cancel")%>" onClick="javascript:Cancel()" alt="<%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.CancelJobEditing")%>"/>
 			</nobr></td>
 			</tr>
 		  </table>

Modified: incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/webapp/editoutput.jsp
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/webapp/editoutput.jsp?rev=1224918&r1=1224917&r2=1224918&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/webapp/editoutput.jsp (original)
+++ incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/webapp/editoutput.jsp Tue Dec 27 14:48:42 2011
@@ -93,7 +93,7 @@
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<link rel="StyleSheet" href="style.css" type="text/css" media="screen"/>
 	<title>
-		<fmt:message key="editoutput.ApacheManifoldCFEditOutputConnection" />
+		<%=Messages.getString(pageContext.getRequest().getLocale(),"editoutput.ApacheManifoldCFEditOutputConnection")%>
 	</title>
 
 	<script type="text/javascript">
@@ -229,7 +229,7 @@
 	if (set.getRowCount() == 0)
 	{
 %>
-	<p class="windowtitle"><fmt:message key='editoutput.EditOutputConnection' /></p>
+	<p class="windowtitle"><%=Messages.getString(pageContext.getRequest().getLocale(),"editoutput.EditOutputConnection")%></p>
 	<table class="displaytable"><tr><td class="message">No output connectors registered</td></tr></table>
 <%
 	}
@@ -268,14 +268,14 @@
 	  if (description.length() > 0)
 	  {
 %>
-			  <nobr><fmt:message key='editoutput.EditOutputConnection' /> '<%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%>'</nobr>
+			  <nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editoutput.EditOutputConnection")%> '<%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%>'</nobr>
 <%
 	  }
 	  else
 	  {
 %>
 
-		          <nobr><fmt:message key="editoutput.EditAnOutputConnection" /></nobr>
+		          <nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editoutput.EditAnOutputConnection")%></nobr>
 <%
 	  }
 %>
@@ -293,7 +293,7 @@
 		    <table class="displaytable">
 			<tr><td class="separator" colspan="5"><hr/></td></tr>
 			<tr>
-				<td class="description"><nobr><fmt:message key='editoutput.Name' /></nobr></td><td class="value" colspan="4">
+				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editoutput.Name")%></nobr></td><td class="value" colspan="4">
 <%
 	    // If the connection doesn't exist yet, we are allowed to change the name.
 	    if (connection == null || connectionName.length() < 1)
@@ -313,7 +313,7 @@
 				</td>
 			</tr>
 			<tr>
-				<td class="description"><nobr><fmt:message key='editoutput.Description' /></nobr></td><td class="value" colspan="4">
+				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editoutput.Description")%></nobr></td><td class="value" colspan="4">
 					<input type="text" size="50" name="description" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(description)%>'/>
 				</td>
 			</tr>
@@ -337,7 +337,7 @@
 		    <table class="displaytable">
 			<tr><td class="separator" colspan="5"><hr/></td></tr>
 			<tr>
-				<td class="description"><nobr><fmt:message key="editoutput.ConnectionType" /></nobr></td><td class="value" colspan="4">
+				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editoutput.ConnectionType")%></nobr></td><td class="value" colspan="4">
 <%
 	    if (className.length() > 0)
 	    {
@@ -400,7 +400,7 @@
 		    <table class="displaytable">
 			<tr><td class="separator" colspan="2"><hr/></td></tr>
 			<tr>
-				<td class="description"><nobr><fmt:message key='editoutput.MaxConnections' /></nobr><br/><nobr><fmt:message key='editoutput.PerJVM' /></nobr></td>
+				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editoutput.MaxConnections")%></nobr><br/><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editoutput.PerJVM")%></nobr></td>
 				<td class="value"><input type="text" size="6" name="maxconnections" value='<%=Integer.toString(maxConnections)%>'/></td>
 			</tr>
 		    </table>
@@ -425,7 +425,7 @@
 	  if (className.length() > 0)
 	  {
 %>
-			    <input type="button" value="<fmt:message key='editoutput.Save' />" onClick="javascript:Save()" alt="<fmt:message key='editoutput.SaveThisOutputConnection' />"/>
+			    <input type="button" value="<%=Messages.getString(pageContext.getRequest().getLocale(),"editoutput.Save")%>" onClick="javascript:Save()" alt="<%=Messages.getString(pageContext.getRequest().getLocale(),"editoutput.SaveThisOutputConnection")%>"/>
 <%
 	  }
 	  else
@@ -433,12 +433,12 @@
 		if (tabName.equals(Messages.getString("editoutput.Type")))
 		{
 %>
-			    <input type="button" value="<fmt:message key='editoutput.Continue' />" onClick="javascript:Continue()" alt="<fmt:message key='editoutput.ContinueToNextPage' />"/>
+			    <input type="button" value="<%=Messages.getString(pageContext.getRequest().getLocale(),"editoutput.Continue")%>" onClick="javascript:Continue()" alt="<%=Messages.getString(pageContext.getRequest().getLocale(),"editoutput.ContinueToNextPage")%>"/>
 <%
 		}
 	  }
 %>
-			    &nbsp;<input type="button" value="<fmt:message key='editoutput.Cancel' />" onClick="javascript:Cancel()" alt="<fmt:message key='editoutput.CancelOutputConnectionEditing' />"/></nobr></td>
+			    &nbsp;<input type="button" value="<%=Messages.getString(pageContext.getRequest().getLocale(),"editoutput.Cancel")%>" onClick="javascript:Cancel()" alt="<%=Messages.getString(pageContext.getRequest().getLocale(),"editoutput.CancelOutputConnectionEditing")%>"/></nobr></td>
 			</tr>
 		    </table>
 		</td>

Modified: incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/webapp/error.jsp
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/webapp/error.jsp?rev=1224918&r1=1224917&r2=1224918&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/webapp/error.jsp (original)
+++ incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/webapp/error.jsp Tue Dec 27 14:48:42 2011
@@ -27,7 +27,7 @@
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<link rel="StyleSheet" href="style.css" type="text/css" media="screen"/>
 	<title>
-		<fmt:message key='error.ApacheManifoldCFError' />
+		<%=Messages.getString(pageContext.getRequest().getLocale(),"error.ApacheManifoldCFError")%>
 	</title>
 
 </head>
@@ -38,7 +38,7 @@
       <tr><td colspan="2" class="banner"><jsp:include page="banner.jsp" flush="true"/></td></tr>
       <tr><td class="navigation"><jsp:include page="navigation.jsp" flush="true"/></td>
        <td class="window">
-	<p class="windowtitle"><fmt:message key='error.Error' /></p>
+	<p class="windowtitle"><%=Messages.getString(pageContext.getRequest().getLocale(),"error.Error")%></p>
 
 <%
 	// These have to be fetched from request rather than variableContext since error
@@ -49,7 +49,7 @@
 	<table class="displaytable">
 		<tr><td class="message"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(errorText)%></td></tr>
 		<tr><td class="separator"><hr/></td></tr>
-		<tr><td class="message"><a href='<%=java.net.URLEncoder.encode(target,"UTF-8")%>' alt="<fmt:message key='error.Return' />">OK</a></td></tr>
+		<tr><td class="message"><a href='<%=java.net.URLEncoder.encode(target,"UTF-8")%>' alt="<%=Messages.getString(pageContext.getRequest().getLocale(),"error.Return")%>">OK</a></td></tr>
 	</table>
 
        </td>

Modified: incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/webapp/index.jsp
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/webapp/index.jsp?rev=1224918&r1=1224917&r2=1224918&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/webapp/index.jsp (original)
+++ incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/webapp/index.jsp Tue Dec 27 14:48:42 2011
@@ -39,7 +39,7 @@
       <tr><td colspan="2" class="banner"><jsp:include page="banner.jsp" flush="true"/></td></tr>
       <tr><td class="navigation"><jsp:include page="navigation.jsp" flush="true"/></td>
        <td class="window">
-	<p class="windowtitle"><fmt:message key="index.WelcomeToApacheManifoldFC" /></p>
+	<p class="windowtitle"><%=Messages.getString(pageContext.getRequest().getLocale(),"index.WelcomeToApacheManifoldFC")%></p>
        </td>
       </tr>
     </table>

Modified: incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/webapp/listauthorities.jsp
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/webapp/listauthorities.jsp?rev=1224918&r1=1224917&r2=1224918&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/webapp/listauthorities.jsp (original)
+++ incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/webapp/listauthorities.jsp Tue Dec 27 14:48:42 2011
@@ -30,7 +30,7 @@
 	<link rel="StyleSheet" href="style.css" type="text/css" media="screen"/>
 
 	<title>
-		<fmt:message key='listauthorities.ApacheManifoldCFListAuthorities' />
+		<%=Messages.getString(pageContext.getRequest().getLocale(),"listauthorities.ApacheManifoldCFListAuthorities")%>
 	</title>
 
 	<script type="text/javascript">
@@ -57,7 +57,7 @@
       <tr><td colspan="2" class="banner"><jsp:include page="banner.jsp" flush="true"/></td></tr>
       <tr><td class="navigation"><jsp:include page="navigation.jsp" flush="true"/></td>
        <td class="window">
-	<p class="windowtitle"><fmt:message key='listauthorities.ListOfAuthorityConnections' /></p>
+	<p class="windowtitle"><%=Messages.getString(pageContext.getRequest().getLocale(),"listauthorities.ListOfAuthorityConnections")%></p>
 	<form class="standardform" name="listconnections" action="execute.jsp" method="POST">
 		<input type="hidden" name="op" value="Continue"/>
 		<input type="hidden" name="type" value="authority"/>
@@ -76,8 +76,8 @@
 				<td class="separator" colspan="5"><hr/></td>
 			</tr>
 			<tr class="headerrow">
-				<td class="columnheader"></td><td class="columnheader"><fmt:message key='listauthorities.Name' /></td><td class="columnheader"><fmt:message key='listauthorities.Description' /></td><td class="columnheader"><fmt:message key='listauthorities.AuthorityType' /></td>
-				<td class="columnheader"><fmt:message key='listauthorities.Max' /></td>
+				<td class="columnheader"></td><td class="columnheader"><%=Messages.getString(pageContext.getRequest().getLocale(),"listauthorities.Name")%></td><td class="columnheader"><%=Messages.getString(pageContext.getRequest().getLocale(),"listauthorities.Description")%></td><td class="columnheader"><%=Messages.getString(pageContext.getRequest().getLocale(),"listauthorities.AuthorityType")%></td>
+				<td class="columnheader"><%=Messages.getString(pageContext.getRequest().getLocale(),"listauthorities.Max")%></td>
 			</tr>
 <%
 	int i = 0;
@@ -98,7 +98,7 @@
 %>
 		<tr <%="class=\""+((i%2==0)?"evendatarow":"odddatarow")+"\""%>>
 			<td class="columncell">
-				<a href='<%="viewauthority.jsp?connname="+java.net.URLEncoder.encode(name,"UTF-8")%>' alt='<%="View "+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'><fmt:message key='listauthorities.View' /></a>&nbsp;<a href='<%="editauthority.jsp?connname="+java.net.URLEncoder.encode(name,"UTF-8")%>' alt='<%="Edit "+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'><fmt:message key='listauthorities.Edit' /></a>&nbsp;<a href="javascript:void()" onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(name)+"\")"%>' alt='<%="Delete "+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'><fmt:message key='listauthorities.Delete' /></a>
+				<a href='<%="viewauthority.jsp?connname="+java.net.URLEncoder.encode(name,"UTF-8")%>' alt='<%="View "+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'><%=Messages.getString(pageContext.getRequest().getLocale(),"listauthorities.View")%></a>&nbsp;<a href='<%="editauthority.jsp?connname="+java.net.URLEncoder.encode(name,"UTF-8")%>' alt='<%="Edit "+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'><%=Messages.getString(pageContext.getRequest().getLocale(),"listauthorities.Edit")%></a>&nbsp;<a href="javascript:void()" onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(name)+"\")"%>' alt='<%="Delete "+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'><%=Messages.getString(pageContext.getRequest().getLocale(),"listauthorities.Delete")%></a>
 			</td>
 			<td class="columncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(name)%></td>
 			<td class="columncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%></td>
@@ -111,7 +111,7 @@
 			<tr>
 				<td class="separator" colspan="5"><hr/></td>
 			</tr>
-			<tr><td class="message" colspan="5"><a href="editauthority.jsp" alt="<fmt:message key='listauthorities.AddNewConnection' />"><fmt:message key='listauthorities.AddaNewConnection' /></a></td></tr>
+			<tr><td class="message" colspan="5"><a href="editauthority.jsp" alt="<%=Messages.getString(pageContext.getRequest().getLocale(),"listauthorities.AddNewConnection")%>"><%=Messages.getString(pageContext.getRequest().getLocale(),"listauthorities.AddaNewConnection")%></a></td></tr>
 		</table>
 
 <%

Modified: incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/webapp/listconnections.jsp
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/webapp/listconnections.jsp?rev=1224918&r1=1224917&r2=1224918&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/webapp/listconnections.jsp (original)
+++ incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/webapp/listconnections.jsp Tue Dec 27 14:48:42 2011
@@ -29,7 +29,7 @@
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<link rel="StyleSheet" href="style.css" type="text/css" media="screen"/>
 	<title>
-		<fmt:message key='listconnections.ApacheManifoldCFListConnections' />
+		<%=Messages.getString(pageContext.getRequest().getLocale(),"listconnections.ApacheManifoldCFListConnections")%>
 	</title>
 
 	<script type="text/javascript">
@@ -56,7 +56,7 @@
       <tr><td colspan="2" class="banner"><jsp:include page="banner.jsp" flush="true"/></td></tr>
       <tr><td class="navigation"><jsp:include page="navigation.jsp" flush="true"/></td>
        <td class="window">
-	<p class="windowtitle"><fmt:message key='listconnections.ListOfRepositoryConnections' /></p>
+	<p class="windowtitle"><%=Messages.getString(pageContext.getRequest().getLocale(),"listconnections.ListOfRepositoryConnections")%></p>
 	<form class="standardform" name="listconnections" action="execute.jsp" method="POST">
 		<input type="hidden" name="op" value="Continue"/>
 		<input type="hidden" name="type" value="connection"/>
@@ -75,8 +75,8 @@
 				<td class="separator" colspan="6"><hr/></td>
 			</tr>
 			<tr class="headerrow">
-				<td class="columnheader"></td><td class="columnheader"><fmt:message key='listconnections.Name' /></td><td class="columnheader"><fmt:message key='listconnections.Description' /></td><td class="columnheader"><fmt:message key='listconnections.ConnectionType' /></td><td class="columnheader"><fmt:message key='listconnections.Authority' /></td>
-				<td class="columnheader"><fmt:message key='listconnections.Max' /></td>
+				<td class="columnheader"></td><td class="columnheader"><%=Messages.getString(pageContext.getRequest().getLocale(),"listconnections.Name")%></td><td class="columnheader"><%=Messages.getString(pageContext.getRequest().getLocale(),"listconnections.Description")%></td><td class="columnheader"><%=Messages.getString(pageContext.getRequest().getLocale(),"listconnections.ConnectionType")%></td><td class="columnheader"><%=Messages.getString(pageContext.getRequest().getLocale(),"listconnections.Authority")%></td>
+				<td class="columnheader"><%=Messages.getString(pageContext.getRequest().getLocale(),"listconnections.Max")%></td>
 			</tr>
 <%
 	int i = 0;
@@ -98,12 +98,12 @@
 %>
 		<tr <%="class=\""+((i%2==0)?"evendatarow":"odddatarow")+"\""%>>
 			<td class="columncell">
-				<a href='<%="viewconnection.jsp?connname="+java.net.URLEncoder.encode(name,"UTF-8")%>' alt='<%="View "+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'><fmt:message key='listconnections.View' /></a>&nbsp;<a href='<%="editconnection.jsp?connname="+java.net.URLEncoder.encode(name,"UTF-8")%>' alt='<%="Edit "+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'><fmt:message key='listconnections.Edit' /></a>&nbsp;<a href="javascript:void()" onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(name)+"\")"%>' alt='<%="Delete "+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'><fmt:message key='listconnections.Delete' /></a>
+				<a href='<%="viewconnection.jsp?connname="+java.net.URLEncoder.encode(name,"UTF-8")%>' alt='<%="View "+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'><%=Messages.getString(pageContext.getRequest().getLocale(),"listconnections.View")%></a>&nbsp;<a href='<%="editconnection.jsp?connname="+java.net.URLEncoder.encode(name,"UTF-8")%>' alt='<%="Edit "+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'><%=Messages.getString(pageContext.getRequest().getLocale(),"listconnections.Edit")%></a>&nbsp;<a href="javascript:void()" onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(name)+"\")"%>' alt='<%="Delete "+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'><%=Messages.getString(pageContext.getRequest().getLocale(),"listconnections.Delete")%></a>
 			</td>
 			<td class="columncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(name)%></td>
 			<td class="columncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%></td>
 			<td class="columncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectorName)%></td>
-			<td class="columncell"><%=((authorityName==null)?Messages.getString("listconnections.GlobalAuthority"):org.apache.manifoldcf.ui.util.Encoder.bodyEscape(authorityName))%></td>
+			<td class="columncell"><%=((authorityName==null)?Messages.getString(pageContext.getRequest().getLocale(),"listconnections.GlobalAuthority"):org.apache.manifoldcf.ui.util.Encoder.bodyEscape(authorityName))%></td>
 			<td class="columncell"><%=Integer.toString(maxCount)%></td>
 		</tr>
 <%
@@ -112,7 +112,7 @@
 			<tr>
 				<td class="separator" colspan="6"><hr/></td>
 			</tr>
-			<tr><td class="message" colspan="6"><a href="editconnection.jsp" alt="Add a connection"><fmt:message key='listconnections.AddNewConnection' /></a></td></tr>
+			<tr><td class="message" colspan="6"><a href="editconnection.jsp" alt="Add a connection"><%=Messages.getString(pageContext.getRequest().getLocale(),"listconnections.AddNewConnection")%></a></td></tr>
 		</table>
 
 <%

Modified: incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/webapp/listjobs.jsp
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/webapp/listjobs.jsp?rev=1224918&r1=1224917&r2=1224918&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/webapp/listjobs.jsp (original)
+++ incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/webapp/listjobs.jsp Tue Dec 27 14:48:42 2011
@@ -29,7 +29,7 @@
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<link rel="StyleSheet" href="style.css" type="text/css" media="screen"/>
 	<title>
-		<fmt:message key='listjobs.ApacheManifoldCFListJobDescriptions' />
+		<%=Messages.getString(pageContext.getRequest().getLocale(),"listjobs.ApacheManifoldCFListJobDescriptions")%>
 	</title>
 
 	<script type="text/javascript">
@@ -57,7 +57,7 @@
       <tr><td colspan="2" class="banner"><jsp:include page="banner.jsp" flush="true"/></td></tr>
       <tr><td class="navigation"><jsp:include page="navigation.jsp" flush="true"/></td>
        <td class="window">
-	<p class="windowtitle"><fmt:message key='listjobs.JobList' /></p>
+	<p class="windowtitle"><%=Messages.getString(pageContext.getRequest().getLocale(),"listjobs.JobList")%></p>
 	<form class="standardform" name="listjobs" action="execute.jsp" method="POST">
 		<input type="hidden" name="op" value="Continue"/>
 		<input type="hidden" name="type" value="job"/>
@@ -76,10 +76,10 @@
 			</tr>
 			<tr class="headerrow">
 				<td class="columnheader"></td>
-				<td class="columnheader"><nobr><fmt:message key='listjobs.Name' /></nobr></td>
-				<td class="columnheader"><nobr><fmt:message key='listjobs.OutputConnection' /></nobr></td>
-				<td class="columnheader"><nobr><fmt:message key='listjobs.RepositoryConnection' /></nobr></td>
-				<td class="columnheader"><nobr><fmt:message key='listjobs.ScheduleType' /></nobr></td>
+				<td class="columnheader"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"listjobs.Name")%></nobr></td>
+				<td class="columnheader"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"listjobs.OutputConnection")%></nobr></td>
+				<td class="columnheader"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"listjobs.RepositoryConnection")%></nobr></td>
+				<td class="columnheader"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"listjobs.ScheduleType")%></nobr></td>
 			</tr>
 <%
 	int i = 0;
@@ -102,7 +102,8 @@
 %>
 		<tr <%="class=\""+((i%2==0)?"evendatarow":"odddatarow")+"\""%>>
 		    <td class="columncell">
-			<a href='<%="viewjob.jsp?jobid="+jd.getID()%>' alt='<%="<fmt:message key=\"listjobs.Viewjob\" /> "+jd.getID()%>'><fmt:message key='listjobs.View' /></a>&nbsp;<a href='<%="editjob.jsp?jobid="+jd.getID()%>' alt='<%="<fmt:message key=\"listjobs.Editjob\" /> "+jd.getID()%>'><fmt:message key='listjobs.Edit' /></a>&nbsp;<a href='<%="javascript:Delete(\""+jd.getID()+"\")"%>' alt='<%="<fmt:message key=\"listjobs.DeleteJob\" /> "+jd.getID()%>'><fmt:message key='listjobs.Delete' /></a>&nbsp;<a href='<%="editjob.jsp?origjobid="+jd.getID()%>' alt='<%="<fmt:message key=\"listjobs.CopyJob\" /> "+jd.getID()%>'><fmt:message key='listjobs.Copy' /></a>
+			<a href='<%="viewjob.jsp?jobid="+jd.getID()%>' alt='<%=Messages.getString(pageContext.getRequest().getLocale(),"listjobs.Viewjob")+" "+jd.getID()%>'><%=Messages.getString(pageContext.getRequest().getLocale(),"listjobs.View")%></a>&nbsp;
+			<a href='<%="editjob.jsp?jobid="+jd.getID()%>' alt='<%=Messages.getString(pageContext.getRequest().getLocale(),"listjobs.Editjob")+" "+jd.getID()%>'><%=Messages.getString(pageContext.getRequest().getLocale(),"listjobs.Edit")%></a>&nbsp;<a href='<%="javascript:Delete(\""+jd.getID()+"\")"%>' alt='<%=Messages.getString(pageContext.getRequest().getLocale(),"listjobs.DeleteJob")+" "+jd.getID()%>'><%=Messages.getString(pageContext.getRequest().getLocale(),"listjobs.Delete")%></a>&nbsp;<a href='<%="editjob.jsp?origjobid="+jd.getID()%>' alt='<%=Messages.getString(pageContext.getRequest().getLocale(),"listjobs.CopyJob")+" "+jd.getID()%>'><%=Messages.getString(pageContext.getRequest().getLocale(),"listjobs.Copy")%></a>
 		    </td>
 		    <td class="columncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(jd.getDescription())%></td>
 		    <td class="columncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(jd.getOutputConnectionName())%></td>
@@ -115,7 +116,7 @@
 			<tr>
 				<td class="separator" colspan="5"><hr/></td>
 			</tr>
-		<tr><td class="message" colspan="5"><a href="editjob.jsp" alt="Add a job"><fmt:message key='listjobs.AddaNewJob' /></a></td></tr>
+		<tr><td class="message" colspan="5"><a href="editjob.jsp" alt="Add a job"><%=Messages.getString(pageContext.getRequest().getLocale(),"listjobs.AddaNewJob")%></a></td></tr>
 		</table>
 
 <%

Modified: incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/webapp/listoutputs.jsp
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/webapp/listoutputs.jsp?rev=1224918&r1=1224917&r2=1224918&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/webapp/listoutputs.jsp (original)
+++ incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/webapp/listoutputs.jsp Tue Dec 27 14:48:42 2011
@@ -29,7 +29,7 @@
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<link rel="StyleSheet" href="style.css" type="text/css" media="screen"/>
 	<title>
-		<fmt:message key="listoutputs.ApacheManifoldCFListOutputConnections" />
+		<%=Messages.getString(pageContext.getRequest().getLocale(),"listoutputs.ApacheManifoldCFListOutputConnections")%>
 	</title>
 
 	<script type="text/javascript">
@@ -37,7 +37,7 @@
 
 	function Delete(connectionName)
 	{
-		if (confirm("<fmt:message key='listoutputs.DeleteOutputConnection' /> '"+connectionName+"'?"))
+		if (confirm("<%=Messages.getString(pageContext.getRequest().getLocale(),"listoutputs.DeleteOutputConnection")%> '"+connectionName+"'?"))
 		{
 			document.listconnections.op.value="Delete";
 			document.listconnections.connname.value=connectionName;
@@ -56,7 +56,7 @@
       <tr><td colspan="2" class="banner"><jsp:include page="banner.jsp" flush="true"/></td></tr>
       <tr><td class="navigation"><jsp:include page="navigation.jsp" flush="true"/></td>
        <td class="window">
-	<p class="windowtitle"><fmt:message key="listoutputs.ListOfOutputConnections" /></p>
+	<p class="windowtitle"><%=Messages.getString(pageContext.getRequest().getLocale(),"listoutputs.ListOfOutputConnections")%></p>
 	<form class="standardform" name="listconnections" action="execute.jsp" method="POST">
 		<input type="hidden" name="op" value="Continue"/>
 		<input type="hidden" name="type" value="output"/>
@@ -76,10 +76,10 @@
 			</tr>
 			<tr class="headerrow">
 				<td class="columnheader"></td>
-				<td class="columnheader"><nobr><fmt:message key="listoutputs.Name" /></nobr></td>
-				<td class="columnheader"><nobr><fmt:message key="listoutputs.Description" /></nobr></td>
-				<td class="columnheader"><nobr><fmt:message key="listoutputs.ConnectionType" /></nobr></td>
-				<td class="columnheader"><fmt:message key="listoutputs.Max" /></td>
+				<td class="columnheader"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"listoutputs.Name")%></nobr></td>
+				<td class="columnheader"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"listoutputs.Description")%></nobr></td>
+				<td class="columnheader"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"listoutputs.ConnectionType")%></nobr></td>
+				<td class="columnheader"><%=Messages.getString(pageContext.getRequest().getLocale(),"listoutputs.Max")%></td>
 			</tr>
 <%
 	int i = 0;
@@ -100,7 +100,7 @@
 %>
 		<tr <%="class=\""+((i%2==0)?"evendatarow":"odddatarow")+"\""%>>
 			<td class="columncell">
-				<a href='<%="viewoutput.jsp?connname="+java.net.URLEncoder.encode(name,"UTF-8")%>' alt='<%="View "+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'><fmt:message key='listoutputs.View' /></a>&nbsp;<a href='<%="editoutput.jsp?connname="+java.net.URLEncoder.encode(name,"UTF-8")%>' alt='<%="Edit "+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'><fmt:message key='listoutputs.Edit' /></a>&nbsp;<a href="javascript:void()" onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(name)+"\")"%>' alt='<%="Delete "+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'><fmt:message key='listoutputs.Delete' /></a>
+				<a href='<%="viewoutput.jsp?connname="+java.net.URLEncoder.encode(name,"UTF-8")%>' alt='<%="View "+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'><%=Messages.getString(pageContext.getRequest().getLocale(),"listoutputs.View")%></a>&nbsp;<a href='<%="editoutput.jsp?connname="+java.net.URLEncoder.encode(name,"UTF-8")%>' alt='<%="Edit "+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'><%=Messages.getString(pageContext.getRequest().getLocale(),"listoutputs.Edit")%></a>&nbsp;<a href="javascript:void()" onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(name)+"\")"%>' alt='<%="Delete "+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'><%=Messages.getString(pageContext.getRequest().getLocale(),"listoutputs.Delete")%></a>
 			</td>
 			<td class="columncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(name)%></td>
 			<td class="columncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%></td>
@@ -113,7 +113,7 @@
 			<tr>
 				<td class="separator" colspan="5"><hr/></td>
 			</tr>
-			<tr><td class="message" colspan="5"><a href="editoutput.jsp" alt="<fmt:message key='listoutputs.AddAnOutputConnection' />"><fmt:message key="listoutputs.AddaNewOutputConnection" /></a></td></tr>
+			<tr><td class="message" colspan="5"><a href="editoutput.jsp" alt="<%=Messages.getString(pageContext.getRequest().getLocale(),"listoutputs.AddAnOutputConnection")%>"><%=Messages.getString(pageContext.getRequest().getLocale(),"listoutputs.AddaNewOutputConnection")%></a></td></tr>
 		</table>
 
 <%



Mime
View raw message