Scheduling infrastructure for absolutely everyone.
fix: language update functionality #29900 (#29901)
AYUSHKUMAR_21JE0209b2c28a23ab5b
diff --git a/apps/web/modules/settings/my-account/general-view.tsx b/apps/web/modules/settings/my-account/general-view.tsxindex c2e430de7e8..db0af100158 100644--- a/apps/web/modules/settings/my-account/general-view.tsx+++ b/apps/web/modules/settings/my-account/general-view.tsx@@ -18,7 +18,7 @@ import { TimezoneSelect } from "@calcom/web/modules/timezone/components/Timezoneimport TravelScheduleModal from "@components/settings/TravelScheduleModal";import { revalidateSettingsGeneral } from "app/(use-page-wrapper)/settings/(settings-layout)/my-account/general/actions";import { useSession } from "next-auth/react";-import { useState } from "react";+import { useMemo, useState } from "react";import { Controller, useForm } from "react-hook-form";export type FormValues = {@@ -89,15 +89,18 @@ const GeneralView = ({ user, travelSchedules }: GeneralViewProps) => {{ value: 24, label: t("24_hour") },];- const weekStartOptions = [- { value: "Sunday", label: nameOfDay(localeProp, 0) },- { value: "Monday", label: nameOfDay(localeProp, 1) },- { value: "Tuesday", label: nameOfDay(localeProp, 2) },- { value: "Wednesday", label: nameOfDay(localeProp, 3) },- { value: "Thursday", label: nameOfDay(localeProp, 4) },- { value: "Friday", label: nameOfDay(localeProp, 5) },- { value: "Saturday", label: nameOfDay(localeProp, 6) },- ];+ const weekStartOptions = useMemo(+ () => [+ { value: "Sunday", label: nameOfDay(language || localeProp, 0) },+ { value: "Monday", label: nameOfDay(language || localeProp, 1) },+ { value: "Tuesday", label: nameOfDay(language || localeProp, 2) },+ { value: "Wednesday", label: nameOfDay(language || localeProp, 3) },+ { value: "Thursday", label: nameOfDay(language || localeProp, 4) },+ { value: "Friday", label: nameOfDay(language || localeProp, 5) },+ { value: "Saturday", label: nameOfDay(language || localeProp, 6) },+ ],+ [language, localeProp]+ );const formMethods = useForm<FormValues>({defaultValues: {@@ -278,7 +281,7 @@ const GeneralView = ({ user, travelSchedules }: GeneralViewProps) => {<>{t("time_format")}</></Label><Select- value={value}+ value={timeFormatOptions.find((option) => option.value === (typeof value === "object" ? value?.value : value)) || value}options={timeFormatOptions}onChange={(event) => {if (event) formMethods.setValue("timeFormat", { ...event }, { shouldDirty: true });@@ -300,7 +303,7 @@ const GeneralView = ({ user, travelSchedules }: GeneralViewProps) => {<>{t("start_of_week")}</></Label><Select- value={value}+ value={weekStartOptions.find((option) => option.value === (typeof value === "object" ? value?.value : value)) || value}options={weekStartOptions}onChange={(event) => {if (event) formMethods.setValue("weekStart", { ...event }, { shouldDirty: true });diff --git a/apps/web/modules/users/components/UserForm.tsx b/apps/web/modules/users/components/UserForm.tsxindex 7c776cc001c..defe5d088bd 100644--- a/apps/web/modules/users/components/UserForm.tsx+++ b/apps/web/modules/users/components/UserForm.tsx@@ -1,5 +1,6 @@"use client";+import { useMemo } from "react";import { formatToLocalizedDate } from "@calcom/lib/dayjs";import { getUserAvatarUrl } from "@calcom/lib/getAvatarUrl";import { useLocale } from "@calcom/lib/hooks/useLocale";@@ -71,22 +72,25 @@ export function UserForm({onSubmit: (data: FormValues) => void;submitLabel?: string;}) {- const { t } = useLocale();+ const { t, i18n: { language } } = useLocale();const timeFormatOptions = [{ value: 12, label: t("12_hour") },{ value: 24, label: t("24_hour") },];- const weekStartOptions = [- { value: "Sunday", label: nameOfDay(localeProp, 0) },- { value: "Monday", label: nameOfDay(localeProp, 1) },- { value: "Tuesday", label: nameOfDay(localeProp, 2) },- { value: "Wednesday", label: nameOfDay(localeProp, 3) },- { value: "Thursday", label: nameOfDay(localeProp, 4) },- { value: "Friday", label: nameOfDay(localeProp, 5) },- { value: "Saturday", label: nameOfDay(localeProp, 6) },- ];+ const weekStartOptions = useMemo(+ () => [+ { value: "Sunday", label: nameOfDay(language || localeProp, 0) },+ { value: "Monday", label: nameOfDay(language || localeProp, 1) },+ { value: "Tuesday", label: nameOfDay(language || localeProp, 2) },+ { value: "Wednesday", label: nameOfDay(language || localeProp, 3) },+ { value: "Thursday", label: nameOfDay(language || localeProp, 4) },+ { value: "Friday", label: nameOfDay(language || localeProp, 5) },+ { value: "Saturday", label: nameOfDay(language || localeProp, 6) },+ ],+ [language, localeProp]+ );const userRoleOptions = [{ value: "USER", label: t("user") },@@ -257,7 +261,7 @@ export function UserForm({<>{t("time_format")}</></Label><Select- value={value}+ value={timeFormatOptions.find((option) => option.value === (typeof value === "object" ? value?.value : value)) || value}options={timeFormatOptions}onChange={(event) => {if (event) form.setValue("timeFormat", { ...event });@@ -275,7 +279,7 @@ export function UserForm({<>{t("start_of_week")}</></Label><Select- value={value}+ value={weekStartOptions.find((option) => option.value === (typeof value === "object" ? value?.value : value)) || value}options={weekStartOptions}onChange={(event) => {if (event) form.setValue("weekStart", { ...event });