summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--archaeological_context_records/forms.py2
-rw-r--r--archaeological_context_records/models.py14
-rw-r--r--archaeological_context_records/templates/ishtar/sheet_contextrecord.html6
-rw-r--r--archaeological_files/models.py2
-rw-r--r--archaeological_finds/models.py4
-rw-r--r--archaeological_warehouse/models.py2
-rw-r--r--ishtar_common/models.py18
7 files changed, 24 insertions, 24 deletions
diff --git a/archaeological_context_records/forms.py b/archaeological_context_records/forms.py
index 98da5ce10..e9b5994eb 100644
--- a/archaeological_context_records/forms.py
+++ b/archaeological_context_records/forms.py
@@ -156,7 +156,7 @@ class RecordFormGeneral(forms.Form):
if 'pk' in cleaned_data and cleaned_data['pk']:
cr = cr.exclude(pk=cleaned_data['pk'])
if cr.count():
- raise forms.ValidationError(_(u"This ID already exist for "
+ raise forms.ValidationError(_(u"This ID already exists for "
u"this operation."))
return cleaned_data
diff --git a/archaeological_context_records/models.py b/archaeological_context_records/models.py
index 52d976cfd..bd18ab5d4 100644
--- a/archaeological_context_records/models.py
+++ b/archaeological_context_records/models.py
@@ -73,8 +73,8 @@ class Unit(GeneralType):
blank=True, null=True)
class Meta:
- verbose_name = _(u"Type Unit")
- verbose_name_plural = _(u"Types Unit")
+ verbose_name = _(u"Unit Type")
+ verbose_name_plural = _(u"Unit Types")
ordering = ('order',)
def __unicode__(self):
@@ -85,8 +85,8 @@ class ActivityType(GeneralType):
order = models.IntegerField(_(u"Order"))
class Meta:
- verbose_name = _(u"Type Activity")
- verbose_name_plural = _(u"Types Activity")
+ verbose_name = _(u"Activity Type")
+ verbose_name_plural = _(u"Activity Types")
ordering = ('order',)
def __unicode__(self):
@@ -97,8 +97,8 @@ class IdentificationType(GeneralType):
order = models.IntegerField(_(u"Order"))
class Meta:
- verbose_name = _(u"Type Identification")
- verbose_name_plural = _(u"Types Identification")
+ verbose_name = _(u"Identification Type")
+ verbose_name_plural = _(u"Identification Types")
ordering = ('order',)
def __unicode__(self):
@@ -172,7 +172,7 @@ class ContextRecord(BaseHistorizedItem, OwnPerms, ShortMenuItem):
verbose_name = _(u"Context Record")
verbose_name_plural = _(u"Context Record")
permissions = (
- ("view_contextrecord", ugettext(u"Can view all Context Record")),
+ ("view_contextrecord", ugettext(u"Can view all Context Records")),
("view_own_contextrecord",
ugettext(u"Can view own Context Record")),
("add_own_contextrecord",
diff --git a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html
index bca027414..8a92a2f61 100644
--- a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html
+++ b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html
@@ -59,9 +59,9 @@
{% if item.taq or item.taq_estimated or item.tpq or item.tpq_estimated %}
<h3>{% trans "Datations"%}</h3>
{% if item.taq %}<p><label>{% trans "TAQ:" %}</label> <span class='value'>{{ item.taq }}</span></p>{%endif%}
-{% if item.taq_estimated %}<p><label>{% trans "TAQ estimated:" %}</label> <span class='value'>{{ item.taq_estimated }}</span></p>{%endif%}
+{% if item.taq_estimated %}<p><label>{% trans "Estimated TAQ:" %}</label> <span class='value'>{{ item.taq_estimated }}</span></p>{%endif%}
{% if item.tpq %}<p><label>{% trans "TPQ:" %}</label> <span class='value'>{{ item.tpq }}</span></p>{%endif%}
-{% if item.tpq_estimated %}<p><label>{% trans "TPQ estimated:" %}</label> <span class='value'>{{ item.tpq_estimated }}</span></p>{%endif%}
+{% if item.tpq_estimated %}<p><label>{% trans "Estimated TPQ:" %}</label> <span class='value'>{{ item.tpq_estimated }}</span></p>{%endif%}
{%endif%}
{% if item.right_relations.count %}
@@ -92,7 +92,7 @@
{% endif %}
{% if item.operation %}
-<h3>{% trans "Operation resume"%}</h3>
+<h3>{% trans "Operation summary"%}</h3>
<p><label>{%trans "Year:"%}</label> <span class='value'>{{ item.operation.year }}</span></p>
{% field "Numerical reference" item.operation.operation_code %}
{% if item.operation.code_patriarche %}
diff --git a/archaeological_files/models.py b/archaeological_files/models.py
index bd6a39340..519d3ced3 100644
--- a/archaeological_files/models.py
+++ b/archaeological_files/models.py
@@ -185,7 +185,7 @@ class File(BaseHistorizedItem, OwnPerms, ValueGetter, ShortMenuItem,
verbose_name = _(u"Archaeological file")
verbose_name_plural = _(u"Archaeological files")
permissions = (
- ("view_file", ugettext(u"Can view all Archaelogical file")),
+ ("view_file", ugettext(u"Can view all Archaelogical files")),
("view_own_file", ugettext(u"Can view own Archaelogical file")),
("add_own_file", ugettext(u"Can add own Archaelogical file")),
("change_own_file",
diff --git a/archaeological_finds/models.py b/archaeological_finds/models.py
index 8685e8ddd..8fc4c9c31 100644
--- a/archaeological_finds/models.py
+++ b/archaeological_finds/models.py
@@ -132,7 +132,7 @@ class BaseFind(BaseHistorizedItem, OwnPerms):
verbose_name = _(u"Base find")
verbose_name_plural = _(u"Base finds")
permissions = (
- ("view_basefind", ugettext(u"Can view all Base find")),
+ ("view_basefind", ugettext(u"Can view all Base finds")),
("view_own_basefind", ugettext(u"Can view own Base find")),
("add_own_basefind", ugettext(u"Can add own Base find")),
("change_own_basefind", ugettext(u"Can change own Base find")),
@@ -266,7 +266,7 @@ class Find(BaseHistorizedItem, ImageModel, OwnPerms, ShortMenuItem):
'base_finds.special_interest',
'base_finds.discovery_date']
EXTRA_FULL_FIELDS_LABELS = {
- 'base_finds.cache_short_id': _(u"Base find - Short Id"),
+ 'base_finds.cache_short_id': _(u"Base find - Short ID"),
'base_finds.cache_complete_id': _(u"Base find - Complete ID"),
'base_finds.comment': _(u"Base find - Comment"),
'base_finds.description': _(u"Base find - Description"),
diff --git a/archaeological_warehouse/models.py b/archaeological_warehouse/models.py
index 9f5558d78..86e430a7e 100644
--- a/archaeological_warehouse/models.py
+++ b/archaeological_warehouse/models.py
@@ -44,7 +44,7 @@ class Warehouse(Address, OwnPerms):
verbose_name = _(u"Warehouse")
verbose_name_plural = _(u"Warehouses")
permissions = (
- ("view_warehouse", ugettext(u"Can view all Warehouse")),
+ ("view_warehouse", ugettext(u"Can view all Warehouses")),
("view_own_warehouse", ugettext(u"Can view own Warehouse")),
("add_own_warehouse", ugettext(u"Can add own Warehouse")),
("change_own_warehouse", ugettext(u"Can change own Warehouse")),
diff --git a/ishtar_common/models.py b/ishtar_common/models.py
index 77a9bf868..2a12edc02 100644
--- a/ishtar_common/models.py
+++ b/ishtar_common/models.py
@@ -188,7 +188,7 @@ def valid_ids(cls):
cls.objects.get(pk=v)
except ObjectDoesNotExist:
raise ValidationError(
- _(u"An item selected is not a valid item."))
+ _(u"A selected item is not a valid item."))
return func
@@ -199,7 +199,7 @@ def is_unique(cls, field):
try:
assert cls.objects.filter(**query).count() == 0
except AssertionError:
- raise ValidationError(_(u"This item already exist."))
+ raise ValidationError(_(u"This item already exists."))
return func
@@ -482,7 +482,7 @@ class ItemKey(models.Model):
content_object = generic.GenericForeignKey('content_type', 'object_id')
importer = models.ForeignKey(
'Import', null=True, blank=True,
- help_text=_(u"Key specific to an import"))
+ help_text=_(u"Specific key to an import"))
def __unicode__(self):
return self.key
@@ -1495,7 +1495,7 @@ class ImporterDuplicateField(models.Model):
column = models.ForeignKey(ImporterColumn, related_name='duplicate_fields')
field_name = models.CharField(_(u"Field name"), blank=True, null=True,
max_length=200)
- force_new = models.BooleanField(_(u"Force creation of new item"),
+ force_new = models.BooleanField(_(u"Force creation of new items"),
default=False)
concat = models.BooleanField(_(u"Concatenate with existing"),
default=False)
@@ -1529,7 +1529,7 @@ class ImportTarget(models.Model):
target = models.CharField(u"Target", max_length=500)
regexp_filter = models.ForeignKey("Regexp", blank=True, null=True)
formater_type = models.ForeignKey("FormaterType")
- force_new = models.BooleanField(_(u"Force creation of new item"),
+ force_new = models.BooleanField(_(u"Force creation of new items"),
default=False)
concat = models.BooleanField(_(u"Concatenate with existing"),
default=False)
@@ -1795,7 +1795,7 @@ class Import(models.Model):
null=True)
end_date = models.DateTimeField(_(u"End date"), blank=True,
null=True, editable=False)
- seconds_remaining = models.IntegerField(_(u"Seconds remaining"),
+ seconds_remaining = models.IntegerField(_(u"Remaining seconds"),
blank=True, null=True,
editable=False)
@@ -1961,7 +1961,7 @@ class Organization(Address, Merge, OwnPerms, ValueGetter):
verbose_name = _(u"Organization")
verbose_name_plural = _(u"Organizations")
permissions = (
- ("view_organization", ugettext(u"Can view all Organization")),
+ ("view_organization", ugettext(u"Can view all Organizations")),
("view_own_organization", ugettext(u"Can view own Organization")),
("add_own_organization", ugettext(u"Can add own Organization")),
("change_own_organization",
@@ -2016,7 +2016,7 @@ class Person(Address, Merge, OwnPerms, ValueGetter):
TYPE = (
('Mr', _(u'Mr')),
('Ms', _(u'Miss')),
- ('Mr and Miss', _(u'Mr and Miss')),
+ ('Mr and Miss', _(u'Mr and Mrs')),
('Md', _(u'Mrs')),
('Dr', _(u'Doctor')),
)
@@ -2039,7 +2039,7 @@ class Person(Address, Merge, OwnPerms, ValueGetter):
verbose_name = _(u"Person")
verbose_name_plural = _(u"Persons")
permissions = (
- ("view_person", ugettext(u"Can view all Person")),
+ ("view_person", ugettext(u"Can view all Persons")),
("view_own_person", ugettext(u"Can view own Person")),
("add_own_person", ugettext(u"Can add own Person")),
("change_own_person", ugettext(u"Can change own Person")),
generated by cgit v1.2.3 (git 2.39.1) at 2025-10-31 00:03:02 +0000