incubator-connectors-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1229398 - in /incubator/lcf/trunk: ./ connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/ connectors/webcrawler/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/webcraw...
Date Mon, 09 Jan 2012 22:24:58 GMT
Author: kwright
Date: Mon Jan  9 22:24:57 2012
New Revision: 1229398

URL: http://svn.apache.org/viewvc?rev=1229398&view=rev
Log:
Finish CONNECTORS-367.

Modified:
    incubator/lcf/trunk/CHANGES.txt
    incubator/lcf/trunk/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/WebcrawlerConnector.java
    incubator/lcf/trunk/connectors/webcrawler/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/webcrawler/common_en_US.properties
    incubator/lcf/trunk/connectors/webcrawler/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/webcrawler/common_ja_JP.properties

Modified: incubator/lcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/CHANGES.txt?rev=1229398&r1=1229397&r2=1229398&view=diff
==============================================================================
--- incubator/lcf/trunk/CHANGES.txt (original)
+++ incubator/lcf/trunk/CHANGES.txt Mon Jan  9 22:24:57 2012
@@ -3,6 +3,9 @@ $Id$
 
 ======================= 0.5-dev =====================
 
+CONNECTORS-367: Internationalize Web connector fully.
+(Hitoshi Ozawa, Karl Wright)
+
 CONNECTORS-364: Internationalize RSS connector fully.
 (Hitoshi Ozawa, Karl Wright)
 

Modified: incubator/lcf/trunk/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/WebcrawlerConnector.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/WebcrawlerConnector.java?rev=1229398&r1=1229397&r2=1229398&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/WebcrawlerConnector.java
(original)
+++ incubator/lcf/trunk/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/WebcrawlerConnector.java
Mon Jan  9 22:24:57 2012
@@ -1385,7 +1385,7 @@ public class WebcrawlerConnector extends
 "{\n"+
 "  if (editconnection.email.value != \"\" && editconnection.email.value.indexOf(\"@\")
== -1)\n"+
 "  {\n"+
-"    alert("+Messages.getString(locale,"WebcrawlerConnector.NeedAValidEmailAddress")+");\n"+
+"    alert(\""+Messages.getBodyJavascriptString(locale,"WebcrawlerConnector.NeedAValidEmailAddress")+"\");\n"+
 "    editconnection.email.focus();\n"+
 "    return false;\n"+
 "  }\n"+
@@ -1398,21 +1398,21 @@ public class WebcrawlerConnector extends
 "    var connections = eval(\"editconnection.connections_bandwidth_\"+i+\".value\");\n"+
 "    if (connections != \"\" && !isInteger(connections))\n"+
 "    {\n"+
-"      alert("+Messages.getString(locale,"WebcrawlerConnector.MaximumConnectionsMustBeAnInteger")+");\n"+
+"      alert(\""+Messages.getBodyJavascriptString(locale,"WebcrawlerConnector.MaximumConnectionsMustBeAnInteger")+"\");\n"+
 "      eval(\"editconnection.connections_bandwidth_\"+i+\".focus()\");\n"+
 "      return false;\n"+
 "    }\n"+
 "    var rate = eval(\"editconnection.rate_bandwidth_\"+i+\".value\");\n"+
 "    if (rate != \"\" && !isInteger(rate))\n"+
 "    {\n"+
-"      alert("+Messages.getString(locale,"WebcrawlerConnector.MaximumKbytesPerSecondMustBeAnInteger")+");\n"+
+"      alert(\""+Messages.getBodyJavascriptString(locale,"WebcrawlerConnector.MaximumKbytesPerSecondMustBeAnInteger")+"\");\n"+
 "      eval(\"editconnection.rate_bandwidth_\"+i+\".focus()\");\n"+
 "      return false;\n"+
 "    }\n"+
 "    var fetches = eval(\"editconnection.fetches_bandwidth_\"+i+\".value\");\n"+
 "    if (fetches != \"\" && !isInteger(fetches))\n"+
 "    {\n"+
-"      alert("+Messages.getString(locale,"WebcrawlerConnector.MaximumFetchesPerMinuteMustBeAnInteger")+");\n"+
+"      alert(\""+Messages.getBodyJavascriptString(locale,"WebcrawlerConnector.MaximumFetchesPerMinuteMustBeAnInteger")+"\");\n"+
 "      eval(\"editconnection.fetches_bandwidth_\"+i+\".focus()\");\n"+
 "      return false;\n"+
 "    }\n"+
@@ -1428,7 +1428,7 @@ public class WebcrawlerConnector extends
 "    var username = eval(\"editconnection.username_acredential_\"+i+\".value\");\n"+
 "    if (username == \"\")\n"+
 "    {\n"+
-"      alert("+Messages.getString(locale,"WebcrawlerConnector.CredentialMustHaveNonNullUserName")+");\n"+
+"      alert(\""+Messages.getBodyJavascriptString(locale,"WebcrawlerConnector.CredentialMustHaveNonNullUserName")+"\");\n"+
 "      eval(\"editconnection.username_acredential_\"+i+\".focus()\");\n"+
 "      return false;\n"+
 "    }\n"+
@@ -1447,7 +1447,7 @@ public class WebcrawlerConnector extends
 "      var matchregexp = eval(\"editconnection.scredential_\"+i+\"_\"+j+\"_matchregexp.value\");\n"+
 "      if (!isRegularExpression(matchregexp))\n"+
 "      {\n"+
-"        alert("+Messages.getString(locale,"WebcrawlerConnector.MatchExpressionMustBeAValidRegularExpression")+");\n"+
+"        alert(\""+Messages.getBodyJavascriptString(locale,"WebcrawlerConnector.MatchExpressionMustBeAValidRegularExpression")+"\");\n"+
 "        eval(\"editconnection.scredential_\"+i+\"_\"+j+\"_matchregexp.focus()\");\n"+
 "        return false;\n"+
 "      }\n"+
