Merge branch 'main' into feature/CCM-8861_sftp-poll-2

Author: chris-elliott-nhsd

frontend/src/__tests__/components/molecules/__snapshots__/MessageTemplates.test.tsx.snap

@@ -280,7 +280,7 @@ exports[`MessageTemplates component matches snapshot with not submitted status 1
               >
                 Type 
               </span>
-              Letter - French
+              Standard letter - French
             </td>
             <td
               class="nhsuk-table__cell"
@@ -604,7 +604,7 @@ exports[`MessageTemplates component matches snapshot with submitted status 1`] =
               >
                 Type 
               </span>
-              Letter - French
+              Standard letter - French
             </td>
             <td
               class="nhsuk-table__cell"

frontend/src/__tests__/components/molecules/__snapshots__/PreviewTemplateDetails.test.tsx.snap

@@ -227,7 +227,7 @@ exports[`PreviewTemplateDetails component renders letter template when testDataC
         <dd
           class="nhsuk-summary-list__value"
         >
-          Letter - French
+          Standard letter - French
         </dd>
       </div>
       <div
@@ -327,7 +327,7 @@ exports[`PreviewTemplateDetails component renders letter template when testPerso
         <dd
           class="nhsuk-summary-list__value"
         >
-          Letter - French
+          Standard letter - French
         </dd>
       </div>
       <div

frontend/src/__tests__/components/organisms/__snapshots__/PreviewLetterTemplate.test.tsx.snap

@@ -73,7 +73,7 @@ exports[`PreviewLetterTemplate component matches snapshot 1`] = `
               <dd
                 class="nhsuk-summary-list__value"
               >
-                Letter - Arabic
+                British Sign Language letter - Arabic
               </dd>
             </div>
             <div

utils/utils/src/__tests__/enum.test.ts

@@ -31,12 +31,16 @@ describe('templateTypeDisplayMappings', () => {
 describe('letterTypeDisplayMappings', () => {
   const letterCases: [LetterType, Language, string][] = [
     ['x0', 'en', 'Standard letter'],
-    ['x0', 'bn', 'Letter - Bengali'],
-    ['x0', 'el', 'Letter - Greek'],
+    ['x0', 'bn', 'Standard letter - Bengali'],
+    ['x0', 'el', 'Standard letter - Greek'],
     ['q1', 'en', 'Braille letter'],
     ['x3', 'en', 'Audio CD letter'],
     ['x1', 'en', 'Large print letter'],
     ['q4', 'en', 'British Sign Language letter'],
+    ['q1', 'fr', 'Braille letter - French'],
+    ['x3', 'it', 'Audio CD letter - Italian'],
+    ['x1', 'de', 'Large print letter - German'],
+    ['q4', 'es', 'British Sign Language letter - Spanish'],
   ];
 
   test.each(letterCases)(

utils/utils/src/enum.ts

@@ -48,8 +48,10 @@ const letterTypeMap: Record<LetterType, string> = {
   x0: 'Standard',
   x1: 'Large print',
 };
+
 export const letterTypeMapping = (letterType: LetterType) =>
-  letterTypeMap[letterType];
+  `${letterTypeMap[letterType]} letter`;
+
 export const alphabeticalLetterTypeList = Object.entries(letterTypeMap).sort(
   ([, nameA], [, nameB]) => nameA.localeCompare(nameB)
 );
@@ -59,8 +61,8 @@ export const letterTypeDisplayMappings = (
   language: Language
 ) =>
   language === 'en'
-    ? `${letterTypeMapping(letterType)} letter`
-    : `Letter - ${languageMapping(language)}`;
+    ? letterTypeMapping(letterType)
+    : `${letterTypeMapping(letterType)} - ${languageMapping(language)}`;
 
 export const templateTypeDisplayMappings = (type: TemplateType) =>
   ({