Merge pull request #11 from xeptagondev/carbon-133

Changes in success and error messages and, minor change in forgot pas…

backend/services/src/i18n/en/programme.json

@@ -9,7 +9,7 @@
     "programmeNotExistWIthId": "Programme does not exist {}",
     "companyIsNotOwnerOfProgramme": "Company {} does not own the programme",
     "companyHaveNoEnoughCredits": "Company {} does not have enough credits",
-    "alreadyCertified": "Certifier already certified the programme",
+    "alreadyCertified": "This programme has already been certified",
     "onlyCertifierCanIssuedProgramme": "Can certify only issued programmes",
     "notCertifiedByCertifier": "Certifier does not certified the programme",
     "failedToUpdate": "Programme failed to update",
@@ -20,15 +20,16 @@
     "notImplementedForMitigationType": "Not implemented for mitigation type {}",
     "transferReqNotExist": "Transfer request does not exist",
     "transferReqAlreadyCancelled": "This transfer request has already been cancelled",
+    "acceptOrRejAlreadyCancelled": "This transfer request has been cancelled",
     "invalidApproverForTransferReq": "Invalid approver for the transfer request",
     "invalidApproverForRetirementReq": "Invalid approver for the retirement request",
-    "noPendReqFound": "No pending transfer request found",
+    "noPendReqFound": "This transfer request has been cancelled",
     "transferAlreadyApproved": "This transfer request has already been accepted",
     "receiveCompanySuspended": "Receive company suspended",
     "cerditSendingCompSuspended": "Credit sending company suspended",
-    "noPendingTransferReq": "No pending transfer request found",
+    "noPendingTransferReq": "This transfer request has been cancelled",
     "internalErrorStatusUpdating": "Internal error on status updating",
-    "transferReqAlreadyProcessed": "Transfer already processed",
+    "transferReqAlreadyProcessed": "This transfer request has already been cancelled",
     "transferReqNotExistinGiv": "Transfer request does not exist in the giv",
     "totalAmount>0": "Total Amount should be greater than 0",
     "companyCreditNeedsToDefineForMultipleComp": "Company credit needs to define for multiple companies",
@@ -63,12 +64,14 @@
     "notInAUthorizedState": "Programme is not in authorised state",
     "issuedCreditAmountcantExceedPendingCredit": "Programme issued credit amount can not exceed pending credit amount",
     "notFOundAPendingProgrammeForTheId": "Does not found a pending programme for the given programme id {}",
-    "notInPendingState": "Programme is not in pending state",
+    "notInPendingState": "This programme has already been authorised",
     "issuedCreditCantExceedEstCredit": "Programme issued credit amount can not exceed estimated credit amount",
     "transferReqRejectSuccess": "The transfer request has been rejected successfully",
     "transferReqCancelSuccess": "The international transfer retire request has been cancelled successfully",
     "certifierCanOnlyCertifiy": "Programme certification can perform only by certifier",
     "govOrProgrammeOwnerOnlyCreditRetirement": "Credit retirement can initiate only the government or programme owner",
     "issuedCreditCannotExceedEstCredit": "Programme issue credit amount can not exceed estimated credit amount",
-    "organisationDeactivated": "This action is unauthorised due to the deactivation of your organisation. You will now be logged out of the system. Log in again to access the system with view-only permissions."
+    "organisationDeactivated": "This action is unauthorised due to the deactivation of your organisation. You will now be logged out of the system. Log in again to access the system with view-only permissions.",
+    "unAuth": "This action is unauthorised",
+    "companyIsNotTheOwnerOfProg": "Company {} is not an owner company of the programme"
 }

backend/services/src/i18n/en/user.json

@@ -3,11 +3,11 @@
     "createUserSuccess": "The user has been created successfully",
     "createOrganisationSuccess": "The organisation has been created successfully",
     "createExistingUser": "This user already exists",
-    "addUserToUnRegisteredCompany": "The programme ID is invalid",
+    "addUserToUnRegisteredCompany": "The Organisation has not been registered with the Carbon Registry",
     "createManagerOrViewerAsInitialUserOfACompany": "The initial user must be an admin",
     "createUserUnAuthorized": "This action is unauthorised",
     "createUserToOtherCompaniesUnAuth": "This action is unauthorised",
-    "companyCreateUserShouldbeAdmin": "Company create user should be an Admin user",
+    "companyCreateUserShouldbeAdmin": "The initial user must be an admin",
     "governmentUserAlreadyExist": "Government already exist for the country code {}",
     "companyCreateNotPermittedForTheCompanyRole": "Company create does not permitted for your company role",
     "companyUpdateFailed": "Company update failed. Please try again",
@@ -29,5 +29,6 @@
     "resetPasswordReqNotFound": "Invalid request id",
     "resetPasswordReqExpired": "Your password resetting request has been expired",
     "reqIdFound": "Reset request id found",
-    "resetEmailSent": "User found, An email was sent"
+    "resetEmailSent": "User found, An email was sent",
+    "invalidCountry": "Country is invalid"
 }

backend/services/src/shared/email-helper/email.template.ts

@@ -106,7 +106,7 @@ export const EmailTemplates = {
     html: `
         Hi {{name}},<br><br>
         We received a request to reset your Carbon Registry password. <br><br>
-        Use the link below to set a new password for your account. This password reset is only valid for the next 24 hours.
+        Use the link below to set a new password for your account. This password reset is only valid for the next hour.
         <br><br>
 
         <a href="http://www-test-carbon.s3-website-us-east-1.amazonaws.com/resetPassword/{{requestId}}">Click here to reset the password</a>