@@ -1460,7 +1460,7 @@ public class WebcrawlerConnector extends
 "          var paramname = eval(\"editconnection.scredential_\"+i+\"_\"+j+\"_\"+k+\"_param.value\");\n"+
 "          if (paramname == \"\")\n"+
 "          {\n"+
-"            alert("+Messages.getString(locale,"WebcrawlerConnector.ParameterMustHaveNonEmptyName")+");\n"+
+"            alert(\""+Messages.getBodyJavascriptString(locale,"WebcrawlerConnector.ParameterMustHaveNonEmptyName")+"\");\n"+
 "            eval(\"editconnection.scredential_\"+i+\"_\"+j+\"_\"+k+\"_param.focus()\");\n"+
 "            return false;\n"+
 "          }\n"+
@@ -1468,7 +1468,7 @@ public class WebcrawlerConnector extends
 "          var parampassword = eval(\"editconnection.scredential_\"+i+\"_\"+j+\"_\"+k+\"_password.value\");\n"+
 "          if (paramvalue != \"\" && parampassword != \"\")\n"+
 "          {\n"+
-"            alert("+Messages.getString(locale,"WebcrawlerConnector.ParameterCanEitherBeHidden")+");\n"+
+"            alert(\""+Messages.getBodyJavascriptString(locale,"WebcrawlerConnector.ParameterCanEitherBeHidden")+"\");\n"+
 "            eval(\"editconnection.scredential_\"+i+\"_\"+j+\"_\"+k+\"_value.focus()\");\n"+
 "            return false;\n"+
 "          }\n"+
@@ -1517,19 +1517,19 @@ public class WebcrawlerConnector extends
 "  }\n"+
 "  if (editconnection.rate_bandwidth.value != \"\" && !isInteger(editconnection.rate_bandwidth.value))\n"+
 "  {\n"+
-"    alert("+Messages.getString(locale,"WebcrawlerConnector.MaximumKbytesPerSecondMustBeAnInteger")+");\n"+
+"    alert(\""+Messages.getBodyJavascriptString(locale,"WebcrawlerConnector.MaximumKbytesPerSecondMustBeAnInteger")+"\");\n"+
 "    editconnection.rate_bandwidth.focus();\n"+
 "    return;\n"+
 "  }\n"+
 "  if (editconnection.fetches_bandwidth.value != \"\" && !isInteger(editconnection.fetches_bandwidth.value))\n"+
 "  {\n"+
-"    alert("+Messages.getString(locale,"WebcrawlerConnector.MaximumFetchesPerMinuteMustBeAnInteger")+");\n"+
+"    alert(\""+Messages.getBodyJavascriptString(locale,"WebcrawlerConnector.MaximumFetchesPerMinuteMustBeAnInteger")+"\");\n"+
 "    editconnection.fetches_bandwidth.focus();\n"+
 "    return;\n"+
 "  }\n"+
 "  if (!isRegularExpression(editconnection.regexp_bandwidth.value))\n"+
 "  {\n"+
-"    alert("+Messages.getString(locale,"WebcrawlerConnector.AValidRegularExpressionIsRequired")+");\n"+
+"    alert(\""+Messages.getBodyJavascriptString(locale,"WebcrawlerConnector.AValidRegularExpressionIsRequired")+"\");\n"+
 "    editconnection.regexp_bandwidth.focus();\n"+
 "    return;\n"+
 "  }\n"+
@@ -1554,13 +1554,13 @@ public class WebcrawlerConnector extends
 "{\n"+
 "  if (editconnection.username_acredential.value == \"\")\n"+
 "  {\n"+
-"    alert("+Messages.getString(locale,"WebcrawlerConnector.CredentialMustIncludeANonNullUserName")+");\n"+
+"    alert(\""+Messages.getBodyJavascriptString(locale,"WebcrawlerConnector.CredentialMustIncludeANonNullUserName")+"\");\n"+
 "    editconnection.username_acredential.focus();\n"+
 "    return;\n"+
 "  }\n"+
 "  if (!isRegularExpression(editconnection.regexp_acredential.value))\n"+
 "  {\n"+
-"    alert("+Messages.getString(locale,"WebcrawlerConnector.AValidRegularExpressionIsRequired")+");\n"+
+"    alert(\""+Messages.getBodyJavascriptString(locale,"WebcrawlerConnector.AValidRegularExpressionIsRequired")+"\");\n"+
 "    editconnection.regexp_acredential.focus();\n"+
 "    return;\n"+
 "  }\n"+
@@ -1585,7 +1585,7 @@ public class WebcrawlerConnector extends
 "{\n"+
 "  if (!isRegularExpression(editconnection.scredential_regexp.value))\n"+
 "  {\n"+
-"    alert("+Messages.getString(locale,"WebcrawlerConnector.AValidRegularExpressionIsRequired")+");\n"+
+"    alert(\""+Messages.getBodyJavascriptString(locale,"WebcrawlerConnector.AValidRegularExpressionIsRequired")+"\");\n"+
 "    editconnection.scredential_regexp.focus();\n"+
 "    return;\n"+
 "  }\n"+
@@ -1611,13 +1611,13 @@ public class WebcrawlerConnector extends
 "{\n"+
 "  if (!isRegularExpression(eval(\"editconnection.scredential_\"+credential+\"_loginpageregexp.value\")))\n"+
 "  {\n"+
-"    alert("+Messages.getString(locale,"WebcrawlerConnector.AValidRegularExpressionIsRequired")+");\n"+
+"    alert(\""+Messages.getBodyJavascriptString(locale,"WebcrawlerConnector.AValidRegularExpressionIsRequired")+"\");\n"+
 "    eval(\"editconnection.scredential_\"+credential+\"_loginpageregexp.focus()\");\n"+
 "    return;\n"+
 "  }\n"+
 "  if (!isRegularExpression(eval(\"editconnection.scredential_\"+credential+\"_loginpagematchregexp.value\")))\n"+
 "  {\n"+
