Update labels

8 files changed, 27 insertions, 27 deletions

diff --git a/archaeological_finds/forms_treatments.py b/archaeological_finds/forms_treatments.py
index f73672967..7a388a10d 100644
--- a/archaeological_finds/forms_treatments.py
+++ b/archaeological_finds/forms_treatments.py
@@ -331,7 +331,7 @@ class AdministrativeActTreatmentModifForm(
     pk = forms.IntegerField(required=False, widget=forms.HiddenInput)
     index = forms.IntegerField(label=_("Index"), required=False)
 
-# treatment files
+# treatment requests
 
 
 class TreatmentFileSelect(TableSelect):
@@ -459,14 +459,14 @@ class TreatmentFileModifyForm(TreatmentFileForm):
             .filter(year=year, index=index).exclude(pk=pk)
         if index and q.count():
             raise forms.ValidationError(
-                _(u"Another treatment file with this index exists for {}."
+                _(u"Another treatment request with this index exists for {}."
                   ).format(year))
         return cleaned_data
 
 
 class TreatmentFileDeletionForm(FinalForm):
-    confirm_msg = _(u"Are you sure you want to delete this treatment file?")
-    confirm_end_msg = _(u"Would you like to delete this treatment file?")
+    confirm_msg = _(u"Are you sure you want to delete this treatment request?")
+    confirm_end_msg = _(u"Would you like to delete this treatment request?")
 
 
 class AdministrativeActTreatmentFileSelect(TableSelect):
@@ -549,7 +549,7 @@ SourceTreatmentFileFormSelection = get_form_selection(
     'SourceTreatmentFileFormSelection', _(u"Treatment request search"),
     'treatment_file',
     models.TreatmentFile, TreatmentFileSelect, 'get-treatmentfile',
-    _(u"You should select a treatment file."))
+    _(u"You should select a treatment request."))
 
 
 class TreatmentSourceSelect(SourceSelect):
diff --git a/archaeological_finds/models_treatments.py b/archaeological_finds/models_treatments.py
index 7586c7eca..0f4a53afc 100644
--- a/archaeological_finds/models_treatments.py
+++ b/archaeological_finds/models_treatments.py
@@ -62,8 +62,8 @@ post_delete.connect(post_save_cache, sender=TreatmentType)
 
 class TreatmentState(GeneralType):
     class Meta:
-        verbose_name = _(u"Type of treatment state")
-        verbose_name_plural = _(u"Type of treatment states")
+        verbose_name = _(u"Treatment state type")
+        verbose_name_plural = _(u"Treatment state types")
         ordering = ('label',)
 post_save.connect(post_save_cache, sender=TreatmentState)
 post_delete.connect(post_save_cache, sender=TreatmentState)
@@ -445,7 +445,7 @@ class TreatmentFile(ClosedItem, BaseHistorizedItem, OwnPerms, ValueGetter,
                                    max_length=200)
     name = models.TextField(_(u"Name"), blank=True, null=True)
     type = models.ForeignKey(TreatmentFileType, verbose_name=_(u"Treatment "
-                                                               u"file type"))
+                                                               u"request type"))
     in_charge = models.ForeignKey(
         Person, related_name='treatmentfile_responsability',
         verbose_name=_(u"Person in charge"), on_delete=models.SET_NULL,
diff --git a/archaeological_finds/templates/ishtar/sheet_treatmentfilesource.html b/archaeological_finds/templates/ishtar/sheet_treatmentfilesource.html
index e456b6fe0..e558296a8 100644
--- a/archaeological_finds/templates/ishtar/sheet_treatmentfilesource.html
+++ b/archaeological_finds/templates/ishtar/sheet_treatmentfilesource.html
@@ -1,12 +1,12 @@
 {% extends "ishtar/sheet_source.html" %}
 {% load i18n window_field window_header link_to_window %}
 
-{% block head_title %}{% trans "Treatement file source" %}{% endblock %}
+{% block head_title %}{% trans "Treatment request source" %}{% endblock %}
 
 {% block window_nav %}
 {% window_nav item window_id 'show-treatmentfilesource' 'treatmentfile_source_modify' %}
 {% endblock %}
 
 {% block related %}
-{% field "Related treatment file" item.owner '' item.owner|link_to_window %}
+{% field "Related treatment request" item.owner '' item.owner|link_to_window %}
 {% endblock %}
diff --git a/archaeological_finds/views.py b/archaeological_finds/views.py
index 830a997c6..e36d65068 100644
--- a/archaeological_finds/views.py
+++ b/archaeological_finds/views.py
@@ -456,11 +456,11 @@ def treatment_administrativeacttreatment_modify(request, pk):
             }))
 
 
