mirror of
https://github.com/DSpace/dspace-angular.git
synced 2025-10-07 01:54:15 +00:00
Merge pull request #1708 from toniprieto/translate-accept-license-step
Make label and error messages for license-step accept-checkbox translatable
This commit is contained in:
@@ -29,6 +29,7 @@ import { renderSectionFor } from '../sections-decorator';
|
||||
import { SectionsType } from '../sections-type';
|
||||
import { SectionsService } from '../sections.service';
|
||||
import { SECTION_LICENSE_FORM_LAYOUT, SECTION_LICENSE_FORM_MODEL } from './section-license.model';
|
||||
import { TranslateService } from '@ngx-translate/core';
|
||||
|
||||
/**
|
||||
* This component represents a section that contains the submission license form.
|
||||
@@ -99,6 +100,7 @@ export class SubmissionSectionLicenseComponent extends SectionModelComponent {
|
||||
* @param {JsonPatchOperationsBuilder} operationsBuilder
|
||||
* @param {SectionsService} sectionService
|
||||
* @param {SubmissionService} submissionService
|
||||
* @param {TranslateService} translateService
|
||||
* @param {string} injectedCollectionId
|
||||
* @param {SectionDataObject} injectedSectionData
|
||||
* @param {string} injectedSubmissionId
|
||||
@@ -111,6 +113,7 @@ export class SubmissionSectionLicenseComponent extends SectionModelComponent {
|
||||
protected operationsBuilder: JsonPatchOperationsBuilder,
|
||||
protected sectionService: SectionsService,
|
||||
protected submissionService: SubmissionService,
|
||||
protected translateService: TranslateService,
|
||||
@Inject('collectionIdProvider') public injectedCollectionId: string,
|
||||
@Inject('sectionDataProvider') public injectedSectionData: SectionDataObject,
|
||||
@Inject('submissionIdProvider') public injectedSubmissionId: string) {
|
||||
@@ -126,6 +129,9 @@ export class SubmissionSectionLicenseComponent extends SectionModelComponent {
|
||||
this.formModel = this.formBuilderService.fromJSON(SECTION_LICENSE_FORM_MODEL);
|
||||
const model = this.formBuilderService.findById('granted', this.formModel);
|
||||
|
||||
// Translate checkbox label
|
||||
model.label = this.translateService.instant(model.label);
|
||||
|
||||
// Retrieve license accepted status
|
||||
(model as DynamicCheckboxModel).value = (this.sectionData.data as WorkspaceitemSectionLicenseObject).granted;
|
||||
|
||||
|
@@ -13,15 +13,15 @@ export const SECTION_LICENSE_FORM_LAYOUT = {
|
||||
export const SECTION_LICENSE_FORM_MODEL = [
|
||||
{
|
||||
id: 'granted',
|
||||
label: 'I confirm the license above',
|
||||
label: 'submission.sections.license.granted-label',
|
||||
required: true,
|
||||
value: false,
|
||||
validators: {
|
||||
required: null
|
||||
},
|
||||
errorMessages: {
|
||||
required: 'You must accept the license',
|
||||
notgranted: 'You must accept the license'
|
||||
required: 'submission.sections.license.required',
|
||||
notgranted: 'submission.sections.license.notgranted'
|
||||
},
|
||||
type: 'CHECKBOX',
|
||||
}
|
||||
|
@@ -4234,6 +4234,12 @@
|
||||
|
||||
"submission.sections.accesses.form.until-placeholder": "Until",
|
||||
|
||||
"submission.sections.license.granted-label": "I confirm the license above",
|
||||
|
||||
"submission.sections.license.required": "You must accept the license",
|
||||
|
||||
"submission.sections.license.notgranted": "You must accept the license",
|
||||
|
||||
|
||||
"submission.sections.sherpa.publication.information": "Publication information",
|
||||
|
||||
|
@@ -5314,7 +5314,14 @@
|
||||
// "submission.sections.upload.upload-successful": "Upload successful",
|
||||
"submission.sections.upload.upload-successful": "Subida exitosa",
|
||||
|
||||
// "submission.sections.license.granted-label": "I confirm the license above",
|
||||
"submission.sections.license.granted-label": "Confirmo la licencia",
|
||||
|
||||
// "submission.sections.license.required": "You must accept the license",
|
||||
"submission.sections.license.required": "Debe aceptar la licencia",
|
||||
|
||||
// "submission.sections.license.notgranted": "You must accept the license",
|
||||
"submission.sections.license.notgranted": "Debe aceptar la licencia",
|
||||
|
||||
// "submission.submit.breadcrumbs": "New submission",
|
||||
"submission.submit.breadcrumbs": "Nuevo envío",
|
||||
|
Reference in New Issue
Block a user