Merge branch 'version1.1' into lunadev

Conflicts: lang/English/luna.po
GetLuna · Oct 15, 2015 · 325a10a · 325a10a
2 parents f0e0889 + 2c3f5b2
commit 325a10a
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/include/functions.php b/include/functions.php
@@ -1590,7 +1590,7 @@ function file_size($size) {
 	for ($i = 0; $size > 1024; $i++)
 		$size /= 1024;
 
-	return sprintf(__('Size unit %s', 'luna'), $units[ round($size, 2) ]);
+	return sprintf(__('%s '.$units[$i], 'luna'), round($size, 2));
 }
 
 

diff --git a/lang/English/luna.po b/lang/English/luna.po
@@ -2812,6 +2812,27 @@ msgstr ""
 msgrid "At least 6 characters long"
 msgstr ""
 
+msgid "%s B"
+msgstr ""
+
+msgid "%s KiB"
+msgstr ""
+
+msgid "%s MiB"
+msgstr ""
+
+msgid "%s GiB"
+msgstr ""
+
+msgid "%s TiB"
+msgstr ""
+
+msgid "%s PiB"
+msgstr ""
+
+msgid "%s EiB"
+msgstr ""
+
 msgrid "Board setup"
 msgstr ""