java/code/src/com/redhat/rhn/common/localization/test/LocalizationServiceTest.java | 2
+-
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 7
+++++--
java/code/src/com/redhat/rhn/frontend/xmlrpc/test/XmlRpcServletTest.java | 6
+++---
java/code/webapp/WEB-INF/pages/channel/manage/syncrepos.jsp | 2
+-
4 files changed, 10 insertions(+), 7 deletions(-)
New commits:
commit 8a538131c5b4504f20ad870266adb5c08df80efb
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Thu Sep 23 18:33:55 2010 -0400
fixing unit tests
diff --git
a/java/code/src/com/redhat/rhn/common/localization/test/LocalizationServiceTest.java
b/java/code/src/com/redhat/rhn/common/localization/test/LocalizationServiceTest.java
index 6013c36..9e01517 100644
--- a/java/code/src/com/redhat/rhn/common/localization/test/LocalizationServiceTest.java
+++ b/java/code/src/com/redhat/rhn/common/localization/test/LocalizationServiceTest.java
@@ -297,7 +297,7 @@ public class LocalizationServiceTest extends RhnBaseTestCase {
}
public void testPlainText() {
- String expected = "You donot have enough entitlements for" +
+ String expected = "You do not have enough entitlements for" +
" 5 systems (
http://www.redhat.com).";
String actual = ls.getPlainText("testMessage.html", 5);
assertEquals(expected, actual);
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/test/XmlRpcServletTest.java
b/java/code/src/com/redhat/rhn/frontend/xmlrpc/test/XmlRpcServletTest.java
index 18e1c37..e9b8f48 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/test/XmlRpcServletTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/test/XmlRpcServletTest.java
@@ -113,9 +113,9 @@ public class XmlRpcServletTest extends MockObjectTestCase {
"<methodResponse><fault><value><struct><member><name>"
+
"faultCode</name><value><int>-1</int></value></member>"
+
"<member><name>faultString</name><value><string>"
+
- "redstone.xmlrpc.XmlRpcFault: Could not find method add in class
" +
- "class
com.redhat.rhn.frontend.xmlrpc.test.UnitTestHandler</string>" +
-
"</value></member></struct></value></fault>" +
+ "redstone.xmlrpc.XmlRpcFault: Could not find method: add in class:
" +
+ "com.redhat.rhn.frontend.xmlrpc.test.UnitTestHandler with params:
" +
+
"[java.lang.Integer]</string></value></member></struct></value></fault>"
+
"</methodResponse>");
}
commit fc8fbabbd02150fffa11ec4de743c59bed41a82f
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Thu Sep 23 18:28:16 2010 -0400
fixing some strings associated with repo syncing
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
index f5663e2..5154b98 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
@@ -9461,8 +9461,11 @@ Please note that some manual configuration of these scripts may
still be require
<source>note here</source>
</trans-unit>
<trans-unit id="repos.jsp.norepos">
- <source>No repos in the db</source>
+ <source>No repositories currently exist.</source>
</trans-unit>
+ <trans-unit id="repos.jsp.channel.norepos">
+ <source>No repositories are currently associated with this
channel.</source>
+ </trans-unit>
<trans-unit id="repos.jsp.label">
<source>Label</source>
</trans-unit>
@@ -22488,7 +22491,7 @@ given channel.</source>
<source>Monthly</source>
</trans-unit>
<trans-unit id="schedule.cron">
- <source>Custom Cron format</source>
+ <source>Custom Quartz format</source>
</trans-unit>
<trans-unit id="schedule.weekly">
<source>Weekly</source>
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/syncrepos.jsp
b/java/code/webapp/WEB-INF/pages/channel/manage/syncrepos.jsp
index 1b3a2a2..4dced9e 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/syncrepos.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/syncrepos.jsp
@@ -21,7 +21,7 @@
<input type="hidden" name="cid" value="${cid}" />
<rl:list
- emptykey="repos.jsp.norepos"
+ emptykey="repos.jsp.channel.norepos"
alphabarcolumn="label"