diff --git a/arches_for_science/media/js/views/components/workflows/project-report-workflow/download-report.js b/arches_for_science/media/js/views/components/workflows/project-report-workflow/download-report.js index b52d25be7..1bbfe9722 100644 --- a/arches_for_science/media/js/views/components/workflows/project-report-workflow/download-report.js +++ b/arches_for_science/media/js/views/components/workflows/project-report-workflow/download-report.js @@ -86,7 +86,6 @@ define([ const reportDate = today.toLocaleDateString('en-US', options); const physicalThingsDetailsArray = [...Object.values(physicalThingsDetails)]; const objectOfStudyDetailsArray = physicalThingsDetailsArray.filter(thing => physicalThingFromPreviousStep.includes(thing.resourceinstanceid)); - // TODO(i18n) samples const analysisAreas = physicalThingsDetailsArray.filter(physicalThing => physicalThing.resource?.type?.["@display_value"] == 'analysis areas'); const annotationScreenshots = screenshots?.map((screenshot) => { const url = `${window.location.origin}/temp_file/${screenshot.fileId}`; diff --git a/arches_for_science/media/js/views/components/workflows/sample-taking-workflow/sampling-info-step.js b/arches_for_science/media/js/views/components/workflows/sample-taking-workflow/sampling-info-step.js index 33f1a7251..3e463d937 100644 --- a/arches_for_science/media/js/views/components/workflows/sample-taking-workflow/sampling-info-step.js +++ b/arches_for_science/media/js/views/components/workflows/sample-taking-workflow/sampling-info-step.js @@ -85,8 +85,7 @@ define([ }); this.samplingDate.subscribe(function(val){ - // TODO(i18n) samples - self.samplingName(["Sampling Activity of", self.physicalThingNameValue, val].join(' ')); + self.samplingName(arches.translations.samplingActivityOf.replace('{physicalThingName}', self.physicalThingNameValue) + ' ' + val); }); const selectPhysThingData = params.selectPhysThingData; diff --git a/arches_for_science/media/js/views/components/workflows/upload-dataset/instrument-info-step.js b/arches_for_science/media/js/views/components/workflows/upload-dataset/instrument-info-step.js index 7b2d3f779..978d09757 100644 --- a/arches_for_science/media/js/views/components/workflows/upload-dataset/instrument-info-step.js +++ b/arches_for_science/media/js/views/components/workflows/upload-dataset/instrument-info-step.js @@ -107,8 +107,10 @@ define([ self.instrumentInstance(self.createRelatedInstance(val, instrumentUsedInObservation, observationInstrumentUsedIn)); instrumentData.then(function(data){ self.instrumentName(data._source.displayname); - // TODO(i18n) samples - self.nameValue(`Observation of ${physThingName} with ${data._source.displayname} ${self.dateValue()}`); + const formattedName = arches.translations.observationWith + .replace('{physicalThingName}', physThingName) + .replace('{instrumentName}', data._source.displayname); + self.nameValue(`${formattedName} ${self.dateValue()}`); }); } if (!val) { @@ -119,8 +121,10 @@ define([ this.dateValue.subscribe(function(val){ if (self.instrumentName()) { - // TODO(i18n) samples - self.nameValue(`Observation of ${physThingName} with ${self.instrumentName()} ${val}`); + const formattedName = arches.translations.observationWith + .replace('{physicalThingName}', physThingName) + .replace('{instrumentName}', self.instrumentName()); + self.nameValue(`${formattedName} ${val}`); } }); diff --git a/arches_for_science/templates/javascript.htm b/arches_for_science/templates/javascript.htm index c6af2b236..641d76a4b 100644 --- a/arches_for_science/templates/javascript.htm +++ b/arches_for_science/templates/javascript.htm @@ -151,6 +151,7 @@ analysis-areas='"{{ analysisAreas|pluralize }}"' analysis-area-of='{% trans "{analysisName} [Analysis Area of {physicalThingName}]" as analysisAreaOf %} "{{ analysisAreaOf|escapejs }}"' sample-of='{% trans "{sampleName} [Sample of {physicalThingName}]" as sampleOf %} "{{ sampleOf|escapejs }}"' + sampling-activity-of='{% trans "Sampling Activity of {physicalThingName}" as samplingActivityOf %} "{{ samplingActivityOf|escapejs }}"' no-modifying-areas='{% trans "Analysis Areas may not be modified in the sample taking workflow" as noModifyingAreas %} "{{ noModifyingAreas|escapejs }}"' sample-location='{% trans "Sample Location" as sampleLocation %} "{{ sampleLocation|escapejs }}"' no-modifying-samples='{% trans "Sample locations may not be modified in the analysis area workflow" as noModifyingSamples %} "{{ noModifyingSamples|escapejs }}"' @@ -158,6 +159,7 @@ annotation-summary-for='{% trans "Annotation Summary for" as annotationSummaryFor %} "{{ annotationSummaryFor|escapejs }}"' existing-annotation='{% trans "{title} is a {type} of {parent},\n which is created before" as existingAnnotation %} "{{ existingAnnotation|escapejs }}"' timespan='{% trans "TimeSpan" as timespan %} "{{ timespan|escapejs }}"' + observation-with='{% trans "Observation of {physicalThingName} with {instrumentName}" as observationWith %} "{{ observationWith|escapejs }}"' > {% endblock arches_translations %}