Merge branch 'develop' into forked-v1.6.3

Author: soniarimamy

public/helpers.js

@@ -922,6 +922,11 @@ window.registrationStatementSimplified = registrationStatementSimplified
 function registrationStatement() {
   return function (informantPrimaryDistrict, registrationDistrict) {
     var _a
+    const nameParts = this.registrar.name.trim().split(' ')
+    const registrarFamilyName = nameParts.pop() || ''
+    const rawFirstName = nameParts.join(' ')
+    const registrarFirstName =
+      rawFirstName.trim().toLowerCase() === 'xyz261' ? '' : ` ${rawFirstName}`
     var birthRegistrationDate = getBirthRegistrationDate(this)
     var registrarDateUTC = convertToTimeZoneIso(
       isValidDate(birthRegistrationDate)
@@ -1008,7 +1013,7 @@ function registrationStatement() {
         ),
         [
           'izay miara-manao sonia aminay,',
-          this.registrar.name + ',',
+          registrarFamilyName + registrarFirstName + ',',
           'Mpiandraikitra ny fiankohonana eto amin’ny Kaominina',
           definitionOffice(registrationDistrict) + ',',
           'rehefa novakiana taminy ity soratra ity.---'

src/form/common/certificate/handlebars/helpers.ts

@@ -453,9 +453,11 @@ export function registrationStatement(): Handlebars.HelperDelegate {
     informantPrimaryDistrict: string,
     registrationDistrict: string
   ) {
-    const parts = this.registrar.name.trim().split(' ')
-    const registrarFamilyName = parts.pop() || ''
-    const registrarFirstName = parts.join(' ')
+    const nameParts = this.registrar.name.trim().split(' ')
+    const registrarFamilyName = nameParts.pop() || ''
+    const rawFirstName = nameParts.join(' ')
+    const registrarFirstName =
+      rawFirstName.trim().toLowerCase() === 'xyz261' ? '' : ` ${rawFirstName}`
     const birthRegistrationDate = getBirthRegistrationDate(this)
     const registrarDateUTC = convertToTimeZoneIso(
       isValidDate(birthRegistrationDate)
@@ -521,7 +523,7 @@ export function registrationStatement(): Handlebars.HelperDelegate {
             this.informantOccupation ? this.informantOccupation + ',' : ''
           ]),
       'izay miara-manao sonia aminay,',
-      `${registrarFamilyName} ${registrarFirstName}` + ',',
+      registrarFamilyName + registrarFirstName + ',',
       'Mpiandraikitra ny fiankohonana eto amin’ny Kaominina',
       definitionOffice(registrationDistrict) + ',',
       'rehefa novakiana taminy ity soratra ity.---'

src/translations/client.csv

@@ -1243,7 +1243,7 @@ form.field.label.fetchRegistrationModalInfo,,Birth Registration Number,Numéro d
 form.field.label.fileSizeError,,File size must be less than 2MB,La taille du fichier doit être inférieure à 2 Mo,
 form.field.label.fileUploadError,,{type} supported image only,{type} supporté uniquement,{type} supporté uniquement
 form.field.label.firstName,,First name(s),Prénom,Fanampin'anarana
-form.field.label.firstNameEN,,First name,Prénom,Fanampin'anarana
+form.field.label.firstNameEN,,First name (use xyz261 if not available),Prénom (utilisez xyz261 si non disponible),Fanampin'anarana (ataovy xyz261 raha tsy misy)
 form.field.label.firstNames,,First name(s),Prénom(s),Fanampin'anarana
 form.field.label.fokontanyCustomAddress,,Fokontany,Fokontany,Fokontany
 form.field.label.generateNUI,,Generate NUI,Générer NUI,