Dev: Always show storage in megabytes with one decimal and correct ra…

…dix point
LimeSurvey · Sep 22, 2017 · e94f989 · e94f989 · Shnoulle · Sep 22, 2017
1 parent 9aa0183
commit e94f989
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/application/controllers/admin/globalsettings.php b/application/controllers/admin/globalsettings.php
@@ -121,7 +121,7 @@ public function getStorageData()
         $data = array();
 
         $uploaddir = Yii::app()->getConfig("uploaddir");
-        $decimals = 0;
+        $decimals = 1;
 
         $data['totalStorage'] = humanFilesize(folderSize($uploaddir), $decimals);
         $data['templateSize'] = humanFilesize(folderSize($uploaddir . '/templates'), $decimals);

diff --git a/application/helpers/common_helper.php b/application/helpers/common_helper.php
@@ -6176,8 +6176,12 @@ function folderSize($dir)
 function humanFilesize($bytes, $decimals = 2)
 {
     $sz = 'BKMGTP';
-    $factor = floor((strlen($bytes) - 1) / 3);
-    return sprintf("%.{$decimals}f", $bytes / pow(1024, $factor)) . @$sz[$factor];
+    //$factor = floor((strlen($bytes) - 1) / 3);
+    $factor = 2;
+    $string = sprintf("%.{$decimals}f", $bytes / pow(1024, $factor)) . @$sz[$factor];
+    $aLangData = getLanguageData();
+    $radix = getRadixPointData($aLangData[Yii::app()->session['adminlang']]['radixpoint']);
+    return str_replace('.', $radix['separator'], $string);
 }
 
     /**