Changeset 229 for trunk

Timestamp:

Oct 29, 2007, 12:14:12 AM (17 years ago)

Author:

ecprice

Message:

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

Location:

trunk/web/templates

Files:

• list.tmpl (modified) (1 diff)
• validation.py (modified) (1 diff)

trunk/web/templates/list.tmpl

@@ -28 +28 @@
         <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>
-          <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)

trunk/web/templates/validation.py

@@ -113 +113 @@
     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