manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1537536 - in /manifoldcf/branches/CONNECTORS-553/connectors/email/connector/src/main: native2ascii/org/apache/manifoldcf/crawler/connectors/email/ resources/org/apache/manifoldcf/crawler/connectors/email/
Date Thu, 31 Oct 2013 15:48:51 GMT
Author: kwright
Date: Thu Oct 31 15:48:51 2013
New Revision: 1537536

URL: http://svn.apache.org/r1537536
Log:
Fix the text for configuration to make more sense.

Modified:
    manifoldcf/branches/CONNECTORS-553/connectors/email/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/email/common_en_US.properties
    manifoldcf/branches/CONNECTORS-553/connectors/email/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/email/common_ja_JP.properties
    manifoldcf/branches/CONNECTORS-553/connectors/email/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/email/ConfigurationHeader.js
    manifoldcf/branches/CONNECTORS-553/connectors/email/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/email/ConfigurationView.html
    manifoldcf/branches/CONNECTORS-553/connectors/email/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/email/Configuration_Server.html

Modified: manifoldcf/branches/CONNECTORS-553/connectors/email/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/email/common_en_US.properties
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-553/connectors/email/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/email/common_en_US.properties?rev=1537536&r1=1537535&r2=1537536&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-553/connectors/email/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/email/common_en_US.properties
(original)
+++ manifoldcf/branches/CONNECTORS-553/connectors/email/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/email/common_en_US.properties
Thu Oct 31 15:48:51 2013
@@ -17,12 +17,14 @@ EmailConnector.Server=Server
 EmailConnector.Metadata=Metadata
 EmailConnector.Filter=Filter
 
-EmailConnector.EnterAMailServerURL=Enter a mail server URL
+EmailConnector.EnterAMailServerHostName=Enter a mail server host name
+EmailConnector.PleaseSelectAConfigurationParameterName=Please select a configuration parameter
name
 EmailConnector.PleaseSelectAMetadataName=Please select a metadata name
 EmailConnector.ValueCannotBeBlank=Value cannot be blank
 
+EmailConnector.ConfigurationPropertiesColon=Configuration properties:
 EmailConnector.ProtocolColon=Protocol:
-EmailConnector.EmailServerURLColon=Email server URL:
+EmailConnector.HostNameColon=Host name:
 EmailConnector.PortColon=Port:
 EmailConnector.UserNameColon=User name:
 EmailConnector.PasswordColon=Password:
@@ -31,8 +33,10 @@ EmailConnector.ServerProperty=Server pro
 EmailConnector.Value=Value
 EmailConnector.NoServerPropertiesSpecified=No server properties specified
 EmailConnector.AddNewMatch=Add new match
+EmailConnector.AddNewProperty=Add new property
 EmailConnector.Add=Add
 EmailConnector.DeleteMatchNumber=Delete match #
+EmailConnector.DeletePropertyNumber=Delete property #
 EmailConnector.Delete=Delete
 EmailConnector.MetadataName=Metadata name
 EmailConnector.NoMetadataSpecified=No metadata specified

Modified: manifoldcf/branches/CONNECTORS-553/connectors/email/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/email/common_ja_JP.properties
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-553/connectors/email/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/email/common_ja_JP.properties?rev=1537536&r1=1537535&r2=1537536&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-553/connectors/email/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/email/common_ja_JP.properties
(original)
+++ manifoldcf/branches/CONNECTORS-553/connectors/email/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/email/common_ja_JP.properties
Thu Oct 31 15:48:51 2013
@@ -17,12 +17,14 @@ EmailConnector.Server=Server
 EmailConnector.Metadata=Metadata
 EmailConnector.Filter=Filter
 
-EmailConnector.EnterAMailServerURL=Enter a mail server URL
+EmailConnector.EnterAMailServerHostName=Enter a mail server host name
+EmailConnector.PleaseSelectAConfigurationParameterName=Please select a configuration parameter
name
 EmailConnector.PleaseSelectAMetadataName=Please select a metadata name
 EmailConnector.ValueCannotBeBlank=Value cannot be blank
 
+EmailConnector.ConfigurationPropertiesColon=Configuration properties:
 EmailConnector.ProtocolColon=Protocol:
