cms/converters.py - Issue 6556935134380032: Issue 2344 - Fix <em> in translatable strings is being turned into <em >

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line
<Enter> :	respond to / edit current comment
d :	mark current comment as done

	Issue
u :	up to list of issues
m :	publish + mail comments
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue
# :	close issue

	Comment/message editing
<Ctrl> + s or <Ctrl> + Enter :	save comment
<Esc> :	cancel edit

Unified Diff: cms/converters.py

Issue 6556935134380032: Issue 2344 - Fix <em> in translatable strings is being turned into <em > (Closed)

Patch Set: Created April 18, 2015, 7:11 a.m.

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

Index: cms/converters.py

===================================================================

--- a/cms/converters.py

+++ b/cms/converters.py

@@ -158,17 +158,17 @@ class Converter:

return '%s="%s"' % (escape(name), escape(value))

for tag in self.whitelist:

saved = saved_attributes.get(tag, [])

for attrs in saved:

attrs = map(stringify_attribute, attrs)

result = re.sub(

r"%s([^<>]*?)%s" % (re_escape("<%s>" % tag), re_escape("</%s>" % tag)),

- r'<%s %s>\1</%s>' % (tag, " ".join(attrs), tag),

+ r'<%s%s>\1</%s>' % (tag, " " + " ".join(attrs) if attrs else "", tag),

result, 1, flags=re.S

)

result = re.sub(

r"%s([^<>]*?)%s" % (re_escape("<%s>" % tag), re_escape("</%s>" % tag)),

r"<%s>\1</%s>" % (tag, tag),

result, flags=re.S

)

return result

« no previous file with comments | « no previous file | no next file » | no next file with comments »