maronato/cal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: [CAL-1959] Removed duplicate value warnings on starting dev server(#1959)

This commit is contained in:
Sagar Singh Negi 2023-06-17 16:17:23 +05:30
parent 4fe5f6ca6f
commit 1fe8c8cb66
9 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apps/web/public/static/locales/en/common.json
View File

@ -126,10 +126,9 @@
"seat_options_doesnt_support_confirmation": "Seats option doesn't support confirmation requirement",
"team_upgrade_seats_details": "Of the {{memberCount}} members in your team, {{unpaidCount}} seat(s) are unpaid. At ${{seatPrice}}/month per seat the estimated total cost of your membership is ${{totalCost}}/month.",
"team_upgrade_banner_description": "Thank you for trialing our new team plan. We noticed your team \"{{teamName}}\" needs to be upgraded.",
"team_upgrade_banner_action": "Upgrade here",
"upgrade_banner_action": "Upgrade here",
"team_upgraded_successfully": "Your team was upgraded successfully!",
"org_upgrade_banner_description": "Thank you for trialing our Organization plan. We noticed your Organization \"{{teamName}}\" needs to be upgraded.",
"org_upgrade_banner_action": "Upgrade here",
"org_upgraded_successfully": "Your Organization was upgraded successfully!",
"use_link_to_reset_password": "Use the link below to reset your password",
"hey_there": "Hey there,",
@ -240,7 +239,6 @@
"forgot": "Forgot?",
"done": "Done",
"all_done": "All done!",
"all_apps": "All",
"all": "All",
"yours": "Yours",
"available_apps": "Available Apps",
@ -305,7 +303,6 @@
"success": "Success",
"failed": "Failed",
"password_has_been_reset_login": "Your password has been reset. You can now login with your newly created password.",
"bookerlayout_title": "Layout",
"layout": "Layout",
"bookerlayout_default_title": "Default view",
"bookerlayout_description": "You can select multiple and your bookers can switch views.",
@ -548,8 +545,6 @@
"members": "Members",
"organization_members":"Organisation members",
"member": "Member",
"number_member_one": "{{count}} member",
"number_member_other": "{{count}} members",
"owner": "Owner",
"admin": "Admin",
"administrator_user": "Administrator user",
@ -1463,7 +1458,7 @@
"team_name_taken": "This name is already taken",
"must_enter_team_name": "Must enter a team name",
"team_url_required": "Must enter a team URL",
"team_url_taken": "This URL is already taken",
"url_taken": "This URL is already taken",
"team_publish": "Publish team",
"number_sms_notifications": "Phone number (SMS notifications)",
"attendee_email_variable": "Attendee email",
@ -1849,7 +1844,6 @@
"organization_banner_title": "Manage organizations with multiple teams",
"set_up_your_organization": "Set up your organization",
"organizations_description": "Organizations are shared environments where teams can create shared event types, apps, workflows and more.",
"organization_url_taken": "This URL is already taken",
"must_enter_organization_name": "Must enter an organization name",
"must_enter_organization_admin_email": "Must enter your organization email address",
"admin_email": "Your organization email address",

2
packages/features/ee/organizations/components/CreateANewOrganizationForm.tsx
View File

@ -172,7 +172,7 @@ export const CreateANewOrganizationForm = () => {
message: t("email_already_used"),
});
} else if (err.message === "organization_url_taken") {
newOrganizationFormMethods.setError("slug", { type: "custom", message: t("organization_url_taken") });
newOrganizationFormMethods.setError("slug", { type: "custom", message: t("url_taken") });
} else {
setServerErrorMessage(err.message);
}

2
packages/features/ee/organizations/components/OrgUpgradeBanner.tsx
View File

@ -31,7 +31,7 @@ export function OrgUpgradeBanner() {
onClick={() => {
publishTeamMutation.mutate();
}}>
{t("org_upgrade_banner_action")}
{t("upgrade_banner_action")}
</button>
}
/>

2
packages/features/ee/teams/components/CreateANewTeamForm.tsx
View File

@ -38,7 +38,7 @@ export const CreateANewTeamForm = () => {
},
onError: (err) => {
if (err.message === "team_url_taken") {
newTeamFormMethods.setError("slug", { type: "custom", message: t("team_url_taken") });
newTeamFormMethods.setError("slug", { type: "custom", message: t("url_taken") });
} else {
setServerErrorMessage(err.message);
}

2
packages/features/ee/teams/components/TeamsUpgradeBanner.tsx
View File

@ -31,7 +31,7 @@ export function TeamsUpgradeBanner() {
onClick={() => {
publishTeamMutation.mutate({ teamId: membership.team.id });
}}>
{t("team_upgrade_banner_action")}
{t("upgrade_banner_action")}
</button>
}
/>

8
packages/features/eventtypes/components/OrganizationEventTypeFilter.tsx
View File

@ -17,7 +17,7 @@ export const OrganizationEventTypeFilter = () => {
const { t } = useLocale();
const session = useSession();
const { data: query, pushItemToKey, removeItemByKeyAndValue, removeAllQueryParams } = useFilterQuery();
const [dropdownTitle, setDropdownTitle] = useState<string>(t("all_apps"));
const [dropdownTitle, setDropdownTitle] = useState<string>(t("all"));
const { data: teams, status } = trpc.viewer.teams.list.useQuery();
const isNotEmpty = !!teams?.length;
@ -28,13 +28,13 @@ export const OrganizationEventTypeFilter = () => {
<CheckboxField
id="all-eventtypes-checkbox"
icon={<Layers className="h-4 w-4" />}
checked={dropdownTitle === t("all_apps")}
checked={dropdownTitle === t("all")}
onChange={(e) => {
removeAllQueryParams();
setDropdownTitle(t("all_apps"));
setDropdownTitle(t("all"));
// TODO: What to do when all event types is unchecked
}}
label={t("all_apps")}
label={t("all")}
/>
</CheckboxFieldContainer>
<CheckboxFieldContainer>

2
packages/features/filters/components/TeamsFilter.tsx
View File

@ -60,7 +60,7 @@ export const TeamsFilter = () => {
onChange={(e) => {
removeAllQueryParams();
}}
label={t("all_apps")}
label={t("all")}
/>
<FilterCheckboxField

2
packages/features/settings/BookerLayoutSelector.tsx
View File

@ -43,7 +43,7 @@ export const BookerLayoutSelector = ({
return (
<>
<Label className="mb-0">{title ? title : t("bookerlayout_title")}</Label>
<Label className="mb-0">{title ? title : t("layout")}</Label>
<p className="text-subtle max-w-full break-words py-1 text-sm">
{description ? description : t("bookerlayout_description")}
</p>

4
packages/ui/components/apps/AllApps.tsx
View File

@ -73,7 +73,7 @@ function CategoryTab({ selectedCategory, categories, searchText }: CategoryTabPr
: t("category_apps", {
category:
(selectedCategory && selectedCategory[0].toUpperCase() + selectedCategory.slice(1)) ||
t("all_apps"),
t("all"),
})}
</h2>
{leftVisible && (
@ -96,7 +96,7 @@ function CategoryTab({ selectedCategory, categories, searchText }: CategoryTabPr
selectedCategory === null ? "bg-emphasis text-default" : "bg-muted text-emphasis",
"hover:bg-emphasis min-w-max rounded-md px-4 py-2.5 text-sm font-medium hover:cursor-pointer"
)}>
{t("all_apps")}
{t("all")}
</li>
{categories.map((cat, pos) => (
<li