manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1224921 - in /incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/webapp: editauthority.jsp editconnection.jsp editjob.jsp editoutput.jsp viewconnection.jsp
Date Tue, 27 Dec 2011 14:55:41 GMT
Author: kwright
Date: Tue Dec 27 14:55:41 2011
New Revision: 1224921

URL: http://svn.apache.org/viewvc?rev=1224921&view=rev
Log:
Make sure all Message.getString() calls include the locale.

Modified:
    incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/webapp/editauthority.jsp
    incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/webapp/editconnection.jsp
    incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/webapp/editjob.jsp
    incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/webapp/editoutput.jsp
    incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/webapp/viewconnection.jsp

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=1224921&r1=1224920&r2=1224921&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:55:41 2011
@@ -36,7 +36,7 @@
 	// Figure out what the current tab name is.
 	String tabName = variableContext.getParameter("tabname");
 	if (tabName == null || tabName.length() == 0)
-		tabName = Messages.getString("editauthority.Name");
+		tabName = Messages.getString(pageContext.getRequest().getLocale(),"editauthority.Name");
 
 	String connectionName = null;
 	IAuthorityConnection connection = (IAuthorityConnection)threadContext.get("ConnectionObject");
@@ -79,10 +79,10 @@
 	ArrayList tabsArray = new ArrayList();
 
 	// Set up the predefined tabs
-	tabsArray.add(Messages.getString("editauthority.Name"));
-	tabsArray.add(Messages.getString("editauthority.Type"));
+	tabsArray.add(Messages.getString(pageContext.getRequest().getLocale(),"editauthority.Name"));
+	tabsArray.add(Messages.getString(pageContext.getRequest().getLocale(),"editauthority.Type"));
 	if (className.length() > 0)
-		tabsArray.add(Messages.getString("editauthority.Throttling"));
+		tabsArray.add(Messages.getString(pageContext.getRequest().getLocale(),"editauthority.Throttling"));
 
 %>
 
@@ -141,7 +141,7 @@
 			if (editconnection.connname.value == "")
 			{
 				alert("Connection must have a name");
-				SelectTab(Messages.getString("editauthority.Name"));
+				SelectTab(Messages.getString(pageContext.getRequest().getLocale(),"editauthority.Name"));
 				document.editconnection.connname.focus();
 				return;
 			}
@@ -288,7 +288,7 @@
 <%
 
 	  // Name tab
