diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2015-02-11 18:07:03 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2015-02-11 18:07:03 +0100 |
| commit | ee58fc47a79779c5b712fafb19207664e9171e68 (patch) | |
| tree | 828d1f1a167f32d09eea0dde555df1bc7aec805c /chimere/tasks.py | |
| parent | c481c44e52175f16571654bc9948d3e14097badb (diff) | |
| parent | ec824db12597389c87184497796e8d0763c80b51 (diff) | |
| download | Chimère-ee58fc47a79779c5b712fafb19207664e9171e68.tar.bz2 Chimère-ee58fc47a79779c5b712fafb19207664e9171e68.zip | |
Merge branch 'v2.1' into v2.2
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 |