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: correct message and translation key #15657

Merged

Conversation

RushikeshGandhmal
Copy link
Contributor

@RushikeshGandhmal RushikeshGandhmal commented Jul 3, 2024

What does this PR do?

Mandatory Tasks (DO NOT REMOVE)

  • I have self-reviewed the code (A decent size PR without self-review might be rejected).
  • N/A-I have added a Docs issue here if this PR makes changes that would require a documentation change. If N/A, write N/A here and check the checkbox.
  • N/A- I confirm automated tests are in place that prove my fix is effective or that my feature works.

How should this be tested?

  • Are there environment variables that should be set?
  • What are the minimal test data to have?
  • What is expected (happy path) to have (input and output)?
  • Any other important info that could help to test that PR

Checklist

  • I haven't read the contributing guide
  • My code doesn't follow the style guidelines of this project
  • I haven't commented my code, particularly in hard-to-understand areas
  • I haven't checked if my changes generate no new warnings

@CLAassistant
Copy link

CLAassistant commented Jul 3, 2024

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
1 out of 2 committers have signed the CLA.

✅ anikdhabal
❌ RushikeshGandhmal
You have signed the CLA already but the status is still pending? Let us recheck it.

@dosubot dosubot bot added i18n area: i18n, translations 🐛 bug Something isn't working labels Jul 3, 2024
Copy link

vercel bot commented Jul 3, 2024

@RushikeshGandhmal is attempting to deploy a commit to the cal Team on Vercel.

A member of the Team first needs to authorize it.

@graphite-app graphite-app bot added the community Created by Linear-GitHub Sync label Jul 3, 2024
@graphite-app graphite-app bot requested a review from a team July 3, 2024 15:24
Copy link

graphite-app bot commented Jul 3, 2024

Graphite Automations

"Add community label" took an action on this PR • (07/03/24)

1 label was added to this PR based on Keith Williams's automation.

"Add consumer team as reviewer" took an action on this PR • (07/03/24)

1 reviewer was added to this PR based on Keith Williams's automation.

@RushikeshGandhmal
Copy link
Contributor Author

RushikeshGandhmal commented Jul 3, 2024

So here we were using event_type_requres_google_cal which was not present. Correct one is requires_google_calendar.
Based on it I changed the message.

Can we add new message instead ? with link redirecting to google_calendar to install as it requires.

@PeerRich @hariombalhara

@RushikeshGandhmal
Copy link
Contributor Author

RushikeshGandhmal commented Jul 3, 2024

Before: Change it pointing to event types/advanced which has nothing to do with adding google calendar. @PeerRich
before

After:
after

Copy link
Contributor

@anikdhabal anikdhabal left a comment

Choose a reason for hiding this comment

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

Hey @RushikeshGandhmal, I think the message is correct. We should change the link to redirect to the Google Calendar in the App Store. Also, please add the missing translation in the locales using this key.

And instead of 'change it here,' we should add 'connect Google Calendar.'

Copy link
Contributor

@anikdhabal anikdhabal left a comment

Choose a reason for hiding this comment

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

Left messages, let me know what do you think?

@RushikeshGandhmal RushikeshGandhmal force-pushed the rushikesh_correct_translation_key branch from 492264b to df9e70c Compare July 3, 2024 17:29
@RushikeshGandhmal
Copy link
Contributor Author

@anikdhabal that's what I though in the first place and asked the confirmation above. I've pushed the code.

The message can we better, to make it easy for user to read and understand @PeerRich @hariombalhara

Copy link
Contributor

@anikdhabal anikdhabal left a comment

Choose a reason for hiding this comment

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

Hey, the i18n key was correct previously, no need to change it. And instead of 'Install here,' add 'Connect it here.

Copy link
Contributor

github-actions bot commented Jul 4, 2024

📦 Next.js Bundle Analysis for @calcom/web

This analysis was generated by the Next.js Bundle Analysis action. 🤖

Seventy-eight Pages Changed Size

The following pages changed size from the code in this PR compared to its base branch:

