Merge pull request #4057 from jyhein/f5000

Remove separate Dublin Core Language metadata field and only use Submission Locale to define the language

cypress/tests/integration/SubmissionWizard.cy.js

@@ -273,7 +273,6 @@ describe('Submission Wizard', function() {
             metadata: {
                 autosuggest: {
                     disciplines: 'Faucibus',
-                    languages: 'Ornare',
                     subjects: 'Suspendisse',
                     supportingAgencies: 'Porttitor',
                 },
@@ -301,7 +300,6 @@ describe('Submission Wizard', function() {
             'Coverage',
             'Data Availability Statement',
             'Disciplines',
-            'Languages',
             'Rights',
             'Source',
             'Subjects',
@@ -326,7 +324,6 @@ describe('Submission Wizard', function() {
                         dataAvailability: 'require',
                         disciplines: 'require',
                         keywords: 'require',
-                        languages: 'require',
                         rights: 'require',
                         source: 'require',
                         subjects: 'require',
@@ -463,7 +460,6 @@ describe('Submission Wizard', function() {
                         dataAvailability: 'request',
                         disciplines: 'request',
                         keywords: 'require',
-                        languages: 'request',
                         rights: 'request',
                         source: 'request',
                         subjects: 'require',
@@ -531,7 +527,6 @@ describe('Submission Wizard', function() {
         const metadata = {
             subjects: "Subjects",
             disciplines: "Disciplines",
-            languages: "Languages",
             supportingAgencies: "Supporting Agencies",
             coverage: "Coverage",
             rights: "Rights",
@@ -629,7 +624,6 @@ describe('Submission Wizard', function() {
                         dataAvailability: '0',
                         disciplines: '0',
                         keywords: 'request',
-                        languages: '0',
                         rights: '0',
                         source: '0',
                         subjects: '0',

plugins/metadata/dc11/filter/Dc11SchemaArticleAdapter.php

@@ -30,7 +30,6 @@
 use APP\submission\Submission;
 use PKP\db\DAORegistry;
 use PKP\facades\Locale;
-use PKP\i18n\LocaleConversion;
 use PKP\metadata\MetadataDataObjectAdapter;
 use PKP\metadata\MetadataDescription;
 use PKP\plugins\Hook;
@@ -184,22 +183,12 @@ public function &extractMetadataFromDataObject(&$article)
         }
 
         // Language
-        $locales = [];
-        if ($article instanceof Submission) {
-            foreach ($galleys as $galley) {
-                $locale = $galley->getLocale();
-                if (!is_null($locale) && !in_array($locale, $locales)) {
-                    $locales[] = $locale;
-                    $dc11Description->addStatement('dc:language', LocaleConversion::getIso3FromLocale($locale));
-                }
-            }
-        }
-        $articleLanguages = $article->getLanguage();
-        if (empty($locales) && isset($articleLanguages[$article->getLocale()])) {
-            foreach ($articleLanguages[$article->getLocale()] as $language) {
-                $dc11Description->addStatement('dc:language', $language);
-            }
-        }
+        collect($galleys)
+            ->map(fn ($g) => $g->getData('locale'))
+            ->push($publication->getData('locale'))
+            ->filter()
+            ->unique()
+            ->each(fn ($l) => $dc11Description->addStatement('dc:language', $l));
 
         // Relation
         // full text URLs

plugins/oaiMetadataFormats/dc/tests/OAIMetadataFormat_DCTest.php

@@ -111,7 +111,6 @@ public function testToXml()
         $publication->setData('abstract', 'article-abstract', 'en');
         $publication->setData('sponsor', 'article-sponsor', 'en');
         $publication->setData('doiObject', $publicationDoiObject);
-        $publication->setData('languages', ['en' => ['en']]);
         $publication->setData('copyrightHolder', 'article-copyright');
         $publication->setData('copyrightYear', 'year');
         $publication->setData('authors', collect([$author]));
@@ -153,6 +152,7 @@ public function testToXml()
             ->will($this->returnValue(98));
         $galley->setId(98);
         $galley->setData('doiObject', $galleyDoiObject);
+        $galley->setData('locale', 'en');
 
         $galleys = [$galley];