merge (sorry, no rebase on vm)

2012-02-25 10:52:58 +00:00 · 2012-02-25 10:52:58 +00:00 · 40dcee8e40
commit 40dcee8e40
parent 215168b8f5 d9ac05245b
1 changed files with 2 additions and 1 deletions
--- a/pandora/item/models.py
+++ b/pandora/item/models.py
@ -1226,12 +1226,13 @@ class Item(models.Model):
                    s = q[0]
                    for data in s.srt(offset):
                        subtitles_added = True
+                        value = data['value'].replace('\n', '<br>\n').replace('<br><br>\n', '<br>\n')
                        annotation = Annotation(
                            item=self,
                            layer=layer,
                            start=data['in'],
                            end=data['out'],
-                            value=data['value'],
+                            value=value,
                            user=user
                        )
                        annotation.save()