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

Improve multilingualism and fix search routes #5334

Merged
merged 92 commits into from
Dec 7, 2022

Conversation

OMaxOe
Copy link
Contributor

@OMaxOe OMaxOe commented Nov 2, 2022

What does this PR do?

  • improvements for multilingualism
  • fixed routes for kbars
  • fixed variable {ATTENDEE} and renamed it to {{attendeeName}}

Environment: Staging(main branch) / Production

Type of change

  • Improvments and Bug fix (non-breaking change)

@vercel
Copy link

vercel bot commented Nov 2, 2022

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

A member of the Team first needs to authorize it.

@what-the-diff
Copy link

what-the-diff bot commented Nov 2, 2022

  • In the App.tsx file, we changed "Free" to a translated string
  • We added translations for default and free_to_use apps in AvailabilityTab.tsx
  • Added translation for event name placeholder in EventAdvancedTab
  • Changed title from Title to title (lowercase) in EventSetupTab
  • Updated navigation info text with new key: default schedule name instead of Working Hours
  • Added a new translation for the "copy_public_page_link" key in de, en and es.
  • Updated translations of some keys to be more consistent across languages: unavailable -> not available; meeting with user -> Meeting with {{attendeeName}} (added attendee name as variable)
  • Fixed typo in German translation ("Unverfügbar" instead of "Nicht verfügbar")
  • Changed English text from 'Meeting' to 'Appointment'. This is also reflected on the public page where it says Appointments now instead of Meetings before this change was made
  • Update the meta title and description for webhooks page
  • Add translation key to enterprise license required component
  • Fix typo in Vietnamese locale file (meeting_with_user)
  • Change meeting with user string from {ATTENDEE} to {{attendeeName}} so that it can be translated properly on booking form
  • Changed the name of some pages in KBar.tsx
  • Added translations for those names and sections in SettingsLayout.tsx

Copy link
Contributor

@alannnc alannnc left a comment

Choose a reason for hiding this comment

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

Good job! Looks promising, let me just see it on the deployed server.

@vercel
Copy link

vercel bot commented Nov 2, 2022

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Updated
cal ✅ Ready (Inspect) Visit Preview Dec 7, 2022 at 9:13PM (UTC)

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.

Thanks, @OMaxOe. Awesome PR.
Can you just check the comment I left?

maxi and others added 14 commits November 23, 2022 10:33
…lism

# Conflicts:
#	apps/web/pages/500.tsx
#	apps/web/pages/settings/admin/apps.tsx
#	apps/web/pages/settings/admin/index.tsx
#	apps/web/pages/settings/admin/users.tsx
#	apps/web/pages/settings/my-account/conferencing.tsx
#	apps/web/pages/settings/security/two-factor-auth.tsx
#	apps/web/pages/settings/teams/new/index.tsx
#	apps/web/pages/workflows/index.tsx
#	packages/features/ee/common/components/LicenseRequired.tsx
#	packages/features/ee/common/components/v2/LicenseRequired.tsx
#	packages/features/ee/workflows/pages/v2/index.tsx
…lism

# Conflicts:
#	apps/web/pages/settings/my-account/appearance.tsx
…lism

# Conflicts:
#	apps/web/public/static/locales/de/common.json
@PeerRich
Copy link
Member

oh dear -- sorry about the delay and the new merge conflicts @OMaxOe
CleanShot 2022-11-30 at 23 05 02

maxi and others added 6 commits December 1, 2022 15:27
…lism

# Conflicts:
#	apps/web/pages/500.tsx
#	apps/web/pages/event-types/index.tsx
#	apps/web/pages/settings/developer/api-keys.tsx
#	apps/web/pages/settings/my-account/profile.tsx
#	apps/web/public/static/locales/de/common.json
#	apps/web/public/static/locales/en/common.json
#	packages/features/ee/common/components/LicenseRequired.tsx
#	packages/features/ee/common/components/v2/LicenseRequired.tsx
#	packages/features/webhooks/pages/webhook-edit-view.tsx
#	packages/features/webhooks/pages/webhook-new-view.tsx
#	packages/features/webhooks/pages/webhooks-view.tsx
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants