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 2014/10/08 01:13:28 UTC

svn commit: r1629995 - in /manifoldcf/branches/dev_1x: ./ connectors/alfresco-webscript/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/ connectors/alfresco-webscript/connector/src/main/java/org/apache/manifoldcf...

Author: kwright
Date: Tue Oct  7 23:13:27 2014
New Revision: 1629995

URL: http://svn.apache.org/r1629995
Log:
Pull up fix for CONNECTORS-1057 from trunk.

Modified:
    manifoldcf/branches/dev_1x/   (props changed)
    manifoldcf/branches/dev_1x/CHANGES.txt
    manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/ConfigurationHandler.java
    manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/ConfigurationHandler.java
    manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/Messages.java
    manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/common_en_US.properties
    manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/common_ja_JP.properties
    manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/common_zh_CN.properties
    manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/common_en_US.properties
    manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/common_ja_JP.properties
    manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/common_zh_CN.properties
    manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/editConfiguration.js
    manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/editConfiguration_Server.html
    manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/viewConfiguration.html
    manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/editConfiguration.js
    manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/editConfiguration_Server.html
    manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/viewConfiguration.html

Propchange: manifoldcf/branches/dev_1x/
------------------------------------------------------------------------------
  Merged /manifoldcf/trunk:r1629994

Modified: manifoldcf/branches/dev_1x/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/CHANGES.txt?rev=1629995&r1=1629994&r2=1629995&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/CHANGES.txt (original)
+++ manifoldcf/branches/dev_1x/CHANGES.txt Tue Oct  7 23:13:27 2014
@@ -3,6 +3,10 @@ $Id$
 
 ======================= 1.8-dev =====================
 
+CONNECTORS-1057: Implement full internationalization for alfresco-webscript
+connector.
+(Karl Wright)
+
 CONNECTORS-1037: Add Alfresco webscript connector and authority.
 (Maurizio Pillitu, Rafa Haro, Karl Wright)
 