-"    alert("+Messages.getString(locale,"WebcrawlerConnector.AValidRegularExpressionIsRequired")+");\n"+
+"    alert(\""+Messages.getBodyJavascriptString(locale,"WebcrawlerConnector.AValidRegularExpressionIsRequired")+"\");\n"+
 "    eval(\"editconnection.scredential_\"+credential+\"_loginpagematchregexp.focus()\");\n"+
 "    return;\n"+
 "  }\n"+
@@ -1642,13 +1642,13 @@ public class WebcrawlerConnector extends
 "{\n"+
 "  if (!isRegularExpression(eval(\"editconnection.scredential_\"+credential+\"_\"+loginpage+\"_loginparamname.value\")))\n"+
 "  {\n"+
-"    alert("+Messages.getString(locale,"WebcrawlerConnector.ParameterNameMustBeARegularExpression")+");\n"+
+"    alert(\""+Messages.getBodyJavascriptString(locale,"WebcrawlerConnector.ParameterNameMustBeARegularExpression")+"\");\n"+
 "    eval(\"editconnection.scredential_\"+credential+\"_\"+loginpage+\"_loginparamname.focus()\");\n"+
 "    return;\n"+
 "  }\n"+
 "  if (eval(\"editconnection.scredential_\"+credential+\"_\"+loginpage+\"_loginparamvalue.value\")
!= \"\" && eval(\"editconnection.scredential_\"+credential+\"_\"+loginpage+\"_loginparampassword.value\")
!= \"\")\n"+
 "  {\n"+
-"    alert("+Messages.getString(locale,"WebcrawlerConnector.ParameterCanEitherBeHidden")+");\n"+
+"    alert(\""+Messages.getBodyJavascriptString(locale,"WebcrawlerConnector.ParameterCanEitherBeHidden")+"\");\n"+
 "    eval(\"editconnection.scredential_\"+credential+\"_\"+loginpage+\"_loginparamvalue.focus()\");\n"+
 "    return;\n"+
 "  }\n"+
@@ -1673,13 +1673,13 @@ public class WebcrawlerConnector extends
 "{\n"+
 "  if (editconnection.certificate_trust.value == \"\" && editconnection.all_trust.checked
== false)\n"+
 "  {\n"+
-"    alert("+Messages.getString(locale,"WebcrawlerConnector.SpecifyATrustCertificateFileToUploadFirst")+");\n"+
+"    alert(\""+Messages.getBodyJavascriptString(locale,"WebcrawlerConnector.SpecifyATrustCertificateFileToUploadFirst")+"\");\n"+
 "    editconnection.certificate_trust.focus();\n"+
 "    return;\n"+
 "  }\n"+
 "  if (!isRegularExpression(editconnection.regexp_trust.value))\n"+
 "  {\n"+
-"    alert("+Messages.getString(locale,"WebcrawlerConnector.AValidRegularExpressionIsRequired")+");\n"+
+"    alert(\""+Messages.getBodyJavascriptString(locale,"WebcrawlerConnector.AValidRegularExpressionIsRequired")+"\");\n"+
 "    editconnection.regexp_trust.focus();\n"+
 "    return;\n"+
 "  }\n"+
@@ -1885,7 +1885,7 @@ public class WebcrawlerConnector extends
       if (binCounter == 0)
       {
         out.print(
-"        <tr class=\"formrow\"><td class=\"formmessage\" colspan=\"6\">"+Messages.getString(locale,"WebcrawlerConnector.NoBandwidthOrConnectionThrottlingSpecified")+"</td></tr>\n"
+"        <tr class=\"formrow\"><td class=\"formmessage\" colspan=\"6\">"+Messages.getBodyString(locale,"WebcrawlerConnector.NoBandwidthOrConnectionThrottlingSpecified")+"</td></tr>\n"
         );
       }
       out.print(
@@ -2164,7 +2164,7 @@ public class WebcrawlerConnector extends
 "              <tr class=\""+(((authPageCounter % 2)==0)?"evenformrow":"oddformrow")+"\">\n"+
 "                <td class=\"formcolumncell\">\n"+
 "                  <a name=\""+authpagePrefix+"\">\n"+
-"                    <input type=\"button\" value=\"Delete\" alt=\""+Messages.getString(locale,"WebcrawlerConnector.DeleteLoginPage")+(authPageCounter+1)+"
for url regular expression #"+Integer.toString(accessCounter+1)+"\" onclick='javascript:deleteLoginPage("+Integer.toString(accessCounter)+","+Integer.toString(authPageCounter)+");'/>\n"+
+"                    <input type=\"button\" value=\"Delete\" alt=\""+Messages.getAttributeString(locale,"WebcrawlerConnector.DeleteLoginPage")+(authPageCounter+1)+"
for url regular expression #"+Integer.toString(accessCounter+1)+"\" onclick='javascript:deleteLoginPage("+Integer.toString(accessCounter)+","+Integer.toString(authPageCounter)+");'/>\n"+
 "                    <input type=\"hidden\" name=\""+authpagePrefix+"_op"+"\" value=\"Continue\"/>\n"+
 "                    <input type=\"hidden\" name=\""+authpagePrefix+"_regexp"+"\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(pageRegexp)+"\"/>\n"+
 "                    <input type=\"hidden\" name=\""+authpagePrefix+"_type"+"\" value=\""+pageType+"\"/>\n"+
@@ -2182,9 +2182,9 @@ public class WebcrawlerConnector extends
 "                  <table class=\"formtable\">\n"+
 "                    <tr class=\"formheaderrow\">\n"+
 "                      <td class=\"formcolumnheader\"></td>\n"+
-"                      <td class=\"formcolumnheader\"><nobr>"+Messages.getString(locale,"WebcrawlerConnector.ParameterRegularExpression")+"</nobr></td>\n"+
-"                      <td class=\"formcolumnheader\"><nobr>"+Messages.getString(locale,"WebcrawlerConnector.Value")+"</nobr></td>\n"+
-"                      <td class=\"formcolumnheader\"><nobr>"+Messages.getString(locale,"WebcrawlerConnector.Password")+"</nobr></td>\n"+
+"                      <td class=\"formcolumnheader\"><nobr>"+Messages.getBodyString(locale,"WebcrawlerConnector.ParameterRegularExpression")+"</nobr></td>\n"+
+"                      <td class=\"formcolumnheader\"><nobr>"+Messages.getBodyString(locale,"WebcrawlerConnector.Value")+"</nobr></td>\n"+
+"                      <td class=\"formcolumnheader\"><nobr>"+Messages.getBodyString(locale,"WebcrawlerConnector.Password")+"</nobr></td>\n"+
 "                    </tr>\n"
                   );
                   int z = 0;