-	  if (tabName.equals(Messages.getString("editauthority.Name")))
+	  if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"editauthority.Name")))
 	  {
 %>
 		    <table class="displaytable">
@@ -332,7 +332,7 @@
 
 
 	  // "Type" tab
-	  if (tabName.equals(Messages.getString("editauthority.Type")))
+	  if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"editauthority.Type")))
 	  {
 %>
 		    <table class="displaytable">
@@ -395,7 +395,7 @@
 
 
 	  // The "Throttling" tab
-	  if (tabName.equals(Messages.getString("editauthority.Throttling")))
+	  if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"editauthority.Throttling")))
 	  {
 %>
 		    <table class="displaytable">
@@ -430,7 +430,7 @@
 	  }
 	  else
 	  {
-		if (tabName.equals(Messages.getString("editauthority.Type")))
+		if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"editauthority.Type")))
 		{
 %>
 			    <input type="button" value="<%=Messages.getString(pageContext.getRequest().getLocale(),"editauthority.Continue")%>"
onClick="javascript:Continue()" alt="<%=Messages.getString(pageContext.getRequest().getLocale(),"editauthority.ContinueToNextPage")%>"/>

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=1224921&r1=1224920&r2=1224921&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:55:41 2011
@@ -37,7 +37,7 @@
 	// Figure out what the current tab name is.
 	String tabName = variableContext.getParameter("tabname");
 	if (tabName == null || tabName.length() == 0)
-		tabName = Messages.getString("editconnection.Name");
+		tabName = Messages.getString(pageContext.getRequest().getLocale(),"editconnection.Name");
 
 	String connectionName = null;
 	IRepositoryConnection connection = (IRepositoryConnection)threadContext.get("ConnectionObject");
@@ -96,10 +96,10 @@
 	ArrayList tabsArray = new ArrayList();
 
 	// Set up the predefined tabs
-	tabsArray.add(Messages.getString("editconnection.Name"));
-	tabsArray.add(Messages.getString("editconnection.Type"));
+	tabsArray.add(Messages.getString(pageContext.getRequest().getLocale(),"editconnection.Name"));
+	tabsArray.add(Messages.getString(pageContext.getRequest().getLocale(),"editconnection.Type"));
 	if (className.length() > 0)
-		tabsArray.add(Messages.getString("editconnection.Throttling"));
+		tabsArray.add(Messages.getString(pageContext.getRequest().getLocale(),"editconnection.Throttling"));
 
 %>
 
@@ -159,7 +159,7 @@
 			if (editconnection.connname.value == "")
 			{
 				alert("Connection must have a name");
-				SelectTab(Messages.getString("editconnection.Name"));
+				SelectTab(Messages.getString(pageContext.getRequest().getLocale(),"editconnection.Name"));
 				document.editconnection.connname.focus();
 				return;
 			}
@@ -327,7 +327,7 @@
 <%
 
 	  // Name tab
-	  if (tabName.equals(Messages.getString("editconnection.Name")))
+	  if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"editconnection.Name")))
 	  {
 %>
 		    <table class="displaytable">
@@ -371,7 +371,7 @@
 
 
 	  // "Type" tab
-	  if (tabName.equals(Messages.getString("editconnection.Type")))
+	  if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"editconnection.Type")))
 	  {
 %>
 		    <table class="displaytable">
@@ -464,7 +464,7 @@
 %>
 		    <input type="hidden" name="throttlecount" value='<%=Integer.toString(throttles.size())%>'/>
 <%
-	  if (tabName.equals(Messages.getString("editconnection.Throttling")))
+	  if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"editconnection.Throttling")))
 	  {
 %>
 		    <table class="displaytable">
@@ -581,7 +581,7 @@
 	  }
 	  else
 	  {
-		if (tabName.equals(Messages.getString("editconnection.Type")))
+		if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"editconnection.Type")))
 		{
 %>
 			    <input type="button" value="<%=Messages.getString(pageContext.getRequest().getLocale(),"editconnection.Continue")%>"
onClick="javascript:Continue()" alt="<%=Messages.getString(pageContext.getRequest().getLocale(),"editconnection.ContinueToNextPage")%>"/>

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=1224921&r1=1224920&r2=1224921&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:55:41 2011
@@ -39,7 +39,7 @@
 	// Figure out tab name
 	String tabName = variableContext.getParameter("tabname");
 	if (tabName == null || tabName.length() == 0)
-		tabName = Messages.getString("editjob.Name");
+		tabName = Messages.getString(pageContext.getRequest().getLocale(),"editjob.Name");
 
 	// Get a loaded job object, somehow.
 	String jobID = null;
@@ -147,13 +147,13 @@
 	}
 
 	// Set up the predefined tabs
-	tabsArray.add(Messages.getString("editjob.Name"));
-	tabsArray.add(Messages.getString("editjob.Connection"));
+	tabsArray.add(Messages.getString(pageContext.getRequest().getLocale(),"editjob.Name"));
+	tabsArray.add(Messages.getString(pageContext.getRequest().getLocale(),"editjob.Connection"));
 	if (connectionName.length() > 0)
 	{
-		tabsArray.add(Messages.getString("editjob.Scheduling"));
+		tabsArray.add(Messages.getString(pageContext.getRequest().getLocale(),"editjob.Scheduling"));
 		if (relationshipTypes != null && relationshipTypes.length > 0)
-			tabsArray.add(Messages.getString("editjob.HopFilters"));
+			tabsArray.add(Messages.getString(pageContext.getRequest().getLocale(),"editjob.HopFilters"));
 	}
 
 
@@ -224,7 +224,7 @@
 			if (editjob.description.value == "")
 			{
 				alert("Job must have a name");
-				SelectTab(Messages.getString("editjob.Name"));
+				SelectTab(Messages.getString(pageContext.getRequest().getLocale(),"editjob.Name"));
 				document.editjob.description.focus();
 				return;
 			}
@@ -495,7 +495,7 @@
 		  <input type="hidden" name="schedulerecords" value='<%=Integer.toString(scheduleRecords.size())%>'/>
 <%
 	// The NAME tab
-	if (tabName.equals(Messages.getString("editjob.Name")))
+	if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"editjob.Name")))
 	{
 %>
 		  <table class="displaytable">
@@ -518,7 +518,7 @@
 	}
 
 	// Hop Filters tab
-	if (tabName.equals(Messages.getString("editjob.HopFilters")))
+	if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"editjob.HopFilters")))
 	{
 	    if (relationshipTypes != null)
 	    {
@@ -583,7 +583,7 @@
 	}
 
 	// Connection tab
-	if (tabName.equals(Messages.getString("editjob.Connection")))
+	if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"editjob.Connection")))
 	{
 %>
 		  <table class="displaytable">
@@ -691,7 +691,7 @@
 	}
 
 	// Scheduling tab