Modified: manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/ConfigurationHandler.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/ConfigurationHandler.java?rev=1629995&r1=1629994&r2=1629995&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/ConfigurationHandler.java (original)
+++ manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/ConfigurationHandler.java Tue Oct  7 23:13:27 2014
@@ -57,7 +57,7 @@ public class ConfigurationHandler {
                                                IHTTPOutput out, Locale locale,
                                                ConfigParams parameters,
                                                List<String> tabsArray) throws ManifoldCFException, IOException {
-    tabsArray.add("Server");
+    tabsArray.add(Messages.getString(locale,"Alfresco.Server"));
     Map<String, Object> paramMap = new HashMap<String, Object>();
     fillInParameters(paramMap, out, parameters);
     Messages.outputResourceWithVelocity(out, locale, EDIT_CONFIG_HEADER, paramMap);

Modified: manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/ConfigurationHandler.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/ConfigurationHandler.java?rev=1629995&r1=1629994&r2=1629995&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/ConfigurationHandler.java (original)
+++ manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/ConfigurationHandler.java Tue Oct  7 23:13:27 2014
@@ -110,7 +110,7 @@ public class ConfigurationHandler {
   public static void outputConfigurationHeader(IThreadContext threadContext,
                                                IHTTPOutput out, Locale locale, ConfigParams parameters,
                                                List<String> tabsArray) throws ManifoldCFException, IOException {
-    tabsArray.add("Server");
+    tabsArray.add(Messages.getString(locale,"Alfresco.Server"));
     Map<String, Object> paramMap = new HashMap<String, Object>();
     fillInParameters(paramMap, out, parameters);
     Messages.outputResourceWithVelocity(out, locale, EDIT_CONFIG_HEADER, paramMap);
@@ -202,21 +202,21 @@ public class ConfigurationHandler {
                   );
       }
           
-      out.print("editjob."+seqPrefix+node+"_op.value=\""+ Messages.getBodyJavascriptString(locale, "Alfresco.Add") + "\";\n"+
+      out.print("editjob."+seqPrefix+node+"_op.value=\"Add\";\n"+
                 "  postFormSetAnchor(\""+seqPrefix+"+"+node+"\");\n"+
                 "}\n"+
                 "\n"+
                 "function "+seqPrefix+"delete"+node+"(i)\n"+
                 "{\n"+
                 "  // Set the operation\n"+
-                "  eval(\"editjob."+seqPrefix+node+"_\"+i+\"_op.value=\\\"" + Messages.getBodyJavascriptString(locale, "Alfresco.Delete") + "\\\"\");\n"+
+                "  eval(\"editjob."+seqPrefix+node+"_\"+i+\"_op.value=\\\"Delete\\\"\");\n"+
                 "  // Submit\n"+
                 "  if (editjob."+seqPrefix+node+"_count.value==i)\n"+
                 "    postFormSetAnchor(\""+seqPrefix+node+"\");\n"+
                 "  else\n"+
                 "    postFormSetAnchor(\""+seqPrefix+node+"_\"+i)\n"+
                 "  // Undo, so we won't get two deletes next time\n"+
-                "  eval(\"editjob."+seqPrefix+node+"_\"+i+\"_op.value=\\\""+ Messages.getBodyJavascriptString(locale, "Alfresco.Continue") + "\\\"\");\n"+
+                "  eval(\"editjob."+seqPrefix+node+"_\"+i+\"_op.value=\\\"Continue\\\"\");\n"+
                 "}\n"+
                 "\n");
     }
@@ -242,14 +242,14 @@ public class ConfigurationHandler {
                   "<table class=\"displaytable\">\n"+
                   "  <tr><td class=\"separator\" colspan=\"2\"><hr/></td></tr>\n"+
                   "  <tr>\n"+
-                  "    <td class=\"description\"><nobr>" + node + " filtering:</nobr></td>\n"+
+                  "    <td class=\"description\"><nobr>" + Messages.getBodyString(locale, "Alfresco.SpecificFilteringConfiguration",new String[]{Messages.getString(locale,"Alfresco."+node)}) + "</nobr></td>\n"+
                   "    <td class=\"boxcell\">\n"+
                   "      <table class=\"formtable\">\n"+
                   "        <tr class=\"formheaderrow\">\n"+
                   "          <td class=\"formcolumnheader\"></td>\n");
         Collection<String> vars = SPECIFICATION_MAP.get(node);
         for(String var:vars){
-          out.print("<td class=\"formcolumnheader\"><nobr>" + var + "</nobr></td>\n");
+          out.print("<td class=\"formcolumnheader\"><nobr>" + Messages.getString(locale,"Alfresco."+var) + "</nobr></td>\n");
         }
         out.print("</tr>\n");
         
@@ -264,7 +264,7 @@ public class ConfigurationHandler {
                       "          <td class=\"formcolumncell\">\n"+
                       "            <a name=\""+prefix+"\">\n"+
                       "              <input type=\"button\" value=\""+ Messages.getBodyJavascriptString(locale, "Alfresco.Delete") + "\" alt=\""+ Messages.getBodyJavascriptString(locale, "Alfresco.Delete") + ""+Integer.toString(fieldCounter+1)+"\" onclick='javascript:"+seqPrefix+"delete"+node+"("+Integer.toString(fieldCounter)+");'/>\n"+
-                      "              <input type=\"hidden\" name=\""+prefix+"_op\" value=\""+ Messages.getBodyJavascriptString(locale, "Alfresco.Continue") + "\"/>\n");
+                      "              <input type=\"hidden\" name=\""+prefix+"_op\" value=\"Continue\"/>\n");
             for(String var:vars){
               out.print("<input type=\"hidden\" name=\""+prefix+"_"+var+"\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(sn.getAttributeValue(var))+"\"/>\n");
             }
@@ -292,10 +292,10 @@ public class ConfigurationHandler {
                   "        <tr class=\"formrow\">\n"+
                   "          <td class=\"formcolumncell\">\n"+
                   "            <a name=\""+seqPrefix+node+"\">\n"+
-                  "              <input type=\"button\" value=\""+ Messages.getBodyJavascriptString(locale, "Alfresco.Add") + "\" alt=\""+ Messages.getBodyJavascriptString(locale, "Alfresco.Add") + " " + node + "\" onclick=\"javascript:"+seqPrefix+"add"+node+"();\"/>\n"+
+                  "              <input type=\"button\" value=\""+ Messages.getAttributeString(locale, "Alfresco.Add") + "\" alt=\""+ Messages.getAttributeString(locale, "Alfresco.Add") + " " + node + "\" onclick=\"javascript:"+seqPrefix+"add"+node+"();\"/>\n"+
                   "            </a>\n"+
                   "            <input type=\"hidden\" name=\""+seqPrefix+node+"_count\" value=\""+fieldCounter+"\"/>\n"+
-                  "            <input type=\"hidden\" name=\""+seqPrefix+node+"_op\" value=\""+ Messages.getBodyJavascriptString(locale, "Alfresco.Continue") +"\"/>\n"+
+                  "            <input type=\"hidden\" name=\""+seqPrefix+node+"_op\" value=\"Continue\"/>\n"+
                   "          </td>\n");
         for(String var:vars){
           out.print("          <td class=\"formcolumncell\">\n"+
@@ -303,7 +303,7 @@ public class ConfigurationHandler {
                     "          </td>\n");
         }
 
-       out.print("</tr>\n"+
+        out.print("</tr>\n"+
                  "      </table>\n"+
                  "    </td>\n"+
                  "  </tr>\n");
@@ -362,7 +362,7 @@ public class ConfigurationHandler {
         {
           String prefix = seqPrefix+node+"_"+Integer.toString(i);
           String op = variableContext.getParameter(prefix+"_op");
-          if (op == null || !op.equals(Messages.getBodyJavascriptString(locale, "Alfresco.Delete")))
+          if (op == null || !op.equals("Delete"))
           {
             SpecificationNode specNode = new SpecificationNode(node);
             for(String var:vars){
@@ -377,7 +377,7 @@ public class ConfigurationHandler {
         }
 
         String addop = variableContext.getParameter(seqPrefix+node+"_op");
-        if (addop != null && addop.equals(Messages.getBodyJavascriptString(locale, "Alfresco.Add")))
+        if (addop != null && addop.equals("Add"))
         {
           SpecificationNode specNode = new SpecificationNode(node);
           for(String var:vars){
@@ -409,13 +409,13 @@ public class ConfigurationHandler {
                 "\n"+
                 "<table class=\"displaytable\">\n"+
                 "  <tr>\n"+
-                "    <td class=\"description\"><nobr>"+ Messages.getBodyJavascriptString(locale, "Alfresco.SpecificFilteringConfiguration",new String[]{node}) +"</nobr></td>\n"+
+                "    <td class=\"description\"><nobr>"+ Messages.getBodyString(locale, "Alfresco.SpecificFilteringConfiguration",new String[]{Messages.getString(locale,"Alfresco."+node)}) +"</nobr></td>\n"+
                 "    <td class=\"boxcell\">\n"+
                 "      <table class=\"formtable\">\n"+
                 "        <tr class=\"formheaderrow\">\n");
       for(String var:vars)
         out.print(
-                  "          <td class=\"formcolumnheader\"><nobr>" + var + "</nobr></td>\n");
+                  "          <td class=\"formcolumnheader\"><nobr>" + Messages.getBodyString(locale, "Alfresco."+var) + "</nobr></td>\n");
               
      out.print("        </tr>\n");
      

Modified: manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/Messages.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/Messages.java?rev=1629995&r1=1629994&r2=1629995&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/Messages.java (original)
+++ manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/Messages.java Tue Oct  7 23:13:27 2014
@@ -23,8 +23,8 @@ import java.util.Locale;
 import java.util.Map;
 
 public class Messages extends org.apache.manifoldcf.ui.i18n.Messages {
-  public static final String DEFAULT_BUNDLE_NAME = "org.apache.manifoldcf.crawler.connectors.alfresco.webscript.common";
-  public static final String DEFAULT_PATH_NAME = "org.apache.manifoldcf.crawler.connectors.alfresco.webscript";
+  public static final String DEFAULT_BUNDLE_NAME = "org.apache.manifoldcf.crawler.connectors.alfrescowebscript.common";
+  public static final String DEFAULT_PATH_NAME = "org.apache.manifoldcf.crawler.connectors.alfrescowebscript";
 
   /**
    * Constructor - do no instantiate

Modified: manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/common_en_US.properties
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/common_en_US.properties?rev=1629995&r1=1629994&r2=1629995&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/common_en_US.properties (original)
+++ manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/common_en_US.properties Tue Oct  7 23:13:27 2014
@@ -1,3 +1,30 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+Alfresco.Server=Server
+
+Alfresco.ProtocolColon=Protocol:
+Alfresco.HostnameColon=Host name:
+Alfresco.EndpointColon=Endpoint:
+Alfresco.UsernameColon=User name:
+Alfresco.PasswordColon=Password:
+
 Alfresco.Continue=Continue
 Alfresco.Delete=Delete
-Alfresco.Add=Add
\ No newline at end of file
+Alfresco.Add=Add
+
+Alfresco.ProtocolMustNotBeEmpty=Protocol must not be empty!
+Alfresco.HostNameMustNotBeEmpty=Hostname must not be empty!
+Alfresco.EndpointMustNotBeEmpty=Endpoint must not be empty!

Modified: manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/common_ja_JP.properties
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/common_ja_JP.properties?rev=1629995&r1=1629994&r2=1629995&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/common_ja_JP.properties (original)
+++ manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/common_ja_JP.properties Tue Oct  7 23:13:27 2014
@@ -1,3 +1,30 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+Alfresco.Server=Server
+
+Alfresco.ProtocolColon=Protocol:
+Alfresco.HostnameColon=Host name:
+Alfresco.EndpointColon=Endpoint:
+Alfresco.UsernameColon=User name:
+Alfresco.PasswordColon=Password:
+
 Alfresco.Continue=Continue
 Alfresco.Delete=Delete
-Alfresco.Add=Add
\ No newline at end of file
+Alfresco.Add=Add
+
+Alfresco.ProtocolMustNotBeEmpty=Protocol must not be empty!
+Alfresco.HostNameMustNotBeEmpty=Hostname must not be empty!
+Alfresco.EndpointMustNotBeEmpty=Endpoint must not be empty!

Modified: manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/common_zh_CN.properties
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/common_zh_CN.properties?rev=1629995&r1=1629994&r2=1629995&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/common_zh_CN.properties (original)
+++ manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/common_zh_CN.properties Tue Oct  7 23:13:27 2014
@@ -1,3 +1,30 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+Alfresco.Server=Server
+
+Alfresco.ProtocolColon=Protocol:
+Alfresco.HostnameColon=Host name:
+Alfresco.EndpointColon=Endpoint:
+Alfresco.UsernameColon=User name:
+Alfresco.PasswordColon=Password:
+
 Alfresco.Continue=Continue
 Alfresco.Delete=Delete
-Alfresco.Add=Add
\ No newline at end of file
+Alfresco.Add=Add
+
+Alfresco.ProtocolMustNotBeEmpty=Protocol must not be empty!
+Alfresco.HostNameMustNotBeEmpty=Hostname must not be empty!
+Alfresco.EndpointMustNotBeEmpty=Endpoint must not be empty!

Modified: manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/common_en_US.properties
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/common_en_US.properties?rev=1629995&r1=1629994&r2=1629995&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/common_en_US.properties (original)
+++ manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/common_en_US.properties Tue Oct  7 23:13:27 2014
@@ -1,8 +1,49 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+Alfresco.Server=Server
+
+Alfresco.ProtocolColon=Protocol:
+Alfresco.HostnameColon=Host name:
+Alfresco.EndpointColon=Endpoint:
+Alfresco.UsernameColon=User name:
+Alfresco.PasswordColon=Password:
+Alfresco.StoreProtocolColon=Store protocol:
+Alfresco.StoreIDColon=Store ID:
+Alfresco.EnableDocumentProcessingQuestion=Enable document processing?
+
+Alfresco.ProtocolMustNotBeEmpty=Protocol must not be empty!
+Alfresco.HostNameMustNotBeEmpty=Hostname must not be empty!
+Alfresco.EndpointMustNotBeEmpty=Endpoint must not be empty!
+Alfresco.StoreProtocolMustNotBeEmpty=Store protocol must not be empty!
+Alfresco.StoreIDMustNotBeEmpty=Store ID must not be empty!
+
+Alfresco.site=site
+Alfresco.site_name=Site name
+Alfresco.mimetype=mime type
+Alfresco.mimetype_name=Mime type name
+Alfresco.aspect=aspect
+Alfresco.aspect_name=Aspect name
+Alfresco.metadata=metadata
+Alfresco.metadata_source=Metadata source
+Alfresco.metadata_value=Metadata value
+
 Alfresco.FilteringConfiguration=Alfresco Filtering Configuration
-Alfresco.SpecificFilteringConfiguration=Alfresco {0} Filtering Configuration
-Alfresco.NoSpecificFilteringConfiguration=No Filtering Configuration Specificied for {0}
-Alfresco.NoFilteringConfiguration=No Filtering Configuration Specified
+Alfresco.SpecificFilteringConfiguration=Alfresco {0} filtering configuration:
+Alfresco.NoSpecificFilteringConfiguration=No filtering configuration specified for {0}
+Alfresco.NoFilteringConfiguration=No filtering configuration specified
 Alfresco.ParamNullError=Value of {0}.{1} can't be NULL
-Alfresco.Continue=Continue
 Alfresco.Delete=Delete
 Alfresco.Add=Add
\ No newline at end of file

Modified: manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/common_ja_JP.properties
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/common_ja_JP.properties?rev=1629995&r1=1629994&r2=1629995&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/common_ja_JP.properties (original)
+++ manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/common_ja_JP.properties Tue Oct  7 23:13:27 2014
@@ -1,8 +1,49 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+Alfresco.Server=Server
+
+Alfresco.ProtocolColon=Protocol:
+Alfresco.HostnameColon=Host name:
+Alfresco.EndpointColon=Endpoint:
+Alfresco.UsernameColon=User name:
+Alfresco.PasswordColon=Password:
+Alfresco.StoreProtocolColon=Store protocol:
+Alfresco.StoreIDColon=Store ID:
+Alfresco.EnableDocumentProcessingQuestion=Enable document processing?
+
+Alfresco.ProtocolMustNotBeEmpty=Protocol must not be empty!
+Alfresco.HostNameMustNotBeEmpty=Hostname must not be empty!
+Alfresco.EndpointMustNotBeEmpty=Endpoint must not be empty!
+Alfresco.StoreProtocolMustNotBeEmpty=Store protocol must not be empty!
+Alfresco.StoreIDMustNotBeEmpty=Store ID must not be empty!
+
+Alfresco.site=site
+Alfresco.site_name=Site name
+Alfresco.mimetype=mime type
+Alfresco.mimetype_name=Mime type name
+Alfresco.aspect=aspect
+Alfresco.aspect_name=Aspect name
+Alfresco.metadata=metadata
+Alfresco.metadata_source=Metadata source
+Alfresco.metadata_value=Metadata value
+
 Alfresco.FilteringConfiguration=Alfresco Filtering Configuration
-Alfresco.SpecificFilteringConfiguration=Alfresco {0} Filtering Configuration
-Alfresco.NoSpecificFilteringConfiguration=No Filtering Configuration Specificied for {0}
-Alfresco.NoFilteringConfiguration=No Filtering Configuration Specified
+Alfresco.SpecificFilteringConfiguration=Alfresco {0} filtering configuration:
+Alfresco.NoSpecificFilteringConfiguration=No filtering configuration specified for {0}
+Alfresco.NoFilteringConfiguration=No filtering configuration specified
 Alfresco.ParamNullError=Value of {0}.{1} can't be NULL
-Alfresco.Continue=Continue
 Alfresco.Delete=Delete
 Alfresco.Add=Add
\ No newline at end of file

Modified: manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/common_zh_CN.properties
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/common_zh_CN.properties?rev=1629995&r1=1629994&r2=1629995&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/common_zh_CN.properties (original)
+++ manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/common_zh_CN.properties Tue Oct  7 23:13:27 2014
@@ -1,8 +1,49 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+Alfresco.Server=Server
+
+Alfresco.ProtocolColon=Protocol:
+Alfresco.HostnameColon=Host name:
+Alfresco.EndpointColon=Endpoint:
+Alfresco.UsernameColon=User name:
+Alfresco.PasswordColon=Password:
+Alfresco.StoreProtocolColon=Store protocol:
+Alfresco.StoreIDColon=Store ID:
+Alfresco.EnableDocumentProcessingQuestion=Enable document processing?
+
+Alfresco.ProtocolMustNotBeEmpty=Protocol must not be empty!
+Alfresco.HostNameMustNotBeEmpty=Hostname must not be empty!
+Alfresco.EndpointMustNotBeEmpty=Endpoint must not be empty!
+Alfresco.StoreProtocolMustNotBeEmpty=Store protocol must not be empty!
+Alfresco.StoreIDMustNotBeEmpty=Store ID must not be empty!
+
+Alfresco.site=site
+Alfresco.site_name=Site name
+Alfresco.mimetype=mime type
+Alfresco.mimetype_name=Mime type name
+Alfresco.aspect=aspect
+Alfresco.aspect_name=Aspect name
+Alfresco.metadata=metadata
+Alfresco.metadata_source=Metadata source
+Alfresco.metadata_value=Metadata value
+
 Alfresco.FilteringConfiguration=Alfresco Filtering Configuration
-Alfresco.SpecificFilteringConfiguration=Alfresco {0} Filtering Configuration
-Alfresco.NoSpecificFilteringConfiguration=No Filtering Configuration Specificied for {0}
-Alfresco.NoFilteringConfiguration=No Filtering Configuration Specified
+Alfresco.SpecificFilteringConfiguration=Alfresco {0} filtering configuration:
+Alfresco.NoSpecificFilteringConfiguration=No filtering configuration specified for {0}
+Alfresco.NoFilteringConfiguration=No filtering configuration specified
 Alfresco.ParamNullError=Value of {0}.{1} can't be NULL
-Alfresco.Continue=Continue
 Alfresco.Delete=Delete
 Alfresco.Add=Add
\ No newline at end of file

Modified: manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/editConfiguration.js
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/editConfiguration.js?rev=1629995&r1=1629994&r2=1629995&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/editConfiguration.js (original)
+++ manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/editConfiguration.js Tue Oct  7 23:13:27 2014
@@ -6,20 +6,20 @@ function checkConfig() {
 
 function checkConfigForSave() {
   if (editconnection.protocol.value == "") {
-    alert("Protocol must not be empty!");
-    SelectTab("Server");
+    alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('Alfresco.ProtocolMustNotBeEmpty'))");
+    SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('Alfresco.Server'))");
     editconnection.protocol.focus();
     return false;
   }
   if (editconnection.hostname.value == "") {
-    alert("Hostname must not be empty!");
-    SelectTab("Server");
+    alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('Alfresco.HostNameMustNotBeEmpty'))");
+    SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('Alfresco.Server'))");
     editconnection.hostname.focus();
     return false;
   }
   if (editconnection.endpoint.value == "") {
-    alert("Endpoint must not be empty!");
-    SelectTab("Server");
+    alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('Alfresco.EndpointMustNotBeEmpty'))");
+    SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('Alfresco.Server'))");
     editconnection.endpoint.focus();
     return false;
   }

Modified: manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/editConfiguration_Server.html
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/editConfiguration_Server.html?rev=1629995&r1=1629994&r2=1629995&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/editConfiguration_Server.html (original)
+++ manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/editConfiguration_Server.html Tue Oct  7 23:13:27 2014
@@ -1,8 +1,8 @@
-#if($tabName == "Server")
+#if($tabName == "$ResourceBundle.getString('Alfresco.Server')")
 <table class="displaytable">
   <tr>
     <td class="description">
-      <nobr>Protocol</nobr>
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('Alfresco.ProtocolColon'))</nobr>
     </td>
     <td class="value">
       <input name="protocol" type="text" size="32" value="$Encoder.attributeEscape($protocol)" />
@@ -10,7 +10,7 @@
   </tr>
   <tr>
     <td class="description">
-      <nobr>Hostname</nobr>
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('Alfresco.HostnameColon'))</nobr>
     </td>
     <td class="value">
       <input name="hostname" type="text" size="32" value="$Encoder.attributeEscape($hostname)"/>
@@ -18,7 +18,7 @@
   </tr>
   <tr>
     <td class="description">
-      <nobr>Endpoint</nobr>
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('Alfresco.EndpointColon'))</nobr>
     </td>
     <td class="value">
       <input name="endpoint" type="text" size="32" value="$Encoder.attributeEscape($endpoint)" />
@@ -26,7 +26,7 @@
   </tr>
   <tr>
     <td class="description">
-      <nobr>Username</nobr>
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('Alfresco.UsernameColon'))</nobr>
     </td>
     <td class="value">
       <input name="username" type="text" size="32" value="$Encoder.attributeEscape($username)"/>
@@ -34,7 +34,7 @@
   </tr>
   <tr>
     <td class="description">
-      <nobr>Password</nobr>
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('Alfresco.PasswordColon'))</nobr>
     </td>
     <td class="value">
       <input name="password" type="password" size="32" value="$Encoder.attributeEscape($password)"/>

Modified: manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/viewConfiguration.html
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/viewConfiguration.html?rev=1629995&r1=1629994&r2=1629995&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/viewConfiguration.html (original)
+++ manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/viewConfiguration.html Tue Oct  7 23:13:27 2014
@@ -1,7 +1,7 @@
 <table class="displaytable">
   <tr>
     <td class="description" colspan="1">
-      <nobr>Protocol:</nobr>
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('Alfresco.ProtocolColon'))</nobr>
     </td>
     <td class="value" colspan="3">
       <nobr>$Encoder.bodyEscape($protocol)</nobr><br/>
@@ -9,7 +9,7 @@
   </tr>
   <tr>
     <td class="description" colspan="1">
-      <nobr>Hostname:</nobr>
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('Alfresco.HostnameColon'))</nobr>
     </td>
     <td class="value" colspan="3">
       <nobr>$Encoder.bodyEscape($hostname)</nobr><br/>
@@ -17,7 +17,7 @@
   </tr>
   <tr>
     <td class="description" colspan="1">
-      <nobr>Endpoint:</nobr>
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('Alfresco.EndpointColon'))</nobr>
     </td>
     <td class="value" colspan="3">
       <nobr>$Encoder.bodyEscape($endpoint)</nobr><br/>
@@ -25,7 +25,7 @@
   </tr>
   <tr>
     <td class="description" colspan="1">
-      <nobr>Username:</nobr>
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('Alfresco.UsernameColon'))</nobr>
     </td>
     <td class="value" colspan="3">
       <nobr>$Encoder.bodyEscape($username)</nobr><br/>
@@ -33,7 +33,7 @@
   </tr>
   <tr>
     <td class="description" colspan="1">
-      <nobr>Password:</nobr>
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('Alfresco.PasswordColon'))</nobr>
     </td>
     <td class="value" colspan="3">
       <nobr>********</nobr><br/>

Modified: manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/editConfiguration.js
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/editConfiguration.js?rev=1629995&r1=1629994&r2=1629995&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/editConfiguration.js (original)
+++ manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/editConfiguration.js Tue Oct  7 23:13:27 2014
@@ -6,32 +6,32 @@ function checkConfig() {
 
 function checkConfigForSave() {
   if (editconnection.protocol.value == "") {
-    alert("Protocol must not be empty!");
-    SelectTab("Server");
+    alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('Alfresco.ProtocolMustNotBeEmpty'))");
+    SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('Alfresco.Server'))");
     editconnection.protocol.focus();
     return false;
   }
   if (editconnection.hostname.value == "") {
-    alert("Hostname must not be empty!");
-    SelectTab("Server");
+    alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('Alfresco.HostnameMustNotBeEmpty'))");
+    SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('Alfresco.Server'))");
     editconnection.hostname.focus();
     return false;
   }
   if (editconnection.endpoint.value == "") {
-    alert("Endpoint must not be empty!");
-    SelectTab("Server");
+    alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('Alfresco.EndpointMustNotBeEmpty'))");
+    SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('Alfresco.Server'))");
     editconnection.endpoint.focus();
     return false;
   }
   if (editconnection.storeprotocol.value == "") {
-    alert("Store protocol must no be empty!");
-    SelectTab("Server");
+    alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('Alfresco.StoreProtocolMustNotBeEmpty'))");
+    SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('Alfresco.Server'))");
     editconnection.storeprotocol.focus();
     return false;
   }
   if (editconnection.storeid.value == "") {
-    alert("Store id must no be empty!");
-    SelectTab("Server");
+    alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('Alfresco.StoreIDMustNotBeEmpty'))");
+    SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('Alfresco.Server'))");
     editconnection.storeid.focus();
     return false;
   }

Modified: manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/editConfiguration_Server.html
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/editConfiguration_Server.html?rev=1629995&r1=1629994&r2=1629995&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/editConfiguration_Server.html (original)
+++ manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/editConfiguration_Server.html Tue Oct  7 23:13:27 2014
@@ -2,7 +2,7 @@
 <table class="displaytable">
   <tr>
     <td class="description">
-      <nobr>Protocol</nobr>
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('Alfresco.ProtocolColon'))</nobr>
     </td>
     <td class="value">
       <input name="protocol" type="text" size="32" value="$Encoder.attributeEscape($protocol)" />
@@ -10,7 +10,7 @@
   </tr>
   <tr>
     <td class="description">
-      <nobr>Hostname</nobr>
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('Alfresco.HostnameColon'))</nobr>
     </td>
     <td class="value">
       <input name="hostname" type="text" size="32" value="$Encoder.attributeEscape($hostname)"/>
@@ -18,7 +18,7 @@
   </tr>
   <tr>
     <td class="description">
-      <nobr>Endpoint</nobr>
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('Alfresco.EndpointColon'))</nobr>
     </td>
     <td class="value">
       <input name="endpoint" type="text" size="32" value="$Encoder.attributeEscape($endpoint)" />
@@ -26,23 +26,15 @@
   </tr>
   <tr>
     <td class="description">
-      <nobr>Store protocol</nobr>
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('Alfresco.StoreProtocolColon'))</nobr>
     </td>
     <td class="value">
       <input name="storeprotocol" type="text" size="32" value="$Encoder.attributeEscape($storeprotocol)"/>
     </td>
   </tr>
-    <tr>
-        <td class="description">
-            <nobr>Enable Document Processing</nobr>
-        </td>
-        <td class="value">
-            <input name="enabledocumentprocessing" type="checkbox" value="$enabledocumentprocessing"/>
-        </td>
-    </tr>
   <tr>
     <td class="description">
-      <nobr>Store id</nobr>
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('Alfresco.StoreIDColon'))</nobr>
     </td>
     <td class="value">
       <input name="storeid" type="text" size="32" value="$Encoder.attributeEscape($storeid)"/>
@@ -50,7 +42,7 @@
   </tr>
   <tr>
     <td class="description">
-      <nobr>Username</nobr>
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('Alfresco.UsernameColon'))</nobr>
     </td>
     <td class="value">
       <input name="username" type="text" size="32" value="$Encoder.attributeEscape($username)"/>
@@ -58,12 +50,20 @@
   </tr>
   <tr>
     <td class="description">
-      <nobr>Password</nobr>
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('Alfresco.PasswordColon'))</nobr>
     </td>
     <td class="value">
       <input name="password" type="password" size="32" value="$Encoder.attributeEscape($password)"/>
     </td>
   </tr>
+  <tr>
+    <td class="description">
+        <nobr>$Encoder.bodyEscape($ResourceBundle.getString('Alfresco.EnableDocumentProcessingQuestion'))</nobr>
+    </td>
+    <td class="value">
+      <input name="enabledocumentprocessing" type="checkbox" value="$enabledocumentprocessing"/>
+    </td>
+  </tr>
 </table>
 #else
 <input type="hidden" name="protocol" value="$Encoder.attributeEscape($protocol)" />

Modified: manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/viewConfiguration.html
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/viewConfiguration.html?rev=1629995&r1=1629994&r2=1629995&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/viewConfiguration.html (original)
+++ manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/viewConfiguration.html Tue Oct  7 23:13:27 2014
@@ -1,7 +1,7 @@
 <table class="displaytable">
   <tr>
     <td class="description" colspan="1">
-      <nobr>Protocol:</nobr>
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('Alfresco.ProtocolColon'))</nobr>
     </td>
     <td class="value" colspan="3">
       <nobr>$Encoder.bodyEscape($protocol)</nobr><br/>
@@ -9,7 +9,7 @@
   </tr>
   <tr>
     <td class="description" colspan="1">
-      <nobr>Hostname:</nobr>
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('Alfresco.HostnameColon'))</nobr>
     </td>
     <td class="value" colspan="3">
       <nobr>$Encoder.bodyEscape($hostname)</nobr><br/>
@@ -17,7 +17,7 @@
   </tr>
   <tr>
     <td class="description" colspan="1">
-      <nobr>Endpoint:</nobr>
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('Alfresco.EndpointColon'))</nobr>
     </td>
     <td class="value" colspan="3">
       <nobr>$Encoder.bodyEscape($endpoint)</nobr><br/>
@@ -25,23 +25,15 @@
   </tr>
   <tr>
     <td class="description" colspan="1">
-      <nobr>Store protocol:</nobr>
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('Alfresco.StoreProtocolColon'))</nobr>
     </td>
     <td class="value" colspan="3">
       <nobr>$Encoder.bodyEscape($storeprotocol)</nobr><br/>
     </td>
   </tr>
-    <tr>
-        <td class="description" colspan="1">
-            <nobr>Enable Document Processing:</nobr>
-        </td>
-        <td class="value" colspan="3">
-            <nobr>$enabledocumentprocessing</nobr><br/>
-        </td>
-    </tr>
   <tr>
     <td class="description" colspan="1">
-      <nobr>Store id:</nobr>
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('Alfresco.StoreIDColon'))</nobr>
     </td>
     <td class="value" colspan="3">
       <nobr>$Encoder.bodyEscape($storeid)</nobr><br/>
@@ -49,7 +41,7 @@
   </tr>
   <tr>
     <td class="description" colspan="1">
-      <nobr>Username:</nobr>
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('Alfresco.UsernameColon'))</nobr>
     </td>
     <td class="value" colspan="3">
       <nobr>$Encoder.bodyEscape($username)</nobr><br/>
@@ -57,10 +49,18 @@
   </tr>
   <tr>
     <td class="description" colspan="1">
-      <nobr>Password:</nobr>
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('Alfresco.PasswordColon'))</nobr>
     </td>
     <td class="value" colspan="3">
       <nobr>********</nobr><br/>
     </td>
   </tr>
+  <tr>
+    <td class="description" colspan="1">
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('Alfresco.EnableDocumentProcessingQuestion'))</nobr>
+    </td>
+    <td class="value" colspan="3">
+      <nobr>$enabledocumentprocessing</nobr><br/>
+    </td>
+  </tr>
 </table>