diff --git a/bireme/biblioref/forms.py b/bireme/biblioref/forms.py index 99fc680e..ac26f5cd 100644 --- a/bireme/biblioref/forms.py +++ b/bireme/biblioref/forms.py @@ -931,32 +931,6 @@ def save(self, *args, **kwargs): # save object obj.save() - # update DeDup service - if self.document_type == 'Sas': - # for status LLXP and Published use more complete schema of DeDup index - if obj.status == 0 or obj.status == 1: - dedup_schema = 'LILACS_Sas_Seven' - author_list = [au.get('text') for au in obj.individual_author] if obj.individual_author else [] - first_page = obj.pages[0].get('_f', '') if obj.pages else '' - dedup_params = {"ano_publicacao": obj.source.publication_date_normalized[:4], - "numero_fasciculo": obj.source.issue_number, "volume_fasciculo": obj.source.volume_serial, - "titulo_artigo": obj.title[0]['text'], "titulo_revista": obj.source.title_serial, - "autores": '//@//'.join(author_list), "pagina_inicial": first_page} - else: - dedup_schema = 'LILACS_Sas_Five' - dedup_params = {"ano_publicacao": obj.source.publication_date_normalized[:4], - "numero_fasciculo": obj.source.issue_number, "volume_fasciculo": obj.source.volume_serial, - "titulo_artigo": obj.title[0]['text'], "titulo_revista": obj.source.title_serial} - - json_data = json.dumps(dedup_params, ensure_ascii=True) - dedup_headers = {'Content-Type': 'application/json'} - ref_id = "fiadmin-{0}".format(obj.id) - dedup_url = "{0}/{1}/{2}/{3}".format(settings.DEDUP_PUT_URL, 'lilacs_Sas', dedup_schema, ref_id) - try: - dedup_request = requests.post(dedup_url, headers=dedup_headers, data=json_data, timeout=5) - except: - pass - return obj class BiblioRefSourceForm(BiblioRefForm): diff --git a/bireme/biblioref/views.py b/bireme/biblioref/views.py index 05edb6f6..4907640c 100644 --- a/bireme/biblioref/views.py +++ b/bireme/biblioref/views.py @@ -250,6 +250,8 @@ def form_valid(self, form): form.save_m2m() # update solr index form.save() + # update DeDup service + update_dedup_service(self.object) return HttpResponseRedirect(self.get_success_url()) else: @@ -634,3 +636,35 @@ def refs_llxp_for_indexing(current_user): ref_list = ref_list.filter(filter_title_qs) return ref_list + + +# update DeDup service +def update_dedup_service(obj): + if obj.document_type() == 'Sas': + # send multiple DeDup entries with the same ID for each title #728 + for article_title in obj.title: + # for status LLXP and Published use more complete schema of DeDup index + if obj.status == 0 or obj.status == 1: + dedup_schema = 'LILACS_Sas_Seven' + author_list = [au.get('text') for au in obj.individual_author] if obj.individual_author else [] + first_page = obj.pages[0].get('_f', '') if obj.pages else '' + dedup_params = {"ano_publicacao": obj.source.publication_date_normalized[:4], + "numero_fasciculo": obj.source.issue_number, "volume_fasciculo": obj.source.volume_serial, + "titulo_artigo": article_title['text'], "titulo_revista": obj.source.title_serial, + "autores": '//@//'.join(author_list), "pagina_inicial": first_page} + else: + dedup_schema = 'LILACS_Sas_Five' + dedup_params = {"ano_publicacao": obj.source.publication_date_normalized[:4], + "numero_fasciculo": obj.source.issue_number, "volume_fasciculo": obj.source.volume_serial, + "titulo_artigo": article_title['text'], "titulo_revista": obj.source.title_serial} + + json_data = json.dumps(dedup_params, ensure_ascii=True) + dedup_headers = {'Content-Type': 'application/json'} + # send to DeDup FIADMIN ID with title language code. Ex. fiadmin-99999-pt #728 + ref_id = "fiadmin-{0}-{1}".format(obj.id, article_title['_i']) + + dedup_url = "{0}/{1}/{2}/{3}".format(settings.DEDUP_PUT_URL, 'lilacs_Sas', dedup_schema, ref_id) + try: + dedup_request = requests.post(dedup_url, headers=dedup_headers, data=json_data, timeout=5) + except: + pass diff --git a/bireme/events/views.py b/bireme/events/views.py index 22db329f..a9d1f119 100644 --- a/bireme/events/views.py +++ b/bireme/events/views.py @@ -167,8 +167,6 @@ def create_edit_event(request, **kwargs): # update solr index form.save() - # update solr index - form.save_m2m() output['alert'] = _("Event successfully edited.") output['alerttype'] = "alert-success" diff --git a/bireme/locale/es/LC_MESSAGES/django.mo b/bireme/locale/es/LC_MESSAGES/django.mo index e770c22e..7d0d1a27 100644 Binary files a/bireme/locale/es/LC_MESSAGES/django.mo and b/bireme/locale/es/LC_MESSAGES/django.mo differ diff --git a/bireme/locale/es/LC_MESSAGES/django.po b/bireme/locale/es/LC_MESSAGES/django.po index db461a49..a0eef7b0 100644 --- a/bireme/locale/es/LC_MESSAGES/django.po +++ b/bireme/locale/es/LC_MESSAGES/django.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-03-13 12:53-0300\n" -"PO-Revision-Date: 2019-03-13 12:59-0306\n" +"POT-Creation-Date: 2019-03-22 10:03-0300\n" +"PO-Revision-Date: 2019-03-22 10:04-0306\n" "Last-Translator: <>\n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" @@ -235,12 +235,12 @@ msgstr "Nota pública" msgid "Title" msgstr "Título" -#: biblioref/field_definitions.py:587 biblioref/forms.py:329 +#: biblioref/field_definitions.py:587 biblioref/forms.py:328 msgid "Comma abscent" msgstr "Ausencia de coma" -#: biblioref/field_definitions.py:590 biblioref/forms.py:333 -#: biblioref/forms.py:354 +#: biblioref/field_definitions.py:590 biblioref/forms.py:332 +#: biblioref/forms.py:353 msgid "Insert space after comma" msgstr "Poner espacio después de la coma" @@ -419,65 +419,65 @@ msgstr "Tesis/Disertación perteneciente a una Serie Monográfica" msgid "Select document type" msgstr "Seleccione el tipo de registro" -#: biblioref/forms.py:213 +#: biblioref/forms.py:212 #, python-format msgid "Insert space after %s" msgstr "Poner espacio después de %s" -#: biblioref/forms.py:217 +#: biblioref/forms.py:216 #, python-format msgid "Delete space before %s" msgstr "Quitar espacio antes de %s" -#: biblioref/forms.py:230 +#: biblioref/forms.py:229 msgid "Individual Author and Corporate Autor present simultaneous" msgstr "Autor personal y Autor Institucional presentes al mismo tiempo" -#: biblioref/forms.py:233 +#: biblioref/forms.py:232 msgid "Individual Author or Corporate Author mandatory" msgstr "Autor personal o Autor Institucional obligatorio" -#: biblioref/forms.py:247 +#: biblioref/forms.py:246 #, python-format msgid "The % simbol don't separete occurences" msgstr "El símbolo % no separa ocurrencias" -#: biblioref/forms.py:251 biblioref/forms.py:390 +#: biblioref/forms.py:250 biblioref/forms.py:389 msgid "Point at end of field is not allowed" msgstr "No es permitido punto al final del campo" -#: biblioref/forms.py:264 +#: biblioref/forms.py:263 msgid "Volume or issue number mandatory" msgstr "Volumen o Número del fascículo obligatorio" -#: biblioref/forms.py:271 +#: biblioref/forms.py:270 msgid "Required when indexed in LILACS database" msgstr "Requerido cuando se indexa en la base de datos LILACS" -#: biblioref/forms.py:295 biblioref/forms.py:323 biblioref/forms.py:346 +#: biblioref/forms.py:294 biblioref/forms.py:322 biblioref/forms.py:345 #, python-format msgid "Author %s: " msgstr "Autor %s:" -#: biblioref/forms.py:297 biblioref/forms.py:384 +#: biblioref/forms.py:296 biblioref/forms.py:383 msgid "Degree of responsibility incompatible with LILACS" msgstr "Grado de responsabilidade incompatible con LILACS" -#: biblioref/forms.py:317 biblioref/forms.py:455 biblioref/forms.py:531 -#: biblioref/forms.py:539 biblioref/forms.py:552 biblioref/forms.py:590 -#: biblioref/forms.py:608 biblioref/forms.py:628 biblioref/forms.py:656 -#: biblioref/forms.py:672 biblioref/forms.py:767 biblioref/forms.py:778 -#: biblioref/forms.py:796 biblioref/forms.py:834 biblioref/forms.py:849 -#: biblioref/forms.py:859 biblioref/forms.py:999 biblioref/forms.py:1012 -#: biblioref/forms.py:1033 +#: biblioref/forms.py:316 biblioref/forms.py:454 biblioref/forms.py:530 +#: biblioref/forms.py:538 biblioref/forms.py:551 biblioref/forms.py:589 +#: biblioref/forms.py:607 biblioref/forms.py:627 biblioref/forms.py:655 +#: biblioref/forms.py:671 biblioref/forms.py:766 biblioref/forms.py:777 +#: biblioref/forms.py:795 biblioref/forms.py:833 biblioref/forms.py:848 +#: biblioref/forms.py:858 biblioref/forms.py:1009 biblioref/forms.py:1022 +#: biblioref/forms.py:1043 msgid "Mandatory" msgstr "Obligatorio" -#: biblioref/forms.py:325 +#: biblioref/forms.py:324 msgid "Thesis's author anonymous" msgstr "Autor de la tesis anónimo" -#: biblioref/forms.py:337 +#: biblioref/forms.py:336 msgid "" "Affiliation information in Thesis/Dissertation must be provide at " "'Institution to which it is submitted' field" @@ -485,27 +485,27 @@ msgstr "" "Información de afiliación en Tesis/Disertación debe ser llenada en el campo " "'Institución a la cual se presenta\"" -#: biblioref/forms.py:349 +#: biblioref/forms.py:348 msgid "Comma absense or error in the word Anon" msgstr "Ausencia de coma o error en la digitación de Anon" -#: biblioref/forms.py:358 +#: biblioref/forms.py:357 msgid "Insert space after point" msgstr "Inserte espacio después del punto" -#: biblioref/forms.py:362 +#: biblioref/forms.py:361 msgid "Invalid abbreviation input Junior and/or Filho" msgstr "Abreviatura inválida digite Junior y/o Filho" -#: biblioref/forms.py:367 +#: biblioref/forms.py:366 msgid "Affiliation institution level 1 mandatory" msgstr "Institución de afiliación nivel 1 obligatoria " -#: biblioref/forms.py:372 +#: biblioref/forms.py:371 msgid "Affiliation country mandatory" msgstr "País de afiliación obligatório" -#: biblioref/forms.py:378 +#: biblioref/forms.py:377 msgid "" "For absent or s.af affiliation do not describe the others affiliation " "atributes" @@ -513,41 +513,41 @@ msgstr "" "Para afiliación ausente o s.af, no describir los demás atributos de " "afiliación" -#: biblioref/forms.py:391 +#: biblioref/forms.py:390 #, python-format msgid " at subfield %s " msgstr "en el subcampo %s" -#: biblioref/forms.py:421 biblioref/forms.py:731 +#: biblioref/forms.py:420 biblioref/forms.py:730 #, python-format msgid "item %s: " msgstr "item %s:" -#: biblioref/forms.py:424 +#: biblioref/forms.py:423 msgid "File extension attribute is mandatory" msgstr "Atributo extensión del archivo es obligatório" -#: biblioref/forms.py:429 +#: biblioref/forms.py:428 msgid "File type attribute is mandatory" msgstr "Atributo de tipo del archivo es obligatorio" -#: biblioref/forms.py:434 biblioref/forms.py:561 biblioref/forms.py:584 -#: biblioref/forms.py:650 biblioref/forms.py:839 +#: biblioref/forms.py:433 biblioref/forms.py:560 biblioref/forms.py:583 +#: biblioref/forms.py:649 biblioref/forms.py:838 msgid "Language incompatible with LILACS" msgstr "Idioma incompatible con LILACS" -#: biblioref/forms.py:441 +#: biblioref/forms.py:440 msgid "URL duplicated" msgstr "Enlace duplicado" -#: biblioref/forms.py:458 +#: biblioref/forms.py:457 msgid "" "Printed music in the Record Type is incompatible with the LILACS Methodology" msgstr "" "Música impresa en el Tipo de Registro es incompatible con la metodología " "LILACS" -#: biblioref/forms.py:460 +#: biblioref/forms.py:459 msgid "" "Manuscript music in the Record Type is incompatible with the LILACS " "Methodology" @@ -555,7 +555,7 @@ msgstr "" "Manuscrito de música en el campo Tipo de Registro es incompatible com la " "metodología LILACS" -#: biblioref/forms.py:462 +#: biblioref/forms.py:461 msgid "" "Printed cartographic material in the Record Type is incompatible with the " "LILACS Methodology" @@ -563,7 +563,7 @@ msgstr "" "Material cartográfico en el campo Tipo de Registro es incompatible con la " "metodologia LILACS" -#: biblioref/forms.py:464 +#: biblioref/forms.py:463 msgid "" "Manuscript cartographic material in the Record Type is incompatible with the" " LILACS Methodology" @@ -571,7 +571,7 @@ msgstr "" "Manuscritos de música en el campo Tipo de Registro es incompatible con la " "metodologia LILACS" -#: biblioref/forms.py:466 +#: biblioref/forms.py:465 msgid "" "Musical sound recording in the Record Type is incompatible with the LILACS " "Methodology" @@ -579,7 +579,7 @@ msgstr "" "Registros musicales en el campo Tipo de Registro es incompatible con la " "metodologia LILACS" -#: biblioref/forms.py:468 +#: biblioref/forms.py:467 msgid "" "Two-dimensional nonprojectable graphic in the Record Type is incompatible " "with the LILACS Methodology" @@ -587,19 +587,19 @@ msgstr "" "Gráficos bidimensionales no proyectables en el campo Tipo de Registro es " "incompatible con la metodologia LILACS" -#: biblioref/forms.py:470 +#: biblioref/forms.py:469 msgid "" "Computer file in the Record Type is incompatible with the LILACS Methodology" msgstr "" "Archivo de computador en el campo Tipo de Registro es incompatible con la " "metodología LILACS" -#: biblioref/forms.py:472 +#: biblioref/forms.py:471 msgid "Kit in the Record Type is incompatible with the LILACS Methodology" msgstr "" "Kit en el campo Tipo de Registro es incompatible con la metodologia LILACS" -#: biblioref/forms.py:474 +#: biblioref/forms.py:473 msgid "" "Mixed material in the Record Type is incompatible with the LILACS " "Methodology" @@ -607,7 +607,7 @@ msgstr "" "Material mixto en el campo Tipo de Registro es incompatible con la " "metodologia LILACS" -#: biblioref/forms.py:476 +#: biblioref/forms.py:475 msgid "" "Three-dimensional artifact or naturally occurring object in the Record Type " "is incompatible with the LILACS Methodology" @@ -615,7 +615,7 @@ msgstr "" "Material tridimensional, artefacto, objeto en el campo Tipo de Registro es " "incompatible con la metodologia LILACS" -#: biblioref/forms.py:478 +#: biblioref/forms.py:477 msgid "" "Manuscript language material in the Record Type is incompatible with the " "LILACS Methodology" @@ -623,7 +623,7 @@ msgstr "" "Manuscritos de música en el campo Tipo de Registro es incompatible con la " "metodologia LILACS" -#: biblioref/forms.py:497 +#: biblioref/forms.py:496 msgid "" "For the tradicional material of LILACS which is only in electronic form you " "should describe it as Electronic" @@ -631,22 +631,22 @@ msgstr "" "Para el material tradicional de LILACS que se encuentren solamente en " "formato electrónico debese llenarlo con la opción Electrónico" -#: biblioref/forms.py:501 +#: biblioref/forms.py:500 msgid "For articles, item form must be empty or Eletronic" msgstr "Para artículos, el campo forma del item debe ser vacío o electrónico" -#: biblioref/forms.py:513 +#: biblioref/forms.py:512 msgid "" "For articles indexed in LILACS, type of journal must be Journal or Separatum" msgstr "" "Para artículos indizados en LILACS, el campo Tipo de Periódico debe ser " "llenado con Revista o Separata" -#: biblioref/forms.py:525 +#: biblioref/forms.py:524 msgid "For LILACS references is mandatory select a journal from the list" msgstr "Para registros LILACS es obligatorio seleccionar una revista da lista" -#: biblioref/forms.py:528 +#: biblioref/forms.py:527 msgid "" "Please choose one journal from the list or use blank to inform other journal" " title" @@ -654,20 +654,20 @@ msgstr "" "Por favor elija una revista da lista o use la opción vacia para informar un " "otro título de revista" -#: biblioref/forms.py:558 biblioref/forms.py:581 biblioref/forms.py:647 +#: biblioref/forms.py:557 biblioref/forms.py:580 biblioref/forms.py:646 #, python-format msgid "Title %s: " msgstr "Título %s:" -#: biblioref/forms.py:611 biblioref/forms.py:631 +#: biblioref/forms.py:610 biblioref/forms.py:630 msgid "Invalid fill. Don't translate title in English" msgstr "Llenado inválido. No se traduz titulo en Inglés" -#: biblioref/forms.py:669 +#: biblioref/forms.py:668 msgid "Date without year" msgstr "Fecha sin año" -#: biblioref/forms.py:686 +#: biblioref/forms.py:685 msgid "" "Entering information in this field is conditional to filling out publication" " date field" @@ -675,50 +675,50 @@ msgstr "" "El registro de información en este campo es condicional a llenar el campo de" " fecha de publicación" -#: biblioref/forms.py:689 biblioref/forms.py:1015 +#: biblioref/forms.py:688 biblioref/forms.py:1025 msgid "Different of 8 characters" msgstr "No contiene 8 dígitos" -#: biblioref/forms.py:692 +#: biblioref/forms.py:691 msgid "Incompatible with LILACS" msgstr "Incompatible con LILACS" -#: biblioref/forms.py:700 +#: biblioref/forms.py:699 #, python-format msgid "Normalized date year must be '%s'" msgstr "Año de la fecha normalizada debe ser '%s'" -#: biblioref/forms.py:706 +#: biblioref/forms.py:705 #, python-format msgid "Error in the date, use: %s" msgstr "Error en la fecha, utilize: %s" -#: biblioref/forms.py:710 biblioref/forms.py:1022 +#: biblioref/forms.py:709 biblioref/forms.py:1032 #, python-format msgid "Leave blank, publication date = %s" msgstr "Deje en blanco, fecha de publicación = %s" -#: biblioref/forms.py:722 +#: biblioref/forms.py:721 msgid "Do not have more than 4 occurrences, use passim" msgstr "No puede tener mas que 4 ocurrencias, usar passim" -#: biblioref/forms.py:734 +#: biblioref/forms.py:733 msgid "If the attribute first is passim, the attribute last should be empty" msgstr "Si el atributo inicio es Passim, el atributo final debe ser vacío" -#: biblioref/forms.py:739 +#: biblioref/forms.py:738 msgid "Attribute last is missing" msgstr "Atributo último no fue informado" -#: biblioref/forms.py:744 +#: biblioref/forms.py:743 msgid "Attribute first is missing" msgstr "Atributo primero no fue informado" -#: biblioref/forms.py:749 +#: biblioref/forms.py:748 msgid "Square brackets are missing [ ]" msgstr "Hace falta los corchetes [ ] " -#: biblioref/forms.py:754 +#: biblioref/forms.py:753 msgid "" "When the electronic location attribute is informed the others attributes " "should be empty" @@ -726,11 +726,11 @@ msgstr "" "Cuando se informó el atributo de la localización electrónica los otros " "atributos deben ser vacíos" -#: biblioref/forms.py:786 biblioref/forms.py:812 +#: biblioref/forms.py:785 biblioref/forms.py:811 msgid "LILACS incompatible" msgstr "Incompatible con LILACS" -#: biblioref/forms.py:807 +#: biblioref/forms.py:806 msgid "" "Entering information in this field is conditional to filling out publication" " city field" @@ -738,19 +738,19 @@ msgstr "" "El registro de información en este campo es condicional a llenar el campo de" " la ciudad de publicación" -#: biblioref/forms.py:822 +#: biblioref/forms.py:821 msgid "Maximum number of characteres = 9" msgstr "Número máximo de caracteres = 9" -#: biblioref/forms.py:986 +#: biblioref/forms.py:996 msgid "Event name mandatory" msgstr "Nombre del evento es obligatório" -#: biblioref/forms.py:989 +#: biblioref/forms.py:999 msgid "Project name OR Project number mandatory" msgstr "Nombre del proyecto O Número del proyecto obligatorio" -#: biblioref/forms.py:1019 +#: biblioref/forms.py:1029 msgid "Error in the date" msgstr "Error en la fecha" @@ -1275,7 +1275,7 @@ msgstr "datos" #: classification/models.py:27 classification/models.py:66 #: classification/models.py:82 leisref/models.py:449 multimedia/models.py:67 #: multimedia/models.py:80 multimedia/models.py:102 -#: templates/biblioref/referenceanalytic_form.html:223 +#: templates/biblioref/referenceanalytic_form.html:224 #: templates/biblioref/referencesource_form.html:130 #: templates/classification/classify.html:26 #: templates/main/edit-resource.html:126 @@ -2864,8 +2864,8 @@ msgstr "Seleccione por búsqueda" #: templates/biblioref/fieldset_indexing.html:70 #: templates/biblioref/reference_confirm_delete.html:29 -#: templates/biblioref/referenceanalytic_form.html:456 -#: templates/biblioref/referenceanalytic_form.html:508 +#: templates/biblioref/referenceanalytic_form.html:457 +#: templates/biblioref/referenceanalytic_form.html:509 #: templates/biblioref/referencesource_form.html:382 #: templates/delete_confirm.html:17 #: templates/institution/institution_confirm_delete.html:29 @@ -2892,8 +2892,7 @@ msgstr "Seleccione por búsqueda" msgid "Yes" msgstr "Sí" -#: templates/biblioref/fieldset_indexing.html:82 -#| msgid "List of descriptors identified in the abstract" +#: templates/biblioref/fieldset_indexing.html:83 msgid "descriptores from abstract" msgstr "descriptores del resumen" @@ -2908,7 +2907,7 @@ msgid "Record" msgstr "Registro" #: templates/biblioref/reference_confirm_delete.html:27 -#: templates/biblioref/referenceanalytic_form.html:449 +#: templates/biblioref/referenceanalytic_form.html:450 #: templates/delete_confirm.html:9 #: templates/institution/institution_confirm_delete.html:27 #: templates/leisref/act_confirm_delete.html:27 @@ -2923,8 +2922,8 @@ msgid "Are you sure you want to delete?" msgstr "¿Está seguro que desea borrar?" #: templates/biblioref/reference_confirm_delete.html:28 -#: templates/biblioref/referenceanalytic_form.html:457 -#: templates/biblioref/referenceanalytic_form.html:509 +#: templates/biblioref/referenceanalytic_form.html:458 +#: templates/biblioref/referenceanalytic_form.html:510 #: templates/biblioref/referencesource_form.html:383 #: templates/delete_confirm.html:16 #: templates/institution/institution_confirm_delete.html:28 @@ -3030,7 +3029,7 @@ msgstr "Medio creado en" #: templates/biblioref/reference_form.html:121 #: templates/biblioref/reference_form.html:124 #: templates/biblioref/referenceanalytic_form.html:211 -#: templates/biblioref/referenceanalytic_form.html:217 +#: templates/biblioref/referenceanalytic_form.html:218 #: templates/biblioref/referencesource_form.html:121 #: templates/biblioref/referencesource_form.html:124 #: templates/events/edit-event.html:133 templates/events/edit-event.html:136 @@ -3057,7 +3056,7 @@ msgid "Cooperative center code" msgstr "Código del centro cooperante" #: templates/biblioref/reference_form.html:124 -#: templates/biblioref/referenceanalytic_form.html:217 +#: templates/biblioref/referenceanalytic_form.html:218 #: templates/biblioref/referencesource_form.html:124 #: templates/events/edit-event.html:136 #: templates/institution/institution_form.html:164 @@ -3084,7 +3083,7 @@ msgid "Suggested" msgstr "Sugerido" #: templates/biblioref/reference_form.html:396 -#: templates/biblioref/referenceanalytic_form.html:379 +#: templates/biblioref/referenceanalytic_form.html:380 #: templates/biblioref/referencesource_form.html:268 #: templates/events/edit-event.html:415 templates/leisref/act_form.html:340 #: templates/main/edit-resource.html:417 @@ -3096,8 +3095,8 @@ msgstr "Añadir descriptor" #: templates/biblioref/reference_form.html:397 #: templates/biblioref/reference_form.html:407 #: templates/biblioref/reference_form.html:417 -#: templates/biblioref/referenceanalytic_form.html:380 -#: templates/biblioref/referenceanalytic_form.html:390 +#: templates/biblioref/referenceanalytic_form.html:381 +#: templates/biblioref/referenceanalytic_form.html:391 #: templates/biblioref/referencesource_form.html:269 #: templates/biblioref/referencesource_form.html:279 #: templates/biblioref/referencesource_form.html:289 @@ -3419,7 +3418,7 @@ msgstr "Registro creado en" msgid "Indexer cooperative center code" msgstr "Código del centro indizador" -#: templates/biblioref/referenceanalytic_form.html:221 +#: templates/biblioref/referenceanalytic_form.html:222 #: templates/biblioref/referencesource_form.html:128 #: templates/institution/institution_form.html:168 #: templates/main/edit-resource.html:124 templates/modal_log.html:6 @@ -3430,36 +3429,36 @@ msgstr "Código del centro indizador" msgid "Changes history" msgstr "Historia de cambios" -#: templates/biblioref/referenceanalytic_form.html:226 +#: templates/biblioref/referenceanalytic_form.html:227 #: templates/biblioref/referencesource_form.html:133 #: templates/title/title_form.html:132 msgid "Duplicates" msgstr "Duplicados" -#: templates/biblioref/referenceanalytic_form.html:250 +#: templates/biblioref/referenceanalytic_form.html:251 #: templates/biblioref/referencesource_form.html:163 #: templates/institution/institution_form.html:236 #: templates/leisref/act_form.html:305 templates/oer/oer_form.html:277 msgid "Save Draft" msgstr "Guardar Borrador" -#: templates/biblioref/referenceanalytic_form.html:252 +#: templates/biblioref/referenceanalytic_form.html:253 #: templates/biblioref/referencesource_form.html:165 #: templates/institution/institution_form.html:238 #: templates/leisref/act_form.html:307 templates/oer/oer_form.html:279 msgid "Save as" msgstr "Guardar como" -#: templates/biblioref/referenceanalytic_form.html:258 +#: templates/biblioref/referenceanalytic_form.html:259 msgid "Save as LILACS-Express" msgstr "Guardar como LILACS-Express" -#: templates/biblioref/referenceanalytic_form.html:260 +#: templates/biblioref/referenceanalytic_form.html:261 msgid "Publish as LILACS-Express" msgstr "Publicar como LILACS-Express" -#: templates/biblioref/referenceanalytic_form.html:263 -#: templates/biblioref/referenceanalytic_form.html:267 +#: templates/biblioref/referenceanalytic_form.html:264 +#: templates/biblioref/referenceanalytic_form.html:268 #: templates/biblioref/referencesource_form.html:169 #: templates/biblioref/referencesource_form.html:173 #: templates/institution/institution_form.html:242 @@ -3467,7 +3466,7 @@ msgstr "Publicar como LILACS-Express" msgid "Publish" msgstr "Publicar" -#: templates/biblioref/referenceanalytic_form.html:272 +#: templates/biblioref/referenceanalytic_form.html:273 #: templates/biblioref/referencesource_form.html:177 #: templates/institution/institution_form.html:246 #: templates/leisref/act_form.html:315 templates/oer/oer_form.html:287 @@ -3475,12 +3474,12 @@ msgstr "Publicar" msgid "Back" msgstr "Volver" -#: templates/biblioref/referenceanalytic_form.html:389 +#: templates/biblioref/referenceanalytic_form.html:390 #: templates/biblioref/referencesource_form.html:278 msgid "Add file" msgstr "Añadir archivo" -#: templates/biblioref/referenceanalytic_form.html:499 +#: templates/biblioref/referenceanalytic_form.html:500 #: templates/biblioref/referencesource_form.html:373 msgid "" "After publication the record can only be modified by a user with editor " @@ -5803,8 +5802,8 @@ msgid "Editor code" msgstr "Codigo del editor" #: templates/utils/decs_suggestion.html:26 -msgid "DeCS" -msgstr "Geog DeCS" +msgid "Abstract DeCS subjects" +msgstr "Asuntos DeCS del resumen" #: templates/utils/decs_suggestion.html:37 msgid "List of descriptors identified in the abstract" @@ -6747,6 +6746,9 @@ msgstr "Registro creado" msgid "Year must be greater than 1900" msgstr "El año debe ser mayor que 1900" +#~ msgid "DeCS" +#~ msgstr "Geog DeCS" + #~ msgid "see descriptores suggestions" #~ msgstr "Descriptores" diff --git a/bireme/locale/pt_BR/LC_MESSAGES/django.mo b/bireme/locale/pt_BR/LC_MESSAGES/django.mo index c49a8d72..0b8cd473 100644 Binary files a/bireme/locale/pt_BR/LC_MESSAGES/django.mo and b/bireme/locale/pt_BR/LC_MESSAGES/django.mo differ diff --git a/bireme/locale/pt_BR/LC_MESSAGES/django.po b/bireme/locale/pt_BR/LC_MESSAGES/django.po index 97224cc4..fd89ba4e 100644 --- a/bireme/locale/pt_BR/LC_MESSAGES/django.po +++ b/bireme/locale/pt_BR/LC_MESSAGES/django.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-03-13 12:53-0300\n" -"PO-Revision-Date: 2019-03-13 12:58-0306\n" +"POT-Creation-Date: 2019-03-22 10:03-0300\n" +"PO-Revision-Date: 2019-03-22 10:04-0306\n" "Last-Translator: <>\n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" @@ -235,12 +235,12 @@ msgstr "Nota pública" msgid "Title" msgstr "Título" -#: biblioref/field_definitions.py:587 biblioref/forms.py:329 +#: biblioref/field_definitions.py:587 biblioref/forms.py:328 msgid "Comma abscent" msgstr "Ausência de vírgula" -#: biblioref/field_definitions.py:590 biblioref/forms.py:333 -#: biblioref/forms.py:354 +#: biblioref/field_definitions.py:590 biblioref/forms.py:332 +#: biblioref/forms.py:353 msgid "Insert space after comma" msgstr "Adicionar espaço depois da vírgula" @@ -419,65 +419,65 @@ msgstr "Tese/Dissertação pertencente a uma Série Monográfica" msgid "Select document type" msgstr "Selecione o tipo do documento" -#: biblioref/forms.py:213 +#: biblioref/forms.py:212 #, python-format msgid "Insert space after %s" msgstr "Adicionar espaço depois de %s" -#: biblioref/forms.py:217 +#: biblioref/forms.py:216 #, python-format msgid "Delete space before %s" msgstr "Apagar espaço antes de %s" -#: biblioref/forms.py:230 +#: biblioref/forms.py:229 msgid "Individual Author and Corporate Autor present simultaneous" msgstr "Autor Pessoal e Autor Institucional presentes ao mesmo tempo" -#: biblioref/forms.py:233 +#: biblioref/forms.py:232 msgid "Individual Author or Corporate Author mandatory" msgstr "Autor Pessoal ou Autor Institucional obrigatório" -#: biblioref/forms.py:247 +#: biblioref/forms.py:246 #, python-format msgid "The % simbol don't separete occurences" msgstr "O símbolo % não separa ocorrências" -#: biblioref/forms.py:251 biblioref/forms.py:390 +#: biblioref/forms.py:250 biblioref/forms.py:389 msgid "Point at end of field is not allowed" msgstr "Não é permitido ponto no final do campo" -#: biblioref/forms.py:264 +#: biblioref/forms.py:263 msgid "Volume or issue number mandatory" msgstr "Volume ou número da edição obrigatório" -#: biblioref/forms.py:271 +#: biblioref/forms.py:270 msgid "Required when indexed in LILACS database" msgstr "Obrigatório quando indexado na base de dados LILACS" -#: biblioref/forms.py:295 biblioref/forms.py:323 biblioref/forms.py:346 +#: biblioref/forms.py:294 biblioref/forms.py:322 biblioref/forms.py:345 #, python-format msgid "Author %s: " msgstr "Autor %s:" -#: biblioref/forms.py:297 biblioref/forms.py:384 +#: biblioref/forms.py:296 biblioref/forms.py:383 msgid "Degree of responsibility incompatible with LILACS" msgstr "Grau de responsabilidade incompatível com LILACS" -#: biblioref/forms.py:317 biblioref/forms.py:455 biblioref/forms.py:531 -#: biblioref/forms.py:539 biblioref/forms.py:552 biblioref/forms.py:590 -#: biblioref/forms.py:608 biblioref/forms.py:628 biblioref/forms.py:656 -#: biblioref/forms.py:672 biblioref/forms.py:767 biblioref/forms.py:778 -#: biblioref/forms.py:796 biblioref/forms.py:834 biblioref/forms.py:849 -#: biblioref/forms.py:859 biblioref/forms.py:999 biblioref/forms.py:1012 -#: biblioref/forms.py:1033 +#: biblioref/forms.py:316 biblioref/forms.py:454 biblioref/forms.py:530 +#: biblioref/forms.py:538 biblioref/forms.py:551 biblioref/forms.py:589 +#: biblioref/forms.py:607 biblioref/forms.py:627 biblioref/forms.py:655 +#: biblioref/forms.py:671 biblioref/forms.py:766 biblioref/forms.py:777 +#: biblioref/forms.py:795 biblioref/forms.py:833 biblioref/forms.py:848 +#: biblioref/forms.py:858 biblioref/forms.py:1009 biblioref/forms.py:1022 +#: biblioref/forms.py:1043 msgid "Mandatory" msgstr "Obrigatório" -#: biblioref/forms.py:325 +#: biblioref/forms.py:324 msgid "Thesis's author anonymous" msgstr "Autor de tese anônimo" -#: biblioref/forms.py:337 +#: biblioref/forms.py:336 msgid "" "Affiliation information in Thesis/Dissertation must be provide at " "'Institution to which it is submitted' field" @@ -485,27 +485,27 @@ msgstr "" "Informação de afiliação em Tese/Dissertação deve ser informada no campo " "'Instituição a qual se apresenta'" -#: biblioref/forms.py:349 +#: biblioref/forms.py:348 msgid "Comma absense or error in the word Anon" msgstr "Ausência de vírgula ou erro na digitação de Anon" -#: biblioref/forms.py:358 +#: biblioref/forms.py:357 msgid "Insert space after point" msgstr "Insira espaço após a virgula" -#: biblioref/forms.py:362 +#: biblioref/forms.py:361 msgid "Invalid abbreviation input Junior and/or Filho" msgstr "Abreviação inválida Junior e/ou Filho" -#: biblioref/forms.py:367 +#: biblioref/forms.py:366 msgid "Affiliation institution level 1 mandatory" msgstr "Instituição nível 1 da afiliação obrigatório" -#: biblioref/forms.py:372 +#: biblioref/forms.py:371 msgid "Affiliation country mandatory" msgstr "País de afiliação obrigatório" -#: biblioref/forms.py:378 +#: biblioref/forms.py:377 msgid "" "For absent or s.af affiliation do not describe the others affiliation " "atributes" @@ -513,40 +513,40 @@ msgstr "" "Para afiliação ausente OU s.af não descreva os outros atributos da " "afiliação" -#: biblioref/forms.py:391 +#: biblioref/forms.py:390 #, python-format msgid " at subfield %s " msgstr "no subcampo %s" -#: biblioref/forms.py:421 biblioref/forms.py:731 +#: biblioref/forms.py:420 biblioref/forms.py:730 #, python-format msgid "item %s: " msgstr "Item %s:" -#: biblioref/forms.py:424 +#: biblioref/forms.py:423 msgid "File extension attribute is mandatory" msgstr "Atributo de extensão do arquivo é obrigatório" -#: biblioref/forms.py:429 +#: biblioref/forms.py:428 msgid "File type attribute is mandatory" msgstr "Atributo de tipo de arquivo é obrigatório" -#: biblioref/forms.py:434 biblioref/forms.py:561 biblioref/forms.py:584 -#: biblioref/forms.py:650 biblioref/forms.py:839 +#: biblioref/forms.py:433 biblioref/forms.py:560 biblioref/forms.py:583 +#: biblioref/forms.py:649 biblioref/forms.py:838 msgid "Language incompatible with LILACS" msgstr "Idioma incompatível com LILACS" -#: biblioref/forms.py:441 +#: biblioref/forms.py:440 msgid "URL duplicated" msgstr "URL duplicada" -#: biblioref/forms.py:458 +#: biblioref/forms.py:457 msgid "" "Printed music in the Record Type is incompatible with the LILACS Methodology" msgstr "" "Música Impressa no Tipo de Registro é incompatível com a Metodologia LILACS" -#: biblioref/forms.py:460 +#: biblioref/forms.py:459 msgid "" "Manuscript music in the Record Type is incompatible with the LILACS " "Methodology" @@ -554,7 +554,7 @@ msgstr "" "Manuscritos de música no Tipo de Registro é incompatível com a Metodologia " "LILACS" -#: biblioref/forms.py:462 +#: biblioref/forms.py:461 msgid "" "Printed cartographic material in the Record Type is incompatible with the " "LILACS Methodology" @@ -562,7 +562,7 @@ msgstr "" "Material Cartográfico no Tipo de Registro é incompatível com a Metodologia " "LILACS" -#: biblioref/forms.py:464 +#: biblioref/forms.py:463 msgid "" "Manuscript cartographic material in the Record Type is incompatible with the" " LILACS Methodology" @@ -570,7 +570,7 @@ msgstr "" "Manuscritos de Material Cartográfico no Tipo de Registro é incompatível com " "a Metodologia LILACS" -#: biblioref/forms.py:466 +#: biblioref/forms.py:465 msgid "" "Musical sound recording in the Record Type is incompatible with the LILACS " "Methodology" @@ -578,7 +578,7 @@ msgstr "" "Registros musicais no Tipo de Registro é incompatível com a Metodologia " "LILACS" -#: biblioref/forms.py:468 +#: biblioref/forms.py:467 msgid "" "Two-dimensional nonprojectable graphic in the Record Type is incompatible " "with the LILACS Methodology" @@ -586,25 +586,25 @@ msgstr "" "Gráficos bi-dimensionais não projetáveis no Tipo de Registro é incompatível " "com a Metodologia LILACS" -#: biblioref/forms.py:470 +#: biblioref/forms.py:469 msgid "" "Computer file in the Record Type is incompatible with the LILACS Methodology" msgstr "" "Arquivo de computador no Tipo de Registro é incompatível com a Metodologia " "LILACS" -#: biblioref/forms.py:472 +#: biblioref/forms.py:471 msgid "Kit in the Record Type is incompatible with the LILACS Methodology" msgstr "Kit no Tipo de Registro é incompatível com a Metodologia LILACS" -#: biblioref/forms.py:474 +#: biblioref/forms.py:473 msgid "" "Mixed material in the Record Type is incompatible with the LILACS " "Methodology" msgstr "" "Material misto no Tipo de Registro é incompatível com a Metodologia LILACS" -#: biblioref/forms.py:476 +#: biblioref/forms.py:475 msgid "" "Three-dimensional artifact or naturally occurring object in the Record Type " "is incompatible with the LILACS Methodology" @@ -612,14 +612,14 @@ msgstr "" "Material tridimensional, artefato, objeto no Tipo de Registro é incompatível" " com a Metodologia LILACS" -#: biblioref/forms.py:478 +#: biblioref/forms.py:477 msgid "" "Manuscript language material in the Record Type is incompatible with the " "LILACS Methodology" msgstr "" "Manuscritos no Tipo de Registro é incompatível com a Metodologia LILACS" -#: biblioref/forms.py:497 +#: biblioref/forms.py:496 msgid "" "For the tradicional material of LILACS which is only in electronic form you " "should describe it as Electronic" @@ -627,22 +627,22 @@ msgstr "" "Para material tradicional de LILACS que se encontrem somente em formato " "eletrônico deve-se preenchê-lo com a opção Eletrônico" -#: biblioref/forms.py:501 +#: biblioref/forms.py:500 msgid "For articles, item form must be empty or Eletronic" msgstr "Para artigos, a forma do item deve ser vazio ou Eletrônico" -#: biblioref/forms.py:513 +#: biblioref/forms.py:512 msgid "" "For articles indexed in LILACS, type of journal must be Journal or Separatum" msgstr "" "Para artigos indexados na LILACS, o tipo de periódico deve ser Revistas ou " "Separatas" -#: biblioref/forms.py:525 +#: biblioref/forms.py:524 msgid "For LILACS references is mandatory select a journal from the list" msgstr "Para referências LILACS é obrigatório selecionar uma revista de lista" -#: biblioref/forms.py:528 +#: biblioref/forms.py:527 msgid "" "Please choose one journal from the list or use blank to inform other journal" " title" @@ -650,20 +650,20 @@ msgstr "" "Por favor selecione uma revista da lista ou escolha opção vazia para " "informar um outro título de revista" -#: biblioref/forms.py:558 biblioref/forms.py:581 biblioref/forms.py:647 +#: biblioref/forms.py:557 biblioref/forms.py:580 biblioref/forms.py:646 #, python-format msgid "Title %s: " msgstr "Título %s:" -#: biblioref/forms.py:611 biblioref/forms.py:631 +#: biblioref/forms.py:610 biblioref/forms.py:630 msgid "Invalid fill. Don't translate title in English" msgstr "Preenchimento inválido. Não traduza título em Inglês" -#: biblioref/forms.py:669 +#: biblioref/forms.py:668 msgid "Date without year" msgstr "Data sem ano" -#: biblioref/forms.py:686 +#: biblioref/forms.py:685 msgid "" "Entering information in this field is conditional to filling out publication" " date field" @@ -671,52 +671,52 @@ msgstr "" "O registro de informação neste campo está condicionado ao preenchimento do " "campo data de publicação" -#: biblioref/forms.py:689 biblioref/forms.py:1015 +#: biblioref/forms.py:688 biblioref/forms.py:1025 msgid "Different of 8 characters" msgstr "Não contem 8 dígitos" -#: biblioref/forms.py:692 +#: biblioref/forms.py:691 msgid "Incompatible with LILACS" msgstr "Incompatível com LILACS" -#: biblioref/forms.py:700 +#: biblioref/forms.py:699 #, python-format msgid "Normalized date year must be '%s'" msgstr "Ano da data normalizada deve ser: '%s'" -#: biblioref/forms.py:706 +#: biblioref/forms.py:705 #, python-format msgid "Error in the date, use: %s" msgstr "Erro na data, use: %s" -#: biblioref/forms.py:710 biblioref/forms.py:1022 +#: biblioref/forms.py:709 biblioref/forms.py:1032 #, python-format msgid "Leave blank, publication date = %s" msgstr "Deixe em branco, data de publicação = %s" -#: biblioref/forms.py:722 +#: biblioref/forms.py:721 msgid "Do not have more than 4 occurrences, use passim" msgstr "Mais que 4 ocorrências não permitido, use passim" -#: biblioref/forms.py:734 +#: biblioref/forms.py:733 msgid "If the attribute first is passim, the attribute last should be empty" msgstr "" "Se o atributo número inicial é passim, o atributo número final precisa ser " "vazio" -#: biblioref/forms.py:739 +#: biblioref/forms.py:738 msgid "Attribute last is missing" msgstr "Atributo número final não presente" -#: biblioref/forms.py:744 +#: biblioref/forms.py:743 msgid "Attribute first is missing" msgstr "Atributo número inicial não presente" -#: biblioref/forms.py:749 +#: biblioref/forms.py:748 msgid "Square brackets are missing [ ]" msgstr "Colchetes não presentes" -#: biblioref/forms.py:754 +#: biblioref/forms.py:753 msgid "" "When the electronic location attribute is informed the others attributes " "should be empty" @@ -724,11 +724,11 @@ msgstr "" "Quando o atributo de localização eletrônica é informado os outros atributos " "devem ser vazios" -#: biblioref/forms.py:786 biblioref/forms.py:812 +#: biblioref/forms.py:785 biblioref/forms.py:811 msgid "LILACS incompatible" msgstr "Incompatível com a LILACS" -#: biblioref/forms.py:807 +#: biblioref/forms.py:806 msgid "" "Entering information in this field is conditional to filling out publication" " city field" @@ -736,19 +736,19 @@ msgstr "" "O preenchimento de informação neste campo está condicionado ao preenchimento" " do campo cidade de publicação" -#: biblioref/forms.py:822 +#: biblioref/forms.py:821 msgid "Maximum number of characteres = 9" msgstr "Número máximo de caracteres = 9" -#: biblioref/forms.py:986 +#: biblioref/forms.py:996 msgid "Event name mandatory" msgstr "Nome do evento obrigatório" -#: biblioref/forms.py:989 +#: biblioref/forms.py:999 msgid "Project name OR Project number mandatory" msgstr "Nome do Projeto ou Número do Projeto obrigatório" -#: biblioref/forms.py:1019 +#: biblioref/forms.py:1029 msgid "Error in the date" msgstr "Erro na data" @@ -1273,7 +1273,7 @@ msgstr "dados" #: classification/models.py:27 classification/models.py:66 #: classification/models.py:82 leisref/models.py:449 multimedia/models.py:67 #: multimedia/models.py:80 multimedia/models.py:102 -#: templates/biblioref/referenceanalytic_form.html:223 +#: templates/biblioref/referenceanalytic_form.html:224 #: templates/biblioref/referencesource_form.html:130 #: templates/classification/classify.html:26 #: templates/main/edit-resource.html:126 @@ -2856,8 +2856,8 @@ msgstr "Selecione pela pesquisa" #: templates/biblioref/fieldset_indexing.html:70 #: templates/biblioref/reference_confirm_delete.html:29 -#: templates/biblioref/referenceanalytic_form.html:456 -#: templates/biblioref/referenceanalytic_form.html:508 +#: templates/biblioref/referenceanalytic_form.html:457 +#: templates/biblioref/referenceanalytic_form.html:509 #: templates/biblioref/referencesource_form.html:382 #: templates/delete_confirm.html:17 #: templates/institution/institution_confirm_delete.html:29 @@ -2884,8 +2884,7 @@ msgstr "Selecione pela pesquisa" msgid "Yes" msgstr "Sim" -#: templates/biblioref/fieldset_indexing.html:82 -#| msgid "List of descriptors identified in the abstract" +#: templates/biblioref/fieldset_indexing.html:83 msgid "descriptores from abstract" msgstr "descritores do resumo" @@ -2900,7 +2899,7 @@ msgid "Record" msgstr "Registro" #: templates/biblioref/reference_confirm_delete.html:27 -#: templates/biblioref/referenceanalytic_form.html:449 +#: templates/biblioref/referenceanalytic_form.html:450 #: templates/delete_confirm.html:9 #: templates/institution/institution_confirm_delete.html:27 #: templates/leisref/act_confirm_delete.html:27 @@ -2915,8 +2914,8 @@ msgid "Are you sure you want to delete?" msgstr "Você tem certeza que deseja apagar?" #: templates/biblioref/reference_confirm_delete.html:28 -#: templates/biblioref/referenceanalytic_form.html:457 -#: templates/biblioref/referenceanalytic_form.html:509 +#: templates/biblioref/referenceanalytic_form.html:458 +#: templates/biblioref/referenceanalytic_form.html:510 #: templates/biblioref/referencesource_form.html:383 #: templates/delete_confirm.html:16 #: templates/institution/institution_confirm_delete.html:28 @@ -3022,7 +3021,7 @@ msgstr "Mídia criada em" #: templates/biblioref/reference_form.html:121 #: templates/biblioref/reference_form.html:124 #: templates/biblioref/referenceanalytic_form.html:211 -#: templates/biblioref/referenceanalytic_form.html:217 +#: templates/biblioref/referenceanalytic_form.html:218 #: templates/biblioref/referencesource_form.html:121 #: templates/biblioref/referencesource_form.html:124 #: templates/events/edit-event.html:133 templates/events/edit-event.html:136 @@ -3049,7 +3048,7 @@ msgid "Cooperative center code" msgstr "Código Centro Cooperante" #: templates/biblioref/reference_form.html:124 -#: templates/biblioref/referenceanalytic_form.html:217 +#: templates/biblioref/referenceanalytic_form.html:218 #: templates/biblioref/referencesource_form.html:124 #: templates/events/edit-event.html:136 #: templates/institution/institution_form.html:164 @@ -3076,7 +3075,7 @@ msgid "Suggested" msgstr "Sugerido" #: templates/biblioref/reference_form.html:396 -#: templates/biblioref/referenceanalytic_form.html:379 +#: templates/biblioref/referenceanalytic_form.html:380 #: templates/biblioref/referencesource_form.html:268 #: templates/events/edit-event.html:415 templates/leisref/act_form.html:340 #: templates/main/edit-resource.html:417 @@ -3088,8 +3087,8 @@ msgstr "Adicionar descritor" #: templates/biblioref/reference_form.html:397 #: templates/biblioref/reference_form.html:407 #: templates/biblioref/reference_form.html:417 -#: templates/biblioref/referenceanalytic_form.html:380 -#: templates/biblioref/referenceanalytic_form.html:390 +#: templates/biblioref/referenceanalytic_form.html:381 +#: templates/biblioref/referenceanalytic_form.html:391 #: templates/biblioref/referencesource_form.html:269 #: templates/biblioref/referencesource_form.html:279 #: templates/biblioref/referencesource_form.html:289 @@ -3410,7 +3409,7 @@ msgstr "Registro criado" msgid "Indexer cooperative center code" msgstr "Código do centro indexador" -#: templates/biblioref/referenceanalytic_form.html:221 +#: templates/biblioref/referenceanalytic_form.html:222 #: templates/biblioref/referencesource_form.html:128 #: templates/institution/institution_form.html:168 #: templates/main/edit-resource.html:124 templates/modal_log.html:6 @@ -3421,36 +3420,36 @@ msgstr "Código do centro indexador" msgid "Changes history" msgstr "Histórico de mudanças" -#: templates/biblioref/referenceanalytic_form.html:226 +#: templates/biblioref/referenceanalytic_form.html:227 #: templates/biblioref/referencesource_form.html:133 #: templates/title/title_form.html:132 msgid "Duplicates" msgstr "Duplicados" -#: templates/biblioref/referenceanalytic_form.html:250 +#: templates/biblioref/referenceanalytic_form.html:251 #: templates/biblioref/referencesource_form.html:163 #: templates/institution/institution_form.html:236 #: templates/leisref/act_form.html:305 templates/oer/oer_form.html:277 msgid "Save Draft" msgstr "Gravar Rascunho" -#: templates/biblioref/referenceanalytic_form.html:252 +#: templates/biblioref/referenceanalytic_form.html:253 #: templates/biblioref/referencesource_form.html:165 #: templates/institution/institution_form.html:238 #: templates/leisref/act_form.html:307 templates/oer/oer_form.html:279 msgid "Save as" msgstr "Gravar como" -#: templates/biblioref/referenceanalytic_form.html:258 +#: templates/biblioref/referenceanalytic_form.html:259 msgid "Save as LILACS-Express" msgstr "Salvar como LILACS-Express" -#: templates/biblioref/referenceanalytic_form.html:260 +#: templates/biblioref/referenceanalytic_form.html:261 msgid "Publish as LILACS-Express" msgstr "Publicar como LILACS-Express" -#: templates/biblioref/referenceanalytic_form.html:263 -#: templates/biblioref/referenceanalytic_form.html:267 +#: templates/biblioref/referenceanalytic_form.html:264 +#: templates/biblioref/referenceanalytic_form.html:268 #: templates/biblioref/referencesource_form.html:169 #: templates/biblioref/referencesource_form.html:173 #: templates/institution/institution_form.html:242 @@ -3458,7 +3457,7 @@ msgstr "Publicar como LILACS-Express" msgid "Publish" msgstr "Publicar" -#: templates/biblioref/referenceanalytic_form.html:272 +#: templates/biblioref/referenceanalytic_form.html:273 #: templates/biblioref/referencesource_form.html:177 #: templates/institution/institution_form.html:246 #: templates/leisref/act_form.html:315 templates/oer/oer_form.html:287 @@ -3466,12 +3465,12 @@ msgstr "Publicar" msgid "Back" msgstr "Voltar" -#: templates/biblioref/referenceanalytic_form.html:389 +#: templates/biblioref/referenceanalytic_form.html:390 #: templates/biblioref/referencesource_form.html:278 msgid "Add file" msgstr "Adicionar arquivo" -#: templates/biblioref/referenceanalytic_form.html:499 +#: templates/biblioref/referenceanalytic_form.html:500 #: templates/biblioref/referencesource_form.html:373 msgid "" "After publication the record can only be modified by a user with editor " @@ -5769,8 +5768,8 @@ msgid "Editor code" msgstr "Código do editor" #: templates/utils/decs_suggestion.html:26 -msgid "DeCS" -msgstr "Geog DeCS" +msgid "Abstract DeCS subjects" +msgstr "Assuntos DeCS do resumo" #: templates/utils/decs_suggestion.html:37 msgid "List of descriptors identified in the abstract" @@ -6708,6 +6707,9 @@ msgstr "Recurso criado" msgid "Year must be greater than 1900" msgstr "Ano deve ser maior que 1900" +#~ msgid "DeCS" +#~ msgstr "Geog DeCS" + #~ msgid "see descriptores suggestions" #~ msgstr "Descritores" diff --git a/bireme/static/css/screen.css b/bireme/static/css/screen.css index 1643dbdd..3d5842ac 100644 --- a/bireme/static/css/screen.css +++ b/bireme/static/css/screen.css @@ -739,9 +739,9 @@ tr.relation-row td input, tr.relation-row td select{ } .decs_suggestion{ - margin: -50px 0 40px 600px; - + margin: -52px 0 40px 190px; } .decs_suggestion a{ color: #ffff; + padding: 7px 10px 7px; } diff --git a/bireme/templates/biblioref/fieldset_indexing.html b/bireme/templates/biblioref/fieldset_indexing.html index 7162737f..3a17bb52 100644 --- a/bireme/templates/biblioref/fieldset_indexing.html +++ b/bireme/templates/biblioref/fieldset_indexing.html @@ -78,8 +78,10 @@ {% if settings.DECS_HIGHLIGHTER_URL %} -
- {% trans "descriptores from abstract" %} +
+ + {% trans "descriptores from abstract" %} +
{% endif %} diff --git a/bireme/templates/biblioref/referenceanalytic_form.html b/bireme/templates/biblioref/referenceanalytic_form.html index 6dcc1610..e4358588 100644 --- a/bireme/templates/biblioref/referenceanalytic_form.html +++ b/bireme/templates/biblioref/referenceanalytic_form.html @@ -209,10 +209,11 @@

