java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 14 ++--
java/code/webapp/WEB-INF/pages/admin/multiorg/orgsoftwaresubs.jsp | 31
++++++++--
java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlements.jsp | 6 -
java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlementsubs.jsp | 6 -
4 files changed, 38 insertions(+), 19 deletions(-)
New commits:
commit 3be2fd83b9d88da8315f61fc7b2422194217a353
Author: Partha Aji <paji(a)redhat.com>
Date: Thu Jun 24 12:24:37 2010 -0400
Fixed some typos
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 559206f..b317046 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
@@ -4465,14 +4465,14 @@ button below, and <b>will be unable to log back
in</b>.</source>
<context
context-type="sourcefile">/rhn/admin/multiorg/SoftwareEntitlements</context>
</context-group>
</trans-unit>
- <trans-unit id="Used/Alloted">
-<source>Used/Alloted</source>
+ <trans-unit id="Used/Allotted">
+<source>Used/Allotted</source>
<context-group name="ctx">
<context
context-type="sourcefile">/rhn/admin/multiorg/SoftwareEntitlements</context>
</context-group>
</trans-unit>
<trans-unit id="None Allocated">
-<source>None Alloted</source>
+<source>None Allotted</source>
<context-group name="ctx">
<context
context-type="sourcefile">/rhn/admin/multiorg/SoftwareEntitlements</context>
</context-group>
@@ -4516,8 +4516,8 @@ button below, and <b>will be unable to log back
in</b>.</source>
</context-group>
</trans-unit>
- <trans-unit id="Used/Alloted.tip">
-<source>'Alloted' refers to the total number of entitlements allocated to
any organization from initial pool as reflected in this @@PRODUCT_NAME@@'s
certificate. 'Used' refers to entitlements that have been consumed by systems in
various organizations.</source>
+ <trans-unit id="Used/Allotted.tip">
+<source>'Allotted' refers to the total number of entitlements allocated to
any organization from initial pool as reflected in this @@PRODUCT_NAME@@'s
certificate. 'Used' refers to entitlements that have been consumed by systems in
various organizations.</source>
<context-group name="ctx">
<context
context-type="sourcefile">/rhn/admin/multiorg/SoftwareEntitlementSubscriptions</context>
</context-group>
@@ -4732,8 +4732,8 @@ deducted from the default organization.</source>
</context-group>
</trans-unit>
- <trans-unit id="softwareEntitlementSubs.Used/Alloted">
-<source>'Alloted' refers to the total available entitlements to the
organizations (excluding the default @@PRODUCT_NAME@@ organization) on this
@@PRODUCT_NAME@@. It is not equal to the total available in the @@PRODUCT_NAME@@
certificate.</source>
+ <trans-unit id="softwareEntitlementSubs.Used/Allotted">
+<source>'Allotted' refers to the total available entitlements to the
organizations (excluding the default @@PRODUCT_NAME@@ organization) on this
@@PRODUCT_NAME@@. It is not equal to the total available in the @@PRODUCT_NAME@@
certificate.</source>
<context-group name="ctx">
<context
context-type="sourcefile">/rhn/admin/multiorg/SoftwareEntitlementSubscriptions</context>
</context-group>
diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgsoftwaresubs.jsp
b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgsoftwaresubs.jsp
index f2b3505..f0ac87f 100644
--- a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgsoftwaresubs.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgsoftwaresubs.jsp
@@ -57,9 +57,17 @@
<a
href="/rhn/admin/multiorg/SoftwareEntitlementDetails.do?cfid=${current.id}"
tabindex="-1"><c:out value="${current.name}" /></a>
</rl:column>
<rl:column styleclass="center"
- headertext="${rhn:localize('Regular Usage')}
<br/>(${rhn:localize('Entitlement Usage Type')})">
- <c:out value="${current.currentMembers} / ${current.maxMembers}"
/>
- </rl:column>
+ headertext="${rhn:localize('Regular Usage')}
<br/>(${rhn:localize('Used/Allotted')})*">
+ <c:choose>
+ <c:when test="${empty current.maxMembers or current.maxMembers ==
0}">
+ <bean:message key="None Allocated"/>
+ </c:when>
+ <c:otherwise>
+ <c:out value="${current.currentMembers} /
${current.maxMembers}" />
+ </c:otherwise>
+ </c:choose>
+ </rl:column>
+
<rl:column
headerkey="Regular Proposed Total">
<c:choose>
@@ -83,8 +91,18 @@
</c:choose>
</rl:column>
<rl:column styleclass="center"
- headertext="${rhn:localize('Flex Usage')}
<br/>(${rhn:localize('Entitlement Usage Type')})">
- <c:out value="${current.currentFlex} / ${current.maxFlex}"
/>
+ headertext="${rhn:localize('Flex Usage')}
<br/>(${rhn:localize('Used/Allotted')})*">
+
+ <c:choose>
+ <c:when test="${empty current.maxFlex or current.maxFlex ==
0}">
+ <bean:message key="None Allocated"/>
+ </c:when>
+ <c:otherwise>
+ <c:out value="${current.currentFlex} / ${current.maxFlex}"
/>
+ </c:otherwise>
+ </c:choose>
+
+
</rl:column>
<rl:column bound="false"
@@ -110,7 +128,8 @@
</c:otherwise>
</c:choose>
</rl:column>
- </rl:list>
+ </rl:list>
+<p><rhn:tooltip>*-<bean:message key =
"Used/Allotted.tip"/></rhn:tooltip></p>
<c:if test="${param.oid != 1}">
<div align="right">
<hr/>
diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlements.jsp
b/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlements.jsp
index 3443ed8..e449ace 100644
--- a/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlements.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlements.jsp
@@ -65,7 +65,7 @@
<c:if test="${orgCount > 1}">
<rl:column
- headertext="${rhn:localize('Regular Usage')} <br/>
(${rhn:localize('Used/Alloted')})**">
+ headertext="${rhn:localize('Regular Usage')} <br/>
(${rhn:localize('Used/Allotted')})**">
<c:choose>
<c:when test="${empty current.allocated or current.allocated ==
0}">
<bean:message key="None Allocated"/>
@@ -92,7 +92,7 @@
<c:if test="${orgCount > 1}">
<rl:column bound="false"
- headertext="${rhn:localize('Flex Usage')} <br/>
(${rhn:localize('Used/Alloted')})**"
+ headertext="${rhn:localize('Flex Usage')} <br/>
(${rhn:localize('Used/Allotted')})**"
styleclass="${usagestyle}">
<c:choose>
@@ -110,6 +110,6 @@
</rl:listset>
<rhn:tooltip typeKey="Tip">*-<bean:message key =
"Available/Total.tip"/></rhn:tooltip>
-<rhn:tooltip typeKey="Tip">**-<bean:message key =
"Used/Alloted.tip"/></rhn:tooltip>
+<rhn:tooltip typeKey="Tip">**-<bean:message key =
"Used/Allotted.tip"/></rhn:tooltip>
</body>
</html:html>
diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlementsubs.jsp
b/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlementsubs.jsp
index a19ce7d..9165ebf 100644
--- a/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlementsubs.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlementsubs.jsp
@@ -50,7 +50,7 @@
</rl:column>
<c:if test="${not empty requestScope.regularAvailable}">
<rl:column
- headertext="${rhn:localize('Regular Usage')} <br/>
(${rhn:localize('Used/Alloted')})*"
+ headertext="${rhn:localize('Regular Usage')} <br/>
(${rhn:localize('Used/Allotted')})*"
<c:choose>
<c:when test="${empty current.maxMembers or current.maxMembers ==
0}">
@@ -86,7 +86,7 @@
</c:if>
<c:if test="${not empty requestScope.flexAvailable}">
<rl:column
- headertext="${rhn:localize('Flex Usage')} <br/>
(${rhn:localize('Used/Alloted')})*"
+ headertext="${rhn:localize('Flex Usage')} <br/>
(${rhn:localize('Used/Allotted')})*"
<c:choose>
<c:when test="${empty current.maxFlex or current.maxFlex ==
0}">
@@ -136,7 +136,7 @@
</rl:list>
</rl:listset>
</p>
-<rhn:tooltip key="softwareEntitlementSubs.Used/Alloted"/>
+<rhn:tooltip key="softwareEntitlementSubs.Used/Allotted"/>
<c:if test="${not empty requestScope.regularAvailable}">
<h2><bean:message
key="softwareEntitlementSubs.systemWideCounts.header.regular"/></h2>