From: yomguy Date: Wed, 1 Feb 2012 11:44:43 +0000 (+0100) Subject: fix profile details X-Git-Tag: 1.3.9~23 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=0470fb13259f8ee0710a33ab325658d43858a9d7;p=telemeta.git fix profile details --- diff --git a/INSTALL.rst b/INSTALL.rst index c1d571bb..82ae4326 100644 --- a/INSTALL.rst +++ b/INSTALL.rst @@ -45,7 +45,7 @@ Install the system dependencies Install Telemeta ----------------------------- -PIP style (recommended) +Pip style (recommended) ++++++++++++++++++++++++ We strongly advise you use the python package tool as it installs some good dependencies automatically:: @@ -53,7 +53,7 @@ We strongly advise you use the python package tool as it installs some good depe sudo aptitude install python-pip sudo pip install telemeta - or (deprecated):: +or (deprecated):: sudo easy_install telemeta diff --git a/telemeta/locale/de/LC_MESSAGES/django.mo b/telemeta/locale/de/LC_MESSAGES/django.mo index 11e7c742..de4caed2 100644 Binary files a/telemeta/locale/de/LC_MESSAGES/django.mo and b/telemeta/locale/de/LC_MESSAGES/django.mo differ diff --git a/telemeta/locale/de/LC_MESSAGES/django.po b/telemeta/locale/de/LC_MESSAGES/django.po index 5bd46ce6..0859c72a 100644 --- a/telemeta/locale/de/LC_MESSAGES/django.po +++ b/telemeta/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-01-31 16:50+0100\n" +"POT-Creation-Date: 2012-02-01 12:42+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -242,11 +242,11 @@ msgstr "" msgid "depositor / contributor" msgstr "" -#: models/media.py:175 +#: models/media.py:175 models/media.py:634 msgid "recording year (from)" msgstr "" -#: models/media.py:176 +#: models/media.py:176 models/media.py:635 msgid "recording year (until)" msgstr "" @@ -494,24 +494,24 @@ msgstr "" msgid "transcoded" msgstr "" -#: models/media.py:632 +#: models/media.py:633 msgid "collections" msgstr "" -#: models/media.py:640 models/media.py:641 models/media.py:650 -#: models/media.py:665 +#: models/media.py:643 models/media.py:644 models/media.py:654 +#: models/media.py:669 msgid "corpus" msgstr "" -#: models/media.py:658 models/media.py:659 models/media.py:676 +#: models/media.py:662 models/media.py:663 models/media.py:680 msgid "fonds" msgstr "" -#: models/media.py:669 models/media.py:670 +#: models/media.py:673 models/media.py:674 msgid "corpus related media" msgstr "" -#: models/media.py:680 models/media.py:681 +#: models/media.py:684 models/media.py:685 msgid "fonds related media" msgstr "" @@ -536,23 +536,31 @@ msgid "Institution" msgstr "" #: models/system.py:85 templates/telemeta/profile_detail.html:37 -msgid "Function" +msgid "Department" msgstr "" #: models/system.py:86 templates/telemeta/profile_detail.html:38 -msgid "Address" +msgid "Function" msgstr "" #: models/system.py:87 templates/telemeta/profile_detail.html:39 +msgid "Attachment" +msgstr "" + +#: models/system.py:88 templates/telemeta/profile_detail.html:40 +msgid "Address" +msgstr "" + +#: models/system.py:89 templates/telemeta/profile_detail.html:41 msgid "Telephone" msgstr "" -#: models/system.py:88 +#: models/system.py:90 msgid "Expiration_date" msgstr "" #: templates/admin/base.html:21 templates/telemeta/base.html:83 -#: templates/telemeta/base.html.py:102 templates/telemeta/base.html:106 +#: templates/telemeta/base.html.py:100 templates/telemeta/base.html:106 msgid "Home" msgstr "" @@ -611,7 +619,7 @@ msgstr "" msgid "Welcome" msgstr "" -#: templates/telemeta/base.html:59 templates/telemeta/base.html.py:101 +#: templates/telemeta/base.html:59 templates/telemeta/base.html.py:102 msgid "Profile" msgstr "" @@ -656,7 +664,7 @@ msgstr "" msgid "Desk" msgstr "" -#: templates/telemeta/base.html:100 views/base.py:258 +#: templates/telemeta/base.html:101 views/base.py:260 msgid "Lists" msgstr "" @@ -683,21 +691,21 @@ msgstr "" msgid "Instruments" msgstr "" -#: templates/telemeta/base.html:158 +#: templates/telemeta/base.html:159 msgid "Powered by" msgstr "" -#: templates/telemeta/base.html:159 +#: templates/telemeta/base.html:160 msgid "By" msgstr "" -#: templates/telemeta/base.html:164 +#: templates/telemeta/base.html:165 msgid "" "Usage of the archives in the respect of cultural heritage of the original " "communities." msgstr "" -#: templates/telemeta/base.html:170 +#: templates/telemeta/base.html:171 #: templates/telemeta/collection_detail.html:117 msgid "Legal notices" msgstr "" @@ -752,7 +760,7 @@ msgid "Save" msgstr "" #: templates/telemeta/collection_detail.html:5 -#: templates/telemeta/collection_detail_dc.html:5 views/base.py:405 +#: templates/telemeta/collection_detail_dc.html:5 views/base.py:407 msgid "Collection" msgstr "" @@ -764,7 +772,7 @@ msgstr "" #: templates/telemeta/mediaitem_detail_video.html:192 #: templates/telemeta/mediaitem_detail_video.html:231 #: templates/telemeta/mediaitem_detail_video.html:352 -#: templates/telemeta/profile_detail.html:63 +#: templates/telemeta/profile_detail.html:65 #: templates/telemeta/resource_detail.html:21 #: templates/telemeta/inc/collection_related.html:81 #: templates/telemeta/inc/mediaitem_related.html:81 @@ -858,7 +866,7 @@ msgstr "" #: templates/telemeta/home.html:35 #: templates/telemeta/mediaitem_detail.html:293 #: templates/telemeta/mediaitem_detail_video.html:363 -#: templates/telemeta/resource_detail.html:65 +#: templates/telemeta/resource_detail.html:69 msgid "Delete" msgstr "" @@ -1071,7 +1079,7 @@ msgstr "" #: templates/telemeta/mediaitem_add.html:5 #: templates/telemeta/mediaitem_copy.html:5 #: templates/telemeta/mediaitem_detail.html:5 -#: templates/telemeta/mediaitem_detail_video.html:5 views/base.py:567 +#: templates/telemeta/mediaitem_detail_video.html:5 views/base.py:569 msgid "Item" msgstr "" @@ -1215,7 +1223,7 @@ msgstr "" msgid "User Profile" msgstr "" -#: templates/telemeta/profile_detail.html:8 views/base.py:1335 +#: templates/telemeta/profile_detail.html:8 views/base.py:1337 msgid "User profile" msgstr "" @@ -1233,37 +1241,37 @@ msgstr "" msgid "Email" msgstr "" -#: templates/telemeta/profile_detail.html:40 +#: templates/telemeta/profile_detail.html:42 msgid "Expiration date" msgstr "" -#: templates/telemeta/profile_detail.html:42 +#: templates/telemeta/profile_detail.html:44 msgid "Is staff" msgstr "" -#: templates/telemeta/profile_detail.html:43 +#: templates/telemeta/profile_detail.html:45 msgid "Is superuser" msgstr "" -#: templates/telemeta/profile_detail.html:44 +#: templates/telemeta/profile_detail.html:46 msgid "Group" msgid_plural "Groups" msgstr[0] "" msgstr[1] "" -#: templates/telemeta/profile_detail.html:45 +#: templates/telemeta/profile_detail.html:47 msgid "Last login" msgstr "" -#: templates/telemeta/profile_detail.html:47 +#: templates/telemeta/profile_detail.html:49 msgid "Language" msgstr "" -#: templates/telemeta/profile_detail.html:55 +#: templates/telemeta/profile_detail.html:57 msgid "Apply" msgstr "" -#: templates/telemeta/profile_detail.html:66 +#: templates/telemeta/profile_detail.html:68 #: templates/telemeta/registration/password_change_done.html:3 #: templates/telemeta/registration/password_change_form.html:4 msgid "Change password" @@ -1357,7 +1365,7 @@ msgstr "" msgid "No item" msgstr "" -#: templates/telemeta/inc/module_revisions.html:7 views/base.py:1365 +#: templates/telemeta/inc/module_revisions.html:7 views/base.py:1367 msgid "Last changes" msgstr "" @@ -1551,13 +1559,13 @@ msgid_plural "%(count)d collections" msgstr[0] "" msgstr[1] "" -#: views/base.py:257 views/base.py:404 views/base.py:566 views/base.py:860 -#: views/base.py:1334 +#: views/base.py:259 views/base.py:406 views/base.py:568 views/base.py:862 +#: views/base.py:1336 msgid "Access not allowed" msgstr "" -#: views/base.py:259 views/base.py:406 views/base.py:568 views/base.py:862 -#: views/base.py:1336 +#: views/base.py:261 views/base.py:408 views/base.py:570 views/base.py:864 +#: views/base.py:1338 msgid "" "Please login or contact the website administator to get a private access." msgstr "" diff --git a/telemeta/locale/de/LC_MESSAGES/djangojs.mo b/telemeta/locale/de/LC_MESSAGES/djangojs.mo index 11e7c742..de4caed2 100644 Binary files a/telemeta/locale/de/LC_MESSAGES/djangojs.mo and b/telemeta/locale/de/LC_MESSAGES/djangojs.mo differ diff --git a/telemeta/locale/de/LC_MESSAGES/djangojs.po b/telemeta/locale/de/LC_MESSAGES/djangojs.po index 95d94240..da1e2817 100644 --- a/telemeta/locale/de/LC_MESSAGES/djangojs.po +++ b/telemeta/locale/de/LC_MESSAGES/djangojs.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-01-31 16:50+0100\n" +"POT-Creation-Date: 2012-02-01 12:42+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/telemeta/locale/fr/LC_MESSAGES/django.mo b/telemeta/locale/fr/LC_MESSAGES/django.mo index 87921ca5..5cfed4ad 100644 Binary files a/telemeta/locale/fr/LC_MESSAGES/django.mo and b/telemeta/locale/fr/LC_MESSAGES/django.mo differ diff --git a/telemeta/locale/fr/LC_MESSAGES/django.po b/telemeta/locale/fr/LC_MESSAGES/django.po index 8b21074e..a952d51c 100644 --- a/telemeta/locale/fr/LC_MESSAGES/django.po +++ b/telemeta/locale/fr/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-01-31 16:50+0100\n" +"POT-Creation-Date: 2012-02-01 12:42+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Olivier Guilyardi \n" "Language-Team: LANGUAGE \n" @@ -242,11 +242,11 @@ msgstr "titre original / traduction" msgid "depositor / contributor" msgstr "déposant / contributeur" -#: models/media.py:175 +#: models/media.py:175 models/media.py:634 msgid "recording year (from)" msgstr "année d'enregistrement (depuis)" -#: models/media.py:176 +#: models/media.py:176 models/media.py:635 msgid "recording year (until)" msgstr "année d'enregistrement (jusqu'à)" @@ -496,24 +496,24 @@ msgstr "auteur" msgid "transcoded" msgstr "" -#: models/media.py:632 +#: models/media.py:633 msgid "collections" msgstr "collections" -#: models/media.py:640 models/media.py:641 models/media.py:650 -#: models/media.py:665 +#: models/media.py:643 models/media.py:644 models/media.py:654 +#: models/media.py:669 msgid "corpus" msgstr "corpus" -#: models/media.py:658 models/media.py:659 models/media.py:676 +#: models/media.py:662 models/media.py:663 models/media.py:680 msgid "fonds" msgstr "fonds" -#: models/media.py:669 models/media.py:670 +#: models/media.py:673 models/media.py:674 msgid "corpus related media" msgstr "média associés" -#: models/media.py:680 models/media.py:681 +#: models/media.py:684 models/media.py:685 msgid "fonds related media" msgstr "média associés" @@ -538,23 +538,31 @@ msgid "Institution" msgstr "Institution" #: models/system.py:85 templates/telemeta/profile_detail.html:37 +msgid "Department" +msgstr "Département" + +#: models/system.py:86 templates/telemeta/profile_detail.html:38 msgid "Function" msgstr "Fonction" -#: models/system.py:86 templates/telemeta/profile_detail.html:38 +#: models/system.py:87 templates/telemeta/profile_detail.html:39 +msgid "Attachment" +msgstr "Rattachement" + +#: models/system.py:88 templates/telemeta/profile_detail.html:40 msgid "Address" msgstr "Adresse" -#: models/system.py:87 templates/telemeta/profile_detail.html:39 +#: models/system.py:89 templates/telemeta/profile_detail.html:41 msgid "Telephone" msgstr "Téléphone" -#: models/system.py:88 +#: models/system.py:90 msgid "Expiration_date" msgstr "Date d'expiration" #: templates/admin/base.html:21 templates/telemeta/base.html:83 -#: templates/telemeta/base.html.py:102 templates/telemeta/base.html:106 +#: templates/telemeta/base.html.py:100 templates/telemeta/base.html:106 msgid "Home" msgstr "" @@ -613,7 +621,7 @@ msgstr "Pas d'utilisateurs" msgid "Welcome" msgstr "Bienvenue" -#: templates/telemeta/base.html:59 templates/telemeta/base.html.py:101 +#: templates/telemeta/base.html:59 templates/telemeta/base.html.py:102 msgid "Profile" msgstr "Profil" @@ -658,7 +666,7 @@ msgstr "Admin" msgid "Desk" msgstr "Bureau" -#: templates/telemeta/base.html:100 views/base.py:258 +#: templates/telemeta/base.html:101 views/base.py:260 msgid "Lists" msgstr "Listes" @@ -685,15 +693,15 @@ msgstr "" msgid "Instruments" msgstr "Instruments" -#: templates/telemeta/base.html:158 +#: templates/telemeta/base.html:159 msgid "Powered by" msgstr "Propulsé par" -#: templates/telemeta/base.html:159 +#: templates/telemeta/base.html:160 msgid "By" msgstr "Par" -#: templates/telemeta/base.html:164 +#: templates/telemeta/base.html:165 msgid "" "Usage of the archives in the respect of cultural heritage of the original " "communities." @@ -701,7 +709,7 @@ msgstr "" "Usage des archives réservé dans le respect du patrimoine culturel des " "communautés d'origine." -#: templates/telemeta/base.html:170 +#: templates/telemeta/base.html:171 #: templates/telemeta/collection_detail.html:117 msgid "Legal notices" msgstr "Mentions légales" @@ -756,7 +764,7 @@ msgid "Save" msgstr "Enregistrer" #: templates/telemeta/collection_detail.html:5 -#: templates/telemeta/collection_detail_dc.html:5 views/base.py:405 +#: templates/telemeta/collection_detail_dc.html:5 views/base.py:407 msgid "Collection" msgstr "Collection" @@ -768,7 +776,7 @@ msgstr "Collection" #: templates/telemeta/mediaitem_detail_video.html:192 #: templates/telemeta/mediaitem_detail_video.html:231 #: templates/telemeta/mediaitem_detail_video.html:352 -#: templates/telemeta/profile_detail.html:63 +#: templates/telemeta/profile_detail.html:65 #: templates/telemeta/resource_detail.html:21 #: templates/telemeta/inc/collection_related.html:81 #: templates/telemeta/inc/mediaitem_related.html:81 @@ -862,7 +870,7 @@ msgstr "Nombre d'items" #: templates/telemeta/home.html:35 #: templates/telemeta/mediaitem_detail.html:293 #: templates/telemeta/mediaitem_detail_video.html:363 -#: templates/telemeta/resource_detail.html:65 +#: templates/telemeta/resource_detail.html:69 msgid "Delete" msgstr "Supprimer" @@ -1076,7 +1084,7 @@ msgstr "Mot de passe oublié" #: templates/telemeta/mediaitem_add.html:5 #: templates/telemeta/mediaitem_copy.html:5 #: templates/telemeta/mediaitem_detail.html:5 -#: templates/telemeta/mediaitem_detail_video.html:5 views/base.py:567 +#: templates/telemeta/mediaitem_detail_video.html:5 views/base.py:569 msgid "Item" msgstr "Item" @@ -1220,7 +1228,7 @@ msgstr "Formation" msgid "User Profile" msgstr "Profil utilisateur" -#: templates/telemeta/profile_detail.html:8 views/base.py:1335 +#: templates/telemeta/profile_detail.html:8 views/base.py:1337 msgid "User profile" msgstr "Profil utilisateur" @@ -1238,37 +1246,37 @@ msgstr "Nom" msgid "Email" msgstr "Courriel" -#: templates/telemeta/profile_detail.html:40 +#: templates/telemeta/profile_detail.html:42 msgid "Expiration date" msgstr "Date d'expiration" -#: templates/telemeta/profile_detail.html:42 +#: templates/telemeta/profile_detail.html:44 msgid "Is staff" msgstr "Statut équipe" -#: templates/telemeta/profile_detail.html:43 +#: templates/telemeta/profile_detail.html:45 msgid "Is superuser" msgstr "Statut super-utilisateur" -#: templates/telemeta/profile_detail.html:44 +#: templates/telemeta/profile_detail.html:46 msgid "Group" msgid_plural "Groups" msgstr[0] "Groupe" msgstr[1] "Groupes" -#: templates/telemeta/profile_detail.html:45 +#: templates/telemeta/profile_detail.html:47 msgid "Last login" msgstr "Dernière connexion" -#: templates/telemeta/profile_detail.html:47 +#: templates/telemeta/profile_detail.html:49 msgid "Language" msgstr "Langue" -#: templates/telemeta/profile_detail.html:55 +#: templates/telemeta/profile_detail.html:57 msgid "Apply" msgstr "Appliquer" -#: templates/telemeta/profile_detail.html:66 +#: templates/telemeta/profile_detail.html:68 #: templates/telemeta/registration/password_change_done.html:3 #: templates/telemeta/registration/password_change_form.html:4 msgid "Change password" @@ -1363,7 +1371,7 @@ msgstr "Etat/Continent" msgid "No item" msgstr "Aucun item" -#: templates/telemeta/inc/module_revisions.html:7 views/base.py:1365 +#: templates/telemeta/inc/module_revisions.html:7 views/base.py:1367 msgid "Last changes" msgstr "Dernières modifications" @@ -1564,13 +1572,13 @@ msgid_plural "%(count)d collections" msgstr[0] "%(count)d collection" msgstr[1] "%(count)d collections" -#: views/base.py:257 views/base.py:404 views/base.py:566 views/base.py:860 -#: views/base.py:1334 +#: views/base.py:259 views/base.py:406 views/base.py:568 views/base.py:862 +#: views/base.py:1336 msgid "Access not allowed" msgstr "Accès non autorisé" -#: views/base.py:259 views/base.py:406 views/base.py:568 views/base.py:862 -#: views/base.py:1336 +#: views/base.py:261 views/base.py:408 views/base.py:570 views/base.py:864 +#: views/base.py:1338 msgid "" "Please login or contact the website administator to get a private access." msgstr "" diff --git a/telemeta/locale/fr/LC_MESSAGES/djangojs.mo b/telemeta/locale/fr/LC_MESSAGES/djangojs.mo index 5c6ea154..697517d4 100644 Binary files a/telemeta/locale/fr/LC_MESSAGES/djangojs.mo and b/telemeta/locale/fr/LC_MESSAGES/djangojs.mo differ diff --git a/telemeta/locale/fr/LC_MESSAGES/djangojs.po b/telemeta/locale/fr/LC_MESSAGES/djangojs.po index 0f446a35..ffc1833e 100644 --- a/telemeta/locale/fr/LC_MESSAGES/djangojs.po +++ b/telemeta/locale/fr/LC_MESSAGES/djangojs.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-01-31 16:51+0100\n" +"POT-Creation-Date: 2012-02-01 12:42+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Guillaume Pellerin \n" "Language-Team: LANGUAGE \n" diff --git a/telemeta/templates/telemeta/profile_detail.html b/telemeta/templates/telemeta/profile_detail.html index b24b0860..6c8fec0e 100644 --- a/telemeta/templates/telemeta/profile_detail.html +++ b/telemeta/templates/telemeta/profile_detail.html @@ -34,7 +34,9 @@
{% trans "Email" %}
{{ usr.email }}
{% trans "Institution" %}
{% if profile %}{{ profile.institution }}{% endif %}
+
{% trans "Department" %}
{% if profile %}{{ profile.department }}{% endif %}
{% trans "Function" %}
{% if profile %}{{ profile.function }}{% endif %}
+
{% trans "Attachment" %}
{% if profile %}{{ profile.attachment }}{% endif %}
{% trans "Address" %}
{% if profile %}{{ profile.address }}{% endif %}
{% trans "Telephone" %}
{% if profile %}{{ profile.telephone }}{% endif %}
{% trans "Expiration date" %}
{% if profile %}{{ profile.expiration_date }}{% endif %}