You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2012/01/09 21:22:31 UTC

svn commit: r1229336 - in /incubator/lcf/trunk: ./ connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/ connectors/livelink/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/livelink/

Author: kwright
Date: Mon Jan  9 20:22:30 2012
New Revision: 1229336

URL: http://svn.apache.org/viewvc?rev=1229336&view=rev
Log:
Fix CONNECTORS-363.

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

Modified: incubator/lcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/CHANGES.txt?rev=1229336&r1=1229335&r2=1229336&view=diff
==============================================================================
--- incubator/lcf/trunk/CHANGES.txt (original)
+++ incubator/lcf/trunk/CHANGES.txt Mon Jan  9 20:22:30 2012
@@ -3,6 +3,9 @@ $Id$
 
 ======================= 0.5-dev =====================
 
+CONNECTORS-363: Internationalize more of the Livelink connector.
+(Hitoshi Ozawa, Karl Wright)
+
 CONNECTORS-362: Internationalize JDBC connector fully.
 (Hitoshi Ozawa, Karl Wright)
 

Modified: incubator/lcf/trunk/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkAuthority.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkAuthority.java?rev=1229336&r1=1229335&r2=1229336&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkAuthority.java (original)
+++ incubator/lcf/trunk/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkAuthority.java Mon Jan  9 20:22:30 2012
@@ -470,13 +470,13 @@ public class LivelinkAuthority extends o
 "{\n"+
 "  if (editconnection.serverport.value != \"\" && !isInteger(editconnection.serverport.value))\n"+
 "  {\n"+
-"    alert(" + Messages.getString(locale,"LivelinkConnector.AValidNumberIsRequired") + ");\n"+
+"    alert(\"" + Messages.getBodyJavascriptString(locale,"LivelinkConnector.AValidNumberIsRequired") + "\");\n"+
 "    editconnection.serverport.focus();\n"+
 "    return false;\n"+
 "  }\n"+
 "  if (editconnection.usernameregexp.value != \"\" && !isRegularExpression(editconnection.usernameregexp.value))\n"+
 "  {\n"+
-"    alert(" + Messages.getString(locale,"LivelinkConnector.UserNameRegularExpressionMustBeValidRegularExpression") + ");\n"+
+"    alert(\"" + Messages.getBodyJavascriptString(locale,"LivelinkConnector.UserNameRegularExpressionMustBeValidRegularExpression") + "\");\n"+
 "    editconnection.usernameregexp.focus();\n"+
 "    return false;\n"+
 "  }\n"+
@@ -487,22 +487,22 @@ public class LivelinkAuthority extends o
 "{\n"+
 "  if (editconnection.servername.value == \"\")\n"+
 "  {\n"+
-"    alert(" + Messages.getString(locale,"LivelinkConnector.EnterALivelinkServerName") + ");\n"+
-"    SelectTab(" + Messages.getString(locale,"LivelinkConnector.Server") + ");\n"+
+"    alert(\"" + Messages.getBodyJavascriptString(locale,"LivelinkConnector.EnterALivelinkServerName") + "\");\n"+
+"    SelectTab(\"" + Messages.getBodyJavascriptString(locale,"LivelinkConnector.Server") + "\");\n"+
 "    editconnection.servername.focus();\n"+
 "    return false;\n"+
 "  }\n"+
 "  if (editconnection.serverport.value == \"\")\n"+
 "  {\n"+
-"    alert(" + Messages.getString(locale,"LivelinkConnector.AServerPortNumberIsRequired") + ");\n"+
-"    SelectTab(" + Messages.getString(locale,"LivelinkConnector.Server") + ");\n"+
+"    alert(\"" + Messages.getBodyJavascriptString(locale,"LivelinkConnector.AServerPortNumberIsRequired") + "\");\n"+
+"    SelectTab(\"" + Messages.getBodyJavascriptString(locale,"LivelinkConnector.Server") + "\");\n"+
 "    editconnection.serverport.focus();\n"+
 "    return false;\n"+
 "  }\n"+
 "  if (editconnection.usernameregexp.value == \"\")\n"+
 "  {\n"+
