rattail/appypod-rattail
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bugfix while displaying content of textarea-entered text (Strings with format=String.TEXT): for displaying again textarea content, I replaced 'backslash n' with html br tags, but in some cases carriage returns are stored as a sequence of 'backslah r' and 'backslah n' chars. In this case, 'backslash r' chars were left alone in the HTML page, producing sometimes strange behaviour within the browser.

Browse source
This commit is contained in:
Gaetan Delannay 2011-02-23 11:30:44 +01:00
parent 3fc5bc8418
commit 39321b2d38
5 changed files with 25 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

18
gen/plone25/mixins/__init__.py
View file

@ -1162,6 +1162,18 @@ class BaseMixin:
if '-' in res: res = res[:res.find('-')]
return res
def formatText(self, text, format='html'):
'''Produces a representation of p_text into the desired p_format, which
is 'html' by default.'''
if format in ('html', 'xhtml'):
res = text.replace('\r\n', '<br/>').replace('\n', '<br/>')
elif format == 'js':
res = text.replace('\r\n', '').replace('\n', '')
res = res.replace("'", "\\'")
else:
res = text
return res
def translate(self, label, mapping={}, domain=None, default=None,
language=None, format='html'):
'''Translates a given p_label into p_domain with p_mapping.'''
@ -1196,11 +1208,7 @@ class BaseMixin:
if not res: res = label
else:
# Perform replacements, according to p_format.
if format == 'html':
res = res.replace('\r\n', '<br/>').replace('\n', '<br/>')
elif format == 'js':
res = res.replace('\r\n', '').replace('\n', '')
res = res.replace("'", "\\'")
res = self.formatText(res, format)
# Perform variable replacements
for name, repl in mapping.iteritems():
res = res.replace('${%s}' % name, repl)