-	if (tabName.equals(Messages.getString("editjob.Scheduling")))
+	if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"editjob.Scheduling")))
 	{
 %>
 		  <table class="displaytable">
@@ -1154,7 +1154,7 @@
 	}
 	else
 	{
-		if (tabName.equals(Messages.getString("editjob.Connection")))
+		if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"editjob.Connection")))
 		{
 %>
 			<input type="button" value="<%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.Continue")%>"
onClick="javascript:Continue()" alt="<%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.ContinueToNextScreen")%>"/>

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=1224921&r1=1224920&r2=1224921&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:55:41 2011
@@ -36,7 +36,7 @@
 	// Figure out what the current tab name is.
 	String tabName = variableContext.getParameter("tabname");
 	if (tabName == null || tabName.length() == 0)
-		tabName = Messages.getString("editoutput.Name");
+		tabName = Messages.getString(pageContext.getRequest().getLocale(),"editoutput.Name");
 	String connectionName = null;
 	IOutputConnection connection = (IOutputConnection)threadContext.get("ConnectionObject");
 	if (connection == null)
@@ -79,10 +79,10 @@
 	ArrayList tabsArray = new ArrayList();
 
 	// Set up the predefined tabs
-	tabsArray.add(Messages.getString("editoutput.Name"));
-	tabsArray.add(Messages.getString("editoutput.Type"));
+	tabsArray.add(Messages.getString(pageContext.getRequest().getLocale(),"editoutput.Name"));
+	tabsArray.add(Messages.getString(pageContext.getRequest().getLocale(),"editoutput.Type"));
 	if (className.length() > 0)
-		tabsArray.add(Messages.getString("editoutput.Throttling"));
+		tabsArray.add(Messages.getString(pageContext.getRequest().getLocale(),"editoutput.Throttling"));
 
 %>
 
@@ -142,7 +142,7 @@
 			if (editconnection.connname.value == "")
 			{
 				alert("Connection must have a name");
-				SelectTab(Messages.getString("editoutput.Name"));
+				SelectTab(Messages.getString(pageContext.getRequest().getLocale(),"editoutput.Name"));
 				document.editconnection.connname.focus();
 				return;
 			}
@@ -287,7 +287,7 @@
 
 
 	  // Name tab
-	  if (tabName.equals(Messages.getString("editoutput.Name")))
+	  if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"editoutput.Name")))
 	  {
 %>
 		    <table class="displaytable">
@@ -331,7 +331,7 @@
 
 
 	  // "Type" tab
-	  if (tabName.equals(Messages.getString("editoutput.Type")))
+	  if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"editoutput.Type")))
 	  {
 %>
 		    <table class="displaytable">
@@ -394,7 +394,7 @@
 
 
 	  // The "Throttling" tab
-	  if (tabName.equals(Messages.getString("editoutput.Throttling")))
+	  if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"editoutput.Throttling")))
 	  {
 %>
 		    <table class="displaytable">
@@ -430,7 +430,7 @@
 	  }
 	  else
 	  {
-		if (tabName.equals(Messages.getString("editoutput.Type")))
+		if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"editoutput.Type")))
 		{
 %>
 			    <input type="button" value="<%=Messages.getString(pageContext.getRequest().getLocale(),"editoutput.Continue")%>"
onClick="javascript:Continue()" alt="<%=Messages.getString(pageContext.getRequest().getLocale(),"editoutput.ContinueToNextPage")%>"/>

Modified: incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/webapp/viewconnection.jsp
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/webapp/viewconnection.jsp?rev=1224921&r1=1224920&r2=1224921&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/webapp/viewconnection.jsp
(original)
+++ incubator/lcf/branches/CONNECTORS-335/framework/crawler-ui/src/main/webapp/viewconnection.jsp
Tue Dec 27 14:55:41 2011
@@ -85,7 +85,7 @@
 			connectorName = className + "(uninstalled)";
 		String authorityName = connection.getACLAuthority();
 		if (authorityName == null)
-			authorityName = Messages.getString("viewconnection.NoneGlobalAuthority");
+			authorityName = Messages.getString(pageContext.getRequest().getLocale(),"viewconnection.NoneGlobalAuthority");
 		int maxCount = connection.getMaxConnections();
 		String[] throttles = connection.getThrottles();
 		ConfigParams parameters = connection.getConfigParams();



Mime
View raw message