Open Source Projects Europe

--- a/ForgeTracker/forgetracker/templates/ticket_changes.mak
+++ b/ForgeTracker/forgetracker/data/ticket_changed_tmpl
@@ -1,16 +1,22 @@
-% for key, values in changelist:
-% if key == 'description':
-  description has changed
-% else:
-<% oldv, newv = values %>
-% if key == 'assigned_to':
-    <% oldv = oldv.display_name %>
-    <% newv = newv.display_name %>
-% endif
-% if key == 'labels':
-    <% oldv = ', '.join(oldv.display_name) %>
-    <% newv = ', '.join(newv.display_name) %>
-% endif
+{% for key, values in changelist %}
+{% choose %}
+{% when key == 'description' %}
+  description has changed{% end %}
+{% otherwise %}
+{% with oldv, newv = values %}
+{% choose %}
+{% when key == 'assigned_to' %}
+- **${key}**: ${oldv.display_name} → ${newv.display_name}
+{% end %}
+{% when key == 'labels' %}
+- **${key}**: ${', '.join(oldv)} → ${', '.join(newv)}
+{% end %}
+{% otherwise %}
 - **${key}**: ${oldv} → ${newv}
-% endif
-% endfor
+{% end %}
+{% end %}
+{% end %}
+{% end %}
+{% end %}
+{% end %}
+{% end %}