Merge branch 'master' of git+ssh://projects.mako.cc/git/iron-blogger

[iron-blogger] / templates / email.txt

diff --git a/templates/email.txt b/templates/email.txt
index e82b15fb59e1add6f3110110f7402be769266d85..667eaef7a86da25b45cb320dfb46a2a3a522bc5d 100644 (file)
--- a/templates/email.txt
+++ b/templates/email.txt
@@ -1,7 +1,11 @@
+## -*- coding: utf-8 -*-
 Subject: IRON BLOGGER results for the week beginning ${week_start.strftime("%F")}
-To: iron-blogger@mit.edu
+To: iron-blogger@mako.cc
 
 SLACKERS: ${", ".join(sorted([u.username for u in lame]))}
+% if punt:
+PUNTED for balance ≥$30: ${", ".join(sorted(punt))}
+% endif
 
 People who posted:
 % for u in sorted(good, key=lambda u:u.username):
@@ -20,10 +24,15 @@ People who have not yet started:
 
 Beer pool:
 This week: $${5 * len(lame)}.00
-Total:     $${pool}.00
-Paid:      $${paid}.00
+Total:     $${pool}
+Paid:      $${paid}
 
 Individual debts:
 % for (u, v) in sorted(debts, key=lambda p:p[1], reverse=True):
 ${"%20s $%d" % (u, v)}
 % endfor
+
+PREVIOUSLY PUNTED (pay $30 balance to return): 
+% for (u) in sorted(punted, key=lambda p:p.username):
+${"%20s (%s)" % (u.username, u.end)}
+% endfor