diff --git a/ietf/release/views.py b/ietf/release/views.py index 8720bcf29..dc086b390 100644 --- a/ietf/release/views.py +++ b/ietf/release/views.py @@ -1,4 +1,5 @@ import os +import re from django.template import RequestContext from django.shortcuts import render_to_response @@ -7,6 +8,14 @@ from django.http import HttpResponse import changelog +def trac_links(text): + # changeset links + text = re.sub(r'\[(\d+)\]', r'[\1]', text) + # issue links + text = re.sub(r'#(\d+)', r'#\1', text) + return text + + def release(request, version=None): entries = {} if os.path.exists(settings.CHANGELOG_PATH): @@ -22,5 +31,6 @@ def release(request, version=None): entries = dict((entry.version, entry) for entry in log_entries) if version == None or version not in entries: version = log_entries[0].version + entries[version].logentry = trac_links(entries[version].logentry) return render_to_response('release/release.html', { 'releases': log_entries, 'version': version, 'entry': entries[version], }, context_instance=RequestContext(request)) diff --git a/ietf/templates/release/release.html b/ietf/templates/release/release.html index 64a842155..2a6c64520 100644 --- a/ietf/templates/release/release.html +++ b/ietf/templates/release/release.html @@ -14,7 +14,7 @@ Release Notes: -{{entry.logentry}} +{{entry.logentry|safe}}
-{{entry.logentry}} +{{entry.logentry|safe}}