{% trans "Record created in" %}: {{ object.created_time }} {% trans "by user" %} {{ object.created_by.username }}

-

{% trans "Cooperative center code" %}: {{ object.cooperative_center_code }}

+

{% trans "Cooperative center code" %}: {{ object.cooperative_center_code }} {% if object.indexer_cc_code and object.indexer_cc_code != object.cooperative_center_code %} -

{% trans "Indexer cooperative center code" %}: {{ object.indexer_cc_code }}

+ | {% trans "Indexer cooperative center code" %}: {{ object.indexer_cc_code }} {% endif %} +

{% if object.updated_by %}

{% trans "Last edit in" %} {{ object.updated_time }} {% trans "by user" %} {{ object.updated_by.username }}

{% endif %} @@ -536,25 +537,45 @@

0) { + articles = data.result; + duplicates_total = 0; + {% if object.pk %} + ref_id = '{{ object.pk }}'; + for (i = 0; i < articles.length; i++){ + article = articles[i]; + article_id = article['id'].split('-')[1]; // get only id number. ex. fiadmin-9999-pt + if (article_id != ref_id){ + duplicates_total++; + } + } + {% else %} + duplicates_total = data.total; + {% endif %} + + if (duplicates_total > 0) { $('.dedup-alert').show(); $('.dedup-alert').addClass('animated shake'); - articles = data.result; + $('#dedup_result .modal-body').empty(); for (i = 0; i < articles.length; i++){ pos = i+1; article = articles[i]; article_id = article['id']; + detail_url = ''; if (article_id.startsWith('fiadmin')){ - article_id = article_id.substring(article_id.lastIndexOf('-')+1) - detail_url = '{% url "list_biblioref" %}edit-analytic/' + article_id ; + article_id = article['id'].split('-')[1]; + if (article_id != ref_id){ + detail_url = '{% url "list_biblioref" %}edit-analytic/' + article_id; + } }else{ detail_url = '{{settings.DEDUP_ARTICLE_DETAIL}}lil-' + article_id; } - $('#dedup_result .modal-body').append($('
', { - html: pos + '. ' + article['titulo_artigo'] - + ' - ' + article['titulo_revista'] + ' (' + article['ano_publicacao'] + ')' - })); + if (detail_url != ''){ + $('#dedup_result .modal-body').append($('
', { + html: pos + '. ' + article['titulo_artigo'] + + ' - ' + article['titulo_revista'] + ' (' + article['ano_publicacao'] + ')' + })); + } } }else{ $('.dedup-alert').hide(); diff --git a/bireme/templates/utils/decs_suggestion.html b/bireme/templates/utils/decs_suggestion.html index 9c847632..8b4d5e0b 100644 --- a/bireme/templates/utils/decs_suggestion.html +++ b/bireme/templates/utils/decs_suggestion.html @@ -23,7 +23,7 @@ {% endblock %} -{% block title %}{% trans "DeCS" %} | {{ block.super }}{% endblock %} +{% block title %}{% trans "Abstract DeCS subjects" %} | {{ block.super }}{% endblock %} {% block breadcrumb_wrap %}{% endblock %} @@ -43,7 +43,7 @@

{{ decs.descriptor|title }} - + {% trans "Add" %}