-EmailConnector.EmailServerURLColon=Email server URL:
+EmailConnector.HostNameColon=Host name:
 EmailConnector.PortColon=Port:
 EmailConnector.UserNameColon=User name:
 EmailConnector.PasswordColon=Password:
@@ -31,8 +33,10 @@ EmailConnector.ServerProperty=Server pro
 EmailConnector.Value=Value
 EmailConnector.NoServerPropertiesSpecified=No server properties specified
 EmailConnector.AddNewMatch=Add new match
+EmailConnector.AddNewProperty=Add new property
 EmailConnector.Add=Add
 EmailConnector.DeleteMatchNumber=Delete match #
+EmailConnector.DeletePropertyNumber=Delete property #
 EmailConnector.Delete=Delete
 EmailConnector.MetadataName=Metadata name
 EmailConnector.NoMetadataSpecified=No metadata specified

Modified: manifoldcf/branches/CONNECTORS-553/connectors/email/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/email/ConfigurationHeader.js
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-553/connectors/email/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/email/ConfigurationHeader.js?rev=1537536&r1=1537535&r2=1537536&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-553/connectors/email/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/email/ConfigurationHeader.js
(original)
+++ manifoldcf/branches/CONNECTORS-553/connectors/email/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/email/ConfigurationHeader.js
Thu Oct 31 15:48:51 2013
@@ -21,7 +21,7 @@ function checkConfigForSave()
 {
   if (editconnection.server.value == "")
   {
-    alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('EmailConnector.EnterAMailServerURL'))");
+    alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('EmailConnector.EnterAMailServerHostName'))");
     SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('EmailConnector.Server'))");
     editconnection.server.focus();
     return false;
@@ -49,7 +49,7 @@ function FindAdd(n)
 {
   if (editconnection.findname.value == "")
   {
-    alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('EmailConnector.PleaseSelectAMetadataName'))");
+    alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('EmailConnector.PleaseSelectAConfigurationParameterName'))");
     editconnection.findname.focus();
     return;
   }

Modified: manifoldcf/branches/CONNECTORS-553/connectors/email/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/email/ConfigurationView.html
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-553/connectors/email/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/email/ConfigurationView.html?rev=1537536&r1=1537535&r2=1537536&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-553/connectors/email/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/email/ConfigurationView.html
(original)
+++ manifoldcf/branches/CONNECTORS-553/connectors/email/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/email/ConfigurationView.html
Thu Oct 31 15:48:51 2013
@@ -16,54 +16,59 @@ limitations under the License.
 -->
 
 <table class="displaytable">
+  
   <tr>
     <td class="description">
-      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('EmailConnector.UserNameColon'))</nobr>
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('EmailConnector.ProtocolColon'))</nobr>
     </td>
     <td class="value">
-      <nobr>$Encoder.bodyEscape($USERNAME)</nobr>
+      <nobr>$Encoder.bodyEscape($PROTOCOL)</nobr>
     </td>
   </tr>
   
   <tr>
     <td class="description">
-      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('EmailConnector.PasswordColon'))</nobr>
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('EmailConnector.HostNameColon'))</nobr>
     </td>
     <td class="value">
-      <nobr>********</nobr>
+      <nobr>$Encoder.bodyEscape($SERVER)</nobr>
     </td>
   </tr>
   
   <tr>
     <td class="description">
-      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('EmailConnector.ProtocolColon'))</nobr>
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('EmailConnector.PortColon'))</nobr>
     </td>
     <td class="value">
-      <nobr>$Encoder.bodyEscape($PROTOCOL)</nobr>
+      <nobr>$Encoder.bodyEscape($PORT)</nobr>
     </td>
   </tr>
+
+  <tr><td  class="separator" colspan="2"><hr/></td></tr>
   
   <tr>
     <td class="description">
-      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('EmailConnector.EmailServerURLColon'))</nobr>
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('EmailConnector.UserNameColon'))</nobr>
     </td>
     <td class="value">
-      <nobr>$Encoder.bodyEscape($SERVER)</nobr>
+      <nobr>$Encoder.bodyEscape($USERNAME)</nobr>
     </td>
   </tr>
   
   <tr>
     <td class="description">
-      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('EmailConnector.PortColon'))</nobr>
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('EmailConnector.PasswordColon'))</nobr>
     </td>
     <td class="value">
