[phpwiki-checkins] SF.net SVN: phpwiki:[10716] trunk

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 10716
          http://sourceforge.net/p/phpwiki/code/10716
Author:   vargenau
Date:     2021-11-30 18:45:36 +0000 (Tue, 30 Nov 2021)
Log Message:
-----------
FileInfo plugin: use binary prefixes

Modified Paths:
--------------
    trunk/lib/plugin/FileInfo.php
    trunk/locale/de/LC_MESSAGES/phpwiki.mo
    trunk/locale/es/LC_MESSAGES/phpwiki.mo
    trunk/locale/fr/LC_MESSAGES/phpwiki.mo
    trunk/locale/it/LC_MESSAGES/phpwiki.mo
    trunk/locale/ja/LC_MESSAGES/phpwiki.mo
    trunk/locale/nl/LC_MESSAGES/phpwiki.mo
    trunk/locale/po/de.po
    trunk/locale/po/es.po
    trunk/locale/po/fr.po
    trunk/locale/po/it.po
    trunk/locale/po/ja.po
    trunk/locale/po/nl.po
    trunk/locale/po/phpwiki.pot
    trunk/locale/po/sv.po
    trunk/locale/po/zh.po
    trunk/locale/sv/LC_MESSAGES/phpwiki.mo
    trunk/locale/zh/LC_MESSAGES/phpwiki.mo

Modified: trunk/lib/plugin/FileInfo.php
===================================================================

--- trunk/lib/plugin/FileInfo.php	2021-11-30 18:18:01 UTC (rev 10715)
+++ trunk/lib/plugin/FileInfo.php	2021-11-30 18:45:36 UTC (rev 10716)
@@ -209,12 +209,12 @@
         return $result;
     }
 
-    private function _formatsize($n, $factor, $suffix = '')
+    private function formatsize($n, $factor, $suffix)
     {
         if ($n > $factor) {
             $b = $n / $factor;
             $n -= floor($factor * $b);
-            return number_format($b, $n ? 3 : 0) . $suffix;
+            return number_format($b, $n ? 3 : 0) . ' ' . $suffix;
         }
         return '';
     }
@@ -221,17 +221,17 @@
 
     private function phonysize($a)
     {
-        $factor = 1024 * 1024 * 1000;
+        $factor = 1024 * 1024 * 1024;
         if ($a > $factor)
-            return $this->_formatsize($a, $factor, ' GB');
-        $factor = 1024 * 1000;
+            return $this->formatsize($a, $factor, _('GiB'));
+        $factor = 1024 * 1024;
         if ($a > $factor)
-            return $this->_formatsize($a, $factor, ' MB');
+            return $this->formatsize($a, $factor, _('MiB'));
         $factor = 1024;
         if ($a > $factor)
-            return $this->_formatsize($a, $factor, ' KB');
+            return $this->formatsize($a, $factor, _('KiB'));
         if ($a > 1)
-            return $this->_formatsize($a, 1, ' byte');
+            return $this->formatsize($a, 1, _('bytes'));
         else
             return $a;
     }

Modified: trunk/locale/de/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/es/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/it/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/ja/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/nl/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/po/de.po
===================================================================
--- trunk/locale/po/de.po	2021-11-30 18:18:01 UTC (rev 10715)
+++ trunk/locale/po/de.po	2021-11-30 18:45:36 UTC (rev 10716)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-30 18:25+0100\n"
+"POT-Creation-Date: 2021-11-30 19:43+0100\n"
 "PO-Revision-Date: 2000-10-31 02:23+0200\n"
 "Last-Translator: Reini Urban <ru...@x-...>, Carsten Klapp "
 "<car...@us...>, Helmer Pardun <pardunpress@t-online."
@@ -1694,6 +1694,18 @@
 msgid "page not locked"
 msgstr "Seite nicht gesperrt"
 
+msgid "GiB"
+msgstr ""
+
+msgid "MiB"
+msgstr ""
+
+msgid "KiB"
+msgstr ""
+
+msgid "bytes"
+msgstr "Bytes"
+
 msgid "Parse an RDF FOAF file and extract information to render as HTML."
 msgstr ""
 

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2021-11-30 18:18:01 UTC (rev 10715)
+++ trunk/locale/po/es.po	2021-11-30 18:45:36 UTC (rev 10716)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-30 18:25+0100\n"
+"POT-Creation-Date: 2021-11-30 19:43+0100\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -619,7 +619,7 @@
 
 #, php-format
 msgid "%s bytes written"
-msgstr "%s octetos"
+msgstr "%s octetos escritos"
 
 msgid "PhpWikiAdministration"
 msgstr "AdministraciónDePhpWiki"
@@ -1664,6 +1664,18 @@
 msgid "page not locked"
 msgstr "página no está bloqueada"
 
+msgid "GiB"
+msgstr "Gio"
+
+msgid "MiB"
+msgstr "Mio"
+
+msgid "KiB"
+msgstr "Kio"
+
+msgid "bytes"
+msgstr "octetos"
+
 msgid "Parse an RDF FOAF file and extract information to render as HTML."
 msgstr ""
 
@@ -4485,7 +4497,7 @@
 
 #, php-format
 msgid "%s B"
-msgstr ""
+msgstr "%s o"
 
 #, php-format
 msgid "%s bytes"

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2021-11-30 18:18:01 UTC (rev 10715)
+++ trunk/locale/po/fr.po	2021-11-30 18:45:36 UTC (rev 10716)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-30 18:25+0100\n"
+"POT-Creation-Date: 2021-11-30 19:43+0100\n"
 "PO-Revision-Date: 2004-06-22 21:10+0200\n"
 "Last-Translator: Pierrick Meignen <mei...@wa...>, Roland "
 "Trique <rol...@fr...>, Stéphane Gourichon <stephane.gourichon@lip6."
