From aa72f0e612d6764f13960c7c32e1c0da1388c4a2 Mon Sep 17 00:00:00 2001
From: David Toledo <dtoledo@solidgear.es>
Date: Mon, 27 Feb 2017 13:41:05 +0100
Subject: Add percentage to user's quota info

* Add percentage to user's quota info

Fixes https://github.com/owncloud/core/issues/24011

* Do not show percentage if the quota is Unlimited

* translate quota

* correct condition and remove print_unescaped

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
---
 settings/personal.php           | 1 +
 settings/templates/personal.php | 9 +++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'settings')

diff --git a/settings/personal.php b/settings/personal.php
index a1fcd10e0ad..a4449754f64 100644
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -158,6 +158,7 @@ $userData = $accountManager->getUser($user);
 
 $tmpl->assign('total_space', $totalSpace);
 $tmpl->assign('usage_relative', $storageInfo['relative']);
+$tmpl->assign('quota', $storageInfo['quota']);
 $tmpl->assign('clients', $clients);
 $tmpl->assign('email', $userData[\OC\Accounts\AccountManager::PROPERTY_EMAIL]['value']);
 $tmpl->assign('languages', $languages);
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index 31aa268f776..b47e2e28ffa 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -28,8 +28,13 @@
 	<div style="width:<?php p($_['usage_relative']);?>%"
 		<?php if($_['usage_relative'] > 80): ?> class="quota-warning" <?php endif; ?>>
 		<p id="quotatext">
-			<?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong>',
-			array($_['usage'], $_['total_space'])));?>
+			<?php if ($_['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED): ?>
+				<?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong>',
+					[$_['usage'], $_['total_space']]));?>
+			<?php else: ?>
+				<?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong> (<strong>%s %%</strong>)',
+					[$_['usage'], $_['total_space'],  $_['usage_relative']]));?>
+			<?php endif ?>
 		</p>
 	</div>
 </div>
-- 
cgit v1.2.3