diff options
| author | Valérie-Emma Leroux <emma@iggdrasil.net> | 2017-02-06 17:35:47 +0100 | 
|---|---|---|
| committer | Valérie-Emma Leroux <emma@iggdrasil.net> | 2017-02-06 17:35:47 +0100 | 
| commit | b7ed57da8a83328c248fb5817b951d722d989ef2 (patch) | |
| tree | b327f1c41833fbfada1ca7d63739c79933452b68 | |
| parent | 8f9b00f461c5f9ddaebbe9da4cecfab18834c751 (diff) | |
| download | Ishtar-b7ed57da8a83328c248fb5817b951d722d989ef2.tar.bz2 Ishtar-b7ed57da8a83328c248fb5817b951d722d989ef2.zip | |
Update labels
| -rw-r--r-- | archaeological_context_records/forms.py | 4 | ||||
| -rw-r--r-- | archaeological_context_records/models.py | 14 | 
2 files changed, 9 insertions, 9 deletions
| diff --git a/archaeological_context_records/forms.py b/archaeological_context_records/forms.py index 0452243e2..953d33417 100644 --- a/archaeological_context_records/forms.py +++ b/archaeological_context_records/forms.py @@ -144,7 +144,7 @@ class RecordFormGeneral(ManageOldType, forms.Form):      width = forms.FloatField(label=_(u"Width (m)"), required=False)      thickness = forms.FloatField(label=_(u"Thickness (m)"), required=False)      depth = forms.FloatField(label=_(u"Depth (m)"), required=False) -    unit = forms.ChoiceField(label=_("Unit"), required=False, choices=[]) +    unit = forms.ChoiceField(label=_("Context record type"), required=False, choices=[])      has_furniture = forms.NullBooleanField(label=_(u"Has furniture?"),                                             required=False)      location = forms.CharField( @@ -352,7 +352,7 @@ class RecordSourceSelect(SourceSelect):      context_record__datings__period = forms.ChoiceField(          label=_(u"Period of the context record"), choices=[])      context_record__unit = forms.ChoiceField( -        label=_(u"Unit type of the context record"), choices=[]) +        label=_(u"Context record type"), choices=[])      def __init__(self, *args, **kwargs):          super(RecordSourceSelect, self).__init__(*args, **kwargs) 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") | 
