Merge pull request #921 from opencrvs/master-to-develop

Merge master into develop
opencrvs · Feb 29, 2024 · 6371dfe · 6371dfe
2 parents e30e35f + 38f5d46
commit 6371dfe
Show file tree

Hide file tree

Showing 27 changed files with 1,036 additions and 692 deletions.
diff --git a/src/api/certificate-configuration/handler.ts b/src/api/certificate-configuration/handler.ts
@@ -27,7 +27,7 @@ export function certificateConfigurationHandler(): Configuration {
     fonts: {
       ['Noto Sans']: {
         normal: `${COUNTRY_CONFIG_URL}/fonts/NotoSans-Regular.ttf`,
-        bold: `${COUNTRY_CONFIG_URL}/fonts/NotoSans-SemiBold.ttf`,
+        bold: `${COUNTRY_CONFIG_URL}/fonts/NotoSans-Bold.ttf`,
         italics: `${COUNTRY_CONFIG_URL}/fonts/NotoSans-Regular.ttf`,
         bolditalics: `${COUNTRY_CONFIG_URL}/fonts/NotoSans-Regular.ttf`
       }

diff --git a/src/api/content/client/client.json b/src/api/content/client/client.json
@@ -881,6 +881,9 @@
         "fieldAgentHome.requireUpdatesCountLoading": "Checking your declarations",
         "fieldAgentHome.sentForReviewCount": "Sent for review ({total})",
         "fieldAgentHome.zeroUpdatesText": "No declarations require updates",
+        "form.customField.label.numberOfDependants": "No. of dependants",
+        "form.customField.label.reasonForLateRegistrationBirth": "Reason for delayed registration",
+        "form.customField.label.reasonForLateRegistrationDeath": "Reason for late registration",
         "form.field.SearchField.changeButtonLabel": "{fieldName, select, registrationOffice {Change assigned office} other {Change health institute}}",
         "form.field.SearchField.modalTitle": "{fieldName, select, registrationOffice {Assigned registration office} other {Health institutions}}",
         "form.field.SearchField.officeLocationId": "Id: {locationId}",
@@ -1357,6 +1360,7 @@
         "home.header.nationalId": "National ID",
         "home.header.placeHolderBrnDrn": "Search for a BRN/DRN",
         "home.header.placeHolderEmail": "Search for an email.",
+        "home.header.placeHolderId": "Search for an ID",
         "home.header.placeHolderNationalId": "Search for a national ID.",
         "home.header.placeHolderPhone": "Search for a phone no.",
         "home.header.placeHolderTrackingId": "Search for a tracking ID",
@@ -3012,6 +3016,9 @@
         "fieldAgentHome.requireUpdatesCountLoading": "Vérification de vos déclarations",
         "fieldAgentHome.sentForReviewCount": "Envoyées pour révision ({total})",
         "fieldAgentHome.zeroUpdatesText": "Aucune déclaration ne nécessite de mise à jour",
+        "form.customField.label.numberOfDependants": "Nombre de personnes à charge",
+        "form.customField.label.reasonForLateRegistrationBirth": "Raison du retard d'inscription",
+        "form.customField.label.reasonForLateRegistrationDeath": "Raison de l'inscription tardive",
         "form.field.SearchField.changeButtonLabel": "{fieldName, select, registrationOffice {Bureau d'enregistrement assigné} autre {Instituts de santé}}",
         "form.field.SearchField.modalTitle": "{fieldName, select, registrationOffice {Bureau d'enregistrement assigné} autre {Instituts de santé}}",
         "form.field.SearchField.officeLocationId": "Id : {locationId}",
@@ -3488,6 +3495,7 @@
         "home.header.nationalId": "Carte d'identité nationale",
         "home.header.placeHolderBrnDrn": "Recherche d'un BRN/DRN",
         "home.header.placeHolderEmail": "Recherchez un e-mail.",
+        "home.header.placeHolderId": "Recherche d'un ID",
         "home.header.placeHolderNationalId": "Recherche d'une carte d'identité nationale",
         "home.header.placeHolderPhone": "Recherche d'un numéro de téléphone",
         "home.header.placeHolderTrackingId": "Recherche d'un ID de suivi",

diff --git a/src/api/content/client/descriptions.json b/src/api/content/client/descriptions.json
@@ -272,8 +272,6 @@
     "constants.issueToInformant": "Issuance of death to informant",
     "constants.issueConfirmationMessage": "Confirmation of issuance",
     "constants.idCheckWithoutVerify": "Issuance without the confirmation of proof",
-    "form.field.label.UNION": "Label for Union",
-    "form.field.label.DIVISION": "Label for Division",
     "form.field.label.district": "Label for District",
     "form.field.label.cityUrbanOption": "Label for City",
     "form.field.label.state": "Label for State",

diff --git a/src/api/content/login/login.json b/src/api/content/login/login.json
@@ -45,8 +45,8 @@
         "login.verficationCodeLabel": "Verification code (6 digits)",
         "login.verify": "Verify",
         "misc.newPass.header": "Choose a new password",
-        "misc.newPass.instruction": "Create a unique password one that you don't use for another website or application",
-        "password.cases": "Contain upper and lower cases",
+        "misc.newPass.instruction": "Create a unique password - one that you don't use for other websites or applications. A secure and easy to remember passphrase could include three random words, while avoiding the use of personal info.",
+        "password.cases": "At least one upper and lower case character",
         "password.label.confirm": "Confirm password",
         "password.label.new": "New password",
         "password.match": "Passwords match",

diff --git a/src/api/fonts/NotoSans-Bold.ttf b/src/api/fonts/NotoSans-Bold.ttf
diff --git a/src/data-seeding/certificates/README.md b/src/data-seeding/certificates/README.md
diff --git a/src/data-seeding/certificates/handler.ts b/src/data-seeding/certificates/handler.ts
@@ -28,23 +28,23 @@ export async function certificateHandler(request: Request, h: ResponseToolkit) {
   const Certificates = [
     {
       event: 'birth',
-      fileName: 'farajaland-birth-certificate-v1.svg',
+      fileName: 'Farajaland-birth-certificate-v2.svg',
       svgCode: readFileSync(
-        './src/data-seeding/certificates/source/BirthCertificate.svg'
+        './src/data-seeding/certificates/source/Farajaland-birth-certificate-v2.svg'
       ).toString()
     },
     {
       event: 'death',
-      fileName: 'farajaland-death-certificate-v1.svg',
+      fileName: 'Farajaland-death-certificate-v2.svg',
       svgCode: readFileSync(
-        './src/data-seeding/certificates/source/DeathCertificate.svg'
+        './src/data-seeding/certificates/source/Farajaland-death-certificate-v2.svg'
       ).toString()
     },
     {
       event: 'marriage',
-      fileName: 'farajaland-marriage-certificate-v1.svg',
+      fileName: 'Farajaland-marriage-certificate-v2.svg',
       svgCode: readFileSync(
-        './src/data-seeding/certificates/source/MarriageCertificate.svg'
+        './src/data-seeding/certificates/source/Farajaland-marriage-certificate-v2.svg'
       ).toString()
     }
   ]