Return-Path: X-Original-To: apmail-incubator-connectors-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-connectors-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id EE69CBA98 for ; Fri, 6 Jan 2012 14:27:23 +0000 (UTC) Received: (qmail 15082 invoked by uid 500); 6 Jan 2012 14:27:23 -0000 Delivered-To: apmail-incubator-connectors-commits-archive@incubator.apache.org Received: (qmail 15005 invoked by uid 500); 6 Jan 2012 14:27:19 -0000 Mailing-List: contact connectors-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: connectors-dev@incubator.apache.org Delivered-To: mailing list connectors-commits@incubator.apache.org Received: (qmail 14983 invoked by uid 99); 6 Jan 2012 14:27:16 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 06 Jan 2012 14:27:16 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 06 Jan 2012 14:27:13 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id DAFD42388980; Fri, 6 Jan 2012 14:26:52 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: svn commit: r1228197 - in /incubator/lcf/trunk: ./ framework/crawler-ui/src/main/webapp/ framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/ Date: Fri, 06 Jan 2012 14:26:52 -0000 To: connectors-commits@incubator.apache.org From: kwright@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120106142652.DAFD42388980@eris.apache.org> Author: kwright Date: Fri Jan 6 14:26:51 2012 New Revision: 1228197 URL: http://svn.apache.org/viewvc?rev=1228197&view=rev Log: Fix for CONNECTORS-355, on behalf of Hitoshi Ozawa. Modified: incubator/lcf/trunk/CHANGES.txt incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/documentstatus.jsp incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/editauthority.jsp incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/editconnection.jsp incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/editjob.jsp incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/editoutput.jsp incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/listconnections.jsp incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/maxactivityreport.jsp incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/maxbandwidthreport.jsp incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/queuestatus.jsp incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/resultreport.jsp incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/simplereport.jsp incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/viewauthority.jsp incubator/lcf/trunk/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties incubator/lcf/trunk/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_ja_JP.properties Modified: incubator/lcf/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/CHANGES.txt?rev=1228197&r1=1228196&r2=1228197&view=diff ============================================================================== --- incubator/lcf/trunk/CHANGES.txt (original) +++ incubator/lcf/trunk/CHANGES.txt Fri Jan 6 14:26:51 2012 @@ -3,6 +3,9 @@ $Id$ ======================= 0.5-dev ===================== +CONNECTORS-355: Fix some remaining uninternationalized strings. +(Hitoshi Ozawa) + CONNECTORS-353: Ship .wsdd configuration files as part of connector jars rather than separate files with configuration parameters. This simplifies the building and deployment of the SharePoint and Meridio Modified: incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/documentstatus.jsp URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/documentstatus.jsp?rev=1228197&r1=1228196&r2=1228197&view=diff ============================================================================== --- incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/documentstatus.jsp (original) +++ incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/documentstatus.jsp Fri Jan 6 14:26:51 2012 @@ -43,13 +43,13 @@ boolean maintenanceUnderway = org.apache { if (!isInteger(report.rowcount.value)) { - alert("Enter a legal number for rows per page"); + alert(<%=Messages.getString(pageContext.getRequest().getLocale(),"documentstatus.EnterALegalNumberForRowsPerPage")%>); report.rowcount.focus(); return; } if (!isRegularExpression(report.statusidentifiermatch.value)) { - alert("Identifier match must be a valid regular expression"); + alert(<%=Messages.getString(pageContext.getRequest().getLocale(),"documentstatus.IdentifierMatchMustBeAValidRegularExpression")%>); report.statusidentifiermatch.focus(); return; } @@ -63,7 +63,7 @@ boolean maintenanceUnderway = org.apache { if (!isRegularExpression(report.statusidentifiermatch.value)) { - alert("Identifier match must be a valid regular expression"); + alert(<%=Messages.getString(pageContext.getRequest().getLocale(),"documentstatus.IdentifierMatchMustBeAValidRegularExpression")%>); report.statusidentifiermatch.focus(); return; } Modified: incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/editauthority.jsp URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/editauthority.jsp?rev=1228197&r1=1228196&r2=1228197&view=diff ============================================================================== --- incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/editauthority.jsp (original) +++ incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/editauthority.jsp Fri Jan 6 14:26:51 2012 @@ -140,7 +140,7 @@ // Check our part of the form, for save if (editconnection.connname.value == "") { - alert("Connection must have a name"); + alert(<%=Messages.getString(pageContext.getRequest().getLocale(),"editauthority.ConnectionMustHaveAName")%>); SelectTab(Messages.getString(pageContext.getRequest().getLocale(),"editauthority.Name")); document.editconnection.connname.focus(); return; @@ -180,7 +180,7 @@ { if (!isInteger(editconnection.maxconnections.value)) { - alert("The maximum number of connections must be a valid integer"); + alert(<%=Messages.getString(pageContext.getRequest().getLocale(),"editauthority.TheMaximumNumberOfConnectionsMustBeAValidInteger")%>); editconnection.maxconnections.focus(); return false; } @@ -233,7 +233,7 @@ { %>

