diff options
Diffstat (limited to 'archaeological_context_records')
| -rw-r--r-- | archaeological_context_records/forms.py | 2 | ||||
| -rw-r--r-- | archaeological_context_records/ishtar_menu.py | 1 | ||||
| -rw-r--r-- | archaeological_context_records/locale/django.pot | 37 | ||||
| -rw-r--r-- | archaeological_context_records/models.py | 14 | ||||
| -rw-r--r-- | archaeological_context_records/templates/ishtar/sheet_contextrecord.html | 8 |
5 files changed, 31 insertions, 31 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/ishtar_menu.py b/archaeological_context_records/ishtar_menu.py index 826f99b0f..8e8f32218 100644 --- a/archaeological_context_records/ishtar_menu.py +++ b/archaeological_context_records/ishtar_menu.py @@ -27,6 +27,7 @@ import models MENU_SECTIONS = [ (40, SectionItem('record_management', _(u"Context record"), + profile_restriction='context_record', childs=[MenuItem('record_search', _(u"Search"), model=models.ContextRecord, access_controls=['view_contextrecord', diff --git a/archaeological_context_records/locale/django.pot b/archaeological_context_records/locale/django.pot index 8b88d7cc3..8a74c7110 100644 --- a/archaeological_context_records/locale/django.pot +++ b/archaeological_context_records/locale/django.pot @@ -2,8 +2,7 @@ # Copyright (C) 2010-2015 # This file is distributed under the same license as the Ishtar package. # Étienne Loks <etienne.loks at peacefrogs net>, 2010-2015. -# Étienne Loks <etienne.loks@iggdrasil.net>, 2015. #zanata -# Étienne Loks <etienne.loks@iggdrasil.net>, 2016. #zanata +# Valérie-Emma Leroux <emma@iggdrasil.net>, 2016. #zanata msgid "" msgstr "" @@ -87,7 +86,7 @@ msgid "Location" msgstr "" #: forms.py:159 -msgid "This ID already exist for this operation." +msgid "This ID already exists for this operation." msgstr "" #: forms.py:165 forms.py:189 models.py:59 @@ -195,27 +194,27 @@ msgstr "" msgid "You should select a document." msgstr "" -#: ishtar_menu.py:30 +#: ishtar_menu.py:31 msgid "Search" msgstr "" -#: ishtar_menu.py:34 +#: ishtar_menu.py:35 msgid "Creation" msgstr "" -#: ishtar_menu.py:38 ishtar_menu.py:55 +#: ishtar_menu.py:39 ishtar_menu.py:56 msgid "Modification" msgstr "" -#: ishtar_menu.py:42 ishtar_menu.py:61 +#: ishtar_menu.py:43 ishtar_menu.py:62 msgid "Deletion" msgstr "" -#: ishtar_menu.py:46 +#: ishtar_menu.py:47 msgid "Documentation" msgstr "" -#: ishtar_menu.py:49 +#: ishtar_menu.py:50 msgid "Add" msgstr "" @@ -248,27 +247,27 @@ msgid "Parent unit" msgstr "" #: models.py:76 -msgid "Type Unit" +msgid "Unit Type" msgstr "" #: models.py:77 -msgid "Types Unit" +msgid "Unit Types" msgstr "" #: models.py:88 -msgid "Type Activity" +msgid "Activity Type" msgstr "" #: models.py:89 -msgid "Types Activity" +msgid "Activity Types" msgstr "" #: models.py:100 -msgid "Type Identification" +msgid "Identification Type" msgstr "" #: models.py:101 -msgid "Types Identification" +msgid "Identification Types" msgstr "" #: models.py:119 @@ -316,7 +315,7 @@ msgid "Context Record" msgstr "" #: models.py:175 -msgid "Can view all Context Record" +msgid "Can view all Context Records" msgstr "" #: models.py:177 @@ -500,7 +499,7 @@ msgid "TAQ:" msgstr "" #: templates/ishtar/sheet_contextrecord.html:62 -msgid "TAQ estimated:" +msgid "Estimated TAQ:" msgstr "" #: templates/ishtar/sheet_contextrecord.html:63 @@ -508,7 +507,7 @@ msgid "TPQ:" msgstr "" #: templates/ishtar/sheet_contextrecord.html:64 -msgid "TPQ estimated:" +msgid "Estimated TPQ:" msgstr "" #: templates/ishtar/sheet_contextrecord.html:68 @@ -528,7 +527,7 @@ msgid "Details" msgstr "" #: templates/ishtar/sheet_contextrecord.html:95 -msgid "Operation resume" +msgid "Operation summary" msgstr "" #: templates/ishtar/sheet_contextrecord.html:96 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..f7296848b 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 %} @@ -128,7 +128,7 @@ {% trans "Finds" as finds %} {% if item.base_finds.count %} -{% dynamic_table_document finds 'finds_for_ope' 'base_finds__context_record' item.pk 'TABLE_COLS_FOR_OPE' %} +{% dynamic_table_document finds 'finds_for_ope' 'base_finds__context_record' item.pk 'TABLE_COLS_FOR_OPE' output %} {% endif %} {% trans "Documents from associated finds" as find_docs %} |