diff --git a/memopol/templatetags/memopol_tags.py b/memopol/templatetags/memopol_tags.py index 2fe326196b081b519d418576be8ed16d684b4651..6c26fea64e55003f03b79646793ec30724dfc1f2 100644 --- a/memopol/templatetags/memopol_tags.py +++ b/memopol/templatetags/memopol_tags.py @@ -10,23 +10,23 @@ link = '<a class="{network}-link" href="{url}" target="_blank">{label}</a>' @register.filter def twitter_link(url): return mark_safe(link.format(network='twitter', url=url, - label=re.sub(r'.*/@?([^/]+)', '@\\1', url))) + label=re.sub(r'.*/@?([^/]+)', '@\\1', re.sub(r'/$', '', url.strip())))) @register.filter def facebook_link(url): return mark_safe(link.format(network='facebook', url=url, - label=re.sub(r'.*/([^/]+)', '\\1', url))) + label=re.sub(r'.*/([^/]+)', '\\1', re.sub(r'/$', '', url.strip())))) @register.filter def website_link(url): short_url = re.sub(r'^https?://([^/]+).*', '\\1', url) return mark_safe(link.format(network='website', url=url, - label=short_url)) + label=short_url)) @register.filter def email_link(address): return mark_safe(link.format(network='email', url='mailto:%s' % address, - label=address)) + label=address))