Edit Authority Connection

-
No authority connectors registered
+
<%=Messages.getString(pageContext.getRequest().getLocale(),"editauthority.NoAuthorityConnectorsRegistered")%>
<% } else Modified: incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/editconnection.jsp URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/editconnection.jsp?rev=1228197&r1=1228196&r2=1228197&view=diff ============================================================================== --- incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/editconnection.jsp (original) +++ incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/editconnection.jsp Fri Jan 6 14:26:51 2012 @@ -158,8 +158,8 @@ // Check our part of the form, for save if (editconnection.connname.value == "") { - alert("Connection must have a name"); - SelectTab(Messages.getString(pageContext.getRequest().getLocale(),"editconnection.Name")); + alert(<%=Messages.getString(pageContext.getRequest().getLocale(),"editconnection.ConnectionMustHaveAName")%>); + SelectTab(<%=Messages.getString(pageContext.getRequest().getLocale(),"editconnection.Name")%>); document.editconnection.connname.focus(); return; } @@ -196,13 +196,13 @@ { if (!isInteger(editconnection.throttlevalue.value)) { - alert("Throttle rate must be an integer"); + alert(<%=Messages.getString(pageContext.getRequest().getLocale(),"editconnection.ThrottleRateMustBeAnInteger")%>); document.editconnection.throttlevalue.focus(); return; } if (!isRegularExpression(editconnection.throttle.value)) { - alert("The throttle expression must be a valid regular expression"); + alert(<%=Messages.getString(pageContext.getRequest().getLocale(),"editconnection.TheThrottleExpressionMustBeAValidRegularExpression")%>); editconnection.throttle.focus(); return; } @@ -223,7 +223,7 @@ { if (!isInteger(editconnection.maxconnections.value)) { - alert("The maximum number of connections must be a valid integer"); + alert(<%=Messages.getString(pageContext.getRequest().getLocale(),"editconnection.TheMaximumNumberOfConnectionsMustBeAValidInteger")%>); editconnection.maxconnections.focus(); return false; } @@ -271,8 +271,8 @@ if (set.getRowCount() == 0) { %> -

Edit Repository Connection

-
No repository connectors registered
+

<%=Messages.getString(pageContext.getRequest().getLocale(),"editconnection.EditRepositoryConnection")%>

