Move appended strings to options array.

Author: lonnieezell

system/Helpers/number_helper.php

@@ -80,10 +80,9 @@ function number_to_size($num, int $precision = 1, string $locale=null)
         else
         {
             $unit = lang('Number.bytes');
-            return number_format($num).' '.$unit;
         }
 
-        return format_number($num, $precision, $locale).' '.$unit;
+        return format_number($num, $precision, $locale, ['after' => ' '.$unit]);
     }
 }
 
@@ -147,7 +146,7 @@ function number_to_amount($num, int $precision, string $locale = null)
             $num = round(($num/1000), $precision);
         }
 
-        return format_number($num, $precision, $locale). $suffix;
+        return format_number($num, $precision, $locale, ['after' => $suffix]);
     }
 }
 
@@ -175,11 +174,25 @@ function format_number($num, int $precision = 1, string $locale = null, array $o
         // Try to format it per the locale
         $output = $formatter->format($num);
 
+        // This might lead a trailing period if $precision == 0
+        $output = trim($output, '. ');
+
         if (intl_is_failure($formatter->getErrorCode()))
         {
             throw new BadFunctionCallException($formatter->getErrorMessage());
         }
 
+        // Add on any before/after text.
+        if (isset($options['before']) && is_string($options['before']))
+        {
+            $output = $options['before'].$output;
+        }
+
+        if (isset($options['after']) && is_string($options['after']))
+        {
+            $output .= $options['after'];
+        }
+
         return $output;
     }
 }

tests/system/Helpers/NumberHelperTest.php

@@ -16,9 +16,6 @@ public function test_format_number()
         $this->assertEquals('123,456', format_number(123456, 0, 'en_US'));
     }
 
-    /**
-     * @group single
-     */
     public function test_format_number_with_precision()
     {
         $this->assertEquals('123,456.8', format_number(123456.789, 1, 'en_US'));