-"    alert(" + Messages.getString(locale,"LivelinkConnector.UserNameRegularExpressionCannotBeNull") + ");\n"+
-"    SelectTab(" + Messages.getString(locale,"LivelinkConnector.UserMapping") + ");\n"+
+"    alert(\"" + Messages.getBodyJavascriptString(locale,"LivelinkConnector.UserNameRegularExpressionCannotBeNull") + "\");\n"+
+"    SelectTab(\"" + Messages.getBodyJavascriptString(locale,"LivelinkConnector.UserMapping") + "\");\n"+
 "    editconnection.usernameregexp.focus();\n"+
 "    return false;\n"+
 "  }\n"+
@@ -568,19 +568,19 @@ public class LivelinkAuthority extends o
 "<table class=\"displaytable\">\n"+
 "  <tr><td class=\"separator\" colspan=\"2\"><hr/></td></tr>\n"+
 "  <tr>\n"+
-"    <td class=\"description\"><nobr>" + Messages.getString(locale,"LivelinkConnector.ServerName") + "</nobr></td>\n"+
+"    <td class=\"description\"><nobr>" + Messages.getBodyString(locale,"LivelinkConnector.ServerName") + "</nobr></td>\n"+
 "    <td class=\"value\"><input type=\"text\" size=\"64\" name=\"servername\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(serverName)+"\"/></td>\n"+
 "  </tr>\n"+
 "  <tr>\n"+
-"    <td class=\"description\"><nobr>" + Messages.getString(locale,"LivelinkConnector.ServerPort") + "</nobr></td>\n"+
+"    <td class=\"description\"><nobr>" + Messages.getBodyString(locale,"LivelinkConnector.ServerPort") + "</nobr></td>\n"+
 "    <td class=\"value\"><input type=\"text\" size=\"5\" name=\"serverport\" value=\""+serverPort+"\"/></td>\n"+
 "  </tr>\n"+
 "  <tr>\n"+
-"    <td class=\"description\"><nobr>" + Messages.getString(locale,"LivelinkConnector.ServerUserName") + "</nobr></td>\n"+
+"    <td class=\"description\"><nobr>" + Messages.getBodyString(locale,"LivelinkConnector.ServerUserName") + "</nobr></td>\n"+
 "    <td class=\"value\"><input type=\"text\" size=\"32\" name=\"serverusername\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(serverUserName)+"\"/></td>\n"+
 "  </tr>\n"+
 "  <tr>\n"+
-"    <td class=\"description\"><nobr>" + Messages.getString(locale,"LivelinkConnector.ServerPassword") + "</nobr></td>\n"+
+"    <td class=\"description\"><nobr>" + Messages.getBodyString(locale,"LivelinkConnector.ServerPassword") + "</nobr></td>\n"+
 "    <td class=\"value\"><input type=\"password\" size=\"32\" name=\"serverpassword\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(serverPassword)+"\"/></td>\n"+
 "  </tr>\n"+
 "</table>\n"
@@ -604,11 +604,11 @@ public class LivelinkAuthority extends o
 "<table class=\"displaytable\">\n"+
 "  <tr><td class=\"separator\" colspan=\"2\"><hr/></td></tr>\n"+
 "  <tr>\n"+
-"    <td class=\"description\"><nobr>" + Messages.getString(locale,"LivelinkConnector.UserNameRegularExpression") + "</nobr></td>\n"+
+"    <td class=\"description\"><nobr>" + Messages.getBodyString(locale,"LivelinkConnector.UserNameRegularExpression") + "</nobr></td>\n"+
 "    <td class=\"value\"><input type=\"text\" size=\"40\" name=\"usernameregexp\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(usernameRegexp)+"\"/></td>\n"+
 "  </tr>\n"+
 "  <tr>\n"+
-"    <td class=\"description\"><nobr>" + Messages.getString(locale,"LivelinkConnector.LivelinkUserExpression") + "</nobr></td>\n"+
+"    <td class=\"description\"><nobr>" + Messages.getBodyString(locale,"LivelinkConnector.LivelinkUserExpression") + "</nobr></td>\n"+
 "    <td class=\"value\"><input type=\"text\" size=\"40\" name=\"livelinkuserexpr\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(livelinkUserExpr)+"\"/></td>\n"+
 "  </tr>\n"+
 "</table>\n"
