Merge branch 'master' of ssh://dev.dredd.it/dreddit-auth

templates/sso/character.html

@@ -12,8 +12,8 @@
 
 
 <ul>
-<li>Race: {{ character.race_description }}</li>
-<li>Gender: {{ character.gender_description }}</li>
+<li>Race: {{ character.get_race_display }}</li>
+<li>Gender: {{ character.get_gender_display }}</li>
 <li>Corporation: {{ character.corporation.name }}</li>
 <li>Alliance: {{ character.corporation.alliance.name }}</li>
 <li>Total SP: {{ character.total_sp|intcomma }}</li>

templates/sso/profile.html

@@ -70,7 +70,7 @@ setup.</p>
 <tr><td>{{ acc.api_user_id }}</td>
     <td>{{ acc.api_key }}</td>
     <td>{{ acc.description }}</td>
-    <td>{{ acc.api_status_description }}</td>
+    <td>{{ acc.get_api_status_display }}</td>
     <td>{{ acc.api_last_updated|naturaltimediff }}</td>
     <td><a href="{% url sso.views.eveapi_refresh acc.api_user_id %}">Refresh</a>,&nbsp;
         <a href="{% url sso.views.eveapi_log acc.api_user_id %}">Logs</a>,&nbsp;