summaryrefslogtreecommitdiff
path: root/archaeological_finds
diff options
context:
space:
mode:
authorValérie-Emma Leroux <valerie-emma.leroux@iggdrasil.net>2017-01-09 22:40:32 +0100
committerValérie-Emma Leroux <valerie-emma.leroux@iggdrasil.net>2017-01-09 22:40:32 +0100
commit7d888972e14e30990ac361c5c7336c2fb484db8d (patch)
tree5ed943ed44c4b10ebf40eb7f56b41f8d8c32a99a /archaeological_finds
parent41c10f52fb23ba8e831a225b9d83108b1b853e93 (diff)
downloadIshtar-7d888972e14e30990ac361c5c7336c2fb484db8d.tar.bz2
Ishtar-7d888972e14e30990ac361c5c7336c2fb484db8d.zip
Update labels
Diffstat (limited to 'archaeological_finds')
-rw-r--r--archaeological_finds/forms_treatments.py10
-rw-r--r--archaeological_finds/models_treatments.py6
-rw-r--r--archaeological_finds/templates/ishtar/sheet_treatmentfilesource.html4
-rw-r--r--archaeological_finds/views.py24
4 files changed, 22 insertions, 22 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',)