entrouvert
/
combo
16
1
Fork 0
Code Issues Pull Requests 11 Releases Wiki Activity

family: improve template to be easily customizable via css (#8125) 

French translations also updated
This commit is contained in:
Serghei Mihai 2015-09-23 11:30:59 +02:00
parent 2fe09e6107
commit e026739491
2 changed files with 34 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
combo/apps/family/templates/family/person.html
View File

@ -1,17 +1,15 @@
{% load i18n %} {% load i18n %}
<p>{{ person.first_name }} {{ person.last_name }}</p> <p class="name"><span>{{ person.first_name }} {{ person.last_name }}</span></p>
{% blocktrans with birthdate=person.birthdate %} <p class="birthdate">
Born on {{ birthdate }} <span>{% trans "Born on" %}</span> {{ person.birthdate }}
{% endblocktrans %} </p>
<h4>{% trans "Address" %}</h4> <h4>{% trans "Address" %}</h4>
<p>{{ person.address }}</p> <p class="address"><span>{% trans "Address:" %}</span> {{ person.address }}</p>
{% if person.phone or person.cellphone or person.email %} {% if person.phone or person.cellphone or person.email %}
<h4>{% trans "Contact" %}</h4> <h4>{% trans "Contact" %}</h4>
<ul class='contact'> {% if person.phone %}<p class='phone'><span>{% trans "Phone:" %}</span> {{ person.phone }}</p>{% endif %}
{% if person.cellphone %}<li class='cellphone'>{% trans "Cellphone:" %} {{ person.cellphone }}</li>{% endif %} {% if person.cellphone %}<p class='cellphone'><span>{% trans "Cellphone:" %}</span> {{ person.cellphone }}</p>{% endif %}
{% if person.phone %}<li class='phone'>{% trans "Phone:" %} {{ person.phone }}</li>{% endif %} {% if person.email %}<p class='email'><span>{% trans "Email:" %}</span> {{ person.email }}</p>{% endif %}
{% if person.email %}<li class='email'>{% trans "Email:" %} {{ person.email }}</li>{% endif %}
</ul>
{% endif %} {% endif %}

53
combo/locale/fr/LC_MESSAGES/django.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: combo 0\n" "Project-Id-Version: combo 0\n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: 2015-03-15 11:36+0100\n"
"Last-Translator: Frederic Peters <fpeters@entrouvert.com>\n" "Last-Translator: Frederic Peters <fpeters@entrouvert.com>\n"
"Language: French\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" msgid "You have to connect and link you account to a family"
msgstr "Vous devez vous connecter et relier votre compte à une famille" msgstr "Vous devez vous connecter et relier votre compte à une famille"
#: combo/apps/family/templates/family/person.html:3 #: combo/apps/family/templates/family/person.html:4
#, python-format msgid "Born on"
msgid "" msgstr "Né(e) le"
"\n"
"Born on %(birthdate)s\n"
msgstr ""
"\n"
"Né(e) le %(birthdate)s\n"
#: combo/apps/family/templates/family/person.html:7 #: combo/apps/family/templates/family/person.html:7
msgid "Address" msgid "Address"
msgstr "Adresse" msgstr "Adresse"
#: combo/apps/family/templates/family/person.html:8
msgid "Address:"
msgstr "Adresse :"
#: combo/apps/family/templates/family/person.html:11 #: combo/apps/family/templates/family/person.html:11
msgid "Contact" msgid "Contact"
msgstr "" msgstr ""
#: combo/apps/family/templates/family/person.html:12
msgid "Phone:"
msgstr "Téléphone :"
#: combo/apps/family/templates/family/person.html:13 #: combo/apps/family/templates/family/person.html:13
msgid "Cellphone:" msgid "Cellphone:"
msgstr "Téléphone portable :" msgstr "Téléphone portable :"
#: combo/apps/family/templates/family/person.html:14 #: combo/apps/family/templates/family/person.html:14
msgid "Phone:"
msgstr "Téléphone :"
#: combo/apps/family/templates/family/person.html:15
msgid "Email:" msgid "Email:"
msgstr "Courriel :" msgstr "Courriel :"
#: combo/apps/momo/__init__.py:34 #: combo/apps/momo/__init__.py:34
#: combo/apps/momo/templates/momo/manager_base.html:5 #: combo/apps/momo/templates/momo/manager_base.html:5
@ -193,12 +192,12 @@ msgid "Form"
msgstr "Formulaire" msgstr "Formulaire"
#: combo/apps/wcs/models.py:38 combo/apps/wcs/models.py:85 #: 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" msgid "Title"
msgstr "Titre" msgstr "Titre"
#: combo/apps/wcs/models.py:39 combo/data/models.py:456 #: combo/apps/wcs/models.py:39 combo/data/models.py:469
#: combo/data/models.py:488 #: combo/data/models.py:501
msgid "URL" msgid "URL"
msgstr "URL" msgstr "URL"
@ -329,39 +328,39 @@ msgstr "Groupes"
msgid "Private (%s)" msgid "Private (%s)"
msgstr "Privée (%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" msgid "Text"
msgstr "Texte" msgstr "Texte"
#: combo/data/models.py:379 #: combo/data/models.py:392
msgid "Fortune" msgid "Fortune"
msgstr "Fortune du jour" msgstr "Fortune du jour"
#: combo/data/models.py:396 #: combo/data/models.py:409
msgid "Unlock Marker" msgid "Unlock Marker"
msgstr "Marqueur de déblocage" msgstr "Marqueur de déblocage"
#: combo/data/models.py:442 #: combo/data/models.py:455
msgid "Depth" msgid "Depth"
msgstr "Profondeur" msgstr "Profondeur"
#: combo/data/models.py:446 #: combo/data/models.py:459
msgid "Menu" msgid "Menu"
msgstr "Menu" msgstr "Menu"
#: combo/data/models.py:458 #: combo/data/models.py:471
msgid "Internal link" msgid "Internal link"
msgstr "Lien interne" msgstr "Lien interne"
#: combo/data/models.py:459 #: combo/data/models.py:472
msgid "Anchor" msgid "Anchor"
msgstr "Ancre" msgstr "Ancre"
#: combo/data/models.py:464 #: combo/data/models.py:477
msgid "Link" msgid "Link"
msgstr "Lien" msgstr "Lien"
#: combo/data/models.py:493 #: combo/data/models.py:506
msgid "RSS/Atom Feed" msgid "RSS/Atom Feed"
msgstr "Flux RSS/Atom" msgstr "Flux RSS/Atom"