From 51640e9893a21312b4edd1ce0efd108e993f6208 Mon Sep 17 00:00:00 2001
From: Christopher Neugebauer <_@chrisjrn.com>
Date: Sun, 17 Jul 2016 01:51:50 -0600
Subject: [PATCH] Fix issue in proposals display code (#49)

* Fixes a biography display-related oops

* Fixes translation issue on cancelled proposals
---
 pinaxcon/templates/symposion/proposals/_proposal_fields.html | 4 ++--
 pinaxcon/templates/symposion/proposals/proposal_detail.html  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pinaxcon/templates/symposion/proposals/_proposal_fields.html b/pinaxcon/templates/symposion/proposals/_proposal_fields.html
index c507d93f..d168f44b 100644
--- a/pinaxcon/templates/symposion/proposals/_proposal_fields.html
+++ b/pinaxcon/templates/symposion/proposals/_proposal_fields.html
@@ -48,10 +48,10 @@
       <h4>{% trans "Speaker:" %} {{ speaker.name }}</h4>
       <h5>{% trans "Biography" %}</h5>
 
-      <div class="biography">{{ proposal.speaker.biography_html|safe }}&nbsp;</div>
+      <div class="biography">{{ speaker.biography_html|safe }}&nbsp;</div>
 
       <h5>{% trans "Experience" %}</h5>
-      <div class="biography">{{ proposal.speaker.experience_html|safe }}&nbsp;</div>
+      <div class="biography">{{ speaker.experience_html|safe }}&nbsp;</div>
     {% endfor %}
 
     {% can_manage proposal as can_manage_proposal %}
diff --git a/pinaxcon/templates/symposion/proposals/proposal_detail.html b/pinaxcon/templates/symposion/proposals/proposal_detail.html
index 401aabae..4548f6e6 100644
--- a/pinaxcon/templates/symposion/proposals/proposal_detail.html
+++ b/pinaxcon/templates/symposion/proposals/proposal_detail.html
@@ -34,7 +34,7 @@
                       </a>
                   {% endif %}
               {% else %}
-                  {% trans 'Cancelled' }
+                  {% trans 'Cancelled' %}
               {% endif %}
           </div>
         </div>