From 32dfcf7a656f99f4ec6251023a6b3cd82bc874ef Mon Sep 17 00:00:00 2001 From: Valérie-Emma Leroux Date: Mon, 22 Feb 2016 14:13:03 +0100 Subject: Update translation --- archaeological_context_records/forms.py | 2 +- archaeological_context_records/models.py | 14 +++++++------- .../templates/ishtar/sheet_contextrecord.html | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) (limited to 'archaeological_context_records') 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 %}

{% trans "Datations"%}

{% if item.taq %}

{{ item.taq }}

{%endif%} -{% if item.taq_estimated %}

{{ item.taq_estimated }}

{%endif%} +{% if item.taq_estimated %}

{{ item.taq_estimated }}

{%endif%} {% if item.tpq %}

{{ item.tpq }}

{%endif%} -{% if item.tpq_estimated %}

{{ item.tpq_estimated }}

{%endif%} +{% if item.tpq_estimated %}

{{ item.tpq_estimated }}

{%endif%} {%endif%} {% if item.right_relations.count %} @@ -92,7 +92,7 @@ {% endif %} {% if item.operation %} -

{% trans "Operation resume"%}

+

{% trans "Operation summary"%}

{{ item.operation.year }}

{% field "Numerical reference" item.operation.operation_code %} {% if item.operation.code_patriarche %} -- cgit v1.2.3