Move byte units translations to proper place.

libraries/common.lib.php

@@ -1375,21 +1375,24 @@ function PMA_profilingResults($profiling_results)
  */
 function PMA_formatByteDown($value, $limes = 6, $comma = 0)
 {
+    /* l10n: shortcuts for Byte, Kilo, Mega, Giga, Tera, Peta, Exa+ */
+    $byteUnits = array(__('B'), __('KiB'), __('MiB'), __('GiB'), __('TiB'), __('PiB'), __('EiB'));
+
     $dh           = PMA_pow(10, $comma);
     $li           = PMA_pow(10, $limes);
     $return_value = $value;
-    $unit         = $GLOBALS['byteUnits'][0];
+    $unit         = $byteUnits[0];
 
     for ($d = 6, $ex = 15; $d >= 1; $d--, $ex-=3) {
-        if (isset($GLOBALS['byteUnits'][$d]) && $value >= $li * PMA_pow(10, $ex)) {
+        if (isset($byteUnits[$d]) && $value >= $li * PMA_pow(10, $ex)) {
             // use 1024.0 to avoid integer overflow on 64-bit machines
             $value = round($value / (PMA_pow(1024, $d) / $dh)) /$dh;
-            $unit = $GLOBALS['byteUnits'][$d];
+            $unit = $byteUnits[$d];
             break 1;
         } // end if
     } // end for
 
-    if ($unit != $GLOBALS['byteUnits'][0]) {
+    if ($unit != $byteUnits[0]) {
         // if the unit is not bytes (as represented in current language)
         // reformat with max length of 5
         // 4th parameter=true means do not reformat if value < 1

libraries/messages.inc.php

@@ -21,8 +21,6 @@ $text_dir = __('ltr');
 $number_thousands_separator = __(',');
 /* l10n: Decimal separator */
 $number_decimal_separator = __('.');
-// shortcuts for Byte, Kilo, Mega, Giga, Tera, Peta, Exa
-$byteUnits = array(__('B'), __('KiB'), __('MiB'), __('GiB'), __('TiB'), __('PiB'), __('EiB'));
 
 $strAbortedClients = __('Aborted');
 $strAccessDenied = __('Access denied');

test/PMA_formatNumberByteDown_test.php

@@ -43,7 +43,7 @@ class PMA_formatNumberByteDown_test extends PHPUnit_Framework_TestCase
 
         $this->tmpGlobals = $GLOBALS;
         $this->tmpSession = $_SESSION;
-        
+
     }
 
     /**
@@ -107,10 +107,9 @@ class PMA_formatNumberByteDown_test extends PHPUnit_Framework_TestCase
      */
 
     public function testFormatByteDown($a, $b, $c, $e) {
-        $GLOBALS['byteUnits'] = array('B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB');
         $GLOBALS['number_thousands_separator'] = ' ';
         $GLOBALS['number_decimal_separator'] = ',';
-        
+
 
         $result = PMA_formatByteDown($a, $b, $c);
         $result[0] = trim($result[0]);