-      <nobr>$Encoder.bodyEscape($PORT)</nobr>
+      <nobr>********</nobr>
     </td>
   </tr>
-  
+
+  <tr><td  class="separator" colspan="2"><hr/></td></tr>
+
   <tr>
     <td class="description">
-      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('EmailConnector.MatchesColon'))</nobr>
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('EmailConnector.ConfigurationPropertiesColon'))</nobr>
     </td>
     <td class="value">
 #foreach( $property in $PROPERTIES )
@@ -75,5 +80,6 @@ limitations under the License.
 
     </td>
   </tr>
+  
 </table>
 

Modified: manifoldcf/branches/CONNECTORS-553/connectors/email/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/email/Configuration_Server.html
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-553/connectors/email/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/email/Configuration_Server.html?rev=1537536&r1=1537535&r2=1537536&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-553/connectors/email/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/email/Configuration_Server.html
(original)
+++ manifoldcf/branches/CONNECTORS-553/connectors/email/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/email/Configuration_Server.html
Thu Oct 31 15:48:51 2013
@@ -41,7 +41,7 @@ limitations under the License.
   
   <tr>
     <td class="description">
-      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('EmailConnector.EmailServerURLColon'))</nobr>
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('EmailConnector.HostNameColon'))</nobr>
     </td>
     <td class="value">
       <input id="server" name="server" type="text" size="32" value="$Encoder.attributeEscape($SERVER)"/>
@@ -56,7 +56,9 @@ limitations under the License.
       <input type="text" id="port" name="port" value="$Encoder.attributeEscape($PORT)"/>
     </td>
   </tr>
-  
+
+  <tr><td class="separator" colspan="2"><hr/></td></tr>
+
   <tr>
     <td class="description">
       <nobr>$Encoder.bodyEscape($ResourceBundle.getString('EmailConnector.UserNameColon'))</nobr>
@@ -74,10 +76,12 @@ limitations under the License.
       <input type="password" id="password" name="password" value="$Encoder.attributeEscape($PASSWORD)"/>
     </td>
   </tr>
-  
+
+  <tr><td class="separator" colspan="2"><hr/></td></tr>
+
   <tr>
     <td class="description">
-      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('EmailConnector.MatchesColon'))</nobr>
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('EmailConnector.ConfigurationPropertiesColon'))</nobr>
     </td>
     <td class="boxcell">
       <table class="formtable">
@@ -104,7 +108,7 @@ limitations under the License.
             <input type="hidden" name="findname_$k" value="$Encoder.attributeEscape($property.get('name'))"/>
             <input type="hidden" name="findvalue_$k" value="$Encoder.attributeEscape($property.get('value'))"/>
             <a name="find_$k">
-              <input type="button" value="$Encoder.attributeEscape($ResourceBundle.getString('EmailConnector.Delete'))"
onClick='Javascript:FindDelete("$k")' alt="$Encoder.attributeEscape($ResourceBundle.getString('EmailConnector.DeleteMatchNumber'))$k"/>
+              <input type="button" value="$Encoder.attributeEscape($ResourceBundle.getString('EmailConnector.Delete'))"
onClick='Javascript:FindDelete("$k")' alt="$Encoder.attributeEscape($ResourceBundle.getString('EmailConnector.DeletePropertyNumber'))$k"/>
             </a>
           </td>
           <td class="formcolumncell">
@@ -132,7 +136,7 @@ limitations under the License.
           <td class="formcolumncell">
             <nobr>
               <a name="find_$k">
-                <input type="button" value="$Encoder.attributeEscape($ResourceBundle.getString('EmailConnector.Add'))"
onClick='Javascript:FindAdd("$nextk")' alt="$Encoder.attributeEscape($ResourceBundle.getString('EmailConnector.AddNewMatch'))"/>
+                <input type="button" value="$Encoder.attributeEscape($ResourceBundle.getString('EmailConnector.Add'))"
onClick='Javascript:FindAdd("$nextk")' alt="$Encoder.attributeEscape($ResourceBundle.getString('EmailConnector.AddNewProperty'))"/>
                 <input type="hidden" name="findcount" value="$k"/>
                 <input type="hidden" name="findop" value=""/>
               </a>



Mime
View raw message