Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: ai translations description for atoms #17875

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions packages/features/bookings/Booker/Booker.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { AnimatePresence, LazyMotion, m } from "framer-motion";
import dynamic from "next/dynamic";
import { useSearchParams } from "next/navigation";
import { useEffect, useMemo, useRef } from "react";
import { Toaster } from "react-hot-toast";
import StickyBox from "react-sticky-box";
Expand Down Expand Up @@ -67,14 +66,10 @@ const BookerComponent = ({
isPlatform,
orgBannerUrl,
customClassNames,
areInstantMeetingParametersSet = false,
userLocale,
}: BookerProps & WrappedBookerProps) => {
const { t } = useLocale();
const searchParams = useSearchParams();

const areInstantMeetingParametersSet = !!event.data?.instantMeetingParameters
? searchParams &&
event.data.instantMeetingParameters.every((param) => Array.from(searchParams.values()).includes(param))
: true;

const [bookerState, setBookerState] = useBookerStore((state) => [state.state, state.setState], shallow);
const selectedDate = useBookerStore((state) => state.selectedDate);
Expand Down Expand Up @@ -358,6 +353,7 @@ const BookerComponent = ({
event={event.data}
isPending={event.isPending}
isPlatform={isPlatform}
locale={userLocale}
/>
{layout !== BookerLayouts.MONTH_VIEW &&
!(layout === "mobile" && bookerState === "booking") && (
Expand Down
10 changes: 5 additions & 5 deletions packages/features/bookings/Booker/components/EventMeta.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { m } from "framer-motion";
import { useSession } from "next-auth/react";
import dynamic from "next/dynamic";
import { useEffect, useMemo } from "react";
import { shallow } from "zustand/shallow";
Expand All @@ -12,9 +11,9 @@ import { EventMetaBlock } from "@calcom/features/bookings/components/event-meta/
import { useTimePreferences } from "@calcom/features/bookings/lib";
import type { BookerEvent } from "@calcom/features/bookings/types";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { locales as i18nLocales } from "@calcom/lib/i18n";
import { EventTypeAutoTranslatedField } from "@calcom/prisma/enums";

import i18nLocales from "../../../../../i18n.json";
import { fadeInUp } from "../config";
import { useBookerStore } from "../store";
import { FromToTime } from "../utils/dates";
Expand All @@ -31,6 +30,7 @@ export const EventMeta = ({
isPending,
isPlatform = true,
classNames,
locale,
}: {
event?: Pick<
BookerEvent,
Expand Down Expand Up @@ -61,8 +61,8 @@ export const EventMeta = ({
eventMetaTitle?: string;
eventMetaTimezoneSelect?: string;
};
locale?: string | null;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

shouldn't this be userLocale? based on the other changes you added

}) => {
const session = useSession();
const { setTimezone, timeFormat, timezone } = useTimePreferences();
const selectedDuration = useBookerStore((state) => state.selectedDuration);
const selectedTimeslot = useBookerStore((state) => state.selectedTimeslot);
Expand Down Expand Up @@ -107,11 +107,11 @@ export const EventMeta = ({
: isHalfFull
? "text-yellow-500"
: "text-bookinghighlight";
const userLocale = session.data?.user.locale ?? navigator.language;
const userLocale = locale ?? navigator.language;
const translatedDescription = (event?.fieldTranslations ?? []).find(
(trans) =>
trans.field === EventTypeAutoTranslatedField.DESCRIPTION &&
i18nLocales.includes(trans.targetLocale) &&
i18nLocales.locale.targets.includes(trans.targetLocale) &&
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  1. i18nLocales name is misleading
  2. i18n.locale.targets.concat([i18n.locale.source])

// browser language looks like "en-US", "es-ES", "fr-FR", etc
(userLocale === trans.targetLocale || userLocale.split("-")[0] === trans.targetLocale)
)?.translatedText;
Expand Down
2 changes: 2 additions & 0 deletions packages/features/bookings/Booker/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,8 @@ export interface BookerProps {
teamMemberEmail?: string | null;
crmOwnerRecordType?: string | null;
crmAppSlug?: string | null;
areInstantMeetingParametersSet?: boolean;
userLocale?: string | null;
}

export type WrappedBookerPropsMain = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -142,17 +142,19 @@ export const EventSetupTab = (
</>
)}
</div>
<div className="[&_label]:my-1 [&_label]:font-normal">
<SettingsToggle
title={t("translate_description_button")}
checked={!!autoTranslateDescriptionEnabled}
onCheckedChange={(value) => {
formMethods.setValue("autoTranslateDescriptionEnabled", value, { shouldDirty: true });
}}
disabled={!orgId}
tooltip={!orgId ? t("orgs_upgrade_to_enable_feature") : undefined}
/>
</div>
{!isPlatform && (
<div className="[&_label]:my-1 [&_label]:font-normal">
<SettingsToggle
title={t("translate_description_button")}
checked={!!autoTranslateDescriptionEnabled}
onCheckedChange={(value) => {
formMethods.setValue("autoTranslateDescriptionEnabled", value, { shouldDirty: true });
}}
disabled={!orgId}
tooltip={!orgId ? t("orgs_upgrade_to_enable_feature") : undefined}
/>
</div>
)}
<TextField
required
label={isPlatform ? "Slug" : t("URL")}
Expand Down
7 changes: 7 additions & 0 deletions packages/platform/atoms/booker/BookerWebWrapper.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,11 @@ export const BookerWebWrapper = (props: BookerWebWrapperAtomProps) => {
theme: event.data?.profile.theme,
});

const areInstantMeetingParametersSet = !!event.data?.instantMeetingParameters
? searchParams &&
event.data.instantMeetingParameters.every((param) => Array.from(searchParams.values()).includes(param))
: true;

return (
<BookerComponent
{...props}
Expand Down Expand Up @@ -219,6 +224,8 @@ export const BookerWebWrapper = (props: BookerWebWrapperAtomProps) => {
schedule={schedule}
verifyCode={verifyCode}
isPlatform={false}
areInstantMeetingParametersSet={areInstantMeetingParametersSet}
userLocale={session?.user.locale}
/>
);
};
Loading