@@ -2208,7 +2208,7 @@ public class WebcrawlerConnector extends
 "                    <tr class=\""+(((paramCounter % 2)==0)?"evenformrow":"oddformrow")+"\">\n"+
 "                      <td class=\"formcolumncell\">\n"+
 "                        <a name=\""+authParamPrefix+"\">\n"+
-"                          <input type=\"button\" value=\"Delete\" alt=\""+Messages.getString(locale,"WebcrawlerConnector.DeleteParameter")+(paramCounter+1)+Messages.getString(locale,"WebcrawlerConnector.ForLoginPage")+(authPageCounter+1)+Messages.getString(locale,"WebcrawlerConnector.ForCredential")+(accessCounter+1)+"\"
onclick='javascript:deleteLoginPageParameter("+accessCounter+","+authPageCounter+","+paramCounter+");'/>\n"+
+"                          <input type=\"button\" value=\"Delete\" alt=\""+Messages.getAttributeString(locale,"WebcrawlerConnector.DeleteParameter")+(paramCounter+1)+Messages.getAttributeString(locale,"WebcrawlerConnector.ForLoginPage")+(authPageCounter+1)+Messages.getAttributeString(locale,"WebcrawlerConnector.ForCredential")+(accessCounter+1)+"\"
onclick='javascript:deleteLoginPageParameter("+accessCounter+","+authPageCounter+","+paramCounter+");'/>\n"+
 "                          <input type=\"hidden\" name=\""+authParamPrefix+"_op"+"\" value=\"Continue\"/>\n"+
 "                        </a>\n"+
 "                      </td>\n"+
@@ -2231,7 +2231,7 @@ public class WebcrawlerConnector extends
 "                    <tr class=\"formrow\">\n"+
 "                      <td class=\"formcolumncell\">\n"+
 "                        <a name=\""+authpagePrefix+"_loginparam"+"\">\n"+
-"                          <input type=\"button\" value=\"Add\" alt=\""+Messages.getString(locale,"WebcrawlerConnector.AddParameterToLoginPage")+(authPageCounter+1)+Messages.getString(locale,"WebcrawlerConnector.ForCredential")+(accessCounter+1)+"\"
onclick='javascript:addLoginPageParameter("+accessCounter+","+authPageCounter+");'/>\n"+
+"                          <input type=\"button\" value=\"Add\" alt=\""+Messages.getAttributeString(locale,"WebcrawlerConnector.AddParameterToLoginPage")+(authPageCounter+1)+Messages.getAttributeString(locale,"WebcrawlerConnector.ForCredential")+(accessCounter+1)+"\"
onclick='javascript:addLoginPageParameter("+accessCounter+","+authPageCounter+");'/>\n"+
 "                        </a>\n"+
 "                        <input type=\"hidden\" name=\""+authpagePrefix+"_loginparamcount"+"\"
value=\""+paramCounter+"\"/>\n"+
 "                        <input type=\"hidden\" name=\""+authpagePrefix+"_loginparamop"+"\"
value=\"Continue\"/>\n"+
@@ -2267,7 +2267,7 @@ public class WebcrawlerConnector extends
 "              <tr class=\"formrow\">\n"+
 "                <td class=\"formcolumncell\">\n"+
 "                  <a name=\""+prefix+"_loginpage"+"\">\n"+
-"                    <input type=\"button\" value=\"Add\" alt=\""+Messages.getString(locale,"WebcrawlerConnector.AddLoginPageToCredential")+(accessCounter+1)+"\"
onclick='javascript:addLoginPage("+accessCounter+");'/>\n"+
+"                    <input type=\"button\" value=\"Add\" alt=\""+Messages.getAttributeString(locale,"WebcrawlerConnector.AddLoginPageToCredential")+(accessCounter+1)+"\"
onclick='javascript:addLoginPage("+accessCounter+");'/>\n"+
 "                  </a>\n"+
 "                  <input type=\"hidden\" name=\""+prefix+"_loginpagecount"+"\" value=\""+authPageCounter+"\"/>\n"+
 "                  <input type=\"hidden\" name=\""+prefix+"_loginpageop"+"\" value=\"Continue\"/>\n"+
@@ -2276,9 +2276,9 @@ public class WebcrawlerConnector extends
 "                  <nobr><input type=\"text\" size=\"30\" name=\""+prefix+"_loginpageregexp"+"\"
value=\"\"/></nobr>\n"+
 "                </td>\n"+
 "                <td class=\"formcolumncell\">\n"+
