diff --git a/src/app/core/data/version-history-data.service.ts b/src/app/core/data/version-history-data.service.ts index ee49c82e266..82290835355 100644 --- a/src/app/core/data/version-history-data.service.ts +++ b/src/app/core/data/version-history-data.service.ts @@ -6,23 +6,21 @@ import { ObjectCacheService } from '../cache/object-cache.service'; import { HALEndpointService } from '../shared/hal-endpoint.service'; import { HttpHeaders } from '@angular/common/http'; import { PostRequest } from './request.models'; -import { Observable, of } from 'rxjs'; +import { combineLatest, Observable, of as observableOf } from 'rxjs'; import { PaginatedSearchOptions } from '../../shared/search/models/paginated-search-options.model'; import { RemoteData } from './remote-data'; import { PaginatedList } from './paginated-list.model'; import { Version } from '../shared/version.model'; -import { filter, map, switchMap, take } from 'rxjs/operators'; +import { filter, find, map, switchMap, take } from 'rxjs/operators'; import { VERSION_HISTORY } from '../shared/version-history.resource-type'; import { followLink, FollowLinkConfig } from '../../shared/utils/follow-link-config.model'; import { VersionDataService } from './version-data.service'; import { HttpOptions } from '../dspace-rest/dspace-rest.service'; import { getAllSucceededRemoteData, getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload, getRemoteDataPayload } from '../shared/operators'; import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model'; -import { hasValueOperator } from '../../shared/empty.util'; +import { hasValue, hasValueOperator } from '../../shared/empty.util'; import { Item } from '../shared/item.model'; import { FindListOptions } from './find-list-options.model'; -import { sendRequest } from '../shared/request.operators'; -import { RestRequest } from './rest-request.model'; import { IdentifiableDataService } from './base/identifiable-data.service'; import { dataService } from './base/data-service.decorator'; @@ -86,29 +84,31 @@ export class VersionHistoryDataService extends IdentifiableDataService> { + const requestId = this.requestService.generateRequestId(); const requestOptions: HttpOptions = Object.create({}); let requestHeaders = new HttpHeaders(); requestHeaders = requestHeaders.append('Content-Type', 'text/uri-list'); requestOptions.headers = requestHeaders; - const response$ = this.halService.getEndpoint(this.versionsEndpoint).pipe( + this.halService.getEndpoint(this.versionsEndpoint).pipe( take(1), map((endpointUrl: string) => (summary?.length > 0) ? `${endpointUrl}?summary=${summary}` : `${endpointUrl}`), - map((endpointURL: string) => new PostRequest(this.requestService.generateRequestId(), endpointURL, itemHref, requestOptions)), - sendRequest(this.requestService), - switchMap((restRequest: RestRequest) => this.rdbService.buildFromRequestUUID(restRequest.uuid)), - getFirstCompletedRemoteData() - ) as Observable>; - - response$.subscribe((versionRD: RemoteData) => { - // invalidate version history - // note: we should do this regardless of whether the request succeeds, - // because it may have failed due to cached data that is out of date - this.requestService.setStaleByHrefSubstring(versionRD.payload._links.self.href); - this.requestService.setStaleByHrefSubstring(versionRD.payload._links.versionhistory.href); + find((href: string) => hasValue(href)), + ).subscribe((href) => { + const request = new PostRequest(requestId, href, itemHref, requestOptions); + if (hasValue(this.responseMsToLive)) { + request.responseMsToLive = this.responseMsToLive; + } + + this.requestService.send(request); }); - return response$; + return this.rdbService.buildFromRequestUUIDAndAwait(requestId, (versionRD) => combineLatest([ + this.requestService.setStaleByHrefSubstring(versionRD.payload._links.self.href), + this.requestService.setStaleByHrefSubstring(versionRD.payload._links.versionhistory.href), + ])).pipe( + getFirstCompletedRemoteData(), + ); } /** @@ -147,7 +147,7 @@ export class VersionHistoryDataService extends IdentifiableDataService res.versionhistory), getFirstSucceededRemoteDataPayload(), switchMap((versionHistoryRD) => this.getLatestVersionFromHistory$(versionHistoryRD)), - ) : of(null); + ) : observableOf(null); } /** @@ -158,8 +158,8 @@ export class VersionHistoryDataService extends IdentifiableDataService { return version ? this.getLatestVersion$(version).pipe( take(1), - switchMap((latestVersion) => of(version.version === latestVersion.version)) - ) : of(null); + switchMap((latestVersion) => observableOf(version.version === latestVersion.version)) + ) : observableOf(null); } /** @@ -170,21 +170,20 @@ export class VersionHistoryDataService extends IdentifiableDataService { return this.versionDataService.findByHref(versionHref, false, true, followLink('versionhistory')).pipe( getFirstCompletedRemoteData(), - switchMap((res) => { - if (res.hasSucceeded && !res.hasNoContent) { - return res.payload.versionhistory.pipe( + switchMap((versionRD: RemoteData) => { + if (versionRD.hasSucceeded && !versionRD.hasNoContent) { + return versionRD.payload.versionhistory.pipe( getFirstCompletedRemoteData(), - map((versionHistoryRD) => { - if (res.hasSucceeded) { - const versionHistory = versionHistoryRD.payload; - return versionHistory ? versionHistory.draftVersion : false; + map((versionHistoryRD: RemoteData) => { + if (versionHistoryRD.hasSucceeded && !versionHistoryRD.hasNoContent) { + return versionHistoryRD.payload.draftVersion; } else { return false; } }), ); } else { - return of(false); + return observableOf(false); } }), ); diff --git a/src/app/shared/dso-page/dso-versioning-modal-service/dso-versioning-modal.service.ts b/src/app/shared/dso-page/dso-versioning-modal-service/dso-versioning-modal.service.ts index 46792294dd8..b9c77dc56b6 100644 --- a/src/app/shared/dso-page/dso-versioning-modal-service/dso-versioning-modal.service.ts +++ b/src/app/shared/dso-page/dso-versioning-modal-service/dso-versioning-modal.service.ts @@ -1,7 +1,7 @@ import { getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload } from '../../../core/shared/operators'; import { RemoteData } from '../../../core/data/remote-data'; import { Version } from '../../../core/shared/version.model'; -import { map, startWith, switchMap, tap } from 'rxjs/operators'; +import { map, switchMap, tap } from 'rxjs/operators'; import { Item } from '../../../core/shared/item.model'; import { WorkspaceItem } from '../../../core/submission/models/workspaceitem.model'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; @@ -13,9 +13,7 @@ import { ItemDataService } from '../../../core/data/item-data.service'; import { Injectable } from '@angular/core'; import { Observable, of } from 'rxjs'; import { ItemVersionsSharedService } from '../../../item-page/versions/item-versions-shared.service'; -import { - ItemVersionsSummaryModalComponent -} from '../../../item-page/versions/item-versions-summary-modal/item-versions-summary-modal.component'; +import { ItemVersionsSummaryModalComponent } from '../../../item-page/versions/item-versions-summary-modal/item-versions-summary-modal.component'; /** * Service to take care of all the functionality related to the version creation modal @@ -86,7 +84,6 @@ export class DsoVersioningModalService { // button is disabled if hasDraftVersion = true, and enabled if hasDraftVersion = false or null // (hasDraftVersion is null when a version history does not exist) map((res) => Boolean(res)), - startWith(true), ); } diff --git a/src/assets/i18n/bn.json5 b/src/assets/i18n/bn.json5 index c70cc6f4595..50f6ced88c5 100644 --- a/src/assets/i18n/bn.json5 +++ b/src/assets/i18n/bn.json5 @@ -3121,7 +3121,7 @@ // "item.page.version.create": "Create new version", "item.page.version.create": "নতুন সংস্করণ তৈরি করুন", - // "item.page.version.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history", + // "item.page.version.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history", "item.page.version.hasDraft": "একটি নতুন সংস্করণ তৈরি করা যাচ্ছে না কারণ ভার্সন হিস্ট্রিতে একটি জমা ইনপ্রগ্রেসস অবস্থাই রয়েছে", // "item.preview.dc.identifier.uri": "Identifier:", @@ -3250,7 +3250,7 @@ // "item.version.history.table.action.deleteVersion": "Delete version", "item.version.history.table.action.deleteVersion": "মুছে ফেলুন সংস্করণ", - // "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history", + // "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history", "item.version.history.table.action.hasDraft": "একটি নতুন সংস্করণ তৈরি করা যাচ্ছে না কারণ ভার্সন হিস্ট্রিতে একটি জমা ইনপ্রগ্রেসস অবস্থাই রয়েছে", @@ -3291,7 +3291,7 @@ // "item.version.create.notification.failure" : "New version has not been created", "item.version.create.notification.failure": "নতুন সংস্করণ তৈরি করা হয়নি", - // "item.version.create.notification.inProgress" : "A new version cannot be created because there is an inprogress submission in the version history", + // "item.version.create.notification.inProgress" : "A new version cannot be created because there is an in-progress submission in the version history", "item.version.create.notification.inProgress": "একটি নতুন সংস্করণ তৈরি করা যাবে না কারণ ভার্সন হিস্ট্রিতে একটি জমা ইনপ্রগ্রেসস অবস্থাই রয়েছে", diff --git a/src/assets/i18n/ca.json5 b/src/assets/i18n/ca.json5 index ad8fe49424e..33919fecc32 100644 --- a/src/assets/i18n/ca.json5 +++ b/src/assets/i18n/ca.json5 @@ -3376,7 +3376,7 @@ // "item.page.version.create": "Create new version", "item.page.version.create": "Crear una nova versió", - // "item.page.version.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history", + // "item.page.version.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history", "item.page.version.hasDraft": "No es pot crear una nova versió perquè a l'historial de versions hi ha un enviament en curs", // "item.page.claim.button": "Claim", @@ -3535,7 +3535,7 @@ // "item.version.history.table.action.deleteVersion": "Delete version", "item.version.history.table.action.deleteVersion": "Esborrar versió", - // "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history", + // "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history", "item.version.history.table.action.hasDraft": "No és possible crear una nova versió ja que existeix a l'historial de versions un enviament pendent", @@ -3582,7 +3582,7 @@ // "item.version.create.notification.failure" : "New version has not been created", "item.version.create.notification.failure": "No s'ha creat una nova versió", - // "item.version.create.notification.inProgress" : "A new version cannot be created because there is an inprogress submission in the version history", + // "item.version.create.notification.inProgress" : "A new version cannot be created because there is an in-progress submission in the version history", "item.version.create.notification.inProgress": "No és possible crear una nova versió ja que existeix a l'historial de versions un enviament pendent", diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index d7c50b1a603..5af26257915 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -2472,7 +2472,7 @@ "item.page.version.create": "Create new version", - "item.page.version.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history", + "item.page.version.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history", "item.page.claim.button": "Claim", @@ -2582,7 +2582,7 @@ "item.version.history.table.action.deleteVersion": "Delete version", - "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history", + "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history", "item.version.notice": "This is not the latest version of this item. The latest version can be found here.", @@ -2612,7 +2612,7 @@ "item.version.create.notification.failure": "New version has not been created", - "item.version.create.notification.inProgress": "A new version cannot be created because there is an inprogress submission in the version history", + "item.version.create.notification.inProgress": "A new version cannot be created because there is an in-progress submission in the version history", "item.version.delete.modal.header": "Delete version", diff --git a/src/assets/i18n/es.json5 b/src/assets/i18n/es.json5 index 0d5b27473cf..13e6b36b7b8 100644 --- a/src/assets/i18n/es.json5 +++ b/src/assets/i18n/es.json5 @@ -3660,7 +3660,7 @@ // "item.page.version.create": "Create new version", "item.page.version.create": "Crear una nueva version", - // "item.page.version.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history", + // "item.page.version.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history", "item.page.version.hasDraft": "No se puede crear una nueva versión porque en el historial de versiones hay un envío en curso", // "item.page.claim.button": "Claim", @@ -3819,7 +3819,7 @@ // "item.version.history.table.action.deleteVersion": "Delete version", "item.version.history.table.action.deleteVersion": "Borrar versión", - // "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history", + // "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history", "item.version.history.table.action.hasDraft": "No es posible crear una nueva versión puesto que existe en el historial de versiones un envío pendiente", // "item.version.notice": "This is not the latest version of this item. The latest version can be found here.", @@ -3864,7 +3864,7 @@ // "item.version.create.notification.failure": "New version has not been created", "item.version.create.notification.failure": "No se ha creado una nueva versión", - // "item.version.create.notification.inProgress": "A new version cannot be created because there is an inprogress submission in the version history", + // "item.version.create.notification.inProgress": "A new version cannot be created because there is an in-progress submission in the version history", "item.version.create.notification.inProgress": "No es posible crear una nueva versión puesto que existe en el historial de versiones un envío pendiente", // "item.version.delete.modal.header": "Delete version", diff --git a/src/assets/i18n/fr.json5 b/src/assets/i18n/fr.json5 index 699ca5cc27b..62143efb6ce 100644 --- a/src/assets/i18n/fr.json5 +++ b/src/assets/i18n/fr.json5 @@ -3108,7 +3108,7 @@ // "item.page.version.create": "Create new version", "item.page.version.create": "Créer une nouvelle version", - // "item.page.version.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history", + // "item.page.version.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history", "item.page.version.hasDraft": "Une nouvelle version ne peut être créée car il y a une soumission en cours dans l'historique des versions", // "item.preview.dc.identifier.uri": "Identifier:", @@ -3234,7 +3234,7 @@ // "item.version.history.table.action.deleteVersion": "Delete version", "item.version.history.table.action.deleteVersion": "Supprimer la version", - // "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history", + // "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history", "item.version.history.table.action.hasDraft": "Une nouvelle version ne peut pas être créée parce qu'il y a une soumission en cours dans l'historique des versions.", // "item.version.notice": "This is not the latest version of this item. The latest version can be found here.", @@ -3273,7 +3273,7 @@ // "item.version.create.notification.failure": "New version has not been created", "item.version.create.notification.failure": "La nouvelle version n'a pas été créée", - // "item.version.create.notification.inProgress": "A new version cannot be created because there is an inprogress submission in the version history", + // "item.version.create.notification.inProgress": "A new version cannot be created because there is an in-progress submission in the version history", "item.version.create.notification.inProgress": "Une nouvelle version ne peut pas être créée parce qu'il y a une soumission en cours dans l'historique des versions.", // "item.version.delete.modal.header": "Delete version", diff --git a/src/assets/i18n/gd.json5 b/src/assets/i18n/gd.json5 index 55a53bc6f1b..b509f57b5a6 100644 --- a/src/assets/i18n/gd.json5 +++ b/src/assets/i18n/gd.json5 @@ -3106,7 +3106,7 @@ // "item.page.version.create": "Create new version", "item.page.version.create": "Cruthaich dreach ùr", - // "item.page.version.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history", + // "item.page.version.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history", "item.page.version.hasDraft": "Cha ghabh dreach ùr a chruthachadh oir tha cur-a-steach a' tachairt ann an eachdraidh nan dreachan", // "item.preview.dc.identifier.uri": "Identifier:", @@ -3235,7 +3235,7 @@ // "item.version.history.table.action.deleteVersion": "Delete version", "item.version.history.table.action.deleteVersion": "Dubh às dreach", - // "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history", + // "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history", "item.version.history.table.action.hasDraft": "Cha ghabh dreach ùr a chruthachadh oir tha cur-a-steach a' tachairt ann an eachdraidh nan dreachan", @@ -3276,7 +3276,7 @@ // "item.version.create.notification.failure" : "New version has not been created", "item.version.create.notification.failure": "Cha deach dreach ùr a chruthachadh", - // "item.version.create.notification.inProgress" : "A new version cannot be created because there is an inprogress submission in the version history", + // "item.version.create.notification.inProgress" : "A new version cannot be created because there is an in-progress submission in the version history", "item.version.create.notification.inProgress": "Cha ghabh dreach ùr a chruthachadh oir tha cur-a-steach a' tachairt ann an eachdraidh nan dreachan", diff --git a/src/assets/i18n/hu.json5 b/src/assets/i18n/hu.json5 index d186f6435a7..5f70b05e12c 100644 --- a/src/assets/i18n/hu.json5 +++ b/src/assets/i18n/hu.json5 @@ -3975,9 +3975,9 @@ // TODO New key - Add a translation "item.page.version.create": "Create new version", - // "item.page.version.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history", + // "item.page.version.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history", // TODO New key - Add a translation - "item.page.version.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history", + "item.page.version.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history", // "item.page.claim.button": "Claim", // TODO New key - Add a translation @@ -4162,9 +4162,9 @@ // TODO New key - Add a translation "item.version.history.table.action.deleteVersion": "Delete version", - // "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history", + // "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history", // TODO New key - Add a translation - "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history", + "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history", // "item.version.notice": "This is not the latest version of this item. The latest version can be found here.", @@ -4223,9 +4223,9 @@ // TODO New key - Add a translation "item.version.create.notification.failure": "New version has not been created", - // "item.version.create.notification.inProgress" : "A new version cannot be created because there is an inprogress submission in the version history", + // "item.version.create.notification.inProgress" : "A new version cannot be created because there is an in-progress submission in the version history", // TODO New key - Add a translation - "item.version.create.notification.inProgress": "A new version cannot be created because there is an inprogress submission in the version history", + "item.version.create.notification.inProgress": "A new version cannot be created because there is an in-progress submission in the version history", // "item.version.delete.modal.header": "Delete version", diff --git a/src/assets/i18n/it.json5 b/src/assets/i18n/it.json5 index 7f410ce0b17..c23d7e2102f 100644 --- a/src/assets/i18n/it.json5 +++ b/src/assets/i18n/it.json5 @@ -3663,7 +3663,7 @@ // "item.page.version.create": "Create new version", "item.page.version.create": "Crea una nuova versione", - // "item.page.version.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history", + // "item.page.version.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history", "item.page.version.hasDraft": "Impossibile creare una nuova versione perché è presente un'submission in corso nella cronologia delle versioni", // "item.page.claim.button": "Claim", @@ -3822,7 +3822,7 @@ // "item.version.history.table.action.deleteVersion": "Delete version", "item.version.history.table.action.deleteVersion": "Elimina versione", - // "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history", + // "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history", "item.version.history.table.action.hasDraft": "Non è possibile creare una nuova versione perchè c'è già una submission in progress nella cronologia delle versioni", @@ -3869,7 +3869,7 @@ // "item.version.create.notification.failure": "New version has not been created", "item.version.create.notification.failure": "Non è stata creata una nuova versione", - // "item.version.create.notification.inProgress": "A new version cannot be created because there is an inprogress submission in the version history", + // "item.version.create.notification.inProgress": "A new version cannot be created because there is an in-progress submission in the version history", "item.version.create.notification.inProgress": "Non è possibile creare una nuova versione perchè c'è già una submission in progress nella cronologia delle versioni", diff --git a/src/assets/i18n/kk.json5 b/src/assets/i18n/kk.json5 index d23dc23c475..6ad3942d23a 100644 --- a/src/assets/i18n/kk.json5 +++ b/src/assets/i18n/kk.json5 @@ -3321,7 +3321,7 @@ // "item.page.version.create": "Create new version", "item.page.version.create": "Жаңа нұсқасын жасау", - // "item.page.version.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history", + // "item.page.version.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history", "item.page.version.hasDraft": "Жаңа нұсқаны жасау мүмкін емес, өйткені нұсқа тарихында аяқталмаған жіберу бар", // "item.page.claim.button": "Claim", @@ -3481,7 +3481,7 @@ // "item.version.history.table.action.deleteVersion": "Delete version", "item.version.history.table.action.deleteVersion": "Нұсқаны өшіру", - // "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history", + // "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history", "item.version.history.table.action.hasDraft": "Жаңа нұсқаны жасау мүмкін емес, өйткені нұсқа тарихында аяқталмаған бағынымдар бар", @@ -3528,7 +3528,7 @@ // "item.version.create.notification.failure" : "New version has not been created", "item.version.create.notification.failure": "Жаңа нұсқа жасалмады", - // "item.version.create.notification.inProgress" : "A new version cannot be created because there is an inprogress submission in the version history", + // "item.version.create.notification.inProgress" : "A new version cannot be created because there is an in-progress submission in the version history", "item.version.create.notification.inProgress": "Жаңа нұсқаны жасау мүмкін емес, өйткені нұсқа тарихында аяқталмаған жіберу бар", diff --git a/src/assets/i18n/pt-BR.json5 b/src/assets/i18n/pt-BR.json5 index ce35f1ec055..3eea67069df 100644 --- a/src/assets/i18n/pt-BR.json5 +++ b/src/assets/i18n/pt-BR.json5 @@ -3669,7 +3669,7 @@ // "item.page.version.create": "Create new version", "item.page.version.create": "Criar nova versão", - // "item.page.version.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history", + // "item.page.version.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history", "item.page.version.hasDraft": "Não é possível criar uma nova versão porque há uma submissão em andamento no histórico de versões", // "item.page.claim.button": "Claim", @@ -3828,7 +3828,7 @@ // "item.version.history.table.action.deleteVersion": "Delete version", "item.version.history.table.action.deleteVersion": "Apagar versão", - // "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history", + // "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history", "item.version.history.table.action.hasDraft": "Não é possível criar uma nova versão porque há uma submissão em andamento no histórico de versões", // "item.version.notice": "This is not the latest version of this item. The latest version can be found here.", @@ -3873,7 +3873,7 @@ // "item.version.create.notification.failure": "New version has not been created", "item.version.create.notification.failure": "A nova versão não foi criada", - // "item.version.create.notification.inProgress": "A new version cannot be created because there is an inprogress submission in the version history", + // "item.version.create.notification.inProgress": "A new version cannot be created because there is an in-progress submission in the version history", "item.version.create.notification.inProgress": "Não é possível criar uma nova versão porque há uma submissão em andamento no histórico de versões", // "item.version.delete.modal.header": "Delete version", diff --git a/src/assets/i18n/pt-PT.json5 b/src/assets/i18n/pt-PT.json5 index faa027705e0..59ac6aca71f 100644 --- a/src/assets/i18n/pt-PT.json5 +++ b/src/assets/i18n/pt-PT.json5 @@ -3619,7 +3619,7 @@ // "item.page.version.create": "Create new version", "item.page.version.create": "Criar nova versão", - // "item.page.version.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history", + // "item.page.version.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history", "item.page.version.hasDraft": "Um nova versão não pode ser criada porque já se encontra uma submisão em curso no histórico de versões.", // "item.page.claim.button": "Claim", @@ -3776,7 +3776,7 @@ // "item.version.history.table.action.deleteVersion": "Delete version", "item.version.history.table.action.deleteVersion": "Remover versão", - // "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history", + // "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history", "item.version.history.table.action.hasDraft": "Uma nova versão não pode ser criada porque se encontra um depósito em curso no histórico de versões", // "item.version.notice": "This is not the latest version of this item. The latest version can be found here.", @@ -3821,7 +3821,7 @@ // "item.version.create.notification.failure": "New version has not been created", "item.version.create.notification.failure": "Nova versão não foi criada", - // "item.version.create.notification.inProgress": "A new version cannot be created because there is an inprogress submission in the version history", + // "item.version.create.notification.inProgress": "A new version cannot be created because there is an in-progress submission in the version history", "item.version.create.notification.inProgress": "Uma nova versão não pode ser criada porque se encontra um depósito em curso no histórico de versões", // "item.version.delete.modal.header": "Delete version", diff --git a/src/assets/i18n/sv.json5 b/src/assets/i18n/sv.json5 index 4e3576ccfc0..023b3e2e18e 100644 --- a/src/assets/i18n/sv.json5 +++ b/src/assets/i18n/sv.json5 @@ -3151,7 +3151,7 @@ // "item.page.version.create": "Create new version", "item.page.version.create": "Skapa ny version", - // "item.page.version.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history", + // "item.page.version.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history", "item.page.version.hasDraft": "Ny version kan inte skapas pga pågående uppladdning i versionshistoriken", // "item.preview.dc.identifier.uri": "Identifier:", @@ -3281,9 +3281,9 @@ // "item.version.history.table.action.deleteVersion": "Delete version", "item.version.history.table.action.deleteVersion": "Radera version", - // "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history", + // "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history", // TODO New key - Add a translation - "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history", + "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history", // "item.version.notice": "This is not the latest version of this item. The latest version can be found here.", @@ -3323,9 +3323,9 @@ // "item.version.create.notification.failure" : "New version has not been created", "item.version.create.notification.failure": "Ny version har inte skapats", - // "item.version.create.notification.inProgress" : "A new version cannot be created because there is an inprogress submission in the version history", + // "item.version.create.notification.inProgress" : "A new version cannot be created because there is an in-progress submission in the version history", // TODO New key - Add a translation - "item.version.create.notification.inProgress": "A new version cannot be created because there is an inprogress submission in the version history", + "item.version.create.notification.inProgress": "A new version cannot be created because there is an in-progress submission in the version history", // "item.version.delete.modal.header": "Delete version",