From: yomguy Date: Tue, 14 Feb 2012 00:34:23 +0000 (+0100) Subject: more loop over types X-Git-Tag: 1.4~6 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=e9b5443290fa14257b8ad496c5675b2677e7331f;p=telemeta.git more loop over types --- diff --git a/telemeta/htdocs/images/maximize.png b/telemeta/htdocs/images/maximize.png index 245f301b..ee95226d 100644 Binary files a/telemeta/htdocs/images/maximize.png and b/telemeta/htdocs/images/maximize.png differ diff --git a/telemeta/locale/de/LC_MESSAGES/django.mo b/telemeta/locale/de/LC_MESSAGES/django.mo index 45099d74..31a8d8c8 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 24672b1e..c3d4183a 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-02-14 00:00+0100\n" +"POT-Creation-Date: 2012-02-14 00:59+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -667,7 +667,7 @@ msgstr "" msgid "Desk" msgstr "" -#: templates/telemeta/base.html:86 views/base.py:269 +#: templates/telemeta/base.html:86 views/base.py:246 msgid "Lists" msgstr "" @@ -778,7 +778,7 @@ msgid "Save" msgstr "" #: templates/telemeta/collection_detail.html:5 -#: templates/telemeta/collection_detail_dc.html:5 views/base.py:459 +#: templates/telemeta/collection_detail_dc.html:5 views/base.py:436 msgid "Collection" msgstr "" @@ -1095,7 +1095,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:622 +#: templates/telemeta/mediaitem_detail_video.html:5 views/base.py:599 msgid "Item" msgstr "" @@ -1230,7 +1230,7 @@ msgstr "" msgid "User Profile" msgstr "" -#: templates/telemeta/profile_detail.html:8 views/base.py:1392 +#: templates/telemeta/profile_detail.html:8 views/base.py:1369 msgid "User profile" msgstr "" @@ -1589,17 +1589,17 @@ msgstr "" msgid "pattern" msgstr "" -#: views/base.py:268 views/base.py:458 views/base.py:621 views/base.py:925 -#: views/base.py:1391 +#: views/base.py:245 views/base.py:435 views/base.py:598 views/base.py:902 +#: views/base.py:1368 msgid "Access not allowed" msgstr "" -#: views/base.py:270 views/base.py:460 views/base.py:623 views/base.py:927 -#: views/base.py:1393 +#: views/base.py:247 views/base.py:437 views/base.py:600 views/base.py:904 +#: views/base.py:1370 msgid "" "Please login or contact the website administator to get a private access." msgstr "" -#: views/base.py:1422 +#: views/base.py:1399 msgid "Last changes" msgstr "" diff --git a/telemeta/locale/de/LC_MESSAGES/djangojs.mo b/telemeta/locale/de/LC_MESSAGES/djangojs.mo index 45099d74..31a8d8c8 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 cf88843e..f9487a34 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-02-14 00:00+0100\n" +"POT-Creation-Date: 2012-02-14 00:59+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 cb88a5e5..990b6934 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 60d812b9..8d29f12a 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-02-14 00:00+0100\n" +"POT-Creation-Date: 2012-02-14 00:59+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Olivier Guilyardi \n" "Language-Team: LANGUAGE \n" @@ -71,7 +71,6 @@ msgid "generic style" msgstr "style générique" #: models/enum.py:127 models/media.py:426 -#, fuzzy msgid "keyword" msgstr "Mot-clé" @@ -670,7 +669,7 @@ msgstr "Recherche" msgid "Desk" msgstr "Bureau" -#: templates/telemeta/base.html:86 views/base.py:269 +#: templates/telemeta/base.html:86 views/base.py:246 msgid "Lists" msgstr "Listes" @@ -783,7 +782,7 @@ msgid "Save" msgstr "Enregistrer" #: templates/telemeta/collection_detail.html:5 -#: templates/telemeta/collection_detail_dc.html:5 views/base.py:459 +#: templates/telemeta/collection_detail_dc.html:5 views/base.py:436 msgid "Collection" msgstr "Collection" @@ -1101,7 +1100,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:622 +#: templates/telemeta/mediaitem_detail_video.html:5 views/base.py:599 msgid "Item" msgstr "Item" @@ -1236,7 +1235,7 @@ msgstr "Formation" msgid "User Profile" msgstr "Profil utilisateur" -#: templates/telemeta/profile_detail.html:8 views/base.py:1392 +#: templates/telemeta/profile_detail.html:8 views/base.py:1369 msgid "User profile" msgstr "Profil utilisateur" @@ -1601,20 +1600,20 @@ msgstr "Enfants" msgid "pattern" msgstr "mots clés" -#: views/base.py:268 views/base.py:458 views/base.py:621 views/base.py:925 -#: views/base.py:1391 +#: views/base.py:245 views/base.py:435 views/base.py:598 views/base.py:902 +#: views/base.py:1368 msgid "Access not allowed" msgstr "Accès non autorisé" -#: views/base.py:270 views/base.py:460 views/base.py:623 views/base.py:927 -#: views/base.py:1393 +#: views/base.py:247 views/base.py:437 views/base.py:600 views/base.py:904 +#: views/base.py:1370 msgid "" "Please login or contact the website administator to get a private access." msgstr "" "Connectez-vous s'il vous plaît ou bien contactez l'administrateur du site " "pour obtenir un accès privé." -#: views/base.py:1422 +#: views/base.py:1399 msgid "Last changes" msgstr "Dernières modifications" diff --git a/telemeta/locale/fr/LC_MESSAGES/djangojs.mo b/telemeta/locale/fr/LC_MESSAGES/djangojs.mo index 8207ff79..937e766f 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 a0f8d47b..706d1af5 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-02-14 00:00+0100\n" +"POT-Creation-Date: 2012-02-14 00:59+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/admin_enumerations.html b/telemeta/templates/telemeta/admin_enumerations.html index 98861f89..b7734375 100644 --- a/telemeta/templates/telemeta/admin_enumerations.html +++ b/telemeta/templates/telemeta/admin_enumerations.html @@ -15,7 +15,7 @@ {% for enum in enumerations %} - {{ enum.name|capfirst }} + {% trans enum.name|capfirst %} {% endfor %} diff --git a/telemeta/views/base.py b/telemeta/views/base.py index 5d4b5fe3..b9529958 100644 --- a/telemeta/views/base.py +++ b/telemeta/views/base.py @@ -78,6 +78,9 @@ from telemeta.cache import TelemetaCache import telemeta.views.pages as pages from telemeta.forms import * +# Model type definition +mods = {'item': MediaItem, 'collection': MediaCollection, + 'corpus': MediaCorpus, 'fonds': MediaFonds, 'marker': MediaItemMarker, } # TOOLS @@ -134,33 +137,14 @@ def get_revisions(nb, user=None): last_revisions = last_revisions.filter(user=user) last_revisions = last_revisions[0:nb] revisions = [] - for revision in last_revisions: - if revision.element_type == 'item': - try: - element = MediaItem.objects.get(pk=revision.element_id) - except: - element = None - if revision.element_type == 'collection': - try: - element = MediaCollection.objects.get(pk=revision.element_id) - except: - element = None - if revision.element_type == 'marker': - try: - element = MediaItemMarker.objects.get(pk=revision.element_id) - except: - element = None - if revision.element_type == 'corpus': - try: - element = MediaCorpus.objects.get(pk=revision.element_id) - except: - element = None - if revision.element_type == 'fonds': - try: - element = MediaFonds.objects.get(pk=revision.element_id) - except: - element = None + for revision in last_revisions: + for type in mods.keys(): + if revision.element_type == type: + try: + element = mods[type].objects.get(pk=revision.element_id) + except: + element = None if not element == None: revisions.append({'revision': revision, 'element': element}) return revisions @@ -176,16 +160,9 @@ def get_playlists(request, user=None): resources = [] for resource in playlist_resources: try: - if resource.resource_type == 'item': - element = MediaItem.objects.get(id=resource.resource_id) - if resource.resource_type == 'collection': - element = MediaCollection.objects.get(id=resource.resource_id) - if resource.resource_type == 'marker': - element = MediaItemMarker.objects.get(id=resource.resource_id) - if resource.resource_type == 'corpus': - element = MediaCorpus.objects.get(id=resource.resource_id) - if resource.resource_type == 'fonds': - element = MediaFonds.objects.get(id=resource.resource_id) + for type in mods.keys(): + if resource.resource_type == type: + element = mods[type].objects.get(id=resource.resource_id) except: element = None resources.append({'element': element, 'type': resource.resource_type, 'public_id': resource.public_id })