diff options
| -rw-r--r-- | archaeological_operations/forms.py | 3 | ||||
| -rw-r--r-- | archaeological_operations/templates/ishtar/sheet_operation.html | 3 | ||||
| -rw-r--r-- | ishtar_common/locale/fr/LC_MESSAGES/django.po | 5 |
3 files changed, 5 insertions, 6 deletions
diff --git a/archaeological_operations/forms.py b/archaeological_operations/forms.py index 72834d8f0..0b2555148 100644 --- a/archaeological_operations/forms.py +++ b/archaeological_operations/forms.py @@ -111,7 +111,8 @@ ParcelFormSet = formset_factory(ParcelForm, can_delete=True, ParcelFormSet.form_label = _(u"Parcels") class OperationSelect(TableSelect): - common_name = forms.CharField(label=_(u"Name"), max_length=30) + common_name = forms.CharField(label=_(u"Name (full text search)"), + max_length=30) if settings.COUNTRY == 'fr': code_patriarche = forms.IntegerField( widget=widgets.JQueryAutoComplete("/" + settings.URL_PATH + \ diff --git a/archaeological_operations/templates/ishtar/sheet_operation.html b/archaeological_operations/templates/ishtar/sheet_operation.html index 491304125..2fab55a39 100644 --- a/archaeological_operations/templates/ishtar/sheet_operation.html +++ b/archaeological_operations/templates/ishtar/sheet_operation.html @@ -3,14 +3,13 @@ {% block content %} <div class='tool'>{%trans "Export as:"%} <a href='{% url show-operation item.pk "odt" %}'>{%trans "OpenOffice.org file"%}</a>, <a href='{% url show-operation item.pk "pdf" %}'>{%trans "PDF file"%}</a></div> <h3>{% trans "General"%}</h3> +{% if item.common_name %}<p><label>{%trans "Name:"%}</label> <span class='value'>{{ item.common_name }}</span></p>{% endif %} <p><label>{%trans "Year:"%}</label> <span class='value'>{{ item.year }}</span></p> {% if item.operation.operation_code %}<p><label>{%trans "Numerical reference:"%}</label> <span class='value'>{{ item.operation_code }}</span></p>{% endif %} {% if item.code_patriarche %}<p><label>{%trans "Patriarche OA code:"%}</label> <span class='value'>{{ item.code_patriarche }}</span></p>{%else%} <p class='alert'>{%trans "Patriarche OA code not yet recorded!"%}</p>{%endif%} -{#<p><label>{%trans "Operation's name:"%}</label> <span class='value'>{{ item.internal_reference }}</span></p>#} - <p><label>{%trans "Edition date:"%}</label> <span class='value'>{{ item.history.all.0.history_date }}</span></p> <!-- date = now --> {% if item.start_date %}<p><label>{%trans "Begining date:"%}</label> <span class='value'>{{ item.start_date }}</span></p> diff --git a/ishtar_common/locale/fr/LC_MESSAGES/django.po b/ishtar_common/locale/fr/LC_MESSAGES/django.po index 96a467273..d6cd9f86d 100644 --- a/ishtar_common/locale/fr/LC_MESSAGES/django.po +++ b/ishtar_common/locale/fr/LC_MESSAGES/django.po @@ -447,9 +447,8 @@ msgid "Localisation" msgstr "Localisation" #: views.py:79 -#, fuzzy msgid "New person" -msgstr "Peut voir les Personnes" +msgstr "Nouvelle personne" #: views.py:86 msgid "Person modification" @@ -632,7 +631,7 @@ msgstr "Identifiant complet :" #: templates/sheet_contextrecord.html:11 templates/sheet_contextrecord.html:54 #: templates/sheet_operation.html:10 msgid "Patriarche OA code not yet recorded!" -msgstr "Code Patriarche pas encore enregistré !" +msgstr "Code d'opération Patriarche non renseigné !" #: templates/sheet_contextrecord.html:12 msgid "Temporary ID:" |