mirror/FreshRSS
0
0
Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-05-07 22:54:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

Formatage nombres

Browse Source 
Implémente https://github.com/marienfressinaud/FreshRSS/issues/395
This commit is contained in:
Alexandre Alapetite
2014-01-26 17:11:24 +01:00
parent 004a652f8a
commit 1031c19779
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/configure/archiving.phtml
View File

@@ -39,7 +39,7 @@
<div class="form-group">
<p class="group-name"><?php echo Minz_Translate::t('current_user'); ?></p>
<div class="group-controls">
<p><?php echo $this->nb_total, ' ', Minz_Translate::t('articles'), ', ', formatBytes($this->size_user); ?></p>
<p><?php echo formatNumber($this->nb_total), ' ', Minz_Translate::t('articles'), ', ', formatBytes($this->size_user); ?></p>
<input type="hidden" name="optimiseDatabase" value="1" />
<button type="submit" class="btn btn-important"><?php echo Minz_Translate::t('optimize_bdd'); ?></button>
<?php echo FreshRSS_Themes::icon('help'); ?> <?php echo Minz_Translate::t('optimize_todo_sometimes'); ?>

7
lib/lib_rss.php
View File

@@ -62,6 +62,11 @@ function small_hash ($txt) {
return strtr ($t, '+/', '-_');
}
function formatNumber($n, $precision = 0) {
return str_replace(' ', '&#8239;', //Espace fine insécable
number_format($n, $precision, '.', ' ')); //number_format does not seem to be Unicode-compatible
}
function formatBytes($bytes, $precision = 2, $system = 'IEC') {
if ($system === 'IEC') {
$base = 1024;
@@ -74,7 +79,7 @@ function formatBytes($bytes, $precision = 2, $system = 'IEC') {
$pow = $bytes === 0 ? 0 : floor(log($bytes) / log($base));
$pow = min($pow, count($units) - 1);
$bytes /= pow($base, $pow);
return round($bytes, $precision) . ' ' . $units[$pow];
return formatNumber($bytes, $precision) . ' ' . $units[$pow];
}
function timestamptodate ($t, $hour = true) {