diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-09-22 10:38:46 +0200 | 
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-09-22 10:38:46 +0200 | 
| commit | 42ac5a4f41e5ae471ba96b2c0ad0f8965501446b (patch) | |
| tree | 865ad1cf5d315558406c64bc797ddb844e3422c5 /ishtar_common/models.py | |
| parent | 64000a8c56da1872901f89faeb00df60f4994dd1 (diff) | |
| parent | fd445130a3f7566d00c00b92de92eb034445b79e (diff) | |
| download | Ishtar-42ac5a4f41e5ae471ba96b2c0ad0f8965501446b.tar.bz2 Ishtar-42ac5a4f41e5ae471ba96b2c0ad0f8965501446b.zip | |
Merge branch 'master' into v0.9
Diffstat (limited to 'ishtar_common/models.py')
| -rw-r--r-- | ishtar_common/models.py | 2 | 
1 files changed, 1 insertions, 1 deletions
| diff --git a/ishtar_common/models.py b/ishtar_common/models.py index 9ec03b60e..b0625e25c 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -960,7 +960,7 @@ class IshtarSiteProfile(models.Model, Cached):                      u"can be used to display a random image."))      file_external_id = models.TextField(          _(u"File external id"), -        default="{settings__ISHTAR_LOCAL_PREFIX}{year}-{numeric_reference}", +        default="{year}-{numeric_reference}",          help_text=_(u"Formula to manage file external ID. "                      u"Change this with care. With incorrect formula, the "                      u"application might be unusable and import of external " | 
