Merge pull request #1194 from City-of-Helsinki/UHF-11231

UHF-11231: Change wording on the comprehensive school languages
City-of-Helsinki · Feb 21, 2025 · 39b3797 · 39b3797
2 parents 1567c42 + 2fece9e
commit 39b3797
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/dist/js/school-search.min.js b/dist/js/school-search.min.js
diff --git a/src/js/react/apps/school-search/containers/FeatureFormContainer.tsx b/src/js/react/apps/school-search/containers/FeatureFormContainer.tsx
@@ -85,10 +85,10 @@ const FeatureFormContainer = () => {
   };
 
   const keys: Array<keyof Omit<SearchParams, 'keyword'|'page'|'query'|'a1'|'a2'|'b1'|'b2'|'weighted_education'|'bilingual_education'>> = ['grades_1_6', 'grades_1_9', 'grades_7_9', 'finnish_education', 'swedish_education'];
-  const a1Label: string = Drupal.t('Foreign language starting in 1st grade (A1)', {}, { context: 'TPR Ontologyword details schools' });
-  const a2Label: string = Drupal.t('Optional foreign language starting in 3rd grade (A2)', {}, { context: 'TPR Ontologyword details schools' });
-  const b1Label: string = Drupal.t('Second national language starting in 6th grade (B1)', {}, { context: 'TPR Ontologyword details schools' });
-  const b2Label: string = Drupal.t('Optional foreign language starting in 8th grade (B2)', {}, { context: 'TPR Ontologyword details schools' });
+  const a1Label: string = Drupal.t('Language starting in Grade 1 (A1)', {}, { context: 'TPR Ontologyword details schools' });
+  const a2Label: string = Drupal.t('Language starting in Grade 3 (A2)', {}, { context: 'TPR Ontologyword details schools' });
+  const b1Label: string = Drupal.t('Language starting in Grade 6 (B1)', {}, { context: 'TPR Ontologyword details schools' });
+  const b2Label: string = Drupal.t('Language starting in Grade 7 or 8 (B2)', {}, { context: 'TPR Ontologyword details schools' });
   const weightedEducationLabel: string = Drupal.t('Weighted curriculum education', {}, { context: 'TPR Ontologyword details schools' });
   const bilingualEducationLabel: string = Drupal.t('Bilingual education', {}, { context: 'TPR Ontologyword details schools' });