Merge branch 'fixAssignMessageBug330-707' into 'stable-3_3_0'

Corrige interferência na mensagem de designação de usuário See merge request softwares-pkp/plugins_ojs/dataverse!169
lepidus · Oct 10, 2024 · 829a523 · 829a523
2 parents 5c08357 + 135d734
commit 829a523
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 5 deletions.
diff --git a/classes/dispatchers/DatasetTabDispatcher.inc.php b/classes/dispatchers/DatasetTabDispatcher.inc.php
@@ -211,6 +211,7 @@ private function setupResearchDataUpdate(Submission $submission, DataverseStudy
             'confirmPublishDatasetMessage' => __('plugins.generic.dataverse.modal.confirmDatasetPublish', [
                 'serverUrl' => $configuration->getDataverseServerUrl(),
             ]),
+            'loadingCitationMsg' => __('plugins.generic.dataverse.metadataForm.loadingDatasetCitation'),
             'datasetCitationUrl' => $dispatcher->url($request, ROUTE_API, $context->getPath(), 'datasets/' . $study->getId() . '/citation'),
             'canSendEmail' => in_array(ROLE_ID_MANAGER, $userRoles),
             'hasDepositedDataset' => true

diff --git a/js/DataverseWorkflowPage.js b/js/DataverseWorkflowPage.js
@@ -23,6 +23,10 @@ var DataverseWorkflowPage = $.extend(true, {}, pkp.controllers.WorkflowPage, {
         },
 
         datasetIsPublished: function () {
+            if (this.datasetIsLoading) {
+                return true;
+            }
+
             return this.dataset.versionState === 'RELEASED';
         },
 
@@ -307,7 +311,7 @@ var DataverseWorkflowPage = $.extend(true, {}, pkp.controllers.WorkflowPage, {
                 return;
             }
             var self = this;
-            this.datasetCitation = this.__('common.loading') + '...';
+            this.datasetCitation = this.loadingCitationMsg;
             $.ajax({
                 url: self.datasetCitationUrl,
                 type: 'GET',

diff --git a/locale/en_US/locale.po b/locale/en_US/locale.po
@@ -210,6 +210,12 @@ msgstr "Publish research data"
 msgid "plugins.generic.dataverse.dataset.titlePrefix"
 msgstr "Replication data for: "
 
+msgid "plugins.generic.dataverse.metadataForm.loadingDataset"
+msgstr "Loading research data information..."
+
+msgid "plugins.generic.dataverse.metadataForm.loadingDatasetCitation"
+msgstr "Loading citation..."
+
 msgid "plugins.generic.dataverse.metadataForm.title"
 msgstr "Title"
 

diff --git a/locale/es_ES/locale.po b/locale/es_ES/locale.po
@@ -213,6 +213,12 @@ msgstr "Publicar datos de investigación"
 msgid "plugins.generic.dataverse.dataset.titlePrefix"
 msgstr "Datos de réplica: "
 
+msgid "plugins.generic.dataverse.metadataForm.loadingDataset"
+msgstr "Cargando información de los datos de investigación..."
+
+msgid "plugins.generic.dataverse.metadataForm.loadingDatasetCitation"
+msgstr "Cargando citación..."
+
 msgid "plugins.generic.dataverse.metadataForm.title"
 msgstr "Título"
 

diff --git a/locale/pt_BR/locale.po b/locale/pt_BR/locale.po
@@ -213,6 +213,12 @@ msgstr "Publicar dados de pesquisa"
 msgid "plugins.generic.dataverse.dataset.titlePrefix"
 msgstr "Dados de replicação para: "
 
+msgid "plugins.generic.dataverse.metadataForm.loadingDataset"
+msgstr "Carregando informações dos dados de pesquisa..."
+
+msgid "plugins.generic.dataverse.metadataForm.loadingDatasetCitation"
+msgstr "Carregando citação..."
+
 msgid "plugins.generic.dataverse.metadataForm.title"
 msgstr "Título"
 

diff --git a/templates/datasetTab/datasetData.tpl b/templates/datasetTab/datasetData.tpl
@@ -1,8 +1,8 @@
 <span v-if="datasetIsLoading">
     <spinner></spinner>
-    {{ __('common.loading')}} ...
+    {translate key="plugins.generic.dataverse.metadataForm.loadingDataset"}
 </span>
-<section v-if="!datasetIsLoading" id="datasetData" class="item datasetData -pkpClearfix">
+<section id="datasetData" class="item datasetData -pkpClearfix">
     <pkp-header>
         <h1>
             {translate key="plugins.generic.dataverse.researchData"}

diff --git a/version.xml b/version.xml
@@ -13,8 +13,8 @@
 <version>
 	<application>dataverse</application>
 	<type>plugins.generic</type>
-	<release>2.6.0.0</release>
-	<date>2024-09-24</date>
+	<release>2.6.1.0</release>
+	<date>2024-10-10</date>
 	<lazy-load>1</lazy-load>
 	<class>DataversePlugin</class>
 </version>