Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions lib/Controller/ApiController.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
use OCP\AppFramework\OCSController;
use OCP\IConfig;
use OCP\IGroupManager;
use OCP\IL10N;
use OCP\IRequest;
use OCP\IUserSession;

Expand All @@ -40,6 +41,7 @@ public function __construct(
private DatabaseStatistics $databaseStatistics,
private ShareStatistics $shareStatistics,
private SessionStatistics $sessionStatistics,
private IL10N $l10n,
) {
parent::__construct($appName, $request);
}
Expand Down Expand Up @@ -131,19 +133,24 @@ private function getWebserver(): string {
*/
private function formatUptime(int $uptime): string {
if ($uptime === -1) {
return 'Unknown';
return $this->l10n->t('Unknown');
}

try {
$boot = new \DateTime($uptime . ' seconds ago');
} catch (\Exception $e) {
return 'Unknown';
return $this->l10n->t('Unknown');
}

$interval = $boot->diff(new \DateTime());
if ($interval->days > 0) {
return $interval->format('%a days, %h hours, %i minutes, %s seconds');
$days = $interval->days;
$hours = $interval->h;
$minutes = $interval->i;
$seconds = $interval->s;

if ($days > 0) {
return $this->l10n->t('%1$d days, %2$d hours, %3$d minutes, %4$d seconds', [$days, $hours, $minutes, $seconds]);
}
return $interval->format('%h hours, %i minutes, %s seconds');
return $this->l10n->t('%1$d hours, %2$d minutes, %3$d seconds', [$hours, $minutes, $seconds]);
}
}
6 changes: 5 additions & 1 deletion tests/lib/ApiControllerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
use OCP\AppFramework\Http;
use OCP\IConfig;
use OCP\IGroupManager;
use OCP\IL10N;
use OCP\IRequest;
use OCP\IUser;
use OCP\IUserSession;
Expand All @@ -38,6 +39,7 @@ class ApiControllerTest extends \Test\TestCase {
private DatabaseStatistics&MockObject $databaseStatistics;
private ShareStatistics&MockObject $shareStatistics;
private SessionStatistics&MockObject $sessionStatistics;
private IL10N&MockObject $l10n;

protected function setUp(): void {
parent::setUp();
Expand All @@ -53,6 +55,7 @@ protected function setUp(): void {
$this->databaseStatistics = $this->createMock(DatabaseStatistics::class);
$this->shareStatistics = $this->createMock(ShareStatistics::class);
$this->sessionStatistics = $this->createMock(SessionStatistics::class);
$this->l10n = $this->createMock(IL10N::class);
}

private function getController($userSession) {
Expand All @@ -69,7 +72,8 @@ private function getController($userSession) {
$this->fpmStatistics,
$this->databaseStatistics,
$this->shareStatistics,
$this->sessionStatistics
$this->sessionStatistics,
$this->l10n
);
}

Expand Down
Loading