# HG changeset patch # User ymh # Date 1381494860 -7200 # Node ID a998cf036d15b854ffdf80a06c3cc4953f3b5239 # Parent e4d53c64f0d0c08ca8a252ba9851b531d3370190 Merge pull request #8 https://github.com/IRI-Research/plan4learning/pull/8 : Ordre des champs - traduction des libellés - restriction des langues diff -r e4d53c64f0d0 -r a998cf036d15 src/p4l/locale/en/LC_MESSAGES/django.mo Binary file src/p4l/locale/en/LC_MESSAGES/django.mo has changed diff -r e4d53c64f0d0 -r a998cf036d15 src/p4l/locale/en/LC_MESSAGES/django.po --- a/src/p4l/locale/en/LC_MESSAGES/django.po Fri Oct 11 13:24:03 2013 +0200 +++ b/src/p4l/locale/en/LC_MESSAGES/django.po Fri Oct 11 14:34:20 2013 +0200 @@ -191,59 +191,59 @@ #: templates/p4l/record_view.html:24 msgid "subjects" -msgstr "subjects" +msgstr "Keywords" #: templates/p4l/record_view.html:28 msgid "themes" -msgstr "themes" +msgstr "Themes" #: templates/p4l/record_view.html:32 msgid "countries" -msgstr "countries" +msgstr "Countries" #: templates/p4l/record_view.html:40 msgid "notes" -msgstr "notes" +msgstr "Notes" #: templates/p4l/record_view.html:44 msgid "issns" -msgstr "issns" +msgstr "ISSN" #: templates/p4l/record_view.html:48 msgid "isbns" -msgstr "isbns" +msgstr "ISBN" #: templates/p4l/record_view.html:52 msgid "document code" -msgstr "document code" +msgstr "Document Code" #: templates/p4l/record_view.html:60 msgid "other languages" -msgstr "other languages" +msgstr "Also available in" #: templates/p4l/record_view.html:68 msgid "abstracts" -msgstr "abstracts" +msgstr "Abstract" #: templates/p4l/record_view.html:72 msgid "added titles" -msgstr "addes titles" +msgstr "Contents title" #: templates/p4l/record_view.html:76 msgid "titles main document" -msgstr "titles main document" +msgstr "In" #: templates/p4l/record_view.html:80 msgid "edition statement" -msgstr "edition statement" +msgstr "Edition" #: templates/p4l/record_view.html:84 msgid "imprints" -msgstr "imprints" +msgstr "Imprint" #: templates/p4l/record_view.html:90 msgid "City" -msgstr "City" +msgstr "Publisher city" #: templates/p4l/record_view.html:91 msgid "Publisher" @@ -260,11 +260,11 @@ #: templates/p4l/record_view.html:101 msgid "collations" -msgstr "collations" +msgstr "Pages" #: templates/p4l/record_view.html:105 msgid "volume issues" -msgstr "volume issues" +msgstr "Volume" #: templates/p4l/record_view.html:111 templates/p4l/record_view.html.py:154 msgid "Volume" @@ -277,15 +277,15 @@ #: templates/p4l/record_view.html:121 msgid "project names" -msgstr "project names" +msgstr "Projects" #: templates/p4l/record_view.html:125 msgid "periodicals" -msgstr "periodicals" +msgstr "Periodical" #: templates/p4l/record_view.html:129 msgid "meetings" -msgstr "meetings" +msgstr "Meeting" #: templates/p4l/record_view.html:137 templates/p4l/record_view.html.py:182 msgid "Place" @@ -297,63 +297,63 @@ #: templates/p4l/record_view.html:147 msgid "series" -msgstr "series" +msgstr "Series" #: templates/p4l/record_view.html:162 msgid "authors" -msgstr "authors" +msgstr "Author(s)" #: templates/p4l/record_view.html:166 msgid "subject persons" -msgstr "subject persons" +msgstr "Personal name (subject)" #: templates/p4l/record_view.html:170 msgid "subject corporate bodies" -msgstr "subject corporate bodies" +msgstr "Related institutions" #: templates/p4l/record_view.html:174 msgid "subject meetings" -msgstr "subject meetings" +msgstr "Related meetings" #: templates/p4l/record_view.html:192 msgid "corporate authors" -msgstr "corporate authors" +msgstr "Institution(s)" #: templates/p4l/record_view.html:196 msgid "corporate author label" -msgstr "corporate author label" +msgstr "Institution(s) bibliographical label" #: templates/p4l/record_view.html:200 msgid "Urls" -msgstr "Urls" +msgstr "URL" #: templates/p4l/record_view.html:206 msgid "Address" -msgstr "Address" +msgstr "URL" #: templates/p4l/record_view.html:207 msgid "Display" -msgstr "Display" +msgstr "Full text" #: templates/p4l/record_view.html:215 msgid "record type" -msgstr "record type" +msgstr "Type of document" #: templates/p4l/record_view.html:219 msgid "audiences" -msgstr "audiences" +msgstr "Audiences" #: templates/p4l/record_view.html:223 msgid "is document part" -msgstr "is document part" +msgstr "Is document part" #: templates/p4l/record_view.html:227 msgid "is hidden" -msgstr "is hidden" +msgstr "Hidden record" #: templates/p4l/record_view.html:231 msgid "is restricted" -msgstr "is restricted" +msgstr "Restricted access" #: templates/p4l/translations.html:3 msgid "Add" @@ -365,7 +365,7 @@ #: templates/p4l/translations.html:6 msgid "Add a new subject" -msgstr "Add a new subject" +msgstr "Add a new keyword" #: templates/p4l/translations.html:7 msgid "Add a new theme" diff -r e4d53c64f0d0 -r a998cf036d15 src/p4l/locale/es/LC_MESSAGES/django.mo Binary file src/p4l/locale/es/LC_MESSAGES/django.mo has changed diff -r e4d53c64f0d0 -r a998cf036d15 src/p4l/locale/es/LC_MESSAGES/django.po --- a/src/p4l/locale/es/LC_MESSAGES/django.po Fri Oct 11 13:24:03 2013 +0200 +++ b/src/p4l/locale/es/LC_MESSAGES/django.po Fri Oct 11 14:34:20 2013 +0200 @@ -31,7 +31,7 @@ #: admin/components.py:50 admin/forms.py:62 templates/p4l/record_view.html:56 msgid "language" -msgstr "language" +msgstr "idioma" #: admin/views.py:143 msgid "No active process to kill" @@ -43,7 +43,7 @@ #: semantictree/forms/widgets.py:68 msgid "Search" -msgstr "Search" +msgstr "Buscar" #: semantictree/forms/widgets.py:72 semantictree/forms/widgets.py:109 msgid "" @@ -55,11 +55,11 @@ #: semantictree/forms/widgets.py:73 semantictree/forms/widgets.py:110 msgid "Browse" -msgstr "Browse" +msgstr "Consultar" #: semantictree/forms/widgets.py:78 semantictree/forms/widgets.py:115 msgid "or" -msgstr "or" +msgstr "o" #: templates/admin/app_index.html:7 #: templates/p4l/admin/confirm_run_script.html:13 @@ -94,24 +94,24 @@ #: templates/p4l/home.html:6 templates/p4l/home.html.py:15 msgid "Record List" -msgstr "Record list" +msgstr "Lista de registros" #: templates/p4l/home.html:6 templates/p4l/home.html.py:35 #: templates/p4l/home.html:75 msgid "Page" -msgstr "Page" +msgstr "Página" #: templates/p4l/home.html:19 msgid "Query" -msgstr "Query" +msgstr "Buscar" #: templates/p4l/home.html:24 msgid "New record" -msgstr "New record" +msgstr "Nuevo registro" #: templates/p4l/home.html:32 templates/p4l/home.html.py:72 msgid "Previous" -msgstr "Previous" +msgstr "Atrás" #: templates/p4l/home.html:35 templates/p4l/home.html.py:75 msgid "on" @@ -119,49 +119,49 @@ #: templates/p4l/home.html:38 templates/p4l/home.html.py:78 msgid "Next" -msgstr "Next" +msgstr "Siguiente" #: templates/p4l/home.html:48 templates/p4l/record_view.html:36 msgid "identifier" -msgstr "identifier" +msgstr "MFN" #: templates/p4l/home.html:48 templates/p4l/record_view.html:64 msgid "titles" -msgstr "titles" +msgstr "título" #: templates/p4l/home.html:48 msgid "dates" -msgstr "dates" +msgstr "año" #: templates/p4l/home.html:48 msgid "actions" -msgstr "actions" +msgstr "acciones" #: templates/p4l/home.html:64 msgid "No record" -msgstr "No record" +msgstr "No hay respuesta" #: templates/p4l/record_update_form.html:5 templates/p4l/record_view.html:7 msgid "Record" -msgstr "Record" +msgstr "Registro" #: templates/p4l/record_update_form.html:5 templates/p4l/record_view.html:7 msgid "View" -msgstr "View" +msgstr "Ver" #: templates/p4l/record_update_form.html:55 templates/p4l/translations.html:4 msgid "Save" -msgstr "Save" +msgstr "Guardar" #: templates/p4l/record_update_form.html:59 msgid "Cancel" -msgstr "Cancel" +msgstr "Cancelar" #: templates/p4l/record_update_form.html:63 #: templates/p4l/record_update_form.html:251 #: templates/p4l/translations.html:20 msgid "View the record" -msgstr "View the record" +msgstr "Ver el registro" #: templates/p4l/record_update_form.html:64 #: templates/p4l/record_update_form.html:252 templates/p4l/record_view.html:12 @@ -169,78 +169,78 @@ msgid "" "Are your sure you want to delete this record ? This action is irreversible." msgstr "" -"Are your sure you want to delete this record ? This action is irreversible." +"¿Confirma la supresión? Es irreversible." #: templates/p4l/record_update_form.html:64 #: templates/p4l/record_update_form.html:252 templates/p4l/record_view.html:12 #: templates/p4l/record_view.html.py:238 msgid "Delete the record" -msgstr "Delete the record" +msgstr "Suprimir el registro" #: templates/p4l/record_view.html:11 templates/p4l/record_view.html.py:237 #: templates/p4l/translations.html:21 msgid "Edit the record" -msgstr "Edit the record" +msgstr "Modificar el registro" #: templates/p4l/record_view.html:16 msgid "property" -msgstr "property" +msgstr "campo" #: templates/p4l/record_view.html:16 msgid "value" -msgstr "value" +msgstr "valor" #: templates/p4l/record_view.html:24 msgid "subjects" -msgstr "subjects" +msgstr "Palabras clave" #: templates/p4l/record_view.html:28 msgid "themes" -msgstr "themes" +msgstr "Temas" #: templates/p4l/record_view.html:32 msgid "countries" -msgstr "countries" +msgstr "Países" #: templates/p4l/record_view.html:40 msgid "notes" -msgstr "notes" +msgstr "Notas" #: templates/p4l/record_view.html:44 msgid "issns" -msgstr "issns" +msgstr "ISSN" #: templates/p4l/record_view.html:48 msgid "isbns" -msgstr "isbns" +msgstr "ISBN" #: templates/p4l/record_view.html:52 msgid "document code" -msgstr "document code" +msgstr "Código del documento" #: templates/p4l/record_view.html:60 msgid "other languages" -msgstr "other languages" +msgstr "Disponible en" #: templates/p4l/record_view.html:68 msgid "abstracts" -msgstr "abstracts" +msgstr "Resumen" #: templates/p4l/record_view.html:72 msgid "added titles" -msgstr "addes titles" +msgstr "Incluye" #: templates/p4l/record_view.html:76 msgid "titles main document" -msgstr "titles main document" +msgstr "In" #: templates/p4l/record_view.html:80 msgid "edition statement" -msgstr "edition statement" +msgstr "Edición" #: templates/p4l/record_view.html:84 msgid "imprints" -msgstr "imprints" +msgstr "Publicado por" #: templates/p4l/record_view.html:90 msgid "City" @@ -253,80 +253,80 @@ #: templates/p4l/record_view.html:92 templates/p4l/record_view.html.py:138 #: templates/p4l/record_view.html:183 msgid "Date" -msgstr "Date" +msgstr "Fecha" #: templates/p4l/record_view.html:93 templates/p4l/record_view.html.py:113 msgid "Language" -msgstr "Language" +msgstr "Idioma" #: templates/p4l/record_view.html:101 msgid "collations" -msgstr "collations" +msgstr "Páginas" #: templates/p4l/record_view.html:105 msgid "volume issues" -msgstr "volume issues" +msgstr "Volumen" #: templates/p4l/record_view.html:111 templates/p4l/record_view.html.py:154 msgid "Volume" -msgstr "Volume" +msgstr "Volumen" #: templates/p4l/record_view.html:112 templates/p4l/record_view.html.py:136 #: templates/p4l/record_view.html:181 msgid "Number" -msgstr "Number" +msgstr "Número" #: templates/p4l/record_view.html:121 msgid "project names" -msgstr "project names" +msgstr "Proyectos" #: templates/p4l/record_view.html:125 msgid "periodicals" -msgstr "periodicals" +msgstr "Revista" #: templates/p4l/record_view.html:129 msgid "meetings" -msgstr "meetings" +msgstr "Seminario" #: templates/p4l/record_view.html:137 templates/p4l/record_view.html.py:182 msgid "Place" -msgstr "Place" +msgstr "Lugar del seminario" #: templates/p4l/record_view.html:139 templates/p4l/record_view.html.py:184 msgid "Year" -msgstr "Year" +msgstr "Año" #: templates/p4l/record_view.html:147 msgid "series" -msgstr "series" +msgstr "Colección" #: templates/p4l/record_view.html:162 msgid "authors" -msgstr "authors" +msgstr "Autor(es)" #: templates/p4l/record_view.html:166 msgid "subject persons" -msgstr "subject persons" +msgstr "Autor personal (materia)" #: templates/p4l/record_view.html:170 msgid "subject corporate bodies" -msgstr "subject corporate bodies" +msgstr "Otras entidades" #: templates/p4l/record_view.html:174 msgid "subject meetings" -msgstr "subject meetings" +msgstr "Otros seminarios" #: templates/p4l/record_view.html:192 msgid "corporate authors" -msgstr "corporate authors" +msgstr "Entidad(es)" #: templates/p4l/record_view.html:196 msgid "corporate author label" -msgstr "corporate author label" +msgstr "Entidad(es) bibliographical label" #: templates/p4l/record_view.html:200 msgid "Urls" -msgstr "Urls" +msgstr "Versión electrónica" #: templates/p4l/record_view.html:206 msgid "Address" @@ -342,27 +342,27 @@ #: templates/p4l/record_view.html:219 msgid "audiences" -msgstr "audiences" +msgstr "Público" #: templates/p4l/record_view.html:223 msgid "is document part" -msgstr "is document part" +msgstr "Analítico" #: templates/p4l/record_view.html:227 msgid "is hidden" -msgstr "is hidden" +msgstr "registro oculto" #: templates/p4l/record_view.html:231 msgid "is restricted" -msgstr "is restricted" +msgstr "acceso restringido" #: templates/p4l/translations.html:3 msgid "Add" -msgstr "Add" +msgstr "Añadir" #: templates/p4l/translations.html:5 msgid "Update" -msgstr "Update" +msgstr "Actualizar" #: templates/p4l/translations.html:6 msgid "Add a new subject" @@ -370,47 +370,47 @@ #: templates/p4l/translations.html:7 msgid "Add a new theme" -msgstr "Add a new theme" +msgstr "Añadir un nuevo tema" #: templates/p4l/translations.html:8 msgid "Add a new country" -msgstr "Add a new country" +msgstr "Añadir un nuevo país" #: templates/p4l/translations.html:9 msgid "Add a new language" -msgstr "Add a new language" +msgstr "Añadir un nuevo idioma" #: templates/p4l/translations.html:10 msgid "Add a new project" -msgstr "Add a new project" +msgstr "Añadir un nuevo proyecto" #: templates/p4l/translations.html:11 msgid "Add a new organization" -msgstr "Add a new organization" +msgstr "Añadir un nuevo entidad" #: templates/p4l/translations.html:12 msgid "Add a new audience" -msgstr "Add a new audience" +msgstr "Añadir un nuevo público" #: templates/p4l/translations.html:13 msgid "Modify the language" -msgstr "Modify the language" +msgstr "Modificar idioma" #: templates/p4l/translations.html:14 msgid "Modify the record type" -msgstr "Modify the record type" +msgstr "Modificar tipo de registro" #: templates/p4l/translations.html:15 msgid "title" -msgstr "title" +msgstr "título" #: templates/p4l/translations.html:16 msgid "abstract" -msgstr "abstract" +msgstr "resumen" #: templates/p4l/translations.html:17 msgid "collation" -msgstr "collation" +msgstr "páginas" #: templates/p4l/translations.html:18 msgid "label" diff -r e4d53c64f0d0 -r a998cf036d15 src/p4l/locale/fr/LC_MESSAGES/django.mo Binary file src/p4l/locale/fr/LC_MESSAGES/django.mo has changed diff -r e4d53c64f0d0 -r a998cf036d15 src/p4l/locale/fr/LC_MESSAGES/django.po --- a/src/p4l/locale/fr/LC_MESSAGES/django.po Fri Oct 11 13:24:03 2013 +0200 +++ b/src/p4l/locale/fr/LC_MESSAGES/django.po Fri Oct 11 14:34:20 2013 +0200 @@ -86,7 +86,7 @@ #: templates/p4l/base.html:36 msgid "logout" -msgstr "deconnection" +msgstr "déconnection" #: templates/p4l/base.html:38 templates/registration/login.html:4 #: templates/registration/login.html:27 @@ -95,7 +95,7 @@ #: templates/p4l/home.html:6 templates/p4l/home.html.py:15 msgid "Record List" -msgstr "Liste notice" +msgstr "Liste des Notices" #: templates/p4l/home.html:6 templates/p4l/home.html.py:35 #: templates/p4l/home.html:75 @@ -104,7 +104,7 @@ #: templates/p4l/home.html:19 msgid "Query" -msgstr "Requête" +msgstr "Chercher..." #: templates/p4l/home.html:24 msgid "New record" @@ -124,19 +124,19 @@ #: templates/p4l/home.html:48 templates/p4l/record_view.html:36 msgid "identifier" -msgstr "identifiant" +msgstr "Identifiant" #: templates/p4l/home.html:48 templates/p4l/record_view.html:64 msgid "titles" -msgstr "titres" +msgstr "Titre" #: templates/p4l/home.html:48 msgid "dates" -msgstr "dates" +msgstr "Date" #: templates/p4l/home.html:48 msgid "actions" -msgstr "actions" +msgstr "Actions" #: templates/p4l/home.html:64 msgid "No record" @@ -186,63 +186,63 @@ #: templates/p4l/record_view.html:16 msgid "property" -msgstr "propriété" +msgstr "Propriété" #: templates/p4l/record_view.html:16 msgid "value" -msgstr "valeur" +msgstr "Valeur" #: templates/p4l/record_view.html:24 msgid "subjects" -msgstr "sujets" +msgstr "Descripteurs" #: templates/p4l/record_view.html:28 msgid "themes" -msgstr "thèmes" +msgstr "Thèmes" #: templates/p4l/record_view.html:32 msgid "countries" -msgstr "pays" +msgstr "Pays" #: templates/p4l/record_view.html:40 msgid "notes" -msgstr "notes" +msgstr "Notes" #: templates/p4l/record_view.html:44 msgid "issns" -msgstr "issns" +msgstr "ISSN" #: templates/p4l/record_view.html:48 msgid "isbns" -msgstr "isbns" +msgstr "ISBN" #: templates/p4l/record_view.html:52 msgid "document code" -msgstr "code document" +msgstr "Code du document" #: templates/p4l/record_view.html:60 msgid "other languages" -msgstr "autres langues" +msgstr "Disponible aussi en" #: templates/p4l/record_view.html:68 msgid "abstracts" -msgstr "résumés" +msgstr "Résumé" #: templates/p4l/record_view.html:72 msgid "added titles" -msgstr "titres ajoutés" +msgstr "Contient" #: templates/p4l/record_view.html:76 msgid "titles main document" -msgstr "titre doc. principal" +msgstr "In" #: templates/p4l/record_view.html:80 msgid "edition statement" -msgstr "déclatation pub." +msgstr "Edition" #: templates/p4l/record_view.html:84 msgid "imprints" -msgstr "impressions" +msgstr "Publié par" #: templates/p4l/record_view.html:90 msgid "City" @@ -263,11 +263,11 @@ #: templates/p4l/record_view.html:101 msgid "collations" -msgstr "paginations" +msgstr "Pages" #: templates/p4l/record_view.html:105 msgid "volume issues" -msgstr "volume de parution" +msgstr "Volume" #: templates/p4l/record_view.html:111 templates/p4l/record_view.html.py:154 msgid "Volume" @@ -276,19 +276,19 @@ #: templates/p4l/record_view.html:112 templates/p4l/record_view.html.py:136 #: templates/p4l/record_view.html:181 msgid "Number" -msgstr "Nombre" +msgstr "Numéro" #: templates/p4l/record_view.html:121 msgid "project names" -msgstr "noms de projet" +msgstr "Projets" #: templates/p4l/record_view.html:125 msgid "periodicals" -msgstr "périodiques" +msgstr "Périodique" #: templates/p4l/record_view.html:129 msgid "meetings" -msgstr "réunion" +msgstr "Conférence" #: templates/p4l/record_view.html:137 templates/p4l/record_view.html.py:182 msgid "Place" @@ -300,35 +300,35 @@ #: templates/p4l/record_view.html:147 msgid "series" -msgstr "séries" +msgstr "Collection" #: templates/p4l/record_view.html:162 msgid "authors" -msgstr "auteurs" +msgstr "Auteur(s)" #: templates/p4l/record_view.html:166 msgid "subject persons" -msgstr "personnes sujets" +msgstr "Personnes (sujet)" #: templates/p4l/record_view.html:170 msgid "subject corporate bodies" -msgstr "personne morale sujets" +msgstr "Autres institutions" #: templates/p4l/record_view.html:174 msgid "subject meetings" -msgstr "réunion sujets" +msgstr "Autres conférences" #: templates/p4l/record_view.html:192 msgid "corporate authors" -msgstr "entités auteurs" +msgstr "Institution(s)" #: templates/p4l/record_view.html:196 msgid "corporate author label" -msgstr "Libellé de l'auteur institutionnel" +msgstr "Institution (pour bibliographie)" #: templates/p4l/record_view.html:200 msgid "Urls" -msgstr "Urls" +msgstr "Texte intégral" #: templates/p4l/record_view.html:206 msgid "Address" @@ -340,23 +340,23 @@ #: templates/p4l/record_view.html:215 msgid "record type" -msgstr "type de notice" +msgstr "Type de notice" #: templates/p4l/record_view.html:219 msgid "audiences" -msgstr "audiences" +msgstr "Audience" #: templates/p4l/record_view.html:223 msgid "is document part" -msgstr "document partiel" +msgstr "Document partiel" #: templates/p4l/record_view.html:227 msgid "is hidden" -msgstr "caché" +msgstr "Caché" #: templates/p4l/record_view.html:231 msgid "is restricted" -msgstr "restreint" +msgstr "Restreint" #: templates/p4l/translations.html:3 msgid "Add" @@ -388,7 +388,7 @@ #: templates/p4l/translations.html:11 msgid "Add a new organization" -msgstr "Ajouter une nouvelle organisation" +msgstr "Ajouter une nouvelle institution" #: templates/p4l/translations.html:12 msgid "Add a new audience" @@ -420,7 +420,7 @@ #: templates/p4l/translations.html:19 msgid "name" -msgstr "Nom" +msgstr "nom" #: templates/p4l/translations.html:22 msgid "An error occured. Somes datas may be incorrect or incomplete." diff -r e4d53c64f0d0 -r a998cf036d15 src/p4l/settings.py --- a/src/p4l/settings.py Fri Oct 11 13:24:03 2013 +0200 +++ b/src/p4l/settings.py Fri Oct 11 14:34:20 2013 +0200 @@ -268,195 +268,16 @@ } LANGUAGES_LIST = [ +(u"English", "en"), (u"French", "fr"), -(u"English", "en"), -(u"Spanish; Castilian", "es"), -(u"", ""), -(u"Abkhaz", "ab"), -(u"Afar", "aa"), -(u"Afrikaans", "af"), -(u"Akan", "ak"), -(u"Albanian", "sq"), -(u"Amharic", "am"), +(u"Spanish", "es"), +(u"Portuguese", "pt"), (u"Arabic", "ar"), -(u"Aragonese", "an"), -(u"Armenian", "hy"), -(u"Assamese", "as"), -(u"Avaric", "av"), -(u"Avestan", "ae"), -(u"Aymara", "ay"), -(u"Azerbaijani", "az"), -(u"Bambara", "bm"), -(u"Bashkir", "ba"), -(u"Basque", "eu"), -(u"Belarusian", "be"), -(u"Bengali; Bangla", "bn"), -(u"Bihari", "bh"), -(u"Bislama", "bi"), -(u"Bosnian", "bs"), -(u"Breton", "br"), -(u"Bulgarian", "bg"), -(u"Burmese", "my"), -(u"Catalan", "ca"), -(u"Chamorro", "ch"), -(u"Chechen", "ce"), -(u"Chichewa; Chewa; Nyanja", "ny"), -(u"Chinese", "zh"), -(u"Chuvash", "cv"), -(u"Cornish", "kw"), -(u"Corsican", "co"), -(u"Cree", "cr"), -(u"Croatian", "hr"), -(u"Czech", "cs"), -(u"Danish", "da"), -(u"Divehi; Dhivehi; Maldivian;", "dv"), -(u"Dutch", "nl"), -(u"Dzongkha", "dz"), -(u"English", "en"), -(u"Esperanto", "eo"), -(u"Estonian", "et"), -(u"Ewe", "ee"), -(u"Faroese", "fo"), -(u"Fijian", "fj"), -(u"Finnish", "fi"), -(u"French", "fr"), -(u"Fula; Fulah; Pulaar; Pular", "ff"), -(u"Galician", "gl"), -(u"Ganda", "lg"), -(u"Georgian", "ka"), (u"German", "de"), -(u"Greek Modern", "el"), -(u"Guarani", "gn"), -(u"Gujarati", "gu"), -(u"Haitian; Haitian Creole", "ht"), -(u"Hausa", "ha"), -(u"Hebrew", "he"), -(u"Herero", "hz"), -(u"Hindi", "hi"), -(u"Hiri Motu", "ho"), -(u"Hungarian", "hu"), -(u"Icelandic", "is"), -(u"Ido", "io"), -(u"Igbo", "ig"), -(u"Indonesian", "id"), -(u"Interlingua", "ia"), -(u"Interlingue", "ie"), -(u"Inuktitut", "iu"), -(u"Inupiaq", "ik"), -(u"Irish", "ga"), -(u"Italian", "it"), (u"Japanese", "ja"), -(u"Javanese", "jv"), -(u"Kalaallisut; Greenlandic", "kl"), -(u"Kannada", "kn"), -(u"Kanuri", "kr"), -(u"Kashmiri", "ks"), -(u"Kazakh", "kk"), -(u"Khmer", "km"), -(u"Kikuyu; Gikuyu", "ki"), -(u"Kinyarwanda", "rw"), -(u"Kirundi", "rn"), -(u"Komi", "kv"), -(u"Kongo", "kg"), -(u"Korean", "ko"), -(u"Kurdish", "ku"), -(u"Kwanyama; Kuanyama", "kj"), -(u"Kyrgyz", "ky"), -(u"Lao", "lo"), -(u"Latin", "la"), -(u"Latvian", "lv"), -(u"Limburgish; Limburgan; Limburger", "li"), -(u"Lingala", "ln"), -(u"Lithuanian", "lt"), -(u"Luba-Katanga", "lu"), -(u"Luxembourgish; Letzeburgesch", "lb"), -(u"Macedonian", "mk"), -(u"Malagasy", "mg"), -(u"Malay", "ms"), -(u"Malayalam", "ml"), -(u"Maltese", "mt"), -(u"Manx", "gv"), -(u"Marathi", "mr"), -(u"Marshallese", "mh"), -(u"Mongolian", "mn"), -(u"Maori", "mi"), -(u"Nauru", "na"), -(u"Navajo; Navaho", "nv"), -(u"Ndonga", "ng"), -(u"Nepali", "ne"), -(u"North Ndebele", "nd"), -(u"Northern Sami", "se"), -(u"Norwegian", "no"), -(u"Norwegian Bokmal", "nb"), -(u"Norwegian Nynorsk", "nn"), -(u"Nuosu", "ii"), -(u"Occitan", "oc"), -(u"Ojibwe; Ojibwa", "oj"), -(u"Church Slavic; Church Slavonic", "cu"), -(u"Oriya", "or"), -(u"Oromo", "om"), -(u"Ossetian; Ossetic", "os"), -(u"Panjabi; Punjabi", "pa"), -(u"Pashto; Pushto", "ps"), -(u"Persian", "fa"), -(u"Polish", "pl"), -(u"Portuguese", "pt"), -(u"Pali", "pi"), -(u"Quechua", "qu"), -(u"Romanian; Moldavian", "ro"), -(u"Romansh", "rm"), (u"Russian", "ru"), -(u"Samoan", "sm"), -(u"Sango", "sg"), -(u"Sanskrit (Samskrta),sa"), -(u"Sardinian", "sc"), -(u"Scottish Gaelic; Gaelic", "gd"), -(u"Serbian", "sr"), -(u"Shona", "sn"), -(u"Sindhi", "sd"), -(u"Sinhala; Sinhalese", "si"), -(u"Slovak", "sk"), -(u"Slovene", "sl"), -(u"Somali", "so"), -(u"South Azerbaijani", "az"), -(u"South Ndebele", "nr"), -(u"Southern Sotho", "st"), -(u"Spanish; Castilian", "es"), -(u"Sundanese", "su"), -(u"Swahili", "sw"), -(u"Swati", "ss"), -(u"Swedish", "sv"), -(u"Tagalog", "tl"), -(u"Tahitian", "ty"), -(u"Tajik", "tg"), -(u"Tamil", "ta"), -(u"Tatar", "tt"), -(u"Telugu", "te"), -(u"Thai", "th"), -(u"Tibetan", "bo"), -(u"Tigrinya", "ti"), -(u"Tonga", "to"), -(u"Tsonga", "ts"), -(u"Tswana", "tn"), -(u"Turkish", "tr"), -(u"Turkmen", "tk"), -(u"Twi", "tw"), -(u"Ukrainian", "uk"), -(u"Urdu", "ur"), -(u"Uyghur; Uighur", "ug"), -(u"Uzbek", "uz"), -(u"Venda", "ve"), -(u"Vietnamese", "vi"), -(u"Volapuk", "vo"), -(u"Walloon", "wa"), -(u"Welsh", "cy"), -(u"Western Frisian", "fy"), -(u"Wolof", "wo"), -(u"Xhosa", "xh"), -(u"Yiddish", "yi"), -(u"Yoruba", "yo"), -(u"Zhuang; Chuang", "za"), -(u"Zulu", "zu")] +(u"Multilingual", "mul") +]; # cf http://docs.python.org/2/library/subprocess.html#popen-constructor ADMIN_SCRIPT = {} diff -r e4d53c64f0d0 -r a998cf036d15 src/p4l/templates/p4l/record_update_form.html --- a/src/p4l/templates/p4l/record_update_form.html Fri Oct 11 13:24:03 2013 +0200 +++ b/src/p4l/templates/p4l/record_update_form.html Fri Oct 11 14:34:20 2013 +0200 @@ -79,55 +79,11 @@ {{record.identifier}} - {{ 'subjects' | translate}} - - - - {{ 'themes' | translate}} - - - - {{ 'countries' | translate}} - - - - {{ 'notes' | translate}} - - - - {{ 'issns' | translate }} - - - - {{ 'isbns' | translate }} - - - - {{ 'document code' | translate }} - - - - {{ 'language' | translate }} - - - - {{ 'other languages' | translate }} - - - {{ 'titles' | translate }} - {{ 'abstracts' | translate }} - - - {{ 'added titles' | translate }} @@ -138,34 +94,17 @@ object-fields='["title", "lang"]' table="true" size-fields='[7, 2]' label-fields='["Title","Language"]'> - {{ 'edition statement' | translate }} - - - - {{ 'imprints' | translate }} - + {{ 'authors' | translate }} + - {{ 'collations' | translate }} - + {{ 'corporate authors' | translate }} + - {{ 'volume issues' | translate }} - - - - {{ 'project names' | translate }} - - - - {{ 'periodicals' | translate }} - + {{ 'corporate author label' | translate }} + {{ 'meetings' | translate }} @@ -180,9 +119,57 @@ size-fields='[5, 2, 2]' label-fields='["Title","Volume","Language"]'> - {{ 'authors' | translate }} - + {{ 'periodicals' | translate }} + + + + {{ 'volume issues' | translate }} + + + + {{ 'imprints' | translate }} + + + + {{ 'collations' | translate }} + + + + {{ 'language' | translate }} + + + + {{ 'other languages' | translate }} + + + + {{ 'Urls' | translate }} + + + + {{ 'abstracts' | translate }} + + + + {{ 'themes' | translate}} + + + + {{ 'countries' | translate}} + + + + {{ 'subjects' | translate}} + {{ 'subject persons' | translate }} @@ -200,18 +187,31 @@ size-fields='[3, 1, 2, 1, 1, 1]' label-fields='["Label","Number","Place","Date","Year","Language"]' > - {{ 'corporate authors' | translate }} - + {{ 'project names' | translate }} + + + + {{ 'edition statement' | translate }} + + + + {{ 'notes' | translate}} + - {{ 'corporate author label' | translate }} - + {{ 'isbns' | translate }} + - {{ 'Urls' | translate }} - + {{ 'issns' | translate }} + + + + {{ 'document code' | translate }} + {{ 'record type' | translate }} @@ -253,4 +253,4 @@ -{% endblock %} \ No newline at end of file +{% endblock %} diff -r e4d53c64f0d0 -r a998cf036d15 src/p4l/templates/p4l/record_view.html --- a/src/p4l/templates/p4l/record_view.html Fri Oct 11 13:24:03 2013 +0200 +++ b/src/p4l/templates/p4l/record_view.html Fri Oct 11 14:34:20 2013 +0200 @@ -21,54 +21,14 @@ {{ record.uri|default:'' }} - {% trans 'subjects' %} - - - - {% trans 'themes' %} - - - - {% trans 'countries' %} - - - {% trans 'identifier' %} {{ record.identifier }} - {% trans 'notes' %} - {{ record.notes|default:'' }} - - - {% trans 'issns' %} - - - - {% trans 'isbns' %} - - - - {% trans 'document code' %} - - - - {% trans 'language' %} - {% if record.language %}{{ uri_labels | get_item:record.language.uri }} ({{ record.language.uri|default:'' }}){% endif %} - - - {% trans 'other languages' %} - - - {% trans 'titles' %} - {% trans 'abstracts' %} - - - {% trans 'added titles' %} @@ -77,53 +37,16 @@ - {% trans 'edition statement' %} - {{ record.editionStatement|default:'' }} - - - {% trans 'imprints' %} - - - + {% trans 'authors' %} + - {% trans 'collations' %} - + {% trans 'corporate authors' %} + - {% trans 'volume issues' %} - - - - - - {% trans 'project names' %} - - - - {% trans 'periodicals' %} - + {% trans 'corporate author label' %} + {{ record.corporateAuthorLabel|default:'' }} {% trans 'meetings' %} @@ -159,8 +82,84 @@ - {% trans 'authors' %} - + {% trans 'periodicals' %} + + + + {% trans 'volume issues' %} + + + + + + {% trans 'imprints' %} + + + + + + {% trans 'collations' %} + + + + {% trans 'language' %} + {% if record.language %}{{ uri_labels | get_item:record.language.uri }} ({{ record.language.uri|default:'' }}){% endif %} + + + {% trans 'other languages' %} + + + + {% trans 'Urls' %} + + + + + + {% trans 'abstracts' %} + + + + {% trans 'themes' %} + + + + {% trans 'countries' %} + + + + {% trans 'subjects' %} + {% trans 'subject persons' %} @@ -189,27 +188,28 @@ - {% trans 'corporate authors' %} - + {% trans 'project names' %} + - {% trans 'corporate author label' %} - {{ record.corporateAuthorLabel|default:'' }} + {% trans 'edition statement' %} + {{ record.editionStatement|default:'' }} - {% trans 'Urls' %} - - - + {% trans 'notes' %} + {{ record.notes|default:'' }} + + + {% trans 'isbns' %} + + + + {% trans 'issns' %} + + + + {% trans 'document code' %} + {% trans 'record type' %} @@ -237,4 +237,4 @@ {% trans 'Edit the record' %} {% trans 'Delete the record' %} -{% endblock %} \ No newline at end of file +{% endblock %}