summaryrefslogtreecommitdiff
path: root/archaeological_finds/models.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@peacefrogs.net>2012-10-21 01:31:49 +0200
committerÉtienne Loks <etienne.loks@peacefrogs.net>2012-10-21 01:31:49 +0200
commit48eb91979705f9999b724c8e2f960fd7931775c1 (patch)
treeb0ce9167008a2ef608f522680f3d11a0459663e4 /archaeological_finds/models.py
parent5b8c7201eefa8b404afb0cb89b389fd3e8f92899 (diff)
downloadIshtar-48eb91979705f9999b724c8e2f960fd7931775c1.tar.bz2
Ishtar-48eb91979705f9999b724c8e2f960fd7931775c1.zip
Djangoization - Major refactoring (step 7)
Work on archaeological_files wizards
Diffstat (limited to 'archaeological_finds/models.py')
-rw-r--r--archaeological_finds/models.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/archaeological_finds/models.py b/archaeological_finds/models.py
index eeb293934..cb305a93a 100644
--- a/archaeological_finds/models.py
+++ b/archaeological_finds/models.py
@@ -79,14 +79,14 @@ class BaseFind(BaseHistorizedItem, OwnPerms):
finds += [ope.code_patriarche or \
(unicode(ope.year) + "-" + unicode(ope.operation_code))]
finds += [self.context_record.label, unicode(self.material_index)]
- return JOINT.join(finds)
+ return settings.JOINT.join(finds)
def _real_label(self):
if not self.context_record.parcel.operation.code_patriarche:
return
find = self.get_last_find()
lbl = find.label or self.label
- return JOINT.join([unicode(it) for it in (
+ return settings.JOINT.join([unicode(it) for it in (
self.context_record.parcel.operation.code_patriarche,
self.context_record.label,
lbl) if it])
@@ -96,7 +96,7 @@ class BaseFind(BaseHistorizedItem, OwnPerms):
return
find = self.get_last_find()
lbl = find.label or self.label
- return JOINT.join([unicode(it) for it in (
+ return settings.JOINT.join([unicode(it) for it in (
self.context_record.parcel.year,
self.index,
self.context_record.label,
@@ -278,5 +278,5 @@ class Property(LightHistorizedItem):
verbose_name_plural = _(u"Properties")
def __unicode__(self):
- return self.person + JOINT + self.find
+ return self.person + settings.JOINT + self.find