diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-02-06 20:07:45 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-02-06 20:07:45 +0100 |
| commit | 51dc338f873efa8f5c79f5ec4a5723ee9e5be26c (patch) | |
| tree | 058d8317204500766ffc94701a2a40d52851cdc3 /archaeological_context_records/models.py | |
| parent | 6979f76c94daae084eb0c5525e1a65734c97555f (diff) | |
| parent | 53c4caf13113c8f84bb037e325c4a3c982c49682 (diff) | |
| download | Ishtar-51dc338f873efa8f5c79f5ec4a5723ee9e5be26c.tar.bz2 Ishtar-51dc338f873efa8f5c79f5ec4a5723ee9e5be26c.zip | |
Merge branch 'master' into v0.9
Diffstat (limited to 'archaeological_context_records/models.py')
| -rw-r--r-- | archaeological_context_records/models.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/archaeological_context_records/models.py b/archaeological_context_records/models.py index 9714673e6..377cea087 100644 --- a/archaeological_context_records/models.py +++ b/archaeological_context_records/models.py @@ -76,12 +76,12 @@ class Dating(models.Model): class Unit(GeneralType): order = models.IntegerField(_(u"Order")) - parent = models.ForeignKey("Unit", verbose_name=_(u"Parent unit"), + parent = models.ForeignKey("Unit", verbose_name=_(u"Parent context record type"), blank=True, null=True) class Meta: - verbose_name = _(u"Unit Type") - verbose_name_plural = _(u"Unit Types") + verbose_name = _(u"Context record Type") + verbose_name_plural = _(u"Context record Types") ordering = ('order', 'label') def __unicode__(self): @@ -193,7 +193,7 @@ class ContextRecord(BaseHistorizedItem, ImageModel, OwnPerms, datings = models.ManyToManyField(Dating) datings_comment = models.TextField(_(u"Comment on datings"), blank=True, null=True) - unit = models.ForeignKey(Unit, verbose_name=_(u"Unit"), related_name='+', + unit = models.ForeignKey(Unit, verbose_name=_(u"Context record type"), related_name='+', blank=True, null=True) has_furniture = models.NullBooleanField(_(u"Has furniture?"), blank=True, null=True) @@ -410,13 +410,13 @@ class RecordRelations(GeneralRecordRelations, models.Model): ] COL_LABELS = { "left_record__label": _(u"ID (left)"), - "left_record__unit": _(u"Unit (left)"), + "left_record__unit": _(u"Context record type (left)"), "left_record__parcel": _(u"Parcel (left)"), "left_record__description": _(u"Description (left)"), "left_record__datings__period": _(u"Periods (left)"), "relation_type": _(u"Relation type"), "right_record__label": _(u"ID (right)"), - "right_record__unit": _(u"Unit (right)"), + "right_record__unit": _(u"Context record type (right)"), "right_record__parcel": _(u"Parcel (right)"), "right_record__description": _(u"Description (right)"), "right_record__datings__period": _(u"Periods (right)") @@ -454,7 +454,7 @@ class RecordRelationView(models.Model): COL_LABELS = { "relation_type": _(u"Relation type"), "right_record__label": _(u"ID"), - "right_record__unit": _(u"Unit"), + "right_record__unit": _(u"Context record type"), "right_record__parcel": _(u"Parcel"), "right_record__description": _(u"Description"), "right_record__datings__period": _(u"Periods") |