Merge branch 'develop' into feature/3498_async_articles_bulk_api

.gitignore

@@ -40,6 +40,7 @@ cache/csv/*.csv
 cache/sitemap/*.xml
 portality/migrate/p1p2/*.csv
 portality/migrate/p1p2/*.csv.bak
+/portality/scripts/3821_add_deposit_policy/add-Mirabel-deposit-policy.csv
 local_store/main/*
 !local_store/main/README.md
 local_store/tmp/*

cms/data/volunteers.yml

@@ -19,13 +19,13 @@ ed:
   language: Chinese, English
   featured: true
 
-- name: Juyeon Park
-  area: Librarianship
+- name: Jiayi Xu
+  area: Academic Publishing
   year_since:
-  city: Seoul
-  country: Korea
-  language: Korean, English
-
+  city: Chongqing
+  country: China
+  language: Chinese, English
+  
 - name: Lut Tamam
   area: Medicine
   year_since:
@@ -75,6 +75,7 @@ ed:
   city: Tabriz
   country: Iran
   language: Persian, English, Azeri
+  photo: "Rasoul.jpg"
 
 - name: S.Suharto
   area: Humanities, Social Sciences
@@ -94,6 +95,14 @@ ed:
 ## All associate editors
 
 ass_ed:
+- name: Adhi Narayanan
+  area: Scientometric and Bibliometric Studies, Biotechnology 
+  year_since:
+  city: Tiruchirappalli 
+  country: India
+  language: Tamil, English
+  photo: "Dr. K.JPG"
+
 - name: Alain Chaple
   area: Medical Sciences
   year_since:
@@ -162,6 +171,7 @@ ass_ed:
   city: Bucharest
   country: Romania
   language: Romanian, English
+  photo: "Octav.jpg"
 
 - name: Anna Sidorko
   area: Library Science
@@ -397,13 +407,6 @@ ass_ed:
   country:
   language: English
 
-- name: Jiayi Xu
-  area: Publishing
-  year_since:
-  city: Chongqing
-  country: China
-  language: Chinese,English
-
 - name: Jinjin Liu
   area: Social Sciences, Medicine
   year_since:
@@ -433,11 +436,19 @@ ass_ed:
   language: Portuguese, English
   photo: "jlima.jpg"
 
-- name: JuYeon Park
-  area:
+- name: Julio Zetter
+  area: Library Science
   year_since:
-  city:
-  country:
+  city: Mexico City
+  country: Mexico
+  language: Spanish, English
+  photo: "Julio.jpg"
+
+- name: Juyeon Park
+  area: Librarianship
+  year_since:
+  city: Seoul
+  country: Korea
   language: Korean, English
 
 - name: Kadri Kıran
@@ -495,6 +506,14 @@ ass_ed:
   city:
   country: Finland
   language: Finnish, English
+
+- name: Leila Yang
+  area: Scholarly Publishing
+  year_since:
+  city: Beijing
+  country: China
+  language: Chinese, English
+  photo: "Yang.jpg"
 
 - name: Liana Penabad Camacho
   area: Social Sciences
@@ -511,6 +530,14 @@ ass_ed:
   country: Colombia
   language: Spanish, English
 
+- name: Liping Yang
+  area: Material Engineering, Library Studies
+  year_since:
+  city: Suzhou
+  country: China
+  language: Chinese, English
+  photo: "Liping.jpg"
+
 - name: Lorri Peters
   area: Science
   year_since:
@@ -524,6 +551,7 @@ ass_ed:
   city: Târgu jiu
   country: Romania
   language: Romanian, English
+  photo: "Flavius.jpg"
 
 - name: Marco Tullney
   area: Social Sciences, Technology
@@ -566,7 +594,7 @@ ass_ed:
   city: Łupice
   country: Poland
   language: Polish, English
-  photo: "Mirecka.jpeg"
+  photo: "Martyna.JPG"
 
 - name: Melih Sever
   area: Social Sciences
@@ -734,6 +762,13 @@ ass_ed:
   city: Milan
   country: Italy
   language: Italian, English, German
+
+- name: Shiying Li
+  area: Forensic Science
+  year_since:
+  city: Shanghai
+  country: China
+  language: Chinese
 
 - name: Soon Kim
   area:

cms/pages/apply/copyright-and-licensing.md

@@ -50,6 +50,10 @@ But the license applies to the readers **and** the author when:
 
 Further reading and more examples are [available as a downloadable presentation](https://drive.google.com/drive/folders/190BgMV0ImGk-gUpHu5ai_R-uvO8NDAB8?usp=sharing).
 
+## In other languages
+
+[French](https://www.erudit.org/public/documents/licencedroitsauteursDOAJ.pdf) - hosted by Érudit
+
 ## Version history
 
 This is Version 1 of our Licensing and copyright page.

cms/pages/apply/guide.md

@@ -223,7 +223,7 @@ Our criteria are available in:
 - [Chinese](https://zenodo.org/record/4633341)
 - [Danish](https://pro.kb.dk/danske-open-access-tidsskrifter-og-directory-open-access-journals/basisbetingelser-indeksering)
 - [Finnish](https://docs.google.com/document/d/1BLuaFerSw0G4L2GCVcGeu3rB7SXT7fWL0px26ME9jo0/edit?usp=sharing)
-- [French (Canadian)](https://drive.google.com/drive/folders/1-9FraAimhA9Ks64tvKE_W4wsQ8LNob9a?usp=sharing)
+- [French](https://www.erudit.org/public/documents/guidecandidatureDOAJ.pdf) - hosted by Érudit
 - [German](https://bibliothek.thws.de/leitfaden-fuer-die-zeitschriftenregistrierung-bei-doaj/)
 - [Japanese](https://drive.google.com/file/d/1MDRlcc7SJnv8yOlZ1aCqbivXOZevxH4a/view?usp=sharing)
 - [Lithuanian](https://drive.google.com/file/d/1f7YXn6cXGXhDH9AbPJyOiM7_tHVRMe4j/view?usp=sharing)

cms/pages/apply/publisher-responsibilities.md

@@ -173,6 +173,10 @@ You can also check our [log of withdrawn journals](https://docs.google.com/sprea
 
 - [Contact our Help Desk](mailto:helpdesk@doaj.org) with the journal title and ISSN; they will help you.
 
+## In other languages
+
+[French](https://www.erudit.org/public/documents/infoediteursDOAJ.pdf) - hosted by Érudit
+
 ## Version history
 
 This is Version 1 of our Publisher information page.

cms/pages/apply/seal.md

@@ -48,6 +48,10 @@ All seven criteria must be met for a journal to be awarded the Seal. Failure to
 7. Copyright and publishing rights
   -  Authors must retain unrestricted copyright and all publishing rights when publishing under any license permitted by the journal.
 
+## In other languages
+
+[French](https://www.erudit.org/public/documents/sceauDOAJ.pdf) - hosted by Érudit
+
 ## Version history
 
 This is Version 1 of our Seal criteria.

cms/pages/apply/transparency.md

@@ -203,6 +203,7 @@ WAME is a global nonprofit voluntary association of editors of peer-reviewed med
 
 - [Bengali](https://docs.google.com/document/d/1hsCynqvYbnaUwnu7VxlEPNKn076mz1KrRUdQ4vefYX4/edit?usp=sharing) - Google document
 - [Chinese](https://zenodo.org/records/10401800) - PDF, Zenodo
+- [French](https://www.erudit.org/public/documents/transparenceDOAJ.pdf) - hosted by Érudit
 - [Korean](https://drive.google.com/file/d/1Uyh5uZR1vbkPwcIvN1h7PPlHVwu0fMHA/view?usp=sharing) - PDF
 - [Portuguese](https://docs.google.com/document/d/155dAHllL2KhPhzTsR3UhbMEASYjkxP157fAtiZ1jw2w/edit?usp=sharing) - Google document
 - [Serbian](https://www.ceon.rs/index.php?option=com_content&view=article&id=654:transparentnost-i-najbolja-praksa&catid=94&lang=sr&Itemid=578) (hosted at ceon.rs)

cms/pages/docs/faq.md

@@ -100,6 +100,20 @@ Choose how you want to upload article metadata to us.
 - **Documentation** No
 - **Troubleshooting**: you must be careful to enter the Print ISSN and Electronic ISSN in the right field.
 
+### A note about updating articles
+
+Sometimes article metadata needs to be updated. We use the Full Text URL and DOI, if present, to identify and match articles. If you are updating article metadata with details about authors, affiliations, year, volume, issue, etc or adding a DOI to an article that doesn't have one in DOAJ, you will be able to send us the updated metadata, using one of the methods above, without any problem.
+
+However, if you need to update the Full Text URL or DOI of articles that already have that metadata present in DOAJ, you will need to contact us first. Submitting new FUll Text URLs or DOIs will cause duplicate articles to be created. Our preferenc here is that we delete the existing article records first.
+
+If you do need us to delete article metadata, please contact Help Desk with the following details:
+
+- journal title
+- ISSN(s)
+- years to be deleted (we can only delete whole years) or if we should delete all article for a journal
+
+We will confirm the number of articles to delete with you. Deleting articles is instantaneous and cannot be reversed.
+
 ## Help with metadata uploads
 
 ### My authors have multiple affiliations

doajtest/unit/test_task_preservation.py

@@ -3,13 +3,15 @@
 import requests
 from io import BytesIO
 from unittest.mock import patch
-from doajtest.helpers import DoajTestCase
+from doajtest.helpers import DoajTestCase, login
 from doajtest.mocks.preservation import PreservationMock
 from portality.tasks import preservation
 from portality.core import app
 from portality.lib import dates
 from werkzeug.datastructures import FileStorage
 from portality.models.article import Article
+from portality.models import Account
+from portality.ui.messages import Messages
 
 
 def mock_pull_by_key(key, value):
@@ -232,3 +234,15 @@ def test_get_article_info(self):
         assert issn == "2051-5960"
         assert article_id == "00003741594643f4996e2555a01e03c7"
         assert metadata_json["bibjson"]["identifier"][0]["id"] == "10.1186/s40478-018-0619-9"
+
+    def test_empty_file(self):
+        admin_account = Account.make_account(email="admin@test.com", username="admin", name="Admin", roles=["admin"])
+        admin_account.set_password('password123')
+        admin_account.save()
+
+        with self.app_test.test_client() as t_client:
+            login(t_client, "admin", "password123")
+            response = t_client.post('/publisher/preservation', data={})
+            with t_client.session_transaction() as session:
+                flash_messages = session.get('_flashes')
+                assert any(msg[1] == Messages.PRESERVATION_NO_FILE for msg in flash_messages)

portality/forms/application_forms.py

@@ -1598,12 +1598,12 @@ class FieldDefinitions:
     }
 
     #######################################
-    ## Ediorial fields
+    ## Editorial fields
 
     # ~~->$ DOAJSeal:FormField~~
     DOAJ_SEAL = {
         "name": "doaj_seal",
-        "label": "The journal has fulfilled all the criteria for the Seal. Award the Seal?",
+        "label": "The journal may have fulfilled all the criteria for the Seal. Award the Seal?",
         "input": "checkbox",
         "validate": [
             {