From b9ced0ecf865f60ccf74690c9d3a380f45ba9a74 Mon Sep 17 00:00:00 2001 From: Keith Williams Date: Wed, 28 Jun 2023 13:54:45 +0200 Subject: [PATCH 01/40] v3.0.9 --- apps/web/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/web/package.json b/apps/web/package.json index 423216ab51..593ea6d25a 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -1,6 +1,6 @@ { "name": "@calcom/web", - "version": "3.0.8", + "version": "3.0.9", "private": true, "scripts": { "analyze": "ANALYZE=true next build", From 5f718bd9f7047c36bcf160211ad44f9848ea4c55 Mon Sep 17 00:00:00 2001 From: Crowdin Bot Date: Wed, 28 Jun 2023 11:55:44 +0000 Subject: [PATCH 02/40] New Crowdin translations by Github Action --- apps/web/public/static/locales/it/common.json | 8 ++++---- apps/web/public/static/locales/ja/common.json | 8 ++++---- apps/web/public/static/locales/zh-CN/common.json | 4 ++-- apps/web/public/static/locales/zh-TW/common.json | 8 ++++---- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/apps/web/public/static/locales/it/common.json b/apps/web/public/static/locales/it/common.json index 5cd8268668..a28d860001 100644 --- a/apps/web/public/static/locales/it/common.json +++ b/apps/web/public/static/locales/it/common.json @@ -763,7 +763,7 @@ "minimum_booking_notice": "Preavviso minimo", "offset_toggle": "Sposta orari di inizio", "offset_toggle_description": "Sposta le fasce orarie mostrate alle persone che prenotano di un numero specificato di muniti", - "offset_start": "Spostamento di", + "offset_start": "Sposta di", "offset_start_description": "ad es., le fascie orarie saranno mostrate alle persone che prenotano alle {{ adjustedTime }} anziché alle {{ originalTime }}", "slot_interval": "Intervalli di fascia oraria", "slot_interval_default": "Usa durata evento (impostazione predefinita)", @@ -1782,7 +1782,7 @@ "payment_app_commission": "Pagamento richiesto ({{paymentFeePercentage}}% + {{fee, currency}} di commissione per transazione)", "email_invite_team": "{{email}} è stato invitato", "email_invite_team_bulk": "{{userCount}} utenti sono stati invitati", - "error_collecting_card": "Errore durante la raccolta dei dati della carta", + "error_collecting_card": "Errore durante l'elaborazione della carta", "image_size_limit_exceed": "Le dimensioni delle immagini caricate non devono superare il limite di 5 MB", "unauthorized_workflow_error_message": "{{errorCode}}: Non hai l'autorizzazione ad abilitare o disabilitare questo flusso di lavoro", "inline_embed": "Incorporamento inline", @@ -1792,7 +1792,7 @@ "pop_up_element_click": "Finestra popup tramite clic su un elemento", "open_dialog_with_element_click": "Apre la finestra di dialogo di Cal quando un utente clicca su un elemento.", "need_help_embedding": "Hai bisogno di aiuto? Consulta le nostre guide per integrare Cal su Wix, Squarespace o WordPress, leggi le risposte alle domande più frequenti o esplora le opzioni di incorporamento avanzate.", - "book_my_cal": "Prenota il mio Cal", + "book_my_cal": "Prenota su Cal", "invite_as": "Invita come", "form_updated_successfully": "Modulo aggiornato correttamente.", "disable_attendees_confirmation_emails": "Disabilita le e-mail di conferma predefinite per i partecipanti", @@ -1802,7 +1802,7 @@ "add_an_override": "Aggiungi sostituzione", "import_from_google_workspace": "Importa utenti da Google Workspace", "connect_google_workspace": "Collega Google Workspace", - "google_workspace_admin_tooltip": "Per usare questa funzione è necessario essere un amministratore di Workspace", + "google_workspace_admin_tooltip": "Per usare questa funzione è necessario essere amministratori di Workspace", "first_event_type_webhook_description": "Crea il primo webhook per questo tipo di evento", "create_for": "Crea per", "organization_url_taken": "URL già occupato", diff --git a/apps/web/public/static/locales/ja/common.json b/apps/web/public/static/locales/ja/common.json index f96704ddf0..2cb3da74c2 100644 --- a/apps/web/public/static/locales/ja/common.json +++ b/apps/web/public/static/locales/ja/common.json @@ -736,9 +736,9 @@ "new_event_type_to_book_description": "ユーザーが時間を予約する際に使う新しいイベントタイプを作成する。", "length": "長さ", "minimum_booking_notice": "最低頻度の通知", - "offset_toggle": "オフセット開始時間", - "offset_toggle_description": "オフセットの時間帯は指定された時間 (分) まで予約者に表示されます", - "offset_start": "オフセット時間 (分)", + "offset_toggle": "開始時間をずらす", + "offset_toggle_description": "予約者に表示される時間帯を指定された時間 (分) だけずらします", + "offset_start": "ずらす時間（分）", "offset_start_description": "これにより例えば、{{ originalTime }}ではなく{{ adjustedTime }}に予約者に時間帯が表示されます", "slot_interval": "時間帯の間隔", "slot_interval_default": "イベントの長さを使用する (デフォルト)", @@ -1643,7 +1643,7 @@ "switch_monthly": "月ごとの表示に切り替える", "switch_weekly": "週ごとの表示に切り替える", "switch_multiday": "日ごとの表示に切り替える", - "num_locations": "{{num}} 件の場所の選択肢", + "num_locations": "{{num}} ヵ所の場所のオプション", "select_on_next_step": "次のステップで選ぶ", "this_meeting_has_not_started_yet": "このミーティングはまだ開始されていません", "this_app_requires_connected_account": "{{appName}} には接続された {{dependencyName}} アカウントが必要です", diff --git a/apps/web/public/static/locales/zh-CN/common.json b/apps/web/public/static/locales/zh-CN/common.json index 9fcde0d262..f1f37cd9f2 100644 --- a/apps/web/public/static/locales/zh-CN/common.json +++ b/apps/web/public/static/locales/zh-CN/common.json @@ -751,7 +751,7 @@ "minimum_booking_notice": "最小预约通知提前时间", "offset_toggle": "偏移开始时间", "offset_toggle_description": "将显示给预约者的时间段偏移指定的分钟数", - "offset_start": "偏移量", + "offset_start": "偏移时间", "offset_start_description": "例如，这将向您的预约者显示时间段 {{ adjustedTime }}，而不是 {{ originalTime }}", "slot_interval": "时间段间隔", "slot_interval_default": "使用活动时长 (默认)", @@ -1761,7 +1761,7 @@ "email_invite_team": "{{email}} 已被邀请", "email_invite_team_bulk": "{{userCount}} 名用户已被邀请", "error_collecting_card": "收集卡时出错", - "image_size_limit_exceed": "上传的图像不应超过 5mb 大小限制", + "image_size_limit_exceed": "上传的图像不应超过 5MB 大小限制", "inline_embed": "内联嵌入", "load_inline_content": "将您的活动类型直接与您的其他网站内容内联加载。", "floating_pop_up_button": "浮动弹出式按钮", diff --git a/apps/web/public/static/locales/zh-TW/common.json b/apps/web/public/static/locales/zh-TW/common.json index 22936cbd96..f5bf1b294a 100644 --- a/apps/web/public/static/locales/zh-TW/common.json +++ b/apps/web/public/static/locales/zh-TW/common.json @@ -739,7 +739,7 @@ "offset_toggle": "偏移開始時間", "offset_toggle_description": "針對向預約者顯示的時段偏移指定的分鐘數", "offset_start": "偏移時間", - "offset_start_description": "例如，這麼做會向您的預約者顯示 {{ adjustedTime }}，而非 {{ originalTime }}", + "offset_start_description": "例如，這麼做會向您的預約者顯示 {{ adjustedTime }} 的時段，而非 {{ originalTime }}", "slot_interval": "時間單位", "slot_interval_default": "使用活動長度（預設）", "delete_event_type": "要刪除活動類型嗎？", @@ -1739,14 +1739,14 @@ "error_collecting_card": "收集卡片時發生錯誤", "image_size_limit_exceed": "上傳的圖片大小不得超過 5MB 限制", "inline_embed": "內嵌式嵌入", - "load_inline_content": "直接與其他網站內容內嵌式載入您的活動類型。", + "load_inline_content": "直接載入您的活動類型，內嵌在其他網站內容中。", "floating_pop_up_button": "浮動式彈出按鈕", - "floating_button_trigger_modal": "在網站上放置浮動式按鈕，以根據活動類型觸發強制回應。", + "floating_button_trigger_modal": "在網站上放置浮動式按鈕，觸發選擇活動類型的強制回應。", "pop_up_element_click": "透過點閱元素彈出", "open_dialog_with_element_click": "有人按一下元素即開啟 Cal 對話方塊。", "need_help_embedding": "需要協助嗎？歡迎查看我們的指南了解如何在 Wix、Squarespace 或 WordPress 上嵌入 Cal，也歡迎參閱我們的常見問題，或探索進階嵌入方案。", "book_my_cal": "預約我的 Cal", - "invite_as": "以下列身分邀請：", + "invite_as": "邀請擔任下列身分：", "form_updated_successfully": "表單更新成功。", "disable_attendees_confirmation_emails": "為與會者停用預設確認電子郵件", "disable_attendees_confirmation_emails_description": "預約活動時，此活動類型至少要啟用一個工作流程來傳送電子郵件給與會者。", From 852d5b3954d6fdb1c0196d05c6f79b2fe15e4141 Mon Sep 17 00:00:00 2001 From: Keith Williams Date: Wed, 28 Jun 2023 15:10:03 +0200 Subject: [PATCH 03/40] chore: increase operations-per-run for stale issues job (#9833) --- .github/workflows/cron-stale-issue.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cron-stale-issue.yml b/.github/workflows/cron-stale-issue.yml index 2f0c165cfa..e20689034f 100644 --- a/.github/workflows/cron-stale-issue.yml +++ b/.github/workflows/cron-stale-issue.yml @@ -10,16 +10,17 @@ on: schedule: # Runs every day (see https://crontab.guru) - cron: "0 0 * * *" + workflow_dispatch: jobs: stale: runs-on: ubuntu-latest steps: - uses: actions/stale@v7 with: - ascending: true days-before-issue-stale: 60 days-before-issue-close: -1 days-before-pr-stale: 14 days-before-pr-close: 7 stale-pr-message: "This PR is being marked as stale due to inactivity." close-pr-message: "This PR is being closed due to inactivity. Please reopen if work is intended to be continued." + operations-per-run: 100 From 42494c7c2b3ecd19fa3ff1ba03e90cd47f0a541f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Efra=C3=ADn=20Roch=C3=ADn?= Date: Wed, 28 Jun 2023 06:12:33 -0700 Subject: [PATCH 04/40] fix: [CAL-2005] Issue with loading skeleton on new side menu (#9829) * remove mx-auto from the Icon in bottom navigation link * add loading skeleton for the profile links --- packages/features/shell/Shell.tsx | 48 ++++++++++++++----------------- 1 file changed, 21 insertions(+), 27 deletions(-) diff --git a/packages/features/shell/Shell.tsx b/packages/features/shell/Shell.tsx index 7ab961b687..f87a829068 100644 --- a/packages/features/shell/Shell.tsx +++ b/packages/features/shell/Shell.tsx @@ -797,32 +797,26 @@ function SideBar({ bannersHeight, user }: SideBarProps) { const orgBranding = useOrgBrandingValues(); const publicPageUrl = orgBranding?.slug ? getOrganizationUrl(orgBranding?.slug) : ""; const bottomNavItems: NavigationItemType[] = [ - ...(user?.username - ? [ - { - name: "view_public_page", - href: !!user?.organizationId - ? publicPageUrl - : `${process.env.NEXT_PUBLIC_WEBSITE_URL}/${user.username}`, - icon: ExternalLink, - target: "__blank", - }, - { - name: "copy_public_page_link", - href: "", - onClick: (e: { preventDefault: () => void }) => { - e.preventDefault(); - navigator.clipboard.writeText( - !!user?.organizationId - ? publicPageUrl - : `${process.env.NEXT_PUBLIC_WEBSITE_URL}/${user.username}` - ); - showToast(t("link_copied"), "success"); - }, - icon: Copy, - }, - ] - : []), + { + name: "view_public_page", + href: !!user?.organizationId + ? publicPageUrl + : `${process.env.NEXT_PUBLIC_WEBSITE_URL}/${user?.username}`, + icon: ExternalLink, + target: "__blank", + }, + { + name: "copy_public_page_link", + href: "", + onClick: (e: { preventDefault: () => void }) => { + e.preventDefault(); + navigator.clipboard.writeText( + !!user?.organizationId ? publicPageUrl : `${process.env.NEXT_PUBLIC_WEBSITE_URL}/${user?.username}` + ); + showToast(t("link_copied"), "success"); + }, + icon: Copy, + }, { name: "settings", href: user?.organizationId @@ -922,7 +916,7 @@ function SideBar({ bannersHeight, user }: SideBarProps) {