-"                  <nobr><input type=\"radio\" name=\""+prefix+"_loginpagetype"+"\"
value=\""+org.apache.manifoldcf.crawler.connectors.webcrawler.WebcrawlerConfig.ATTRVALUE_FORM+"\"
checked=\"\"/>"+Messages.getString(locale,"WebcrawlerConnector.FormName")+"</nobr><br/>\n"+
-"                  <nobr><input type=\"radio\" name=\""+prefix+"_loginpagetype"+"\"
value=\""+org.apache.manifoldcf.crawler.connectors.webcrawler.WebcrawlerConfig.ATTRVALUE_LINK+"\"/>"+Messages.getString(locale,"WebcrawlerConnector.LinkTarget")+"</nobr>\n"+
-"                  <nobr><input type=\"radio\" name=\""+prefix+"_loginpagetype"+"\"
value=\""+org.apache.manifoldcf.crawler.connectors.webcrawler.WebcrawlerConfig.ATTRVALUE_REDIRECTION+"\"/>"+Messages.getString(locale,"WebcrawlerConnector.Redirection")+"</nobr>\n"+
+"                  <nobr><input type=\"radio\" name=\""+prefix+"_loginpagetype"+"\"
value=\""+org.apache.manifoldcf.crawler.connectors.webcrawler.WebcrawlerConfig.ATTRVALUE_FORM+"\"
checked=\"\"/>"+Messages.getBodyString(locale,"WebcrawlerConnector.FormName")+"</nobr><br/>\n"+
+"                  <nobr><input type=\"radio\" name=\""+prefix+"_loginpagetype"+"\"
value=\""+org.apache.manifoldcf.crawler.connectors.webcrawler.WebcrawlerConfig.ATTRVALUE_LINK+"\"/>"+Messages.getBodyString(locale,"WebcrawlerConnector.LinkTarget")+"</nobr>\n"+
+"                  <nobr><input type=\"radio\" name=\""+prefix+"_loginpagetype"+"\"
value=\""+org.apache.manifoldcf.crawler.connectors.webcrawler.WebcrawlerConfig.ATTRVALUE_REDIRECTION+"\"/>"+Messages.getBodyString(locale,"WebcrawlerConnector.Redirection")+"</nobr>\n"+
 "                </td>\n"+
 "                <td class=\"formcolumncell\">\n"+
 "                  <nobr><input type=\"text\" size=\"30\" name=\""+prefix+"_loginpagematchregexp"+"\"
value=\"\"/></nobr>\n"+
@@ -2307,7 +2307,7 @@ public class WebcrawlerConnector extends
 "        <tr class=\"formrow\">\n"+
 "          <td class=\"formcolumncell\">\n"+
 "            <a name=\"scredential\">\n"+
-"              <input type=\"button\" value=\"" + Messages.getAttributeString(locale,"WebcrawlerConnector.Add")
+ "\" alt=\""+Messages.getString(locale,"WebcrawlerConnector.AddSessionAuthenticationUrlRegularExpression")+"\"
onclick=\"javascript:addSRegexp();\"/>\n"+
+"              <input type=\"button\" value=\"" + Messages.getAttributeString(locale,"WebcrawlerConnector.Add")
+ "\" alt=\""+Messages.getAttributeString(locale,"WebcrawlerConnector.AddSessionAuthenticationUrlRegularExpression")+"\"
onclick=\"javascript:addSRegexp();\"/>\n"+
 "            </a>\n"+
 "            <input type=\"hidden\" name=\"scredential_count\" value=\""+accessCounter+"\"/>\n"+
 "            <input type=\"hidden\" name=\"scredential_op\" value=\"Continue\"/>\n"+
@@ -2482,7 +2482,7 @@ public class WebcrawlerConnector extends
             out.print(
 "        <tr class=\""+(((trustsCounter % 2)==0)?"evenformrow":"oddformrow")+"\">\n"+
 "          <td class=\"formcolumncell\">\n"+
-"            <a name=\""+prefix+"\"><input type=\"button\" value=\"Delete\" alt=\""+Messages.getString(locale,"WebcrawlerConnector.DeleteTrustUrlRegularExpression")+Integer.toString(trustsCounter+1)+"\"
onclick='javascript:deleteTRegexp("+Integer.toString(trustsCounter)+");'/>\n"+
+"            <a name=\""+prefix+"\"><input type=\"button\" value=\"Delete\" alt=\""+Messages.getAttributeString(locale,"WebcrawlerConnector.DeleteTrustUrlRegularExpression")+Integer.toString(trustsCounter+1)+"\"
onclick='javascript:deleteTRegexp("+Integer.toString(trustsCounter)+");'/>\n"+
 "            <input type=\"hidden\" name=\""+"op_"+prefix+"\" value=\"Continue\"/>\n"+
 "            <input type=\"hidden\" name=\""+"regexp_"+prefix+"\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(regexp)+"\"/>\n"+
 "            <input type=\"hidden\" name=\""+"trustall_"+prefix+"\" value=\"true\"/>\n"+
@@ -2493,7 +2493,7 @@ public class WebcrawlerConnector extends
 "            <nobr>"+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(regexp)+"</nobr>\n"+
 "          </td>\n"+
 "          <td class=\"formcolumncell\">\n"+
-"            <nobr><i>"+Messages.getString(locale,"WebcrawlerConnector.TrustEverything")+"</i></nobr>\n"+
+"            <nobr><i>"+Messages.getBodyString(locale,"WebcrawlerConnector.TrustEverything")+"</i></nobr>\n"+
 "          </td>\n"+
 "        </tr>\n"
             );
@@ -2519,7 +2519,7 @@ public class WebcrawlerConnector extends
 "        <tr class=\""+(((trustsCounter % 2)==0)?"evenformrow":"oddformrow")+"\">\n"+
 "          <td class=\"formcolumncell\">\n"+
 "            <a name=\""+prefix+"\">\n"+
-"              <input type=\"button\" value=\"Delete\" alt=\""+Messages.getString(locale,"WebcrawlerConnector.DeleteTrustUrlRegularExpression")+Integer.toString(trustsCounter+1)+"\"
onclick='javascript:deleteTRegexp("+Integer.toString(trustsCounter)+");'/>\n"+
+"              <input type=\"button\" value=\"Delete\" alt=\""+Messages.getAttributeString(locale,"WebcrawlerConnector.DeleteTrustUrlRegularExpression")+Integer.toString(trustsCounter+1)+"\"
onclick='javascript:deleteTRegexp("+Integer.toString(trustsCounter)+");'/>\n"+
 "              <input type=\"hidden\" name=\""+"op_"+prefix+"\" value=\"Continue\"/>\n"+
 "              <input type=\"hidden\" name=\""+"regexp_"+prefix+"\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(regexp)+"\"/>\n"+
 "              <input type=\"hidden\" name=\""+"trustall_"+prefix+"\" value=\"false\"/>\n"+
