From 48e642dfc48687da45d1ce27b139270e577fcf03 Mon Sep 17 00:00:00 2001 From: yomguy Date: Wed, 25 May 2011 11:38:32 +0200 Subject: [PATCH] add language to MediaItem model --- telemeta/locale/de/LC_MESSAGES/django.mo | Bin 420 -> 420 bytes telemeta/locale/de/LC_MESSAGES/django.po | 98 +++++++++--------- telemeta/locale/fr/LC_MESSAGES/django.mo | Bin 12453 -> 12485 bytes telemeta/locale/fr/LC_MESSAGES/django.po | 98 +++++++++--------- telemeta/models/media.py | 1 + .../telemeta_default/mediaitem_detail.html | 1 + 6 files changed, 104 insertions(+), 94 deletions(-) diff --git a/telemeta/locale/de/LC_MESSAGES/django.mo b/telemeta/locale/de/LC_MESSAGES/django.mo index f02e9761d185f348df280526cccb0c41b849a9ee..f5782e63de7b1161214f0b84c1c2718d35987022 100644 GIT binary patch delta 18 ZcmZ3&yo7ne1a?yeLqjWLvyIbv838o_1ttIh delta 18 ZcmZ3&yo7ne1a=bzLqjV=la14P838ok1t9\n" "Language-Team: LANGUAGE \n" @@ -62,15 +62,15 @@ msgstr "" msgid "A/D conversion" msgstr "" -#: models/enum.py:113 models/media.py:246 +#: models/enum.py:113 models/media.py:247 msgid "vernacular style" msgstr "" -#: models/enum.py:120 models/media.py:248 +#: models/enum.py:120 models/media.py:249 msgid "generic style" msgstr "" -#: models/enum.py:127 models/media.py:333 +#: models/enum.py:127 models/media.py:334 msgid "keyword" msgstr "" @@ -156,16 +156,16 @@ msgstr "" msgid "Private data" msgstr "" -#: models/media.py:62 models/media.py:115 models/media.py:263 +#: models/media.py:62 models/media.py:115 models/media.py:264 msgid "public access" msgstr "" -#: models/media.py:92 models/media.py:260 +#: models/media.py:92 models/media.py:261 msgid "reference" msgstr "" -#: models/media.py:93 models/media.py:227 models/media.py:365 -#: models/media.py:380 models/media.py:414 +#: models/media.py:93 models/media.py:227 models/media.py:366 +#: models/media.py:381 models/media.py:415 msgid "title" msgstr "" @@ -245,15 +245,15 @@ msgstr "" msgid "published" msgstr "" -#: models/media.py:139 models/media.py:257 +#: models/media.py:139 models/media.py:258 msgid "code" msgstr "" -#: models/media.py:140 models/media.py:258 +#: models/media.py:140 models/media.py:259 msgid "old code" msgstr "" -#: models/media.py:141 models/media.py:267 +#: models/media.py:141 models/media.py:268 msgid "approximative duration" msgstr "" @@ -281,7 +281,7 @@ msgstr "" msgid "populations / social groups" msgstr "" -#: models/media.py:204 models/media.py:309 +#: models/media.py:204 models/media.py:310 msgid "computed duration" msgstr "" @@ -313,101 +313,105 @@ msgstr "" msgid "moda_execut" msgstr "" -#: models/media.py:249 +#: models/media.py:243 +msgid "language" +msgstr "" + +#: models/media.py:250 msgid "author / compositor" msgstr "" -#: models/media.py:252 +#: models/media.py:253 msgid "remarks" msgstr "" -#: models/media.py:253 +#: models/media.py:254 msgid "recordist selection" msgstr "" -#: models/media.py:254 +#: models/media.py:255 msgid "recordist as in collection" msgstr "" -#: models/media.py:259 +#: models/media.py:260 msgid "item number" msgstr "" -#: models/media.py:261 +#: models/media.py:262 msgid "published reference" msgstr "" -#: models/media.py:262 +#: models/media.py:263 msgid "copy of" msgstr "" -#: models/media.py:264 +#: models/media.py:265 msgid "file" msgstr "" -#: models/media.py:274 models/media.py:434 -#: templates/telemeta_default/mediaitem_detail.html:207 +#: models/media.py:275 models/media.py:435 +#: templates/telemeta_default/mediaitem_detail.html:208 msgid "keywords" msgstr "" -#: models/media.py:332 models/media.py:346 models/media.py:364 -#: models/media.py:411 +#: models/media.py:333 models/media.py:347 models/media.py:365 +#: models/media.py:412 msgid "item" msgstr "" -#: models/media.py:348 +#: models/media.py:349 msgid "composition" msgstr "" -#: models/media.py:350 +#: models/media.py:351 msgid "vernacular name" msgstr "" -#: models/media.py:351 +#: models/media.py:352 msgid "number" msgstr "" -#: models/media.py:352 +#: models/media.py:353 msgid "interprets" msgstr "" -#: models/media.py:366 +#: models/media.py:367 msgid "start" msgstr "" -#: models/media.py:367 +#: models/media.py:368 msgid "end" msgstr "" -#: models/media.py:378 models/media.py:397 models/media.py:412 +#: models/media.py:379 models/media.py:398 models/media.py:413 msgid "public_id" msgstr "" -#: models/media.py:381 models/media.py:416 +#: models/media.py:382 models/media.py:417 msgid "description" msgstr "" -#: models/media.py:398 +#: models/media.py:399 msgid "playlist" msgstr "" -#: models/media.py:399 +#: models/media.py:400 msgid "resource_type" msgstr "" -#: models/media.py:400 +#: models/media.py:401 msgid "resource_id" msgstr "" -#: models/media.py:413 models/system.py:54 +#: models/media.py:414 models/system.py:54 msgid "time" msgstr "" -#: models/media.py:415 models/media.py:435 +#: models/media.py:416 models/media.py:436 msgid "date" msgstr "" -#: models/media.py:417 +#: models/media.py:418 msgid "author" msgstr "" @@ -681,8 +685,8 @@ msgstr "" #: templates/telemeta_default/collection_detail.html:44 #: templates/telemeta_default/mediaitem_detail.html:109 -#: templates/telemeta_default/mediaitem_detail.html:207 -#: templates/telemeta_default/mediaitem_detail.html:246 +#: templates/telemeta_default/mediaitem_detail.html:208 +#: templates/telemeta_default/mediaitem_detail.html:247 #: templates/telemeta_default/profile_detail.html:63 msgid "Edit" msgstr "" @@ -722,22 +726,22 @@ msgid "Recordist" msgstr "" #: templates/telemeta_default/collection_detail.html:141 -#: templates/telemeta_default/mediaitem_detail.html:262 +#: templates/telemeta_default/mediaitem_detail.html:263 msgid "Archiving data" msgstr "" #: templates/telemeta_default/collection_detail.html:162 -#: templates/telemeta_default/mediaitem_detail.html:277 +#: templates/telemeta_default/mediaitem_detail.html:278 msgid "Technical data" msgstr "" #: templates/telemeta_default/collection_detail.html:167 -#: templates/telemeta_default/mediaitem_detail.html:280 +#: templates/telemeta_default/mediaitem_detail.html:281 msgid "Media type" msgstr "" #: templates/telemeta_default/collection_detail.html:167 -#: templates/telemeta_default/mediaitem_detail.html:280 +#: templates/telemeta_default/mediaitem_detail.html:281 msgid "Audio" msgstr "" @@ -985,15 +989,15 @@ msgstr "" msgid "Location" msgstr "" -#: templates/telemeta_default/mediaitem_detail.html:212 +#: templates/telemeta_default/mediaitem_detail.html:213 msgid "Musical informations" msgstr "" -#: templates/telemeta_default/mediaitem_detail.html:246 +#: templates/telemeta_default/mediaitem_detail.html:247 msgid "performance" msgstr "" -#: templates/telemeta_default/mediaitem_detail.html:251 +#: templates/telemeta_default/mediaitem_detail.html:252 msgid "General informations" msgstr "" diff --git a/telemeta/locale/fr/LC_MESSAGES/django.mo b/telemeta/locale/fr/LC_MESSAGES/django.mo index 7d58fba261084cdda16c71743abb0d4eb567fed5..a4f67c6516dc558f423264b59bce7e86e70fb040 100644 GIT binary patch delta 4342 zcmXxl3y@b;9l-Ik?6S)O`}ni*h=pC2bz^xfk4QuwmMG$gB&d|ABs(aGgG`Z_K=!s+|vp6>ADbI!f@yng50|1PU- ztW6(nmD3QoJ|H>}gYrV?n-#+Sh29OJx+H{d*cHq0ZoCG+k6*?G*a}x8O+zE*;x5d_ z1DKD8u^FDkB0Ph=cIfj8bbxAfVl~(U z`=SGl!- zY6$xNaP+-<&u@}#UGX9cHuxR7(iLdKSJ9ciiB4!Y+R^*y-k(6*T}HPkr)`qK zW@rYB(TR0N`{{}Hb3K}gVQtC3EB-b&Y%m!epe{NaZ7>gQ@GEq}FQA8RB|6bf=tOp- z10F(>6;7e;E@4N^ZXuo?gZNozp?C_)b;5^#kGID-G4nO>4H)GhxU4XV*72SZ2yR(e^`?(zDhKJ@HT5nOF)GN?|`lE+t z2zJ7;=)iUH`7h9Ri_yJbjSjF5UFl9VbNkTDoI*48ad|p<;Vd`YyYunE#po3@6HPiL z@3laGP*P}z73f}m74P7$=8f2m`p+wpzn1Iq8tO;TOoq-$X4<0@>6MO!e(1~xqbnPV zo`Es3J|RAzfv#v4I`BL+<@2L|Ks$aN?QaX3!JX)q97NlnK@WBMpA_uqJlY_qGD%HK z^pvO2v(W)>z-n}WiShmvwEYZppn5d*8Fa#%-6`j~Xw1b<_j&DbQHzuH4l8*J~uq*ZDXg~YV_9rk0KSCGu*;Ugad``g^bE}dL zTca=bL{rrl`{VWK1g4@Znu*ys3!TUubnBL&6JLW(u@ODoZ=wC3jQ2mpe8vx-QgB8W z;)Cq3B%ez@+HqU-^!G+T!{O*a6VVCGL|2$b2cC=W^+I$DSE3Vm4L!7Pqi5y>rXBbk z1wWtACCNk^Bq^Z^?dUeN;|FjOeh>L+2uING`V!htUUl+b30kj0&qN=z|AFZ5!6UX2>9YZsBI!(b9{2LvhS@)!aQuKZwbOpCyGaQemelmKPeuB;MIc$NyMkn|}bPYPe zjpzh+#QG6*y!2@bc6i8^)j@BZs=kB8ane4XovTqhjVhQ&qcRp0p{W2 z=6Z-^G^rG5U*l0r>+NQoWMDg1w`okYDdG z70plsR^ju=-<_}(J(T}IC;kO`IGgt-|L$#P3O?w8W}-h9Ap45_ZwfKUPpLsCRSW6h43dlP7IB8d4m{0JWb3aencG2oG9v&bug1(T;6ph^)bW~ z#E%J6)|vPl;q^#Dcqucg_`0kUnfl`Lns?*9rRe8&EAb}r9xt^b_d3b$Z6 z(VEzl*`Dg&^Z=#TGnZ1`Q->&d%_n|F?95!-sxtp&O2df1W@=lNRvo6anDAOe>?dYe z;aWo6Lu}0~ZB;U22c??`&$ibPVh!Op(2ekVk$8>pSS=);CDsyNCljvz|JItUl8gDd qQzlNUo%qn2|8%I&&bzi#pFRWn_FFTj)6AB+lWTeO(CV6H+5ZFJn6^9s delta 4318 zcmXxl4Ukq<8Nl)LvMlV%vb*oD3k$gH!h*013#`DPFgmE9#I(SKm=+meN-#+=B!Q+c zh7b;jqwkQROo#!^B$mqtLIwp0tVqbWAB%ix5t5c*iA_-dKlgZthu=B(-t+aGbKl)L zdCla^@sifd0@nw`HN>E{Aq-4~@YO=^hEQG_LM?W}t~dgF;Jw%h7hws$h%^lwunlg( z9DE(~u^IF5AQoW@@_r_qqmavu3+R|%#250ePF^fWJL-*g&=-AwF#7(mSRak8sE>>H z$DRKZbUc;$Y@HHwJN|3obxsx(e-Z9Xh~>pB(SGPcZp=_{ppod_j6r932ijmNGU+fI9e647FZ`VUT+w>8 z-F|eyqi67v@88rpS;(!(2NuS~dgeP6>|kc}N9fERiS-3&gT?3;t;C_&h{gDK zwEZRYc@Al0`$HMJfWFaTXg{NoSHnHX)@H(73S=w%6kWj!=oYL&C-MrKp-t#n*oLm~ zEp)&ZG&3Kgss0>ocRAXIUp3nmq7%LbeO`y2zc84Bd)$D&_ziRmz8mj9jGpdA=meLb z6MPzde?_eS8vOy<5bK+wJJ5Ff(1{;HGjjs3eE*+Na0Q>E6G^eLrnC@U`PJymE6@)5 zp{X2-W?&3Dz$7#S_hC=`9@_pHr0eiJ+V3W`-B!%l;r{sG7~0@8a&E#oB#R-JAAVQb z4V`FzbOJZTdIOrVucM#ybo9_>(00#8*PsJ8pjqwSlqHSR|zek6Jd3;q5-reKHv#nxEX zGf7ovyqZx`_~PfgdP zcrWJT^cwR2Z3;i+h7Av+DLRQ}(6PFb_wgsUMFXrkQvZ&c=557&^fxqtBre{1rNZ z##rBuj<*->H*ppDL8>jG?fF;3=EDA!&cO9j?YJ+9e)K~ z(FC-gsaT9N(9~z5&tQuB6U3KS3k4>homJSa;sE90#P5kOucBDkkZmmNlHNkioc$!; z-JN~Eu)2L?tbKqxvh9niQ>U}_MO}LSk@_9PK4KEFjMz+g9VR$Q;jQeoytuONop^5*`mK#3wiE9X6NoC}b;9e<*}oL`ulQ|J31iVi z?XT$?qM6v6txs2{_Gc%gD?J6_0pc-Yq7|;!vQMOYrH*GC)1_svCbz=1 zW*bXN8{VLFE8zk6x`kLz_=l>N@Op{ZM0mEA6HAFE!s}GRmH+oNrAsg7H\n" "Language-Team: LANGUAGE \n" @@ -61,15 +61,15 @@ msgstr "contexte d'enregistrement" msgid "A/D conversion" msgstr "" -#: models/enum.py:113 models/media.py:246 +#: models/enum.py:113 models/media.py:247 msgid "vernacular style" msgstr "style vernaculaire" -#: models/enum.py:120 models/media.py:248 +#: models/enum.py:120 models/media.py:249 msgid "generic style" msgstr "style générique" -#: models/enum.py:127 models/media.py:333 +#: models/enum.py:127 models/media.py:334 #, fuzzy msgid "keyword" msgstr "Mot-clé" @@ -156,16 +156,16 @@ msgstr "Son et métadonnées" msgid "Private data" msgstr "Données privées" -#: models/media.py:62 models/media.py:115 models/media.py:263 +#: models/media.py:62 models/media.py:115 models/media.py:264 msgid "public access" msgstr "accès public" -#: models/media.py:92 models/media.py:260 +#: models/media.py:92 models/media.py:261 msgid "reference" msgstr "référence" -#: models/media.py:93 models/media.py:227 models/media.py:365 -#: models/media.py:380 models/media.py:414 +#: models/media.py:93 models/media.py:227 models/media.py:366 +#: models/media.py:381 models/media.py:415 msgid "title" msgstr "titre" @@ -245,15 +245,15 @@ msgstr "collecteur identique au déposant" msgid "published" msgstr "édité" -#: models/media.py:139 models/media.py:257 +#: models/media.py:139 models/media.py:258 msgid "code" msgstr "cote" -#: models/media.py:140 models/media.py:258 +#: models/media.py:140 models/media.py:259 msgid "old code" msgstr "ancienne cote" -#: models/media.py:141 models/media.py:267 +#: models/media.py:141 models/media.py:268 msgid "approximative duration" msgstr "durée approximative" @@ -281,7 +281,7 @@ msgstr "états / nations" msgid "populations / social groups" msgstr "populations / groupes sociaux" -#: models/media.py:204 models/media.py:309 +#: models/media.py:204 models/media.py:310 msgid "computed duration" msgstr "durée calculée" @@ -313,104 +313,108 @@ msgstr "commentaires" msgid "moda_execut" msgstr "moda_execut" -#: models/media.py:249 +#: models/media.py:243 +msgid "language" +msgstr "langue" + +#: models/media.py:250 msgid "author / compositor" msgstr "auteur / compositeur" -#: models/media.py:252 +#: models/media.py:253 msgid "remarks" msgstr "remarques" -#: models/media.py:253 +#: models/media.py:254 msgid "recordist selection" msgstr "sélection collecteur" -#: models/media.py:254 +#: models/media.py:255 msgid "recordist as in collection" msgstr "collecteur identique à la collection" -#: models/media.py:259 +#: models/media.py:260 msgid "item number" msgstr "n° de l'item" -#: models/media.py:261 +#: models/media.py:262 msgid "published reference" msgstr "référence éditée" -#: models/media.py:262 +#: models/media.py:263 msgid "copy of" msgstr "copie de" -#: models/media.py:264 +#: models/media.py:265 msgid "file" msgstr "fichier" -#: models/media.py:274 models/media.py:434 -#: templates/telemeta_default/mediaitem_detail.html:207 +#: models/media.py:275 models/media.py:435 +#: templates/telemeta_default/mediaitem_detail.html:208 msgid "keywords" msgstr "mots-clés" -#: models/media.py:332 models/media.py:346 models/media.py:364 -#: models/media.py:411 +#: models/media.py:333 models/media.py:347 models/media.py:365 +#: models/media.py:412 msgid "item" msgstr "item" -#: models/media.py:348 +#: models/media.py:349 msgid "composition" msgstr "formation" -#: models/media.py:350 +#: models/media.py:351 msgid "vernacular name" msgstr "nom vernaculaire" -#: models/media.py:351 +#: models/media.py:352 msgid "number" msgstr "nombre" -#: models/media.py:352 +#: models/media.py:353 msgid "interprets" msgstr "interprètes" -#: models/media.py:366 +#: models/media.py:367 msgid "start" msgstr "début" -#: models/media.py:367 +#: models/media.py:368 msgid "end" msgstr "fin" -#: models/media.py:378 models/media.py:397 models/media.py:412 +#: models/media.py:379 models/media.py:398 models/media.py:413 #, fuzzy msgid "public_id" msgstr "édité" -#: models/media.py:381 models/media.py:416 +#: models/media.py:382 models/media.py:417 msgid "description" msgstr "" -#: models/media.py:398 +#: models/media.py:399 msgid "playlist" msgstr "liste de lecture" -#: models/media.py:399 +#: models/media.py:400 #, fuzzy msgid "resource_type" msgstr "type de ressource" -#: models/media.py:400 +#: models/media.py:401 #, fuzzy msgid "resource_id" msgstr "ressource" -#: models/media.py:413 models/system.py:54 +#: models/media.py:414 models/system.py:54 msgid "time" msgstr "heure" -#: models/media.py:415 models/media.py:435 +#: models/media.py:416 models/media.py:436 msgid "date" msgstr "" -#: models/media.py:417 +#: models/media.py:418 #, fuzzy msgid "author" msgstr "rédacteur fiche" @@ -689,8 +693,8 @@ msgstr "Collection" #: templates/telemeta_default/collection_detail.html:44 #: templates/telemeta_default/mediaitem_detail.html:109 -#: templates/telemeta_default/mediaitem_detail.html:207 -#: templates/telemeta_default/mediaitem_detail.html:246 +#: templates/telemeta_default/mediaitem_detail.html:208 +#: templates/telemeta_default/mediaitem_detail.html:247 #: templates/telemeta_default/profile_detail.html:63 msgid "Edit" msgstr "Editer" @@ -730,22 +734,22 @@ msgid "Recordist" msgstr "Collecteur" #: templates/telemeta_default/collection_detail.html:141 -#: templates/telemeta_default/mediaitem_detail.html:262 +#: templates/telemeta_default/mediaitem_detail.html:263 msgid "Archiving data" msgstr "Données d'archivage" #: templates/telemeta_default/collection_detail.html:162 -#: templates/telemeta_default/mediaitem_detail.html:277 +#: templates/telemeta_default/mediaitem_detail.html:278 msgid "Technical data" msgstr "Données techniques" #: templates/telemeta_default/collection_detail.html:167 -#: templates/telemeta_default/mediaitem_detail.html:280 +#: templates/telemeta_default/mediaitem_detail.html:281 msgid "Media type" msgstr "Type de media" #: templates/telemeta_default/collection_detail.html:167 -#: templates/telemeta_default/mediaitem_detail.html:280 +#: templates/telemeta_default/mediaitem_detail.html:281 msgid "Audio" msgstr "Audio" @@ -994,15 +998,15 @@ msgstr "Date d'enregistrement" msgid "Location" msgstr "Lieu" -#: templates/telemeta_default/mediaitem_detail.html:212 +#: templates/telemeta_default/mediaitem_detail.html:213 msgid "Musical informations" msgstr "Informations sur la musique" -#: templates/telemeta_default/mediaitem_detail.html:246 +#: templates/telemeta_default/mediaitem_detail.html:247 msgid "performance" msgstr "composition" -#: templates/telemeta_default/mediaitem_detail.html:251 +#: templates/telemeta_default/mediaitem_detail.html:252 msgid "General informations" msgstr "Informations générales" diff --git a/telemeta/models/media.py b/telemeta/models/media.py index 92ff4d84..2294e3a6 100644 --- a/telemeta/models/media.py +++ b/telemeta/models/media.py @@ -240,6 +240,7 @@ class MediaItem(MediaResource): verbose_name=_('population / social group')) context_comment = TextField(_('comments')) moda_execut = CharField(_('moda_execut')) + language = CharField(_('language')) # Musical informations vernacular_style = WeakForeignKey('VernacularStyle', related_name="items", diff --git a/telemeta/templates/telemeta_default/mediaitem_detail.html b/telemeta/templates/telemeta_default/mediaitem_detail.html index a5221aeb..f619a263 100644 --- a/telemeta/templates/telemeta_default/mediaitem_detail.html +++ b/telemeta/templates/telemeta_default/mediaitem_detail.html @@ -196,6 +196,7 @@
{% if item.location %}{{ item.location.fullnames|join:"
" }}{% endif %}
{% dl_field item "location_comment" %} {% dl_field item "cultural_area" %} + {% dl_field item "language" %} {% dl_field item "ethnic_group" placeholder %} {% dl_field item "context_comment" %} {% dl_field item "keywords" join with ", " %} -- 2.39.5