Update NL handling in doSignature and doVacation (#330)

This commit is contained in:
Ross Scroggs
2016-11-13 10:48:32 -08:00
committed by Jay Lee
parent fc5cd1c219
commit d5538a79da

View File

@@ -6102,9 +6102,9 @@ def doSignature(users):
if sys.argv[i].lower() == u'file':
filename = sys.argv[i+1]
i, encoding = getCharSet(i+2)
signature = readFile(filename, encoding=encoding).replace(u'\\n', u'<br/>').replace(u'\n', u'<br/>')
signature = readFile(filename, encoding=encoding).replace(u'\\n', u'<br/>')
else:
signature = getString(i, u'String', emptyOK=True).replace(u'\\n', u'<br/>').replace(u'\n', u'<br/>')
signature = getString(i, u'String', emptyOK=True).replace(u'\\n', u'<br/>')
i += 1
body = {}
while i < len(sys.argv):
@@ -6200,7 +6200,7 @@ def doVacation(users):
sys.exit(2)
if message:
if responseBodyType == u'responseBodyHtml':
message = message.replace(u'\\n', u'<br/>').replace(u'\n', u'<br/>')
message = message.replace(u'\\n', u'<br/>')
else:
message = message.replace(u'\\n', u'\n')
if tagReplacements: