Fix double-translation issue from switching from Transifex

Strings in src/schemas are no longer translated. FormInputError already translates these strings. Having src/schemas
translate strings would cause a double translation. Having FormInputError not translate strings would cause these
strings to not update when switching languages. This was not an issue with @transifex/native, which seems to defer
evaluation of the strings, somehow.

This assumes strings in src/schemas all pass through FormInputError!

Author: jpmckinney

src/schemas/OCPsettings.ts

@@ -1,65 +1,65 @@
 import { type TypeOf, z } from "zod";
-import { t } from "../util/i18n";
 
 import { CREDIT_PRODUCT_TYPE } from "../constants";
 
-const creditProviderNameSchema = z.string().min(1, t("Provider name is required"));
-const creditProviderTypeSchema = z.string().min(1, t("Provider type is required"));
+const creditProviderNameSchema = z.string().min(1, "Provider name is required");
+const creditProviderTypeSchema = z.string().min(1, "Provider type is required");
 
 export const lenderSchema = z.object({
   name: creditProviderNameSchema,
   type: creditProviderTypeSchema,
   sla_days: z.coerce
     .number()
     .int()
-    .positive(t("SLA days must be greater than 0"))
-    .min(1, t("SLA days must be greater than 0")),
-  email_group: z.string().email(t("Email Address is invalid")),
+    .positive("SLA days must be greater than 0")
+    .min(1, "SLA days must be greater than 0"),
+  email_group: z.string().email("Email Address is invalid"),
   logo_filename: z.string(),
-  external_onboarding_url: z.string().url(t("URL is invalid (Hint: include http:// or https://)")),
+  external_onboarding_url: z.string().url("URL is invalid (Hint: include http:// or https://)"),
 });
 
 export type ProviderInput = TypeOf<typeof lenderSchema>;
 
-export const creditProductSchema = z.object({
-  borrower_size: z.string().min(1, t("Borrower size is required")),
-  lower_limit: z.coerce.number().min(1, t("Lower limit must be greater than 0")),
-  upper_limit: z.coerce.number().min(1, t("Upper limit must be greater than 0")),
-  interest_rate: z.string().min(1, t("Interest rate description is required")),
-  type: z.nativeEnum(CREDIT_PRODUCT_TYPE, {
-    errorMap: (issue) => {
-      switch (issue.code) {
-        case "invalid_type":
-        case "invalid_enum_value":
-          return { message: t("Type of product is required") };
-        default:
-          return { message: t("Select an option") };
-      }
-    },
-  }),
-  procurement_category_to_exclude: z.string(),
-  required_document_types: z.record(z.string().min(1), z.boolean()),
-  borrower_types: z.record(z.string().min(1), z.boolean()),
-  other_fees_total_amount: z.preprocess(
-    (args) => (args === "" ? undefined : args),
-    z.coerce
-      .number({
-        required_error: t("Other fees total amount is required"),
-        invalid_type_error: t("Other fees total amount must be a number"),
-      })
-      .gte(0, t("Other fees total amount must be greater or equal than 0")),
-  ),
-  other_fees_description: z.string().min(1, t("Other fees description is required")),
-  additional_information: z.string(),
-  more_info_url: z.string().url(t("URL is invalid (Hint: include http:// or https://)")),
-})
+export const creditProductSchema = z
+  .object({
+    borrower_size: z.string().min(1, "Borrower size is required"),
+    lower_limit: z.coerce.number().min(1, "Lower limit must be greater than 0"),
+    upper_limit: z.coerce.number().min(1, "Upper limit must be greater than 0"),
+    interest_rate: z.string().min(1, "Interest rate description is required"),
+    type: z.nativeEnum(CREDIT_PRODUCT_TYPE, {
+      errorMap: (issue) => {
+        switch (issue.code) {
+          case "invalid_type":
+          case "invalid_enum_value":
+            return { message: "Type of product is required" };
+          default:
+            return { message: "Select an option" };
+        }
+      },
+    }),
+    procurement_category_to_exclude: z.string(),
+    required_document_types: z.record(z.string().min(1), z.boolean()),
+    borrower_types: z.record(z.string().min(1), z.boolean()),
+    other_fees_total_amount: z.preprocess(
+      (args) => (args === "" ? undefined : args),
+      z.coerce
+        .number({
+          required_error: "Other fees total amount is required",
+          invalid_type_error: "Other fees total amount must be a number",
+        })
+        .gte(0, "Other fees total amount must be greater or equal than 0"),
+    ),
+    other_fees_description: z.string().min(1, "Other fees description is required"),
+    additional_information: z.string(),
+    more_info_url: z.string().url("URL is invalid (Hint: include http:// or https://)"),
+  })
   .refine((data) => data.lower_limit < data.upper_limit, {
     path: ["lower_limit"],
-    message: t("Lower limit must be less than upper limit"),
+    message: "Lower limit must be less than upper limit",
   })
   .refine((data) => data.lower_limit < data.upper_limit, {
     path: ["upper_limit"],
-    message: t("Upper limit must be greater than lower limit"),
+    message: "Upper limit must be greater than lower limit",
   });
 
 export type CreditProductInput = TypeOf<typeof creditProductSchema>;

