From e9b5443290fa14257b8ad496c5675b2677e7331f Mon Sep 17 00:00:00 2001 From: yomguy Date: Tue, 14 Feb 2012 01:34:23 +0100 Subject: [PATCH] more loop over types --- telemeta/htdocs/images/maximize.png | Bin 857 -> 882 bytes telemeta/locale/de/LC_MESSAGES/django.mo | Bin 420 -> 420 bytes telemeta/locale/de/LC_MESSAGES/django.po | 20 +++---- telemeta/locale/de/LC_MESSAGES/djangojs.mo | Bin 420 -> 420 bytes telemeta/locale/de/LC_MESSAGES/djangojs.po | 2 +- telemeta/locale/fr/LC_MESSAGES/django.mo | Bin 15305 -> 15338 bytes telemeta/locale/fr/LC_MESSAGES/django.po | 21 ++++---- telemeta/locale/fr/LC_MESSAGES/djangojs.mo | Bin 1718 -> 1718 bytes telemeta/locale/fr/LC_MESSAGES/djangojs.po | 2 +- .../telemeta/admin_enumerations.html | 2 +- telemeta/views/base.py | 49 +++++------------- 11 files changed, 36 insertions(+), 60 deletions(-) diff --git a/telemeta/htdocs/images/maximize.png b/telemeta/htdocs/images/maximize.png index 245f301b005c49138d6fc656e8416a3ce21d403a..ee95226d58e8b25f273af2427e4086ca4c91145a 100644 GIT binary patch delta 799 zcmV+)1K|AG2J!}wV1Et(2{6Pg*+KvS0`f^jK~y-)m6Ts-m30`$Ki}W`zUQ4g^We@p z+bV-JoMu!+UU&$y30(*!(nZw8x;WW%3pTtGi=<0$N`+l?u?CSCAr|6Q47#Y>P1pzw zB%I9JiluAkv~%9`{&~FE6qBK+@8xsxdEonecw}bWpF`3>27lW!XhtwOX*Nv@(Ou9X zso%jx2c16PfCQ+*`Cp(iZx%faU zPKJ>8;LWei7D{+*!OOlfn+srHCscMzJ01x#IN-z8BDsa5@*OBPh=&yDAGqRy7r;x8 z1f^@Rr35Po`G1BXgkgMV76)L0!B?c7vQ&Ig>e;aDerdKFdcQU61{hKx!~8ESi3g-o z41X;^7DCO3&8xsF%+%oW3QXKIn{xmWjQ$Iycct;W8$4Y4w&Z&-eI0%VUa!H_V_?rf zV<+_OfRDDr^_|jZ_s;)-UYV;_{M{dI=nXzQ-9as;G)@LQOXx#e;y8(pu7c2 z2_!dQPWKD>v{Wv@i4NGB!tx57TZ9X@&8iy}+$-$~VebvIF+FHDBW?iL1~k*mCcUx$ zX*MISAGwP_CvqSMmSJgpeyL8SG~R;QjJQ7F5^^=<_K_u5fDYuImmmI6Y>Qem+ssZP zmq+d$PJcIkg7zxbw!rDeByz8Meo(nR*n-)>0pzX{x6d$IFq-Sr(ZV03&1t~%)q>gU zSt3oIr3vIn)?rJdG)VcGGAnhk=Wmov?70EP-i4mi6aj&9@jTti7bLk>ULLdcA(l zcYK-|ABSQ18qSZ%5+iMfacW*I=JR{!uO88A z-z&CT-y_q1pfv3zvkY`^oJ^Zid`rfX|cL|=;~EgBOH41Z+)=r$^@2yKd3Ti}ZV zb4nV+QdU38=B2)f zm6O!Y(W)|5qH7%E)W$eC%C6rsPZwZiYk^!G(KC~6oh+K-;wXED+5czerT;qc!id#X)||=Q8P}6N7}19%Xfzmj{Qr_Y zI88R@6sF^Bq0Zi6`g?DO?7@g-I8dNo;n5adE$%GwekZ*PZi8%@=?HtiW$FhW$xO$T zPaRW!E`Ku(vE@4&pR+VG-Kej;$oc}mv}>=`qVhWB#dxI_9WT_`i(-ifZ+W9{A}+M? zQ@i#z@I8}F$|WWntFlo&8qxfnBNd*O?E9hlF7GMW#hf0 z5f3#P8l_cXtUy--4Qh1`HrUmh`42~jBi45Eb$*GjdNQA>MMobFjT;}U@ar%qOT63S zt@%7wVxmdbsg6?|WyjU{4@7LA$<}s8N*tb^ykUf)^K9(P9R4Jtqn&kaZ0V$@jqVoB zk?YCc7tzzkwhD_{T&%Nal>IN>fb887t4plu&D{Ann%-DK6BI=900000NkvXXu0mjf Dy?c1_ diff --git a/telemeta/locale/de/LC_MESSAGES/django.mo b/telemeta/locale/de/LC_MESSAGES/django.mo index 45099d749e2aa35ebbbef9da6f5440d22cb13f89..31a8d8c83be7ccf0f9ed7b943f1c7176df4bd6d9 100644 GIT binary patch delta 13 UcmZ3&yo7neR3=l)jnjD<0U&e)IsgCw delta 13 UcmZ3&yo7neR3-z1jnjD<0U#*^EC2ui 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 45099d749e2aa35ebbbef9da6f5440d22cb13f89..31a8d8c83be7ccf0f9ed7b943f1c7176df4bd6d9 100644 GIT binary patch delta 13 UcmZ3&yo7neR3=l)jnjD<0U&e)IsgCw delta 13 UcmZ3&yo7neR3-z1jnjD<0U#*^EC2ui 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 cb88a5e526e5f143dbef334c14044057a4a7e133..990b6934812fb8e7e97114b1613ed593150a4042 100644 GIT binary patch delta 5193 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 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 8207ff79d099fe05bab12796fd4924bf549e54a8..937e766f328ca40d690835a61406350d03274b7d 100644 GIT binary patch delta 15 WcmdnSyN!246El;k<>nS\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 }) -- 2.39.5