From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 22 Oct 2015 15:39:14 +0000 (+0200)
Subject: Merge branch 'dev' of https://github.com/yomguy/Telemeta into dev
X-Git-Tag: 1.6b~7^2~56^2~3
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=37faea1a3668d79229dbeefe3433839afc2213c4;p=telemeta.git

Merge branch 'dev' of https://github.com/yomguy/Telemeta into dev

Conflicts:
	telemeta/locale
	telemeta/management/commands/telemeta-import-collections-from-crem.py
---

37faea1a3668d79229dbeefe3433839afc2213c4
diff --cc telemeta/management/commands/telemeta-import-collections-from-crem.py
index cfec15b5,ebd71238..d286f973
--- a/telemeta/management/commands/telemeta-import-collections-from-crem.py
+++ b/telemeta/management/commands/telemeta-import-collections-from-crem.py
@@@ -94,10 -92,11 +93,10 @@@ class Command(BaseCommand)
                      f.close()
                  else:
                      print "file in MEDIA_ROOT, linking..."
-                     path = media[len(self.media_root):]
+                     path = media.replace(self.media_root, '')
                      if not self.dry_run:
                          item.file = path
 -                        item.save()
 +                item.save()
                  if self.user:
                      item.set_revision(self.user)
              else: