From d60da49f2787605c238fdb83b45a98b81a0e64e4 Mon Sep 17 00:00:00 2001 From: qiyu-xie Date: Tue, 3 Aug 2021 14:30:50 +0800 Subject: [PATCH] * Finish task#40815. --- module/doc/lang/de.php | 2 +- module/doc/lang/en.php | 2 +- module/doc/lang/fr.php | 2 +- module/doc/lang/vi.php | 2 +- module/doc/model.php | 11 ++++------- 5 files changed, 8 insertions(+), 11 deletions(-) diff --git a/module/doc/lang/de.php b/module/doc/lang/de.php index ddd6f58183..de3c45d8fe 100644 --- a/module/doc/lang/de.php +++ b/module/doc/lang/de.php @@ -206,7 +206,7 @@ $lang->doc->noticeAcl['doc']['private'] = 'Only the one who created it can acces $lang->doc->placeholder = new stdclass(); $lang->doc->placeholder->url = 'Url'; -$lang->doc->summary = "Total files on this page: %s , total size: %s, %s"; +$lang->doc->summary = "Total files on this page: %s , total size: %s, %s."; $lang->doc->ge = ':'; $lang->doc->point = '.'; diff --git a/module/doc/lang/en.php b/module/doc/lang/en.php index ebe2fa3a25..86ad3fcb9c 100644 --- a/module/doc/lang/en.php +++ b/module/doc/lang/en.php @@ -211,7 +211,7 @@ $lang->doc->noticeAcl['doc']['private'] = 'Only the one who created it can acces $lang->doc->placeholder = new stdclass(); $lang->doc->placeholder->url = 'URL'; -$lang->doc->summary = "Total files on this page: %s , total size: %s, %s"; +$lang->doc->summary = "Total files on this page: %s , total size: %s, %s."; $lang->doc->ge = ':'; $lang->doc->point = '.'; diff --git a/module/doc/lang/fr.php b/module/doc/lang/fr.php index 69bb0a4d42..b7130464e3 100644 --- a/module/doc/lang/fr.php +++ b/module/doc/lang/fr.php @@ -206,7 +206,7 @@ $lang->doc->noticeAcl['doc']['private'] = 'Seulement celui qui a ajouté le docu $lang->doc->placeholder = new stdclass(); $lang->doc->placeholder->url = 'URL'; -$lang->doc->summary = "Total files on this page: %s , total size: %s, %s"; +$lang->doc->summary = "Total files on this page: %s , total size: %s, %s."; $lang->doc->ge = ':'; $lang->doc->point = '.'; diff --git a/module/doc/lang/vi.php b/module/doc/lang/vi.php index 76edcec8a6..6104d9e766 100644 --- a/module/doc/lang/vi.php +++ b/module/doc/lang/vi.php @@ -206,7 +206,7 @@ $lang->doc->noticeAcl['doc']['private'] = 'Chỉ the one who created it có th $lang->doc->placeholder = new stdclass(); $lang->doc->placeholder->url = 'URL'; -$lang->doc->summary = "Total files on this page: %s , total size: %s, %s"; +$lang->doc->summary = "Total files on this page: %s , total size: %s, %s."; $lang->doc->ge = ':'; $lang->doc->point = '.'; diff --git a/module/doc/model.php b/module/doc/model.php index 6d5782bedb..b9c15f5a00 100644 --- a/module/doc/model.php +++ b/module/doc/model.php @@ -2219,30 +2219,27 @@ EOT; /* Unit conversion. */ $i = 0; - while($sizeCount > 1024) + while($sizeCount > 1024 and $i <= 4) { $sizeCount = $sizeCount / 1024; $i ++; } - $unitList = array('B', 'K', 'M', 'G'); + $unitList = array('B', 'K', 'M', 'G', 'T'); $sizeCount = round($sizeCount, 1) . $unitList[$i]; /* Summary of each type. */ - $extensionNum = count($extensionCount); foreach($extensionCount as $extension => $count) { if(in_array($this->app->getClientLang(), ['zh-cn','zh-tw'])) { - $extensionSummary .= $extension . ' ' . $count . $this->lang->doc->ge; - - $extensionNum--; - if(!empty($extensionNum)) $extensionSummary .= $this->lang->doc->point; + $extensionSummary .= $extension . ' ' . $count . $this->lang->doc->ge . $this->lang->doc->point; } else { $extensionSummary .= $extension . ' ' . $this->lang->doc->ge . ' ' . $count . $this->lang->doc->point; } } + $extensionSummary = rtrim($extensionSummary, $this->lang->doc->point); return sprintf($this->lang->doc->summary, $filesCount, $sizeCount, $extensionSummary); }