[Scummvm-cvs-logs] scummvm-web master -> e70a5966e059a47e3331a1224b0552c8a1f34233

sev- sev at scummvm.org
Wed Mar 2 00:30:51 CET 2016


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm-web' repo located at https://github.com/scummvm/scummvm-web .

Summary:
e70a5966e0 WEB: Gracefully round file size, remove extra info


Commit: e70a5966e059a47e3331a1224b0552c8a1f34233
    https://github.com/scummvm/scummvm-web/commit/e70a5966e059a47e3331a1224b0552c8a1f34233
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-03-02T00:30:18+01:00

Commit Message:
WEB: Gracefully round file size, remove extra info

Changed paths:
    include/Objects/File.php
    lang/lang.de.ini
    lang/lang.fr.ini
    lang/lang.ini
    lang/lang.ru.ini
    templates/list_items.tpl



diff --git a/include/Objects/File.php b/include/Objects/File.php
index a7b9254..35b2ac3 100644
--- a/include/Objects/File.php
+++ b/include/Objects/File.php
@@ -44,8 +44,22 @@ class File extends BasicObject {
 
 			if (is_file($fname) && is_readable($fname)) {
 				$this->_extra_info = array();
-				$this->_extra_info['size'] = round((@filesize($fname) / 1024));
-				$this->_extra_info['ext'] = substr($url, (strrpos($url, '.')+1));
+				$sz = round((@filesize($fname) / 1024));
+
+				if ($sz < 1024) {
+					$sz = $sz . "K";
+				} else {
+					$sz /= 1024;
+
+					if ($sz < 1024) {
+						$sz = round($sz, 1) . "M";
+					} else {
+						$sz /= 1024;
+						$sz = round($sz, 2) . "G";
+					}
+				}
+				$this->_extra_info['size'] = $sz;
+				$this->_extra_info['ext'] = substr($url, (strrpos($url, '.')));
 			}
 		}
 		$this->_url = $url;
diff --git a/lang/lang.de.ini b/lang/lang.de.ini
index db9a42d..a2a1ea4 100644
--- a/lang/lang.de.ini
+++ b/lang/lang.de.ini
@@ -324,7 +324,7 @@ linksIntro = "<b>Verlinken Sie zu uns:</b> Bitte verwenden Sie dieses Bild, wenn
 
 # list_items.tpl
 listItemsBuildFromRepo = "aus dem aktuellen Quellcode gebaut,"
-listItemsFile = ", zuletzt aktualisiert:"
+listItemsDate = ", zuletzt aktualisiert:"
 
 # NewsPage.php
 newsTitle = "Startseite"
diff --git a/lang/lang.fr.ini b/lang/lang.fr.ini
index 7d778a5..f61f91d 100644
--- a/lang/lang.fr.ini
+++ b/lang/lang.fr.ini
@@ -321,7 +321,7 @@ linksIntro = "<b>Liens vers le site de ScummVM :</b> vous pouvez utiliser cett
 
 # list_items.tpl
 listItemsBuildFromRepo = "compilé à partir du dépôt,"
-listItemsFile = ", dernière mise à jour :"
+listItemsDate = ", dernière mise à jour :"
 
 # NewsPage.php
 newsTitle = "Accueil"
diff --git a/lang/lang.ini b/lang/lang.ini
index fc9ad7b..2f4e6ba 100644
--- a/lang/lang.ini
+++ b/lang/lang.ini
@@ -319,7 +319,7 @@ linksIntro = "<b>Link to us:</b> If you want to link your site to us: please fee
 
 # list_items.tpl
 listItemsBuildFromRepo = "build from repository,"
-listItemsFile = "file, last update:"
+listItemsDate = ", last update:"
 
 # NewsPage.php
 newsTitle = "Home"
diff --git a/lang/lang.ru.ini b/lang/lang.ru.ini
index 07c6bbf..bef9b86 100644
--- a/lang/lang.ru.ini
+++ b/lang/lang.ru.ini
@@ -324,7 +324,7 @@ linksIntro = "<b>Добавляйте ссылки на нас:</b> Если в
 
 # list_items.tpl
 listItemsBuildFromRepo = "собрано из репозитория,"
-listItemsFile = "-файл, последнее обновление:"
+listItemsDate = ", последнее обновление:"
 
 # NewsPage.php
 newsTitle = "Главная"
diff --git a/templates/list_items.tpl b/templates/list_items.tpl
index 696aaf0..4da25d6 100644
--- a/templates/list_items.tpl
+++ b/templates/list_items.tpl
@@ -11,7 +11,7 @@
 					{if is_array($data)}
 						(
 							{if $item->getType() == 'daily'}{#listItemsBuildFromRepo#} {/if}
-							{$data.size}K {if $data.ext == 'exe'}Win32 {/if}{$data.ext} {#listItemsFile#} {$data.date}
+							{$data.size} {if $data.ext == '.exe'}Win32 {/if}{$data.ext}{if $data.date != ""}{#listItemsDate#}{$data.date}{/if}
 						)
 					{else}
 						{if $item->getType() != 'daily'}






More information about the Scummvm-git-logs mailing list