Replace 'megabyte' with 'MiB' to please Anders.

svn path=/trunk/web/; revision=229

diff --git a/templates/list.tmpl b/templates/list.tmpl
index 95cb96c..d6c0e00 100644 (file)
--- a/templates/list.tmpl
+++ b/templates/list.tmpl
@@ -27,12 +27,12 @@ List of your VMs
 $errorRow('name', $err)
        <tr>
          <td>Memory</td>
 $errorRow('name', $err)
        <tr>
          <td>Memory</td>

-         <td><input type="text" name="memory" value="$defaults.memory" size=3/> megabytes ($max_memory max)</td>
+         <td><input type="text" name="memory" value="$defaults.memory" size=3/> MiB ($max_memory max)</td>

        </tr>
 $errorRow('memory', $err)
        <tr>
          <td>Disk</td>
        </tr>
 $errorRow('memory', $err)
        <tr>
          <td>Disk</td>

-         <td><input type="text" name="disk" value="$defaults.disk" size=3/> gigabytes (${"%0.1f" % ($max_disk-0.05)} max)</td>
+         <td><input type="text" name="disk" value="$defaults.disk" size=3/> GiB (${"%0.1f" % ($max_disk-0.05)} max)</td>

        </tr>
 $errorRow('disk', $err)
        <tr>
        </tr>
 $errorRow('disk', $err)
        <tr>

diff --git a/templates/validation.py b/templates/validation.py
index 0ee8d75..4165aa9 100644 (file)
--- a/templates/validation.py
+++ b/templates/validation.py
@@ -112,7 +112,8 @@ def validMemory(user, memory, machine=None, on=True):
                            "Minimum %s MiB" % MIN_MEMORY_SINGLE)
     if memory > maxMemory(user, machine, on):
         raise InvalidInput('memory', memory,
                            "Minimum %s MiB" % MIN_MEMORY_SINGLE)
     if memory > maxMemory(user, machine, on):
         raise InvalidInput('memory', memory,

-                           'Maximum %s MiB' % maxMemory(user, machine))
+                           'Maximum %s MiB for %s' % (maxMemory(user, machine),
+                                                      user))

     return memory
 
 def validDisk(user, disk, machine=None):
     return memory
 
 def validDisk(user, disk, machine=None):