Fixed quota usage bar issue

diff --git a/language/en.xml b/language/en.xml
index 9684669779b8d618706d8552efd901b4d13c59a3..d28ae4b0d69e01a84b1f79deeb57bc20a888dcff 100644 (file)
--- a/language/en.xml
+++ b/language/en.xml
@@ -52,6 +52,7 @@
                <item name="wcf.conversation.participants"><![CDATA[Participants]]></item>
                <item name="wcf.conversation.participants.description"><![CDATA[Separate names with a comma.]]></item>
                <item name="wcf.conversation.quota"><![CDATA[Quota]]></item>
+               <item name="wcf.conversation.quota.description"><![CDATA[{#$conversationCount/$maxConversationCount*100}% full ({#$conversationCount} of {#$maxConversationCount})]]></item>
                <item name="wcf.conversation.replies"><![CDATA[Replies]]></item>
                <item name="wcf.conversation.showAll"><![CDATA[Show All Conversations]]></item>
        </category>

diff --git a/templates/conversationList.tpl b/templates/conversationList.tpl
index e7e5095c4e7b4f60d1979b36d4ede6891a361471..6ab5c520656ac8c1a53859c1058e0e254935d1a2 100644 (file)
--- a/templates/conversationList.tpl
+++ b/templates/conversationList.tpl
@@ -94,7 +94,7 @@
                <div>
                        {assign var='conversationCount' value=$__wcf->getConversationHandler()->getConversationCount()}
                        {assign var='maxConversationCount' value=$__wcf->session->getPermission('user.conversation.maxConversations')}
-                       <p class="conversationUsageBar{if $conversationCount/$maxConversationCount > 0.9} yellow{elseif $conversationCount/$maxConversationCount >= 1.0} red{/if}">
+                       <p class="conversationUsageBar{if $conversationCount/$maxConversationCount >= 1.0} red{elseif $conversationCount/$maxConversationCount > 0.9} yellow{/if}">
                                <span style="width: {if $conversationCount/$maxConversationCount < 1.0}{@$conversationCount/$maxConversationCount*100|round:0}{else}100{/if}%">{#$conversationCount/$maxConversationCount*100}%</span>
                        </p>
                        <p><small>{lang}wcf.conversation.quota.description{/lang}</small></p>