From b347f29d6c83e36144c5025f30abe1465469f536 Mon Sep 17 00:00:00 2001
From: Alex van Andel <me@alexvanandel.com>
Date: Thu, 29 Sep 2022 13:41:40 +0100
Subject: [PATCH] Feature/deprecate title translations (#4682)

* wip

* Aims to deprecate _title keys

* Removed _title translation

* Revert "wip"

This reverts commit 3e33fc6b1ebc064ddfacd8ebc2b63b2ba009d416.
---
 apps/web/components/v2/eventtype/EventTypeSingleLayout.tsx | 2 +-
 apps/web/pages/v2/availability/[schedule].tsx              | 2 +-
 apps/web/public/static/locales/ar/common.json              | 1 -
 apps/web/public/static/locales/cs/common.json              | 1 -
 apps/web/public/static/locales/de/common.json              | 1 -
 apps/web/public/static/locales/en/common.json              | 2 --
 apps/web/public/static/locales/es/common.json              | 1 -
 apps/web/public/static/locales/fr/common.json              | 1 -
 apps/web/public/static/locales/he/common.json              | 1 -
 apps/web/public/static/locales/it/common.json              | 1 -
 apps/web/public/static/locales/ja/common.json              | 1 -
 apps/web/public/static/locales/ko/common.json              | 1 -
 apps/web/public/static/locales/nl/common.json              | 1 -
 apps/web/public/static/locales/pl/common.json              | 1 -
 apps/web/public/static/locales/pt-BR/common.json           | 1 -
 apps/web/public/static/locales/pt/common.json              | 1 -
 apps/web/public/static/locales/ro/common.json              | 1 -
 apps/web/public/static/locales/sr/common.json              | 1 -
 apps/web/public/static/locales/sv/common.json              | 1 -
 apps/web/public/static/locales/tr/common.json              | 1 -
 apps/web/public/static/locales/uk/common.json              | 1 -
 apps/web/public/static/locales/vi/common.json              | 1 -
 apps/web/public/static/locales/zh-CN/common.json           | 1 -
 apps/web/public/static/locales/zh-TW/common.json           | 1 -
 packages/ui/v2/core/Shell.tsx                              | 2 +-
 25 files changed, 3 insertions(+), 26 deletions(-)

diff --git a/apps/web/components/v2/eventtype/EventTypeSingleLayout.tsx b/apps/web/components/v2/eventtype/EventTypeSingleLayout.tsx
index e3d907af4c..ba2f982317 100644
--- a/apps/web/components/v2/eventtype/EventTypeSingleLayout.tsx
+++ b/apps/web/components/v2/eventtype/EventTypeSingleLayout.tsx
@@ -157,7 +157,7 @@ function EventTypeSingleLayout({
   return (
     <Shell
       backPath="/event-types"
-      title={t("event_type_title", { eventTypeTitle: eventType.title })}
+      title={eventType.title + " | " + t("event_type")}
       heading={eventType.title}
       subtitle={eventType.description || ""}
       CTA={
diff --git a/apps/web/pages/v2/availability/[schedule].tsx b/apps/web/pages/v2/availability/[schedule].tsx
index d434bd82d5..761575a8a5 100644
--- a/apps/web/pages/v2/availability/[schedule].tsx
+++ b/apps/web/pages/v2/availability/[schedule].tsx
@@ -82,7 +82,7 @@ export default function Availability({ schedule }: { schedule: number }) {
   return (
     <Shell
       backPath="/availability"
-      title={t("availability_title", { availabilityTitle: data?.schedule.name })}
+      title={data?.schedule.name && data.schedule.name + " | " + t("availability")}
       heading={
         <Controller
           control={form.control}
diff --git a/apps/web/public/static/locales/ar/common.json b/apps/web/public/static/locales/ar/common.json
index 705ffb6287..bb214d7302 100644
--- a/apps/web/public/static/locales/ar/common.json
+++ b/apps/web/public/static/locales/ar/common.json
@@ -112,7 +112,6 @@
   "use_link_to_reset_password": "استخدم الرابط أدناه لإعادة تعيين كلمة المرور",
   "hey_there": "مرحبًا،",
   "forgot_your_password_calcom": "نسيت كلمة المرور الخاصة بك؟ - Cal.com",
-  "event_type_title": "{{eventTypeTitle}} | نوع الحدث",
   "delete_webhook_confirmation_message": "هل أنت متأكد أنك تريد حذف الويب هوك هذا؟ لن تتلقى بعد الآن بيانات اجتماعات Cal.com على عنوان URL محدد، وفي الوقت الفعلي، عندما تتم جدولة حدث أو يتم إلغاؤه.",
   "confirm_delete_webhook": "نعم، قم بحذف الويبهوك",
   "edit_webhook": "تعديل الويبهوك",
diff --git a/apps/web/public/static/locales/cs/common.json b/apps/web/public/static/locales/cs/common.json
index ccc6d6fd5a..dbf79e409a 100644
--- a/apps/web/public/static/locales/cs/common.json
+++ b/apps/web/public/static/locales/cs/common.json
@@ -112,7 +112,6 @@
   "use_link_to_reset_password": "Pro obnovení hesla použijte odkaz níž",
   "hey_there": "Zdravíme,",
   "forgot_your_password_calcom": "Zapomněli jste heslo? - Cal.com",
-  "event_type_title": "{{eventTypeTitle}} | Typ události",
   "delete_webhook_confirmation_message": "Opravdu chcete smazat tento webhook? Přestanete v reálném čase dostávat Cal.com data o schůzce na dané URL, pokud bude událost naplánována nebo zrušena.",
   "confirm_delete_webhook": "Ano, smazat webhook",
   "edit_webhook": "Upravit webhook",
diff --git a/apps/web/public/static/locales/de/common.json b/apps/web/public/static/locales/de/common.json
index 255fce34ac..3075b4c9bb 100644
--- a/apps/web/public/static/locales/de/common.json
+++ b/apps/web/public/static/locales/de/common.json
@@ -112,7 +112,6 @@
   "use_link_to_reset_password": "Benutzen Sie den Link, um Ihr Passwort zurückzusetzen",
   "hey_there": "Hallo,",
   "forgot_your_password_calcom": "Passwort vergessen? - Cal.com",
-  "event_type_title": "{{eventTypeTitle}} | Event-Typ",
   "delete_webhook_confirmation_message": "Sind Sie sicher, dass Sie diesen Webhook löschen möchten? Sie werden keine Cal.com Termindaten mehr erhalten.",
   "confirm_delete_webhook": "Ja, Webhook löschen",
   "edit_webhook": "Webhook bearbeiten",
diff --git a/apps/web/public/static/locales/en/common.json b/apps/web/public/static/locales/en/common.json
index fcb47755cc..d232e871e6 100644
--- a/apps/web/public/static/locales/en/common.json
+++ b/apps/web/public/static/locales/en/common.json
@@ -112,7 +112,6 @@
   "use_link_to_reset_password": "Use the link below to reset your password",
   "hey_there": "Hey there,",
   "forgot_your_password_calcom": "Forgot your password? - Cal.com",
-  "event_type_title": "{{eventTypeTitle}} | Event Type",
   "delete_webhook_confirmation_message": "Are you sure you want to delete this webhook? You will no longer receive Cal.com meeting data at a specified URL, in real-time, when an event is scheduled or canceled.",
   "confirm_delete_webhook": "Yes, delete webhook",
   "edit_webhook": "Edit Webhook",
@@ -633,7 +632,6 @@
   "billing": "Billing",
   "manage_your_billing_info": "Manage your billing information and cancel your subscription.",
   "availability": "Availability",
-  "availability_title": "{{availabilityTitle}} | Availability",
   "edit_availability": "Edit availability",
   "configure_availability": "Configure times when you are available for bookings.",
   "copy_times_to": "Copy times to",
diff --git a/apps/web/public/static/locales/es/common.json b/apps/web/public/static/locales/es/common.json
index 45017053fd..05fe749481 100644
--- a/apps/web/public/static/locales/es/common.json
+++ b/apps/web/public/static/locales/es/common.json
@@ -112,7 +112,6 @@
   "use_link_to_reset_password": "Utilice el enlace de abajo para restablecer su contraseña",
   "hey_there": "Hola,",
   "forgot_your_password_calcom": "¿Has olvidado tu contraseña? - Cal.com",
-  "event_type_title": "{{eventTypeTitle}} | Tipo de Evento",
   "delete_webhook_confirmation_message": "¿Está seguro de que desea eliminar este webhook? Ya no recibirá datos de reuniones de Cal.com en una URL específica, en tiempo real, cuando se programe o cancele un evento.",
   "confirm_delete_webhook": "Sí, elimina este webhook",
   "edit_webhook": "Editar Webhook",
diff --git a/apps/web/public/static/locales/fr/common.json b/apps/web/public/static/locales/fr/common.json
index 7b346f9836..38c804c268 100644
--- a/apps/web/public/static/locales/fr/common.json
+++ b/apps/web/public/static/locales/fr/common.json
@@ -112,7 +112,6 @@
   "use_link_to_reset_password": "Utilisez le lien ci-dessous pour réinitialiser votre mot de passe",
   "hey_there": "Salut,",
   "forgot_your_password_calcom": "Mot de passe oublié ? - Cal.com",
-  "event_type_title": "{{eventTypeTitle}} | Type d'événement",
   "delete_webhook_confirmation_message": "Êtes-vous sûr de vouloir supprimer ce webhook ? Vous ne recevrez plus les données de réunion de Cal.com à une URL spécifiée, en temps réel, lorsqu'un événement est programmé ou annulé.",
   "confirm_delete_webhook": "Oui, supprimer le webhook",
   "edit_webhook": "Modifier le webhook",
diff --git a/apps/web/public/static/locales/he/common.json b/apps/web/public/static/locales/he/common.json
index 483f18a6af..cd577b4539 100644
--- a/apps/web/public/static/locales/he/common.json
+++ b/apps/web/public/static/locales/he/common.json
@@ -112,7 +112,6 @@
   "use_link_to_reset_password": "נא להשתמש בקישור הבא כדי לאפס את הסיסמה",
   "hey_there": "שלום,",
   "forgot_your_password_calcom": "שכחתה את הסיסמה? - cal.com",
-  "event_type_title": "{{eventTypeTitle}} | סוג האירוע",
   "delete_webhook_confirmation_message": "בטוח שברצונך למחוק את ה-Webhook הזה? אם אירוע יבוטל או שייקבע עבורו מועד, לא תקבל יותר נתוני פגישות מ-Cal.com בזמן אמת או בכתובת ה-URL שציינת.",
   "confirm_delete_webhook": "כן, אני רוצה למחוק את ה-Webhook",
   "edit_webhook": "עריכת Webhook",
diff --git a/apps/web/public/static/locales/it/common.json b/apps/web/public/static/locales/it/common.json
index 2d58bc6a21..12b0f44baf 100644
--- a/apps/web/public/static/locales/it/common.json
+++ b/apps/web/public/static/locales/it/common.json
@@ -112,7 +112,6 @@
   "use_link_to_reset_password": "Usa il link qui sotto per reimpostare la tua password",
   "hey_there": "Ciao,",
   "forgot_your_password_calcom": "Hai dimenticato la password? - Cal.com",
-  "event_type_title": "{{eventTypeTitle}} | Tipo di evento",
   "delete_webhook_confirmation_message": "Sei sicuro di voler eliminare questo webhook? Non riceverai più Cal.com dati di riunione in un URL specificato, in tempo reale, quando un evento è programmato o annullato.",
   "confirm_delete_webhook": "Sì, elimina webhook",
   "edit_webhook": "Modifica Webhook",
diff --git a/apps/web/public/static/locales/ja/common.json b/apps/web/public/static/locales/ja/common.json
index b12456b8b4..ce017f7a68 100644
--- a/apps/web/public/static/locales/ja/common.json
+++ b/apps/web/public/static/locales/ja/common.json
@@ -112,7 +112,6 @@
   "use_link_to_reset_password": "以下のリンクを使用してパスワードをリセットしてください",
   "hey_there": "こんにちは！",
   "forgot_your_password_calcom": "パスワードをお忘れですか? - Cal.com",
-  "event_type_title": "{{eventTypeTitle}} | イベントタイプ",
   "delete_webhook_confirmation_message": "このウェブフックを削除してもよろしいですか？ イベントがスケジュールまたはキャンセルされたときに、指定された URL でのミーティングデータをリアルタイムには受け取れなくなります。",
   "confirm_delete_webhook": "はい、ウェブフックを削除します",
   "edit_webhook": "ウェブフックを編集",
diff --git a/apps/web/public/static/locales/ko/common.json b/apps/web/public/static/locales/ko/common.json
index c5db8d79f4..774391eb7f 100644
--- a/apps/web/public/static/locales/ko/common.json
+++ b/apps/web/public/static/locales/ko/common.json
@@ -112,7 +112,6 @@
   "use_link_to_reset_password": "비밀번호를 재설정하시려면 아래 링크를 사용하세요.",
   "hey_there": "안녕하세요.",
   "forgot_your_password_calcom": "비밀번호를 잊어버리셨나요? - Cal.com",
-  "event_type_title": "{{eventTypeTitle}} | 이벤트 타입",
   "delete_webhook_confirmation_message": "웹훅을 정말로 삭제하시겠습니까? 이벤트 일정이 잡혔거나 취소되었을 때 Cal.com의 회의 정보를 더 이상 실시간으로 받아보실 수 없게 됩니다.",
   "confirm_delete_webhook": "네, 웹훅을 삭제하겠습니다.",
   "edit_webhook": "웹훅 수정하기",
diff --git a/apps/web/public/static/locales/nl/common.json b/apps/web/public/static/locales/nl/common.json
index e6662edf75..cdfe41be26 100644
--- a/apps/web/public/static/locales/nl/common.json
+++ b/apps/web/public/static/locales/nl/common.json
@@ -112,7 +112,6 @@
   "use_link_to_reset_password": "Gebruik de onderstaande link om uw wachtwoord te resetten",
   "hey_there": "Hallo daar,",
   "forgot_your_password_calcom": "Wachtwoord vergeten? - Cal.com",
-  "event_type_title": "{{eventTypeTitle}} | Evenement",
   "delete_webhook_confirmation_message": "Weet u zeker dat u deze webhook wilt verwijderen? U ontvangt dan niet langer Cal.com vergadergegevens op een opgegeven URL, in real-time, wanneer een evenement is geboekt of geannuleerd.",
   "confirm_delete_webhook": "Ja, webhook verwijderen",
   "edit_webhook": "Webhook bewerken",
diff --git a/apps/web/public/static/locales/pl/common.json b/apps/web/public/static/locales/pl/common.json
index ea6c0b9ccb..fd34add777 100644
--- a/apps/web/public/static/locales/pl/common.json
+++ b/apps/web/public/static/locales/pl/common.json
@@ -112,7 +112,6 @@
   "use_link_to_reset_password": "Użyj poniższego linku, aby zresetować swoje hasło",
   "hey_there": "Cześć,",
   "forgot_your_password_calcom": "Nie pamiętasz swojego hasła? - Cal.com",
-  "event_type_title": "{{eventTypeTitle}} | Typ Wydarzenia",
   "delete_webhook_confirmation_message": "Czy na pewno chcesz usunąć ten webhook? Nie będziesz już otrzymywać danych o spotkaniach w Cal.com w określonym URL, w czasie rzeczywistym, gdy zdarzenie jest zaplanowane lub anulowane.",
   "confirm_delete_webhook": "Tak, usuń webhook",
   "edit_webhook": "Edytuj Webhook",
diff --git a/apps/web/public/static/locales/pt-BR/common.json b/apps/web/public/static/locales/pt-BR/common.json
index 04853c8281..801f6f7f64 100644
--- a/apps/web/public/static/locales/pt-BR/common.json
+++ b/apps/web/public/static/locales/pt-BR/common.json
@@ -112,7 +112,6 @@
   "use_link_to_reset_password": "Use o link abaixo para redefinir a sua senha",
   "hey_there": "Olá,",
   "forgot_your_password_calcom": "Esqueceu sua senha? - Cal.com",
-  "event_type_title": "{{eventTypeTitle}} | Tipo de evento",
   "delete_webhook_confirmation_message": "Você tem certeza que quer remover este Webhook? Você não receberá mais dados de reuniões de Cal.com na URL especificada, em tempo real, quando um evento for agendado ou cancelado.",
   "confirm_delete_webhook": "Sim, remover o Webhook",
   "edit_webhook": "Editar Webhook",
diff --git a/apps/web/public/static/locales/pt/common.json b/apps/web/public/static/locales/pt/common.json
index 6700d88f9f..3613b05bed 100644
--- a/apps/web/public/static/locales/pt/common.json
+++ b/apps/web/public/static/locales/pt/common.json
@@ -112,7 +112,6 @@
   "use_link_to_reset_password": "Use a ligação abaixo para redefinir a sua senha",
   "hey_there": "Olá,",
   "forgot_your_password_calcom": "Esqueceu-se da sua senha? - Cal.com",
-  "event_type_title": "{{eventTypeTitle}} | Tipo de evento",
   "delete_webhook_confirmation_message": "De certeza que quer eliminar este Webhook? Não receberá mais dados de reuniões de Cal.com do URL especificado, em tempo real, quando um evento for agendado ou cancelado.",
   "confirm_delete_webhook": "Sim, eliminar o Webhook",
   "edit_webhook": "Editar Webhook",
diff --git a/apps/web/public/static/locales/ro/common.json b/apps/web/public/static/locales/ro/common.json
index 14a6fe9f10..d9757e4345 100644
--- a/apps/web/public/static/locales/ro/common.json
+++ b/apps/web/public/static/locales/ro/common.json
@@ -112,7 +112,6 @@
   "use_link_to_reset_password": "Utilizați linkul de mai jos pentru a vă reseta parola",
   "hey_there": "Bună,",
   "forgot_your_password_calcom": "Ți-ai uitat parola? - Cal.com",
-  "event_type_title": "{{eventTypeTitle}} Tip de Eveniment",
   "delete_webhook_confirmation_message": "Ești sigur că vrei să ștergi acest webhook? Nu vei mai primi Cal.com date de întâlnire la un URL specificat, în timp real, atunci când un eveniment este programat sau anulat.",
   "confirm_delete_webhook": "Da, șterge webhook",
   "edit_webhook": "Editează Webhook",
diff --git a/apps/web/public/static/locales/sr/common.json b/apps/web/public/static/locales/sr/common.json
index 96a6e05553..091d81c6a2 100644
--- a/apps/web/public/static/locales/sr/common.json
+++ b/apps/web/public/static/locales/sr/common.json
@@ -112,7 +112,6 @@
   "use_link_to_reset_password": "Resetujte lozinku koristeći link ispod",
   "hey_there": "Zdravo,",
   "forgot_your_password_calcom": "Zaboravili ste lozinku? - Cal.com",
-  "event_type_title": "{{eventTypeTitle}} | Tip Dogadjaja",
   "delete_webhook_confirmation_message": "Da li ste sigurni da želite da obrišete ovaj webhook? Nećete više dobijati Cal.com podatke o sastancima preko naznačenog URL, istovremeno kad je dogadjaj zakazan ili otkazan.",
   "confirm_delete_webhook": "Da, obriši webhook",
   "edit_webhook": "Uredi Webhook",
diff --git a/apps/web/public/static/locales/sv/common.json b/apps/web/public/static/locales/sv/common.json
index b1bcb19412..44c81ec9bf 100644
--- a/apps/web/public/static/locales/sv/common.json
+++ b/apps/web/public/static/locales/sv/common.json
@@ -112,7 +112,6 @@
   "use_link_to_reset_password": "Använd länken nedan för att återställa ditt lösenord",
   "hey_there": "Hallå där,",
   "forgot_your_password_calcom": "Glömt ditt lösenord? - Cal.com",
-  "event_type_title": "{{eventTypeTitle}} | Händelsetyp",
   "delete_webhook_confirmation_message": "Är du säker på att du vill ta bort denna webhook? Du kommer inte längre att få Calcom mötesdata skickad till angiven URL, i realtid, när en händelse är schemalagd eller avbruten.",
   "confirm_delete_webhook": "Ja, ta bort webhook",
   "edit_webhook": "Redigera Webhook",
diff --git a/apps/web/public/static/locales/tr/common.json b/apps/web/public/static/locales/tr/common.json
index 089aafb9b5..820924032d 100644
--- a/apps/web/public/static/locales/tr/common.json
+++ b/apps/web/public/static/locales/tr/common.json
@@ -112,7 +112,6 @@
   "use_link_to_reset_password": "Şifrenizi sıfırlamak için aşağıdaki bağlantıyı kullanın",
   "hey_there": "Selam,",
   "forgot_your_password_calcom": "Şifrenizi mi unuttunuz? - Cal.com",
-  "event_type_title": "{{eventTypeTitle}} | Etkinlik Türü",
   "delete_webhook_confirmation_message": "Bu web kancasını silmek istediğinizden emin misiniz? Bir etkinlik planlandığında veya iptal edildiğinde, Cal.com toplantı verilerini gerçek zamanlı olarak belirli bir URL'de almazsınız.",
   "confirm_delete_webhook": "Evet, web kancasını sil",
   "edit_webhook": "Web kancasını düzenle",
diff --git a/apps/web/public/static/locales/uk/common.json b/apps/web/public/static/locales/uk/common.json
index 87ee175415..7d03db82bf 100644
--- a/apps/web/public/static/locales/uk/common.json
+++ b/apps/web/public/static/locales/uk/common.json
@@ -112,7 +112,6 @@
   "use_link_to_reset_password": "Скористайтеся посиланням нижче, щоб скинути пароль",
   "hey_there": "Привіт!",
   "forgot_your_password_calcom": "Забули пароль? – Cal.com",
-  "event_type_title": "{{eventTypeTitle}} | Тип заходу",
   "delete_webhook_confirmation_message": "Справді видалити цей вебгук? Ви більше не отримуватимете дані про нараду Cal.com за вказаною URL-адресою: у реальному часі, а також під час планування та скасування.",
   "confirm_delete_webhook": "Так, видалити вебгук",
   "edit_webhook": "Редагувати вебгук",
diff --git a/apps/web/public/static/locales/vi/common.json b/apps/web/public/static/locales/vi/common.json
index 8782bcbcdd..c19b754002 100644
--- a/apps/web/public/static/locales/vi/common.json
+++ b/apps/web/public/static/locales/vi/common.json
@@ -112,7 +112,6 @@
   "use_link_to_reset_password": "Sử dụng đường link dưới đây để thay đổi mật khẩu của bạn",
   "hey_there": "Xin chào,",
   "forgot_your_password_calcom": "Quên mật khẩu của bạn? - Cal.com",
-  "event_type_title": "{{eventTypeTitle}} | Loại Sự Kiện",
   "delete_webhook_confirmation_message": "Bạn có chắc bạn muốn xoá webhook này? Bạn sẽ không còn nhận dữ liệu cuộc họp Cal.com tại đường URL này, trong thời gian thực, khi một sự kiện được lên lịch hoặc huỷ.",
   "confirm_delete_webhook": "Vâng, hãy xoá webhook",
   "edit_webhook": "Chỉnh Webhook",
diff --git a/apps/web/public/static/locales/zh-CN/common.json b/apps/web/public/static/locales/zh-CN/common.json
index edc6d4f2da..daedcdd50f 100644
--- a/apps/web/public/static/locales/zh-CN/common.json
+++ b/apps/web/public/static/locales/zh-CN/common.json
@@ -112,7 +112,6 @@
   "use_link_to_reset_password": "使用下面的链接重置您的密码",
   "hey_there": "嘿，您好！",
   "forgot_your_password_calcom": "忘记密码？- Cal.com",
-  "event_type_title": "{{eventTypeTitle}} | 活动类型",
   "delete_webhook_confirmation_message": "您确定要删除此Webhook吗？当活动被安排或取消时，您将不再会在指定的链接收到 Cal.com 实时提供的会议数据。",
   "confirm_delete_webhook": "是，删除 Webhook",
   "edit_webhook": "编辑 Webhook",
diff --git a/apps/web/public/static/locales/zh-TW/common.json b/apps/web/public/static/locales/zh-TW/common.json
index 8a7cf83138..c45fa75788 100644
--- a/apps/web/public/static/locales/zh-TW/common.json
+++ b/apps/web/public/static/locales/zh-TW/common.json
@@ -112,7 +112,6 @@
   "use_link_to_reset_password": "使用以下連結重置密碼",
   "hey_there": "哈囉，",
   "forgot_your_password_calcom": "忘記密碼了？ - Cal.com",
-  "event_type_title": "{{eventTypeTitle}} | 活動類型",
   "delete_webhook_confirmation_message": "您確定要刪除這組 Webhook 嗎？之後活動預定或取消的時候，您就不會即時經特定連結收到 Cal.com 的會議資料。",
   "confirm_delete_webhook": "是的，刪除 Webhook",
   "edit_webhook": "編輯 Webhook",
diff --git a/packages/ui/v2/core/Shell.tsx b/packages/ui/v2/core/Shell.tsx
index 6e1682c0dc..258ca9387d 100644
--- a/packages/ui/v2/core/Shell.tsx
+++ b/packages/ui/v2/core/Shell.tsx
@@ -119,7 +119,7 @@ export function ShellSubHeading(props: {
 }
 
 const Layout = (props: LayoutProps) => {
-  const pageTitle = typeof props.heading === "string" ? props.heading : props.title;
+  const pageTitle = typeof props.heading === "string" && !props.title ? props.heading : props.title;
 
   return (
     <>