Skip to content

Commit

Permalink
update i18n's
Browse files Browse the repository at this point in the history
  • Loading branch information
rithviknishad committed Sep 2, 2024
1 parent 33551c9 commit a50f7b1
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 10 deletions.
13 changes: 6 additions & 7 deletions src/Components/Medicine/validators.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ export const PrescriptionFormValidator = () => {
form.target_dosage &&
form.base_dosage.split(" ")[1] !== form.target_dosage.split(" ")[1]
) {
errors.base_dosage = t("unit_must_be_same_as_target_dosage_unit");
errors.target_dosage = t("unit_must_be_same_as_base_dosage_unit");
errors.base_dosage = t("inconsistent_dosage_units_error");
errors.target_dosage = t("inconsistent_dosage_units_error");
}
} else {
errors.base_dosage = RequiredFieldValidator()(form.base_dosage);
Expand All @@ -36,8 +36,7 @@ export const PrescriptionFormValidator = () => {
maxDosageValue &&
baseDosageValue > maxDosageValue
) {
errors.max_dosage =
"Max dosage in 24 hours must be greater than or equal to base dosage";
errors.max_dosage = t("max_dosage_in_24hrs_gte_base_dosage_error");
}
} else {
errors.frequency = RequiredFieldValidator()(form.frequency);
Expand All @@ -56,7 +55,7 @@ export const EditPrescriptionFormValidator = (old: Prescription) => {
const errors = PrescriptionFormValidator()(form);

if (comparePrescriptions(old, form)) {
errors.$all = "No changes made";
errors.$all = t("no_changes_made");
}

return errors;
Expand Down Expand Up @@ -97,13 +96,13 @@ export const AdministrationDosageValidator = (
if (!valueDosage) return t("field_required");

if (value?.split(" ")[1] !== base_dosage?.split(" ")[1])
return "Unit must be the same as start and target dosage's unit";
return t("inconsistent_dosage_units_error");

if (baseDosage && targetDosage) {
const [min, max] = [baseDosage, targetDosage].sort((a, b) => a - b);

if (!(min <= valueDosage && valueDosage <= max)) {
return "Dosage should be between start and target dosage";
return t("administration_dosage_range_error");
}
}
};
Expand Down
3 changes: 2 additions & 1 deletion src/Locale/en/Common.json
Original file line number Diff line number Diff line change
Expand Up @@ -191,5 +191,6 @@
"discard": "Discard",
"live": "Live",
"discharged": "Discharged",
"archived": "Archived"
"archived": "Archived",
"no_changes_made": "No changes made"
}
7 changes: 5 additions & 2 deletions src/Locale/en/Medicine.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,5 +61,8 @@
"PRESCRIPTION_FREQUENCY_QID": "6th hourly",
"PRESCRIPTION_FREQUENCY_Q4H": "4th hourly",
"PRESCRIPTION_FREQUENCY_QOD": "Alternate day",
"PRESCRIPTION_FREQUENCY_QWK": "Once a week"
}
"PRESCRIPTION_FREQUENCY_QWK": "Once a week",
"inconsistent_dosage_units_error": "Dosage units must be same",
"max_dosage_in_24hrs_gte_base_dosage_error": "Max. dosage in 24 hours must be greater than or equal to base dosage",
"administration_dosage_range_error": "Dosage should be between start and target dosage"
}

0 comments on commit a50f7b1

Please sign in to comment.