Skip to content
This repository has been archived by the owner on Jan 23, 2024. It is now read-only.

Commit

Permalink
fix: remove duplicate key in common.json (calcom#12543)
Browse files Browse the repository at this point in the history
* fix: remove duplicate key in common.json

* chore: add  both keys in same log
  • Loading branch information
Udit-takkar authored Nov 27, 2023
1 parent db3f718 commit a48e7cb
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 20 deletions.
2 changes: 1 addition & 1 deletion apps/web/components/apps/InstallAppButtonChild.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ export const InstallAppButtonChild = ({
disabled={shouldDisableInstallation}
color="primary"
size="base">
{paid.trial ? t("start_paid_trial") : t("install_paid_app")}
{paid.trial ? t("start_paid_trial") : t("subscribe")}
</Button>
);
}
Expand Down
16 changes: 12 additions & 4 deletions apps/web/next.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,21 @@ if (process.env.GOOGLE_API_CREDENTIALS && !validJson(process.env.GOOGLE_API_CRED
}

const informAboutDuplicateTranslations = () => {
const valueSet = new Set();
const valueMap = {};

for (const key in englishTranslation) {
if (valueSet.has(englishTranslation[key])) {
console.warn("\x1b[33mDuplicate value found in:", "\x1b[0m", key);
const value = englishTranslation[key];

if (valueMap[value]) {
console.warn(
"\x1b[33mDuplicate value found in common.json keys:",
"\x1b[0m ",
key,
"and",
valueMap[value]
);
} else {
valueSet.add(englishTranslation[key]);
valueMap[value] = key;
}
}
};
Expand Down
10 changes: 0 additions & 10 deletions apps/web/public/static/locales/en/common.json
Original file line number Diff line number Diff line change
Expand Up @@ -678,8 +678,6 @@
"managed_event_url_clarification": "\"username\" will be filled by the username of the members assigned",
"assign_to": "Assign to",
"add_members": "Add members...",
"count_members_one": "{{count}} member",
"count_members_other": "{{count}} members",
"no_assigned_members": "No assigned members",
"assigned_to": "Assigned to",
"start_assigning_members_above": "Start assigning members above",
Expand Down Expand Up @@ -861,7 +859,6 @@
"next_step": "Skip step",
"prev_step": "Prev step",
"install": "Install",
"install_paid_app": "Subscribe",
"start_paid_trial": "Start free Trial",
"installed": "Installed",
"active_install_one": "{{count}} active install",
Expand Down Expand Up @@ -1232,9 +1229,6 @@
"attendee_name_variable": "Attendee",
"event_date_variable": "Event date",
"event_time_variable": "Event time",
"timezone_variable": "Timezone",
"location_variable": "Location",
"additional_notes_variable": "Additional notes",
"organizer_name_variable": "Organizer name",
"app_upgrade_description": "In order to use this feature, you need to upgrade to a Pro account.",
"invalid_number": "Invalid phone number",
Expand Down Expand Up @@ -2002,14 +1996,11 @@
"google_new_spam_policy": "Google’s new spam policy could prevent you from receiving any email and calendar notifications about this booking.",
"resolve": "Resolve",
"no_organization_slug": "There was an error creating teams for this organization. Missing URL slug.",
"org_name": "Organization name",
"org_url": "Organization URL",
"copy_link_org": "Copy link to organization",
"404_the_org": "The organization",
"404_the_team": "The team",
"404_claim_entity_org": "Claim your subdomain for your organization",
"404_claim_entity_team": "Claim this team and start managing schedules collectively",
"insights_all_org_filter": "All",
"insights_team_filter": "Team: {{teamName}}",
"insights_user_filter": "User: {{userName}}",
"insights_subtitle": "View booking insights across your events",
Expand All @@ -2021,7 +2012,6 @@
"select_date": "Select Date",
"see_all_available_times": "See all available times",
"org_team_names_example": "e.g. Marketing Team",
"org_team_names_example_1": "e.g. Marketing Team",
"org_team_names_example_2": "e.g. Sales Team",
"org_team_names_example_3": "e.g. Design Team",
"org_team_names_example_4": "e.g. Engineering Team",
Expand Down
6 changes: 3 additions & 3 deletions packages/features/ee/organizations/pages/settings/profile.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ const OrgProfileView = () => {
<div className="border-subtle flex rounded-b-md border border-t-0 px-4 py-8 sm:px-6">
<div className="flex-grow">
<div>
<Label className="text-emphasis">{t("org_name")}</Label>
<Label className="text-emphasis">{t("organization_name")}</Label>
<p className="text-default text-sm">{currentOrganisation?.name}</p>
</div>
{!isBioEmpty && (
Expand Down Expand Up @@ -245,7 +245,7 @@ const OrgProfileForm = ({ defaultValues }: { defaultValues: FormValues }) => {
<div className="mt-8">
<TextField
name="name"
label={t("org_name")}
label={t("organization_name")}
value={value}
onChange={(e) => {
form.setValue("name", e?.target.value, { shouldDirty: true });
Expand All @@ -261,7 +261,7 @@ const OrgProfileForm = ({ defaultValues }: { defaultValues: FormValues }) => {
<div className="mt-8">
<TextField
name="slug"
label={t("org_url")}
label={t("organization_url")}
value={value}
disabled
addOnSuffix={`.${subdomainSuffix()}`}
Expand Down
2 changes: 1 addition & 1 deletion packages/features/insights/filters/TeamAndSelfList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ export const TeamAndSelfList = () => {
isAll: true,
});
}}
label={t("insights_all_org_filter")}
label={t("all")}
/>
)}

Expand Down
2 changes: 1 addition & 1 deletion packages/ui/components/apps/AppCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ const InstallAppButtonChild = ({
StartIcon={Plus}
data-testid="install-app-button"
{...props}>
{paid.trial ? t("start_paid_trial") : t("install_paid_app")}
{paid.trial ? t("start_paid_trial") : t("subscribe")}
</Button>
);
}
Expand Down

0 comments on commit a48e7cb

Please sign in to comment.