From 8bd3f174105717d835a30a0fca1f93b77e1af2b7 Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Thu, 13 Nov 2014 10:47:23 +0100 Subject: [PATCH] fix various bugs (thanks Sara) --- telemeta/forms/media.py | 16 ++- telemeta/locale/de/LC_MESSAGES/django.mo | Bin 24393 -> 24290 bytes telemeta/locale/de/LC_MESSAGES/django.po | 114 ++++++++--------- telemeta/locale/es/LC_MESSAGES/django.mo | Bin 420 -> 420 bytes telemeta/locale/es/LC_MESSAGES/django.po | 111 ++++++++-------- telemeta/locale/fr/LC_MESSAGES/django.mo | Bin 20861 -> 20886 bytes telemeta/locale/fr/LC_MESSAGES/django.po | 119 +++++++++--------- telemeta/locale/zh_CN/LC_MESSAGES/django.mo | Bin 22918 -> 22887 bytes telemeta/locale/zh_CN/LC_MESSAGES/django.po | 114 ++++++++--------- telemeta/models/media.py | 4 +- .../templates/telemeta/collection_detail.html | 2 +- telemeta/templates/telemeta/lists.html | 2 +- .../templates/telemeta/mediaitem_detail.html | 1 + .../templates/telemeta/resource_edit.html | 4 +- telemeta/views/collection.py | 1 + telemeta/views/item.py | 4 + 16 files changed, 248 insertions(+), 244 deletions(-) diff --git a/telemeta/forms/media.py b/telemeta/forms/media.py index 528608ab..3afc2ea7 100644 --- a/telemeta/forms/media.py +++ b/telemeta/forms/media.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2011 Parisson SARL +# Copyright (C) 2011-2014 Parisson SARL # This software is a computer program whose purpose is to backup, analyse, # transcode and stream any audio content with its metadata over a web frontend. @@ -38,6 +38,7 @@ from django.contrib.admin.widgets import FilteredSelectMultiple from telemeta.models import * from extra_views import CreateWithInlinesView, UpdateWithInlinesView, InlineFormSet from extra_views.generic import GenericInlineFormSet +from django.forms.widgets import HiddenInput class MediaFondsForm(ModelForm): @@ -88,6 +89,13 @@ class MediaCollectionForm(ModelForm): required_css_class = 'required' + def __init__(self, *args, **kwargs): + super(MediaCollectionForm, self).__init__(*args, **kwargs) + if '_I_' in self.instance.code: + self.fields["reference"].widget = HiddenInput() + if self.computed_duration: + self.fields["approx_duration"].widget = HiddenInput() + class Meta: model = MediaCollection @@ -107,15 +115,11 @@ class MediaItemForm(ModelForm): class Meta: model = MediaItem exclude = ('copied_from_item', 'mimetype', 'url', 'contributor', - 'organization', 'depositor', 'rights', ) + 'organization', 'depositor', 'rights', 'topic') def clean_code(self): return self.cleaned_data['code'] or None - def __init__(self,*args,**kwargs): - super(MediaItemForm, self).__init__(*args, **kwargs) - self.fields.insert(18, 'comment', self.fields['comment']) - class MediaItemRelatedForm(ModelForm): diff --git a/telemeta/locale/de/LC_MESSAGES/django.mo b/telemeta/locale/de/LC_MESSAGES/django.mo index 46af050141e64f34d6a0b6e25fd3ea95e3ed1647..3b9dc74251b47967bb4765579ae6a82ef5fec245 100644 GIT binary patch delta 8490 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 QeN#t|;Lg_D?eB*C7qSdp7XSbN diff --git a/telemeta/locale/de/LC_MESSAGES/django.po b/telemeta/locale/de/LC_MESSAGES/django.po index bbd0b0c9..53e31b04 100644 --- a/telemeta/locale/de/LC_MESSAGES/django.po +++ b/telemeta/locale/de/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-11-10 17:31+0100\n" +"POT-Creation-Date: 2014-11-13 10:46+0100\n" "PO-Revision-Date: 2012-12-22 21:24+0100\n" "Last-Translator: Patrik Tschudin \n" "Language-Team: LANGUAGE \n" @@ -31,7 +31,7 @@ msgstr "Gültige Dauer eingeben im Format HH:MM[:ss]" msgid "value" msgstr "Wert" -#: models/enum.py:60 models/media.py:254 +#: models/enum.py:60 models/media.py:255 msgid "archive format" msgstr "Archivformat" @@ -137,7 +137,7 @@ msgstr "vollständiger Typus" msgid "media type" msgstr "Medientyp" -#: models/enum.py:282 models/media.py:255 +#: models/enum.py:282 models/media.py:254 #, fuzzy #| msgid "original location" msgid "original format" @@ -413,8 +413,8 @@ msgstr "Oritinaltitel / Übersetzung" msgid "depositor / contributor" msgstr "HinterlegerIn / Zulieferde(r)" -#: models/media.py:208 models/media.py:220 models/media.py:369 -#: models/media.py:399 +#: models/media.py:208 models/media.py:220 models/media.py:350 +#: models/media.py:369 models/media.py:399 msgid "First name, Last name ; First name, Last name" msgstr "" @@ -877,8 +877,7 @@ msgstr "Beschreibung" msgid "criteria" msgstr "Kriterien" -#: templates/admin/base.html:21 templates/telemeta/base.html:105 -#: templates/telemeta/base.html.py:109 +#: templates/admin/base.html:21 templates/telemeta/base.html:98 msgid "Home" msgstr "Start" @@ -918,7 +917,7 @@ msgstr "verschickte Mitteilungen" msgid "Write" msgstr "schreiben" -#: templates/postman/base.html:15 templates/telemeta/base.html:112 +#: templates/postman/base.html:15 templates/telemeta/base.html:101 msgid "Archives" msgstr "Archive" @@ -968,7 +967,7 @@ msgstr "g:i A,M j,n/j/y" #: templates/telemeta/collection_detail.html:224 #: templates/telemeta/collection_detail_dc.html:25 #: templates/telemeta/lists.html:58 -#: templates/telemeta/mediaitem_detail.html:356 +#: templates/telemeta/mediaitem_detail.html:357 #: templates/telemeta/mediaitem_detail_dc.html:20 #: templates/telemeta/resource_detail.html:105 #: templates/telemeta/resource_detail_dc.html:17 @@ -1128,13 +1127,14 @@ msgid "Administration" msgstr "Verwaltung" #: templates/telemeta/admin.html:14 templates/telemeta/admin_general.html:5 -#: templates/telemeta/base.html:130 templates/telemeta/collection_edit.html:20 +#: templates/telemeta/base.html:119 templates/telemeta/collection_edit.html:20 #: templates/telemeta/mediaitem_edit.html:21 +#: templates/telemeta/resource_edit.html:20 msgid "General" msgstr "allgemein" #: templates/telemeta/admin_enumerations.html:6 -#: templates/telemeta/base.html:131 templates/telemeta/enumeration_edit.html:7 +#: templates/telemeta/base.html:120 templates/telemeta/enumeration_edit.html:7 msgid "Enumerations" msgstr "Aufzählung" @@ -1149,7 +1149,7 @@ msgstr "Aufzählung" #: templates/telemeta/inc/resource_related.html:21 #: templates/telemeta/lists.html:69 templates/telemeta/mediaitem_copy.html:39 #: templates/telemeta/search_criteria.html:91 -#: templates/telemeta/search_results.html:44 +#: templates/telemeta/search_results.html:53 msgid "Title" msgstr "Titel" @@ -1158,7 +1158,7 @@ msgid "No enumerations" msgstr "keine Aufzählung" #: templates/telemeta/admin_instruments.html:6 -#: templates/telemeta/admin_users.html:6 templates/telemeta/base.html:125 +#: templates/telemeta/admin_users.html:6 templates/telemeta/base.html:114 #: templates/telemeta/users.html:5 templates/telemeta/users.html.py:8 msgid "Users" msgstr "BenutzerInnen" @@ -1172,67 +1172,59 @@ msgstr "keine BenutzerInnen" msgid "Welcome" msgstr "Willkommen" -#: templates/telemeta/base.html:69 templates/telemeta/base.html.py:104 -msgid "Profile" -msgstr "Profil" - -#: templates/telemeta/base.html:71 templates/telemeta/base.html.py:75 +#: templates/telemeta/base.html:69 templates/telemeta/base.html.py:73 msgid "Help" msgstr "Hilfe" -#: templates/telemeta/base.html:72 +#: templates/telemeta/base.html:70 msgid "Sign out" msgstr "abmelden" -#: templates/telemeta/base.html:76 templates/telemeta/login.html:41 +#: templates/telemeta/base.html:74 templates/telemeta/login.html:41 msgid "Sign in" msgstr "anmelden" -#: templates/telemeta/base.html:101 +#: templates/telemeta/base.html:96 msgid "Desk" msgstr "Arbeitsfläche" -#: templates/telemeta/base.html:103 views/home.py:92 -msgid "Lists" -msgstr "Listen" - -#: templates/telemeta/base.html:114 templates/telemeta/breadcrumbs.html:4 +#: templates/telemeta/base.html:103 templates/telemeta/breadcrumbs.html:4 #: templates/telemeta/inc/breadcrumbs.html:5 msgid "Fonds" msgstr "Fonds" -#: templates/telemeta/base.html:115 templates/telemeta/breadcrumbs.html:5 +#: templates/telemeta/base.html:104 templates/telemeta/breadcrumbs.html:5 #: templates/telemeta/inc/breadcrumbs.html:6 msgid "Corpus" msgstr "Korpus" -#: templates/telemeta/base.html:116 templates/telemeta/breadcrumbs.html:6 +#: templates/telemeta/base.html:105 templates/telemeta/breadcrumbs.html:6 #: templates/telemeta/collection_list.html:6 #: templates/telemeta/collection_list.html:11 #: templates/telemeta/inc/breadcrumbs.html:7 msgid "Collections" msgstr "Sammlungen" -#: templates/telemeta/base.html:117 templates/telemeta/breadcrumbs.html:7 +#: templates/telemeta/base.html:106 templates/telemeta/breadcrumbs.html:7 #: templates/telemeta/collection_detail.html:62 #: templates/telemeta/inc/breadcrumbs.html:8 #: templates/telemeta/mediaitem_list.html:11 msgid "Items" msgstr "Elemente" -#: templates/telemeta/base.html:121 templates/telemeta/home.html:25 +#: templates/telemeta/base.html:110 templates/telemeta/home.html:25 msgid "Geo Navigator" msgstr "Kartennavigation" -#: templates/telemeta/base.html:123 +#: templates/telemeta/base.html:112 msgid "Advanced search" msgstr "erweiterte Suche" -#: templates/telemeta/base.html:128 +#: templates/telemeta/base.html:117 msgid "Admin" msgstr "Verwaltung" -#: templates/telemeta/base.html:132 +#: templates/telemeta/base.html:121 #: templates/telemeta/instrument_alias_edit_value.html:24 #: templates/telemeta/instrument_edit.html:4 #: templates/telemeta/instrument_edit.html:7 @@ -1240,14 +1232,14 @@ msgstr "Verwaltung" msgid "Instruments" msgstr "Instrumente" -#: templates/telemeta/base.html:133 +#: templates/telemeta/base.html:122 #: templates/telemeta/instrument_alias_edit.html:4 #: templates/telemeta/instrument_alias_edit.html:7 #, fuzzy msgid "Instrument aliases" msgstr "Parallelbezeichnungen des Instrumentes" -#: templates/telemeta/base.html:181 +#: templates/telemeta/base.html:170 msgid "" "Usage of the archives in the respect of cultural heritage of the original " "communities." @@ -1255,7 +1247,7 @@ msgstr "" "Die Benutzung des Archivs erfolgt mit Respekt vor dem kulturellen Erbe der " "Ursprungsgesellschaften." -#: templates/telemeta/base.html:186 +#: templates/telemeta/base.html:175 #: templates/telemeta/collection_detail.html:108 msgid "Legal notices" msgstr "juristische Hinweise" @@ -1303,7 +1295,7 @@ msgstr "abbrechen" #: templates/telemeta/collection_detail.html:5 #: templates/telemeta/collection_detail_dc.html:5 views/collection.py:50 -#: views/collection.py:278 +#: views/collection.py:287 msgid "Collection" msgstr "Sammlung" @@ -1387,7 +1379,7 @@ msgid "Related documentation" msgstr "damit zusammenhängende Dokumentation" #: templates/telemeta/collection_detail.html:156 -#: templates/telemeta/mediaitem_detail.html:318 +#: templates/telemeta/mediaitem_detail.html:319 msgid "Comments" msgstr "Kommentare" @@ -1429,6 +1421,7 @@ msgstr "keine solche Sammlung" #: templates/telemeta/inc/mediaitem_related.html:6 #: templates/telemeta/inc/resource_related.html:6 #: templates/telemeta/mediaitem_edit.html:22 +#: templates/telemeta/resource_edit.html:21 msgid "Related media" msgstr "damit zusammenhängende Medien" @@ -1467,8 +1460,8 @@ msgstr "" #: templates/telemeta/collection_list.html:28 #: templates/telemeta/mediaitem_list.html:27 -#: templates/telemeta/search_results.html:13 -#: templates/telemeta/search_results.html:17 +#: templates/telemeta/search_results.html:22 +#: templates/telemeta/search_results.html:26 msgid "All" msgstr "Alles" @@ -1484,8 +1477,8 @@ msgstr "veröffentlicht" #: templates/telemeta/collection_list.html:31 #: templates/telemeta/mediaitem_list.html:30 -#: templates/telemeta/search_results.html:14 -#: templates/telemeta/search_results.html:18 +#: templates/telemeta/search_results.html:23 +#: templates/telemeta/search_results.html:27 msgid "Sounds" msgstr "Töne" @@ -1646,7 +1639,7 @@ msgstr "Code" #: templates/telemeta/inc/resource_list.html:11 #: templates/telemeta/lists.html:74 #: templates/telemeta/search_criteria.html:143 -#: templates/telemeta/search_results.html:61 +#: templates/telemeta/search_results.html:70 msgid "Sound" msgstr "Ton" @@ -1686,7 +1679,7 @@ msgstr "Land / Kontinent" #: templates/telemeta/inc/mediaitem_list.html:16 #: templates/telemeta/search_criteria.html:107 -#: templates/telemeta/search_results.html:47 +#: templates/telemeta/search_results.html:56 msgid "Year of recording" msgstr "Aufnahmejahr" @@ -1847,7 +1840,7 @@ msgstr "publizierte Referenzen" msgid "Remarks" msgstr "Bemerkungen" -#: templates/telemeta/mediaitem_detail.html:306 +#: templates/telemeta/mediaitem_detail.html:307 #, fuzzy #| msgid "collections" msgid "Item size" @@ -2124,13 +2117,13 @@ msgstr "erweiterte Suche" #: templates/telemeta/search_criteria.html:114 #: templates/telemeta/search_criteria.html:133 -#: templates/telemeta/search_results.html:49 -#: templates/telemeta/search_results.html:56 +#: templates/telemeta/search_results.html:58 +#: templates/telemeta/search_results.html:65 msgid "to" msgstr "bis" #: templates/telemeta/search_criteria.html:126 -#: templates/telemeta/search_results.html:54 +#: templates/telemeta/search_results.html:63 msgid "Year of publication" msgstr "Publikationsjahr" @@ -2138,12 +2131,12 @@ msgstr "Publikationsjahr" msgid "Search" msgstr "Suche" -#: templates/telemeta/search_results.html:5 -#: templates/telemeta/search_results.html:8 +#: templates/telemeta/search_results.html:6 +#: templates/telemeta/search_results.html:11 msgid "Search Results" msgstr "Suchergebnis" -#: templates/telemeta/search_results.html:26 +#: templates/telemeta/search_results.html:35 msgid "Search pattern" msgstr "Suchmuster" @@ -2181,20 +2174,20 @@ msgstr "Kinder" msgid "pattern" msgstr "Muster" -#: views/collection.py:49 views/collection.py:277 views/home.py:91 -#: views/item.py:133 views/item.py:503 views/profile.py:68 +#: views/collection.py:49 views/collection.py:286 views/home.py:91 +#: views/item.py:133 views/item.py:506 views/profile.py:68 msgid "Access not allowed" msgstr "Zugang verboten" -#: views/collection.py:51 views/collection.py:279 views/home.py:93 -#: views/item.py:135 views/item.py:505 views/profile.py:70 +#: views/collection.py:51 views/collection.py:288 views/home.py:93 +#: views/item.py:135 views/item.py:508 views/profile.py:70 msgid "" "Please login or contact the website administator to get a private access." msgstr "" "Bitte loggen Sie sich ein oder kontaktieren Sie den Administrator der " "Website, um einen privaten Zugang zu erhalten." -#: views/collection.py:303 +#: views/collection.py:312 msgid "You have successfully updated your collection." msgstr "" @@ -2202,10 +2195,17 @@ msgstr "" msgid "Last changes" msgstr "Letze Änderungen" -#: views/item.py:721 +#: views/home.py:92 +msgid "Lists" +msgstr "Listen" + +#: views/item.py:733 msgid "You have successfully updated your item." msgstr "" +#~ msgid "Profile" +#~ msgstr "Profil" + #~ msgid "Analysis" #~ msgstr "Analyse" diff --git a/telemeta/locale/es/LC_MESSAGES/django.mo b/telemeta/locale/es/LC_MESSAGES/django.mo index bd47f2f7bc24ee54d00e497fdc45a76aae93221f..be37f54df8675d68cb3a08608f1b91bdec338877 100644 GIT binary patch delta 18 ZcmZ3&yo7ne1a@NuLjx-lvyIbv838ot1tb6f delta 18 ZcmZ3&yo7ne1a<=jLvt%*!;RB<838ol1tI_d diff --git a/telemeta/locale/es/LC_MESSAGES/django.po b/telemeta/locale/es/LC_MESSAGES/django.po index a626e332..1fa4605e 100644 --- a/telemeta/locale/es/LC_MESSAGES/django.po +++ b/telemeta/locale/es/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-11-10 17:31+0100\n" +"POT-Creation-Date: 2014-11-13 10:46+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -31,7 +31,7 @@ msgstr "" msgid "value" msgstr "" -#: models/enum.py:60 models/media.py:254 +#: models/enum.py:60 models/media.py:255 msgid "archive format" msgstr "" @@ -133,7 +133,7 @@ msgstr "" msgid "media type" msgstr "" -#: models/enum.py:282 models/media.py:255 +#: models/enum.py:282 models/media.py:254 msgid "original format" msgstr "" @@ -405,8 +405,8 @@ msgstr "" msgid "depositor / contributor" msgstr "" -#: models/media.py:208 models/media.py:220 models/media.py:369 -#: models/media.py:399 +#: models/media.py:208 models/media.py:220 models/media.py:350 +#: models/media.py:369 models/media.py:399 msgid "First name, Last name ; First name, Last name" msgstr "" @@ -848,8 +848,7 @@ msgstr "" msgid "criteria" msgstr "" -#: templates/admin/base.html:21 templates/telemeta/base.html:105 -#: templates/telemeta/base.html.py:109 +#: templates/admin/base.html:21 templates/telemeta/base.html:98 msgid "Home" msgstr "" @@ -887,7 +886,7 @@ msgstr "" msgid "Write" msgstr "" -#: templates/postman/base.html:15 templates/telemeta/base.html:112 +#: templates/postman/base.html:15 templates/telemeta/base.html:101 msgid "Archives" msgstr "" @@ -937,7 +936,7 @@ msgstr "" #: templates/telemeta/collection_detail.html:224 #: templates/telemeta/collection_detail_dc.html:25 #: templates/telemeta/lists.html:58 -#: templates/telemeta/mediaitem_detail.html:356 +#: templates/telemeta/mediaitem_detail.html:357 #: templates/telemeta/mediaitem_detail_dc.html:20 #: templates/telemeta/resource_detail.html:105 #: templates/telemeta/resource_detail_dc.html:17 @@ -1091,13 +1090,14 @@ msgid "Administration" msgstr "" #: templates/telemeta/admin.html:14 templates/telemeta/admin_general.html:5 -#: templates/telemeta/base.html:130 templates/telemeta/collection_edit.html:20 +#: templates/telemeta/base.html:119 templates/telemeta/collection_edit.html:20 #: templates/telemeta/mediaitem_edit.html:21 +#: templates/telemeta/resource_edit.html:20 msgid "General" msgstr "" #: templates/telemeta/admin_enumerations.html:6 -#: templates/telemeta/base.html:131 templates/telemeta/enumeration_edit.html:7 +#: templates/telemeta/base.html:120 templates/telemeta/enumeration_edit.html:7 msgid "Enumerations" msgstr "" @@ -1112,7 +1112,7 @@ msgstr "" #: templates/telemeta/inc/resource_related.html:21 #: templates/telemeta/lists.html:69 templates/telemeta/mediaitem_copy.html:39 #: templates/telemeta/search_criteria.html:91 -#: templates/telemeta/search_results.html:44 +#: templates/telemeta/search_results.html:53 msgid "Title" msgstr "" @@ -1121,7 +1121,7 @@ msgid "No enumerations" msgstr "" #: templates/telemeta/admin_instruments.html:6 -#: templates/telemeta/admin_users.html:6 templates/telemeta/base.html:125 +#: templates/telemeta/admin_users.html:6 templates/telemeta/base.html:114 #: templates/telemeta/users.html:5 templates/telemeta/users.html.py:8 msgid "Users" msgstr "" @@ -1135,67 +1135,59 @@ msgstr "" msgid "Welcome" msgstr "" -#: templates/telemeta/base.html:69 templates/telemeta/base.html.py:104 -msgid "Profile" -msgstr "" - -#: templates/telemeta/base.html:71 templates/telemeta/base.html.py:75 +#: templates/telemeta/base.html:69 templates/telemeta/base.html.py:73 msgid "Help" msgstr "" -#: templates/telemeta/base.html:72 +#: templates/telemeta/base.html:70 msgid "Sign out" msgstr "" -#: templates/telemeta/base.html:76 templates/telemeta/login.html:41 +#: templates/telemeta/base.html:74 templates/telemeta/login.html:41 msgid "Sign in" msgstr "" -#: templates/telemeta/base.html:101 +#: templates/telemeta/base.html:96 msgid "Desk" msgstr "" -#: templates/telemeta/base.html:103 views/home.py:92 -msgid "Lists" -msgstr "" - -#: templates/telemeta/base.html:114 templates/telemeta/breadcrumbs.html:4 +#: templates/telemeta/base.html:103 templates/telemeta/breadcrumbs.html:4 #: templates/telemeta/inc/breadcrumbs.html:5 msgid "Fonds" msgstr "" -#: templates/telemeta/base.html:115 templates/telemeta/breadcrumbs.html:5 +#: templates/telemeta/base.html:104 templates/telemeta/breadcrumbs.html:5 #: templates/telemeta/inc/breadcrumbs.html:6 msgid "Corpus" msgstr "" -#: templates/telemeta/base.html:116 templates/telemeta/breadcrumbs.html:6 +#: templates/telemeta/base.html:105 templates/telemeta/breadcrumbs.html:6 #: templates/telemeta/collection_list.html:6 #: templates/telemeta/collection_list.html:11 #: templates/telemeta/inc/breadcrumbs.html:7 msgid "Collections" msgstr "" -#: templates/telemeta/base.html:117 templates/telemeta/breadcrumbs.html:7 +#: templates/telemeta/base.html:106 templates/telemeta/breadcrumbs.html:7 #: templates/telemeta/collection_detail.html:62 #: templates/telemeta/inc/breadcrumbs.html:8 #: templates/telemeta/mediaitem_list.html:11 msgid "Items" msgstr "" -#: templates/telemeta/base.html:121 templates/telemeta/home.html:25 +#: templates/telemeta/base.html:110 templates/telemeta/home.html:25 msgid "Geo Navigator" msgstr "" -#: templates/telemeta/base.html:123 +#: templates/telemeta/base.html:112 msgid "Advanced search" msgstr "" -#: templates/telemeta/base.html:128 +#: templates/telemeta/base.html:117 msgid "Admin" msgstr "" -#: templates/telemeta/base.html:132 +#: templates/telemeta/base.html:121 #: templates/telemeta/instrument_alias_edit_value.html:24 #: templates/telemeta/instrument_edit.html:4 #: templates/telemeta/instrument_edit.html:7 @@ -1203,19 +1195,19 @@ msgstr "" msgid "Instruments" msgstr "" -#: templates/telemeta/base.html:133 +#: templates/telemeta/base.html:122 #: templates/telemeta/instrument_alias_edit.html:4 #: templates/telemeta/instrument_alias_edit.html:7 msgid "Instrument aliases" msgstr "" -#: templates/telemeta/base.html:181 +#: templates/telemeta/base.html:170 msgid "" "Usage of the archives in the respect of cultural heritage of the original " "communities." msgstr "" -#: templates/telemeta/base.html:186 +#: templates/telemeta/base.html:175 #: templates/telemeta/collection_detail.html:108 msgid "Legal notices" msgstr "" @@ -1263,7 +1255,7 @@ msgstr "" #: templates/telemeta/collection_detail.html:5 #: templates/telemeta/collection_detail_dc.html:5 views/collection.py:50 -#: views/collection.py:278 +#: views/collection.py:287 msgid "Collection" msgstr "" @@ -1342,7 +1334,7 @@ msgid "Related documentation" msgstr "" #: templates/telemeta/collection_detail.html:156 -#: templates/telemeta/mediaitem_detail.html:318 +#: templates/telemeta/mediaitem_detail.html:319 msgid "Comments" msgstr "" @@ -1382,6 +1374,7 @@ msgstr "" #: templates/telemeta/inc/mediaitem_related.html:6 #: templates/telemeta/inc/resource_related.html:6 #: templates/telemeta/mediaitem_edit.html:22 +#: templates/telemeta/resource_edit.html:21 msgid "Related media" msgstr "" @@ -1419,8 +1412,8 @@ msgstr "" #: templates/telemeta/collection_list.html:28 #: templates/telemeta/mediaitem_list.html:27 -#: templates/telemeta/search_results.html:13 -#: templates/telemeta/search_results.html:17 +#: templates/telemeta/search_results.html:22 +#: templates/telemeta/search_results.html:26 msgid "All" msgstr "" @@ -1436,8 +1429,8 @@ msgstr "" #: templates/telemeta/collection_list.html:31 #: templates/telemeta/mediaitem_list.html:30 -#: templates/telemeta/search_results.html:14 -#: templates/telemeta/search_results.html:18 +#: templates/telemeta/search_results.html:23 +#: templates/telemeta/search_results.html:27 msgid "Sounds" msgstr "" @@ -1594,7 +1587,7 @@ msgstr "" #: templates/telemeta/inc/resource_list.html:11 #: templates/telemeta/lists.html:74 #: templates/telemeta/search_criteria.html:143 -#: templates/telemeta/search_results.html:61 +#: templates/telemeta/search_results.html:70 msgid "Sound" msgstr "" @@ -1634,7 +1627,7 @@ msgstr "" #: templates/telemeta/inc/mediaitem_list.html:16 #: templates/telemeta/search_criteria.html:107 -#: templates/telemeta/search_results.html:47 +#: templates/telemeta/search_results.html:56 msgid "Year of recording" msgstr "" @@ -1787,7 +1780,7 @@ msgstr "" msgid "Remarks" msgstr "" -#: templates/telemeta/mediaitem_detail.html:306 +#: templates/telemeta/mediaitem_detail.html:307 msgid "Item size" msgstr "" @@ -2045,13 +2038,13 @@ msgstr "" #: templates/telemeta/search_criteria.html:114 #: templates/telemeta/search_criteria.html:133 -#: templates/telemeta/search_results.html:49 -#: templates/telemeta/search_results.html:56 +#: templates/telemeta/search_results.html:58 +#: templates/telemeta/search_results.html:65 msgid "to" msgstr "" #: templates/telemeta/search_criteria.html:126 -#: templates/telemeta/search_results.html:54 +#: templates/telemeta/search_results.html:63 msgid "Year of publication" msgstr "" @@ -2059,12 +2052,12 @@ msgstr "" msgid "Search" msgstr "" -#: templates/telemeta/search_results.html:5 -#: templates/telemeta/search_results.html:8 +#: templates/telemeta/search_results.html:6 +#: templates/telemeta/search_results.html:11 msgid "Search Results" msgstr "" -#: templates/telemeta/search_results.html:26 +#: templates/telemeta/search_results.html:35 msgid "Search pattern" msgstr "" @@ -2102,18 +2095,18 @@ msgstr "" msgid "pattern" msgstr "" -#: views/collection.py:49 views/collection.py:277 views/home.py:91 -#: views/item.py:133 views/item.py:503 views/profile.py:68 +#: views/collection.py:49 views/collection.py:286 views/home.py:91 +#: views/item.py:133 views/item.py:506 views/profile.py:68 msgid "Access not allowed" msgstr "" -#: views/collection.py:51 views/collection.py:279 views/home.py:93 -#: views/item.py:135 views/item.py:505 views/profile.py:70 +#: views/collection.py:51 views/collection.py:288 views/home.py:93 +#: views/item.py:135 views/item.py:508 views/profile.py:70 msgid "" "Please login or contact the website administator to get a private access." msgstr "" -#: views/collection.py:303 +#: views/collection.py:312 msgid "You have successfully updated your collection." msgstr "" @@ -2121,6 +2114,10 @@ msgstr "" msgid "Last changes" msgstr "" -#: views/item.py:721 +#: views/home.py:92 +msgid "Lists" +msgstr "" + +#: views/item.py:733 msgid "You have successfully updated your item." msgstr "" diff --git a/telemeta/locale/fr/LC_MESSAGES/django.mo b/telemeta/locale/fr/LC_MESSAGES/django.mo index 5b5ece830f5ce0c90b45b0eec0862cf63a96babf..c8b9374ec6ea883ab0872af5c3f37a97411311ee 100644 GIT binary patch delta 5675 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 N@chWyX~ki!{|Be+g8u*j delta 5674 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\n" "Language-Team: LANGUAGE \n" @@ -30,7 +30,7 @@ msgstr "Entrez une durée valide au format HH:MM[:ss]" msgid "value" msgstr "valeur" -#: models/enum.py:60 models/media.py:254 +#: models/enum.py:60 models/media.py:255 msgid "archive format" msgstr "support archivé" @@ -132,7 +132,7 @@ msgstr "type d'exemplaire'" msgid "media type" msgstr "type de média" -#: models/enum.py:282 models/media.py:255 +#: models/enum.py:282 models/media.py:254 msgid "original format" msgstr "support original" @@ -404,8 +404,8 @@ msgstr "titre original / traduction" msgid "depositor / contributor" msgstr "déposant / contributeur" -#: models/media.py:208 models/media.py:220 models/media.py:369 -#: models/media.py:399 +#: models/media.py:208 models/media.py:220 models/media.py:350 +#: models/media.py:369 models/media.py:399 msgid "First name, Last name ; First name, Last name" msgstr "Nom, Prénom ; Nom, Prénom" @@ -518,10 +518,8 @@ msgid "computed duration" msgstr "durée calculée" #: models/media.py:320 -#, fuzzy -#| msgid "collection size (Mo)" msgid "collection size" -msgstr "volume de la collection (Mo)" +msgstr "volume de la collection" #: models/media.py:328 models/media.py:334 models/media.py:351 #: models/media.py:886 @@ -849,8 +847,7 @@ msgstr "Description" msgid "criteria" msgstr "critères" -#: templates/admin/base.html:21 templates/telemeta/base.html:105 -#: templates/telemeta/base.html.py:109 +#: templates/admin/base.html:21 templates/telemeta/base.html:98 msgid "Home" msgstr "Accueil" @@ -889,7 +886,7 @@ msgstr "" msgid "Write" msgstr "Ecrire" -#: templates/postman/base.html:15 templates/telemeta/base.html:112 +#: templates/postman/base.html:15 templates/telemeta/base.html:101 msgid "Archives" msgstr "Archives" @@ -939,7 +936,7 @@ msgstr "" #: templates/telemeta/collection_detail.html:224 #: templates/telemeta/collection_detail_dc.html:25 #: templates/telemeta/lists.html:58 -#: templates/telemeta/mediaitem_detail.html:356 +#: templates/telemeta/mediaitem_detail.html:357 #: templates/telemeta/mediaitem_detail_dc.html:20 #: templates/telemeta/resource_detail.html:105 #: templates/telemeta/resource_detail_dc.html:17 @@ -1093,13 +1090,14 @@ msgid "Administration" msgstr "Administration" #: templates/telemeta/admin.html:14 templates/telemeta/admin_general.html:5 -#: templates/telemeta/base.html:130 templates/telemeta/collection_edit.html:20 +#: templates/telemeta/base.html:119 templates/telemeta/collection_edit.html:20 #: templates/telemeta/mediaitem_edit.html:21 +#: templates/telemeta/resource_edit.html:20 msgid "General" msgstr "Générale" #: templates/telemeta/admin_enumerations.html:6 -#: templates/telemeta/base.html:131 templates/telemeta/enumeration_edit.html:7 +#: templates/telemeta/base.html:120 templates/telemeta/enumeration_edit.html:7 msgid "Enumerations" msgstr "Énumérations" @@ -1114,7 +1112,7 @@ msgstr "Énumérations" #: templates/telemeta/inc/resource_related.html:21 #: templates/telemeta/lists.html:69 templates/telemeta/mediaitem_copy.html:39 #: templates/telemeta/search_criteria.html:91 -#: templates/telemeta/search_results.html:44 +#: templates/telemeta/search_results.html:53 msgid "Title" msgstr "Titre" @@ -1123,7 +1121,7 @@ msgid "No enumerations" msgstr "Aucune énumération" #: templates/telemeta/admin_instruments.html:6 -#: templates/telemeta/admin_users.html:6 templates/telemeta/base.html:125 +#: templates/telemeta/admin_users.html:6 templates/telemeta/base.html:114 #: templates/telemeta/users.html:5 templates/telemeta/users.html.py:8 msgid "Users" msgstr "Utilisateurs" @@ -1137,67 +1135,59 @@ msgstr "Pas d'utilisateurs" msgid "Welcome" msgstr "Bienvenue" -#: templates/telemeta/base.html:69 templates/telemeta/base.html.py:104 -msgid "Profile" -msgstr "Profil" - -#: templates/telemeta/base.html:71 templates/telemeta/base.html.py:75 +#: templates/telemeta/base.html:69 templates/telemeta/base.html.py:73 msgid "Help" msgstr "Aide" -#: templates/telemeta/base.html:72 +#: templates/telemeta/base.html:70 msgid "Sign out" msgstr "Déconnexion" -#: templates/telemeta/base.html:76 templates/telemeta/login.html:41 +#: templates/telemeta/base.html:74 templates/telemeta/login.html:41 msgid "Sign in" msgstr "Connexion" -#: templates/telemeta/base.html:101 +#: templates/telemeta/base.html:96 msgid "Desk" msgstr "Bureau" -#: templates/telemeta/base.html:103 views/home.py:92 -msgid "Lists" -msgstr "Listes" - -#: templates/telemeta/base.html:114 templates/telemeta/breadcrumbs.html:4 +#: templates/telemeta/base.html:103 templates/telemeta/breadcrumbs.html:4 #: templates/telemeta/inc/breadcrumbs.html:5 msgid "Fonds" msgstr "" -#: templates/telemeta/base.html:115 templates/telemeta/breadcrumbs.html:5 +#: templates/telemeta/base.html:104 templates/telemeta/breadcrumbs.html:5 #: templates/telemeta/inc/breadcrumbs.html:6 msgid "Corpus" msgstr "" -#: templates/telemeta/base.html:116 templates/telemeta/breadcrumbs.html:6 +#: templates/telemeta/base.html:105 templates/telemeta/breadcrumbs.html:6 #: templates/telemeta/collection_list.html:6 #: templates/telemeta/collection_list.html:11 #: templates/telemeta/inc/breadcrumbs.html:7 msgid "Collections" msgstr "Collections" -#: templates/telemeta/base.html:117 templates/telemeta/breadcrumbs.html:7 +#: templates/telemeta/base.html:106 templates/telemeta/breadcrumbs.html:7 #: templates/telemeta/collection_detail.html:62 #: templates/telemeta/inc/breadcrumbs.html:8 #: templates/telemeta/mediaitem_list.html:11 msgid "Items" msgstr "Items" -#: templates/telemeta/base.html:121 templates/telemeta/home.html:25 +#: templates/telemeta/base.html:110 templates/telemeta/home.html:25 msgid "Geo Navigator" msgstr "Géo-Navigateur" -#: templates/telemeta/base.html:123 +#: templates/telemeta/base.html:112 msgid "Advanced search" msgstr "Recherche avancée" -#: templates/telemeta/base.html:128 +#: templates/telemeta/base.html:117 msgid "Admin" msgstr "Admin" -#: templates/telemeta/base.html:132 +#: templates/telemeta/base.html:121 #: templates/telemeta/instrument_alias_edit_value.html:24 #: templates/telemeta/instrument_edit.html:4 #: templates/telemeta/instrument_edit.html:7 @@ -1205,13 +1195,13 @@ msgstr "Admin" msgid "Instruments" msgstr "Instruments" -#: templates/telemeta/base.html:133 +#: templates/telemeta/base.html:122 #: templates/telemeta/instrument_alias_edit.html:4 #: templates/telemeta/instrument_alias_edit.html:7 msgid "Instrument aliases" msgstr "Alias d'instruments" -#: templates/telemeta/base.html:181 +#: templates/telemeta/base.html:170 msgid "" "Usage of the archives in the respect of cultural heritage of the original " "communities." @@ -1219,7 +1209,7 @@ msgstr "" "Usage des archives réservé dans le respect du patrimoine culturel des " "communautés d'origine." -#: templates/telemeta/base.html:186 +#: templates/telemeta/base.html:175 #: templates/telemeta/collection_detail.html:108 msgid "Legal notices" msgstr "Mentions légales" @@ -1267,7 +1257,7 @@ msgstr "Annuler" #: templates/telemeta/collection_detail.html:5 #: templates/telemeta/collection_detail_dc.html:5 views/collection.py:50 -#: views/collection.py:278 +#: views/collection.py:287 msgid "Collection" msgstr "Collection" @@ -1346,7 +1336,7 @@ msgid "Related documentation" msgstr "Documentation associée" #: templates/telemeta/collection_detail.html:156 -#: templates/telemeta/mediaitem_detail.html:318 +#: templates/telemeta/mediaitem_detail.html:319 msgid "Comments" msgstr "Commentaires" @@ -1386,6 +1376,7 @@ msgstr "Aucune collection de ce type" #: templates/telemeta/inc/mediaitem_related.html:6 #: templates/telemeta/inc/resource_related.html:6 #: templates/telemeta/mediaitem_edit.html:22 +#: templates/telemeta/resource_edit.html:21 msgid "Related media" msgstr "Média associés" @@ -1423,8 +1414,8 @@ msgstr "" #: templates/telemeta/collection_list.html:28 #: templates/telemeta/mediaitem_list.html:27 -#: templates/telemeta/search_results.html:13 -#: templates/telemeta/search_results.html:17 +#: templates/telemeta/search_results.html:22 +#: templates/telemeta/search_results.html:26 msgid "All" msgstr "Tous" @@ -1440,8 +1431,8 @@ msgstr "Éditées" #: templates/telemeta/collection_list.html:31 #: templates/telemeta/mediaitem_list.html:30 -#: templates/telemeta/search_results.html:14 -#: templates/telemeta/search_results.html:18 +#: templates/telemeta/search_results.html:23 +#: templates/telemeta/search_results.html:27 msgid "Sounds" msgstr "Sonores" @@ -1600,7 +1591,7 @@ msgstr "Cote" #: templates/telemeta/inc/resource_list.html:11 #: templates/telemeta/lists.html:74 #: templates/telemeta/search_criteria.html:143 -#: templates/telemeta/search_results.html:61 +#: templates/telemeta/search_results.html:70 msgid "Sound" msgstr "Sonore" @@ -1640,7 +1631,7 @@ msgstr "Etat/Continent" #: templates/telemeta/inc/mediaitem_list.html:16 #: templates/telemeta/search_criteria.html:107 -#: templates/telemeta/search_results.html:47 +#: templates/telemeta/search_results.html:56 msgid "Year of recording" msgstr "Année d'enregistrement" @@ -1794,8 +1785,7 @@ msgstr "Références éditées" msgid "Remarks" msgstr "Remarques" -#: templates/telemeta/mediaitem_detail.html:306 -#, fuzzy +#: templates/telemeta/mediaitem_detail.html:307 #| msgid "item size" msgid "Item size" msgstr "taille de l'item" @@ -2056,13 +2046,13 @@ msgstr "Recherche avancée" #: templates/telemeta/search_criteria.html:114 #: templates/telemeta/search_criteria.html:133 -#: templates/telemeta/search_results.html:49 -#: templates/telemeta/search_results.html:56 +#: templates/telemeta/search_results.html:58 +#: templates/telemeta/search_results.html:65 msgid "to" msgstr "à" #: templates/telemeta/search_criteria.html:126 -#: templates/telemeta/search_results.html:54 +#: templates/telemeta/search_results.html:63 msgid "Year of publication" msgstr "Année de publication" @@ -2070,12 +2060,12 @@ msgstr "Année de publication" msgid "Search" msgstr "Recherche" -#: templates/telemeta/search_results.html:5 -#: templates/telemeta/search_results.html:8 +#: templates/telemeta/search_results.html:6 +#: templates/telemeta/search_results.html:11 msgid "Search Results" msgstr "Résultats de recherche" -#: templates/telemeta/search_results.html:26 +#: templates/telemeta/search_results.html:35 msgid "Search pattern" msgstr "Mots clés" @@ -2113,20 +2103,20 @@ msgstr "Enfants" msgid "pattern" msgstr "mots clés" -#: views/collection.py:49 views/collection.py:277 views/home.py:91 -#: views/item.py:133 views/item.py:503 views/profile.py:68 +#: views/collection.py:49 views/collection.py:286 views/home.py:91 +#: views/item.py:133 views/item.py:506 views/profile.py:68 msgid "Access not allowed" msgstr "Accès non autorisé" -#: views/collection.py:51 views/collection.py:279 views/home.py:93 -#: views/item.py:135 views/item.py:505 views/profile.py:70 +#: views/collection.py:51 views/collection.py:288 views/home.py:93 +#: views/item.py:135 views/item.py:508 views/profile.py:70 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/collection.py:303 +#: views/collection.py:312 msgid "You have successfully updated your collection." msgstr "" @@ -2134,10 +2124,17 @@ msgstr "" msgid "Last changes" msgstr "Dernières modifications" -#: views/item.py:721 +#: views/home.py:92 +msgid "Lists" +msgstr "Listes" + +#: views/item.py:733 msgid "You have successfully updated your item." msgstr "" +#~ msgid "Profile" +#~ msgstr "Profil" + #~ msgid "Analysis" #~ msgstr "Analyse" diff --git a/telemeta/locale/zh_CN/LC_MESSAGES/django.mo b/telemeta/locale/zh_CN/LC_MESSAGES/django.mo index 2ef30aa1e6a9bfdae25bedea1895ede9dfcae8a9..56a37b332c57f4e53a7ef3864ff75dc441340f1b 100644 GIT binary patch delta 8549 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 delta 8577 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 diff --git a/telemeta/locale/zh_CN/LC_MESSAGES/django.po b/telemeta/locale/zh_CN/LC_MESSAGES/django.po index 91ba1b28..c37eeb7d 100644 --- a/telemeta/locale/zh_CN/LC_MESSAGES/django.po +++ b/telemeta/locale/zh_CN/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Telemeta 1.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-11-10 17:31+0100\n" +"POT-Creation-Date: 2014-11-13 10:46+0100\n" "PO-Revision-Date: 2014-09-02 16:18+2\n" "Last-Translator: Zaichao XIA \n" "Language-Team: zh_CN \n" @@ -31,7 +31,7 @@ msgstr "请输入有效时长（HH:MM[:ss]格式）" msgid "value" msgstr "价值" -#: models/enum.py:60 models/media.py:254 +#: models/enum.py:60 models/media.py:255 msgid "archive format" msgstr "档案格式" @@ -137,7 +137,7 @@ msgstr "完整类型" msgid "media type" msgstr "媒体类型" -#: models/enum.py:282 models/media.py:255 +#: models/enum.py:282 models/media.py:254 #, fuzzy #| msgid "original location" msgid "original format" @@ -414,8 +414,8 @@ msgstr "原始标题/翻译" msgid "depositor / contributor" msgstr "寄存者/贡献者" -#: models/media.py:208 models/media.py:220 models/media.py:369 -#: models/media.py:399 +#: models/media.py:208 models/media.py:220 models/media.py:350 +#: models/media.py:369 models/media.py:399 msgid "First name, Last name ; First name, Last name" msgstr "" @@ -876,8 +876,7 @@ msgstr "描述" msgid "criteria" msgstr "标准" -#: templates/admin/base.html:21 templates/telemeta/base.html:105 -#: templates/telemeta/base.html.py:109 +#: templates/admin/base.html:21 templates/telemeta/base.html:98 msgid "Home" msgstr "首页" @@ -916,7 +915,7 @@ msgstr "已发消息" msgid "Write" msgstr "写消息" -#: templates/postman/base.html:15 templates/telemeta/base.html:112 +#: templates/postman/base.html:15 templates/telemeta/base.html:101 msgid "Archives" msgstr "档案" @@ -966,7 +965,7 @@ msgstr "" #: templates/telemeta/collection_detail.html:224 #: templates/telemeta/collection_detail_dc.html:25 #: templates/telemeta/lists.html:58 -#: templates/telemeta/mediaitem_detail.html:356 +#: templates/telemeta/mediaitem_detail.html:357 #: templates/telemeta/mediaitem_detail_dc.html:20 #: templates/telemeta/resource_detail.html:105 #: templates/telemeta/resource_detail_dc.html:17 @@ -1122,13 +1121,14 @@ msgid "Administration" msgstr "管理" #: templates/telemeta/admin.html:14 templates/telemeta/admin_general.html:5 -#: templates/telemeta/base.html:130 templates/telemeta/collection_edit.html:20 +#: templates/telemeta/base.html:119 templates/telemeta/collection_edit.html:20 #: templates/telemeta/mediaitem_edit.html:21 +#: templates/telemeta/resource_edit.html:20 msgid "General" msgstr "通用" #: templates/telemeta/admin_enumerations.html:6 -#: templates/telemeta/base.html:131 templates/telemeta/enumeration_edit.html:7 +#: templates/telemeta/base.html:120 templates/telemeta/enumeration_edit.html:7 msgid "Enumerations" msgstr "计数/列举" @@ -1143,7 +1143,7 @@ msgstr "计数/列举" #: templates/telemeta/inc/resource_related.html:21 #: templates/telemeta/lists.html:69 templates/telemeta/mediaitem_copy.html:39 #: templates/telemeta/search_criteria.html:91 -#: templates/telemeta/search_results.html:44 +#: templates/telemeta/search_results.html:53 msgid "Title" msgstr "标题" @@ -1152,7 +1152,7 @@ msgid "No enumerations" msgstr "无内容" #: templates/telemeta/admin_instruments.html:6 -#: templates/telemeta/admin_users.html:6 templates/telemeta/base.html:125 +#: templates/telemeta/admin_users.html:6 templates/telemeta/base.html:114 #: templates/telemeta/users.html:5 templates/telemeta/users.html.py:8 msgid "Users" msgstr "用户" @@ -1166,67 +1166,59 @@ msgstr "无用户" msgid "Welcome" msgstr "欢迎" -#: templates/telemeta/base.html:69 templates/telemeta/base.html.py:104 -msgid "Profile" -msgstr "资料" - -#: templates/telemeta/base.html:71 templates/telemeta/base.html.py:75 +#: templates/telemeta/base.html:69 templates/telemeta/base.html.py:73 msgid "Help" msgstr "帮助" -#: templates/telemeta/base.html:72 +#: templates/telemeta/base.html:70 msgid "Sign out" msgstr "注销" -#: templates/telemeta/base.html:76 templates/telemeta/login.html:41 +#: templates/telemeta/base.html:74 templates/telemeta/login.html:41 msgid "Sign in" msgstr "登陆" -#: templates/telemeta/base.html:101 +#: templates/telemeta/base.html:96 msgid "Desk" msgstr "桌面" -#: templates/telemeta/base.html:103 views/home.py:92 -msgid "Lists" -msgstr "列表" - -#: templates/telemeta/base.html:114 templates/telemeta/breadcrumbs.html:4 +#: templates/telemeta/base.html:103 templates/telemeta/breadcrumbs.html:4 #: templates/telemeta/inc/breadcrumbs.html:5 msgid "Fonds" msgstr "全宗" -#: templates/telemeta/base.html:115 templates/telemeta/breadcrumbs.html:5 +#: templates/telemeta/base.html:104 templates/telemeta/breadcrumbs.html:5 #: templates/telemeta/inc/breadcrumbs.html:6 msgid "Corpus" msgstr "全集" -#: templates/telemeta/base.html:116 templates/telemeta/breadcrumbs.html:6 +#: templates/telemeta/base.html:105 templates/telemeta/breadcrumbs.html:6 #: templates/telemeta/collection_list.html:6 #: templates/telemeta/collection_list.html:11 #: templates/telemeta/inc/breadcrumbs.html:7 msgid "Collections" msgstr "选集" -#: templates/telemeta/base.html:117 templates/telemeta/breadcrumbs.html:7 +#: templates/telemeta/base.html:106 templates/telemeta/breadcrumbs.html:7 #: templates/telemeta/collection_detail.html:62 #: templates/telemeta/inc/breadcrumbs.html:8 #: templates/telemeta/mediaitem_list.html:11 msgid "Items" msgstr "项" -#: templates/telemeta/base.html:121 templates/telemeta/home.html:25 +#: templates/telemeta/base.html:110 templates/telemeta/home.html:25 msgid "Geo Navigator" msgstr "地理导航" -#: templates/telemeta/base.html:123 +#: templates/telemeta/base.html:112 msgid "Advanced search" msgstr "高级搜索" -#: templates/telemeta/base.html:128 +#: templates/telemeta/base.html:117 msgid "Admin" msgstr "管理员" -#: templates/telemeta/base.html:132 +#: templates/telemeta/base.html:121 #: templates/telemeta/instrument_alias_edit_value.html:24 #: templates/telemeta/instrument_edit.html:4 #: templates/telemeta/instrument_edit.html:7 @@ -1234,19 +1226,19 @@ msgstr "管理员" msgid "Instruments" msgstr "仪器" -#: templates/telemeta/base.html:133 +#: templates/telemeta/base.html:122 #: templates/telemeta/instrument_alias_edit.html:4 #: templates/telemeta/instrument_alias_edit.html:7 msgid "Instrument aliases" msgstr "仪器别名" -#: templates/telemeta/base.html:181 +#: templates/telemeta/base.html:170 msgid "" "Usage of the archives in the respect of cultural heritage of the original " "communities." msgstr "档案的使用尊重文化遗产的原始所有者。" -#: templates/telemeta/base.html:186 +#: templates/telemeta/base.html:175 #: templates/telemeta/collection_detail.html:108 msgid "Legal notices" msgstr "合法通知" @@ -1294,7 +1286,7 @@ msgstr "取消" #: templates/telemeta/collection_detail.html:5 #: templates/telemeta/collection_detail_dc.html:5 views/collection.py:50 -#: views/collection.py:278 +#: views/collection.py:287 msgid "Collection" msgstr "选集" @@ -1377,7 +1369,7 @@ msgid "Related documentation" msgstr "相关文献" #: templates/telemeta/collection_detail.html:156 -#: templates/telemeta/mediaitem_detail.html:318 +#: templates/telemeta/mediaitem_detail.html:319 msgid "Comments" msgstr "注解" @@ -1419,6 +1411,7 @@ msgstr "无这类选集" #: templates/telemeta/inc/mediaitem_related.html:6 #: templates/telemeta/inc/resource_related.html:6 #: templates/telemeta/mediaitem_edit.html:22 +#: templates/telemeta/resource_edit.html:21 msgid "Related media" msgstr "相关媒体" @@ -1457,8 +1450,8 @@ msgstr "" #: templates/telemeta/collection_list.html:28 #: templates/telemeta/mediaitem_list.html:27 -#: templates/telemeta/search_results.html:13 -#: templates/telemeta/search_results.html:17 +#: templates/telemeta/search_results.html:22 +#: templates/telemeta/search_results.html:26 msgid "All" msgstr "所有" @@ -1474,8 +1467,8 @@ msgstr "已出版的" #: templates/telemeta/collection_list.html:31 #: templates/telemeta/mediaitem_list.html:30 -#: templates/telemeta/search_results.html:14 -#: templates/telemeta/search_results.html:18 +#: templates/telemeta/search_results.html:23 +#: templates/telemeta/search_results.html:27 msgid "Sounds" msgstr "声音" @@ -1632,7 +1625,7 @@ msgstr "密码" #: templates/telemeta/inc/resource_list.html:11 #: templates/telemeta/lists.html:74 #: templates/telemeta/search_criteria.html:143 -#: templates/telemeta/search_results.html:61 +#: templates/telemeta/search_results.html:70 msgid "Sound" msgstr "声音" @@ -1672,7 +1665,7 @@ msgstr "国家/洲" #: templates/telemeta/inc/mediaitem_list.html:16 #: templates/telemeta/search_criteria.html:107 -#: templates/telemeta/search_results.html:47 +#: templates/telemeta/search_results.html:56 msgid "Year of recording" msgstr "录音年份" @@ -1825,7 +1818,7 @@ msgstr "已出版参考资料" msgid "Remarks" msgstr "评论" -#: templates/telemeta/mediaitem_detail.html:306 +#: templates/telemeta/mediaitem_detail.html:307 #, fuzzy #| msgid "collections" msgid "Item size" @@ -2092,13 +2085,13 @@ msgstr "高级搜索" #: templates/telemeta/search_criteria.html:114 #: templates/telemeta/search_criteria.html:133 -#: templates/telemeta/search_results.html:49 -#: templates/telemeta/search_results.html:56 +#: templates/telemeta/search_results.html:58 +#: templates/telemeta/search_results.html:65 msgid "to" msgstr "给" #: templates/telemeta/search_criteria.html:126 -#: templates/telemeta/search_results.html:54 +#: templates/telemeta/search_results.html:63 msgid "Year of publication" msgstr "出版年份" @@ -2106,12 +2099,12 @@ msgstr "出版年份" msgid "Search" msgstr "搜索" -#: templates/telemeta/search_results.html:5 -#: templates/telemeta/search_results.html:8 +#: templates/telemeta/search_results.html:6 +#: templates/telemeta/search_results.html:11 msgid "Search Results" msgstr "搜索结果" -#: templates/telemeta/search_results.html:26 +#: templates/telemeta/search_results.html:35 msgid "Search pattern" msgstr "搜索样板" @@ -2149,18 +2142,18 @@ msgstr "孩子" msgid "pattern" msgstr "样板" -#: views/collection.py:49 views/collection.py:277 views/home.py:91 -#: views/item.py:133 views/item.py:503 views/profile.py:68 +#: views/collection.py:49 views/collection.py:286 views/home.py:91 +#: views/item.py:133 views/item.py:506 views/profile.py:68 msgid "Access not allowed" msgstr "不允许访问" -#: views/collection.py:51 views/collection.py:279 views/home.py:93 -#: views/item.py:135 views/item.py:505 views/profile.py:70 +#: views/collection.py:51 views/collection.py:288 views/home.py:93 +#: views/item.py:135 views/item.py:508 views/profile.py:70 msgid "" "Please login or contact the website administator to get a private access." msgstr "请登录或联系网站管理员以获得私人访问权限。" -#: views/collection.py:303 +#: views/collection.py:312 msgid "You have successfully updated your collection." msgstr "" @@ -2168,10 +2161,17 @@ msgstr "" msgid "Last changes" msgstr "上次更改" -#: views/item.py:721 +#: views/home.py:92 +msgid "Lists" +msgstr "列表" + +#: views/item.py:733 msgid "You have successfully updated your item." msgstr "" +#~ msgid "Profile" +#~ msgstr "资料" + #~ msgid "Analysis" #~ msgstr "分析" diff --git a/telemeta/models/media.py b/telemeta/models/media.py index 9bb25b74..defaf004 100644 --- a/telemeta/models/media.py +++ b/telemeta/models/media.py @@ -251,8 +251,8 @@ class MediaCollection(MediaResource): media_type = WeakForeignKey('MediaType', related_name="collections", verbose_name=_('media type')) approx_duration = DurationField(_('estimated duration'), help_text='hh:mm:ss') physical_items_num = IntegerField(_('number of components (medium / piece)')) - physical_format = WeakForeignKey('PhysicalFormat', related_name="collections", verbose_name=_('archive format')) original_format = WeakForeignKey('OriginalFormat', related_name="collections", verbose_name=_('original format')) + physical_format = WeakForeignKey('PhysicalFormat', related_name="collections", verbose_name=_('archive format')) ad_conversion = WeakForeignKey('AdConversion', related_name='collections', verbose_name=_('digitization')) # All @@ -347,7 +347,7 @@ class MediaItem(MediaResource): # Main Informations title = CharField(_('title')) alt_title = CharField(_('original title / translation')) - collector = CharField(_('collector')) + collector = CharField(_('collector'), help_text=_('First name, Last name ; First name, Last name')) collection = ForeignKey('MediaCollection', related_name="items", verbose_name=_('collection')) recorded_from_date = DateField(_('recording date (from)'), help_text=_('YYYY-MM-DD')) recorded_to_date = DateField(_('recording date (until)'), help_text=_('YYYY-MM-DD')) diff --git a/telemeta/templates/telemeta/collection_detail.html b/telemeta/templates/telemeta/collection_detail.html index 583aea8d..419f31b3 100644 --- a/telemeta/templates/telemeta/collection_detail.html +++ b/telemeta/templates/telemeta/collection_detail.html @@ -177,7 +177,7 @@ {% dl_field collection "code" %} {% dl_field collection "old_code" %} {% dl_field collection "media_type" %} - {% if collection.computed_duration %} + {% if not collection.computed_duration %} {% dl_field collection "approx_duration" %} {% endif %} {% dl_field collection "computed_duration" %} diff --git a/telemeta/templates/telemeta/lists.html b/telemeta/templates/telemeta/lists.html index a8716ab0..bdd53c7d 100644 --- a/telemeta/templates/telemeta/lists.html +++ b/telemeta/templates/telemeta/lists.html @@ -9,7 +9,7 @@ jQuery(window).ready(function(){ var p = playlistUtils; var a = jQuery('#_new_playlist'); - a.unbind('click').click(function(){p.showAdd(a);return false;}); + a.unbind('click').click(function(){p.showAdd(a);}); }); {% for playlist in playlists %} diff --git a/telemeta/templates/telemeta/mediaitem_detail.html b/telemeta/templates/telemeta/mediaitem_detail.html index 716661c7..0777fc47 100644 --- a/telemeta/templates/telemeta/mediaitem_detail.html +++ b/telemeta/templates/telemeta/mediaitem_detail.html @@ -301,6 +301,7 @@ Item : {{ item }}