Page Size (compressed) First Load % of Budget (350 KB)
/apps 279.88 KB 507.56 KB 145.02% (🟢 -1.24%)
/apps/[slug] 297.46 KB 525.15 KB 150.04% (🟢 -1.23%)
/apps/[slug]/[...pages] 588.53 KB 816.21 KB 233.20% (🟢 -1.17%)
/apps/categories 256.23 KB 483.91 KB 138.26% (🟢 -1.23%)
/apps/categories/[category] 261.98 KB 489.67 KB 139.90% (🟢 -1.23%)
/apps/installed/[category] 278.33 KB 506.01 KB 144.57% (🟢 -1.79%)
/auth/saml-idp 12.22 KB 239.91 KB 68.54% (🟢 -20.80%)
/availability 426.13 KB 653.81 KB 186.80% (🟢 -1.79%)
/availability/[schedule] 410.55 KB 638.23 KB 182.35% (🟢 -1.65%)
/bookings/[status] 325.91 KB 553.59 KB 158.17% (🟢 -1.22%)
/enterprise 256.28 KB 483.97 KB 138.28% (🟢 -1.24%)
/event-types 561.23 KB 788.92 KB 225.40% (🟢 -1.18%)
/event-types/[type] 437.43 KB 665.11 KB 190.03% (🟢 -1.17%)
/insights 474.64 KB 702.32 KB 200.66% (🟢 -1.68%)
/more 255.79 KB 483.47 KB 138.13% (🟢 -1.23%)
/settings/admin 262.18 KB 489.86 KB 139.96% (🟢 -1.23%)
/settings/admin/apps 275.42 KB 503.1 KB 143.74% (🟢 -1.26%)
/settings/admin/apps/[category] 275.41 KB 503.09 KB 143.74% (🟢 -1.26%)
/settings/admin/flags 265.9 KB 493.58 KB 141.02% (🟢 -1.26%)
/settings/admin/impersonation 262.57 KB 490.25 KB 140.07% (🟢 -1.23%)
/settings/admin/lockedSMS 283.61 KB 511.29 KB 146.08% (🟢 -1.22%)
/settings/admin/oAuth 274.15 KB 501.83 KB 143.38% (🟢 -1.26%)
/settings/admin/orgMigrations/_OrgMigrationLayout 251.1 KB 478.78 KB 136.79% (🟢 -1.23%)
/settings/admin/orgMigrations/moveTeamToOrg 300.85 KB 528.53 KB 151.01% (🟢 -1.22%)
/settings/admin/orgMigrations/moveUserToOrg 320.62 KB 548.3 KB 156.66% (🟢 -1.21%)
/settings/admin/orgMigrations/removeTeamFromOrg 300.61 KB 528.29 KB 150.94% (🟢 -1.22%)
/settings/admin/orgMigrations/removeUserFromOrg 300.62 KB 528.3 KB 150.94% (🟢 -1.21%)
/settings/admin/organizations 264.07 KB 491.75 KB 140.50% (🟢 -1.23%)
/settings/admin/organizations/[id]/edit 262.73 KB 490.41 KB 140.12% (🟢 -1.24%)
/settings/admin/users 264.84 KB 492.52 KB 140.72% (🟢 -1.23%)
/settings/admin/users/[id]/edit 393.87 KB 621.55 KB 177.59% (🟢 -1.25%)
/settings/admin/users/add 393.53 KB 621.22 KB 177.49% (🟢 -1.24%)
/settings/billing 262.38 KB 490.07 KB 140.02% (🟢 -1.23%)
/settings/developer/api-keys 266.67 KB 494.35 KB 141.24% (🟢 -1.26%)
/settings/developer/webhooks 266.84 KB 494.52 KB 141.29% (🟢 -1.26%)
/settings/developer/webhooks/[id] 267.79 KB 495.47 KB 141.56% (🟢 -1.25%)
/settings/developer/webhooks/new 267.82 KB 495.5 KB 141.57% (🟢 -1.25%)
/settings/my-account/appearance 314.29 KB 541.98 KB 154.85% (🟢 -1.54%)
/settings/my-account/calendars 274.3 KB 501.98 KB 143.42% (🟢 -1.12%)
/settings/my-account/conferencing 272.28 KB 499.96 KB 142.85% (🟢 -1.97%)
/settings/my-account/general 377.79 KB 605.47 KB 172.99% (🟢 -1.25%)
/settings/my-account/out-of-office 267.31 KB 494.99 KB 141.43% (🟢 -1.27%)
/settings/my-account/profile 410.2 KB 637.89 KB 182.25% (🟢 -1.26%)
/settings/organizations/[id]/about 159.63 KB 387.31 KB 110.66% (🟡 +0.46%)
/settings/organizations/[id]/add-teams 159.62 KB 387.3 KB 110.66% (🟡 +0.46%)
/settings/organizations/admin-api 262.34 KB 490.02 KB 140.01% (🟢 -1.24%)
/settings/organizations/appearance 286 KB 513.68 KB 146.77% (🟢 -1.26%)
/settings/organizations/billing 262.42 KB 490.1 KB 140.03% (🟢 -1.23%)
/settings/organizations/dsync 295.04 KB 522.73 KB 149.35% (🟢 -1.23%)
/settings/organizations/general 350.63 KB 578.31 KB 165.23% (🟢 -1.25%)
/settings/organizations/members 400.42 KB 628.1 KB 179.46% (🟢 -1.65%)
/settings/organizations/new 159.63 KB 387.31 KB 110.66% (🟡 +0.46%)
/settings/organizations/privacy 267.83 KB 495.51 KB 141.58% (🟢 -1.27%)
/settings/organizations/profile 402.71 KB 630.39 KB 180.11% (🟢 -1.26%)
/settings/organizations/sso 273.01 KB 500.69 KB 143.06% (🟢 -1.24%)
/settings/organizations/teams/other 263.25 KB 490.93 KB 140.27% (🟢 -1.24%)
/settings/organizations/teams/other/[id]/appearance 274.88 KB 502.56 KB 143.59% (🟢 -1.26%)
/settings/organizations/teams/other/[id]/members 269.74 KB 497.42 KB 142.12% (🟢 -1.26%)
/settings/organizations/teams/other/[id]/profile 473.43 KB 701.12 KB 200.32% (🟢 -1.27%)
/settings/platform 260.89 KB 488.57 KB 139.59% (🟢 -1.23%)
/settings/platform/new 120.67 KB 348.36 KB 99.53% (🟡 +0.51%)
/settings/platform/oauth-clients/[clientId]/edit 259.2 KB 486.88 KB 139.11% (🟢 -1.23%)
/settings/platform/oauth-clients/create 258.34 KB 486.02 KB 138.86% (🟢 -1.23%)
/settings/security/impersonation 267.49 KB 495.17 KB 141.48% (🟢 -1.27%)
/settings/security/password 305.64 KB 533.32 KB 152.38% (🟢 -1.25%)
/settings/security/sso 272.46 KB 500.14 KB 142.90% (🟢 -1.23%)
/settings/security/two-factor-auth 270.97 KB 498.65 KB 142.47% (🟢 -1.26%)
/settings/teams 261.92 KB 489.6 KB 139.89% (🟢 -1.24%)
/settings/teams/[id]/appearance 274.86 KB 502.55 KB 143.58% (🟢 -1.26%)
/settings/teams/[id]/billing 262.42 KB 490.1 KB 140.03% (🟢 -1.23%)
/settings/teams/[id]/members 379.86 KB 607.54 KB 173.58% (🟢 -1.25%)
/settings/teams/[id]/profile 474.21 KB 701.9 KB 200.54% (🟢 -1.26%)
/settings/teams/new 193.07 KB 420.75 KB 120.21% (🟢 -1.81%)
/teams 256.02 KB 483.7 KB 138.20% (🟢 -1.23%)
/upgrade 256.14 KB 483.82 KB 138.23% (🟢 -1.23%)
/video/[uid] 291.19 KB 518.87 KB 148.25% (🟢 -0.18%)
/workflows 287.89 KB 515.57 KB 147.31% (🟢 -1.22%)
/workflows/[workflow] 413.81 KB 641.49 KB 183.28% (🟢 -1.67%)
Details

Only the gzipped size is provided here based on an expert tip.

First Load is the size of the global bundle plus the bundle for the individual page. If a user were to show up to your website and land on a given page, the first load size represents the amount of javascript that user would need to download. If next/link is used, subsequent page loads would only need to download that page's bundle (the number in the "Size" column), since the global bundle has already been downloaded.

Any third party scripts you have added directly to your app using the <script> tag are not accounted for in this analysis

The "Budget %" column shows what percentage of your performance budget the First Load total takes up. For example, if your budget was 100kb, and a given page's first load size was 10kb, it would be 10% of your budget. You can also see how much this has increased or decreased compared to the base branch of your PR. If this percentage has increased by 20% or more, there will be a red status indicator applied, indicating that special attention should be given to this. If you see "+/- <0.01%" it means that there was a change in bundle size, but it is a trivial enough amount that it can be ignored.

@RushikeshGandhmal RushikeshGandhmal force-pushed the rushikesh_correct_translation_key branch from 8a7e693 to 54be5ae Compare July 4, 2024 05:10
<Link
href={`${WEBAPP_URL}/event-types/${formMethods.getValues("id")}?tabName=advanced`}
className="underline">
<Link href={`${WEBAPP_URL}/apps/google-calendar`} className="underline">
Copy link
Member

