diff --git a/combo/apps/family/templates/family/person.html b/combo/apps/family/templates/family/person.html index a8324adf..84937099 100644 --- a/combo/apps/family/templates/family/person.html +++ b/combo/apps/family/templates/family/person.html @@ -1,17 +1,15 @@ {% load i18n %} -

{{ person.first_name }} {{ person.last_name }}

-{% blocktrans with birthdate=person.birthdate %} -Born on {{ birthdate }} -{% endblocktrans %} +

{{ person.first_name }} {{ person.last_name }}

+

+{% trans "Born on" %} {{ person.birthdate }} +

{% trans "Address" %}

-

{{ person.address }}

+

{% trans "Address:" %} {{ person.address }}

{% if person.phone or person.cellphone or person.email %}

{% trans "Contact" %}

- +{% if person.phone %}

{% trans "Phone:" %} {{ person.phone }}

{% endif %} +{% if person.cellphone %}

{% trans "Cellphone:" %} {{ person.cellphone }}

{% endif %} +{% if person.email %}

{% trans "Email:" %} {{ person.email }}

{% endif %} {% endif %} diff --git a/combo/locale/fr/LC_MESSAGES/django.po b/combo/locale/fr/LC_MESSAGES/django.po index cad6e465..4e4c8530 100644 --- a/combo/locale/fr/LC_MESSAGES/django.po +++ b/combo/locale/fr/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: combo 0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-09-21 14:55+0000\n" +"POT-Creation-Date: 2015-09-23 09:09+0000\n" "PO-Revision-Date: 2015-03-15 11:36+0100\n" "Last-Translator: Frederic Peters \n" "Language: French\n" @@ -40,34 +40,33 @@ msgstr "Aucune famille n'est reliée à votre compte." msgid "You have to connect and link you account to a family" msgstr "Vous devez vous connecter et relier votre compte à une famille" -#: combo/apps/family/templates/family/person.html:3 -#, python-format -msgid "" -"\n" -"Born on %(birthdate)s\n" -msgstr "" -"\n" -"Né(e) le %(birthdate)s\n" +#: combo/apps/family/templates/family/person.html:4 +msgid "Born on" +msgstr "Né(e) le" #: combo/apps/family/templates/family/person.html:7 msgid "Address" msgstr "Adresse" +#: combo/apps/family/templates/family/person.html:8 +msgid "Address:" +msgstr "Adresse :" + #: combo/apps/family/templates/family/person.html:11 msgid "Contact" msgstr "" +#: combo/apps/family/templates/family/person.html:12 +msgid "Phone:" +msgstr "Téléphone :" + #: combo/apps/family/templates/family/person.html:13 msgid "Cellphone:" -msgstr "Téléphone portable :" +msgstr "Téléphone portable :" #: combo/apps/family/templates/family/person.html:14 -msgid "Phone:" -msgstr "Téléphone :" - -#: combo/apps/family/templates/family/person.html:15 msgid "Email:" -msgstr "Courriel :" +msgstr "Courriel :" #: combo/apps/momo/__init__.py:34 #: combo/apps/momo/templates/momo/manager_base.html:5 @@ -193,12 +192,12 @@ msgid "Form" msgstr "Formulaire" #: combo/apps/wcs/models.py:38 combo/apps/wcs/models.py:85 -#: combo/data/models.py:61 combo/data/models.py:455 +#: combo/data/models.py:61 combo/data/models.py:468 msgid "Title" msgstr "Titre" -#: combo/apps/wcs/models.py:39 combo/data/models.py:456 -#: combo/data/models.py:488 +#: combo/apps/wcs/models.py:39 combo/data/models.py:469 +#: combo/data/models.py:501 msgid "URL" msgstr "URL" @@ -329,39 +328,39 @@ msgstr "Groupes" msgid "Private (%s)" msgstr "Privée (%s)" -#: combo/data/models.py:360 combo/data/models.py:363 +#: combo/data/models.py:373 combo/data/models.py:376 msgid "Text" msgstr "Texte" -#: combo/data/models.py:379 +#: combo/data/models.py:392 msgid "Fortune" msgstr "Fortune du jour" -#: combo/data/models.py:396 +#: combo/data/models.py:409 msgid "Unlock Marker" msgstr "Marqueur de déblocage" -#: combo/data/models.py:442 +#: combo/data/models.py:455 msgid "Depth" msgstr "Profondeur" -#: combo/data/models.py:446 +#: combo/data/models.py:459 msgid "Menu" msgstr "Menu" -#: combo/data/models.py:458 +#: combo/data/models.py:471 msgid "Internal link" msgstr "Lien interne" -#: combo/data/models.py:459 +#: combo/data/models.py:472 msgid "Anchor" msgstr "Ancre" -#: combo/data/models.py:464 +#: combo/data/models.py:477 msgid "Link" msgstr "Lien" -#: combo/data/models.py:493 +#: combo/data/models.py:506 msgid "RSS/Atom Feed" msgstr "Flux RSS/Atom"