diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-02-04 21:44:27 +0100 | 
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-02-04 21:44:27 +0100 | 
| commit | 41402266b19c94f677c4f5deaba738766b8b1af3 (patch) | |
| tree | 9f64e921fc66bbe0938e17c1f5325b83c4ccb73b /ishtar_common/models.py | |
| parent | b7b200e4ba1c54d83bbda5c47c9e96ddb36bbc0d (diff) | |
| parent | c5584da2f1842ff4b593fa78a2f524bcddb86d60 (diff) | |
| download | Ishtar-41402266b19c94f677c4f5deaba738766b8b1af3.tar.bz2 Ishtar-41402266b19c94f677c4f5deaba738766b8b1af3.zip | |
Merge branch 'master' into master-importers
Conflicts:
	ishtar_common/fixtures/initial_importtypes-fr.json
Diffstat (limited to 'ishtar_common/models.py')
| -rw-r--r-- | ishtar_common/models.py | 5 | 
1 files changed, 3 insertions, 2 deletions
| diff --git a/ishtar_common/models.py b/ishtar_common/models.py index 6e655776d..979b29b33 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -2844,8 +2844,9 @@ post_delete.connect(post_save_cache, sender=SupportType)  class Format(GeneralType):      class Meta: -        verbose_name = _(u"Format") -        verbose_name_plural = _(u"Formats") +        verbose_name = _(u"Format type") +        verbose_name_plural = _(u"Format types") +        ordering = ['label']  post_save.connect(post_save_cache, sender=Format)  post_delete.connect(post_save_cache, sender=Format) | 