{% trans "Technical data" %}

+ {% dl_field item "media_type" %} {% dl_field item "approx_duration" %} {% if item.size %}
{% trans "Item size" %}
diff --git a/telemeta/templates/telemeta/resource_edit.html b/telemeta/templates/telemeta/resource_edit.html index 86d7172f..0741241f 100644 --- a/telemeta/templates/telemeta/resource_edit.html +++ b/telemeta/templates/telemeta/resource_edit.html @@ -17,8 +17,8 @@
{% csrf_token %}
diff --git a/telemeta/views/collection.py b/telemeta/views/collection.py index e203eabb..9e39c84d 100644 --- a/telemeta/views/collection.py +++ b/telemeta/views/collection.py @@ -228,6 +228,7 @@ class CollectionPackageView(View): class CollectionViewMixin(object): model = MediaCollection + form_class = MediaCollectionForm def get_object(self): obj = self.model.objects.filter(code=self.kwargs['public_id']) diff --git a/telemeta/views/item.py b/telemeta/views/item.py index 6190f313..9f678c5d 100644 --- a/telemeta/views/item.py +++ b/telemeta/views/item.py @@ -424,6 +424,9 @@ class ItemView(ItemBaseMixin): analyzer_id='duration', unit='s', value=unicode(datetime.timedelta(0,decoder.input_duration))) analysis.save() + analysis = MediaItemAnalysis(item=item, name='Size', + analyzer_id='size', unit='', value=item.size()) + analysis.save() for analyzer in analyzers_sub: for key in analyzer.results.keys(): @@ -642,6 +645,7 @@ class ItemSoundListView(ItemListView): class ItemViewMixin(ItemBaseMixin): model = MediaItem + form_class = MediaItemForm inlines = [ItemPerformanceInline, ItemKeywordInline, ItemRelatedInline, ItemIdentifierInline] # inlines = [ItemPerformanceInline, ItemKeywordInline, ItemRelatedInline, # ItemFormatInline, ItemIdentifierInline] -- 2.39.5