svn commit: r1440066 - in /manifoldcf/trunk: ./ framework/crawler-ui/src/main/webapp/ framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/

[kwright]

Author: kwright
Date: Tue Jan 29 19:17:26 2013
New Revision: 1440066

URL: http://svn.apache.org/viewvc?rev=1440066&view=rev
Log:
Fix for CONNECTORS-625.  Finish internationalizing all underserved parts of the 
crawler UI.

Modified:
    manifoldcf/trunk/CHANGES.txt
    manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewauthority.jsp
    manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewconnection.jsp
    manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewoutput.jsp
    
manifoldcf/trunk/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties
    
manifoldcf/trunk/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_ja_JP.properties

Modified: manifoldcf/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1440066&r1=1440065&r2=1440066&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Tue Jan 29 19:17:26 2013
@@ -3,6 +3,10 @@ $Id$
 
 ======================= 1.2-dev =====================
 
+CONNECTORS-625: Finish internationalization work for parts of the
+core crawler UI.
+(Karl Wright)
+
 CONNECTORS-627: Upgrade SolrJ to 4.1.0 from 4.0.0
 (Minoru Osuka)
 

Modified: 
manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewauthority.jsp
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewauthority.jsp?rev=1440066&r1=1440065&r2=1440066&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewauthority.jsp 
(original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewauthority.jsp Tue 
Jan 29 19:17:26 2013
@@ -37,7 +37,7 @@
 
        function Delete(connectionName)
        {
-               if 
(confirm("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"viewauthority.DeleteConnection")%>
 '"+connectionName+"'?"))
+               if 
(confirm("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"viewauthority.DeleteConnection")%>
 
'"+connectionName+"'<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"viewauthority.qmark")%>"))
                {
                        document.viewconnection.op.value="Delete";
                        document.viewconnection.connname.value=connectionName;

Modified: 
manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewconnection.jsp
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewconnection.jsp?rev=1440066&r1=1440065&r2=1440066&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewconnection.jsp 
(original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewconnection.jsp 
Tue Jan 29 19:17:26 2013
@@ -37,7 +37,7 @@
 
        function Delete(connectionName)
        {
-               if 
(confirm("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"viewconnection.DeleteConnection")%>
 '"+connectionName+"'?"))
+               if 
(confirm("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"viewconnection.DeleteConnection")%>
 
'"+connectionName+"'<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"viewconnection.qmark")%>"))
                {
                        document.viewconnection.op.value="Delete";
                        document.viewconnection.connname.value=connectionName;

Modified: manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewoutput.jsp
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewoutput.jsp?rev=1440066&r1=1440065&r2=1440066&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewoutput.jsp 
(original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewoutput.jsp Tue 
Jan 29 19:17:26 2013
@@ -37,7 +37,7 @@
 
        function Delete(connectionName)
        {
-               if (confirm("Delete output connection '"+connectionName+"'?"))
+               if 
(confirm("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"viewoutput.Deleteoutputconnection")%>
 
'"+connectionName+"'<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"viewoutput.qmark")%>"))
                {
                        document.viewconnection.op.value="Delete";
                        document.viewconnection.connname.value=connectionName;
@@ -47,7 +47,7 @@
 
        function ReingestAll(connectionName)
        {
-               if (confirm("This command will force all documents associated 
with output\nconnection '"+connectionName+"' to be recrawled the next time 
their associated\n jobs are started.  Do you want to continue?"))
+               if 
(confirm("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"viewoutput.Thiscommandwillforce")%>
 '"+connectionName+"' 
<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"viewoutput.toberecrawled")%>"))
                {
                        document.viewconnection.op.value="ReingestAll";
                        document.viewconnection.connname.value=connectionName;
@@ -92,7 +92,7 @@
                String className = connection.getClassName();
                String connectorName = 
connectorManager.getDescription(className);
                if (connectorName == null)
-                       connectorName = className + "(uninstalled)";
+                       connectorName = className + 
Messages.getString(pageContext.getRequest().getLocale(),"viewoutput.uninstalled");
                int maxCount = connection.getMaxConnections();
                ConfigParams parameters = connection.getConfigParams();
 
@@ -106,7 +106,7 @@
                {
                        IOutputConnector c = 
OutputConnectorFactory.grab(threadContext,className,parameters,maxCount);
                        if (c == null)
-                               connectionStatus = "Connector is not 
installed.";
+                               connectionStatus = 
Messages.getString(pageContext.getRequest().getLocale(),"viewoutput.Connectorisnotinstalled");
                        else
                        {
                                try
@@ -121,7 +121,7 @@
                }
                catch (ManifoldCFException e)
                {
-                       connectionStatus = "Threw exception: 
'"+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(e.getMessage())+"'";
+                       connectionStatus = 
Messages.getString(pageContext.getRequest().getLocale(),"viewoutput.Threwexception")+"
 '"+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(e.getMessage())+"'";
                }
 %>
                <table class="displaytable">

Modified: 
manifoldcf/trunk/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties?rev=1440066&r1=1440065&r2=1440066&view=diff
==============================================================================
--- 
manifoldcf/trunk/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties
 (original)
+++ 
manifoldcf/trunk/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties
 Tue Jan 29 19:17:26 2013
@@ -125,6 +125,13 @@ viewoutput.DeleteThisOutputConnection=De
 viewoutput.Delete=Delete
 viewoutput.ReIngestAllDocumentsAssociatedWithThisOutputConnection=Re-ingest 
all documents associated with this output connection
 viewoutput.ReIngestAllAssociatedDocuments=Re-ingest all associated documents
+viewoutput.Deleteoutputconnection=Delete output connection
+viewoutput.Thiscommandwillforce=This command will force all documents 
associated with output\nconnection
+viewoutput.toberecrawled=to be recrawled the next time their associated\n jobs 
are started.  Do you want to continue?
+viewoutput.qmark=?
+viewoutput.uninstalled=(uninstalled)
+viewoutput.Connectorisnotinstalled=Connector is not installed.
+viewoutput.Threwexception=Threw exception:
 
 listauthorities.ApacheManifoldCFListAuthorities=Apache ManifoldCF: List 
Authorities
 listauthorities.ListOfAuthorityConnections=List of Authority Connections
@@ -229,6 +236,7 @@ viewconnection.Threwexception=Threw exce
 viewconnection.Binregularexpression=Bin regular expression
 viewconnection.Description=Description
 viewconnection.Maxavgfetches=Max avg fetches/min
+viewconnection.qmark=?
 
 listjobs.ApacheManifoldCFListJobDescriptions=Apache ManifoldCF: List job 
descriptions
 listjobs.JobList=Job List
@@ -722,3 +730,4 @@ viewauthority.Deleteconnection=Delete co
 viewauthority.Connectorisnotinstalled=Connector is not installed.
 viewauthority.uninstalled=(uninstalled)
 viewauthority.Threwexception=Threw exception:
+viewauthority.qmark=?

Modified: 
manifoldcf/trunk/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_ja_JP.properties
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_ja_JP.properties?rev=1440066&r1=1440065&r2=1440066&view=diff
==============================================================================
--- 
manifoldcf/trunk/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_ja_JP.properties
 (original)
+++ 
manifoldcf/trunk/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_ja_JP.properties
 Tue Jan 29 19:17:26 2013
@@ -125,6 +125,13 @@ viewoutput.DeleteThisOutputConnection=å
 viewoutput.Delete=削除
 
viewoutput.ReIngestAllDocumentsAssociatedWithThisOutputConnection=コネクションに指定されているすべてのコンテンツを再読込む
 
viewoutput.ReIngestAllAssociatedDocuments=すべてのコンテンツの再読込み
+viewoutput.Deleteoutputconnection=Delete output connection
+viewoutput.Thiscommandwillforce=This command will force all documents 
associated with output\nconnection
+viewoutput.toberecrawled=to be recrawled the next time their associated\n jobs 
are started.  Do you want to continue?
+viewoutput.qmark=?
+viewoutput.uninstalled=(uninstalled)
+viewoutput.Connectorisnotinstalled=Connector is not installed.
+viewoutput.Threwexception=Threw exception:
 
 listauthorities.ApacheManifoldCFListAuthorities=Apache 
ManifoldCF：権限一覧
 listauthorities.ListOfAuthorityConnections=権限コネクション一覧
@@ -229,6 +236,7 @@ viewconnection.Threwexception=Threw exce
 viewconnection.Binregularexpression=Bin regular expression
 viewconnection.Description=Description
 viewconnection.Maxavgfetches=Max avg fetches/min
+viewconnection.qmark=?
 
 listjobs.ApacheManifoldCFListJobDescriptions=Apache 
ManifoldCF：ジョブ一覧
 listjobs.JobList=ジョブ一覧
@@ -723,3 +731,4 @@ viewauthority.Deleteconnection=Delete co
 viewauthority.Connectorisnotinstalled=Connector is not installed.
 viewauthority.uninstalled=(uninstalled)
 viewauthority.Threwexception=Threw exception:
+viewauthority.qmark=?
\ No newline at end of file