From ed3547b68c986952f7f7e64e3b2242eaaca2e94b Mon Sep 17 00:00:00 2001 From: olivier <> Date: Tue, 9 Feb 2010 21:21:00 +0000 Subject: [PATCH] improve i18n and update french translation --- telemeta/htdocs/css/telemeta.css | 8 +- telemeta/htdocs/js/resourcemap.js | 4 +- telemeta/locale/fr/LC_MESSAGES/django.mo | Bin 5711 -> 8045 bytes telemeta/locale/fr/LC_MESSAGES/django.po | 426 ++++++++++++------ telemeta/models/crem.py | 12 +- telemeta/templates/telemeta_default/base.html | 12 +- .../telemeta_default/collection_detail.html | 6 +- .../collection_detail_dc.html | 5 +- .../telemeta_default/geo_continents.html | 2 +- .../telemeta_default/inc/collection_list.html | 3 +- .../telemeta_default/inc/dublincore.html | 3 +- .../telemeta_default/inc/mediaitem_list.html | 3 +- .../telemeta_default/mediaitem_detail.html | 6 +- .../telemeta_default/mediaitem_detail_dc.html | 5 +- 14 files changed, 329 insertions(+), 166 deletions(-) diff --git a/telemeta/htdocs/css/telemeta.css b/telemeta/htdocs/css/telemeta.css index fb90179c..f1e9468a 100644 --- a/telemeta/htdocs/css/telemeta.css +++ b/telemeta/htdocs/css/telemeta.css @@ -45,7 +45,6 @@ h3 { #content { position: relative; - margin-bottom: 2em; } #content ul, #content ul ul, #content ol { list-style: square; @@ -344,7 +343,7 @@ label.disabled { color: #d7d7d7 } border-top: 1px solid; height: 31px; padding: .25em 0; - margin-top: 3em; + margin-top: 2.5em; } #footer :link, #footer :visited { color: #bbb; } #footer hr { display: none } @@ -617,4 +616,7 @@ table.listing tbody tr.even { background-color: #fcfcfc } table.listing tbody tr.odd { background-color: #f7f7f7 } table.listing tbody tr:hover { background: #f7f8fa !important } - +.gmap { + border: solid 1px #888; + margin-top: 0.8em; +} diff --git a/telemeta/htdocs/js/resourcemap.js b/telemeta/htdocs/js/resourcemap.js index b3fbdfda..881b7a26 100644 --- a/telemeta/htdocs/js/resourcemap.js +++ b/telemeta/htdocs/js/resourcemap.js @@ -9,7 +9,7 @@ function ResourceMap(list, cfg) { $(document).ready(function() { that.log("init"); that.list = $(list); - that.container = $('
').css({'width': '100%', 'height': 300}); + that.container = $('
').addClass('gmap').css({'width': '100%', 'height': 300}); that.list.css('display', 'none').after(that.container); var resizeTimer = null; $(window).resize(function() { @@ -29,7 +29,7 @@ function ResourceMap(list, cfg) { that.resize = function() { if (that.container.css('display') == 'block') { - newHeight = that.container.height() + $(window).height() - $("#layout").height(); + newHeight = that.container.height() + $(window).height() - $("#layout").height() + $('#footer').height(); if (newHeight < 300) newHeight = 300; if (newHeight != that.container.height()) { diff --git a/telemeta/locale/fr/LC_MESSAGES/django.mo b/telemeta/locale/fr/LC_MESSAGES/django.mo index 52f8cadfbaf8f46f10b1128b437f763fe5b4c473..686816c42d64d15d623fdf81726672f08ab019f5 100644 GIT binary patch literal 8045 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 ZLT%VVGOJxrA8f1W8=T`H$_Q1|`5#@35;gz; literal 5711 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 aQZ5Y5I4IycY;-Cd*U?|SQxs5*CI1J$aI&EQ diff --git a/telemeta/locale/fr/LC_MESSAGES/django.po b/telemeta/locale/fr/LC_MESSAGES/django.po index d7f681b8..264a8ce6 100644 --- a/telemeta/locale/fr/LC_MESSAGES/django.po +++ b/telemeta/locale/fr/LC_MESSAGES/django.po @@ -1,16 +1,16 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. +# Telemeta French Translation +# Copyright (C) 2010 Samalyse +# This file is distributed under the same license as the Telemeta package. +# Olivier Guilyardi , 2010. # #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-27 22:46+0100\n" +"POT-Creation-Date: 2010-02-09 22:15+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" +"Last-Translator: Olivier Guilyardi \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,447 +18,591 @@ msgstr "" #: models/core.py:130 msgid "Duration" -msgstr "" +msgstr "Durée" #: models/core.py:135 msgid "Enter a valid duration in HH:MM[:ss[.uuuuuu]] format." -msgstr "" +msgstr "Entrez une durée valide au format HH:MM[:ss[.uuuuuu]]" + +#: models/crem.py:137 +msgid "Metadata only" +msgstr "Métadonnées uniquement" -#: models/crem.py:150 models/crem.py:313 +#: models/crem.py:139 +msgid "Sound and metadata" +msgstr "Son et métadonnées" + +#: models/crem.py:141 +msgid "Private data" +msgstr "Données privées" + +#: models/crem.py:143 models/crem.py:206 models/crem.py:327 +msgid "public access" +msgstr "accès public" + +#: models/crem.py:160 models/crem.py:324 msgid "reference" msgstr "référence" -#: models/crem.py:152 +#: models/crem.py:162 msgid "archive format" msgstr "format d'archivage" -#: models/crem.py:153 models/crem.py:289 +#: models/crem.py:163 models/crem.py:300 msgid "old code" msgstr "ancienne cote" -#: models/crem.py:154 models/crem.py:290 +#: models/crem.py:164 models/crem.py:301 msgid "code" msgstr "cote" -#: models/crem.py:155 models/crem.py:299 models/crem.py:379 +#: models/crem.py:165 models/crem.py:309 models/crem.py:396 msgid "title" msgstr "titre" -#: models/crem.py:156 models/crem.py:300 +#: models/crem.py:166 models/crem.py:310 msgid "original title / translation" msgstr "titre original / traduction" -#: models/crem.py:157 +#: models/crem.py:167 msgid "number of components (medium / piece)" msgstr "nb de composants (support / pièce)" -#: models/crem.py:159 +#: models/crem.py:169 msgid "secondary edition" msgstr "réédition" -#: models/crem.py:160 +#: models/crem.py:170 msgid "depositor / contributor" msgstr "déposant / contributeur" -#: models/crem.py:161 +#: models/crem.py:171 msgid "author of published notice" msgstr "auteur de la notice éditée" -#: models/crem.py:162 +#: models/crem.py:172 msgid "related documentation" msgstr "documentation associée" -#: models/crem.py:163 -msgid "collector" -msgstr "collecteur" +#: models/crem.py:173 models/crem.py:318 +msgid "recordist" +msgstr "enregistré par" -#: models/crem.py:164 -msgid "collector identical to depositor" +#: models/crem.py:174 +msgid "recordist identical to depositor" msgstr "collecteur identique au déposant" -#: models/crem.py:166 +#: models/crem.py:176 msgid "publisher / status" msgstr "éditeur / statut" -#: models/crem.py:167 +#: models/crem.py:177 msgid "published" msgstr "édité" -#: models/crem.py:168 +#: models/crem.py:178 msgid "year published" msgstr "année de parution" -#: models/crem.py:170 +#: models/crem.py:180 msgid "publisher collection" msgstr "collection éditeur" -#: models/crem.py:171 +#: models/crem.py:181 msgid "publisher serial number" msgstr "numéro dans la série" -#: models/crem.py:172 +#: models/crem.py:182 msgid "bibliographic references" msgstr "références bibliographiques" -#: models/crem.py:174 +#: models/crem.py:184 msgid "mode of acquisition" msgstr "mode d'acquisition" -#: models/crem.py:175 models/crem.py:314 +#: models/crem.py:185 models/crem.py:325 msgid "comment" msgstr "commentaire" -#: models/crem.py:177 +#: models/crem.py:187 msgid "record author" msgstr "rédacteur fiche" -#: models/crem.py:179 +#: models/crem.py:189 msgid "record writer" msgstr "saisie fiche" -#: models/crem.py:181 +#: models/crem.py:191 msgid "legal rights" msgstr "droit d'utilisation" -#: models/crem.py:182 +#: models/crem.py:192 msgid "copies" msgstr "autres exemplaires" -#: models/crem.py:183 +#: models/crem.py:193 msgid "recording year (from)" msgstr "année d'enregistrement (depuis)" -#: models/crem.py:184 +#: models/crem.py:194 msgid "recording year (until)" msgstr "année d'enregistrement (jusqu'à)" -#: models/crem.py:186 +#: models/crem.py:196 msgid "recording context" msgstr "context d'enregistrement" -#: models/crem.py:187 models/crem.py:291 +#: models/crem.py:197 models/crem.py:302 msgid "approximative duration" msgstr "durée approximative" -#: models/crem.py:188 +#: models/crem.py:198 msgid "document type" msgstr "type de document" -#: models/crem.py:189 +#: models/crem.py:199 msgid "archiver notes" msgstr "notes de l'archiviste" -#: models/crem.py:190 +#: models/crem.py:200 msgid "status" msgstr "etat" -#: models/crem.py:191 +#: models/crem.py:201 msgid "CNRS depositor" msgstr "déposant CNRS" -#: models/crem.py:192 +#: models/crem.py:202 msgid "items finished" msgstr "fiches faîtes" -#: models/crem.py:193 +#: models/crem.py:203 msgid "a_informer_07_03" -msgstr "" +msgstr "a_informer_07_03" -#: models/crem.py:195 +#: models/crem.py:205 msgid "A/D conversion" msgstr "numérisation" -#: models/crem.py:196 models/crem.py:316 -msgid "public access" -msgstr "accès public" - -#: models/crem.py:232 +#: models/crem.py:243 msgid "states / nations" msgstr "états / nations" -#: models/crem.py:245 +#: models/crem.py:256 msgid "populations / social groups" msgstr "populations / groupes sociaux" -#: models/crem.py:253 models/crem.py:368 +#: models/crem.py:264 models/crem.py:379 msgid "computed duration" msgstr "durée calculée" -#: models/crem.py:287 +#: models/crem.py:298 msgid "collection" -msgstr "" +msgstr "collection" -#: models/crem.py:288 +#: models/crem.py:299 msgid "item number" msgstr "n° de l'item" -#: models/crem.py:292 +#: models/crem.py:303 msgid "recording date (from)" msgstr "date d'enregistrement (depuis)" -#: models/crem.py:293 +#: models/crem.py:304 msgid "recording date (until)" msgstr "date d'enregistrement (jusqu'à)" -#: models/crem.py:295 models/crem.py:614 models/crem.py:628 +#: models/crem.py:305 models/crem.py:674 models/crem.py:687 msgid "location" msgstr "lieu" -#: models/crem.py:296 +#: models/crem.py:306 msgid "location details" msgstr "précisions lieu" -#: models/crem.py:298 models/crem.py:710 +#: models/crem.py:308 models/crem.py:775 msgid "population / social group" msgstr "population / groupe social" -#: models/crem.py:301 +#: models/crem.py:311 msgid "author" msgstr "auteur" -#: models/crem.py:303 +#: models/crem.py:313 msgid "vernacular name" msgstr "nom vernaculaire" -#: models/crem.py:304 +#: models/crem.py:314 msgid "comments" msgstr "commentaires" -#: models/crem.py:305 +#: models/crem.py:315 msgid "published reference" msgstr "référence éditée" -#: models/crem.py:306 +#: models/crem.py:316 msgid "moda_execut" -msgstr "" +msgstr "moda_execut" -#: models/crem.py:307 +#: models/crem.py:317 msgid "copy of" msgstr "copie de" -#: models/crem.py:308 -msgid "recorded by" -msgstr "enregistré par" +#: models/crem.py:319 +msgid "recordist as in collection" +msgstr "collecteur identique à la collection" -#: models/crem.py:309 +#: models/crem.py:320 msgid "cultural area" msgstr "aire culturelle" -#: models/crem.py:311 +#: models/crem.py:322 msgid "generic name" msgstr "nom générique" -#: models/crem.py:312 -msgid "collector selection" +#: models/crem.py:323 +msgid "recordist selection" msgstr "sélection collecteur" -#: models/crem.py:315 +#: models/crem.py:326 msgid "file" msgstr "fichier" -#: models/crem.py:322 +#: models/crem.py:333 msgid "keywords" msgstr "mots-clés" -#: models/crem.py:378 models/crem.py:504 models/crem.py:644 +#: models/crem.py:395 models/crem.py:521 models/crem.py:709 msgid "item" msgstr "item" -#: models/crem.py:380 +#: models/crem.py:397 msgid "start" msgstr "début" -#: models/crem.py:381 +#: models/crem.py:398 msgid "end" msgstr "fin" -#: models/crem.py:391 models/crem.py:660 +#: models/crem.py:408 models/crem.py:725 msgid "value" msgstr "valeur" -#: models/crem.py:461 models/crem.py:471 models/crem.py:535 models/crem.py:558 -#: models/crem.py:606 models/crem.py:700 models/crem.py:711 +#: models/crem.py:478 models/crem.py:488 models/crem.py:552 models/crem.py:578 +#: models/crem.py:667 models/crem.py:765 models/crem.py:776 msgid "name" msgstr "nom" -#: models/crem.py:482 models/crem.py:495 +#: models/crem.py:499 models/crem.py:512 msgid "instrument" -msgstr "" +msgstr "instrument" -#: models/crem.py:484 +#: models/crem.py:501 msgid "parent instrument" msgstr "instrument parent" -#: models/crem.py:493 models/crem.py:615 +#: models/crem.py:510 models/crem.py:675 msgid "alias" msgstr "alias" -#: models/crem.py:506 +#: models/crem.py:523 msgid "scientific instrument" msgstr "instrument scientifique" -#: models/crem.py:508 +#: models/crem.py:525 msgid "vernacular instrument" msgstr "instrument vernaculaire" -#: models/crem.py:509 +#: models/crem.py:526 msgid "number" msgstr "nombre" -#: models/crem.py:510 +#: models/crem.py:527 msgid "interprets" msgstr "interprètes" -#: models/crem.py:519 +#: models/crem.py:536 msgid "username" msgstr "nom d'utilisateur" -#: models/crem.py:520 +#: models/crem.py:537 msgid "level" msgstr "niveau" -#: models/crem.py:521 +#: models/crem.py:538 msgid "first name" msgstr "prénom" -#: models/crem.py:522 +#: models/crem.py:539 msgid "last name" msgstr "nom de famille" -#: models/crem.py:523 +#: models/crem.py:540 msgid "phone" msgstr "téléphone" -#: models/crem.py:524 +#: models/crem.py:541 msgid "email" msgstr "e-mail" -#: models/crem.py:547 +#: models/crem.py:564 msgid "playlist" msgstr "liste de lecture" -#: models/crem.py:548 +#: models/crem.py:565 msgid "resource type" msgstr "type de ressource" -#: models/crem.py:549 +#: models/crem.py:566 msgid "resource" msgstr "ressource" -#: models/crem.py:559 +#: models/crem.py:576 +msgid "country" +msgstr "pays" + +#: models/crem.py:576 +msgid "continent" +msgstr "continent" + +#: models/crem.py:576 +msgid "other" +msgstr "autre" + +#: models/crem.py:579 msgid "type" -msgstr "" +msgstr "type" -#: models/crem.py:560 +#: models/crem.py:580 msgid "complete type" msgstr "type complet" -#: models/crem.py:562 -msgid "current name" -msgstr "nom actuel" +#: models/crem.py:582 +msgid "current location" +msgstr "lieu actuel" -#: models/crem.py:563 models/crem.py:616 +#: models/crem.py:585 models/crem.py:676 msgid "authoritative" msgstr "officiel" -#: models/crem.py:605 +#: models/crem.py:666 msgid "identifier" msgstr "identifiant" -#: models/crem.py:630 -msgid "parent location" -msgstr "lieu parent" +#: models/crem.py:688 +msgid "ancestor location" +msgstr "lieu ancêtre" -#: models/crem.py:645 +#: models/crem.py:710 msgid "keyword" msgstr "mot-clé" -#: models/crem.py:659 +#: models/crem.py:724 msgid "publisher" msgstr "éditeur" -#: models/crem.py:673 +#: models/crem.py:738 msgid "element type" msgstr "type d'élément" -#: models/crem.py:674 +#: models/crem.py:739 msgid "element identifier" msgstr "identifiant de l'élément" -#: models/crem.py:675 +#: models/crem.py:740 msgid "modification type" msgstr "type de modification" -#: models/crem.py:676 +#: models/crem.py:741 msgid "time" msgstr "heure" -#: models/crem.py:677 +#: models/crem.py:742 msgid "user" msgstr "utilisateur" -#: templates/telemeta_default/collection_detail.html:51 +#: templates/telemeta_default/base.html:32 +msgid "Search" +msgstr "Recherche" + +#: templates/telemeta_default/base.html:34 +msgid "Advanced search" +msgstr "Recherche avancée" + +#: templates/telemeta_default/base.html:41 +msgid "Collections" +msgstr "Collections" + +#: templates/telemeta_default/base.html:41 +msgid "Items" +msgstr "Items" + +#: templates/telemeta_default/base.html:41 +msgid "Geo Navigator" +msgstr "Géo-Navigateur" + +#: templates/telemeta_default/base.html:41 +msgid "Admin" +msgstr "Admin" + +#: templates/telemeta_default/base.html:61 +msgid "Powered by" +msgstr "Propulsé par" + +#: templates/telemeta_default/base.html:62 +msgid "By" +msgstr "Par" + +#: templates/telemeta_default/base.html:66 +msgid "Visit the Telemeta open source project at" +msgstr "Visitez le projet libre Telemeta" + +#: templates/telemeta_default/collection_detail.html:49 msgid "Recording year" msgstr "Année d'enregistrement" -#: templates/telemeta_default/collection_detail.html:61 -#: templates/telemeta_default/mediaitem_detail.html:149 +#: templates/telemeta_default/collection_detail.html:59 +#: templates/telemeta_default/mediaitem_detail.html:143 msgid "Geographic and cultural informations" msgstr "Indications géographiques et culturelles" -#: templates/telemeta_default/collection_detail.html:74 +#: templates/telemeta_default/collection_detail.html:72 msgid "Legal mentions" msgstr "Mentions légales" -#: templates/telemeta_default/collection_detail.html:79 -msgid "Collector" -msgstr "Collecteur" +#: templates/telemeta_default/collection_detail.html:77 +#: templates/telemeta_default/inc/collection_list.html:16 +#: templates/telemeta_default/inc/mediaitem_list.html:15 +msgid "Recordist" +msgstr "Enregistré par" -#: templates/telemeta_default/collection_detail.html:100 -#: templates/telemeta_default/mediaitem_detail.html:214 +#: templates/telemeta_default/collection_detail.html:98 +#: templates/telemeta_default/mediaitem_detail.html:208 msgid "Archiving data" msgstr "Données d'archivage" #: templates/telemeta_default/collection_detail.html:121 -#: templates/telemeta_default/mediaitem_detail.html:229 +#: templates/telemeta_default/mediaitem_detail.html:223 msgid "Technical data" msgstr "Données techniques" #: templates/telemeta_default/collection_detail.html:126 -#: templates/telemeta_default/mediaitem_detail.html:232 +#: templates/telemeta_default/mediaitem_detail.html:226 msgid "Media type" msgstr "Type de media" #: templates/telemeta_default/collection_detail.html:126 -#: templates/telemeta_default/mediaitem_detail.html:232 +#: templates/telemeta_default/mediaitem_detail.html:226 msgid "Audio" -msgstr "" +msgstr "Audio" #: templates/telemeta_default/collection_detail.html:130 msgid "Number of items" msgstr "Nombre d'items" +#: templates/telemeta_default/collection_detail_dc.html:8 +#: templates/telemeta_default/mediaitem_detail_dc.html:8 +msgid "Normal View" +msgstr "Vue normale" + +#: templates/telemeta_default/collection_detail_dc.html:18 +msgid "No such collection" +msgstr "Collection introuvable" + +#: templates/telemeta_default/country_info.html:9 +msgid "in" +msgstr "dans" + +#: templates/telemeta_default/country_info.html:18 +msgid "Populations / Social groups" +msgstr "Populations / Groupes sociaux" + +#: templates/telemeta_default/geo_continents.html:19 +msgid "Map" +msgstr "Carte" + +#: templates/telemeta_default/geo_continents.html:20 +msgid "List" +msgstr "Liste" + +#: templates/telemeta_default/geo_continents.html:24 +msgid "Geographic Navigator" +msgstr "Navigateur géographique" + #: templates/telemeta_default/geo_countries.html:6 #: templates/telemeta_default/geo_country_collections.html:6 +#: templates/telemeta_default/geo_country_items.html:6 msgid "World" msgstr "Monde" -#: templates/telemeta_default/mediaitem_detail.html:136 -msgid "Collection title" -msgstr "Titre collection" - -#: templates/telemeta_default/mediaitem_detail.html:140 +#: templates/telemeta_default/mediaitem_detail.html:134 msgid "Recording date" msgstr "Date d'enregistrement" -#: templates/telemeta_default/mediaitem_detail.html:152 +#: templates/telemeta_default/mediaitem_detail.html:146 +#: templates/telemeta_default/inc/mediaitem_list.html:17 msgid "Location" msgstr "Lieu" -#: templates/telemeta_default/mediaitem_detail.html:167 +#: templates/telemeta_default/mediaitem_detail.html:161 msgid "Musical informations" msgstr "Informations sur la musique" -#: templates/telemeta_default/mediaitem_detail.html:203 +#: templates/telemeta_default/mediaitem_detail.html:197 msgid "General informations" msgstr "Informations générales" + +#: templates/telemeta_default/mediaitem_detail_dc.html:17 +msgid "No such item" +msgstr "Item introuvable" + +#: templates/telemeta_default/inc/collection_list.html:6 +#, python-format +msgid "Collections %(first_on_page)s to %(last_on_page)s on %(hits)s" +msgstr "Collections %(first_on_page)s à %(last_on_page)s sur %(hits)s" + +#: templates/telemeta_default/inc/collection_list.html:14 +#: templates/telemeta_default/inc/mediaitem_list.html:14 +msgid "Title" +msgstr "Titre" + +#: templates/telemeta_default/inc/collection_list.html:17 +#: templates/telemeta_default/inc/mediaitem_list.html:21 +msgid "Year of recording" +msgstr "Année d'enregistrement" + +#: templates/telemeta_default/inc/collection_list.html:38 +msgid "No collection" +msgstr "Aucune collection" + +#: templates/telemeta_default/inc/dublincore.html:4 +msgid "Dublin Core Metadata" +msgstr "Métadonnées Dublin Core" + +#: templates/telemeta_default/inc/mediaitem_list.html:6 +#, python-format +msgid "Items %(first_on_page)s to %(last_on_page)s on %(hits)s" +msgstr "Items %(first_on_page)s à %(last_on_page)s sur %(hits)s" + +#: templates/telemeta_default/inc/mediaitem_list.html:19 +msgid "Country/Continent" +msgstr "Pays/Continent" + +#: templates/telemeta_default/inc/mediaitem_list.html:46 +msgid "No item" +msgstr "Aucun item" + +#: templatetags/telemeta_utils.py:193 +#, 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:196 +#, python-format +msgid "%(count)d collection" +msgid_plural "%(count)d collections" +msgstr[0] "%(count)d collection" +msgstr[1] "%(count)d collections" + diff --git a/telemeta/models/crem.py b/telemeta/models/crem.py index e80d8a0e..8dac2737 100755 --- a/telemeta/models/crem.py +++ b/telemeta/models/crem.py @@ -132,6 +132,16 @@ class ModelCore(EnhancedModel): class MediaResource(ModelCore): "Base class of all media objects" + def public_access_label(self): + if self.public_access == 'metadata': + return _('Metadata only') + elif self.public_access == 'full': + return _('Sound and metadata') + + return _('Private data') + + public_access_label.verbose_name = _('public access') + class Meta: abstract = True @@ -141,7 +151,7 @@ class MetaCore: class MediaCollection(MediaResource): "Describe a collection of items" element_type = 'collection' - PUBLIC_ACCESS_CHOICES = (('none', 'none'), ('metadata', 'metadata'), ('metadata', 'full')) + PUBLIC_ACCESS_CHOICES = (('none', 'none'), ('metadata', 'metadata'), ('full', 'full')) published_code_regex = 'CNRSMH_E_[0-9]{4}(?:_[0-9]{3}){2}' unpublished_code_regex = 'CNRSMH_I_[0-9]{4}_[0-9]{3}' diff --git a/telemeta/templates/telemeta_default/base.html b/telemeta/templates/telemeta_default/base.html index d2beb6c6..f85022c8 100644 --- a/telemeta/templates/telemeta_default/base.html +++ b/telemeta/templates/telemeta_default/base.html @@ -29,16 +29,16 @@ @@ -58,12 +58,12 @@ Telemeta Powered

- Powered by Telemeta {% telemeta_version %}
- By Parisson & Samalyse. + {% trans "Powered by" %} Telemeta {% telemeta_version %}
+ {% trans "By" %} Parisson & Samalyse.

- Visit the Telemeta open source project at
{% telemeta_url %} + {% trans "Visit the Telemeta open source project at" %}
{% telemeta_url %}

{% endblock %}
diff --git a/telemeta/templates/telemeta_default/collection_detail.html b/telemeta/templates/telemeta_default/collection_detail.html index 46c27d7b..eeb8efcc 100644 --- a/telemeta/templates/telemeta_default/collection_detail.html +++ b/telemeta/templates/telemeta_default/collection_detail.html @@ -74,7 +74,7 @@
{% if collection.collector_is_creator %} {% if collection.creator %} -
{% trans "Collector" %}
{{ collection.creator }}
+
{% trans "Recordist" %}
{{ collection.creator }}
{% endif%} {% else %} {% dl_field collection "collector" %} @@ -85,7 +85,7 @@ {% dl_field collection "booklet_author" %} {% dl_field collection "external_references" %} {% dl_field collection "doctype_code" %} - {% dl_field collection "public_access" %} + {% dl_field collection "public_access_label" %} {% dl_field collection "legal_rights" %}
@@ -103,7 +103,9 @@ {% dl_field collection "metadata_writer" %} {% dl_field collection "booklet_description" %} {% dl_field collection "publishing_status" %} + {% dl_field collection "comment" %} {% dl_field collection "metadata_writer" %} {% dl_field collection "travail" %} diff --git a/telemeta/templates/telemeta_default/collection_detail_dc.html b/telemeta/templates/telemeta_default/collection_detail_dc.html index af2fc707..7cd73461 100644 --- a/telemeta/templates/telemeta_default/collection_detail_dc.html +++ b/telemeta/templates/telemeta_default/collection_detail_dc.html @@ -1,10 +1,11 @@ {% extends "telemeta/base.html" %} {% load telemeta_utils %} +{% load i18n %} {% if collection %} {% block submenu %}

Collection: {{ collection }}

-
Normal View
+
{% trans "Normal View" %}
{% endblock %} {% block content %} @@ -14,5 +15,5 @@ {% endblock %} {% else %} -

No such collection

+

{% trans "No such collection" %}

{% endif %} diff --git a/telemeta/templates/telemeta_default/geo_continents.html b/telemeta/templates/telemeta_default/geo_continents.html index 8a6867aa..fbe544ee 100644 --- a/telemeta/templates/telemeta_default/geo_continents.html +++ b/telemeta/templates/telemeta_default/geo_continents.html @@ -21,7 +21,7 @@ var resourceMap = new ResourceMap('.continents', { {% endblock %} {% block content %} -

Geographic Navigator

+

{% trans "Geographic Navigator" %}

{% if continents %}