@@ -3015,21 +3015,21 @@ public class WebcrawlerConnector extends
     out.print(
 "<table class=\"displaytable\">\n"+
 "  <tr>\n"+
-"    <td class=\"description\" colspan=\"1\"><nobr>"+Messages.getString(locale,"WebcrawlerConnector.EmailAddress")+"</nobr></td>\n"+
+"    <td class=\"description\" colspan=\"1\"><nobr>"+Messages.getBodyString(locale,"WebcrawlerConnector.EmailAddress")+"</nobr></td>\n"+
 "    <td class=\"value\" colspan=\"1\">"+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(email)+"</td>\n"+
-"    <td class=\"description\" colspan=\"1\"><nobr>"+Messages.getString(locale,"WebcrawlerConnector.RobotsUsage")+"</nobr></td>\n"+
+"    <td class=\"description\" colspan=\"1\"><nobr>"+Messages.getBodyString(locale,"WebcrawlerConnector.RobotsUsage")+"</nobr></td>\n"+
 "    <td class=\"value\" colspan=\"1\"><nobr>"+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(robots)+"</nobr></td>\n"+
 "  </tr>\n"+
 "  <tr>\n"+
-"    <td class=\"description\" colspan=\"1\"><nobr>"+Messages.getString(locale,"WebcrawlerConnector.BandwidthThrottling")+"</nobr></td>\n"+
+"    <td class=\"description\" colspan=\"1\"><nobr>"+Messages.getBodyString(locale,"WebcrawlerConnector.BandwidthThrottling")+"</nobr></td>\n"+
 "    <td class=\"boxcell\" colspan=\"3\">\n"+
 "      <table class=\"formtable\">\n"+
 "        <tr class=\"formheaderrow\">\n"+
-"          <td class=\"formcolumnheader\"><nobr>"+Messages.getString(locale,"WebcrawlerConnector.BinRegularExpression")+"</nobr></td>\n"+
-"          <td class=\"formcolumnheader\"><nobr>"+Messages.getString(locale,"WebcrawlerConnector.CaseInsensitive")+"</nobr></td>\n"+
-"          <td class=\"formcolumnheader\"><nobr>"+Messages.getString(locale,"WebcrawlerConnector.MaxConnections")+"</nobr></td>\n"+
-"          <td class=\"formcolumnheader\"><nobr>"+Messages.getString(locale,"WebcrawlerConnector.MaxKbytesSec")+"</nobr></td>\n"+
-"          <td class=\"formcolumnheader\"><nobr>"+Messages.getString(locale,"WebcrawlerConnector.MaxFetchesMin")+"</nobr></td>\n"+
+"          <td class=\"formcolumnheader\"><nobr>"+Messages.getBodyString(locale,"WebcrawlerConnector.BinRegularExpression")+"</nobr></td>\n"+
+"          <td class=\"formcolumnheader\"><nobr>"+Messages.getBodyString(locale,"WebcrawlerConnector.CaseInsensitive")+"</nobr></td>\n"+
+"          <td class=\"formcolumnheader\"><nobr>"+Messages.getBodyString(locale,"WebcrawlerConnector.MaxConnections")+"</nobr></td>\n"+
+"          <td class=\"formcolumnheader\"><nobr>"+Messages.getBodyString(locale,"WebcrawlerConnector.MaxKbytesSec")+"</nobr></td>\n"+
+"          <td class=\"formcolumnheader\"><nobr>"+Messages.getBodyString(locale,"WebcrawlerConnector.MaxFetchesMin")+"</nobr></td>\n"+
 "        </tr>\n"
     );
     int i = 0;
