From 9fbce20016c8e399b4befd19abf3ba9b63d90fa1 Mon Sep 17 00:00:00 2001
From: KeyserSosa <chris@reddit.com>
Date: Tue, 7 Jul 2009 15:05:15 -0700
Subject: [PATCH] fix to subreddit creation when user's language is not english

---
 r2/r2/templates/createsubreddit.html | 11 ++++++-----
 r2/r2/templates/printable.html       |  3 ++-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/r2/r2/templates/createsubreddit.html b/r2/r2/templates/createsubreddit.html
index 8f88e17f3..fbd7cd39d 100644
--- a/r2/r2/templates/createsubreddit.html
+++ b/r2/r2/templates/createsubreddit.html
@@ -36,7 +36,7 @@ function update_title(elem) {
 }
 </script>
 
-<%def name="radio_type(name, text)">
+<%def name="radio_type(name, title, text)">
   <% full_name = "type_" + name %>
   <tr>
     <td class="nowrap nopadding">
@@ -47,7 +47,7 @@ function update_title(elem) {
              checked="checked"
              %endif
              />
-      <label for="${full_name}">${name}</label>
+      <label for="${full_name}">${title}</label>
     </td>
     <td class="leftpad"><span class="gray">${text}</span></td>
   </tr>
@@ -152,10 +152,11 @@ function update_title(elem) {
       </th>
       <td colspan="2" class="prefright">
          <table >
-         ${radio_type(_("public"), _("anyone can view and submit"))}
-         ${radio_type(_("restricted"), 
+         ${radio_type("public", _("public"), _("anyone can view and submit"))}
+         ${radio_type("restricted", _("restricted"), 
                 _("anyone can view, but only contributors can submit links"))}
-         ${radio_type(_("private"), _("only contributors can view and submit"))}
+         ${radio_type("private", _("private"),
+                _("only contributors can view and submit"))}
          </table>
       </td>
     </tr>
diff --git a/r2/r2/templates/printable.html b/r2/r2/templates/printable.html
index 389b1cb48..005907906 100644
--- a/r2/r2/templates/printable.html
+++ b/r2/r2/templates/printable.html
@@ -34,7 +34,8 @@ ${self.RenderPrintable()}
   %if thing.show_spam:
       <li><b>[
         %if c.user_is_admin:
-          ${"auto" if thing.autobanned else ""}banned by ${thing.banner}
+          ${"auto" if thing.autobanned else ""}banned 
+          ${("by %s" % thing.banner) if thing.banner else ""}
         %elif thing.moderator_banned and thing.banner:
           ${strings.banned_by % thing.banner}
         %else: