Changeset 2558

Timestamp:

01/31/10 01:48:03 (2 years ago)

Author:

nuxwin

Message:

• GUI:
  • Fixed #2140: Untranslated message {DISK_USAGE} of {DISK_LIMIT} MB

Location:

trunk

Files:

• CHANGELOG (modified) (1 diff)
• gui/reseller/users.php (modified) (2 diffs)
• gui/themes/omega_original/reseller/users.tpl (modified) (1 diff)

trunk/CHANGELOG

@@ -5 +5 @@
         - GUI:
                 * Fixed #2152: Wrong limited count in reseller gui
+                * Fixed #2140: Untranslated message {DISK_USAGE} of {DISK_LIMIT} MB
 
 2010-01-27 Marc Pujol

trunk/gui/reseller/users.php

@@ -5 +5 @@
  * @copyright   2001-2006 by moleSoftware GmbH
  * @copyright   2006-2010 by ispCP | http://isp-control.net
- * @version     SVN: $ID$
+ * @version     SVN: $Id$
  * @link                http://isp-control.net
  * @author              ispCP Team
@@ -324 +324 @@
                                         'USER_ID' => $rs->fields['domain_admin_id'],
                                         'CHANGE_INTERFACE' => tr('Switch'),
-                                        'DISK_LIMIT' => $rs->fields['domain_disk_limit'],
-                                        'DISK_USAGE' => round($rs->fields['domain_disk_usage'] / 1024 / 1024,1),
+                                        'DISK_USAGE' => ($rs->fields['domain_disk_limit'])
+                                                ? tr('%1$s of %2$s MB', round($rs->fields['domain_disk_usage'] / 1024 / 1024,1), $rs->fields['domain_disk_limit'])
+                                                : tr('%1$s of <b>unlimited</b> MB', round($rs->fields['domain_disk_usage'] / 1024 / 1024,1))
                                 )
                         );

trunk/gui/themes/omega_original/reseller/users.tpl

@@ -112 +112 @@
                         <td class="{CLASS_TYPE_ROW}" width="90" align="center">{CREATION_DATE}</td>
                         <td class="{CLASS_TYPE_ROW}" width="90" align="center">{EXPIRE_DATE}</td>
-                                                <td class="{CLASS_TYPE_ROW}" width="90" align="center">{DISK_USAGE} of {DISK_LIMIT} MB</td>
+                                                <td class="{CLASS_TYPE_ROW}" width="90" align="center">{DISK_USAGE}</td>
                         <td nowrap="nowrap" width="80" align="center" class="{CLASS_TYPE_ROW}"><img src="{THEME_COLOR_PATH}/images/icons/identity.png" width="16" height="16" border="0" style="vertical-align:middle" alt="" /> <a href="domain_details.php?domain_id={DOMAIN_ID}" class="link">{TR_DETAILS}</a></td>
                         <!-- BDP: edit_option -->