svn commit: r1566618 - in /manifoldcf/branches/release-1.5-branch: ./ connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/

[kwright]

Author: kwright
Date: Mon Feb 10 13:27:45 2014
New Revision: 1566618

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

Modified:
    manifoldcf/branches/release-1.5-branch/   (props changed)
    manifoldcf/branches/release-1.5-branch/CHANGES.txt
    
manifoldcf/branches/release-1.5-branch/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java
    
manifoldcf/branches/release-1.5-branch/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_en_US.properties
    
manifoldcf/branches/release-1.5-branch/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_ja_JP.properties

Propchange: manifoldcf/branches/release-1.5-branch/
------------------------------------------------------------------------------
  Merged /manifoldcf/trunk:r1563982

Modified: manifoldcf/branches/release-1.5-branch/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/release-1.5-branch/CHANGES.txt?rev=1566618&r1=1566617&r2=1566618&view=diff
==============================================================================
--- manifoldcf/branches/release-1.5-branch/CHANGES.txt (original)
+++ manifoldcf/branches/release-1.5-branch/CHANGES.txt Mon Feb 10 13:27:45 2014
@@ -4,6 +4,9 @@ $Id$
 
 ======================= Release 1.5.1 =====================
 
+CONNECTORS-877: Missing Solr i18n key.
+(Erlend Garåsen, Karl Wright)
+
 CONNECTORS-876: Solr indexing exception reports now include the document URI.
 (David Morana, Karl Wright)
 

Modified: 
manifoldcf/branches/release-1.5-branch/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/release-1.5-branch/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java?rev=1566618&r1=1566617&r2=1566618&view=diff
==============================================================================
--- 
manifoldcf/branches/release-1.5-branch/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java
 (original)
+++ 
manifoldcf/branches/release-1.5-branch/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java
 Mon Feb 10 13:27:45 2014
@@ -851,13 +851,13 @@ public class SolrConnector extends org.a
 "  }\n"+
 "  if (editconnection.removepath.value != \"\" && 
editconnection.removepath.value.substring(0,1) != \"/\")\n"+
 "  {\n"+
-"    
alert(\""+Messages.getBodyJavascriptString(locale,"SolrConnector.RemovePathMustStartWACharacter")+"\");\n"+
+"    
alert(\""+Messages.getBodyJavascriptString(locale,"SolrConnector.RemovePathMustStartWithACharacter")+"\");\n"+
 "    editconnection.removepath.focus();\n"+
 "    return false;\n"+
 "  }\n"+
 "  if (editconnection.statuspath.value != \"\" && 
editconnection.statuspath.value.substring(0,1) != \"/\")\n"+
 "  {\n"+
-"    
alert(\""+Messages.getBodyJavascriptString(locale,"SolrConnector.StatusPathMustStartWACharacter")+"\");\n"+
+"    
alert(\""+Messages.getBodyJavascriptString(locale,"SolrConnector.StatusPathMustStartWithACharacter")+"\");\n"+
 "    editconnection.statuspath.focus();\n"+
 "    return false;\n"+
 "  }\n"+

Modified: 
manifoldcf/branches/release-1.5-branch/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_en_US.properties
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/release-1.5-branch/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_en_US.properties?rev=1566618&r1=1566617&r2=1566618&view=diff
==============================================================================
--- 
manifoldcf/branches/release-1.5-branch/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_en_US.properties
 (original)
+++ 
manifoldcf/branches/release-1.5-branch/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_en_US.properties
 Mon Feb 10 13:27:45 2014
@@ -88,8 +88,8 @@ SolrConnector.WebApplicationMustBeSpecif
 SolrConnector.ConnectionTimeoutMustBeInteger=Connection timeout must be an 
integer
 SolrConnector.SocketTimeoutMustBeInteger=Socket timeout must be an integer
 SolrConnector.UpdatePathMustStartWithACharacter=Update path must start with a  
'/' character
-SolrConnector.RemovePathMustStartWACharacter=Remove path must start with a  
'/' character
-SolrConnector.StatusPathMustStartWACharacter=Status path must start with a  
'/' character
+SolrConnector.RemovePathMustStartWithACharacter=Remove path must start with a  
'/' character
+SolrConnector.StatusPathMustStartWithACharacter=Status path must start with a  
'/' character
 SolrConnector.MaximumDocumentLengthMustBAnInteger=Maximum document length must 
be an integer
 SolrConnector.CommitWithinValueMustBeAnInteger=Commit-within value must be an 
integer
 SolrConnector.MaximumDocumentLengthMustBeAnInteger=Maximum document length 
must be an integer

Modified: 
manifoldcf/branches/release-1.5-branch/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_ja_JP.properties
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/release-1.5-branch/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_ja_JP.properties?rev=1566618&r1=1566617&r2=1566618&view=diff
==============================================================================
--- 
manifoldcf/branches/release-1.5-branch/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_ja_JP.properties
 (original)
+++ 
manifoldcf/branches/release-1.5-branch/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_ja_JP.properties
 Mon Feb 10 13:27:45 2014
@@ -88,8 +88,8 @@ SolrConnector.WebApplicationMustBeSpecif
 SolrConnector.ConnectionTimeoutMustBeInteger=コネクションタイム
アウトには整数を入力してください
 SolrConnector.SocketTimeoutMustBeInteger=ソケットタイム
アウト値には整数を入力してください
 
SolrConnector.UpdatePathMustStartWithACharacter=更新パスは文字「/」から始めてくã
 ã•ã„
-SolrConnector.RemovePathMustStartWACharacter=削除パスは文字「/」から始めてくã
 ã•ã„
-SolrConnector.StatusPathMustStartWACharacter=状æ…
‹ãƒ‘スは文字「/」から始めてください
+SolrConnector.RemovePathMustStartWithACharacter=削除パスは文字「/」から始めてくã
 ã•ã„
+SolrConnector.StatusPathMustStartWithACharacter=状æ…
‹ãƒ‘スは文字「/」から始めてください
 
SolrConnector.MaximumDocumentLengthMustBAnInteger=コンテンツの最大長さには整数をå
…¥åŠ›ã—てください
 
SolrConnector.CommitWithinValueMustBeAnInteger=Commit-within値には整数をå…
¥åŠ›ã—てください
 
SolrConnector.MaximumDocumentLengthMustBeAnInteger=最大コンテンツ長さには整数をå
…¥åŠ›ã—てください