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 2012/01/09 17:08:33 UTC
svn commit: r1229234 - in
/incubator/lcf/trunk/connectors/wiki/connector/src/main:
java/org/apache/manifoldcf/crawler/connectors/wiki/
native2ascii/org/apache/manifoldcf/crawler/connectors/wiki/
Author: kwright
Date: Mon Jan 9 16:08:32 2012
New Revision: 1229234
URL: http://svn.apache.org/viewvc?rev=1229234&view=rev
Log:
Patch for CONNECTORS-368. Further patches will be required.
Modified:
incubator/lcf/trunk/connectors/wiki/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/wiki/WikiConnector.java
incubator/lcf/trunk/connectors/wiki/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/wiki/common_en_US.properties
incubator/lcf/trunk/connectors/wiki/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/wiki/common_ja_JP.properties
Modified: incubator/lcf/trunk/connectors/wiki/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/wiki/WikiConnector.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/wiki/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/wiki/WikiConnector.java?rev=1229234&r1=1229233&r2=1229234&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/wiki/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/wiki/WikiConnector.java (original)
+++ incubator/lcf/trunk/connectors/wiki/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/wiki/WikiConnector.java Mon Jan 9 16:08:32 2012
@@ -330,13 +330,13 @@ public class WikiConnector extends org.a
"{\n"+
" if (editconnection.serverport.value != \"\" && !isInteger(editconnection.serverport.value))\n"+
" {\n"+
-" alert(\"Wiki server port must be a valid integer\");\n"+
+" alert("+Messages.getString(locale,"WikiConnector.WikiServerPortMustBeAValidInteger")+");\n"+
" editconnection.serverport.focus();\n"+
" return false;\n"+
" }\n"+
" if (editconnection.serverpath.value != \"\" && editconnection.serverpath.value.indexOf(\"/\") != 0)\n"+
" {\n"+
-" alert(\"Path must start with a '/' character\");\n"+
+" alert("+Messages.getString(locale,"WikiConnector.PathMustStartWithACharacter")+");\n"+
" editconnection.serverpath.focus();\n"+
" return false;\n"+
" }\n"+
@@ -347,22 +347,22 @@ public class WikiConnector extends org.a
"{\n"+
" if (editconnection.servername.value == \"\")\n"+
" {\n"+
-" alert(\"Please supply a valid Wiki server name\");\n"+
-" SelectTab(\"Server\");\n"+
+" alert("+Messages.getString(locale,"WikiConnector.PleaseSupplyAValidWikiServerName")+");\n"+
+" SelectTab(\""+Messages.getString(locale,"WikiConnector.Server")+"\");\n"+
" editconnection.servername.focus();\n"+
" return false;\n"+
" }\n"+
" if (editconnection.serverport.value != \"\" && !isInteger(editconnection.serverport.value))\n"+
" {\n"+
-" alert(\"WIki server port must be a valid integer\");\n"+
-" SelectTab(\"Server\");\n"+
+" alert("+Messages.getString(locale,"WikiConnector.WikiServerPortMustBeAValidInteger")+");\n"+
+" SelectTab(\""+Messages.getString(locale,"WikiConnector.Server")+"\");\n"+
" editconnection.serverport.focus();\n"+
" return false;\n"+
" }\n"+
" if (editconnection.serverpath.value != \"\" && editconnection.serverpath.value.indexOf(\"/\") != 0)\n"+
" {\n"+
-" alert(\"Path must start with a '/' character\");\n"+
-" SelectTab(\"Server\");\n"+
+" alert("+Messages.getString(locale,"WikiConnector.PathMustStartWithACharacter")+");\n"+
+" SelectTab(\""+Messages.getString(locale,"WikiConnector.Server")+"\");\n"+
" editconnection.serverpath.focus();\n"+
" return false;\n"+
" }\n"+
@@ -498,7 +498,7 @@ public class WikiConnector extends org.a
out.print(
"<table class=\"displaytable\">\n"+
" <tr>\n"+
-" <td class=\"description\" colspan=\"1\"><nobr>Parameters:</nobr></td>\n"+
+" <td class=\"description\" colspan=\"1\"><nobr>"+Messages.getString(locale,"WikiConnector.Parameters")+"</nobr></td>\n"+
" <td class=\"value\" colspan=\"3\">\n"
);
Iterator iter = parameters.listParameters();
@@ -516,7 +516,7 @@ public class WikiConnector extends org.a
{
IKeystoreManager kmanager = KeystoreManagerFactory.make("",value);
out.print(
-" <nobr>"+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(param)+"=<"+Integer.toString(kmanager.getContents().length)+" certificate(s)></nobr><br/>\n"
+" <nobr>"+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(param)+"=<"+Integer.toString(kmanager.getContents().length)+Messages.getString(locale,"WikiConnector.certificates")+"></nobr><br/>\n"
);
}
else
@@ -629,7 +629,7 @@ public class WikiConnector extends org.a
" <input type=\"hidden\" name=\""+nsOpName+"\" value=\"\"/>\n"+
" <input type=\"hidden\" name=\""+nsNsName+"\" value=\""+((namespace==null)?"":org.apache.manifoldcf.ui.util.Encoder.attributeEscape(namespace))+"\"/>\n"+
" <input type=\"hidden\" name=\""+nsTitlePrefix+"\" value=\""+((titlePrefix==null)?"":org.apache.manifoldcf.ui.util.Encoder.attributeEscape(titlePrefix))+"\"/>\n"+
-" <input type=\"button\" value=\"" + Messages.getAttributeString(locale,"WikiConnector.Delete") + "\" onClick='Javascript:NsDelete("+Integer.toString(k)+")' alt=\""+"Delete namespace/title #"+Integer.toString(k)+"\"/>\n"+
+" <input type=\"button\" value=\"" + Messages.getAttributeString(locale,"WikiConnector.Delete") + "\" onClick='Javascript:NsDelete("+Integer.toString(k)+")' alt=\""+Messages.getString(locale,"WikiConnector.DeleteNamespaceTitle")+Integer.toString(k)+"\"/>\n"+
" </nobr>\n"+
" </td>\n"+
" <td class=\"formcolumncell\">\n"+
Modified: incubator/lcf/trunk/connectors/wiki/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/wiki/common_en_US.properties
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/wiki/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/wiki/common_en_US.properties?rev=1229234&r1=1229233&r2=1229234&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/wiki/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/wiki/common_en_US.properties (original)
+++ incubator/lcf/trunk/connectors/wiki/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/wiki/common_en_US.properties Mon Jan 9 16:08:32 2012
@@ -28,5 +28,11 @@ WikiConnector.Add=Add
WikiConnector.AddNamespacePrefix=Add namespace/prefix
WikiConnector.UseDefault=Use default
WikiConnector.TransientError=Transient error:
-WikiConnector.=AllDefaultNamespaceDocumentsIncluded=All default namespace documents included
+WikiConnector.AllDefaultNamespaceDocumentsIncluded=All default namespace documents included
+WikiConnector.WikiServerPortMustBeAValidInteger=\"Wiki server port must be a valid integer\"
+WikiConnector.PathMustStartWithACharacter=\"Path must start with a '/' character\"
+WikiConnector.PleaseSupplyAValidWikiServerName=\"Please supply a valid Wiki server name\"
+WikiConnector.Parameters=Parameters:
+WikiConnector.certificates= certificate(s)
+WikiConnector.DeleteNamespaceTitle=Delete namespace/title #
Modified: incubator/lcf/trunk/connectors/wiki/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/wiki/common_ja_JP.properties
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/wiki/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/wiki/common_ja_JP.properties?rev=1229234&r1=1229233&r2=1229234&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/wiki/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/wiki/common_ja_JP.properties (original)
+++ incubator/lcf/trunk/connectors/wiki/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/wiki/common_ja_JP.properties Mon Jan 9 16:08:32 2012
@@ -29,4 +29,10 @@ WikiConnector.AddNamespacePrefix=å�
WikiConnector.UseDefault=ããã©ã«ãã使ã
WikiConnector.TransientError=䏿çã¨ã©ã¼ï¼
WikiConnector.=AllDefaultNamespaceDocumentsIncluded=ãã¹ã¦ã®ããã©ã«ãåå空éãå«ã
+WikiConnector.WikiServerPortMustBeAValidInteger=\"Wikiãµã¼ããã¼ãã«ã¯æ´æ°ãå
¥åãã¦ãã ãã\"
+WikiConnector.PathMustStartWithACharacter=\"ãã¹åã®å
é ã¯ã/ãã«ãã¦ãã ãã\"
+WikiConnector.PleaseSupplyAValidWikiServerName=\"æ£ããWikiãµã¼ãåãå
¥åãã¦ãã ãã\"
+WikiConnector.Parameters=弿°ï¼
+WikiConnector.certificates= 証æè¨¼
+WikiConnector.DeleteNamespaceTitle=åå空éï¼é¡åãåé¤ï¼ #