From 22cffee9ebf3f94aa94bc5e94c7bb97ae1d17661 Mon Sep 17 00:00:00 2001 From: Bozana Bokan Date: Mon, 6 Jan 2025 15:05:10 +0100 Subject: [PATCH 1/2] pkp/pkp-lib#10726 consider all existing submission metadata langauges --- .../metadata/dc11/filter/Dc11SchemaPreprintAdapter.php | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/plugins/metadata/dc11/filter/Dc11SchemaPreprintAdapter.php b/plugins/metadata/dc11/filter/Dc11SchemaPreprintAdapter.php index 627a32ec42..d9235ba412 100644 --- a/plugins/metadata/dc11/filter/Dc11SchemaPreprintAdapter.php +++ b/plugins/metadata/dc11/filter/Dc11SchemaPreprintAdapter.php @@ -28,7 +28,6 @@ use APP\submission\Submission; use PKP\controlledVocab\ControlledVocab; use PKP\db\DAORegistry; -use PKP\facades\Locale; use PKP\metadata\MetadataDataObjectAdapter; use PKP\metadata\MetadataDescription; use PKP\plugins\Hook; @@ -87,19 +86,16 @@ public function &extractMetadataFromDataObject(&$submission) } // Subject - $supportedLocales = array_keys(Locale::getSupportedFormLocales()); $subjects = array_merge_recursive( Repo::controlledVocab()->getBySymbolic( ControlledVocab::CONTROLLED_VOCAB_SUBMISSION_KEYWORD, Application::ASSOC_TYPE_PUBLICATION, - $publication->getId(), - $supportedLocales + $publication->getId() ), Repo::controlledVocab()->getBySymbolic( ControlledVocab::CONTROLLED_VOCAB_SUBMISSION_SUBJECT, Application::ASSOC_TYPE_PUBLICATION, - $publication->getId(), - $supportedLocales + $publication->getId() ) ); $this->_addLocalizedElements($dc11Description, 'dc:subject', $subjects); From 39607835160ff3388183864c5a3fd5c500b21a2e Mon Sep 17 00:00:00 2001 From: Bozana Bokan Date: Thu, 9 Jan 2025 12:42:30 +0100 Subject: [PATCH 2/2] pkp/pkp-lib#10726 submodules updates ##bozana/10726## --- lib/pkp | 2 +- plugins/generic/citationStyleLanguage | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/pkp b/lib/pkp index d15e9984d6..eec13bb4b9 160000 --- a/lib/pkp +++ b/lib/pkp @@ -1 +1 @@ -Subproject commit d15e9984d6dad2f9264f37442f0b934a976dd383 +Subproject commit eec13bb4b9f694a42246fc343a34444bf52b5ddc diff --git a/plugins/generic/citationStyleLanguage b/plugins/generic/citationStyleLanguage index 3d86352091..82c052c5a4 160000 --- a/plugins/generic/citationStyleLanguage +++ b/plugins/generic/citationStyleLanguage @@ -1 +1 @@ -Subproject commit 3d86352091a5c34ea7dc1057f238464cff08b96c +Subproject commit 82c052c5a428719346a0c0ef0bf07ee2e7317430