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 aaeff73207bb205ab98e3cc6a15b5b1b5fb0abf1..5f7891d7ee0186fd15bf67a455f018c4930c426d 100644 (file)
--- a/templates/email.txt
+++ b/templates/email.txt
@@ -1,8 +1,11 @@
+## -*- coding: utf-8 -*-

 Subject: IRON BLOGGER results for the week beginning ${week_start.strftime("%F")}
 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]))}
 
 SLACKERS: ${", ".join(sorted([u.username for u in lame]))}

-PUNTED for balance greater than $30: ${", ".join(sorted(punt))}
+% if punt:
+PUNTED for balance ≥${currency}${fine * 6}: ${", ".join(sorted(punt))}
+% endif

 
 People who posted:
 % for u in sorted(good, key=lambda u:u.username):
 
 People who posted:
 % for u in sorted(good, key=lambda u:u.username):


@@ -20,11 +23,18 @@ People who have not yet started:
 % endif
 
 Beer pool:
 % endif
 
 Beer pool:

-This week: $${5 * len(lame)}.00
-Total:     $${pool}
-Paid:      $${paid}
+This week: ${currency}${fine * len(lame)}.00
+Total:     ${currency}${pool}
+Paid:      ${currency}${paid}

 
 Individual debts:
 % for (u, v) in sorted(debts, key=lambda p:p[1], reverse=True):
 
 Individual debts:
 % for (u, v) in sorted(debts, key=lambda p:p[1], reverse=True):

-${"%20s $%d" % (u, v)}
+       ${u} ${currency}${v}
+% endfor
+% if punted:
+
+PREVIOUSLY PUNTED (pay ${currency}${fine * 6} balance to return): 
+% for (u) in sorted(punted, key=lambda p:p.username):
+${"%20s (%s)" % (u.username, u.end)}

 % endfor
 % endfor

+% endif