hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-07 10:04:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1708 from toniprieto/translate-accept-license-step

Browse Source 
Make label and error messages for license-step accept-checkbox translatable
This commit is contained in:
Tim Donohue
2022-07-27 15:54:53 -05:00
committed by GitHub
parent 6b36412f6c 5ee4c6b61b
commit f80e72df9a
4 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/submission/sections/license/section-license.component.ts
View File

@@ -29,6 +29,7 @@ import { renderSectionFor } from '../sections-decorator';
import { SectionsType } from '../sections-type'; import { SectionsType } from '../sections-type';
import { SectionsService } from '../sections.service'; import { SectionsService } from '../sections.service';
import { SECTION_LICENSE_FORM_LAYOUT, SECTION_LICENSE_FORM_MODEL } from './section-license.model'; 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. * This component represents a section that contains the submission license form.
@@ -99,6 +100,7 @@ export class SubmissionSectionLicenseComponent extends SectionModelComponent {
* @param {JsonPatchOperationsBuilder} operationsBuilder * @param {JsonPatchOperationsBuilder} operationsBuilder
* @param {SectionsService} sectionService * @param {SectionsService} sectionService
* @param {SubmissionService} submissionService * @param {SubmissionService} submissionService
* @param {TranslateService} translateService
* @param {string} injectedCollectionId * @param {string} injectedCollectionId
* @param {SectionDataObject} injectedSectionData * @param {SectionDataObject} injectedSectionData
* @param {string} injectedSubmissionId * @param {string} injectedSubmissionId
@@ -111,6 +113,7 @@ export class SubmissionSectionLicenseComponent extends SectionModelComponent {
protected operationsBuilder: JsonPatchOperationsBuilder, protected operationsBuilder: JsonPatchOperationsBuilder,
protected sectionService: SectionsService, protected sectionService: SectionsService,
protected submissionService: SubmissionService, protected submissionService: SubmissionService,
protected translateService: TranslateService,
@Inject('collectionIdProvider') public injectedCollectionId: string, @Inject('collectionIdProvider') public injectedCollectionId: string,
@Inject('sectionDataProvider') public injectedSectionData: SectionDataObject, @Inject('sectionDataProvider') public injectedSectionData: SectionDataObject,
@Inject('submissionIdProvider') public injectedSubmissionId: string) { @Inject('submissionIdProvider') public injectedSubmissionId: string) {
@@ -126,6 +129,9 @@ export class SubmissionSectionLicenseComponent extends SectionModelComponent {
this.formModel = this.formBuilderService.fromJSON(SECTION_LICENSE_FORM_MODEL); this.formModel = this.formBuilderService.fromJSON(SECTION_LICENSE_FORM_MODEL);
const model = this.formBuilderService.findById('granted', this.formModel); const model = this.formBuilderService.findById('granted', this.formModel);
// Translate checkbox label
model.label = this.translateService.instant(model.label);
// Retrieve license accepted status // Retrieve license accepted status
(model as DynamicCheckboxModel).value = (this.sectionData.data as WorkspaceitemSectionLicenseObject).granted; (model as DynamicCheckboxModel).value = (this.sectionData.data as WorkspaceitemSectionLicenseObject).granted;

6
src/app/submission/sections/license/section-license.model.ts
View File

@@ -13,15 +13,15 @@ export const SECTION_LICENSE_FORM_LAYOUT = {
export const SECTION_LICENSE_FORM_MODEL = [ export const SECTION_LICENSE_FORM_MODEL = [
{ {
id: 'granted', id: 'granted',
label: 'I confirm the license above', label: 'submission.sections.license.granted-label',
required: true, required: true,
value: false, value: false,
validators: { validators: {
required: null required: null
}, },
errorMessages: { errorMessages: {
required: 'You must accept the license', required: 'submission.sections.license.required',
notgranted: 'You must accept the license' notgranted: 'submission.sections.license.notgranted'
}, },
type: 'CHECKBOX', type: 'CHECKBOX',
} }

6
src/assets/i18n/en.json5
View File

@@ -4234,6 +4234,12 @@
"submission.sections.accesses.form.until-placeholder": "Until", "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", "submission.sections.sherpa.publication.information": "Publication information",

7
src/assets/i18n/es.json5
View File

@@ -5314,7 +5314,14 @@
// "submission.sections.upload.upload-successful": "Upload successful", // "submission.sections.upload.upload-successful": "Upload successful",
"submission.sections.upload.upload-successful": "Subida exitosa", "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": "New submission",
"submission.submit.breadcrumbs": "Nuevo envío", "submission.submit.breadcrumbs": "Nuevo envío",