From 5f1797b3805e2b2aa1d81f8b1ce0f796aeb68ddd Mon Sep 17 00:00:00 2001 From: olivier <> Date: Mon, 8 Mar 2010 17:39:22 +0000 Subject: [PATCH] - fix MediaItem.comment label (remarks) - fix MediaItem.author label (author / compositor) - prepare for displaying certain fields even if empty - display missing collection reference - display missing collection recording_context - display missing collection metadata_author - do not display redundant metadata_writer - workaround a layout problem with long field names - fix recordist label - fix MediaCollection.items_done label --- telemeta/locale/fr/LC_MESSAGES/django.mo | Bin 9381 -> 9438 bytes telemeta/locale/fr/LC_MESSAGES/django.po | 40 ++++++++++-------- telemeta/models/media.py | 4 +- .../telemeta_default/collection_detail.html | 17 +++++--- telemeta/templatetags/telemeta_utils.py | 40 ++++++++++++------ 5 files changed, 62 insertions(+), 39 deletions(-) diff --git a/telemeta/locale/fr/LC_MESSAGES/django.mo b/telemeta/locale/fr/LC_MESSAGES/django.mo index 667dc756221197bfc1a0450812ad6aaa261c29d5..cad407b5613976b99b3b78f4a4cd39849a843567 100644 GIT binary patch delta 3063 zcmYM#e@vBC9LMqV7+2z65cR4k3S0#8M;JI1QS(PqPAa07=$vg9h-t|HFS;`8$t;_M zYxam~reO+-rGI$0)S{d=wUyIcQq37I%cPZ+F3Ivoy+7RJy1UPPo%8(op6~gdbMI{` zYAPY8)GmJl}iBzun;F;3C7}T?1c^32e;$x*oxVB z81>v`d;KOR&=2<1{jM?TG&G}p)PS>5nLmzWa2_hL&Gz~()Bt->GyVvbzyZ`iCs7H1 zhZ?8@8Pjy4670^+x_=-a35;(>(9lfAV{a_Pc$|R>SdM+M3Ki%TOu+^mh!NC)Cs5Cw zMkRc~+KE~cAHfwT5jD{)bXDr%H1xno>ty6@N^HLjwbnJL%DiS>gTv^*Y5NCJGd_xp zY1)uUn+x{(ReSy>_TzldAobV4LxRx+@{zZ>kB?-Wg$h`U{qZGK<{MEnZbVh?J=Bs! zQ1`c@68Ic7^E0T4{)D>!qV-CU`s;xkoKU6#7AOe^q0Wy&k~LFMr7cBOpbWM4^HB*c zL?u*%dTyER*P%9dgYB=kZbdz}+ohp3j-V=W0F~i!)QrAH&EPC5fuB(cblU6JQHlFl zSjFjw%*6~wRUjWV&@@y9iZKhPqvE?uY3O^u0u{Is^bY=K*DR-@0bfUAnJviM?6v*lw*Mn4@HN!l@DVM9 zA=JS4pstsq;>+qX`!|5-hoT>W$Z>N!oM^GjHg%4%wW15;l5H-Vr zr~z_Nr5$aZhAQ!Fd%YU9IhUXYUW$sd3N@iMsLi?#U2U2zG$!IMRR34hgI7@r#j@b4 zNIH(dq1g2Ug-phjqkfo{*?v6^qu+!Y@B}LHQ&@nfQA-{iME!Lkiyf#N??m-;QHkW+ z{uES2rlAI$f#hbYkXWV;RiS27;15wVJceu+^9^b#enZ9m7qvuz6zZ>;rt^EMCCEkn zw3hOr0mG<(%TW(_$nu&N)Bp!@2p&TP{u8wc^;fC;{HXq5)DmT5*Jed>Fr_XH&3F;2 z#Lr*|Z=G+XueEMQ1>BFC$w}06=TM1upa$qf-5*GcCY*{oKMFNq5o)u}Lvl546%Cbs zHEKq0pk}fOwZ<*h4^RVtiki_W)Ija1fR|AB|AX2Kv7u<3B-D~+pq{@QwRFYNzH8>w z(9EAj?b;VnyY*#jJ!%Qoq7rLHCAaHPe}>fKQX;+O{Fv!TgRP>_L_? z2RUUPMpq>X)5yXXkfh8u)NVh5%J>Xw^L1d??#_(rMZ`4+=9@^f^m7d zk?Q{0zPQ4wg$panYbzEMB delta 3015 zcmY+^X>3$g7{>8)yJS~_*6NP#M}mNwP45rl}tI^CEtn2#fI21alx4#Q2z*Bsy{5f5W39z%vQ zpW_{P*7_szHP`v!x@(fSn!t%P)P(@1U=}7}7?sOt^kET}Vf_13G*4yhHr~unhGkzPDzEMM zpaNY$Vwyfwf;Uk2`}heE-(=I!Ovd6sEJ8m{MGZI|2V(qb;%nysrapZ+Vh--DX*`$!CP z44JGsZ?9jo=lgL8=S?Q{SKwe~Jb_WDgo<%E-j5n^CJx0WROT6!xGf^?ra)*@8_ZhUX6Nio$YT$-PnoR1Kp@i_bJ9Ihf1&? z75Gov_p`vN+z=!ulaH!w1?suFxUQK)Ljji{&zctGYqr>akL@2v1-gvd8`m&|iHxei z5!Cfk)Hst+iPxh7Hrn%xQ1RAavflrVG*rS4REgd}m8>^*gE1eV*6_3 z<<6l3e}@|Hchr(5vU4AFs0NOqKa(=*pY&yn=>6}cq0)ZFPpqVccU zcx}Q7sMoOq^@lXm_UBET?Hf&A1)!!o8@0zd>!jE2#T^w*3SaT1(_dC7O%GHpQq3*Sa)R;(82W zgT1g4wbpA<18zpmq{m)Af=cuRD!@6^{lB0R{uedwpqzNX5va{tisWVRqm{66uh#Kc7)RJ9CJ)a(mFI^6*Uxp;;nkpLF zwY8|-T4#L{wFGlf11?8p+=5DY9V+nasPmnuigcmY_C1Uxh`RqY>il`sQuJYp-v7U8 zXaFZSo>>YiU=TIaFveapjQ!`MN?U_rtV0EU0ktVxQER&sHGyu_cpsr=egd_LFJd6$qgMjz-O(95v8XROa=l-Ms)c;A)Ij0`=N zFT*4(kC@un0FyYOfvZuaeF_zL9%>0(>uc!H*XI$A3XVw}J2|R3lw^%}CauzG_X574 zGu_Mcl{m(m?W@dvlWY1kaFlRtR)^0$am*&~W8Y+Fhv)cnQulCfGRHPA-ye3~@E-L~ z*3jl@j;-Ei|9#GG@2tPb>GV-3q%vCBIdc*fZf zEl3}k9IemHNs78bzmry2Fkxb-u&}JKINCOJTypx9g-e>|&0qTblA~{h7B@yuWiNK3 a59M?^(ceNX3F%G$yXvh7ul4+qul@sP@hHXs diff --git a/telemeta/locale/fr/LC_MESSAGES/django.po b/telemeta/locale/fr/LC_MESSAGES/django.po index b8fe4d2c..0833e065 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: 2010-02-16 22:25+0100\n" +"POT-Creation-Date: 2010-03-08 18:30+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Olivier Guilyardi \n" "Language-Team: LANGUAGE \n" @@ -85,7 +85,7 @@ msgid "population / social group" msgstr "population / groupe social" #: models/enum.py:157 models/instrument.py:41 models/instrument.py:51 -#: models/location.py:50 models/location.py:142 models/media.py:348 +#: models/location.py:50 models/location.py:148 models/media.py:348 msgid "name" msgstr "nom" @@ -97,7 +97,7 @@ msgstr "instrument" msgid "parent instrument" msgstr "instrument parent" -#: models/instrument.py:73 models/location.py:150 +#: models/instrument.py:73 models/location.py:156 msgid "alias" msgstr "alias" @@ -125,20 +125,20 @@ msgstr "type complet" msgid "current location" msgstr "lieu actuel" -#: models/location.py:57 models/location.py:151 models/location.py:165 +#: models/location.py:57 models/location.py:157 models/location.py:171 msgid "authoritative" msgstr "officiel" -#: models/location.py:105 models/location.py:149 models/location.py:162 +#: models/location.py:111 models/location.py:155 models/location.py:168 #: models/media.py:223 msgid "location" msgstr "lieu" -#: models/location.py:141 +#: models/location.py:147 msgid "identifier" msgstr "identifiant" -#: models/location.py:163 +#: models/location.py:169 msgid "ancestor location" msgstr "lieu ancêtre" @@ -196,7 +196,7 @@ msgstr "documentation associée" #: models/media.py:90 models/media.py:236 msgid "recordist" -msgstr "enregistré par" +msgstr "collecteur" #: models/media.py:91 msgid "recordist identical to depositor" @@ -222,7 +222,7 @@ msgstr "numéro dans la série" msgid "bibliographic references" msgstr "références bibliographiques" -#: models/media.py:102 models/media.py:243 +#: models/media.py:102 msgid "comment" msgstr "commentaire" @@ -260,7 +260,7 @@ msgstr "déposant CNRS" #: models/media.py:119 msgid "items finished" -msgstr "fiches faîtes" +msgstr "fiches items faîtes" #: models/media.py:120 msgid "a_informer_07_03" @@ -299,8 +299,8 @@ msgid "location details" msgstr "précisions lieu" #: models/media.py:229 -msgid "author" -msgstr "auteur" +msgid "author / compositor" +msgstr "auteur / compositeur" #: models/media.py:232 msgid "comments" @@ -330,6 +330,10 @@ msgstr "aire culturelle" msgid "recordist selection" msgstr "sélection collecteur" +#: models/media.py:243 +msgid "remarks" +msgstr "remarques" + #: models/media.py:244 msgid "file" msgstr "fichier" @@ -464,7 +468,7 @@ msgstr "Visitez le projet libre Telemeta" msgid "Collection" msgstr "Collection" -#: templates/telemeta_default/collection_detail.html:51 +#: templates/telemeta_default/collection_detail.html:52 msgid "Recording year" msgstr "Année d'enregistrement" @@ -481,7 +485,7 @@ msgstr "Mentions légales" #: templates/telemeta_default/inc/collection_list.html:17 #: templates/telemeta_default/inc/mediaitem_list.html:16 msgid "Recordist" -msgstr "Enregistré par" +msgstr "Collecteur" #: templates/telemeta_default/collection_detail.html:100 #: templates/telemeta_default/mediaitem_detail.html:211 @@ -503,7 +507,7 @@ msgstr "Type de media" msgid "Audio" msgstr "Audio" -#: templates/telemeta_default/collection_detail.html:132 +#: templates/telemeta_default/collection_detail.html:133 #: templates/telemeta_default/geo_countries.html:14 msgid "Number of items" msgstr "Nombre d'items" @@ -603,12 +607,14 @@ msgid "Number of collections" msgstr "Nombre de collections" #: templates/telemeta_default/geo_countries.html:22 +#, python-format msgid "1 collection" msgid_plural "%(counter)s collections" msgstr[0] "1 collection" msgstr[1] "%(counter)s collections" #: templates/telemeta_default/geo_countries.html:29 +#, python-format msgid "1 item" msgid_plural "%(counter)s items " msgstr[0] "1 item" @@ -724,14 +730,14 @@ msgstr "Etat/Continent" msgid "No item" msgstr "Aucun item" -#: templatetags/telemeta_utils.py:204 +#: templatetags/telemeta_utils.py:218 #, python-format msgid "%(count)d item" msgid_plural "%(count)d items" msgstr[0] "%(count)d item" msgstr[1] "%(count)d items" -#: templatetags/telemeta_utils.py:207 +#: templatetags/telemeta_utils.py:221 #, python-format msgid "%(count)d collection" msgid_plural "%(count)d collections" diff --git a/telemeta/models/media.py b/telemeta/models/media.py index d7c34a52..a86f8782 100644 --- a/telemeta/models/media.py +++ b/telemeta/models/media.py @@ -226,7 +226,7 @@ class MediaItem(MediaResource): verbose_name=_('population / social group')) title = CharField(_('title')) alt_title = CharField(_('original title / translation')) - author = CharField(_('author')) + author = CharField(_('author / compositor')) vernacular_style = WeakForeignKey('VernacularStyle', related_name="items", verbose_name=_('vernacular style')) context_comment = TextField(_('comments')) @@ -240,7 +240,7 @@ class MediaItem(MediaResource): verbose_name=_('generic style')) collector_selection = CharField(_('recordist selection')) creator_reference = CharField(_('reference')) - comment = TextField(_('comment')) + comment = TextField(_('remarks')) file = FileField(_('file'), upload_to='items/%Y/%m/%d', db_column="filename") public_access = CharField(_('public access'), choices=PUBLIC_ACCESS_CHOICES, max_length=16, default="metadata") diff --git a/telemeta/templates/telemeta_default/collection_detail.html b/telemeta/templates/telemeta_default/collection_detail.html index 35b9bd4b..cf87ccdf 100644 --- a/telemeta/templates/telemeta_default/collection_detail.html +++ b/telemeta/templates/telemeta_default/collection_detail.html @@ -44,14 +44,16 @@
{% block general_info %}
- {% dl_field collection "title" %} + {% dl_field collection "reference" %} + {% dl_field collection "title" %} {% dl_field collection "alt_title" %} - {% dl_field collection "creator" %} + {% dl_field collection "creator" %} + {% dl_field collection "recording_context" %} {% if collection.recorded_from_year %} -
{% trans "Recording year" %}
-
{{ collection.recorded_from_year }} {{ collection.recorded_to_year|prepend:" - " }}
+
{% trans "Recording year" %}
+
{{ collection.recorded_from_year|default:'' }} {{ collection.recorded_to_year|prepend:" - " }}
{% endif %} - {% dl_field collection "year_published" %} + {% dl_field collection "year_published" %}
{% endblock general_info %}
@@ -62,7 +64,7 @@
{% dl_field collection "countries" join with ", " %} - {% dl_field collection "ethnic_groups" join with ", " %} + {% dl_field collection "ethnic_groups" join with ", " %}
@@ -102,7 +104,7 @@
{% dl_field collection "acquisition_mode" %} {% dl_field collection "cnrs_contributor" %} - {% dl_field collection "metadata_writer" %} + {% dl_field collection "metadata_author" %} {% dl_field collection "booklet_description" %} {% dl_field collection "publishing_status" %}