@@ -679,7 +679,7 @@ public class LivelinkAuthority extends o
     out.print(
 "<table class=\"displaytable\">\n"+
 "  <tr>\n"+
-"    <td class=\"description\" colspan=\"1\"><nobr>" + Messages.getString(locale,"LivelinkConnector.Parameters") + "</nobr></td>\n"+
+"    <td class=\"description\" colspan=\"1\"><nobr>" + Messages.getBodyString(locale,"LivelinkConnector.Parameters") + "</nobr></td>\n"+
 "    <td class=\"value\" colspan=\"3\">\n"
     );
     Iterator iter = parameters.listParameters();

Modified: incubator/lcf/trunk/connectors/livelink/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/livelink/common_en_US.properties
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/livelink/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/livelink/common_en_US.properties?rev=1229336&r1=1229335&r2=1229336&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/livelink/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/livelink/common_en_US.properties (original)
+++ incubator/lcf/trunk/connectors/livelink/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/livelink/common_en_US.properties Mon Jan  9 20:22:30 2012
@@ -23,11 +23,11 @@ LivelinkConnector.Filters=Filters
 LivelinkConnector.Security=Security
 LivelinkConnector.Metadata=Metadata
 LivelinkConnector.UserMapping=User Mapping
-LivelinkConnector.AValidNumberIsRequired=\"A valid number is required\"
-LivelinkConnector.UserNameRegularExpressionMustBeValidRegularExpression=\"User name regular expression must be valid regular expression\"
-LivelinkConnector.EnterALivelinkServerName=\"Enter a livelink server name\"
-LivelinkConnector.AServerPortNumberIsRequired=\"A server port number is required\"
-LivelinkConnector.UserNameRegularExpressionCannotBeNull=\"User name regular expression cannot be null\"
+LivelinkConnector.AValidNumberIsRequired=A valid number is required
+LivelinkConnector.UserNameRegularExpressionMustBeValidRegularExpression=User name regular expression must be valid regular expression
+LivelinkConnector.EnterALivelinkServerName=Enter a livelink server name
+LivelinkConnector.AServerPortNumberIsRequired=A server port number is required
+LivelinkConnector.UserNameRegularExpressionCannotBeNull=User name regular expression cannot be null
 LivelinkConnector.ServerName=Server name:
 LivelinkConnector.ServerPort=Server port:
 LivelinkConnector.ServerUserName=Server user name:

Modified: incubator/lcf/trunk/connectors/livelink/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/livelink/common_ja_JP.properties
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/livelink/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/livelink/common_ja_JP.properties?rev=1229336&r1=1229335&r2=1229336&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/livelink/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/livelink/common_ja_JP.properties (original)
+++ incubator/lcf/trunk/connectors/livelink/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/livelink/common_ja_JP.properties Mon Jan  9 20:22:30 2012
@@ -23,11 +23,11 @@ LivelinkConnector.Filters=フィã
 LivelinkConnector.Security=セキュリティ
 LivelinkConnector.Metadata=メタデータ
 LivelinkConnector.UserMapping=ユーザマップ
-LivelinkConnector.AValidNumberIsRequired=\"数値を入力してください\"
-LivelinkConnector.UserNameRegularExpressionMustBeValidRegularExpression=\"正しいユーザ名正規表現式を入力してください\"
-LivelinkConnector.EnterALivelinkServerName=\"LiveLinkサーバ名を入力してください\"
-LivelinkConnector.AServerPortNumberIsRequired=\"サーバポート番号を入力してください\"
-LivelinkConnector.UserNameRegularExpressionCannotBeNull=\"ユーザ名正規表現を入力してください\"
+LivelinkConnector.AValidNumberIsRequired=数値を入力してください
+LivelinkConnector.UserNameRegularExpressionMustBeValidRegularExpression=正しいユーザ名正規表現式を入力してください
+LivelinkConnector.EnterALivelinkServerName=LiveLinkサーバ名を入力してください
+LivelinkConnector.AServerPortNumberIsRequired=サーバポート番号を入力してください
+LivelinkConnector.UserNameRegularExpressionCannotBeNull=ユーザ名正規表現を入力してください
 LivelinkConnector.ServerName=サーバ名：
 LivelinkConnector.ServerPort=サーバポート：
 LivelinkConnector.ServerUserName=サーバユーザ名：