-# treatment file
+# treatment request
 
 treatmentfile_search_wizard = SearchWizard.as_view([
     ('general-treatmentfile_search', TreatmentFileFormSelection)],
-    label=_(u"Treatment file search"),
+    label=_(u"Treatment request search"),
     url_name='treatmentfile_search',)
 
 treatmentfile_wizard_steps = [
@@ -470,7 +470,7 @@ treatmentfile_wizard_steps = [
 
 treatmentfile_creation_wizard = TreatmentFileWizard.as_view(
     treatmentfile_wizard_steps,
-    label=_(u"New treatment file"),
+    label=_(u"New treatment request"),
     url_name='treatmentfile_creation',)
 
 treatmentfile_modification_wizard = TreatmentFileModificationWizard.as_view(
@@ -493,14 +493,14 @@ def treatmentfile_modify(request, pk):
 treatmentfile_deletion_wizard = TreatmentFileDeletionWizard.as_view([
     ('selec-treatmentfile_deletion', TreatmentFileFormSelection),
     ('final-treatmentfile_deletion', TreatmentFileDeletionForm)],
-    label=_(u"Treatment file deletion"),
+    label=_(u"Treatment request deletion"),
     url_name='treatmentfile_deletion',)
 
 treatmentfile_admacttreatmentfile_search_wizard = \
     SearchWizard.as_view([
         ('selec-treatmentfle_admacttreatmentfle_search',
         AdministrativeActTreatmentFileFormSelection)],
-        label=_(u"Treatment file: search administrative act"),
+        label=_(u"Treatment request: search administrative act"),
         url_name='treatmentfle_admacttreatmentfle_search',)
 
 
@@ -510,7 +510,7 @@ treatmentfile_admacttreatmentfile_wizard = \
         ('admact-treatmentfle_admacttreatmentfle',
          AdministrativeActTreatmentFileForm),
         ('final-treatmentfle_admacttreatmentfle', FinalForm)],
-        label=_(u"Treatment file: new administrative act"),
+        label=_(u"Treatment request: new administrative act"),
         url_name='treatmentfle_admacttreatmentfle',)
 
 treatmentfile_admacttreatmentfile_modification_wizard = \
@@ -520,7 +520,7 @@ treatmentfile_admacttreatmentfile_modification_wizard = \
         ('admact-treatmentfle_admacttreatmentfle_modification',
          AdministrativeActTreatmentFileModifForm),
         ('final-treatmentfle_admacttreatmentfle_modification', FinalForm)],
-        label=_(u"Treatment file: administrative act modification"),
+        label=_(u"Treatment request: administrative act modification"),
         url_name='treatmentfle_admacttreatmentfle_modification',)
 
 treatmentfile_admacttreatmentfile_deletion_wizard = \
@@ -529,7 +529,7 @@ treatmentfile_admacttreatmentfile_deletion_wizard = \
          AdministrativeActTreatmentFileFormSelection),
         ('final-treatmentfle_admacttreatmentfle_deletion',
          FinalAdministrativeActDeleteForm)],
-        label=_(u"Treatment file: administrative act deletion"),
+        label=_(u"Treatment request: administrative act deletion"),
         url_name='treatmentfle_admacttreatmentfle_deletion',)
 
 
@@ -588,7 +588,7 @@ treatment_source_deletion_wizard = TreatmentSourceDeletionWizard.as_view([
     label=_(u"Treatment: source deletion"),
     url_name='treatment_source_deletion',)
 
-# treatment file sources
+# treatment request sources
 
 show_treatmentfilesource = show_item(models.TreatmentFileSource,
                                      'treatmentfilesource')
@@ -598,7 +598,7 @@ get_treatmentfilesource = get_item(
 
 treatmentfile_source_search_wizard = SearchWizard.as_view([
     ('selec-treatmentfile_source_search', TreatmentFileSourceFormSelection)],
-    label=_(u"Treatment file: source search"),
+    label=_(u"Treatment request: source search"),
     url_name='treatmentfile_source_search',)
 
 treatmentfile_source_creation_wizard = TreatmentFileSourceWizard.as_view([
@@ -614,7 +614,7 @@ treatmentfile_source_modification_wizard = TreatmentFileSourceWizard.as_view([
     ('source-treatmentfile_source_modification', SourceForm),
     ('authors-treatmentfile_source_modification', AuthorFormset),
     ('final-treatmentfile_source_modification', FinalForm)],
-    label=_(u"Treatment file: source modification"),
+    label=_(u"Treatment request: source modification"),
     url_name='treatmentfile_source_modification',)
 
 
@@ -632,5 +632,5 @@ treatmentfile_source_deletion_wizard = \
         ('selec-treatmentfile_source_deletion',
          TreatmentFileSourceFormSelection),
         ('final-treatmentfile_source_deletion', SourceDeletionForm)],
-        label=_(u"Treatment file: source deletion"),
+        label=_(u"Treatment request: source deletion"),
         url_name='treatmentfile_source_deletion',)
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>.+)?$',
diff --git a/ishtar_common/views.py b/ishtar_common/views.py
index 1e272fc78..d827ae065 100644
--- a/ishtar_common/views.py
+++ b/ishtar_common/views.py
@@ -240,7 +240,7 @@ def shortcut_menu(request):
     if profile.find:
         CURRENT_ITEMS.append((_(u"Find"), Find))
     if profile.warehouse:
-        CURRENT_ITEMS.append((_(u"Treatment file"), TreatmentFile))
+        CURRENT_ITEMS.append((_(u"Treatment request"), TreatmentFile))
         CURRENT_ITEMS.append((_(u"Treatment"), Treatment))
     if hasattr(request.user, 'ishtaruser') and \
             request.user.ishtaruser.advanced_shortcut_menu: