Merge pull request pkp#577 from jyhein/f5000

Remove separate Dublin Core Language metadata field and only use Submission Locale to define the language
Vitaliy-1 · Nov 28, 2023 · 3fce0fc · 3fce0fc
2 parents f84ab62 + 5bfc142
commit 3fce0fc
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 18 deletions.
diff --git a/lib/pkp b/lib/pkp
diff --git a/plugins/generic/citationStyleLanguage b/plugins/generic/citationStyleLanguage
diff --git a/plugins/metadata/dc11/filter/Dc11SchemaPreprintAdapter.php b/plugins/metadata/dc11/filter/Dc11SchemaPreprintAdapter.php
@@ -28,7 +28,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;
@@ -59,6 +58,7 @@ public function &injectMetadataIntoDataObject(&$metadataDescription, &$targetDat
      * @param Submission $submission
      *
      * @return MetadataDescription
+     *
      * @hook Dc11SchemaPreprintAdapter::extractMetadataFromDataObject [[$this, $submission, $server, &$dc11Description]]
      */
     public function &extractMetadataFromDataObject(&$submission)
@@ -145,20 +145,12 @@ public function &extractMetadataFromDataObject(&$submission)
         $dc11Description->addStatement('dc:identifier', $request->url($server->getPath(), 'preprint', 'view', [$submission->getBestId()]));
 
         // Language
-        $locales = [];
-        foreach ($galleys as $galley) {
-            $galleyLocale = $galley->getLocale();
-            if (!is_null($galleyLocale) && !in_array($galleyLocale, $locales)) {
-                $locales[] = $galleyLocale;
-                $dc11Description->addStatement('dc:language', LocaleConversion::getIso3FromLocale($galleyLocale));
-            }
-        }
-        $submissionLanguages = $submission->getLanguage();
-        if (empty($locales) && isset($submissionLanguages[$submission->getLocale()])) {
-            foreach ($submissionLanguages[$submission->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

diff --git a/plugins/oaiMetadataFormats/dc/tests/OAIMetadataFormat_DCTest.php b/plugins/oaiMetadataFormats/dc/tests/OAIMetadataFormat_DCTest.php
@@ -101,7 +101,6 @@ public function testToXml()
         $publication->setData('abstract', 'preprint-abstract', 'en');
         $publication->setData('sponsor', 'preprint-sponsor', 'en');
         $publication->setData('doiObject', $publicationDoiObject);
-        $publication->setData('languages', ['en' => ['en']]);
         $publication->setData('copyrightHolder', 'preprint-copyright');
         $publication->setData('copyrightYear', 'year');
         $publication->setData('datePublished', '2010-11-05');
@@ -144,6 +143,7 @@ public function testToXml()
             ->will($this->returnValue(98));
         $galley->setId(98);
         $galley->setData('doiObject', $galleyDoiObject);
+        $galley->setData('locale', 'en');
 
         $galleys = [$galley];