diff options
author | Valérie-Emma Leroux <valerie-emma.leroux@iggdrasil.net> | 2017-01-09 22:40:32 +0100 |
---|---|---|
committer | Valérie-Emma Leroux <valerie-emma.leroux@iggdrasil.net> | 2017-01-09 22:40:32 +0100 |
commit | 7d888972e14e30990ac361c5c7336c2fb484db8d (patch) | |
tree | 5ed943ed44c4b10ebf40eb7f56b41f8d8c32a99a /archaeological_operations | |
parent | 41c10f52fb23ba8e831a225b9d83108b1b853e93 (diff) | |
download | Ishtar-7d888972e14e30990ac361c5c7336c2fb484db8d.tar.bz2 Ishtar-7d888972e14e30990ac361c5c7336c2fb484db8d.zip |
Update labels
Diffstat (limited to 'archaeological_operations')
-rw-r--r-- | archaeological_operations/models.py | 4 | ||||
-rw-r--r-- | archaeological_operations/templates/ishtar/sheet_administrativeact.html | 2 | ||||
-rw-r--r-- | archaeological_operations/urls.py | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py index 5d4fe9a2b..129040706 100644 --- a/archaeological_operations/models.py +++ b/archaeological_operations/models.py @@ -882,7 +882,7 @@ class OperationSource(Source): class ActType(GeneralType): TYPE = (('F', _(u'Archaeological file')), ('O', _(u'Operation')), - ('TF', _(u'Treatment file')), + ('TF', _(u'Treatment request')), ('T', _(u'Treatment')), ) intented_to = models.CharField(_(u"Intended to"), max_length=2, @@ -994,7 +994,7 @@ class AdministrativeAct(BaseHistorizedItem, OwnPerms, ValueGetter): 'archaeological_finds.TreatmentFile', blank=True, null=True, related_name='administrative_act', - verbose_name=_(u"Treatment file")) + verbose_name=_(u"Treatment request")) treatment = models.ForeignKey( 'archaeological_finds.Treatment', blank=True, null=True, diff --git a/archaeological_operations/templates/ishtar/sheet_administrativeact.html b/archaeological_operations/templates/ishtar/sheet_administrativeact.html index c96d216c9..b12c1f8c0 100644 --- a/archaeological_operations/templates/ishtar/sheet_administrativeact.html +++ b/archaeological_operations/templates/ishtar/sheet_administrativeact.html @@ -30,7 +30,7 @@ {% field_li_detail "Associated file" item.associated_file %} {% field_li_detail "Operation" item.operation %} {% field_li_detail "Treatment" item.treatment %} - {% field_li_detail "Treatment file" item.treatment_file %} + {% field_li_detail "Treatment request" item.treatment_file %} {% if item.operation and item.operation.surface %} <li><label>{% trans "Surface:"%}</label> <span class='value'>{{ item.operation.surface }} m<sup>2</sup> ({{ item.operation.surface_ha }} ha)</span></li> diff --git a/archaeological_operations/urls.py b/archaeological_operations/urls.py index 710bc5e24..e98ddc93f 100644 --- a/archaeological_operations/urls.py +++ b/archaeological_operations/urls.py @@ -128,7 +128,7 @@ urlpatterns += patterns( # allow specialization for operations url(r'show-administrativeact(?:/(?P<pk>.+))?/(?P<type>.+)?$', 'show_administrativeact', name='show-administrativeactop'), - # allow specialization for files, treatment, treatment file + # allow specialization for files, treatment, treatment request url(r'show-administrativeact(?:/(?P<pk>.+))?/(?P<type>.+)?$', 'show_administrativeact', name='show-administrativeactfile'), url(r'show-administrativeact(?:/(?P<pk>.+))?/(?P<type>.+)?$', |