Choose a reason for hiding this comment

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

Why is this link changed?

Also, could you test with a dummy translation for any non-english language that confirms that it works.

Copy link
Contributor

Choose a reason for hiding this comment

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

In our code, we check if the conferencing app is Google Meet and the destinationCalendar?.integration !== "google_calendar". If it isn't, we show this message. Previously, the link redirected to the event advanced tab, but this is unrelated.

Copy link
Member

@hariombalhara hariombalhara left a comment

Choose a reason for hiding this comment

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

@RushikeshGandhmal Thanks for the PR 🙏 I left a comment

Copy link
Contributor

@anikdhabal anikdhabal left a comment

Choose a reason for hiding this comment

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

Hey @RushikeshGandhmal, it’s not fixed yet. Take the bottom i18nkey in this component as a reference. And please test it before the final commit. Also, instead of 'change it here,' use 'Connect it here.'

@RushikeshGandhmal
Copy link
Contributor Author

RushikeshGandhmal commented Jul 4, 2024

@anikdhabal please take a look at screenshots before committing.
1.
Screenshot from 2024-07-04 13-22-05
2.
Screenshot from 2024-07-04 13-23-38
3.
Screenshot from 2024-07-04 13-23-06

Once confirmed I'll add the sentence in all the required languages.

@anikdhabal
Copy link
Contributor

Great work @RushikeshGandhmal pls commit the changes.
And You don't need to add the i18n key in every locales. Currently it's correct.

@RushikeshGandhmal
Copy link
Contributor Author

RushikeshGandhmal commented Jul 4, 2024

Sure @anikdhabal. Thank you for right direction. Appreciate that.

and yes @hariombalhara for any non-english language it works. But as @anikdhabal said we don't need to add to other locals. It's in english only. Let me know, I can add in other languages also.

For example here I choose Deutsch.
Screenshot from 2024-07-04 18-51-06

@anikdhabal
Copy link
Contributor

Sure @anikdhabal. Thank you for right direction. Appreciate that.

and yes @hariombalhara for any non-english language it works. But as @anikdhabal said we don't need to add to other locals. It's in english only. Let me know, I can add in other languages also.

hey in our project we handle it externally for other language, you don't need to do extra work.

@RushikeshGandhmal
Copy link
Contributor Author

Sure @anikdhabal. Thanks for informing.

@hariombalhara
Copy link
Member

Yeah, no need for non english translation.

I meant to test for the translation so that we know it's properly implemented. Sometimes, when key isn't properly specified, english lang still works but other languages don't translate.

@RushikeshGandhmal
Copy link
Contributor Author

@hariombalhara gotcha. Yeah, I've tested working well for all languages.
Example above for Deutsch.

rushikesh.

Copy link
Contributor

@anikdhabal anikdhabal left a comment

Choose a reason for hiding this comment

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

LGTM

@anikdhabal anikdhabal dismissed hariombalhara’s stale review July 4, 2024 13:51

I've tested it locally, and it works for other languages as well.

@hariombalhara hariombalhara merged commit 5b2688d into calcom:main Jul 5, 2024
27 of 36 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🐛 bug Something isn't working community Created by Linear-GitHub Sync i18n area: i18n, translations ready-for-e2e
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Use correct translation key
4 participants