From 5880a507e4898c38e92398601f9d0669a370cacb Mon Sep 17 00:00:00 2001 From: Jacob Walls Date: Fri, 12 Jan 2024 18:10:08 -0500 Subject: [PATCH] Remove hardcoded sample substrings #1516 --- .../workflows/create-project-workflow/add-things-step.js | 7 ++----- arches_for_science/templates/javascript.htm | 1 + 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/arches_for_science/media/js/views/components/workflows/create-project-workflow/add-things-step.js b/arches_for_science/media/js/views/components/workflows/create-project-workflow/add-things-step.js index 1bb5fdcc7..0e9861c24 100644 --- a/arches_for_science/media/js/views/components/workflows/create-project-workflow/add-things-step.js +++ b/arches_for_science/media/js/views/components/workflows/create-project-workflow/add-things-step.js @@ -114,9 +114,6 @@ define([ analysis: '31d97bdd-f10f-4a26-958c-69cb5ab69af1', }; this.physicalThingTypeNodeId = '8ddfe3ab-b31d-11e9-aff0-a4d18cec433a'; - // TODO(i18n) samples - const sampleSubstring = '[Sample'; // for "[Sample of ..." and "[Sample Area of ..." - const regionSubstring = '[Region'; this.value.subscribe(function(a) { a.forEach(function(action) { @@ -352,8 +349,8 @@ define([ return ( result.context_label.includes("Physical Thing") || result.context_label.includes("Search Term") - ) && (self.includeSamples() || !result.text.includes(sampleSubstring)) - && (self.includeAnalysisAreas() || !result.text.includes(regionSubstring)) + ) && (self.includeSamples() || !result.text.includes(arches.translations.sample)) + && (self.includeAnalysisAreas() || !result.text.includes(arches.translations.analysisArea)) }); return { "results": filteredResults diff --git a/arches_for_science/templates/javascript.htm b/arches_for_science/templates/javascript.htm index 5fd6a8f0d..cbe3feefe 100644 --- a/arches_for_science/templates/javascript.htm +++ b/arches_for_science/templates/javascript.htm @@ -150,6 +150,7 @@ analysis-area='{% trans "Analysis Area" as analysisArea %} "{{ analysisArea|escapejs }}"' analysis-areas='{% trans "Analysis Areas" as analysisAreas %} "{{ analysisAreas|escapejs }}"' analysis-area-of='{% trans "{analysisName} [Analysis Area of {physicalThingName}]" as analysisAreaOf %} "{{ analysisAreaOf|escapejs }}"' + sample='{% trans "Sample" as sample %} "{{ sample|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 }}"'