@@ -3079,7 +3079,7 @@ public class WebcrawlerConnector extends
     if (instanceNumber == 0)
     {
       out.print(
-"        <tr class=\"formrow\"><td class=\"formmessage\" colspan=\"5\">"+Messages.getString(locale,"WebcrawlerConnector.NoBandwidthThrottling")+"</td></tr>\n"
+"        <tr class=\"formrow\"><td class=\"formmessage\" colspan=\"5\">"+Messages.getBodyString(locale,"WebcrawlerConnector.NoBandwidthThrottling")+"</td></tr>\n"
       );
     }
     out.print(
@@ -3401,7 +3401,7 @@ public class WebcrawlerConnector extends
 "    }\n"+
 "    catch (e)\n"+
 "    {\n"+
-"      alert(\""+Messages.getString(locale,"WebcrawlerConnector.FoundAnIllegalRegularExpressionIn")+"\"+thecontext+\":
'\"+theexp+\""+Messages.getString(locale,"WebcrawlerConnector.ErrorWas")+"\"+e);\n"+
+"      alert(\""+Messages.getBodyJavascriptString(locale,"WebcrawlerConnector.FoundAnIllegalRegularExpressionIn")+"\"+thecontext+\":
'\"+theexp+\""+Messages.getBodyJavascriptString(locale,"WebcrawlerConnector.ErrorWas")+"\"+e);\n"+
 "      rval = false;\n"+
 "    }\n"+
 "  }\n"+
@@ -3412,7 +3412,7 @@ public class WebcrawlerConnector extends
 "{\n"+
 "  if (editjob.spectoken.value == \"\")\n"+
 "  {\n"+
-"    alert("+Messages.getString(locale,"WebcrawlerConnector.TypeInAnAccessToken")+");\n"+
+"    alert(\""+Messages.getBodyJavascriptString(locale,"WebcrawlerConnector.TypeInAnAccessToken")+"\");\n"+
 "    editjob.spectoken.focus();\n"+
 "    return;\n"+
 "  }\n"+
@@ -3423,13 +3423,13 @@ public class WebcrawlerConnector extends
 "{\n"+
 "  if (editjob.specmetaname.value == \"\")\n"+
 "  {\n"+
-"    alert("+Messages.getString(locale,"WebcrawlerConnector.TypeInMetadataName")+");\n"+
+"    alert(\""+Messages.getBodyJavascriptString(locale,"WebcrawlerConnector.TypeInMetadataName")+"\");\n"+
 "    editjob.specmetaname.focus();\n"+
 "    return;\n"+
 "  }\n"+
 "  if (editjob.specmetavalue.value == \"\")\n"+
 "  {\n"+
-"    alert("+Messages.getString(locale,"WebcrawlerConnector.TypeInMetadataValue")+");\n"+
+"    alert(\""+Messages.getBodyJavascriptString(locale,"WebcrawlerConnector.TypeInMetadataValue")+"\");\n"+
 "    editjob.specmetavalue.focus();\n"+
 "    return;\n"+
 "  }\n"+

Modified: incubator/lcf/trunk/connectors/webcrawler/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/webcrawler/common_en_US.properties
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/webcrawler/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/webcrawler/common_en_US.properties?rev=1229398&r1=1229397&r2=1229398&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/webcrawler/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/webcrawler/common_en_US.properties
(original)
+++ incubator/lcf/trunk/connectors/webcrawler/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/webcrawler/common_en_US.properties
Mon Jan  9 22:24:57 2012
@@ -105,21 +105,21 @@ WebcrawlerConnector.Domain=Domain
 WebcrawlerConnector.UserName=User name
 WebcrawlerConnector.Password=Password
 WebcrawlerConnector.EmailAaddressRequired=Email address required, to be included in all request
headers
-WebcrawlerConnector.MaximumConnectionsMustBeAnInteger=\"Maximum connections must be an integer\"
-WebcrawlerConnector.NeedAValidEmailAddress=\"Need a valid email address\"
-WebcrawlerConnector.MaximumKbytesPerSecondMustBeAnInteger=\"Maximum Kbytes per second must
be an integer\"
-WebcrawlerConnector.MaximumFetchesPerMinuteMustBeAnInteger=\"Maximum fetches per minute must
be an integer\"
-WebcrawlerConnector.CredentialMustHaveNonNullUserName=\"Credential must have non-null user
name\"
-WebcrawlerConnector.MatchExpressionMustBeAValidRegularExpression=\"Match expression must
be a valid regular expression\"
-WebcrawlerConnector.ParameterMustHaveNonEmptyName=\"Parameter must have non-empty name\"
-WebcrawlerConnector.ParameterCanEitherBeHidden=\"Parameter can either be hidden or not, but
can't be both\"
-WebcrawlerConnector.MaximumKbytesPerSecondMustBeAnInteger=\"Maximum Kbytes per second must
be an integer\"
-WebcrawlerConnector.MaximumFetchesPerMinuteMustBeAnInteger=\"Maximum fetches per minute must
be an integer\"
-WebcrawlerConnector.AValidRegularExpressionIsRequired=\"A valid regular expression is required\"
-WebcrawlerConnector.CredentialMustIncludeANonNullUserName=\"Credential must include a non-null
user name\"
-WebcrawlerConnector.AValidRegularExpressionIsRequired=\"A valid regular expression is required\"
-WebcrawlerConnector.ParameterNameMustBeARegularExpression=\"Parameter name must be a regular
expression\"
-WebcrawlerConnector.SpecifyATrustCertificateFileToUploadFirst=\"Specify a trust certificate
file to upload first, or check 'Trust everything'\"
+WebcrawlerConnector.MaximumConnectionsMustBeAnInteger=Maximum connections must be an integer
+WebcrawlerConnector.NeedAValidEmailAddress=Need a valid email address
+WebcrawlerConnector.MaximumKbytesPerSecondMustBeAnInteger=Maximum Kbytes per second must
be an integer
+WebcrawlerConnector.MaximumFetchesPerMinuteMustBeAnInteger=Maximum fetches per minute must
be an integer
+WebcrawlerConnector.CredentialMustHaveNonNullUserName=Credential must have non-null user
name
+WebcrawlerConnector.MatchExpressionMustBeAValidRegularExpression=Match expression must be
a valid regular expression
+WebcrawlerConnector.ParameterMustHaveNonEmptyName=Parameter must have non-empty name
+WebcrawlerConnector.ParameterCanEitherBeHidden=Parameter can either be hidden or not, but
can't be both
+WebcrawlerConnector.MaximumKbytesPerSecondMustBeAnInteger=Maximum Kbytes per second must
be an integer
+WebcrawlerConnector.MaximumFetchesPerMinuteMustBeAnInteger=Maximum fetches per minute must
be an integer
+WebcrawlerConnector.AValidRegularExpressionIsRequired=A valid regular expression is required
+WebcrawlerConnector.CredentialMustIncludeANonNullUserName=Credential must include a non-null
user name
+WebcrawlerConnector.AValidRegularExpressionIsRequired=A valid regular expression is required
+WebcrawlerConnector.ParameterNameMustBeARegularExpression=Parameter name must be a regular
expression
+WebcrawlerConnector.SpecifyATrustCertificateFileToUploadFirst=Specify a trust certificate
file to upload first, or check 'Trust everything'
 WebcrawlerConnector.NoBandwidthOrConnectionThrottlingSpecified=No bandwidth or connection
throttling specified
 WebcrawlerConnector.DeleteLoginPage=Delete login page #
 WebcrawlerConnector.ParameterRegularExpression=Parameter regular expression
@@ -153,7 +153,7 @@ WebcrawlerConnector.Security=Security
 WebcrawlerConnector.Metadata=Metadata
 WebcrawlerConnector.FoundAnIllegalRegularExpressionIn=Found an illegal regular expression
in
 WebcrawlerConnector.ErrorWas='.  Error was: 
-WebcrawlerConnector.TypeInAnAccessToken=\"Type in an access token\"
-WebcrawlerConnector.TypeInMetadataName=\"Type in metadata name\"
-WebcrawlerConnector.TypeInMetadataValue=\"Type in metadata value\"
+WebcrawlerConnector.TypeInAnAccessToken=Type in an access token
+WebcrawlerConnector.TypeInMetadataName=Type in metadata name
+WebcrawlerConnector.TypeInMetadataValue=Type in metadata value
 

Modified: incubator/lcf/trunk/connectors/webcrawler/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/webcrawler/common_ja_JP.properties
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/webcrawler/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/webcrawler/common_ja_JP.properties?rev=1229398&r1=1229397&r2=1229398&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/webcrawler/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/webcrawler/common_ja_JP.properties
(original)
+++ incubator/lcf/trunk/connectors/webcrawler/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/webcrawler/common_ja_JP.properties
Mon Jan  9 22:24:57 2012
@@ -106,20 +106,20 @@ WebcrawlerConnector.UserName=ユãƒ�
 WebcrawlerConnector.Password=パスワード
 WebcrawlerConnector.EmailAaddressRequired=メールアドレスを入力してください。すべてのリクエストヘッダに含まれます
 WebcrawlerConnector.MaximumConnectionsMustBeAnInteger=最大接続数には整数を入力してください
-WebcrawlerConnector.NeedAValidEmailAddress=\"正しいメールアドレスを入力してください\"
-WebcrawlerConnector.MaximumKbytesPerSecondMustBeAnInteger=\"Maximum Kbytes per second must
be an integer\"
-WebcrawlerConnector.MaximumFetchesPerMinuteMustBeAnInteger=\"Maximum fetches per minute must
be an integer\"
-WebcrawlerConnector.CredentialMustHaveNonNullUserName=\"Credential must have non-null user
name\"
-WebcrawlerConnector.MatchExpressionMustBeAValidRegularExpression=\"Match expression must
be a valid regular expression\"
-WebcrawlerConnector.ParameterMustHaveNonEmptyName=\"Parameter must have non-empty name\"
-WebcrawlerConnector.ParameterCanEitherBeHidden=\"Parameter can either be hidden or not, but
can't be both\"
-WebcrawlerConnector.MaximumKbytesPerSecondMustBeAnInteger=\"Maximum Kbytes per second must
be an integer\"
-WebcrawlerConnector.MaximumFetchesPerMinuteMustBeAnInteger=\"Maximum fetches per minute must
be an integer\"
-WebcrawlerConnector.AValidRegularExpressionIsRequired=\"A valid regular expression is required\"
-WebcrawlerConnector.CredentialMustIncludeANonNullUserName=\"Credential must include a non-null
user name\"
-WebcrawlerConnector.AValidRegularExpressionIsRequired=\"A valid regular expression is required\"
-WebcrawlerConnector.ParameterNameMustBeARegularExpression=\"Parameter name must be a regular
expression\"
-WebcrawlerConnector.SpecifyATrustCertificateFileToUploadFirst=\"Specify a trust certificate
file to upload first, or check 'Trust everything'\"
+WebcrawlerConnector.NeedAValidEmailAddress=正しいメールアドレスを入力してください
+WebcrawlerConnector.MaximumKbytesPerSecondMustBeAnInteger=Maximum Kbytes per second must
be an integer
+WebcrawlerConnector.MaximumFetchesPerMinuteMustBeAnInteger=Maximum fetches per minute must
be an integer
+WebcrawlerConnector.CredentialMustHaveNonNullUserName=Credential must have non-null user
name
+WebcrawlerConnector.MatchExpressionMustBeAValidRegularExpression=Match expression must be
a valid regular expression
+WebcrawlerConnector.ParameterMustHaveNonEmptyName=Parameter must have non-empty name
+WebcrawlerConnector.ParameterCanEitherBeHidden=Parameter can either be hidden or not, but
can't be both
+WebcrawlerConnector.MaximumKbytesPerSecondMustBeAnInteger=Maximum Kbytes per second must
be an integer
+WebcrawlerConnector.MaximumFetchesPerMinuteMustBeAnInteger=Maximum fetches per minute must
be an integer
+WebcrawlerConnector.AValidRegularExpressionIsRequired=A valid regular expression is required
+WebcrawlerConnector.CredentialMustIncludeANonNullUserName=Credential must include a non-null
user name
+WebcrawlerConnector.AValidRegularExpressionIsRequired=A valid regular expression is required
+WebcrawlerConnector.ParameterNameMustBeARegularExpression=Parameter name must be a regular
expression
+WebcrawlerConnector.SpecifyATrustCertificateFileToUploadFirst=Specify a trust certificate
file to upload first, or check 'Trust everything'
 WebcrawlerConnector.NoBandwidthOrConnectionThrottlingSpecified=No bandwidth or connection
throttling specified
 WebcrawlerConnector.DeleteLoginPage=Delete login page #
 WebcrawlerConnector.ParameterRegularExpression=Parameter regular expression
@@ -153,7 +153,7 @@ WebcrawlerConnector.Security=セã‚�
 WebcrawlerConnector.Metadata=メタデータ
 WebcrawlerConnector.FoundAnIllegalRegularExpressionIn=Found an illegal regular expression
in
 WebcrawlerConnector.ErrorWas='。エラー: 
-WebcrawlerConnector.TypeInAnAccessToken=\"アクセストークンの入力\"
-WebcrawlerConnector.TypeInMetadataName=\"メタデータ名の入力\"
-WebcrawlerConnector.TypeInMetadataValue=\"メタデータ値の入力\"
+WebcrawlerConnector.TypeInAnAccessToken=アクセストークンの入力
+WebcrawlerConnector.TypeInMetadataName=メタデータ名の入力
+WebcrawlerConnector.TypeInMetadataValue=メタデータ値の入力
 



Mime
View raw message