Fix bug if used memory is between 1000 and 1024 KiB, MiB, ...

If the memory used (or other values used as parameter of format_size)
ends in the range [1000, 1024) KiB/MiB/GiB... AWS and CWS will fail
rendering that size and the submission details wont be shown! This
because the number of digits of the number was supposed being at most
3, not true anymore since 1024 is used as the base.

Allowing an extra significant digit for those cases is the proposed solution.

Author: edomora97

cms/locale/locale.py

@@ -11,6 +11,7 @@
 # Copyright © 2014 Fabian Gundlach <320pointsguy@gmail.com>
 # Copyright © 2015 William Di Luigi <williamdiluigi@gmail.com>
 # Copyright © 2016 Myungwoo Chun <mc.tamaki@gmail.com>
+# Copyright © 2018 Edoardo Morassutto <edoardo.morassutto@gmail.com>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
@@ -238,7 +239,8 @@ def format_size(self, n):
             if n < self.PREFIX_FACTOR:
                 f = copy.copy(self.locale.decimal_formats[None])
                 # We need int because floor returns a float in py2.
-                d = int(2 - math.floor(math.log10(n)))
+                # if 1000 <= n < 1024 d can be negative, cap to 0 decimals
+                d = max(0, int(2 - math.floor(math.log10(n))))
                 f.frac_prec = (d, d)
                 return (self.gettext(unit)
                         % babel.numbers.format_decimal(n, format=f,

cmstestsuite/unit_tests/locale/locale_test.py

@@ -3,6 +3,7 @@
 
 # Contest Management System - http://cms-dev.github.io/
 # Copyright © 2018 Luca Wehrstedt <luca.wehrstedt@gmail.com>
+# Copyright © 2018 Edoardo Morassutto <edoardo.morassutto@gmail.com>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
@@ -471,15 +472,33 @@ def test_small_values(self):
         self.assertEqual(ENGLISH.format_size(2),
                          "2 bytes")
 
-    def test_cutoff(self):
-        # Cutoff is at 1000, not 1024, as we use kilo, mega, ... rather
-        # than kibi, mebi, ...
+    def test_cutoff_kib(self):
         self.assertEqual(ENGLISH.format_size(999),
                          "999 bytes")
         self.assertEqual(ENGLISH.format_size(1000),
                          "1,000 bytes")
+        self.assertEqual(ENGLISH.format_size(1001),
+                         "1,001 bytes")
+        self.assertEqual(ENGLISH.format_size(1023),
+                         "1,023 bytes")
         self.assertEqual(ENGLISH.format_size(1024),
                          "1.00 KiB")
+        self.assertEqual(ENGLISH.format_size(1025),
+                         "1.00 KiB")
+
+    def test_cutoff_mib(self):
+        self.assertEqual(ENGLISH.format_size(999 * 1024),
+                         "999 KiB")
+        self.assertEqual(ENGLISH.format_size(1000 * 1024),
+                         "1,000 KiB")
+        self.assertEqual(ENGLISH.format_size(1001 * 1024),
+                         "1,001 KiB")
+        self.assertEqual(ENGLISH.format_size(1023 * 1024),
+                         "1,023 KiB")
+        self.assertEqual(ENGLISH.format_size(1024 * 1024),
+                         "1.00 MiB")
+        self.assertEqual(ENGLISH.format_size(1025 * 1024),
+                         "1.00 MiB")
 
     def test_large(self):
         # Ensure larger units are used for larger values, with rounding
@@ -505,13 +524,34 @@ def test_localized_small_values(self):
         self.assertEqual(FRENCH.format_size(2),
                          "2 octets")
 
-    def test_localized_cutoff(self):
+    def test_localized_cutoff_kib(self):
         self.assertEqual(FRENCH.format_size(999),
                          "999 octets")
         self.assertEqual(FRENCH.format_size(1000),
                          "1\N{NO-BREAK SPACE}000 octets")
+        self.assertEqual(FRENCH.format_size(1001),
+                         "1\N{NO-BREAK SPACE}001 octets")
+        self.assertEqual(FRENCH.format_size(1023),
+                         "1\N{NO-BREAK SPACE}023 octets")
         self.assertEqual(FRENCH.format_size(1024),
                          "1,00 Kio")
+        self.assertEqual(FRENCH.format_size(1025),
+                         "1,00 Kio")
+
+    def test_localized_cutoff_mib(self):
+        self.assertEqual(FRENCH.format_size(999 * 1024),
+                         "999 Kio")
+        self.assertEqual(FRENCH.format_size(1000 * 1024),
+                         "1\N{NO-BREAK SPACE}000 Kio")
+        self.assertEqual(FRENCH.format_size(1001 * 1024),
+                         "1\N{NO-BREAK SPACE}001 Kio")
+        self.assertEqual(FRENCH.format_size(1023 * 1024),
+                         "1\N{NO-BREAK SPACE}023 Kio")
+        self.assertEqual(FRENCH.format_size(1024 * 1024),
+                         "1,00 Mio")
+        self.assertEqual(FRENCH.format_size(1025 * 1024),
+                         "1,00 Mio")
+
 
     def test_localized_large(self):
         self.assertEqual(FRENCH.format_size(2.345 * 1000000),