merge (sorry, no rebase on vm)

This commit is contained in:
rolux 2012-02-25 10:52:58 +00:00
commit 40dcee8e40

View file

@ -1226,12 +1226,13 @@ class Item(models.Model):
s = q[0] s = q[0]
for data in s.srt(offset): for data in s.srt(offset):
subtitles_added = True subtitles_added = True
value = data['value'].replace('\n', '<br>\n').replace('<br><br>\n', '<br>\n')
annotation = Annotation( annotation = Annotation(
item=self, item=self,
layer=layer, layer=layer,
start=data['in'], start=data['in'],
end=data['out'], end=data['out'],
value=data['value'], value=value,
user=user user=user
) )
annotation.save() annotation.save()