+
<%=Messages.getString(pageContext.getRequest().getLocale(),"editconnection.NoRepositoryConnectorsRegistered")%>
<% } else Modified: incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/editjob.jsp URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/editjob.jsp?rev=1228197&r1=1228196&r2=1228197&view=diff ============================================================================== --- incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/editjob.jsp (original) +++ incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/editjob.jsp Fri Jan 6 14:26:51 2012 @@ -223,8 +223,8 @@ // Check our part of the form, for save if (editjob.description.value == "") { - alert("Job must have a name"); - SelectTab(Messages.getString(pageContext.getRequest().getLocale(),"editjob.Name")); + alert(<%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.JobMustHaveAName")%>); + SelectTab(<%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.Name")%>); document.editjob.description.focus(); return; } @@ -259,7 +259,7 @@ { if (editjob.duration.value != "" && !isInteger(editjob.duration.value)) { - alert("Duration must be a valid integer"); + alert(<%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.DurationMustBeAValidInteger")%>); editjob.duration.focus(); return; } @@ -310,7 +310,7 @@ var propertyname = "duration" + i; if (eval("editjob."+propertyname+".value") != "" && !isInteger(eval("editjob."+propertyname+".value"))) { - alert("Duration must be a valid integer"); + alert(<%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.DurationMustBeAValidInteger")%>); eval("editjob."+propertyname+".focus()"); return false; } @@ -323,7 +323,7 @@ { if (editjob.recrawlinterval.value != "" && !isInteger(editjob.recrawlinterval.value)) { - alert("Recrawl interval must be a valid integer or null"); + alert(<%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.RecrawlIntervalMustBeAValidIntegerOrNull")%>); editjob.recrawlinterval.focus(); return false; } @@ -334,7 +334,7 @@ { if (editjob.reseedinterval.value != "" && !isInteger(editjob.reseedinterval.value)) { - alert("Reseed interval must be a valid integer or null"); + alert(<%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.ReseedIntervalMustBeAValidIntegerOrNull")%>); editjob.reseedinterval.focus(); return false; } @@ -345,7 +345,7 @@ { if (editjob.expirationinterval.value != "" && !isInteger(editjob.expirationinterval.value)) { - alert("Expiration interval must be a valid integer or null"); + alert(<%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.ExpirationIntervalMustBeAValidIntegerOrNull")%>); editjob.expirationinterval.focus(); return false; } @@ -865,7 +865,7 @@ - " onClick='<%="Javascript:RemoveSchedule("+Integer.toString(l)+")"%>' alt='<%="Remove schedule record #"+Integer.toString(l)%>'/> + " onClick='<%="Javascript:RemoveSchedule("+Integer.toString(l)+")"%>' alt='<%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.RemoveScheduleRecord")+Integer.toString(l)%>'/> Modified: incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/editoutput.jsp URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/editoutput.jsp?rev=1228197&r1=1228196&r2=1228197&view=diff ============================================================================== --- incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/editoutput.jsp (original) +++ incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/editoutput.jsp Fri Jan 6 14:26:51 2012 @@ -141,8 +141,8 @@ // Check our part of the form, for save if (editconnection.connname.value == "") { - alert("Connection must have a name"); - SelectTab(Messages.getString(pageContext.getRequest().getLocale(),"editoutput.Name")); + alert(<%=Messages.getString(pageContext.getRequest().getLocale(),"editoutput.ConnectionMustHaveAName")%>); + SelectTab(<%=Messages.getString(pageContext.getRequest().getLocale(),"editoutput.Name")%>); document.editconnection.connname.focus(); return; } @@ -181,7 +181,7 @@ { if (!isInteger(editconnection.maxconnections.value)) { - alert("The maximum number of connections must be a valid integer"); + alert(<%=Messages.getString(pageContext.getRequest().getLocale(),"editoutput.TheMaximumNumberOfConnectionsMustBeAValidInteger")%>); editconnection.maxconnections.focus(); return false; } Modified: incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/listconnections.jsp URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/listconnections.jsp?rev=1228197&r1=1228196&r2=1228197&view=diff ============================================================================== --- incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/listconnections.jsp (original) +++ incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/listconnections.jsp Fri Jan 6 14:26:51 2012 @@ -37,7 +37,7 @@ function Delete(connectionName) { - if (confirm("Delete connection '"+connectionName+"'?")) + if (confirm(<%=Messages.getString(pageContext.getRequest().getLocale(),"listconnections.DeleteConnection")%>+connectionName+"'?")) { document.listconnections.op.value="Delete"; document.listconnections.connname.value=connectionName; @@ -112,7 +112,7 @@
- <%=Messages.getString(pageContext.getRequest().getLocale(),"listconnections.AddNewConnection")%> + ><%=Messages.getString(pageContext.getRequest().getLocale(),"listconnections.AddNewConnection")%> <% Modified: incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/maxactivityreport.jsp URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/maxactivityreport.jsp?rev=1228197&r1=1228196&r2=1228197&view=diff ============================================================================== --- incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/maxactivityreport.jsp (original) +++ incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/maxactivityreport.jsp Fri Jan 6 14:26:51 2012 @@ -41,43 +41,43 @@ boolean maintenanceUnderway = org.apache { if (!isInteger(report.rowcount.value)) { - alert("Enter a legal number for rows per page"); + alert(<%=Messages.getString(pageContext.getRequest().getLocale(),"maxactivityreport.EnterALegalNumberForRowsPerPage")%>); report.rowcount.focus(); return; } if (!isInteger(report.reportinterval.value)) { - alert("Enter a legal interval size, in minutes"); + alert(<%=Messages.getString(pageContext.getRequest().getLocale(),"maxactivityreport.EnterALegalIntervalSizeInMinutes")%>); report.reportinterval.focus(); return; } if (report.reportbucketdesc.value == "") { - alert("Identifier class description cannot be empty"); + alert(<%=Messages.getString(pageContext.getRequest().getLocale(),"maxactivityreport.IdentifierClassDescriptionCannotBeEmpty")%>); report.reportbucketdesc.focus(); return; } if (!isRegularExpression(report.reportbucketdesc.value)) { - alert("Identifier class description must be a valid regular expression"); + alert(<%=Messages.getString(pageContext.getRequest().getLocale(),"maxactivityreport.IdentifierClassDescriptionMustBeABalidRegularExpression")%>); report.reportbucketdesc.focus(); return; } if (report.reportbucketdesc.value.indexOf("(") == -1 || report.reportbucketdesc.value.indexOf(")") == -1) { - alert("Identifier class description must delimit a class with parentheses ('(' and ')')"); + alert(<%=Messages.getString(pageContext.getRequest().getLocale(),"maxactivityreport.IdentifierClassDescriptionMustDelimitAClassWithParentheses")%>); report.reportbucketdesc.focus(); return; } if (!isRegularExpression(report.reportentitymatch.value)) { - alert("Entity match must be a valid regular expression"); + alert(<%=Messages.getString(pageContext.getRequest().getLocale(),"maxactivityreport.EntityMatchMustBeAValidRegularExpression")%>); report.reportentitymatch.focus(); return; } if (!isRegularExpression(report.reportresultcodematch.value)) { - alert("Result code match must be a valid regular expression"); + alert(<%=Messages.getString(pageContext.getRequest().getLocale(),"maxactivityreport.ResultCodeMatchMustBeAValidRegularExpression")%>); report.reportresultcodematch.focus(); return; } @@ -91,25 +91,25 @@ boolean maintenanceUnderway = org.apache { if (!isRegularExpression(report.reportentitymatch.value)) { - alert("Entity match must be a valid regular expression"); + alert(<%=Messages.getString(pageContext.getRequest().getLocale(),"maxactivityreport.EntityMatchMustBeAValidRegularExpression")%>); report.reportentitymatch.focus(); return; } if (!isRegularExpression(report.reportresultcodematch.value)) { - alert("Result code match must be a valid regular expression"); + alert(<%=Messages.getString(pageContext.getRequest().getLocale(),"maxactivityreport.ResultCodeMatchMustBeAValidRegularExpression")%>); report.reportresultcodematch.focus(); return; } if (!isRegularExpression(report.reportbucketdesc.value)) { - alert("Identifier class description must be a valid regular expression"); + alert(<%=Messages.getString(pageContext.getRequest().getLocale(),"maxactivityreport.IdentifierClassDescriptionMustBeAValidRegularExpression")%>); report.reportbucketdesc.focus(); return; } if (report.reportbucketdesc.value.indexOf("(") == -1 || report.reportbucketdesc.value.indexOf(")") == -1) { - alert("Identifier class description must delimit a class with parentheses ('(' and ')')"); + alert(<%=Messages.getString(pageContext.getRequest().getLocale(),"maxactivityreport.IdentifierClassDescriptionMustDelimitAClassWithParentheses")%>); report.reportbucketdesc.focus(); return; } Modified: incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/maxbandwidthreport.jsp URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/maxbandwidthreport.jsp?rev=1228197&r1=1228196&r2=1228197&view=diff ============================================================================== --- incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/maxbandwidthreport.jsp (original) +++ incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/maxbandwidthreport.jsp Fri Jan 6 14:26:51 2012 @@ -41,43 +41,43 @@ boolean maintenanceUnderway = org.apache { if (!isInteger(report.rowcount.value)) { - alert("Enter a legal number for rows per page"); + alert(<%=Messages.getString(pageContext.getRequest().getLocale(),"maxbandwidthreport.EnterALegalNumberForRowsPerPage")%>); report.rowcount.focus(); return; } if (!isInteger(report.reportinterval.value)) { - alert("Enter a legal interval size, in minutes"); + alert(<%=Messages.getString(pageContext.getRequest().getLocale(),"maxbandwidthreport.EnterALegalIntervalSizeInMinutes")%>); report.reportinterval.focus(); return; } if (report.reportbucketdesc.value == "") { - alert("Identifier class description cannot be empty"); + alert(<%=Messages.getString(pageContext.getRequest().getLocale(),"maxbandwidthreport.IdentifierClassDescriptionCannotBeEmpty")%>); report.reportbucketdesc.focus(); return; } if (!isRegularExpression(report.reportbucketdesc.value)) { - alert("Identifier class description must be a valid regular expression"); + alert(<%=Messages.getString(pageContext.getRequest().getLocale(),"maxbandwidthreport.IdentifierClassDescriptionMustBeAValidRegularExpression")%>); report.reportbucketdesc.focus(); return; } if (report.reportbucketdesc.value.indexOf("(") == -1 || report.reportbucketdesc.value.indexOf(")") == -1) { - alert("Identifier class description must delimit a class with parentheses ('(' and ')')"); + alert(<%=Messages.getString(pageContext.getRequest().getLocale(),"maxbandwidthreport.IdentifierClassDescriptionMustDelimitAClassWithParentheses")%>); report.reportbucketdesc.focus(); return; } if (!isRegularExpression(report.reportentitymatch.value)) { - alert("Entity match must be a valid regular expression"); + alert(<%=Messages.getString(pageContext.getRequest().getLocale(),"maxbandwidthreport.EntityMatchMustBeAValidRegularExpression")%>); report.reportentitymatch.focus(); return; } if (!isRegularExpression(report.reportresultcodematch.value)) { - alert("Result code match must be a valid regular expression"); + alert(<%=Messages.getString(pageContext.getRequest().getLocale(),"maxbandwidthreport.ResultCodeMatchMustBeAValidRegularExpression")%>); report.reportresultcodematch.focus(); return; } @@ -91,25 +91,25 @@ boolean maintenanceUnderway = org.apache { if (!isRegularExpression(report.reportentitymatch.value)) { - alert("Entity match must be a valid regular expression"); + alert(<%=Messages.getString(pageContext.getRequest().getLocale(),"maxbandwidthreport.EntityMatchMustBeAValidRegularExpression")%>); report.reportentitymatch.focus(); return; } if (!isRegularExpression(report.reportresultcodematch.value)) { - alert("Result code match must be a valid regular expression"); + alert(<%=Messages.getString(pageContext.getRequest().getLocale(),"maxbandwidthreport.ResultCodeMatchMustBeAValidRegularExpression")%>); report.reportresultcodematch.focus(); return; } if (!isRegularExpression(report.reportbucketdesc.value)) { - alert("Identifier class description must be a valid regular expression"); + alert(<%=Messages.getString(pageContext.getRequest().getLocale(),"maxbandwidthreport.IdentifierClassDescriptionMustBeAValidRegularExpression")%>); report.reportbucketdesc.focus(); return; } if (report.reportbucketdesc.value.indexOf("(") == -1 || report.reportbucketdesc.value.indexOf(")") == -1) { - alert("Identifier class description must delimit a class with parentheses ('(' and ')')"); + alert(<%=Messages.getString(pageContext.getRequest().getLocale(),"maxbandwidthreport.IdentifierClassDescriptionMustDelimitAClassWithParentheses")%>); report.reportbucketdesc.focus(); return; } Modified: incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/queuestatus.jsp URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/queuestatus.jsp?rev=1228197&r1=1228196&r2=1228197&view=diff ============================================================================== --- incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/queuestatus.jsp (original) +++ incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/queuestatus.jsp Fri Jan 6 14:26:51 2012 @@ -42,31 +42,31 @@ boolean maintenanceUnderway = org.apache { if (report.statusbucketdesc.value == "") { - alert("Identifier class description cannot be empty"); + alert(<%=Messages.getString(pageContext.getRequest().getLocale(),"queuestatus.IdentifierClassDescriptionCannotBeEmpty")%>); report.statusbucketdesc.focus(); return; } if (!isRegularExpression(report.statusbucketdesc.value)) { - alert("Identifier class description must be a valid regular expression"); + alert(<%=Messages.getString(pageContext.getRequest().getLocale(),"queuestatus.IdentifierClassDescriptionMustBeAValidRegularExpression")%>); report.statusbucketdesc.focus(); return; } if (report.statusbucketdesc.value.indexOf("(") == -1 || report.statusbucketdesc.value.indexOf(")") == -1) { - alert("Identifier class description must delimit a class with parentheses ('(' and ')')"); + alert(<%=Messages.getString(pageContext.getRequest().getLocale(),"queuestatus.IdentifierClassDescriptionMustDelimitAClassWithParentheses")%>); report.statusbucketdesc.focus(); return; } if (!isInteger(report.rowcount.value)) { - alert("Enter a legal number for rows per page"); + alert(<%=Messages.getString(pageContext.getRequest().getLocale(),"queuestatus.EnterALegalNumberForRowsPerPage")%>); report.rowcount.focus(); return; } if (!isRegularExpression(report.statusidentifiermatch.value)) { - alert("Identifier match must be a valid regular expression"); + alert(<%=Messages.getString(pageContext.getRequest().getLocale(),"queuestatus.IdentifierMatchMustBeAValidRegularExpression")%>); report.statusidentifiermatch.focus(); return; } @@ -80,25 +80,25 @@ boolean maintenanceUnderway = org.apache { if (report.statusbucketdesc.value == "") { - alert("Identifier class description cannot be empty"); + alert(<%=Messages.getString(pageContext.getRequest().getLocale(),"queuestatus.IdentifierClassDescriptionCannotBeEmpty")%>); report.statusbucketdesc.focus(); return; } if (!isRegularExpression(report.statusbucketdesc.value)) { - alert("Identifier class description must be a valid regular expression"); + alert(<%=Messages.getString(pageContext.getRequest().getLocale(),"queuestatus.IdentifierClassDescriptionMustBeAValidRegularExpression")%>); report.statusbucketdesc.focus(); return; } if (report.statusbucketdesc.value.indexOf("(") == -1 || report.statusbucketdesc.value.indexOf(")") == -1) { - alert("Identifier class description must delimit a class with parentheses ('(' and ')')"); + alert(<%=Messages.getString(pageContext.getRequest().getLocale(),"queuestatus.IdentifierClassDescriptionMustDelimitAClassWithParentheses")%>); report.statusbucketdesc.focus(); return; } if (!isRegularExpression(report.statusidentifiermatch.value)) { - alert("Identifier match must be a valid regular expression"); + alert(<%=Messages.getString(pageContext.getRequest().getLocale(),"queuestatus.IdentifierMatchMustBeAValidRegularExpression")%>); report.statusidentifiermatch.focus(); return; } Modified: incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/resultreport.jsp URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/resultreport.jsp?rev=1228197&r1=1228196&r2=1228197&view=diff ============================================================================== --- incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/resultreport.jsp (original) +++ incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/resultreport.jsp Fri Jan 6 14:26:51 2012 @@ -41,60 +41,60 @@ boolean maintenanceUnderway = org.apache { if (!isInteger(report.rowcount.value)) { - alert("Enter a legal number for rows per page"); + alert(<%=Messages.getString(pageContext.getRequest().getLocale(),"resultreport.EnterALegalNumberForRowsPerPage")%>); report.rowcount.focus(); return; } if (report.reportbucketdesc.value == "") { - alert("Identifier class description cannot be empty"); + alert(<%=Messages.getString(pageContext.getRequest().getLocale(),"resultreport.IdentifierClassDescriptionCannotBeEmpty")%>); report.reportbucketdesc.focus(); return; } if (report.reportresultdesc.value == "") { - alert("Result class description cannot be empty"); + alert(<%=Messages.getString(pageContext.getRequest().getLocale(),"resultreport.ResultClassDescriptionCannotBeEmpty")%>); report.reportresultdesc.focus(); return; } if (!isRegularExpression(report.reportbucketdesc.value)) { - alert("Identifier class description must be a valid regular expression"); + alert(<%=Messages.getString(pageContext.getRequest().getLocale(),"resultreport.IdentifierClassDescriptionMustBeAValidRegularExpression")%>); report.reportbucketdesc.focus(); return; } if (!isRegularExpression(report.reportresultdesc.value)) { - alert("Result class description must be a valid regular expression"); + alert(<%=Messages.getString(pageContext.getRequest().getLocale(),"resultreport.ResultClassDescriptionMustBeAValidRegularExpression")%>); report.reportresultdesc.focus(); return; } if (report.reportbucketdesc.value.indexOf("(") == -1 || report.reportbucketdesc.value.indexOf(")") == -1) { - alert("Identifier class description must delimit a class with parentheses ('(' and ')')"); + alert(<%=Messages.getString(pageContext.getRequest().getLocale(),"resultreport.IdentifierClassDescriptionMustDelimitAClassWithParentheses")%>); report.reportbucketdesc.focus(); return; } if (report.reportresultdesc.value.indexOf("(") == -1 || report.reportresultdesc.value.indexOf(")") == -1) { - alert("Result class description must delimit a class with parentheses ('(' and ')')"); + alert(<%=Messages.getString(pageContext.getRequest().getLocale(),"resultreport.ResultClassDescriptionMustDelimitAClassWithParentheses")%>); report.reportresultdesc.focus(); return; } if (!isRegularExpression(report.reportentitymatch.value)) { - alert("Entity match must be a valid regular expression"); + alert(<%=Messages.getString(pageContext.getRequest().getLocale(),"resultreport.EntityMatchMustBeAValidRegularExpression")%>); report.reportentitymatch.focus(); return; } if (!isRegularExpression(report.reportresultcodematch.value)) { - alert("Result code match must be a valid regular expression"); + alert(<%=Messages.getString(pageContext.getRequest().getLocale(),"resultreport.ResultCodeMatchMustBeAValidRegularExpression")%>); report.reportresultcodematch.focus(); return; } @@ -108,37 +108,37 @@ boolean maintenanceUnderway = org.apache { if (!isRegularExpression(report.reportentitymatch.value)) { - alert("Entity match must be a valid regular expression"); + alert(<%=Messages.getString(pageContext.getRequest().getLocale(),"resultreport.EntityMatchMustBeAValidRegularExpression")%>); report.reportentitymatch.focus(); return; } if (!isRegularExpression(report.reportresultcodematch.value)) { - alert("Result code match must be a valid regular expression"); + alert(<%=Messages.getString(pageContext.getRequest().getLocale(),"resultreport.ResultCodeMatchMustBeAValidRegularExpression")%>); report.reportresultcodematch.focus(); return; } if (!isRegularExpression(report.reportbucketdesc.value)) { - alert("Identifier class description must be a valid regular expression"); + alert(<%=Messages.getString(pageContext.getRequest().getLocale(),"resultreport.IdentifierClassDescriptionMustBeAValidRegularExpression")%>); report.reportbucketdesc.focus(); return; } if (!isRegularExpression(report.reportresultdesc.value)) { - alert("Result class description must be a valid regular expression"); + alert(<%=Messages.getString(pageContext.getRequest().getLocale(),"resultreport.ResultClassDescriptionMustBeAValidRegularExpression")%>); report.reportresultdesc.focus(); return; } if (report.reportbucketdesc.value.indexOf("(") == -1 || report.reportbucketdesc.value.indexOf(")") == -1) { - alert("Identifier class description must delimit a class with parentheses ('(' and ')')"); + alert(<%=Messages.getString(pageContext.getRequest().getLocale(),"resultreport.IdentifierClassDescriptionMustDelimitAClassWithParentheses")%>); report.reportbucketdesc.focus(); return; } if (report.reportresultdesc.value.indexOf("(") == -1 || report.reportresultdesc.value.indexOf(")") == -1) { - alert("Result class description must delimit a class with parentheses ('(' and ')')"); + alert(<%=Messages.getString(pageContext.getRequest().getLocale(),"resultreport.ResultClassDescriptionMustDelimitAClassWithParentheses")%>); report.reportresultdesc.focus(); return; } Modified: incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/simplereport.jsp URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/simplereport.jsp?rev=1228197&r1=1228196&r2=1228197&view=diff ============================================================================== --- incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/simplereport.jsp (original) +++ incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/simplereport.jsp Fri Jan 6 14:26:51 2012 @@ -42,19 +42,19 @@ boolean maintenanceUnderway = org.apache { if (!isInteger(report.rowcount.value)) { - alert("Enter a legal number for rows per page"); + alert(<%=Messages.getString(pageContext.getRequest().getLocale(),"simplereport.EnterALegalNumberForRowsPerPage")%>); report.rowcount.focus(); return; } if (!isRegularExpression(report.reportentitymatch.value)) { - alert("Entity match must be a valid regular expression"); + alert(<%=Messages.getString(pageContext.getRequest().getLocale(),"simplereport.EntityMatchMustBeAValidRegularExpression")%>); report.reportentitymatch.focus(); return; } if (!isRegularExpression(report.reportresultcodematch.value)) { - alert("Result code match must be a valid regular expression"); + alert(<%=Messages.getString(pageContext.getRequest().getLocale(),"simplereport.ResultCodeMatchMustBeAValidRegularExpression")%>); report.reportresultcodematch.focus(); return; } @@ -68,13 +68,13 @@ boolean maintenanceUnderway = org.apache { if (!isRegularExpression(report.reportentitymatch.value)) { - alert("Entity match must be a valid regular expression"); + alert(<%=Messages.getString(pageContext.getRequest().getLocale(),"simplereport.EntityMatchMustBeAValidRegularExpression")%>); report.reportentitymatch.focus(); return; } if (!isRegularExpression(report.reportresultcodematch.value)) { - alert("Result code match must be a valid regular expression"); + alert(<%=Messages.getString(pageContext.getRequest().getLocale(),"simplereport.ResultCodeMatchMustBeAValidRegularExpression")%>); report.reportresultcodematch.focus(); return; } Modified: incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/viewauthority.jsp URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/viewauthority.jsp?rev=1228197&r1=1228196&r2=1228197&view=diff ============================================================================== --- incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/viewauthority.jsp (original) +++ incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/viewauthority.jsp Fri Jan 6 14:26:51 2012 @@ -29,7 +29,7 @@ - Apache ManifoldCF: View Authority Connection Status + <%=Messages.getString(pageContext.getRequest().getLocale(),"viewauthority.ApacheManifoldCFViewAuthorityConnectionStatus")%>