Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.
TypeScript i18nextnext-authnextjspostgresqlprismareact-emailt3-stacktailwindcsstrpcturborepotypescriptzod
💄 Standardise on "time zone" (two words) in UI copy (#2890)
Luke Vella9cacd72ad7e7
diff --git a/apps/web/public/locales/en/app.json b/apps/web/public/locales/en/app.jsonindex aa0597dd2..e89901103 100644--- a/apps/web/public/locales/en/app.json+++ b/apps/web/public/locales/en/app.json@@ -403,7 +403,7 @@"locationDisplayTextPlaceholder": "Meeting link","locationInPerson": "In person","locationPlaceholder": "Joe's Coffee Shop",- "lockTimeZone": "Lock timezone",+ "lockTimeZone": "Lock time zone","lockTimeZoneAllDayHelp": "All-day options already show the same date to everyone.","lockTimeZoneDisabledHelp": "The time zone can't be changed after votes have been cast.","lockTimeZoneHelp": "Everyone sees the same time, instead of it converting to each participant's time zone.",@@ -488,7 +488,7 @@"noChanges": "No changes","noDatesSelected": "No dates selected","noDatesSelectedDescription": "Click on a date to add a time slot",- "noKeepCurrentTimezone": "No, keep the current timezone",+ "noKeepCurrentTimezone": "No, keep the current time zone","noLicenseKey": "No license key found","noLicenseKeyDescription": "This instance doesn’t have a license key yet.","noOpenPolls": "No open polls",@@ -760,9 +760,9 @@"timeFormatSettingDescription": "Show times in 12-hour or 24-hour format.","timePickerSelectTime": "Select time","timeZone": "Time zone",- "timezoneInputPlaceholder": "Search timezone…",- "timeZoneMismatchDialogMessage": "It looks like you are in <b>{currentTimeZone}</b> but your timezone is set to <b>{homeTimeZone}</b>. Do you want to update it?",- "timeZoneMismatchDialogTitle": "Timezone mismatch detected",+ "timezoneInputPlaceholder": "Search time zone…",+ "timeZoneMismatchDialogMessage": "It looks like you are in <b>{currentTimeZone}</b> but your time zone is set to <b>{homeTimeZone}</b>. Do you want to update it?",+ "timeZoneMismatchDialogTitle": "Time zone mismatch detected","timeZoneSelect__noOption": "No option found","timeZoneSettingDescription": "Dates and times are shown in this time zone.","title": "Title",@@ -818,7 +818,7 @@"wrongVerificationCode": "Your verification code is incorrect","yahoo": "Yahoo","yes": "Yes",- "yesUpdateTimezone": "Yes, update my timezone",+ "yesUpdateTimezone": "Yes, update my time zone","you": "You","youAreSignedInAs": "You're signed in as","yourApiKey": "Your API key",diff --git a/apps/web/src/components/time-zone-picker/time-zone-select.tsx b/apps/web/src/components/time-zone-picker/time-zone-select.tsxindex 01baa5b28..937c47635 100644--- a/apps/web/src/components/time-zone-picker/time-zone-select.tsx+++ b/apps/web/src/components/time-zone-picker/time-zone-select.tsx@@ -79,7 +79,7 @@ export function TimeZoneSelect({id={id}disabled={disabled}placeholder={t("timezoneInputPlaceholder", {- defaultValue: "Search timezone…",+ defaultValue: "Search time zone…",})}{...ariaProps}>diff --git a/apps/web/src/features/poll/components/forms/poll-options-form/poll-options-form.tsx b/apps/web/src/features/poll/components/forms/poll-options-form/poll-options-form.tsxindex 31f90e0cf..0d9976a87 100644--- a/apps/web/src/features/poll/components/forms/poll-options-form/poll-options-form.tsx+++ b/apps/web/src/features/poll/components/forms/poll-options-form/poll-options-form.tsx@@ -252,7 +252,7 @@ const PollOptionsForm = ({switchDisabled ? "text-muted-foreground" : undefined}>- <Trans i18nKey="lockTimeZone" defaults="Lock timezone" />+ <Trans i18nKey="lockTimeZone" defaults="Lock time zone" /></Label><Tooltip><TooltipTrigger type="button" delay={0}>diff --git a/apps/web/src/features/user/components/timezone-mismatch-dialog.test.tsx b/apps/web/src/features/user/components/timezone-mismatch-dialog.test.tsxindex f3a7fdaaa..2b904ab10 100644--- a/apps/web/src/features/user/components/timezone-mismatch-dialog.test.tsx+++ b/apps/web/src/features/user/components/timezone-mismatch-dialog.test.tsx@@ -39,7 +39,7 @@ describe("TimeZoneMismatchDialog", () => {it("does not show on a first visit (no cookie), but records the zone", () => {renderDialog({ homeTimeZone: "Europe/Malta" });expect(- screen.queryByText("Timezone mismatch detected"),+ screen.queryByText("Time zone mismatch detected"),).not.toBeInTheDocument();expect(Cookies.get(TIME_ZONE_COOKIE_NAME)).toBe("America/New_York");});@@ -49,14 +49,14 @@ describe("TimeZoneMismatchDialog", () => {Cookies.set(TIME_ZONE_COOKIE_NAME, "America/New_York");renderDialog({ homeTimeZone: "Europe/Malta" });expect(- screen.queryByText("Timezone mismatch detected"),+ screen.queryByText("Time zone mismatch detected"),).not.toBeInTheDocument();});it("shows when the viewer moved to a zone that is not their home zone", () => {Cookies.set(TIME_ZONE_COOKIE_NAME, "Asia/Tokyo");renderDialog({ homeTimeZone: "Europe/Malta" });- expect(screen.getByText("Timezone mismatch detected")).toBeInTheDocument();+ expect(screen.getByText("Time zone mismatch detected")).toBeInTheDocument();expect(Cookies.get(TIME_ZONE_COOKIE_NAME)).toBe("America/New_York");});@@ -64,7 +64,7 @@ describe("TimeZoneMismatchDialog", () => {Cookies.set(TIME_ZONE_COOKIE_NAME, "Asia/Tokyo");renderDialog({ homeTimeZone: "America/New_York" });expect(- screen.queryByText("Timezone mismatch detected"),+ screen.queryByText("Time zone mismatch detected"),).not.toBeInTheDocument();});@@ -72,7 +72,7 @@ describe("TimeZoneMismatchDialog", () => {Cookies.set(TIME_ZONE_COOKIE_NAME, "Asia/Tokyo");renderDialog();expect(- screen.queryByText("Timezone mismatch detected"),+ screen.queryByText("Time zone mismatch detected"),).not.toBeInTheDocument();});@@ -81,7 +81,7 @@ describe("TimeZoneMismatchDialog", () => {Cookies.set(TIME_ZONE_COOKIE_NAME, "Asia/Tokyo");renderDialog({ homeTimeZone: "Europe/Malta" });- await user.click(screen.getByText("Yes, update my timezone"));+ await user.click(screen.getByText("Yes, update my time zone"));expect(mockExecute).toHaveBeenCalledWith({ timeZone: "America/New_York" });});@@ -90,7 +90,7 @@ describe("TimeZoneMismatchDialog", () => {Cookies.set(TIME_ZONE_COOKIE_NAME, "America/New_York");renderDialog({ homeTimeZone: "America/New_York" });expect(- screen.queryByText("Timezone mismatch detected"),+ screen.queryByText("Time zone mismatch detected"),).not.toBeInTheDocument();// Laptop reopened in a new zone: no remount, just a focus event.@@ -100,7 +100,7 @@ describe("TimeZoneMismatchDialog", () => {});expect(- await screen.findByText("Timezone mismatch detected"),+ await screen.findByText("Time zone mismatch detected"),).toBeInTheDocument();expect(Cookies.get(TIME_ZONE_COOKIE_NAME)).toBe("Asia/Tokyo");});@@ -110,11 +110,11 @@ describe("TimeZoneMismatchDialog", () => {Cookies.set(TIME_ZONE_COOKIE_NAME, "Asia/Tokyo");renderDialog({ homeTimeZone: "Europe/Malta" });- await user.click(screen.getByText("No, keep the current timezone"));+ await user.click(screen.getByText("No, keep the current time zone"));expect(mockExecute).not.toHaveBeenCalled();expect(- screen.queryByText("Timezone mismatch detected"),+ screen.queryByText("Time zone mismatch detected"),).not.toBeInTheDocument();});});diff --git a/apps/web/src/features/user/components/timezone-mismatch-dialog.tsx b/apps/web/src/features/user/components/timezone-mismatch-dialog.tsxindex d9d4b271a..8f847658c 100644--- a/apps/web/src/features/user/components/timezone-mismatch-dialog.tsx+++ b/apps/web/src/features/user/components/timezone-mismatch-dialog.tsx@@ -57,14 +57,14 @@ export function TimeZoneMismatchDialog({<DialogTitle><Transi18nKey="timeZoneMismatchDialogTitle"- defaults="Timezone mismatch detected"+ defaults="Time zone mismatch detected"/></DialogTitle></DialogHeader><p className="text-muted-foreground text-sm leading-relaxed"><Transi18nKey="timeZoneMismatchDialogMessage"- defaults="It looks like you are in <b>{currentTimeZone}</b> but your timezone is set to <b>{homeTimeZone}</b>. Do you want to update it?"+ defaults="It looks like you are in <b>{currentTimeZone}</b> but your time zone is set to <b>{homeTimeZone}</b>. Do you want to update it?"components={{ b: <b className="font-medium text-foreground" /> }}values={{ currentTimeZone: prompt.currentTimeZone, homeTimeZone }}/>@@ -81,7 +81,7 @@ export function TimeZoneMismatchDialog({><Transi18nKey="yesUpdateTimezone"- defaults="Yes, update my timezone"+ defaults="Yes, update my time zone"/></Button><Button@@ -91,7 +91,7 @@ export function TimeZoneMismatchDialog({><Transi18nKey="noKeepCurrentTimezone"- defaults="No, keep the current timezone"+ defaults="No, keep the current time zone"/></Button></DialogFooter>