You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2013/01/29 12:44:37 UTC
svn commit: r1439841 - in /manifoldcf/trunk/framework:
crawler-ui/src/main/webapp/
ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/
Author: kwright
Date: Tue Jan 29 11:44:37 2013
New Revision: 1439841
URL: http://svn.apache.org/viewvc?rev=1439841&view=rev
Log:
Bring viewconnection.jsp up to date. Part of CONNECTORS-625.
Modified:
manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewconnection.jsp
manifoldcf/trunk/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties
manifoldcf/trunk/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_ja_JP.properties
Modified: manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewconnection.jsp
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewconnection.jsp?rev=1439841&r1=1439840&r2=1439841&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewconnection.jsp (original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewconnection.jsp Tue Jan 29 11:44:37 2013
@@ -82,7 +82,7 @@
String className = connection.getClassName();
String connectorName = connectorManager.getDescription(className);
if (connectorName == null)
- connectorName = className + "(uninstalled)";
+ connectorName = className + Messages.getString(pageContext.getRequest().getLocale(),"viewconnection.uninstalled");
String authorityName = connection.getACLAuthority();
if (authorityName == null)
authorityName = Messages.getString(pageContext.getRequest().getLocale(),"viewconnection.NoneGlobalAuthority");
@@ -100,7 +100,7 @@
{
IRepositoryConnector c = RepositoryConnectorFactory.grab(threadContext,className,parameters,maxCount);
if (c == null)
- connectionStatus = "Connector is not installed.";
+ connectionStatus = Messages.getString(pageContext.getRequest().getLocale(),"viewconnection.Connectorisnotinstalled");
else
{
try
@@ -115,7 +115,7 @@
}
catch (ManifoldCFException e)
{
- connectionStatus = "Threw exception: '"+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(e.getMessage())+"'";
+ connectionStatus = Messages.getString(pageContext.getRequest().getLocale(),"viewconnection.Threwexception")+" '"+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(e.getMessage())+"'";
}
%>
<table class="displaytable">
@@ -144,9 +144,9 @@
<td class="boxcell" colspan="3">
<table class="formtable">
<tr class="formheaderrow">
- <td class="formcolumnheader"><nobr>Bin regular expression</nobr></td>
- <td class="formcolumnheader"><nobr>Description</nobr></td>
- <td class="formcolumnheader"><nobr>Max avg fetches/min</nobr></td>
+ <td class="formcolumnheader"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewconnection.Binregularexpression")%></nobr></td>
+ <td class="formcolumnheader"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewconnection.Description")%></nobr></td>
+ <td class="formcolumnheader"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewconnection.Maxavgfetches")%></nobr></td>
</tr>
<%
int j = 0;
@@ -204,7 +204,7 @@
<tr>
<td class="separator" colspan="4"><hr/></td>
</tr>
- <tr><td class="message" colspan="4"><a href='<%="viewconnection.jsp?connname="+java.net.URLEncoder.encode(connectionName,"UTF-8")%>' alt="Refresh"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewconnection.Refresh")%></a> <a href='<%="editconnection.jsp?connname="+java.net.URLEncoder.encode(connectionName,"UTF-8")%>' alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewconnection.EditThisConnection")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewconnection.Edit")%></a> <a href="javascript:void()" onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(connectionName)+"\")"%>' alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewconnection.Deletethisconnection")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewconnection.Delete")%></a>
+ <tr><td class="message" colspan="4"><a href='<%="viewconnection.jsp?connname="+java.net.URLEncoder.encode(connectionName,"UTF-8")%>' alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewconnection.Refresh")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewconnection.Refresh")%></a> <a href='<%="editconnection.jsp?connname="+java.net.URLEncoder.encode(connectionName,"UTF-8")%>' alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewconnection.EditThisConnection")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewconnection.Edit")%></a> <a href="javascript:void()" onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(connectionName)+"\")"%>' alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewconnection.Deletethisconnection")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewconnection
.Delete")%></a>
</td></tr>
</table>
Modified: manifoldcf/trunk/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties?rev=1439841&r1=1439840&r2=1439841&view=diff
==============================================================================
--- manifoldcf/trunk/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties (original)
+++ manifoldcf/trunk/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties Tue Jan 29 11:44:37 2013
@@ -223,6 +223,12 @@ viewconnection.Edit=Edit
viewconnection.Delete=Delete
viewconnection.DeleteConnection=Delete connection
viewconnection.Deletethisconnection=Delete this connection
+viewconnection.uninstalled=(uninstalled)
+viewconnection.Connectorisnotinstalled=Connector is not installed.
+viewconnection.Threwexception=Threw exception:
+viewconnection.Binregularexpression=Bin regular expression
+viewconnection.Description=Description
+viewconnection.Maxavgfetches=Max avg fetches/min
listjobs.ApacheManifoldCFListJobDescriptions=Apache ManifoldCF: List job descriptions
listjobs.JobList=Job List
Modified: manifoldcf/trunk/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_ja_JP.properties
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_ja_JP.properties?rev=1439841&r1=1439840&r2=1439841&view=diff
==============================================================================
--- manifoldcf/trunk/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_ja_JP.properties (original)
+++ manifoldcf/trunk/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_ja_JP.properties Tue Jan 29 11:44:37 2013
@@ -223,6 +223,12 @@ viewconnection.Edit=ç·¨é
viewconnection.Delete=åé¤
viewconnection.DeleteConnection=ã³ãã¯ã·ã§ã³ãåé¤
viewconnection.Deletethisconnection=Delete this connection
+viewconnection.uninstalled=(uninstalled)
+viewconnection.Connectorisnotinstalled=Connector is not installed.
+viewconnection.Threwexception=Threw exception:
+viewconnection.Binregularexpression=Bin regular expression
+viewconnection.Description=Description
+viewconnection.Maxavgfetches=Max avg fetches/min
listjobs.ApacheManifoldCFListJobDescriptions=Apache ManifoldCFï¼ã¸ã§ãä¸è¦§
listjobs.JobList=ã¸ã§ãä¸è¦§