src/schemas/application.ts

@@ -1,21 +1,20 @@
 import { type TypeOf, z } from "zod";
-import { t } from "../util/i18n";
 
 import type { APPLICATION_STATUS, USER_TYPES } from "../constants";
 import { isDateAfterCurrentDate } from "../util";
 import { emailSchema } from "./auth";
 
 export const introSchema = z.object({
   accept_terms_and_conditions: z.boolean().refine((value) => value === true, {
-    message: t("You need to check this option to Access the Scheme"),
+    message: "You need to check this option to Access the Scheme",
   }),
 });
 
 export type IntroInput = TypeOf<typeof introSchema>;
 
 export const submitSchema = z.object({
   agree_topass_info_to_banking_partner: z.boolean().refine((value) => value === true, {
-    message: t("You need to check this option to submit the application"),
+    message: "You need to check this option to submit the application",
   }),
 });
 
@@ -29,14 +28,16 @@ export const applicationBaseSchema = z.object({
 
 export type ApplicationBaseInput = TypeOf<typeof applicationBaseSchema>;
 
-export const declineApplicationSchema = z.object({
-  decline_this: z.boolean(),
-  decline_all: z.boolean(),
-  uuid: UUIDType,
-}).refine((data) => data.decline_this || data.decline_all, {
-  path: ["decline_all"],
-  message: t("You need to check at least one option to Decline the Scheme"),
-});
+export const declineApplicationSchema = z
+  .object({
+    decline_this: z.boolean(),
+    decline_all: z.boolean(),
+    uuid: UUIDType,
+  })
+  .refine((data) => data.decline_this || data.decline_all, {
+    path: ["decline_all"],
+    message: "You need to check at least one option to Decline the Scheme",
+  });
 
 export type DeclineApplicationInput = TypeOf<typeof declineApplicationSchema>;
 
@@ -50,14 +51,13 @@ export enum DECLINE_FEEDBACK {
 }
 
 export const DECLINE_FEEDBACK_NAMES: { [key: string]: string } = {
-  [DECLINE_FEEDBACK.dont_need_access_credit]: t("Don't need access credit"),
-  [DECLINE_FEEDBACK.already_have_acredit]: t("Already have acredit"),
-  [DECLINE_FEEDBACK.preffer_to_go_to_bank]: t("Preffer to go to bank"),
-  [DECLINE_FEEDBACK.dont_want_access_credit]: t("Don't want access credit"),
-  [DECLINE_FEEDBACK.suspicious_email]: t(
+  [DECLINE_FEEDBACK.dont_need_access_credit]: "Don't need access credit",
+  [DECLINE_FEEDBACK.already_have_acredit]: "Already have acredit",
+  [DECLINE_FEEDBACK.preffer_to_go_to_bank]: "Preffer to go to bank",
+  [DECLINE_FEEDBACK.dont_want_access_credit]: "Don't want access credit",
+  [DECLINE_FEEDBACK.suspicious_email]:
     "I perceive the email as suspicious or I do not trust that the credit proposal is true",
-  ),
-  [DECLINE_FEEDBACK.other]: t("Other"),
+  [DECLINE_FEEDBACK.other]: "Other",
 };
 
 export const declineFeedbackSchema = z.object({
@@ -74,10 +74,10 @@ export const declineFeedbackSchema = z.object({
 export type DeclineFeedbackInput = TypeOf<typeof declineFeedbackSchema>;
 
 export const creditOptionsSchema = z.object({
-  borrower_size: z.string().min(1, t("Borrower size is required")),
-  sector: z.string().min(1, t("Sector is required")),
+  borrower_size: z.string().min(1, "Borrower size is required"),
+  sector: z.string().min(1, "Sector is required"),
   annual_revenue: z.coerce.number().optional().nullable(),
-  amount_requested: z.coerce.number().min(1, t("Amount requested must be greater than 0")),
+  amount_requested: z.coerce.number().min(1, "Amount requested must be greater than 0"),
   uuid: UUIDType,
 });
 
@@ -88,15 +88,16 @@ export type GetCreditProductsOptionsInput = Omit<CreditOptionsInput, "sector" |
 export const repaymentTermsSchema = z.object({
   repayment_years: z.coerce
     .number({
-      required_error: t("Years is required"),
-      invalid_type_error: t("Years must be a number"),
+      required_error: "Years is required",
+      invalid_type_error: "Years must be a number",
     })
-    .gte(0, t("Years must be greater or equal than ")),
-  repayment_months: z.coerce.number().min(1, t("Months must be greater or equal than 1")),
-  payment_start_date: z.string()
-    .min(1, t("Payment start date is required"))
+    .gte(0, "Years must be greater or equal than "),
+  repayment_months: z.coerce.number().min(1, "Months must be greater or equal than 1"),
+  payment_start_date: z
+    .string()
+    .min(1, "Payment start date is required")
     .refine((value) => isDateAfterCurrentDate(value), {
-      message: t("Payment start date must be after current date"),
+      message: "Payment start date must be after current date",
     }),
 });
 
@@ -336,7 +337,7 @@ export interface ILenderListResponse {
 }
 
 export const formEmailSchema = z.object({
-  message: z.string().min(1, t("A message is required")),
+  message: z.string().min(1, "A message is required"),
 });
 
 export type FormEmailInput = TypeOf<typeof formEmailSchema>;
@@ -348,10 +349,10 @@ export const approveSchema = z.object({
   compliant_checks_passed: z.boolean(),
   disbursed_final_amount: z.coerce
     .number({
-      required_error: t("Disbursed final amount is required"),
-      invalid_type_error: t("Disbursed final amount must be a number"),
+      required_error: "Disbursed final amount is required",
+      invalid_type_error: "Disbursed final amount must be a number",
     })
-    .gt(0, t("Disbursed final amount must be greater than 0")),
+    .gt(0, "Disbursed final amount must be greater than 0"),
 });
 
 export type FormApprovedInput = TypeOf<typeof approveSchema>;

src/schemas/auth.ts

@@ -1,14 +1,11 @@
 import { type TypeOf, z } from "zod";
-import { t } from "../util/i18n";
 
 import { USER_TYPES } from "../constants";
 import type { ILender } from "./application";
 
-export const emailSchema = z.string().min(1, t("Email address is required")).email(t("Email Address is invalid"));
-const passwordSchema = z.string()
-  .min(1, t("Password is required"))
-  .min(14, t("Password must be more than 14 characters"));
-const otp = z.string().min(6, t("OTP length must be 6 digits")).max(6, t("OTP length must be 6 digits"));
+export const emailSchema = z.string().min(1, "Email address is required").email("Email Address is invalid");
+const passwordSchema = z.string().min(1, "Password is required").min(14, "Password must be more than 14 characters");
+const otp = z.string().min(6, "OTP length must be 6 digits").max(6, "OTP length must be 6 digits");
 
 export const loginSchema = z.object({
   username: emailSchema,
@@ -29,7 +26,7 @@ export interface SetupMFAInput {
   session: string;
 }
 
-const nameSchema = z.string().nonempty(t("Full name is required"));
+const nameSchema = z.string().nonempty("Full name is required");
 
 export const createUserSchema = z.object({
   name: nameSchema,
@@ -39,9 +36,9 @@ export const createUserSchema = z.object({
       switch (issue.code) {
         case "invalid_type":
         case "invalid_enum_value":
-          return { message: t("Type of user is required") };
+          return { message: "Type of user is required" };
         default:
-          return { message: t("Select an option") };
+          return { message: "Select an option" };
       }
     },
   }),
@@ -52,13 +49,15 @@ export type CreateUserInput = TypeOf<typeof createUserSchema>;
 
 export type UpdateUserInput = Omit<CreateUserInput, "email"> & { id: string | undefined };
 
-export const setPasswordSchema = z.object({
-  password: passwordSchema,
-  passwordConfirm: z.string().min(1, t("Please confirm your password")),
-}).refine((data) => data.password === data.passwordConfirm, {
-  path: ["passwordConfirm"],
-  message: t("Passwords do not match"),
-});
+export const setPasswordSchema = z
+  .object({
+    password: passwordSchema,
+    passwordConfirm: z.string().min(1, "Please confirm your password"),
+  })
+  .refine((data) => data.password === data.passwordConfirm, {
+    path: ["passwordConfirm"],
+    message: "Passwords do not match",
+  });
 
 export type UpdatePasswordInput = TypeOf<typeof setPasswordSchema>;
 export type UpdatePasswordPayload = {