Merge pull request #10728 from bozana/10726

#10726 consider all existing submission metadata langauges
pkp · Jan 9, 2025 · 4e70f57 · 4e70f57
2 parents 7b40613 + eec13bb
commit 4e70f57
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/classes/section/Repository.php b/classes/section/Repository.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @file classes/section/Repository.php
  *
@@ -88,7 +89,7 @@ public function getSchemaMap(): maps\Schema
     public function validate(?Section $object, array $props, Context $context): array
     {
         $errors = [];
-        $allowedLocales = $context->getSupportedSubmissionLocales();
+        $allowedLocales = $context->getSupportedFormLocales();
         $primaryLocale = $context->getPrimaryLocale();
 
         $validator = ValidatorFactory::make(

diff --git a/plugins/importexport/native/filter/PKPPublicationNativeXmlFilter.php b/plugins/importexport/native/filter/PKPPublicationNativeXmlFilter.php
@@ -21,8 +21,8 @@
 use APP\plugins\importexport\native\NativeImportExportDeployment;
 use APP\publication\Publication;
 use Exception;
-use PKP\controlledVocab\ControlledVocab;
 use PKP\citation\CitationDAO;
+use PKP\controlledVocab\ControlledVocab;
 use PKP\db\DAORegistry;
 use PKP\filter\FilterGroup;
 use PKP\plugins\importexport\PKPImportExportFilter;
@@ -215,16 +215,14 @@ public function addMetadata($doc, $entityNode, $entity)
 
         // add controlled vocabularies
         // get the supported locale keys
-        $supportedLocales = $deployment->getContext()->getSupportedFormLocales();
         $controlledVocabulariesMapping = $this->_getControlledVocabulariesMappings();
         foreach ($controlledVocabulariesMapping as $controlledVocabulariesNodeName => $mappings) {
             $symbolic = $mappings[0];
             $controlledVocabularyNodeName = $mappings[1];
             $controlledVocabulary = Repo::controlledVocab()->getBySymbolic(
                 $symbolic,
                 Application::ASSOC_TYPE_PUBLICATION,
-                $entity->getId(),
-                $supportedLocales
+                $entity->getId()
             );
             $this->addControlledVocabulary($doc, $entityNode, $controlledVocabulariesNodeName, $controlledVocabularyNodeName, $controlledVocabulary);
         }