From 130435f257877a1f8bb82f2b432b45c973e5aefc Mon Sep 17 00:00:00 2001
From: Eric Price <ecprice@mit.edu>
Date: Mon, 29 Oct 2007 00:14:12 -0400
Subject: [PATCH] Replace 'megabyte' with 'MiB' to please Anders.

svn path=/trunk/web/; revision=229
---
 templates/list.tmpl     |    4 ++--
 templates/validation.py |    3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/templates/list.tmpl b/templates/list.tmpl
index 95cb96c..d6c0e00 100644
--- a/templates/list.tmpl
+++ b/templates/list.tmpl
@@ -27,12 +27,12 @@ List of your VMs
 $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>
-	  <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>
diff --git a/templates/validation.py b/templates/validation.py
index 0ee8d75..4165aa9 100644
--- 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,
-                           'Maximum %s MiB' % maxMemory(user, machine))
+                           'Maximum %s MiB for %s' % (maxMemory(user, machine),
+                                                      user))
     return memory
 
 def validDisk(user, disk, machine=None):
-- 
1.7.9.5