@@ -1691,6 +1691,18 @@
 msgid "page not locked"
 msgstr "page déverrouillée"
 
+msgid "GiB"
+msgstr "Gio"
+
+msgid "MiB"
+msgstr "Mio"
+
+msgid "KiB"
+msgstr "Kio"
+
+msgid "bytes"
+msgstr "octets"
+
 msgid "Parse an RDF FOAF file and extract information to render as HTML."
 msgstr ""
 "Analyser un fichier RDF FOAF et extraire les informations à afficher en HTML."
@@ -4585,7 +4597,7 @@
 
 #, php-format
 msgid "%s B"
-msgstr ""
+msgstr "%s o"
 
 #, php-format
 msgid "%s bytes"

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2021-11-30 18:18:01 UTC (rev 10715)
+++ trunk/locale/po/it.po	2021-11-30 18:45:36 UTC (rev 10716)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-30 18:25+0100\n"
+"POT-Creation-Date: 2021-11-30 19:43+0100\n"
 "PO-Revision-Date: 2005-02-12 16:23+0100\n"
 "Last-Translator: Antonio Bonifati ant[(at)]monitor.deis.unical.it\n"
 "Language-Team: \n"
@@ -1647,6 +1647,18 @@
 msgid "page not locked"
 msgstr "pagina non bloccata"
 
+msgid "GiB"
+msgstr ""
+
+msgid "MiB"
+msgstr ""
+
+msgid "KiB"
+msgstr ""
+
+msgid "bytes"
+msgstr "byte"
+
 msgid "Parse an RDF FOAF file and extract information to render as HTML."
 msgstr ""
 

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2021-11-30 18:18:01 UTC (rev 10715)
+++ trunk/locale/po/ja.po	2021-11-30 18:45:36 UTC (rev 10716)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-30 18:25+0100\n"
+"POT-Creation-Date: 2021-11-30 19:43+0100\n"
 "PO-Revision-Date: 2003-06-07 09:01+0900\n"
 "Last-Translator: Tadashi Jokagi <web...@el...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -1633,6 +1633,18 @@
 msgid "page not locked"
 msgstr ""
 
+msgid "GiB"
+msgstr ""
+
+msgid "MiB"
+msgstr ""
+
+msgid "KiB"
+msgstr "キロバイト"
+
+msgid "bytes"
+msgstr "バイト"
+
 msgid "Parse an RDF FOAF file and extract information to render as HTML."
 msgstr ""
 

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2021-11-30 18:18:01 UTC (rev 10715)
+++ trunk/locale/po/nl.po	2021-11-30 18:45:36 UTC (rev 10716)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-30 18:25+0100\n"
+"POT-Creation-Date: 2021-11-30 19:43+0100\n"
 "PO-Revision-Date: 2000-09-30 02:23+0200\n"
 "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
 "Language-Team: Dutch <nl...@li...>\n"
@@ -1639,6 +1639,18 @@
 msgid "page not locked"
 msgstr ""
 
+msgid "GiB"
+msgstr ""
+
+msgid "MiB"
+msgstr ""
+
+msgid "KiB"
+msgstr ""
+
+msgid "bytes"
+msgstr ""
+
 msgid "Parse an RDF FOAF file and extract information to render as HTML."
 msgstr ""
 

Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2021-11-30 18:18:01 UTC (rev 10715)
+++ trunk/locale/po/phpwiki.pot	2021-11-30 18:45:36 UTC (rev 10716)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-30 18:25+0100\n"
+"POT-Creation-Date: 2021-11-30 19:43+0100\n"
 "PO-Revision-Date: 2002-12-14 17:51-0500\n"
 "Last-Translator: Reini Urban <ru...@us...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -1633,6 +1633,18 @@
 msgid "page not locked"
 msgstr ""
 
+msgid "GiB"
+msgstr ""
+
+msgid "MiB"
+msgstr ""
+
+msgid "KiB"
+msgstr ""
+
+msgid "bytes"
+msgstr ""
+
 msgid "Parse an RDF FOAF file and extract information to render as HTML."
 msgstr ""
 

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2021-11-30 18:18:01 UTC (rev 10715)
+++ trunk/locale/po/sv.po	2021-11-30 18:45:36 UTC (rev 10716)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-30 18:25+0100\n"
+"POT-Creation-Date: 2021-11-30 19:43+0100\n"
 "PO-Revision-Date: 2001-01-27 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"
@@ -1634,6 +1634,18 @@
 msgid "page not locked"
 msgstr ""
 
+msgid "GiB"
+msgstr ""
+
+msgid "MiB"
+msgstr ""
+
+msgid "KiB"
+msgstr ""
+
+msgid "bytes"
+msgstr ""
+
 msgid "Parse an RDF FOAF file and extract information to render as HTML."
 msgstr ""
 

Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2021-11-30 18:18:01 UTC (rev 10715)
+++ trunk/locale/po/zh.po	2021-11-30 18:45:36 UTC (rev 10716)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-30 18:25+0100\n"
+"POT-Creation-Date: 2021-11-30 19:43+0100\n"
 "PO-Revision-Date: 2004-04-21 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"
@@ -1640,6 +1640,18 @@
 msgid "page not locked"
 msgstr "頁面已被解鎖定"
 
+msgid "GiB"
+msgstr ""
+
+msgid "MiB"
+msgstr ""
+
+msgid "KiB"
+msgstr ""
+
+msgid "bytes"
+msgstr ""
+
 msgid "Parse an RDF FOAF file and extract information to render as HTML."
 msgstr ""
 

Modified: trunk/locale/sv/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/zh/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.



