diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2015-02-14 21:42:27 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2015-02-14 21:42:27 +0100 |
| commit | 660ce29ac2cf781c8e9607a837b9832e1692e156 (patch) | |
| tree | dfc74f2056cfc9a1ce12eb17adf8bc3771510495 /chimere/tasks.py | |
| parent | 3daa945c334f719e7edb086021bfcc93880eb7f7 (diff) | |
| parent | 57bbba43a75a72eeacd44f1ce5fcd6f203dc321c (diff) | |
| download | Chimère-660ce29ac2cf781c8e9607a837b9832e1692e156.tar.bz2 Chimère-660ce29ac2cf781c8e9607a837b9832e1692e156.zip | |
Merge branch 'master' into nef
Conflicts:
chimere/admin.py
chimere/forms.py
chimere/models.py
chimere/settings.sample.py
chimere/static/chimere/js/jquery.chimere-ol.js
chimere/templates/chimere/base.html
chimere/templates/chimere/blocks/head_chimere.html
chimere/templates/chimere/blocks/map.html
chimere/templates/chimere/main_map.html
chimere/templatetags/chimere_tags.py
chimere/tests.py
chimere/urls.py
chimere/views.py
chimere/widgets.py
Diffstat (limited to 'chimere/tasks.py')
| -rw-r--r-- | chimere/tasks.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chimere/tasks.py b/chimere/tasks.py index 02e32a4..9c94f43 100644 --- a/chimere/tasks.py +++ b/chimere/tasks.py @@ -87,12 +87,12 @@ def importing(importer_pk): importer.state = unicode(IMPORT_MESSAGES['import_process'][0]) importer.save() new_item, updated_item, error = importer.manager.get() - importer.state = error + ' ' if error else '' + importer.state = error + '\n' if error else '' importer.state += unicode(IMPORT_MESSAGES['import_done'][0]) importer.state += u" - " \ + unicode(IMPORT_MESSAGES['import_done'][1]) % {'new':new_item, 'updated':updated_item} - importer.state = importer.state[:200] + importer.state = importer.state importer.save() return True |