Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.
TypeScript analyticsaudience-segmentationchartscohort-analysisgoogle-analyticsproduct-analyticsstatisticsuser-journeyweb-analytics
Simplify i18n: remove old react-intl artifacts, rename formatMessage to t, replace FormattedMessage with t.rich().
Mike Cao50edb71687a6
diff --git a/public/intl/messages/ar-SA.json b/public/intl/messages/ar-SA.jsonindex 375460426..cdf48aa80 100644--- a/public/intl/messages/ar-SA.json+++ b/public/intl/messages/ar-SA.json@@ -298,13 +298,13 @@"bad-request": "Bad request","collected-data": "البيانات المجمعة","confirm-delete": "هل أنت متأكد من حذف {target}?",- "confirm-leave": "هل أنت متأكد من مغادرة {target}?",- "confirm-remove": "هل انت متأكد من حذف {target}?",+ "confirm-leave": "هل أنت متأكد من مغادرة <b>{target}</b>?",+ "confirm-remove": "هل انت متأكد من حذف <b>{target}</b>?","confirm-reset": "هل أنت متأكد من اعادة تعيين الإحصائيات لـ {target}؟","delete-team-warning": "سيؤدي حذف الفريق أيضًا إلى حذف كافة مواقع الفريق","delete-website-warning": "سيتم حذف كافة بيانات الموقع.","error": "حدث خطأ ما.",- "event-log": "{event} في {url}",+ "event-log": "<b>{event}</b> في <a>{url}</a>","forbidden": "Forbidden","go-to-settings": "الذهاب إلى الإعدادات","incorrect-username-password": "اسم المستخدم او كلمة المرور غير صحيحة.",@@ -338,6 +338,6 @@"unauthorized": "Unauthorized","user-deleted": "تم حذف المستخدم.","viewed-page": "شوهدت الصفحة",- "visitor-log": "زائر من {country} يستخدم {browser} على {os} {device}"+ "visitor-log": "زائر من <b>{country}</b> يستخدم <b>{browser}</b> على <b>{os}</b> <b>{device}</b>"}}diff --git a/public/intl/messages/be-BY.json b/public/intl/messages/be-BY.jsonindex 8bf5cf12f..b9791cc37 100644--- a/public/intl/messages/be-BY.json+++ b/public/intl/messages/be-BY.json@@ -298,13 +298,13 @@"bad-request": "Bad request","collected-data": "Сабраныя дадзеныя","confirm-delete": "Вы дакладна хочаце выдаліць {target}?",- "confirm-leave": "Вы дакладна хочаце пакінуць {target}?",- "confirm-remove": "Вы дакладна хочаце выдаліць {target}?",+ "confirm-leave": "Вы дакладна хочаце пакінуць <b>{target}</b>?",+ "confirm-remove": "Вы дакладна хочаце выдаліць <b>{target}</b>?","confirm-reset": "Вы дакладна хочаце скінуць {target} статыстыку?","delete-team-warning": "Выдаленне каманды таксама выдаліць усе сайты каманды.","delete-website-warning": "Усе асацыяваныя дадзеныя будуць таксама выдалены.","error": "Нешта пайшло не так.",- "event-log": "{event} на {url}",+ "event-log": "<b>{event}</b> на <a>{url}</a>","forbidden": "Forbidden","go-to-settings": "Да налад","incorrect-username-password": "Некарэктнае імя карыстальніка/пароль.",@@ -338,6 +338,6 @@"unauthorized": "Unauthorized","user-deleted": "Карыстальнік выдалены.","viewed-page": "Праглядзеў старонку",- "visitor-log": "Наведвальнік з {country} праз {browser} на {os} {device}"+ "visitor-log": "Наведвальнік з <b>{country}</b> праз <b>{browser}</b> на <b>{os}</b> <b>{device}</b>"}}diff --git a/public/intl/messages/bg-BG.json b/public/intl/messages/bg-BG.jsonindex a3585550e..35f6fd33b 100644--- a/public/intl/messages/bg-BG.json+++ b/public/intl/messages/bg-BG.json@@ -298,13 +298,13 @@"bad-request": "Невалидна заявка","collected-data": "Събрани данни","confirm-delete": "Сигурни ли сте, че искате да изтриете {target}?",- "confirm-leave": "Сигурни ли сте, че искате да напуснете {target}?",- "confirm-remove": "Сигурни ли сте, че искате да премахнете {target}?",+ "confirm-leave": "Сигурни ли сте, че искате да напуснете <b>{target}</b>?",+ "confirm-remove": "Сигурни ли сте, че искате да премахнете <b>{target}</b>?","confirm-reset": "Сигурни ли сте, че искате да нулирате {target}?","delete-team-warning": "Изтриването на екип ще изтрие и всички уебсайтове създадени от екипа.","delete-website-warning": "Всички данни за уебсайта ще бъдат изтрити.","error": "Възникна грешка.",- "event-log": "{event} на {url}",+ "event-log": "<b>{event}</b> на <a>{url}</a>","forbidden": "Забранено","go-to-settings": "Отидете в настройките","incorrect-username-password": "Неправилно потребителско име и/или парола.",@@ -338,6 +338,6 @@"unauthorized": "Неоторизиран достъп","user-deleted": "Потребителят е изтрит.","viewed-page": "Страницата е видяна",- "visitor-log": "Посетител от {country}, използващ {browser} на {os} {device}"+ "visitor-log": "Посетител от <b>{country}</b>, използващ <b>{browser}</b> на <b>{os}</b> <b>{device}</b>"}}diff --git a/public/intl/messages/bn-BD.json b/public/intl/messages/bn-BD.jsonindex 61ba9651b..41f3553cc 100644--- a/public/intl/messages/bn-BD.json+++ b/public/intl/messages/bn-BD.json@@ -298,13 +298,13 @@"bad-request": "Bad request","collected-data": "Collected data","confirm-delete": "আপনি কি নিশ্চিত যে আপনি {target} মুছতে চান?",- "confirm-leave": "Are you sure you want to leave {target}?",- "confirm-remove": "Are you sure you want to remove {target}?",+ "confirm-leave": "Are you sure you want to leave <b>{target}</b>?",+ "confirm-remove": "Are you sure you want to remove <b>{target}</b>?","confirm-reset": "আপনি কি নিশ্চিত যে আপনি {target} এর পরিসংখ্যান পুনরায় সেট করতে চান?","delete-team-warning": "Deleting a team will also delete all team websites.","delete-website-warning": "সমস্ত সম্পর্কিত ডেটা পাশাপাশি মুছে ফেলা হবে।","error": "কিছু ভুল হয়েছে।",- "event-log": "{event} on {url}",+ "event-log": "<b>{event}</b> on <a>{url}</a>","forbidden": "Forbidden","go-to-settings": "সেটিংস এ যান","incorrect-username-password": "ভুল ব্যবহারকারীর নাম/পাসওয়ার্ড।",@@ -338,6 +338,6 @@"unauthorized": "Unauthorized","user-deleted": "User deleted.","viewed-page": "Viewed page",- "visitor-log": "{country} থেকে একজন ভিসিটর {ব্রাউজার}, ব্যবহার করছেন {os} {device} এর মধ্যে।"+ "visitor-log": "<b>{country}</b> থেকে একজন ভিসিটর {ব্রাউজার}, ব্যবহার করছেন <b>{os}</b> <b>{device}</b> এর মধ্যে।"}}diff --git a/public/intl/messages/bs-BA.json b/public/intl/messages/bs-BA.jsonindex a6e3c7118..c451ff8ea 100644--- a/public/intl/messages/bs-BA.json+++ b/public/intl/messages/bs-BA.json@@ -298,13 +298,13 @@"bad-request": "Bad request","collected-data": "Collected data","confirm-delete": "Jeste li sigurni da želite obrisati {target}?",- "confirm-leave": "Jeste li sigurni da želite napustiti {target}?",- "confirm-remove": "Jeste li sigurni da želite ukloniti {target}?",+ "confirm-leave": "Jeste li sigurni da želite napustiti <b>{target}</b>?",+ "confirm-remove": "Jeste li sigurni da želite ukloniti <b>{target}</b>?","confirm-reset": "Jeste li sigurni da želite resetovati {target}?","delete-team-warning": "Brisanje tima će također obrisati sve web stranice tima.","delete-website-warning": "Svi podaci web stranice biće obrisani.","error": "Nešto je pošlo po zlu.",- "event-log": "{event} na {url}",+ "event-log": "<b>{event}</b> na <a>{url}</a>","forbidden": "Forbidden","go-to-settings": "Idi na postavke","incorrect-username-password": "Pogrešno korisničko ime i/ili šifra.",@@ -338,6 +338,6 @@"unauthorized": "Unauthorized","user-deleted": "Korisnik obrisan.","viewed-page": "Pogledana stranica",- "visitor-log": "Posjetitelj iz {country} koristi {browser} na {os} {device}"+ "visitor-log": "Posjetitelj iz <b>{country}</b> koristi <b>{browser}</b> na <b>{os}</b> <b>{device}</b>"}}diff --git a/public/intl/messages/ca-ES.json b/public/intl/messages/ca-ES.jsonindex 18a43e615..710922e31 100644--- a/public/intl/messages/ca-ES.json+++ b/public/intl/messages/ca-ES.json@@ -298,13 +298,13 @@"bad-request": "Bad request","collected-data": "Dades recol·lectades","confirm-delete": "Segur que vol esborrar {target}?",- "confirm-leave": "Segur que vol abandonar {target}?",- "confirm-remove": "Segur que vol eliminar {target}?",+ "confirm-leave": "Segur que vol abandonar <b>{target}</b>?",+ "confirm-remove": "Segur que vol eliminar <b>{target}</b>?","confirm-reset": "Segur que vol restablir les estadístiques de {target}?","delete-team-warning": "Al eliminar un equip també s'eliminaran tots els llocs web de l'equip.","delete-website-warning": "També s'esborraran totes les dades relacionades.","error": "S'ha produït un error.",- "event-log": "{event} a {url}",+ "event-log": "<b>{event}</b> a <a>{url}</a>","forbidden": "Forbidden","go-to-settings": "Vés a la configuració","incorrect-username-password": "Nom d'usuari o contrasenya incorrectes.",@@ -338,6 +338,6 @@"unauthorized": "Unauthorized","user-deleted": "Usuari eliminat.","viewed-page": "Pàgina vista",- "visitor-log": "Visitant de {country} usant {browser} a {os} {device}"+ "visitor-log": "Visitant de <b>{country}</b> usant <b>{browser}</b> a <b>{os}</b> <b>{device}</b>"}}diff --git a/public/intl/messages/cs-CZ.json b/public/intl/messages/cs-CZ.jsonindex d5e03a0bb..6ab0fc5e2 100644--- a/public/intl/messages/cs-CZ.json+++ b/public/intl/messages/cs-CZ.json@@ -298,13 +298,13 @@"bad-request": "Bad request","collected-data": "Collected data","confirm-delete": "Opravdu smazat {target}?",- "confirm-leave": "Are you sure you want to leave {target}?",- "confirm-remove": "Are you sure you want to remove {target}?",+ "confirm-leave": "Are you sure you want to leave <b>{target}</b>?",+ "confirm-remove": "Are you sure you want to remove <b>{target}</b>?","confirm-reset": "Are your sure you want to reset {target}'s statistics?","delete-team-warning": "Deleting a team will also delete all team websites.","delete-website-warning": "Všechna související data budou také smazána.","error": "Něco se pokazilo.",- "event-log": "{event} on {url}",+ "event-log": "<b>{event}</b> on <a>{url}</a>","forbidden": "Forbidden","go-to-settings": "Jít do nastavení","incorrect-username-password": "Nesprávné jméno/heslo.",@@ -338,6 +338,6 @@"unauthorized": "Unauthorized","user-deleted": "User deleted.","viewed-page": "Viewed page",- "visitor-log": "Návštěvník z {country} s prohlížečem {browser} na {os} {device}"+ "visitor-log": "Návštěvník z <b>{country}</b> s prohlížečem <b>{browser}</b> na <b>{os}</b> <b>{device}</b>"}}diff --git a/public/intl/messages/da-DK.json b/public/intl/messages/da-DK.jsonindex 583f07024..187430d1e 100644--- a/public/intl/messages/da-DK.json+++ b/public/intl/messages/da-DK.json@@ -298,13 +298,13 @@"bad-request": "Bad request","collected-data": "Collected data","confirm-delete": "Er du sikker på at du vil slette {target}?",- "confirm-leave": "Are you sure you want to leave {target}?",- "confirm-remove": "Are you sure you want to remove {target}?",+ "confirm-leave": "Are you sure you want to leave <b>{target}</b>?",+ "confirm-remove": "Are you sure you want to remove <b>{target}</b>?","confirm-reset": "Er du sikker på at du ville nulstille {target}'s statistikker?","delete-team-warning": "Deleting a team will also delete all team websites.","delete-website-warning": "Alle tilknyttede data slettes også.","error": "Noget gik galt.",- "event-log": "{event} on {url}",+ "event-log": "<b>{event}</b> on <a>{url}</a>","forbidden": "Forbidden","go-to-settings": "Gå til betjeningspanel","incorrect-username-password": "Ugyldigt brugernavn/adgangskode.",@@ -338,6 +338,6 @@"unauthorized": "Unauthorized","user-deleted": "User deleted.","viewed-page": "Viewed page",- "visitor-log": "Besøgende fra {country} bruger {browser} på {os} {device}"+ "visitor-log": "Besøgende fra <b>{country}</b> bruger <b>{browser}</b> på <b>{os}</b> <b>{device}</b>"}}diff --git a/public/intl/messages/de-CH.json b/public/intl/messages/de-CH.jsonindex 0698e4725..e69c4ee44 100644--- a/public/intl/messages/de-CH.json+++ b/public/intl/messages/de-CH.json@@ -298,13 +298,13 @@"bad-request": "Bad request","collected-data": "Gsammleti Date","confirm-delete": "Sind Sie sich sicher, {target} zlösche?",- "confirm-leave": "Sind Sie sich sicher, {target} zverlah?",- "confirm-remove": "Sind Sie sich sicher, dass Sie {target} wänd entferne?",+ "confirm-leave": "Sind Sie sich sicher, <b>{target}</b> zverlah?",+ "confirm-remove": "Sind Sie sich sicher, dass Sie <b>{target}</b> wänd entferne?","confirm-reset": "Sind Sie sicher, dass Sie d Statistike vo {target} zruggsetze wänd?","delete-team-warning": "Es Team lösche dued ebefalls alli team Websiite lösche.","delete-website-warning": "Alli dezueghörige Date werded ebefalls glöscht.","error": "Es isch en Fehler ufträte.",- "event-log": "{event} uf {url}",+ "event-log": "<b>{event}</b> uf <a>{url}</a>","forbidden": "Forbidden","go-to-settings": "Zu de Istellige","incorrect-username-password": "Falsches Passwort oder Benutzername.",@@ -338,6 +338,6 @@"unauthorized": "Unauthorized","user-deleted": "Bnutzer glöscht.","viewed-page": "Siite agluegt",- "visitor-log": "Bsuecher us {country} nutzt {browser} uf {os} {device}"+ "visitor-log": "Bsuecher us <b>{country}</b> nutzt <b>{browser}</b> uf <b>{os}</b> <b>{device}</b>"}}diff --git a/public/intl/messages/de-DE.json b/public/intl/messages/de-DE.jsonindex 15e760086..255a17fe7 100644--- a/public/intl/messages/de-DE.json+++ b/public/intl/messages/de-DE.json@@ -298,13 +298,13 @@"bad-request": "Bad request","collected-data": "Gesammelte Daten","confirm-delete": "Sind Sie sich sicher, {target} zu löschen?",- "confirm-leave": "Sind Sie sicher, dass die {target} verlassen möchten?",- "confirm-remove": "Sind Sie sicher, {target} zu entfernen?",+ "confirm-leave": "Sind Sie sicher, dass die <b>{target}</b> verlassen möchten?",+ "confirm-remove": "Sind Sie sicher, <b>{target}</b> zu entfernen?","confirm-reset": "Sind Sie sicher, dass Sie die Statistiken von {target} zurücksetzen wollen?","delete-team-warning": "Ein Team zu löschen, wird auch alle Team-Websites löschen.","delete-website-warning": "Alle zugehörigen Daten werden ebenfalls gelöscht.","error": "Es ist ein Fehler aufgetreten.",- "event-log": "{event} auf {url}",+ "event-log": "<b>{event}</b> auf <a>{url}</a>","forbidden": "Forbidden","go-to-settings": "Zu den Einstellungen","incorrect-username-password": "Falsches Passwort oder Benutzername.",@@ -338,6 +338,6 @@"unauthorized": "Unauthorized","user-deleted": "Benutzer gelöscht.","viewed-page": "Seite besucht",- "visitor-log": "Besucher aus {country} benutzt {browser} auf {os} {device}"+ "visitor-log": "Besucher aus <b>{country}</b> benutzt <b>{browser}</b> auf <b>{os}</b> <b>{device}</b>"}}diff --git a/public/intl/messages/el-GR.json b/public/intl/messages/el-GR.jsonindex a400edae0..5accbb9a9 100644--- a/public/intl/messages/el-GR.json+++ b/public/intl/messages/el-GR.json@@ -298,13 +298,13 @@"bad-request": "Bad request","collected-data": "Collected data","confirm-delete": "Είστε βέβαιοι ότι θέλετε να διαγράψετε το {target};",- "confirm-leave": "Are you sure you want to leave {target}?",- "confirm-remove": "Are you sure you want to remove {target}?",+ "confirm-leave": "Are you sure you want to leave <b>{target}</b>?",+ "confirm-remove": "Are you sure you want to remove <b>{target}</b>?","confirm-reset": "Are your sure you want to reset {target}'s statistics?","delete-team-warning": "Deleting a team will also delete all team websites.","delete-website-warning": "Όλα τα σχετικά δεδομένα θα διαγραφούν επίσης.","error": "Κάτι πήγε στραβά.",- "event-log": "{event} on {url}",+ "event-log": "<b>{event}</b> on <a>{url}</a>","forbidden": "Forbidden","go-to-settings": "Μεταβείτε στις ρυθμίσεις","incorrect-username-password": "Εσφαλμένο όνομα χρήστη / κωδικός πρόσβασης.",@@ -338,6 +338,6 @@"unauthorized": "Unauthorized","user-deleted": "User deleted.","viewed-page": "Viewed page",- "visitor-log": "Visitor from {country} using {browser} on {os} {device}"+ "visitor-log": "Visitor from <b>{country}</b> using <b>{browser}</b> on <b>{os}</b> <b>{device}</b>"}}diff --git a/public/intl/messages/en-GB.json b/public/intl/messages/en-GB.jsonindex 96a30444b..69d880096 100644--- a/public/intl/messages/en-GB.json+++ b/public/intl/messages/en-GB.json@@ -298,13 +298,13 @@"bad-request": "Bad request","collected-data": "Collected data","confirm-delete": "Are you sure you want to delete {target}?",- "confirm-leave": "Are you sure you want to leave {target}?",- "confirm-remove": "Are you sure you want to remove {target}?",+ "confirm-leave": "Are you sure you want to leave <b>{target}</b>?",+ "confirm-remove": "Are you sure you want to remove <b>{target}</b>?","confirm-reset": "Are you sure you want to reset {target}'s statistics?","delete-team-warning": "Deleting a team will also delete all team websites.","delete-website-warning": "All associated data will be deleted as well.","error": "Something went wrong.",- "event-log": "{event} on {url}",+ "event-log": "<b>{event}</b> on <a>{url}</a>","forbidden": "Forbidden","go-to-settings": "Go to settings","incorrect-username-password": "Incorrect username/password.",@@ -338,6 +338,6 @@"unauthorized": "Unauthorized","user-deleted": "User deleted.","viewed-page": "Viewed page",- "visitor-log": "Visitor from {country} using {browser} on {os} {device}"+ "visitor-log": "Visitor from <b>{country}</b> using <b>{browser}</b> on <b>{os}</b> <b>{device}</b>"}}diff --git a/public/intl/messages/en-US.json b/public/intl/messages/en-US.jsonindex 79c9e284d..95664e4d9 100644--- a/public/intl/messages/en-US.json+++ b/public/intl/messages/en-US.json@@ -298,13 +298,13 @@"bad-request": "Bad request","collected-data": "Collected data","confirm-delete": "Are you sure you want to delete {target}?",- "confirm-leave": "Are you sure you want to leave {target}?",- "confirm-remove": "Are you sure you want to remove {target}?",+ "confirm-leave": "Are you sure you want to leave <b>{target}</b>?",+ "confirm-remove": "Are you sure you want to remove <b>{target}</b>?","confirm-reset": "Are you sure you want to reset {target}?","delete-team-warning": "Deleting a team will also delete all team websites.","delete-website-warning": "All website data will be deleted.","error": "Something went wrong.",- "event-log": "{event} on {url}",+ "event-log": "<b>{event}</b> on <a>{url}</a>","forbidden": "Forbidden","go-to-settings": "Go to settings","incorrect-username-password": "Incorrect username and/or password.",@@ -338,6 +338,6 @@"unauthorized": "Unauthorized","user-deleted": "User deleted.","viewed-page": "Viewed page",- "visitor-log": "Visitor from {country} using {browser} on {os} {device}"+ "visitor-log": "Visitor from <b>{country}</b> using <b>{browser}</b> on <b>{os}</b> <b>{device}</b>"}}diff --git a/public/intl/messages/es-ES.json b/public/intl/messages/es-ES.jsonindex 0396fe0c9..d6431adcc 100644--- a/public/intl/messages/es-ES.json+++ b/public/intl/messages/es-ES.json@@ -299,13 +299,13 @@"bad-request": "Bad request","collected-data": "Datos obtenidos","confirm-delete": "¿Seguro que quieres eliminar {target}?",- "confirm-leave": "¿Seguro que quieres abandonar {target}?",- "confirm-remove": "¿Estás seguro de que desea eliminar {target}?",+ "confirm-leave": "¿Seguro que quieres abandonar <b>{target}</b>?",+ "confirm-remove": "¿Estás seguro de que desea eliminar <b>{target}</b>?","confirm-reset": "¿Seguro que quieres BORRAR las analíticas de {target}?","delete-team-warning": "Al eliminar un equipo, también se eliminarán todos los sitios web del equipo.","delete-website-warning": "Toda la información relacionada será eliminada.","error": "Algo falló.",- "event-log": "{event} en {url}",+ "event-log": "<b>{event}</b> en <a>{url}</a>","forbidden": "Forbidden","go-to-settings": "Ir a la configuración","incorrect-username-password": "Nombre de usuario o contraseña incorrectos.",@@ -339,6 +339,6 @@"unauthorized": "Unauthorized","user-deleted": "Usuario eliminado.","viewed-page": "Página vista",- "visitor-log": "Visitante desde {country} usando {browser} en {os} {device}"+ "visitor-log": "Visitante desde <b>{country}</b> usando <b>{browser}</b> en <b>{os}</b> <b>{device}</b>"}}diff --git a/public/intl/messages/fa-IR.json b/public/intl/messages/fa-IR.jsonindex a6ffeb125..3213d391e 100644--- a/public/intl/messages/fa-IR.json+++ b/public/intl/messages/fa-IR.json@@ -298,13 +298,13 @@"bad-request": "Bad request","collected-data": "دادههای جمعآوری شده","confirm-delete": "آیا مطمئن هستید میخواهید {target} را حذف کنید؟",- "confirm-leave": "آیا مطمئن هستید میخواهید از {target} خارج شوید؟",- "confirm-remove": "آیا مطمئن هستید میخواهید {target} را حذف کنید؟",+ "confirm-leave": "آیا مطمئن هستید میخواهید از <b>{target}</b> خارج شوید؟",+ "confirm-remove": "آیا مطمئن هستید میخواهید <b>{target}</b> را حذف کنید؟","confirm-reset": "آیا مطمئن هستید میخواهید {target} را بازنشانی کنید؟","delete-team-warning": "با حذف تیم، تمامی وبسایتهای تیم هم حذف خواهند شد.","delete-website-warning": "همهی دادههای وبسایت هم حذف خواهد شد.","error": "مشکلی پیش آمده است.",- "event-log": "{event} در {url}",+ "event-log": "<b>{event}</b> در <a>{url}</a>","forbidden": "Forbidden","go-to-settings": "رفتن به تنظیمات","incorrect-username-password": "نام کاربری / رمز نادرست است.",@@ -338,6 +338,6 @@"unauthorized": "Unauthorized","user-deleted": "کاربر حذف شد.","viewed-page": "صفحه مشاهده شد",- "visitor-log": "بازدیدکننده از کشور {country} با مروگر {browser} در {os} {device}"+ "visitor-log": "بازدیدکننده از کشور <b>{country}</b> با مروگر <b>{browser}</b> در <b>{os}</b> <b>{device}</b>"}}diff --git a/public/intl/messages/fi-FI.json b/public/intl/messages/fi-FI.jsonindex aa186b255..45a695779 100644--- a/public/intl/messages/fi-FI.json+++ b/public/intl/messages/fi-FI.json@@ -298,13 +298,13 @@"bad-request": "Virheellinen pyyntö","collected-data": "Kerätty data","confirm-delete": "Haluatko varmasti poistaa sivuston {target}?",- "confirm-leave": "Haluatko varmasti poistua {target}?",- "confirm-remove": "Haluatko varmasti poistaa {target}?",+ "confirm-leave": "Haluatko varmasti poistua <b>{target}</b>?",+ "confirm-remove": "Haluatko varmasti poistaa <b>{target}</b>?","confirm-reset": "Haluatko varmasti poistaa sivuston {target} tilastot?","delete-team-warning": "Tiimin poistaminen poistaa myös kaikki tiimin sivustot.","delete-website-warning": "Kaikki siihen liittyvät tiedot poistetaan.","error": "Jotain meni pieleen.",- "event-log": "{event} on {url}",+ "event-log": "<b>{event}</b> on <a>{url}</a>","forbidden": "Kielletty","go-to-settings": "Mene asetuksiin","incorrect-username-password": "Väärä käyttäjänimi/salasana.",@@ -338,6 +338,6 @@"unauthorized": "Ei oikeuksia","user-deleted": "Käyttäjä poistettu.","viewed-page": "Katsottu sivu",- "visitor-log": "Vierailija maasta {country} selaimella {browser} laitteella {os} {device}"+ "visitor-log": "Vierailija maasta <b>{country}</b> selaimella <b>{browser}</b> laitteella <b>{os}</b> <b>{device}</b>"}}diff --git a/public/intl/messages/fo-FO.json b/public/intl/messages/fo-FO.jsonindex fee893230..2e95fbe8e 100644--- a/public/intl/messages/fo-FO.json+++ b/public/intl/messages/fo-FO.json@@ -298,13 +298,13 @@"bad-request": "Bad request","collected-data": "Collected data","confirm-delete": "Ert tú sikkur at tú ynskir at strika {target}?",- "confirm-leave": "Are you sure you want to leave {target}?",- "confirm-remove": "Are you sure you want to remove {target}?",+ "confirm-leave": "Are you sure you want to leave <b>{target}</b>?",+ "confirm-remove": "Are you sure you want to remove <b>{target}</b>?","confirm-reset": "Are your sure you want to reset {target}'s statistics?","delete-team-warning": "Deleting a team will also delete all team websites.","delete-website-warning": "Øll data ið er knýtt at verður eisini strika.","error": "Okkurt bleiv gali.",- "event-log": "{event} on {url}",+ "event-log": "<b>{event}</b> on <a>{url}</a>","forbidden": "Forbidden","go-to-settings": "Far til stillingar","incorrect-username-password": "Skeivt brúkaranavn/loyniorð.",@@ -338,6 +338,6 @@"unauthorized": "Unauthorized","user-deleted": "User deleted.","viewed-page": "Viewed page",- "visitor-log": "Vitjandi frá {country} brúkar {browser} á {os} {device}"+ "visitor-log": "Vitjandi frá <b>{country}</b> brúkar <b>{browser}</b> á <b>{os}</b> <b>{device}</b>"}}diff --git a/public/intl/messages/fr-FR.json b/public/intl/messages/fr-FR.jsonindex 397d1835b..8b0796cea 100644--- a/public/intl/messages/fr-FR.json+++ b/public/intl/messages/fr-FR.json@@ -300,13 +300,13 @@"bad-request": "Bad request","collected-data": "Donnée collectée","confirm-delete": "Êtes-vous sûr de vouloir supprimer {target} ?",- "confirm-leave": "Êtes-vous sûr de vouloir quitter {target} ?",- "confirm-remove": "Êtes-vous sûr de vouloir retirer {target} ?",+ "confirm-leave": "Êtes-vous sûr de vouloir quitter <b>{target}</b> ?",+ "confirm-remove": "Êtes-vous sûr de vouloir retirer <b>{target}</b> ?","confirm-reset": "Êtes-vous sûr de vouloir réinitialiser les statistiques de {target} ?","delete-team-warning": "Supprimer une équipe supprimera aussi tous les sites de cette équipe.","delete-website-warning": "Toutes les données associées seront supprimées.","error": "Un problème est survenu.",- "event-log": "{event} sur {url}",+ "event-log": "<b>{event}</b> sur <a>{url}</a>","forbidden": "Forbidden","go-to-settings": "Aller aux paramètres","incorrect-username-password": "Nom d'utilisateur/Mot de passe incorrect.",@@ -340,6 +340,6 @@"unauthorized": "Non authorisé!","user-deleted": "Utilisateur supprimé.","viewed-page": "Page vue",- "visitor-log": "Visiteur de {country} utilisant {browser} sur {os} {device}"+ "visitor-log": "Visiteur de <b>{country}</b> utilisant <b>{browser}</b> sur <b>{os}</b> <b>{device}</b>"}}diff --git a/public/intl/messages/ga-ES.json b/public/intl/messages/ga-ES.jsonindex 0d22d73a2..74f63aa8f 100644--- a/public/intl/messages/ga-ES.json+++ b/public/intl/messages/ga-ES.json@@ -298,13 +298,13 @@"bad-request": "Bad request","collected-data": "Datos recopilados","confirm-delete": "Estás seguro/a de que queres eliminar {target}?",- "confirm-leave": "Estás seguro/a de que queres deixar {target}?",- "confirm-remove": "Estás seguro/a de que queres eliminar {target}?",+ "confirm-leave": "Estás seguro/a de que queres deixar <b>{target}</b>?",+ "confirm-remove": "Estás seguro/a de que queres eliminar <b>{target}</b>?","confirm-reset": "Estás seguro/a de querer restablecer as estatísticas de {target}?","delete-team-warning": "Eliminar un equipo tamén eliminará tódolos sitios web do equipo.","delete-website-warning": "Tamén serán borrados tódolos datos asociados.","error": "Houbo un fallo.",- "event-log": "{event} en {url}",+ "event-log": "<b>{event}</b> en <a>{url}</a>","forbidden": "Forbidden","go-to-settings": "Ir aos axustes","incorrect-username-password": "Credenciais incorrectas.",@@ -338,6 +338,6 @@"unauthorized": "Unauthorized","user-deleted": "Usuario eliminado.","viewed-page": "Páxina vista",- "visitor-log": "Visitante desde {country} usando {browser} en {os} {device}"+ "visitor-log": "Visitante desde <b>{country}</b> usando <b>{browser}</b> en <b>{os}</b> <b>{device}</b>"}}diff --git a/public/intl/messages/he-IL.json b/public/intl/messages/he-IL.jsonindex 417a8d757..719d74d89 100644--- a/public/intl/messages/he-IL.json+++ b/public/intl/messages/he-IL.json@@ -298,13 +298,13 @@"bad-request": "Bad request","collected-data": "Collected data","confirm-delete": "האם באמת למחוק את {target}?",- "confirm-leave": "Are you sure you want to leave {target}?",- "confirm-remove": "Are you sure you want to remove {target}?",+ "confirm-leave": "Are you sure you want to leave <b>{target}</b>?",+ "confirm-remove": "Are you sure you want to remove <b>{target}</b>?","confirm-reset": "Are your sure you want to reset {target}'s statistics?","delete-team-warning": "Deleting a team will also delete all team websites.","delete-website-warning": "כל המידע המקושר יימחק","error": "משהו השתבש",- "event-log": "{event} on {url}",+ "event-log": "<b>{event}</b> on <a>{url}</a>","forbidden": "Forbidden","go-to-settings": "להדרותג","incorrect-username-password": "שם משתמש או סיסמה לא נכונים",@@ -338,6 +338,6 @@"unauthorized": "Unauthorized","user-deleted": "User deleted.","viewed-page": "Viewed page",- "visitor-log": "מבקר ממדינת {country} משתמבש בדפדפן {browser} ב-{os} {device}"+ "visitor-log": "מבקר ממדינת <b>{country}</b> משתמבש בדפדפן <b>{browser}</b> ב-<b>{os}</b> <b>{device}</b>"}}diff --git a/public/intl/messages/hi-IN.json b/public/intl/messages/hi-IN.jsonindex d9cae257f..c16491c0a 100644--- a/public/intl/messages/hi-IN.json+++ b/public/intl/messages/hi-IN.json@@ -298,13 +298,13 @@"bad-request": "Bad request","collected-data": "Collected data","confirm-delete": "क्या आप वाकई में {target} हटाना चाहते हैं?",- "confirm-leave": "Are you sure you want to leave {target}?",- "confirm-remove": "Are you sure you want to remove {target}?",+ "confirm-leave": "Are you sure you want to leave <b>{target}</b>?",+ "confirm-remove": "Are you sure you want to remove <b>{target}</b>?","confirm-reset": "Are your sure you want to reset {target}'s statistics?","delete-team-warning": "Deleting a team will also delete all team websites.","delete-website-warning": "सभी संबद्ध डेटा को भी हटा दिया जाएगा।","error": "कुछ गलत हो गया।",- "event-log": "{event} on {url}",+ "event-log": "<b>{event}</b> on <a>{url}</a>","forbidden": "Forbidden","go-to-settings": "समायोजन में जाइए","incorrect-username-password": "ग़लत उपयोगकर्ता नाम / पासवर्ड।",@@ -338,6 +338,6 @@"unauthorized": "Unauthorized","user-deleted": "User deleted.","viewed-page": "Viewed page",- "visitor-log": "{country} का आगंतुक, जो {browser} का उपयोग करता है, {os} यन्त्र पर"+ "visitor-log": "<b>{country}</b> का आगंतुक, जो <b>{browser}</b> का उपयोग करता है, <b>{os}</b> यन्त्र पर"}}diff --git a/public/intl/messages/hr-HR.json b/public/intl/messages/hr-HR.jsonindex 218d48543..664eaec73 100644--- a/public/intl/messages/hr-HR.json+++ b/public/intl/messages/hr-HR.json@@ -298,13 +298,13 @@"bad-request": "Bad request","collected-data": "Collected data","confirm-delete": "Jeste li sigurni da želite obrisati {target}?",- "confirm-leave": "Are you sure you want to leave {target}?",- "confirm-remove": "Are you sure you want to remove {target}?",+ "confirm-leave": "Are you sure you want to leave <b>{target}</b>?",+ "confirm-remove": "Are you sure you want to remove <b>{target}</b>?","confirm-reset": "Jeste li sigurni da želite resetirati {target}'s statistiku?","delete-team-warning": "Deleting a team will also delete all team websites.","delete-website-warning": "All website data will be deleted.","error": "Something went wrong.",- "event-log": "{event} on {url}",+ "event-log": "<b>{event}</b> on <a>{url}</a>","forbidden": "Forbidden","go-to-settings": "Idi u postavke","incorrect-username-password": "Neispravno korisničke ime/lozinka.",@@ -338,6 +338,6 @@"unauthorized": "Unauthorized","user-deleted": "User deleted.","viewed-page": "Viewed page",- "visitor-log": "Visitor from {country} using {browser} on {os} {device}"+ "visitor-log": "Visitor from <b>{country}</b> using <b>{browser}</b> on <b>{os}</b> <b>{device}</b>"}}diff --git a/public/intl/messages/hu-HU.json b/public/intl/messages/hu-HU.jsonindex b757d567f..4854c86c2 100644--- a/public/intl/messages/hu-HU.json+++ b/public/intl/messages/hu-HU.json@@ -298,13 +298,13 @@"bad-request": "Bad request","collected-data": "Collected data","confirm-delete": "Biztos, hogy törölni szeretnéd {target} elemet?",- "confirm-leave": "Are you sure you want to leave {target}?",- "confirm-remove": "Are you sure you want to remove {target}?",+ "confirm-leave": "Are you sure you want to leave <b>{target}</b>?",+ "confirm-remove": "Are you sure you want to remove <b>{target}</b>?","confirm-reset": "Are your sure you want to reset {target}'s statistics?","delete-team-warning": "Deleting a team will also delete all team websites.","delete-website-warning": "Minden társított adat törlésre kerül.","error": "Valami baj történt.",- "event-log": "{event} on {url}",+ "event-log": "<b>{event}</b> on <a>{url}</a>","forbidden": "Forbidden","go-to-settings": "Tovább a beállításokhoz","incorrect-username-password": "Érvénytelen felhasználónév/jelszó.",@@ -338,6 +338,6 @@"unauthorized": "Unauthorized","user-deleted": "User deleted.","viewed-page": "Viewed page",- "visitor-log": "Látógató {country} területéről, {os} {device} eszközön, {browser} böngészőből."+ "visitor-log": "Látógató <b>{country}</b> területéről, <b>{os}</b> <b>{device}</b> eszközön, <b>{browser}</b> böngészőből."}}diff --git a/public/intl/messages/id-ID.json b/public/intl/messages/id-ID.jsonindex bb4ecbc0a..a64a3c0e0 100644--- a/public/intl/messages/id-ID.json+++ b/public/intl/messages/id-ID.json@@ -298,13 +298,13 @@"bad-request": "Bad request","collected-data": "Data dikumpulkan","confirm-delete": "Apakah kamu yakin ingin menghapus {target}?",- "confirm-leave": "Apakah Anda yakin ingin meninggalkan {target}?",- "confirm-remove": "Apakah Anda yakin ingin menghapus {target}?",+ "confirm-leave": "Apakah Anda yakin ingin meninggalkan <b>{target}</b>?",+ "confirm-remove": "Apakah Anda yakin ingin menghapus <b>{target}</b>?","confirm-reset": "Anda yakin ingin mengatur ulang statistik {target}?","delete-team-warning": "Menghapus tim juga akan menghapus semua situs web yang terkait.","delete-website-warning": "Semua data terkait juga akan dihapus.","error": "Ada yang salah.",- "event-log": "{event} on {url}",+ "event-log": "<b>{event}</b> on <a>{url}</a>","forbidden": "Forbidden","go-to-settings": "Pergi ke pengaturan","incorrect-username-password": "Nama pengguna/kata sandi salah.",@@ -338,6 +338,6 @@"unauthorized": "Unauthorized","user-deleted": "Pengguna telah dihapus.","viewed-page": "Halaman dilihat",- "visitor-log": "Pengunjung dari {country} dengan {browser} di {device} {os}"+ "visitor-log": "Pengunjung dari <b>{country}</b> dengan <b>{browser}</b> di <b>{device}</b> <b>{os}</b>"}}diff --git a/public/intl/messages/it-IT.json b/public/intl/messages/it-IT.jsonindex c06c1c1ae..b0bceb05a 100644--- a/public/intl/messages/it-IT.json+++ b/public/intl/messages/it-IT.json@@ -298,13 +298,13 @@"bad-request": "Bad request","collected-data": "Collected data","confirm-delete": "Sei sicuro di voler eliminare {target}?",- "confirm-leave": "Are you sure you want to leave {target}?",- "confirm-remove": "Are you sure you want to remove {target}?",+ "confirm-leave": "Are you sure you want to leave <b>{target}</b>?",+ "confirm-remove": "Are you sure you want to remove <b>{target}</b>?","confirm-reset": "Sei sicuro di voler azzerare le statistiche di {target}?","delete-team-warning": "Deleting a team will also delete all team websites.","delete-website-warning": "Saranno eliminati anche tutti i dati associati.","error": "Si è verificato un errore.",- "event-log": "{event} on {url}",+ "event-log": "<b>{event}</b> on <a>{url}</a>","forbidden": "Forbidden","go-to-settings": "Vai alle impostazioni","incorrect-username-password": "Username o password non corretti.",@@ -338,6 +338,6 @@"unauthorized": "Unauthorized","user-deleted": "User deleted.","viewed-page": "Viewed page",- "visitor-log": "Utenti da {country} tramite {browser} su {os} {device}"+ "visitor-log": "Utenti da <b>{country}</b> tramite <b>{browser}</b> su <b>{os}</b> <b>{device}</b>"}}diff --git a/public/intl/messages/ja-JP.json b/public/intl/messages/ja-JP.jsonindex 592873107..982de10e3 100644--- a/public/intl/messages/ja-JP.json+++ b/public/intl/messages/ja-JP.json@@ -298,13 +298,13 @@"bad-request": "Bad request","collected-data": "収集されたデータ","confirm-delete": "{target}を削除してもよろしいですか?",- "confirm-leave": "{target}から離脱してもよろしいですか?",- "confirm-remove": "{target}を削除してもよろしいですか?",+ "confirm-leave": "<b>{target}</b>から離脱してもよろしいですか?",+ "confirm-remove": "<b>{target}</b>を削除してもよろしいですか?","confirm-reset": "{target}をリセットしてもよろしいですか?","delete-team-warning": "チームを削除すると、そのチームが管理しているWebサイトもすべて削除されます。","delete-website-warning": "Webサイトのデータがすべて削除されます。","error": "未知のエラーが発生しました。",- "event-log": "{url}の{event}",+ "event-log": "<a>{url}</a>の<b>{event}</b>","forbidden": "Forbidden","go-to-settings": "設定に移動する","incorrect-username-password": "ユーザー名またはパスワードが間違っています。",@@ -338,6 +338,6 @@"unauthorized": "Unauthorized","user-deleted": "ユーザーが削除されました。","viewed-page": "閲覧されたページ",- "visitor-log": "{os}({device})で{browser}を使用している{country}からの訪問者"+ "visitor-log": "<b>{os}</b>(<b>{device}</b>)で<b>{browser}</b>を使用している<b>{country}</b>からの訪問者"}}diff --git a/public/intl/messages/km-KH.json b/public/intl/messages/km-KH.jsonindex 1930cbb7a..cf1c8d411 100644--- a/public/intl/messages/km-KH.json+++ b/public/intl/messages/km-KH.json@@ -298,13 +298,13 @@"bad-request": "Bad request","collected-data": "ទិន្នន័យដែលបានប្រមូលទុក","confirm-delete": "តើអ្នកប្រាកដថាចង់លុប {target} ទេ?",- "confirm-leave": "តើអ្នកប្រាកដថាចង់ចាកចេញ {target} ទេ?",- "confirm-remove": "តើអ្នកប្រាកដថាចង់លុប {target} ទេ?",+ "confirm-leave": "តើអ្នកប្រាកដថាចង់ចាកចេញ <b>{target}</b> ទេ?",+ "confirm-remove": "តើអ្នកប្រាកដថាចង់លុប <b>{target}</b> ទេ?","confirm-reset": "តើអ្នកប្រាកដថាចង់កំណត់ស្ថិតិរបស់ {target} ឡើងវិញទេ?","delete-team-warning": "ពេលលុបក្រុម គេហទំព័ររបស់ក្រុមក៏នឹងត្រូវលប់ចោលទាំងអស់ផងដែរ។","delete-website-warning": "ទិន្នន័យរបស់គេហទំព័រទាំងអស់នឹងត្រូវលុបចោល។","error": "មានអ្វីមួយមិនប្រក្រតី។",- "event-log": "{event} on {url}",+ "event-log": "<b>{event}</b> on <a>{url}</a>","forbidden": "Forbidden","go-to-settings": "ការកំណត់","incorrect-username-password": "ឈ្មោះអ្នកប្រើឬពាក្យសម្ងាត់មិនត្រឹមត្រូវ។",@@ -338,6 +338,6 @@"unauthorized": "Unauthorized","user-deleted": "អ្នកប្រើប្រាស់ត្រូវបានលុបចោល។","viewed-page": "ទំព័រដែលបានមើល",- "visitor-log": "អ្នកមើលពីប្រទេស {country} ប្រើប្រាស់កម្មវិធី {browser} លើឧបករណ៍ {os} {device}"+ "visitor-log": "អ្នកមើលពីប្រទេស <b>{country}</b> ប្រើប្រាស់កម្មវិធី <b>{browser}</b> លើឧបករណ៍ <b>{os}</b> <b>{device}</b>"}}diff --git a/public/intl/messages/ko-KR.json b/public/intl/messages/ko-KR.jsonindex e0ce4c7a1..176820d4a 100644--- a/public/intl/messages/ko-KR.json+++ b/public/intl/messages/ko-KR.json@@ -298,13 +298,13 @@"bad-request": "Bad request","collected-data": "수집된 데이터","confirm-delete": "{target}을(를) 삭제하시겠습니까?",- "confirm-leave": "{target}을(를) 떠나시겠습니까?",- "confirm-remove": "{target}을(를) 제거하시겠습니까?",+ "confirm-leave": "<b>{target}</b>을(를) 떠나시겠습니까?",+ "confirm-remove": "<b>{target}</b>을(를) 제거하시겠습니까?","confirm-reset": "{target}을(를) 초기화하시겠습니까?","delete-team-warning": "팀을 삭제하면 팀에 등록된 모든 웹사이트도 삭제됩니다.","delete-website-warning": "관련된 모든 데이터가 삭제됩니다.","error": "문제가 발생했습니다.",- "event-log": "{event} - {url}",+ "event-log": "<b>{event}</b> - <a>{url}</a>","forbidden": "Forbidden","go-to-settings": "설정으로 이동","incorrect-username-password": "사용자 이름 또는 비밀번호를 잘못 입력했습니다.",@@ -338,6 +338,6 @@"unauthorized": "Unauthorized","user-deleted": "사용자를 삭제했습니다.","viewed-page": "조회한 페이지",- "visitor-log": "{os} {device}에서 {browser}을(를) 사용하는 {country}의 방문자"+ "visitor-log": "<b>{os}</b> <b>{device}</b>에서 <b>{browser}</b>을(를) 사용하는 <b>{country}</b>의 방문자"}}diff --git a/public/intl/messages/lt-LT.json b/public/intl/messages/lt-LT.jsonindex 80e1834c6..1587b78b7 100644--- a/public/intl/messages/lt-LT.json+++ b/public/intl/messages/lt-LT.json@@ -298,13 +298,13 @@"bad-request": "Bad request","collected-data": "Collected data","confirm-delete": "Ar esate tikri, jog norite ištrinti svetainę {target}?",- "confirm-leave": "Ar esate tikri, jog norite palikti {target}?",- "confirm-remove": "Ar esate tikri, jog norite ištrinti {target}?",+ "confirm-leave": "Ar esate tikri, jog norite palikti <b>{target}</b>?",+ "confirm-remove": "Ar esate tikri, jog norite ištrinti <b>{target}</b>?","confirm-reset": "Are esate tikri, jog norite atstatyti svetainės {target} statistikos duomenis?","delete-team-warning": "Ištrinant komandą bus ištrintos ir visos komandos svetainės.","delete-website-warning": "Visi susiję duomenys taip pat bus ištrinti.","error": "Kažkas įvyko ne taip.",- "event-log": "{event} on {url}",+ "event-log": "<b>{event}</b> on <a>{url}</a>","forbidden": "Forbidden","go-to-settings": "Eiti į nustatymus","incorrect-username-password": "Neteisingas vartotojo vardas/slaptažodis.",@@ -338,6 +338,6 @@"unauthorized": "Unauthorized","user-deleted": "Vartotojas ištrintas.","viewed-page": "Viewed page",- "visitor-log": "Lankytojas iš {country}, naudojantis {browser} sistemoje {os} {device}"+ "visitor-log": "Lankytojas iš <b>{country}</b>, naudojantis <b>{browser}</b> sistemoje <b>{os}</b> <b>{device}</b>"}}diff --git a/public/intl/messages/mn-MN.json b/public/intl/messages/mn-MN.jsonindex 6700da4f4..f0143b840 100644--- a/public/intl/messages/mn-MN.json+++ b/public/intl/messages/mn-MN.json@@ -298,13 +298,13 @@"bad-request": "Bad request","collected-data": "Цуглуулсан өгөгдөл","confirm-delete": "Та {target}-г устгахдаа итгэлтэй байна уу?",- "confirm-leave": "Та {target}-с гарахдаа итгэлтэй байна уу?",- "confirm-remove": "Та {target}-г устгахдаа итгэлтэй байна уу?",+ "confirm-leave": "Та <b>{target}</b>-с гарахдаа итгэлтэй байна уу?",+ "confirm-remove": "Та <b>{target}</b>-г устгахдаа итгэлтэй байна уу?","confirm-reset": "Та {target}-н тоон үзүүлэлтүүдийг устгахдаа итгэлтэй байна уу?","delete-team-warning": "Баг устгах нь мөн түүнд харъяалагдах вебүүдийг устгах болно.","delete-website-warning": "Энэ вебтэй холбоотой бүх өгөгдөл устах болно.","error": "Ямар нэг зүйл буруу боллоо.",- "event-log": "{url}-д {event}",+ "event-log": "<a>{url}</a>-д <b>{event}</b>","forbidden": "Forbidden","go-to-settings": "Тохиргоо руу очих","incorrect-username-password": "Буруу хэрэглэгчийн нэр/нууц үг.",@@ -338,6 +338,6 @@"unauthorized": "Unauthorized","user-deleted": "Хэрэглэгч устсан.","viewed-page": "Үзсэн хуудас",- "visitor-log": "{country} улсаас {os} {device} дээр {browser} хөтөч ашиглан орсон"+ "visitor-log": "<b>{country}</b> улсаас <b>{os}</b> <b>{device}</b> дээр <b>{browser}</b> хөтөч ашиглан орсон"}}diff --git a/public/intl/messages/ms-MY.json b/public/intl/messages/ms-MY.jsonindex 005039ea2..c8b3ee831 100644--- a/public/intl/messages/ms-MY.json+++ b/public/intl/messages/ms-MY.json@@ -298,13 +298,13 @@"bad-request": "Bad request","collected-data": "Collected data","confirm-delete": "Pastikah anda ingin memadam {target}?",- "confirm-leave": "Are you sure you want to leave {target}?",- "confirm-remove": "Are you sure you want to remove {target}?",+ "confirm-leave": "Are you sure you want to leave <b>{target}</b>?",+ "confirm-remove": "Are you sure you want to remove <b>{target}</b>?","confirm-reset": "Are your sure you want to reset {target}'s statistics?","delete-team-warning": "Deleting a team will also delete all team websites.","delete-website-warning": "Semua data yang berkaitan juga akan dihapuskan.","error": "Ada yang tidak kena.",- "event-log": "{event} on {url}",+ "event-log": "<b>{event}</b> on <a>{url}</a>","forbidden": "Forbidden","go-to-settings": "Pergi ke tetapan","incorrect-username-password": "Pengguna/kata laluan tidak betul.",@@ -338,6 +338,6 @@"unauthorized": "Unauthorized","user-deleted": "User deleted.","viewed-page": "Viewed page",- "visitor-log": "Pelawat dari {country} mengguna {browser} pada {os} {device}"+ "visitor-log": "Pelawat dari <b>{country}</b> mengguna <b>{browser}</b> pada <b>{os}</b> <b>{device}</b>"}}diff --git a/public/intl/messages/my-MM.json b/public/intl/messages/my-MM.jsonindex 80fd4a18f..1b0893935 100644--- a/public/intl/messages/my-MM.json+++ b/public/intl/messages/my-MM.json@@ -298,13 +298,13 @@"bad-request": "Bad request","collected-data": "Collected data","confirm-delete": "{target} ကို ဖျက်ရန် သေချာပါသလား?",- "confirm-leave": "{target} ကို ထွက်ရန် သေချာပါသလား?",- "confirm-remove": "Are you sure you want to remove {target}?",+ "confirm-leave": "<b>{target}</b> ကို ထွက်ရန် သေချာပါသလား?",+ "confirm-remove": "Are you sure you want to remove <b>{target}</b>?","confirm-reset": "{target} ကို ဖျက်၍ပြန်စလုပ်ရန် သေချာပါသလား?","delete-team-warning": "Deleting a team will also delete all team websites.","delete-website-warning": "ဝက်ဘ်ဆိုဒ် ဒေတာအကုန် ဖျက်မည်","error": "မှားယွင်းမှုတစ်ခု ရှိသွားပါသည်",- "event-log": "{url} တွင် {event}",+ "event-log": "<a>{url}</a> တွင် <b>{event}</b>","forbidden": "Forbidden","go-to-settings": "ဆက်တင်သို့ သွားရန်","incorrect-username-password": "အသုံးပြုသူအမည် သို့မဟုတ် စကားဝှက် မှားနေသည်",@@ -338,6 +338,6 @@"unauthorized": "Unauthorized","user-deleted": "အသုံးပြုသူ ဖျက်ပြီးပါပြီ","viewed-page": "Viewed page",- "visitor-log": "{country} မှ {browser} ဖြင့် {os} {device} တွင် ဝင်ရောက်ကြည့်ရှုသူ"+ "visitor-log": "<b>{country}</b> မှ <b>{browser}</b> ဖြင့် <b>{os}</b> <b>{device}</b> တွင် ဝင်ရောက်ကြည့်ရှုသူ"}}diff --git a/public/intl/messages/nb-NO.json b/public/intl/messages/nb-NO.jsonindex 18ee844e8..d0b3606fe 100644--- a/public/intl/messages/nb-NO.json+++ b/public/intl/messages/nb-NO.json@@ -298,13 +298,13 @@"bad-request": "Bad request","collected-data": "Innsamlede data","confirm-delete": "Er du sikker på at du vil slette {target}?",- "confirm-leave": "Er du sikker på at du vil forlate {target}?",- "confirm-remove": "Er du sikker på at du vil fjerne {target}?",+ "confirm-leave": "Er du sikker på at du vil forlate <b>{target}</b>?",+ "confirm-remove": "Er du sikker på at du vil fjerne <b>{target}</b>?","confirm-reset": "Er du sikker på at du vil nullstille statistikken til {target}?","delete-team-warning": "Å slette et team vil også slette alle teamets nettsteder.","delete-website-warning": "Alle tilknyttede data vil også bli slettet.","error": "Noe gikk galt.",- "event-log": "{event} på {url}",+ "event-log": "<b>{event}</b> på <a>{url}</a>","forbidden": "Forbidden","go-to-settings": "Gå til innstillinger","incorrect-username-password": "Ugyldig brukernavn/passord.",@@ -338,6 +338,6 @@"unauthorized": "Unauthorized","user-deleted": "Bruker slettet.","viewed-page": "Vist side",- "visitor-log": "Besøkende fra {country} med {browser} på {os} {device}"+ "visitor-log": "Besøkende fra <b>{country}</b> med <b>{browser}</b> på <b>{os}</b> <b>{device}</b>"}}diff --git a/public/intl/messages/nl-NL.json b/public/intl/messages/nl-NL.jsonindex e671719ef..2d3705165 100644--- a/public/intl/messages/nl-NL.json+++ b/public/intl/messages/nl-NL.json@@ -298,13 +298,13 @@"bad-request": "Bad request","collected-data": "Collected data","confirm-delete": "Weet je zeker dat je {target} wilt verwijderen?",- "confirm-leave": "Weet je zeker dat je {target} wilt verlaten?",- "confirm-remove": "Weet je zeker dat je {target} wilt verwijderen?",+ "confirm-leave": "Weet je zeker dat je <b>{target}</b> wilt verlaten?",+ "confirm-remove": "Weet je zeker dat je <b>{target}</b> wilt verwijderen?","confirm-reset": "Weet je zeker dat je de statistieken van {target} opnieuw wilt instellen?","delete-team-warning": "Als een team wordt verwijderd, worden ook alle websites van dat team verwijderd.","delete-website-warning": "Alle verwante gegevens zullen ook verwijderd worden.","error": "Er is iets misgegaan.",- "event-log": "{event} op {url}",+ "event-log": "<b>{event}</b> op <a>{url}</a>","forbidden": "Forbidden","go-to-settings": "Naar instellingen","incorrect-username-password": "Incorrecte gebruikersnaam/wachtwoord.",@@ -338,6 +338,6 @@"unauthorized": "Unauthorized","user-deleted": "Gebruiker verwijderd","viewed-page": "Bekeken pagina",- "visitor-log": "Bezoeker uit {country} met {browser} op een {os} {device}"+ "visitor-log": "Bezoeker uit <b>{country}</b> met <b>{browser}</b> op een <b>{os}</b> <b>{device}</b>"}}diff --git a/public/intl/messages/pl-PL.json b/public/intl/messages/pl-PL.jsonindex 6d3897381..f6507ddd0 100644--- a/public/intl/messages/pl-PL.json+++ b/public/intl/messages/pl-PL.json@@ -298,13 +298,13 @@"bad-request": "Bad request","collected-data": "Zebrane dane","confirm-delete": "Czy na pewno chcesz usunąć {target}?",- "confirm-leave": "Czy na pewno chcesz opuścić {target}?",- "confirm-remove": "Czy na pewno chcesz usunąć {target}?",+ "confirm-leave": "Czy na pewno chcesz opuścić <b>{target}</b>?",+ "confirm-remove": "Czy na pewno chcesz usunąć <b>{target}</b>?","confirm-reset": "Czy na pewno chcesz zresetować statystyki {target}?","delete-team-warning": "Usunięcie zespołu usunie wszystkie jego witryny.","delete-website-warning": "Wszystkie powiązane dane również zostaną usunięte.","error": "Coś poszło nie tak.",- "event-log": "{event} na {url}",+ "event-log": "<b>{event}</b> na <a>{url}</a>","forbidden": "Forbidden","go-to-settings": "Przejdź do ustawień","incorrect-username-password": "Nieprawidłowa nazwa użytkownika lub hasło.",@@ -338,6 +338,6 @@"unauthorized": "Unauthorized","user-deleted": "Użytkownik usunięty.","viewed-page": "Obejrzana strona",- "visitor-log": "Odwiedzający z {country} używa {browser} na {os} {device}"+ "visitor-log": "Odwiedzający z <b>{country}</b> używa <b>{browser}</b> na <b>{os}</b> <b>{device}</b>"}}diff --git a/public/intl/messages/pt-BR.json b/public/intl/messages/pt-BR.jsonindex 510109433..4e7a2c5d0 100644--- a/public/intl/messages/pt-BR.json+++ b/public/intl/messages/pt-BR.json@@ -298,13 +298,13 @@"bad-request": "Bad request","collected-data": "Collected data","confirm-delete": "Tem certeza de que deseja excluir {target}?",- "confirm-leave": "Tem certeza de que deseja sair de {target}?",- "confirm-remove": "Tem certeza que deseja remover {target}?",+ "confirm-leave": "Tem certeza de que deseja sair de <b>{target}</b>?",+ "confirm-remove": "Tem certeza que deseja remover <b>{target}</b>?","confirm-reset": "Tem certeza que deseja redefinir os dados de {target}?","delete-team-warning": "Excluir a equipe também excluirá todos os sites da equipe.","delete-website-warning": "Todos os dados relacionados serão excluídos.","error": "Ocorreu um erro.",- "event-log": "{event} em {url}",+ "event-log": "<b>{event}</b> em <a>{url}</a>","forbidden": "Forbidden","go-to-settings": "Ir para as configurações","incorrect-username-password": "Nome de usuário ou senha incorretos.",@@ -338,6 +338,6 @@"unauthorized": "Unauthorized","user-deleted": "Usuário excluído.","viewed-page": "Página visualizada",- "visitor-log": "Visitante de {country} usando o navegador {browser} em um {device} com sistema operacional {os}."+ "visitor-log": "Visitante de <b>{country}</b> usando o navegador <b>{browser}</b> em um <b>{device}</b> com sistema operacional <b>{os}</b>."}}diff --git a/public/intl/messages/pt-PT.json b/public/intl/messages/pt-PT.jsonindex 80d3d86d2..6ee8c1971 100644--- a/public/intl/messages/pt-PT.json+++ b/public/intl/messages/pt-PT.json@@ -298,13 +298,13 @@"bad-request": "Bad request","collected-data": "Collected data","confirm-delete": "Tem a certeza que pretende eliminar {target}?",- "confirm-leave": "Are you sure you want to leave {target}?",- "confirm-remove": "Are you sure you want to remove {target}?",+ "confirm-leave": "Are you sure you want to leave <b>{target}</b>?",+ "confirm-remove": "Are you sure you want to remove <b>{target}</b>?","confirm-reset": "Tem a certeza que pretende restaurar as estatísticas de {target}?","delete-team-warning": "Deleting a team will also delete all team websites.","delete-website-warning": "Todos os dados associados também serão eliminados.","error": "Ocorreu um erro.",- "event-log": "{event} on {url}",+ "event-log": "<b>{event}</b> on <a>{url}</a>","forbidden": "Forbidden","go-to-settings": "Ir para as definições","incorrect-username-password": "Nome de utilizador/senha incorretos.",@@ -338,6 +338,6 @@"unauthorized": "Unauthorized","user-deleted": "User deleted.","viewed-page": "Viewed page",- "visitor-log": "Visitante de {country} a usar {browser} no {device} {os}"+ "visitor-log": "Visitante de <b>{country}</b> a usar <b>{browser}</b> no <b>{device}</b> <b>{os}</b>"}}diff --git a/public/intl/messages/ro-RO.json b/public/intl/messages/ro-RO.jsonindex f2e872d1e..7149bc6e9 100644--- a/public/intl/messages/ro-RO.json+++ b/public/intl/messages/ro-RO.json@@ -298,13 +298,13 @@"bad-request": "Bad request","collected-data": "Date colectate","confirm-delete": "Ești sigur că vrei să ștergi {target}?",- "confirm-leave": "Ești sigur că vrei să părăsești {target}?",- "confirm-remove": "Ești sigur că vrei să ștergi {target}?",+ "confirm-leave": "Ești sigur că vrei să părăsești <b>{target}</b>?",+ "confirm-remove": "Ești sigur că vrei să ștergi <b>{target}</b>?","confirm-reset": "Ești sigur că vrei să resetezi statisticile pentru {target}?","delete-team-warning": "Ștergerea unei echipe va șterge și toate website-urile echipei.","delete-website-warning": "Toate datele asociate vor fi șterse, de asemenea.","error": "Ceva n-a mers bine.",- "event-log": "{event} la {url}",+ "event-log": "<b>{event}</b> la <a>{url}</a>","forbidden": "Forbidden","go-to-settings": "Mergi la Setări","incorrect-username-password": "Nume utilizator / parolă incorecte.",@@ -338,6 +338,6 @@"unauthorized": "Unauthorized","user-deleted": "Utilizator șters.","viewed-page": "Pagină vizualizată",- "visitor-log": "Vizitator din {country} folosind {browser} pe {os} {device}"+ "visitor-log": "Vizitator din <b>{country}</b> folosind <b>{browser}</b> pe <b>{os}</b> <b>{device}</b>"}}diff --git a/public/intl/messages/ru-RU.json b/public/intl/messages/ru-RU.jsonindex 018dad33c..7a4545905 100644--- a/public/intl/messages/ru-RU.json+++ b/public/intl/messages/ru-RU.json@@ -298,13 +298,13 @@"bad-request": "Bad request","collected-data": "Собранные данные","confirm-delete": "Вы уверены, что хотите удалить {target}?",- "confirm-leave": "Вы уверены, что хотите уйти {target}?",- "confirm-remove": "Вы уверены, что хотите удалить {target}?",+ "confirm-leave": "Вы уверены, что хотите уйти <b>{target}</b>?",+ "confirm-remove": "Вы уверены, что хотите удалить <b>{target}</b>?","confirm-reset": "Вы уверены, что хотите сбросить статистику {target}?","delete-team-warning": "При удалении команды будут удалены и все ее веб-сайты.","delete-website-warning": "Все связанные данные будут также удалены.","error": "Что-то пошло не так.",- "event-log": "{event} на {url}",+ "event-log": "<b>{event}</b> на <a>{url}</a>","forbidden": "Forbidden","go-to-settings": "Перейти к настройкам","incorrect-username-password": "Неверное имя пользователя/пароль.",@@ -338,6 +338,6 @@"unauthorized": "Unauthorized","user-deleted": "Пользователь удален.","viewed-page": "Просмотренная страница",- "visitor-log": "Посетитель из {country} используя {browser} на {os} {device}"+ "visitor-log": "Посетитель из <b>{country}</b> используя <b>{browser}</b> на <b>{os}</b> <b>{device}</b>"}}diff --git a/public/intl/messages/si-LK.json b/public/intl/messages/si-LK.jsonindex 2c55b75ee..f05ef473f 100644--- a/public/intl/messages/si-LK.json+++ b/public/intl/messages/si-LK.json@@ -298,13 +298,13 @@"bad-request": "Bad request","collected-data": "Collected data","confirm-delete": "{target} මකා දැමීම ගැන විශ්වාසද?",- "confirm-leave": "Are you sure you want to leave {target}?",- "confirm-remove": "Are you sure you want to remove {target}?",+ "confirm-leave": "Are you sure you want to leave <b>{target}</b>?",+ "confirm-remove": "Are you sure you want to remove <b>{target}</b>?","confirm-reset": "{target} ට අදාල සංඛ්යාලේඛන නැවත පිහිටුවීමට අවශ්යද?","delete-team-warning": "Deleting a team will also delete all team websites.","delete-website-warning": "All website data will be deleted.","error": "Something went wrong.",- "event-log": "{event} on {url}",+ "event-log": "<b>{event}</b> on <a>{url}</a>","forbidden": "Forbidden","go-to-settings": "සැකසීම් වෙත යන්න","incorrect-username-password": "වැරදි පරිශීලක නාමය/මුරපදය.",@@ -338,6 +338,6 @@"unauthorized": "Unauthorized","user-deleted": "User deleted.","viewed-page": "Viewed page",- "visitor-log": "Visitor from {country} using {browser} on {os} {device}"+ "visitor-log": "Visitor from <b>{country}</b> using <b>{browser}</b> on <b>{os}</b> <b>{device}</b>"}}diff --git a/public/intl/messages/sk-SK.json b/public/intl/messages/sk-SK.jsonindex 722ca525d..c8262b955 100644--- a/public/intl/messages/sk-SK.json+++ b/public/intl/messages/sk-SK.json@@ -298,13 +298,13 @@"bad-request": "Bad request","collected-data": "Collected data","confirm-delete": "Naozaj zmazať {target}?",- "confirm-leave": "Are you sure you want to leave {target}?",- "confirm-remove": "Are you sure you want to remove {target}?",+ "confirm-leave": "Are you sure you want to leave <b>{target}</b>?",+ "confirm-remove": "Are you sure you want to remove <b>{target}</b>?","confirm-reset": "Are your sure you want to reset {target}'s statistics?","delete-team-warning": "Deleting a team will also delete all team websites.","delete-website-warning": "Všetky príbuzné data budu tiež zmazané.","error": "Niečo sa pokazilo.",- "event-log": "{event} on {url}",+ "event-log": "<b>{event}</b> on <a>{url}</a>","forbidden": "Forbidden","go-to-settings": "Ísť do nastavení","incorrect-username-password": "Nesprávné meno/heslo.",@@ -338,6 +338,6 @@"unauthorized": "Unauthorized","user-deleted": "User deleted.","viewed-page": "Viewed page",- "visitor-log": "Návštevník z {country} s prehliadačom {browser} na {os} {device}"+ "visitor-log": "Návštevník z <b>{country}</b> s prehliadačom <b>{browser}</b> na <b>{os}</b> <b>{device}</b>"}}diff --git a/public/intl/messages/sl-SI.json b/public/intl/messages/sl-SI.jsonindex 1d882fff2..6b8cd0d3a 100644--- a/public/intl/messages/sl-SI.json+++ b/public/intl/messages/sl-SI.json@@ -277,13 +277,13 @@"active-users": "{x} trenutni {x, plural, one {obiskovalec} other {obiskovalcev}}","collected-data": "Zbrani podatki","confirm-delete": "Ste prepričani, da želite izbrisati {target}?",- "confirm-leave": "Ste prepričani, da želite zapustiti {target}?",- "confirm-remove": "Ali ste prepričani, da želite odstraniti {target}?",+ "confirm-leave": "Ste prepričani, da želite zapustiti <b>{target}</b>?",+ "confirm-remove": "Ali ste prepričani, da želite odstraniti <b>{target}</b>?","confirm-reset": "Ste prepričani, da želite ponastaviti statistiko {target}?","delete-team-warning": "Brisanje ekipe bo izbrisalo tudi vsa spletna mesta ekipe.","delete-website-warning": "Izbrisani bodo tudi vsi pripadajoči podatki.","error": "Nekaj je šlo narobe.",- "event-log": "{event} na {url}",+ "event-log": "<b>{event}</b> na <a>{url}</a>","forbidden": "Forbidden","go-to-settings": "Pojdi v nastavitve","incorrect-username-password": "Nepravilno uporabniško ime/geslo.",@@ -316,7 +316,7 @@"triggered-event": "Sprožen dogodek","user-deleted": "Uporabnik je izbrisan.","viewed-page": "Ogledana stran",- "visitor-log": "Obiskovalec iz {country} uporablja {browser} na {os} {device}",+ "visitor-log": "Obiskovalec iz <b>{country}</b> uporablja <b>{browser}</b> na <b>{os}</b> <b>{device}</b>","visitors-dropped-off": "Osip obiskovalcev"}}diff --git a/public/intl/messages/sv-SE.json b/public/intl/messages/sv-SE.jsonindex 0943bb9e1..246f0d03f 100644--- a/public/intl/messages/sv-SE.json+++ b/public/intl/messages/sv-SE.json@@ -298,13 +298,13 @@"bad-request": "Bad request","collected-data": "Collected data","confirm-delete": "Är du säker på att du vill radera {target}?",- "confirm-leave": "Är du säker på att du vill lämna {target}?",- "confirm-remove": "Are you sure you want to remove {target}?",+ "confirm-leave": "Är du säker på att du vill lämna <b>{target}</b>?",+ "confirm-remove": "Are you sure you want to remove <b>{target}</b>?","confirm-reset": "Är du säker på att du vill återställa statistiken för {target}?","delete-team-warning": "Deleting a team will also delete all team websites.","delete-website-warning": "All tillhörande data kommer också att raderas.","error": "Något gick fel.",- "event-log": "{event} på {url}",+ "event-log": "<b>{event}</b> på <a>{url}</a>","forbidden": "Forbidden","go-to-settings": "Gå till inställningar","incorrect-username-password": "Felaktigt användarnamn/lösenord.",@@ -338,6 +338,6 @@"unauthorized": "Unauthorized","user-deleted": "Användaren har raderats.","viewed-page": "Viewed page",- "visitor-log": "Besökare från {country} med {browser} på {os} {device}"+ "visitor-log": "Besökare från <b>{country}</b> med <b>{browser}</b> på <b>{os}</b> <b>{device}</b>"}}diff --git a/public/intl/messages/ta-IN.json b/public/intl/messages/ta-IN.jsonindex d0086416d..b334748f1 100644--- a/public/intl/messages/ta-IN.json+++ b/public/intl/messages/ta-IN.json@@ -298,13 +298,13 @@"bad-request": "Bad request","collected-data": "Collected data","confirm-delete": "நீங்கள் நிச்சயமாக {target} நீக்க விரும்புகிறீர்களா?",- "confirm-leave": "Are you sure you want to leave {target}?",- "confirm-remove": "Are you sure you want to remove {target}?",+ "confirm-leave": "Are you sure you want to leave <b>{target}</b>?",+ "confirm-remove": "Are you sure you want to remove <b>{target}</b>?","confirm-reset": "Are your sure you want to reset {target}'s statistics?","delete-team-warning": "Deleting a team will also delete all team websites.","delete-website-warning": "தொடர்புடைய எல்லா தரவும் நீக்கப்படும்.","error": "ஏதோ தவறு நடந்துவிட்டது.",- "event-log": "{event} on {url}",+ "event-log": "<b>{event}</b> on <a>{url}</a>","forbidden": "Forbidden","go-to-settings": "அமைப்புகளுக்குச் செல்லவும்","incorrect-username-password": "தவறான பயனர்பெயர் / கடவுச்சொல்.",@@ -338,6 +338,6 @@"unauthorized": "Unauthorized","user-deleted": "User deleted.","viewed-page": "Viewed page",- "visitor-log": "{country}வில் இருந்து பார்வையாளர் {browser} ஐ {os} {device}லில் பயன்படுத்துகிறார்"+ "visitor-log": "<b>{country}</b>வில் இருந்து பார்வையாளர் <b>{browser}</b> ஐ <b>{os}</b> <b>{device}</b>லில் பயன்படுத்துகிறார்"}}diff --git a/public/intl/messages/th-TH.json b/public/intl/messages/th-TH.jsonindex cee5b7c91..bd9861db2 100644--- a/public/intl/messages/th-TH.json+++ b/public/intl/messages/th-TH.json@@ -298,13 +298,13 @@"bad-request": "Bad request","collected-data": "Collected data","confirm-delete": "คุณแน่ใจหรือไม่ว่าต้องการลบ {target} ?",- "confirm-leave": "Are you sure you want to leave {target}?",- "confirm-remove": "Are you sure you want to remove {target}?",+ "confirm-leave": "Are you sure you want to leave <b>{target}</b>?",+ "confirm-remove": "Are you sure you want to remove <b>{target}</b>?","confirm-reset": "คุณแน่ใจหรือไม่ว่าต้องการรีเซตข้อมูลสถิติของ {target} ?","delete-team-warning": "Deleting a team will also delete all team websites.","delete-website-warning": "ข้อมูลที่เกี่ยวข้องทั้งหมดจะถูกลบ.","error": "เกิดข้อผิดพลาด.",- "event-log": "{event} on {url}",+ "event-log": "<b>{event}</b> on <a>{url}</a>","forbidden": "Forbidden","go-to-settings": "ไปที่การตั้งค่า","incorrect-username-password": "ชื่อผู้ใช้หรือรหัสผ่านไม่ถูกต้อง.",@@ -338,6 +338,6 @@"unauthorized": "Unauthorized","user-deleted": "User deleted.","viewed-page": "Viewed page",- "visitor-log": "ผู้เข้าชมจาก {country} กำลังใช้งานผ่าน {browser} บน {os} {device}"+ "visitor-log": "ผู้เข้าชมจาก <b>{country}</b> กำลังใช้งานผ่าน <b>{browser}</b> บน <b>{os}</b> <b>{device}</b>"}}diff --git a/public/intl/messages/tr-TR.json b/public/intl/messages/tr-TR.jsonindex 41d77d579..2835afeb3 100644--- a/public/intl/messages/tr-TR.json+++ b/public/intl/messages/tr-TR.json@@ -298,13 +298,13 @@"bad-request": "Bad request","collected-data": "Collected data","confirm-delete": "{target} kaydını silmek istediğinizden emin misiniz?",- "confirm-leave": "{target} kaydından ayrılmak istediğinizden emin misiniz?",- "confirm-remove": "{target} kaydını kaldırmak istediğinizden emin misiniz?",+ "confirm-leave": "<b>{target}</b> kaydından ayrılmak istediğinizden emin misiniz?",+ "confirm-remove": "<b>{target}</b> kaydını kaldırmak istediğinizden emin misiniz?","confirm-reset": "{target} istatistiklerini sıfırlamak istediğinizden emin misiniz?","delete-team-warning": "Bir takımı silmek tüm takım web sitelerini de silecektir.","delete-website-warning": "İlişkili tüm veriler de silinecektir.","error": "Bir şeyler ters gitti!",- "event-log": "{event} on {url}",+ "event-log": "<b>{event}</b> on <a>{url}</a>","forbidden": "Forbidden","go-to-settings": "Ayarlara git","incorrect-username-password": "Hatalı kullanıcı adı ya da parola.",@@ -338,6 +338,6 @@"unauthorized": "Unauthorized","user-deleted": "Kullanıcı silindi.","viewed-page": "Görüntülenen sayfa",- "visitor-log": "Yeni ziyaretçi: {country}, {os}, {device}, {browser}"+ "visitor-log": "Yeni ziyaretçi: <b>{country}</b>, <b>{os}</b>, <b>{device}</b>, <b>{browser}</b>"}}diff --git a/public/intl/messages/uk-UA.json b/public/intl/messages/uk-UA.jsonindex 6946b19db..69575216a 100644--- a/public/intl/messages/uk-UA.json+++ b/public/intl/messages/uk-UA.json@@ -298,13 +298,13 @@"bad-request": "Bad request","collected-data": "Collected data","confirm-delete": "Ви впевнені, що бажаєте видалити {target}?",- "confirm-leave": "Ви впевнені, що бажаєте покинути {target}?",- "confirm-remove": "Ви впевнені, що бажаєте видалити {target}?",+ "confirm-leave": "Ви впевнені, що бажаєте покинути <b>{target}</b>?",+ "confirm-remove": "Ви впевнені, що бажаєте видалити <b>{target}</b>?","confirm-reset": "Ви впевнені, що бажаєте скинути статистику для {target}?","delete-team-warning": "Видалення команди також призведе до видалення всіх її веб-сайтів.","delete-website-warning": "Усі пов'язані дані будуть видалені також.","error": "Щось пішло не так.",- "event-log": "{event} на {url}",+ "event-log": "<b>{event}</b> на <a>{url}</a>","forbidden": "Forbidden","go-to-settings": "Перейти до налаштувань","incorrect-username-password": "Невірне ім'я користувача або пароль.",@@ -338,6 +338,6 @@"unauthorized": "Unauthorized","user-deleted": "Користувача видалено.","viewed-page": "Переглянута сторінка",- "visitor-log": "Відвідувач з {country} використовуючи {browser} на {os} {device}"+ "visitor-log": "Відвідувач з <b>{country}</b> використовуючи <b>{browser}</b> на <b>{os}</b> <b>{device}</b>"}}diff --git a/public/intl/messages/ur-PK.json b/public/intl/messages/ur-PK.jsonindex 47201ace0..1f0aa1649 100644--- a/public/intl/messages/ur-PK.json+++ b/public/intl/messages/ur-PK.json@@ -298,13 +298,13 @@"bad-request": "Bad request","collected-data": "Collected data","confirm-delete": "کیا آپ واقعی {target} کو حذف کرنا چاہتے ہیں؟",- "confirm-leave": "Are you sure you want to leave {target}?",- "confirm-remove": "Are you sure you want to remove {target}?",+ "confirm-leave": "Are you sure you want to leave <b>{target}</b>?",+ "confirm-remove": "Are you sure you want to remove <b>{target}</b>?","confirm-reset": "کیا آپ واقعی {target} کے اعدادوشمار کو دوبارہ ترتیب دینا چاہتے ہیں؟","delete-team-warning": "Deleting a team will also delete all team websites.","delete-website-warning": "تمام متعلقہ ڈیٹا بھی حذف کر دیا جائے گا۔","error": "کچھ غلط ہو گیا.",- "event-log": "{event} on {url}",+ "event-log": "<b>{event}</b> on <a>{url}</a>","forbidden": "Forbidden","go-to-settings": "ترتیبات پر جائیں","incorrect-username-password": "غلط صارف نام/پاس ورڈ۔",@@ -338,6 +338,6 @@"unauthorized": "Unauthorized","user-deleted": "User deleted.","viewed-page": "Viewed page",- "visitor-log": "{os} {device} پر {browser} کا استعمال کرتے ہوئے {country} سے آنے والا"+ "visitor-log": "<b>{os}</b> <b>{device}</b> پر <b>{browser}</b> کا استعمال کرتے ہوئے <b>{country}</b> سے آنے والا"}}diff --git a/public/intl/messages/uz-UZ.json b/public/intl/messages/uz-UZ.jsonindex 91d719173..7bfb15871 100644--- a/public/intl/messages/uz-UZ.json+++ b/public/intl/messages/uz-UZ.json@@ -243,13 +243,13 @@"active-users": "{x} joriy {x, plural, one {tashrif buyuruvchi} other {tashrif buyuruvchilar}}","collected-data": "Yigʻilgan ma'lumotlar","confirm-delete": "**{target}** ni oʻchirmoqchi ekanligingizga ishonchingiz komilmi?",- "confirm-leave": "**{target}** ni tark etmoqchi ekanligingizga ishonchingiz komilmi?",- "confirm-remove": "**{target}** ni olib tashlamoqchi ekanligingizga ishonchingiz komilmi?",+ "confirm-leave": "**<b>{target}</b>** ni tark etmoqchi ekanligingizga ishonchingiz komilmi?",+ "confirm-remove": "**<b>{target}</b>** ni olib tashlamoqchi ekanligingizga ishonchingiz komilmi?","confirm-reset": "**{target}** ni qayta tiklamoqchi ekanligingizga ishonchingiz komilmi?","delete-team-warning": "Jamoani oʻchirish, shuningdek, barcha jamoa veb-saytlarini ham oʻchiradi.","delete-website-warning": "Barcha veb-sayt ma'lumotlari oʻchiriladi.","error": "Nimadir xato ketdi.",- "event-log": "**{url}** da **{event}** hodisasi",+ "event-log": "**<a>{url}</a>** da **<b>{event}</b>** hodisasi","go-to-settings": "Sozlamalarga oʻtish","incorrect-username-password": "Notoʻgʻri foydalanuvchi nomi va/yoki parol.","invalid-domain": "Notoʻgʻri domen. http/https qoʻshmang.",@@ -278,7 +278,7 @@"triggered-event": "Hodisa ishga tushirildi","user-deleted": "Foydalanuvchi oʻchirildi.","viewed-page": "Sahifa koʻrildi",- "visitor-log": "{os} {device} da {browser} dan foydalanayotgan {country} dan tashrif buyuruvchi",+ "visitor-log": "<b>{os}</b> <b>{device}</b> da <b>{browser}</b> dan foydalanayotgan <b>{country}</b> dan tashrif buyuruvchi","visitors-dropped-off": "Tashrif buyuruvchilar tashlab ketishdi"}}diff --git a/public/intl/messages/vi-VN.json b/public/intl/messages/vi-VN.jsonindex 7815bc323..d5552a298 100644--- a/public/intl/messages/vi-VN.json+++ b/public/intl/messages/vi-VN.json@@ -243,13 +243,13 @@"active-users": "{x} {x, plural, one {người dùng} other {người dùng}} đang hoạt động","collected-data": "Dữ liệu đã thu thập","confirm-delete": "Bạn có chắc chắn muốn xóa {target}?",- "confirm-leave": "Bạn có chắc chắn muốn rời {target}?",- "confirm-remove": "Bạn có chắc chắn muốn xóa {target}?",+ "confirm-leave": "Bạn có chắc chắn muốn rời <b>{target}</b>?",+ "confirm-remove": "Bạn có chắc chắn muốn xóa <b>{target}</b>?","confirm-reset": "Bạn có chắc chắn muốn đặt lại thống kê {target}?","delete-team-warning": "Việc xóa một nhóm cũng sẽ xóa tất cả các website của nhóm.","delete-website-warning": "Tất cả dữ liệu liên quan cũng sẽ bị xóa.","error": "Đã xảy ra lỗi.",- "event-log": "{event} trên {url}",+ "event-log": "<b>{event}</b> trên <a>{url}</a>","go-to-settings": "Chuyển đến cài đặt","incorrect-username-password": "Sai tên đăng nhập/mật khẩu.","invalid-domain": "Tên miền không hợp lệ",@@ -278,7 +278,7 @@"triggered-event": "Sự kiện được kích hoạt","user-deleted": "Người dùng đã bị xóa.","viewed-page": "Đã xem trang",- "visitor-log": "Khách từ {country} đang sử dụng {browser} trên {os} {device}",+ "visitor-log": "Khách từ <b>{country}</b> đang sử dụng <b>{browser}</b> trên <b>{os}</b> <b>{device}</b>","visitors-dropped-off": "Khách truy cập đã rời đi"}}diff --git a/public/intl/messages/zh-CN.json b/public/intl/messages/zh-CN.jsonindex a46330d01..8a18390b2 100644--- a/public/intl/messages/zh-CN.json+++ b/public/intl/messages/zh-CN.json@@ -329,13 +329,13 @@"bad-request": "请求错误","collected-data": "已收集的数据","confirm-delete": "你确定要删除 {target} 吗?",- "confirm-leave": "你确定要离开 {target} 吗?",- "confirm-remove": "您确定要移除 {target} ?",+ "confirm-leave": "你确定要离开 <b>{target}</b> 吗?",+ "confirm-remove": "您确定要移除 <b>{target}</b> ?","confirm-reset": "您确定要重置 {target} 的数据吗?","delete-team-warning": "删除团队也会删除所有团队网站。","delete-website-warning": "所有相关数据将会被删除。","error": "发生错误。",- "event-log": "{url} 上的 {event}",+ "event-log": "<a>{url}</a> 上的 <b>{event}</b>","forbidden": "禁止访问","go-to-settings": "去设置","incorrect-username-password": "用户名或密码不正确。",@@ -369,6 +369,6 @@"unauthorized": "未授权","user-deleted": "用户已删除。","viewed-page": "已浏览页面",- "visitor-log": "来自 {country} 的访客在搭载 {os} 的 {device} 上使用 {browser} 浏览器进行访问。"+ "visitor-log": "来自 <b>{country}</b> 的访客在搭载 <b>{os}</b> 的 <b>{device}</b> 上使用 <b>{browser}</b> 浏览器进行访问。"}}diff --git a/public/intl/messages/zh-TW.json b/public/intl/messages/zh-TW.jsonindex 79da82fea..c8fb61c8a 100644--- a/public/intl/messages/zh-TW.json+++ b/public/intl/messages/zh-TW.json@@ -298,13 +298,13 @@"bad-request": "Bad request","collected-data": "已蒐集的資料","confirm-delete": "您確定要刪除 {target} 嗎?",- "confirm-leave": "您確定要離開 {target} 嗎?",- "confirm-remove": "您確定要移除 {target} 嗎?",+ "confirm-leave": "您確定要離開 <b>{target}</b> 嗎?",+ "confirm-remove": "您確定要移除 <b>{target}</b> 嗎?","confirm-reset": "您確定要重設 {target} 的統計資料嗎?","delete-team-warning": "刪除團隊的同時也會刪除所有團隊的網站。","delete-website-warning": "所有網站資料都將被刪除。","error": "發生錯誤。",- "event-log": "在 {url} 上的 {event}",+ "event-log": "在 <a>{url}</a> 上的 <b>{event}</b>","forbidden": "Forbidden","go-to-settings": "前往設定","incorrect-username-password": "使用者名稱或密碼不正確。",@@ -338,6 +338,6 @@"unauthorized": "Unauthorized","user-deleted": "使用者已刪除。","viewed-page": "已瀏覽的網頁",- "visitor-log": "來自 {country} 的訪客在 {device} 上的 {os} 使用 {browser} 瀏覽。"+ "visitor-log": "來自 <b>{country}</b> 的訪客在 <b>{device}</b> 上的 <b>{os}</b> 使用 <b>{browser}</b> 瀏覽。"}}diff --git a/src/app/(main)/MobileNav.tsx b/src/app/(main)/MobileNav.tsxindex af67bc716..158886db3 100644--- a/src/app/(main)/MobileNav.tsx+++ b/src/app/(main)/MobileNav.tsx@@ -11,7 +11,7 @@ import { AdminNav } from './admin/AdminNav';import { SettingsNav } from './settings/SettingsNav';export function MobileNav() {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const { pathname, websiteId, renderUrl } = useNavigation();const isAdmin = pathname.includes('/admin');const isSettings = pathname.includes('/settings');@@ -19,19 +19,19 @@ export function MobileNav() {const links = [{id: 'websites',- label: formatMessage(labels.websites),+ label: t(labels.websites),path: '/websites',icon: <Globe />,},{id: 'links',- label: formatMessage(labels.links),+ label: t(labels.links),path: '/links',icon: <LinkIcon />,},{id: 'pixels',- label: formatMessage(labels.pixels),+ label: t(labels.pixels),path: '/pixels',icon: <Grid2x2 />,},diff --git a/src/app/(main)/SideNav.tsx b/src/app/(main)/SideNav.tsxindex ca52135e4..865a9e280 100644--- a/src/app/(main)/SideNav.tsx+++ b/src/app/(main)/SideNav.tsx@@ -21,7 +21,7 @@ import { NavButton } from '@/components/input/NavButton';import { Logo } from '@/components/svg';export function SideNav(props: any) {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const { pathname, renderUrl, websiteId, router } = useNavigation();const [isCollapsed, setIsCollapsed] = useGlobalState('sidenav-collapsed', false);@@ -30,25 +30,25 @@ export function SideNav(props: any) {const links = [{id: 'boards',- label: formatMessage(labels.boards),+ label: t(labels.boards),path: '/boards',icon: <LayoutDashboard />,},{id: 'websites',- label: formatMessage(labels.websites),+ label: t(labels.websites),path: '/websites',icon: <Globe />,},{id: 'links',- label: formatMessage(labels.links),+ label: t(labels.links),path: '/links',icon: <LinkIcon />,},{id: 'pixels',- label: formatMessage(labels.pixels),+ label: t(labels.pixels),path: '/pixels',icon: <Grid2x2 />,},diff --git a/src/app/(main)/UpdateNotice.tsx b/src/app/(main)/UpdateNotice.tsxindex ef441d0bb..e61407d9d 100644--- a/src/app/(main)/UpdateNotice.tsx+++ b/src/app/(main)/UpdateNotice.tsx@@ -7,7 +7,7 @@ import { setItem } from '@/lib/storage';import { checkVersion, useVersion } from '@/store/version';export function UpdateNotice({ user, config }) {- const { formatMessage, labels, messages } = useMessages();+ const { t, labels, messages } = useMessages();const { latest, checked, hasUpdate, releaseUrl } = useVersion();const pathname = usePathname();const [dismissed, setDismissed] = useState(checked);@@ -49,11 +49,11 @@ export function UpdateNotice({ user, config }) {return (<Column justifyContent="center" alignItems="center" position="fixed" top="10px" width="100%"><Row width="600px">- <AlertBanner title={formatMessage(messages.newVersionAvailable, { version: `v${latest}` })}>+ <AlertBanner title={t(messages.newVersionAvailable, { version: `v${latest}` })}><Button variant="primary" onPress={handleViewClick}>- {formatMessage(labels.viewDetails)}+ {t(labels.viewDetails)}</Button>- <Button onPress={handleDismissClick}>{formatMessage(labels.dismiss)}</Button>+ <Button onPress={handleDismissClick}>{t(labels.dismiss)}</Button></AlertBanner></Row></Column>diff --git a/src/app/(main)/admin/AdminNav.tsx b/src/app/(main)/admin/AdminNav.tsxindex a0d86c507..aa1cbe884 100644--- a/src/app/(main)/admin/AdminNav.tsx+++ b/src/app/(main)/admin/AdminNav.tsx@@ -3,28 +3,28 @@ import { useMessages, useNavigation } from '@/components/hooks';import { Globe, User, Users } from '@/components/icons';export function AdminNav({ onItemClick }: { onItemClick?: () => void }) {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const { pathname } = useNavigation();const items = [{- label: formatMessage(labels.manage),+ label: t(labels.manage),items: [{id: 'users',- label: formatMessage(labels.users),+ label: t(labels.users),path: '/admin/users',icon: <User />,},{id: 'websites',- label: formatMessage(labels.websites),+ label: t(labels.websites),path: '/admin/websites',icon: <Globe />,},{id: 'teams',- label: formatMessage(labels.teams),+ label: t(labels.teams),path: '/admin/teams',icon: <Users />,},@@ -39,7 +39,7 @@ export function AdminNav({ onItemClick }: { onItemClick?: () => void }) {return (<NavMenuitems={items}- title={formatMessage(labels.admin)}+ title={t(labels.admin)}selectedKey={selectedKey}allowMinimize={false}onItemClick={onItemClick}diff --git a/src/app/(main)/admin/teams/AdminTeamsPage.tsx b/src/app/(main)/admin/teams/AdminTeamsPage.tsxindex 7905f7f63..316a2e16e 100644--- a/src/app/(main)/admin/teams/AdminTeamsPage.tsx+++ b/src/app/(main)/admin/teams/AdminTeamsPage.tsx@@ -7,13 +7,13 @@ import { TeamsAddButton } from '../../teams/TeamsAddButton';import { AdminTeamsDataTable } from './AdminTeamsDataTable';export function AdminTeamsPage() {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const handleSave = () => {};return (<Column gap="6" margin="2">- <PageHeader title={formatMessage(labels.teams)}>+ <PageHeader title={t(labels.teams)}><TeamsAddButton onSave={handleSave} isAdmin={true} /></PageHeader><Panel>diff --git a/src/app/(main)/admin/teams/AdminTeamsTable.tsx b/src/app/(main)/admin/teams/AdminTeamsTable.tsxindex 9f2abd5cd..2d5243b99 100644--- a/src/app/(main)/admin/teams/AdminTeamsTable.tsx+++ b/src/app/(main)/admin/teams/AdminTeamsTable.tsx@@ -14,22 +14,22 @@ export function AdminTeamsTable({data: any[];showActions?: boolean;}) {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const [deleteTeam, setDeleteTeam] = useState(null);return (<><DataTable data={data}>- <DataColumn id="name" label={formatMessage(labels.name)} width="1fr">+ <DataColumn id="name" label={t(labels.name)} width="1fr">{(row: any) => <Link href={`/admin/teams/${row.id}`}>{row.name}</Link>}</DataColumn>- <DataColumn id="websites" label={formatMessage(labels.members)} width="140px">+ <DataColumn id="websites" label={t(labels.members)} width="140px">{(row: any) => row?._count?.members}</DataColumn>- <DataColumn id="members" label={formatMessage(labels.websites)} width="140px">+ <DataColumn id="members" label={t(labels.websites)} width="140px">{(row: any) => row?._count?.websites}</DataColumn>- <DataColumn id="owner" label={formatMessage(labels.owner)}>+ <DataColumn id="owner" label={t(labels.owner)}>{(row: any) => {const name = row?.members?.[0]?.user?.username;@@ -40,7 +40,7 @@ export function AdminTeamsTable({);}}</DataColumn>- <DataColumn id="created" label={formatMessage(labels.created)} width="160px">+ <DataColumn id="created" label={t(labels.created)} width="160px">{(row: any) => <DateDistance date={new Date(row.createdAt)} />}</DataColumn>{showActions && (@@ -55,7 +55,7 @@ export function AdminTeamsTable({<Icon><Edit /></Icon>- <Text>{formatMessage(labels.edit)}</Text>+ <Text>{t(labels.edit)}</Text></Row></MenuItem><MenuItem@@ -67,7 +67,7 @@ export function AdminTeamsTable({<Icon><Trash /></Icon>- <Text>{formatMessage(labels.delete)}</Text>+ <Text>{t(labels.delete)}</Text></Row></MenuItem></MenuButton>diff --git a/src/app/(main)/admin/users/UserAddButton.tsx b/src/app/(main)/admin/users/UserAddButton.tsxindex 052508280..c2b906317 100644--- a/src/app/(main)/admin/users/UserAddButton.tsx+++ b/src/app/(main)/admin/users/UserAddButton.tsx@@ -4,12 +4,12 @@ import { Plus } from '@/components/icons';import { UserAddForm } from './UserAddForm';export function UserAddButton({ onSave }: { onSave?: () => void }) {- const { formatMessage, labels, messages } = useMessages();+ const { t, labels, messages } = useMessages();const { toast } = useToast();const { touch } = useModified();const handleSave = () => {- toast(formatMessage(messages.saved));+ toast(t(messages.saved));touch('users');onSave?.();};@@ -20,10 +20,10 @@ export function UserAddButton({ onSave }: { onSave?: () => void }) {<Icon><Plus /></Icon>- <Text>{formatMessage(labels.createUser)}</Text>+ <Text>{t(labels.createUser)}</Text></Button><Modal>- <Dialog title={formatMessage(labels.createUser)} style={{ width: 400 }}>+ <Dialog title={t(labels.createUser)} style={{ width: 400 }}>{({ close }) => <UserAddForm onSave={handleSave} onClose={close} />}</Dialog></Modal>diff --git a/src/app/(main)/admin/users/UserAddForm.tsx b/src/app/(main)/admin/users/UserAddForm.tsxindex 84b8399cd..32c1cd21a 100644--- a/src/app/(main)/admin/users/UserAddForm.tsx+++ b/src/app/(main)/admin/users/UserAddForm.tsx@@ -10,12 +10,11 @@ import {TextField,} from '@umami/react-zen';import { useMessages, useUpdateQuery } from '@/components/hooks';-import { messages } from '@/components/messages';import { ROLES } from '@/lib/constants';export function UserAddForm({ onSave, onClose }) {const { mutateAsync, error, isPending } = useUpdateQuery(`/users`);- const { formatMessage, labels, getErrorMessage } = useMessages();+ const { t, labels, messages, getErrorMessage } = useMessages();const handleSubmit = async (data: any) => {await mutateAsync(data, {@@ -29,45 +28,41 @@ export function UserAddForm({ onSave, onClose }) {return (<Form onSubmit={handleSubmit} error={getErrorMessage(error)}><FormField- label={formatMessage(labels.username)}+ label={t(labels.username)}name="username"- rules={{ required: formatMessage(labels.required) }}+ rules={{ required: t(labels.required) }}><TextField autoComplete="new-username" data-test="input-username" /></FormField><FormField- label={formatMessage(labels.password)}+ label={t(labels.password)}name="password"rules={{- required: formatMessage(labels.required),- minLength: { value: 8, message: formatMessage(messages.minPasswordLength, { n: '8' }) },+ required: t(labels.required),+ minLength: { value: 8, message: t(messages.minPasswordLength, { n: '8' }) },}}><PasswordField autoComplete="new-password" data-test="input-password" /></FormField>- <FormField- label={formatMessage(labels.role)}- name="role"- rules={{ required: formatMessage(labels.required) }}- >+ <FormField label={t(labels.role)} name="role" rules={{ required: t(labels.required) }}><Select><ListItem id={ROLES.viewOnly} data-test="dropdown-item-viewOnly">- {formatMessage(labels.viewOnly)}+ {t(labels.viewOnly)}</ListItem><ListItem id={ROLES.user} data-test="dropdown-item-user">- {formatMessage(labels.user)}+ {t(labels.user)}</ListItem><ListItem id={ROLES.admin} data-test="dropdown-item-admin">- {formatMessage(labels.admin)}+ {t(labels.admin)}</ListItem></Select></FormField><FormButtons><Button isDisabled={isPending} onPress={onClose}>- {formatMessage(labels.cancel)}+ {t(labels.cancel)}</Button><FormSubmitButton variant="primary" data-test="button-submit" isDisabled={false}>- {formatMessage(labels.save)}+ {t(labels.save)}</FormSubmitButton></FormButtons></Form>diff --git a/src/app/(main)/admin/users/UserDeleteButton.tsx b/src/app/(main)/admin/users/UserDeleteButton.tsxindex ee8f2c19c..8425fbb09 100644--- a/src/app/(main)/admin/users/UserDeleteButton.tsx+++ b/src/app/(main)/admin/users/UserDeleteButton.tsx@@ -12,7 +12,7 @@ export function UserDeleteButton({username: string;onDelete?: () => void;}) {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const { user } = useLoginQuery();return (@@ -21,10 +21,10 @@ export function UserDeleteButton({<Icon size="sm"><Trash /></Icon>- <Text>{formatMessage(labels.delete)}</Text>+ <Text>{t(labels.delete)}</Text></Button><Modal>- <Dialog title={formatMessage(labels.deleteUser)} style={{ width: 400 }}>+ <Dialog title={t(labels.deleteUser)} style={{ width: 400 }}>{({ close }) => (<UserDeleteForm userId={userId} username={username} onSave={onDelete} onClose={close} />)}diff --git a/src/app/(main)/admin/users/UserDeleteForm.tsx b/src/app/(main)/admin/users/UserDeleteForm.tsxindex 8f6fd502b..bf060f560 100644--- a/src/app/(main)/admin/users/UserDeleteForm.tsx+++ b/src/app/(main)/admin/users/UserDeleteForm.tsx@@ -12,7 +12,7 @@ export function UserDeleteForm({onSave?: () => void;onClose?: () => void;}) {- const { messages, labels, formatMessage } = useMessages();+ const { messages, labels, t } = useMessages();const { mutateAsync } = useDeleteQuery(`/users/${userId}`);const { touch } = useModified();@@ -29,13 +29,13 @@ export function UserDeleteForm({return (<AlertDialog- title={formatMessage(labels.delete)}+ title={t(labels.delete)}onConfirm={handleConfirm}onCancel={onClose}- confirmLabel={formatMessage(labels.delete)}+ confirmLabel={t(labels.delete)}isDanger>- <Row gap="1">{formatMessage(messages.confirmDelete, { target: username })}</Row>+ <Row gap="1">{t(messages.confirmDelete, { target: username })}</Row></AlertDialog>);}diff --git a/src/app/(main)/admin/users/UsersPage.tsx b/src/app/(main)/admin/users/UsersPage.tsxindex 7e1b0f48b..eaabc7c80 100644--- a/src/app/(main)/admin/users/UsersPage.tsx+++ b/src/app/(main)/admin/users/UsersPage.tsx@@ -7,13 +7,13 @@ import { UserAddButton } from './UserAddButton';import { UsersDataTable } from './UsersDataTable';export function UsersPage() {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const handleSave = () => {};return (<Column gap="6" margin="2">- <PageHeader title={formatMessage(labels.users)}>+ <PageHeader title={t(labels.users)}><UserAddButton onSave={handleSave} /></PageHeader><Panel>diff --git a/src/app/(main)/admin/users/UsersTable.tsx b/src/app/(main)/admin/users/UsersTable.tsxindex 9c10f3e79..16a5b9084 100644--- a/src/app/(main)/admin/users/UsersTable.tsx+++ b/src/app/(main)/admin/users/UsersTable.tsx@@ -15,26 +15,24 @@ export function UsersTable({data: any[];showActions?: boolean;}) {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const [deleteUser, setDeleteUser] = useState(null);return (<><DataTable data={data}>- <DataColumn id="username" label={formatMessage(labels.username)} width="2fr">+ <DataColumn id="username" label={t(labels.username)} width="2fr">{(row: any) => <Link href={`/admin/users/${row.id}`}>{row.username}</Link>}</DataColumn>- <DataColumn id="role" label={formatMessage(labels.role)}>+ <DataColumn id="role" label={t(labels.role)}>{(row: any) =>- formatMessage(- labels[Object.keys(ROLES).find(key => ROLES[key] === row.role)] || labels.unknown,- )+ t(labels[Object.keys(ROLES).find(key => ROLES[key] === row.role)] || labels.unknown)}</DataColumn>- <DataColumn id="websites" label={formatMessage(labels.websites)}>+ <DataColumn id="websites" label={t(labels.websites)}>{(row: any) => row._count.websites}</DataColumn>- <DataColumn id="created" label={formatMessage(labels.created)}>+ <DataColumn id="created" label={t(labels.created)}>{(row: any) => <DateDistance date={new Date(row.createdAt)} />}</DataColumn>{showActions && (@@ -49,7 +47,7 @@ export function UsersTable({<Icon><Edit /></Icon>- <Text>{formatMessage(labels.edit)}</Text>+ <Text>{t(labels.edit)}</Text></Row></MenuItem><MenuItem@@ -61,7 +59,7 @@ export function UsersTable({<Icon><Trash /></Icon>- <Text>{formatMessage(labels.delete)}</Text>+ <Text>{t(labels.delete)}</Text></Row></MenuItem></MenuButton>diff --git a/src/app/(main)/admin/users/[userId]/UserEditForm.tsx b/src/app/(main)/admin/users/[userId]/UserEditForm.tsxindex 28bf030f5..d8110ca90 100644--- a/src/app/(main)/admin/users/[userId]/UserEditForm.tsx+++ b/src/app/(main)/admin/users/[userId]/UserEditForm.tsx@@ -12,7 +12,7 @@ import { useLoginQuery, useMessages, useUpdateQuery, useUser } from '@/componentimport { ROLES } from '@/lib/constants';export function UserEditForm({ userId, onSave }: { userId: string; onSave?: () => void }) {- const { formatMessage, labels, messages, getMessage } = useMessages();+ const { t, labels, messages, getMessage } = useMessages();const user = useUser();const { user: login } = useLoginQuery();@@ -21,7 +21,7 @@ export function UserEditForm({ userId, onSave }: { userId: string; onSave?: () =const handleSubmit = async (data: any) => {await mutateAsync(data, {onSuccess: async () => {- toast(formatMessage(messages.saved));+ toast(t(messages.saved));touch('users');touch(`user:${user.id}`);onSave?.();@@ -31,41 +31,37 @@ export function UserEditForm({ userId, onSave }: { userId: string; onSave?: () =return (<Form onSubmit={handleSubmit} error={getMessage(error?.code)} values={user}>- <FormField name="username" label={formatMessage(labels.username)}>+ <FormField name="username" label={t(labels.username)}><TextField data-test="input-username" /></FormField><FormFieldname="password"- label={formatMessage(labels.password)}+ label={t(labels.password)}rules={{- minLength: { value: 8, message: formatMessage(messages.minPasswordLength, { n: '8' }) },+ minLength: { value: 8, message: t(messages.minPasswordLength, { n: '8' }) },}}><PasswordField autoComplete="new-password" data-test="input-password" /></FormField>{user.id !== login.id && (- <FormField- name="role"- label={formatMessage(labels.role)}- rules={{ required: formatMessage(labels.required) }}- >+ <FormField name="role" label={t(labels.role)} rules={{ required: t(labels.required) }}><Select defaultValue={user.role}><ListItem id={ROLES.viewOnly} data-test="dropdown-item-viewOnly">- {formatMessage(labels.viewOnly)}+ {t(labels.viewOnly)}</ListItem><ListItem id={ROLES.user} data-test="dropdown-item-user">- {formatMessage(labels.user)}+ {t(labels.user)}</ListItem><ListItem id={ROLES.admin} data-test="dropdown-item-admin">- {formatMessage(labels.admin)}+ {t(labels.admin)}</ListItem></Select></FormField>)}<FormButtons><FormSubmitButton data-test="button-submit" variant="primary">- {formatMessage(labels.save)}+ {t(labels.save)}</FormSubmitButton></FormButtons></Form>diff --git a/src/app/(main)/admin/users/[userId]/UserSettings.tsx b/src/app/(main)/admin/users/[userId]/UserSettings.tsxindex 3f17f3e16..e2119bb59 100644--- a/src/app/(main)/admin/users/[userId]/UserSettings.tsx+++ b/src/app/(main)/admin/users/[userId]/UserSettings.tsx@@ -4,14 +4,14 @@ import { UserEditForm } from './UserEditForm';import { UserWebsites } from './UserWebsites';export function UserSettings({ userId }: { userId: string }) {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();return (<Column gap="6"><Tabs><TabList>- <Tab id="details">{formatMessage(labels.details)}</Tab>- <Tab id="websites">{formatMessage(labels.websites)}</Tab>+ <Tab id="details">{t(labels.details)}</Tab>+ <Tab id="websites">{t(labels.websites)}</Tab></TabList><TabPanel id="details" style={{ width: 500 }}><UserEditForm userId={userId} />diff --git a/src/app/(main)/admin/websites/AdminWebsitesPage.tsx b/src/app/(main)/admin/websites/AdminWebsitesPage.tsxindex 1c2ac9218..e536a5bbe 100644--- a/src/app/(main)/admin/websites/AdminWebsitesPage.tsx+++ b/src/app/(main)/admin/websites/AdminWebsitesPage.tsx@@ -6,11 +6,11 @@ import { useMessages } from '@/components/hooks';import { AdminWebsitesDataTable } from './AdminWebsitesDataTable';export function AdminWebsitesPage() {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();return (<Column gap="6" margin="2">- <PageHeader title={formatMessage(labels.websites)} />+ <PageHeader title={t(labels.websites)} /><Panel><AdminWebsitesDataTable /></Panel>diff --git a/src/app/(main)/admin/websites/AdminWebsitesTable.tsx b/src/app/(main)/admin/websites/AdminWebsitesTable.tsxindex cfda59572..def6dd9ff 100644--- a/src/app/(main)/admin/websites/AdminWebsitesTable.tsx+++ b/src/app/(main)/admin/websites/AdminWebsitesTable.tsx@@ -8,23 +8,23 @@ import { Edit, Trash, Users } from '@/components/icons';import { MenuButton } from '@/components/input/MenuButton';export function AdminWebsitesTable({ data = [] }: { data: any[] }) {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const [deleteWebsite, setDeleteWebsite] = useState(null);return (<><DataTable data={data}>- <DataColumn id="name" label={formatMessage(labels.name)}>+ <DataColumn id="name" label={t(labels.name)}>{(row: any) => (<Text truncate><Link href={`/admin/websites/${row.id}`}>{row.name}</Link></Text>)}</DataColumn>- <DataColumn id="domain" label={formatMessage(labels.domain)}>+ <DataColumn id="domain" label={t(labels.domain)}>{(row: any) => <Text truncate>{row.domain}</Text>}</DataColumn>- <DataColumn id="owner" label={formatMessage(labels.owner)}>+ <DataColumn id="owner" label={t(labels.owner)}>{(row: any) => {if (row?.team) {return (@@ -45,7 +45,7 @@ export function AdminWebsitesTable({ data = [] }: { data: any[] }) {);}}</DataColumn>- <DataColumn id="created" label={formatMessage(labels.created)} width="180px">+ <DataColumn id="created" label={t(labels.created)} width="180px">{(row: any) => <DateDistance date={new Date(row.createdAt)} />}</DataColumn><DataColumn id="action" align="end" width="50px">@@ -59,7 +59,7 @@ export function AdminWebsitesTable({ data = [] }: { data: any[] }) {<Icon><Edit /></Icon>- <Text>{formatMessage(labels.edit)}</Text>+ <Text>{t(labels.edit)}</Text></Row></MenuItem><MenuItem@@ -71,7 +71,7 @@ export function AdminWebsitesTable({ data = [] }: { data: any[] }) {<Icon><Trash /></Icon>- <Text>{formatMessage(labels.delete)}</Text>+ <Text>{t(labels.delete)}</Text></Row></MenuItem></MenuButton>diff --git a/src/app/(main)/boards/BoardAddButton.tsx b/src/app/(main)/boards/BoardAddButton.tsxindex dd25dbf30..e3139d4b2 100644--- a/src/app/(main)/boards/BoardAddButton.tsx+++ b/src/app/(main)/boards/BoardAddButton.tsx@@ -4,13 +4,13 @@ import { Plus } from '@/components/icons';import { BoardAddForm } from './BoardAddForm';export function BoardAddButton() {- const { formatMessage, labels, messages } = useMessages();+ const { t, labels, messages } = useMessages();const { toast } = useToast();const { touch } = useModified();const { teamId } = useNavigation();const handleSave = async () => {- toast(formatMessage(messages.saved));+ toast(t(messages.saved));touch('boards');};@@ -20,10 +20,10 @@ export function BoardAddButton() {<Icon><Plus /></Icon>- <Text>{formatMessage(labels.addBoard)}</Text>+ <Text>{t(labels.addBoard)}</Text></Button><Modal>- <Dialog title={formatMessage(labels.addBoard)} style={{ width: 400 }}>+ <Dialog title={t(labels.addBoard)} style={{ width: 400 }}>{({ close }) => <BoardAddForm teamId={teamId} onSave={handleSave} onClose={close} />}</Dialog></Modal>diff --git a/src/app/(main)/boards/BoardAddForm.tsx b/src/app/(main)/boards/BoardAddForm.tsxindex de42b7a14..63fc1366e 100644--- a/src/app/(main)/boards/BoardAddForm.tsx+++ b/src/app/(main)/boards/BoardAddForm.tsx@@ -12,7 +12,7 @@ export function BoardAddForm({onSave?: () => void;onClose?: () => void;}) {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const { mutateAsync, error, isPending } = useUpdateQuery('/boards', { teamId });const [websiteId, setWebsiteId] = useState<string>();@@ -30,34 +30,30 @@ export function BoardAddForm({return (<Form onSubmit={handleSubmit} error={error?.message}>- <FormField- label={formatMessage(labels.name)}- name="name"- rules={{ required: formatMessage(labels.required) }}- >+ <FormField label={t(labels.name)} name="name" rules={{ required: t(labels.required) }}><TextField autoComplete="off" /></FormField><FormField- label={formatMessage(labels.description)}+ label={t(labels.description)}name="description"rules={{- required: formatMessage(labels.required),+ required: t(labels.required),}}><TextField asTextArea autoComplete="off" /></FormField><Row alignItems="center" gap="3" paddingTop="3">- <Text>{formatMessage(labels.website)}</Text>+ <Text>{t(labels.website)}</Text><WebsiteSelect websiteId={websiteId} teamId={teamId} onChange={setWebsiteId} /></Row><Row justifyContent="flex-end" paddingTop="3" gap="3">{onClose && (<Button isDisabled={isPending} onPress={onClose}>- {formatMessage(labels.cancel)}+ {t(labels.cancel)}</Button>)}<FormSubmitButton data-test="button-submit" isDisabled={false}>- {formatMessage(labels.save)}+ {t(labels.save)}</FormSubmitButton></Row></Form>diff --git a/src/app/(main)/boards/BoardProvider.tsx b/src/app/(main)/boards/BoardProvider.tsxindex f96a13ab2..85dd0f737 100644--- a/src/app/(main)/boards/BoardProvider.tsx+++ b/src/app/(main)/boards/BoardProvider.tsx@@ -40,7 +40,7 @@ export function BoardProvider({const { post, useMutation } = useApi();const { touch } = useModified();const { toast } = useToast();- const { formatMessage, labels, messages } = useMessages();+ const { t, labels, messages } = useMessages();const { router, renderUrl } = useNavigation();const [board, setBoard] = useState<Partial<Board>>(data ?? createDefaultBoard());@@ -70,7 +70,7 @@ export function BoardProvider({}, []);const saveBoard = useCallback(async () => {- const defaultName = formatMessage(labels.untitled);+ const defaultName = t(labels.untitled);// Get current layout sizes from BoardBody if registeredconst layoutData = layoutGetterRef.current?.();@@ -82,7 +82,7 @@ export function BoardProvider({parameters,});- toast(formatMessage(messages.saved));+ toast(t(messages.saved));touch('boards');if (board.id) {@@ -92,17 +92,7 @@ export function BoardProvider({}return result;- }, [- board,- mutateAsync,- toast,- formatMessage,- labels.untitled,- messages.saved,- touch,- router,- renderUrl,- ]);+ }, [board, mutateAsync, toast, t, labels.untitled, messages.saved, touch, router, renderUrl]);if (boardId && isFetching && isLoading) {return <Loading placement="absolute" />;diff --git a/src/app/(main)/boards/BoardsPage.tsx b/src/app/(main)/boards/BoardsPage.tsxindex 126ac494c..22ffae528 100644--- a/src/app/(main)/boards/BoardsPage.tsx+++ b/src/app/(main)/boards/BoardsPage.tsx@@ -10,14 +10,14 @@ import { Plus } from '@/components/icons';import { BoardsDataTable } from './BoardsDataTable';export function BoardsPage() {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();return (<PageBody><Column margin="2">- <PageHeader title={formatMessage(labels.boards)}>+ <PageHeader title={t(labels.boards)}><LinkButton href="/boards/create" variant="primary">- <IconLabel icon={<Plus />} label={formatMessage(labels.addBoard)} />+ <IconLabel icon={<Plus />} label={t(labels.addBoard)} /></LinkButton></PageHeader><Panel>diff --git a/src/app/(main)/boards/BoardsTable.tsx b/src/app/(main)/boards/BoardsTable.tsxindex b23dd7a91..d750db9e5 100644--- a/src/app/(main)/boards/BoardsTable.tsx+++ b/src/app/(main)/boards/BoardsTable.tsx@@ -4,19 +4,19 @@ import { DateDistance } from '@/components/common/DateDistance';import { useMessages, useNavigation, useSlug } from '@/components/hooks';export function BoardsTable(props: DataTableProps) {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const { websiteId, renderUrl } = useNavigation();const { getSlugUrl } = useSlug('link');return (<DataTable {...props}>- <DataColumn id="name" label={formatMessage(labels.name)}>+ <DataColumn id="name" label={t(labels.name)}>{({ id, name }: any) => {return <Board href={renderUrl(`/boards/${id}`)}>{name}</Board>;}}</DataColumn>- <DataColumn id="description" label={formatMessage(labels.description)} />- <DataColumn id="created" label={formatMessage(labels.created)} width="200px">+ <DataColumn id="description" label={t(labels.description)} />+ <DataColumn id="created" label={t(labels.created)} width="200px">{(row: any) => <DateDistance date={new Date(row.createdAt)} />}</DataColumn><DataColumn id="action" align="end" width="100px">diff --git a/src/app/(main)/boards/[boardId]/BoardEditHeader.tsx b/src/app/(main)/boards/[boardId]/BoardEditHeader.tsxindex a3bc3bddb..afcbea6df 100644--- a/src/app/(main)/boards/[boardId]/BoardEditHeader.tsx+++ b/src/app/(main)/boards/[boardId]/BoardEditHeader.tsx@@ -13,9 +13,9 @@ import { WebsiteSelect } from '@/components/input/WebsiteSelect';export function BoardEditHeader() {const { board, updateBoard, saveBoard, isPending } = useBoard();- const { formatMessage, labels } = useMessages();- const { teamId, router, renderUrl } = useNavigation();- const defaultName = formatMessage(labels.untitled);+ const { t, labels } = useMessages();+ const { router, renderUrl } = useNavigation();+ const defaultName = t(labels.untitled);const handleNameChange = (value: string) => {updateBoard({ name: value });@@ -71,7 +71,7 @@ export function BoardEditHeader() {variant="quiet"name="description"value={board?.description ?? ''}- placeholder={`+ ${formatMessage(labels.addDescription)}`}+ placeholder={`+ ${t(labels.addDescription)}`}autoComplete="off"onChange={handleDescriptionChange}style={{ width: '100%' }}@@ -80,21 +80,17 @@ export function BoardEditHeader() {</TextField></Row><Row alignItems="center" gap="3">- <Text>{formatMessage(labels.website)}</Text>- <WebsiteSelect- websiteId={board?.parameters?.websiteId}- teamId={teamId}- onChange={handleWebsiteChange}- />+ <Text>{t(labels.website)}</Text>+ <WebsiteSelect websiteId={board?.parameters?.websiteId} onChange={handleWebsiteChange} /></Row></Column><Column justifyContent="center" alignItems="flex-end"><Row gap="3"><Button variant="quiet" onPress={handleCancel}>- {formatMessage(labels.cancel)}+ {t(labels.cancel)}</Button><LoadingButton variant="primary" onPress={handleSave} isLoading={isPending}>- {formatMessage(labels.save)}+ {t(labels.save)}</LoadingButton></Row></Column>diff --git a/src/app/(main)/boards/[boardId]/BoardViewHeader.tsx b/src/app/(main)/boards/[boardId]/BoardViewHeader.tsxindex 756f39d28..6303123b4 100644--- a/src/app/(main)/boards/[boardId]/BoardViewHeader.tsx+++ b/src/app/(main)/boards/[boardId]/BoardViewHeader.tsx@@ -8,14 +8,14 @@ import { Edit } from '@/components/icons';export function BoardViewHeader() {const { board } = useBoard();const { renderUrl } = useNavigation();- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const { data: website } = useWebsiteQuery(board?.parameters?.websiteId);return (<PageHeader title={board?.name} description={board?.description}>{website?.name && <Text>{website.name}</Text>}<LinkButton href={renderUrl(`/boards/${board?.id}/edit`, false)}>- <IconLabel icon={<Edit />}>{formatMessage(labels.edit)}</IconLabel>+ <IconLabel icon={<Edit />}>{t(labels.edit)}</IconLabel></LinkButton></PageHeader>);diff --git a/src/app/(main)/dashboard/DashboardPage.tsx b/src/app/(main)/dashboard/DashboardPage.tsxindex c2c7e75f0..81bb9719d 100644--- a/src/app/(main)/dashboard/DashboardPage.tsx+++ b/src/app/(main)/dashboard/DashboardPage.tsx@@ -5,12 +5,12 @@ import { PageHeader } from '@/components/common/PageHeader';import { useMessages } from '@/components/hooks';export function DashboardPage() {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();return (<PageBody><Column margin="2">- <PageHeader title={formatMessage(labels.dashboard)}></PageHeader>+ <PageHeader title={t(labels.dashboard)}></PageHeader></Column></PageBody>);diff --git a/src/app/(main)/links/LinkAddButton.tsx b/src/app/(main)/links/LinkAddButton.tsxindex 4276895d0..f7f89b81a 100644--- a/src/app/(main)/links/LinkAddButton.tsx+++ b/src/app/(main)/links/LinkAddButton.tsx@@ -4,15 +4,10 @@ import { DialogButton } from '@/components/input/DialogButton';import { LinkEditForm } from './LinkEditForm';export function LinkAddButton({ teamId }: { teamId?: string }) {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();return (- <DialogButton- icon={<Plus />}- label={formatMessage(labels.addLink)}- variant="primary"- width="600px"- >+ <DialogButton icon={<Plus />} label={t(labels.addLink)} variant="primary" width="600px">{({ close }) => <LinkEditForm teamId={teamId} onClose={close} />}</DialogButton>);diff --git a/src/app/(main)/links/LinkDeleteButton.tsx b/src/app/(main)/links/LinkDeleteButton.tsxindex 32ccbaf7e..f17040741 100644--- a/src/app/(main)/links/LinkDeleteButton.tsx+++ b/src/app/(main)/links/LinkDeleteButton.tsx@@ -2,7 +2,6 @@ import { ConfirmationForm } from '@/components/common/ConfirmationForm';import { useDeleteQuery, useMessages, useModified } from '@/components/hooks';import { Trash } from '@/components/icons';import { DialogButton } from '@/components/input/DialogButton';-import { messages } from '@/components/messages';export function LinkDeleteButton({linkId,@@ -14,7 +13,7 @@ export function LinkDeleteButton({name: string;onSave?: () => void;}) {- const { formatMessage, labels, getErrorMessage, FormattedMessage } = useMessages();+ const { t, labels, messages, getErrorMessage } = useMessages();const { mutateAsync, isPending, error } = useDeleteQuery(`/links/${linkId}`);const { touch } = useModified();@@ -29,27 +28,18 @@ export function LinkDeleteButton({};return (- <DialogButton- icon={<Trash />}- title={formatMessage(labels.confirm)}- variant="quiet"- width="400px"- >+ <DialogButton icon={<Trash />} title={t(labels.confirm)} variant="quiet" width="400px">{({ close }) => (<ConfirmationForm- message={- <FormattedMessage- {...messages.confirmRemove}- values={{- target: <b>{name}</b>,- }}- />- }+ message={t.rich(messages.confirmRemove, {+ target: name,+ b: chunks => <b>{chunks}</b>,+ })}isLoading={isPending}error={getErrorMessage(error)}onConfirm={handleConfirm.bind(null, close)}onClose={close}- buttonLabel={formatMessage(labels.delete)}+ buttonLabel={t(labels.delete)}buttonVariant="danger"/>)}diff --git a/src/app/(main)/links/LinkEditButton.tsx b/src/app/(main)/links/LinkEditButton.tsxindex 4d8587966..bd309282f 100644--- a/src/app/(main)/links/LinkEditButton.tsx+++ b/src/app/(main)/links/LinkEditButton.tsx@@ -4,10 +4,10 @@ import { DialogButton } from '@/components/input/DialogButton';import { LinkEditForm } from './LinkEditForm';export function LinkEditButton({ linkId }: { linkId: string }) {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();return (- <DialogButton icon={<Edit />} title={formatMessage(labels.link)} variant="quiet" width="800px">+ <DialogButton icon={<Edit />} title={t(labels.link)} variant="quiet" width="800px">{({ close }) => {return <LinkEditForm linkId={linkId} onClose={close} />;}}diff --git a/src/app/(main)/links/LinkEditForm.tsx b/src/app/(main)/links/LinkEditForm.tsxindex a6c0164d0..64bfb8dbc 100644--- a/src/app/(main)/links/LinkEditForm.tsx+++ b/src/app/(main)/links/LinkEditForm.tsx@@ -32,7 +32,7 @@ export function LinkEditForm({onSave?: () => void;onClose?: () => void;}) {- const { formatMessage, labels, messages, getErrorMessage } = useMessages();+ const { t, labels, messages, getErrorMessage } = useMessages();const { mutateAsync, error, isPending, touch, toast } = useUpdateQuery(linkId ? `/links/${linkId}` : '/links',{@@ -48,7 +48,7 @@ export function LinkEditForm({const handleSubmit = async (data: any) => {await mutateAsync(data, {onSuccess: async () => {- toast(formatMessage(messages.saved));+ toast(t(messages.saved));touch('links');touch(`link:${linkId}`);onSave?.();@@ -59,7 +59,7 @@ export function LinkEditForm({const checkUrl = (url: string) => {if (!isValidUrl(url)) {- return formatMessage(labels.invalidUrl);+ return t(labels.invalidUrl);}return true;};@@ -79,18 +79,14 @@ export function LinkEditForm({return (<>- <FormField- label={formatMessage(labels.name)}- name="name"- rules={{ required: formatMessage(labels.required) }}- >+ <FormField label={t(labels.name)} name="name" rules={{ required: t(labels.required) }}><TextField autoComplete="off" autoFocus /></FormField><FormField- label={formatMessage(labels.destinationUrl)}+ label={t(labels.destinationUrl)}name="url"- rules={{ required: formatMessage(labels.required), validate: checkUrl }}+ rules={{ required: t(labels.required), validate: checkUrl }}><TextField placeholder="https://example.com" autoComplete="off" /></FormField>@@ -98,9 +94,9 @@ export function LinkEditForm({<Grid columns="1fr auto" alignItems="end" gap><FormFieldname="slug"- label={formatMessage({ id: 'label.slug', defaultMessage: 'Slug' })}+ label={t({ id: 'label.slug', defaultMessage: 'Slug' })}rules={{- required: formatMessage(labels.required),+ required: t(labels.required),}}><TextField autoComplete="off" />@@ -116,7 +112,7 @@ export function LinkEditForm({</Grid><Column>- <Label>{formatMessage(labels.link)}</Label>+ <Label>{t(labels.link)}</Label><Row alignItems="center" gap><TextFieldvalue={`${hostUrl}/${slug}`}@@ -131,10 +127,10 @@ export function LinkEditForm({<Row justifyContent="flex-end" paddingTop="3" gap="3">{onClose && (<Button isDisabled={isPending} onPress={onClose}>- {formatMessage(labels.cancel)}+ {t(labels.cancel)}</Button>)}- <FormSubmitButton>{formatMessage(labels.save)}</FormSubmitButton>+ <FormSubmitButton>{t(labels.save)}</FormSubmitButton></Row></>);diff --git a/src/app/(main)/links/LinksPage.tsx b/src/app/(main)/links/LinksPage.tsxindex cdaf8fced..a82ce6da3 100644--- a/src/app/(main)/links/LinksPage.tsx+++ b/src/app/(main)/links/LinksPage.tsx@@ -10,7 +10,7 @@ import { LinkAddButton } from './LinkAddButton';export function LinksPage() {const { user } = useLoginQuery();- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const { teamId } = useNavigation();const { data } = useTeamMembersQuery(teamId);@@ -23,7 +23,7 @@ export function LinksPage() {return (<PageBody><Column gap="6" margin="2">- <PageHeader title={formatMessage(labels.links)}>+ <PageHeader title={t(labels.links)}>{showActions && <LinkAddButton teamId={teamId} />}</PageHeader><Panel>diff --git a/src/app/(main)/links/LinksTable.tsx b/src/app/(main)/links/LinksTable.tsxindex 62eb0fb86..76fcc6df0 100644--- a/src/app/(main)/links/LinksTable.tsx+++ b/src/app/(main)/links/LinksTable.tsx@@ -11,18 +11,18 @@ export interface LinksTableProps extends DataTableProps {}export function LinksTable({ showActions, ...props }: LinksTableProps) {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const { websiteId, renderUrl } = useNavigation();const { getSlugUrl } = useSlug('link');return (<DataTable {...props}>- <DataColumn id="name" label={formatMessage(labels.name)}>+ <DataColumn id="name" label={t(labels.name)}>{({ id, name }: any) => {return <Link href={renderUrl(`/links/${id}`)}>{name}</Link>;}}</DataColumn>- <DataColumn id="slug" label={formatMessage(labels.link)}>+ <DataColumn id="slug" label={t(labels.link)}>{({ slug }: any) => {const url = getSlugUrl(slug);return (@@ -32,12 +32,12 @@ export function LinksTable({ showActions, ...props }: LinksTableProps) {);}}</DataColumn>- <DataColumn id="url" label={formatMessage(labels.destinationUrl)}>+ <DataColumn id="url" label={t(labels.destinationUrl)}>{({ url }: any) => {return <ExternalLink href={url}>{url}</ExternalLink>;}}</DataColumn>- <DataColumn id="created" label={formatMessage(labels.created)} width="200px">+ <DataColumn id="created" label={t(labels.created)} width="200px">{(row: any) => <DateDistance date={new Date(row.createdAt)} />}</DataColumn>{showActions && (diff --git a/src/app/(main)/links/[linkId]/LinkHeader.tsx b/src/app/(main)/links/[linkId]/LinkHeader.tsxindex da1d75939..5ca713c58 100644--- a/src/app/(main)/links/[linkId]/LinkHeader.tsx+++ b/src/app/(main)/links/[linkId]/LinkHeader.tsx@@ -5,14 +5,14 @@ import { useLink, useMessages, useSlug } from '@/components/hooks';import { ExternalLink, Link } from '@/components/icons';export function LinkHeader() {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const { getSlugUrl } = useSlug('link');const link = useLink();return (<PageHeader title={link.name} description={link.url} icon={<Link />}><LinkButton href={getSlugUrl(link.slug)} target="_blank" prefetch={false} asAnchor>- <IconLabel icon={<ExternalLink />} label={formatMessage(labels.view)} />+ <IconLabel icon={<ExternalLink />} label={t(labels.view)} /></LinkButton></PageHeader>);diff --git a/src/app/(main)/links/[linkId]/LinkMetricsBar.tsx b/src/app/(main)/links/[linkId]/LinkMetricsBar.tsxindex 1fe8c45fa..ec07962c6 100644--- a/src/app/(main)/links/[linkId]/LinkMetricsBar.tsx+++ b/src/app/(main)/links/[linkId]/LinkMetricsBar.tsx@@ -13,7 +13,7 @@ export function LinkMetricsBar({compareMode?: boolean;}) {const { isAllTime } = useDateRange();- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const { data, isLoading, isFetching, error } = useWebsiteStatsQuery(linkId);const { pageviews, visitors, visits, comparison } = data || {};@@ -22,19 +22,19 @@ export function LinkMetricsBar({? [{value: visitors,- label: formatMessage(labels.visitors),+ label: t(labels.visitors),change: visitors - comparison.visitors,formatValue: formatLongNumber,},{value: visits,- label: formatMessage(labels.visits),+ label: t(labels.visits),change: visits - comparison.visits,formatValue: formatLongNumber,},{value: pageviews,- label: formatMessage(labels.views),+ label: t(labels.views),change: pageviews - comparison.pageviews,formatValue: formatLongNumber,},diff --git a/src/app/(main)/links/[linkId]/LinkPanels.tsx b/src/app/(main)/links/[linkId]/LinkPanels.tsxindex c044abe5d..6d246618a 100644--- a/src/app/(main)/links/[linkId]/LinkPanels.tsx+++ b/src/app/(main)/links/[linkId]/LinkPanels.tsx@@ -6,13 +6,13 @@ import { MetricsTable } from '@/components/metrics/MetricsTable';import { WorldMap } from '@/components/metrics/WorldMap';export function LinkPanels({ linkId }: { linkId: string }) {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const tableProps = {websiteId: linkId,limit: 10,allowDownload: false,showMore: true,- metric: formatMessage(labels.visitors),+ metric: t(labels.visitors),};const rowProps = { minHeight: 570 };@@ -20,36 +20,36 @@ export function LinkPanels({ linkId }: { linkId: string }) {<Grid gap="3"><GridRow layout="two" {...rowProps}><Panel>- <Heading size="2xl">{formatMessage(labels.sources)}</Heading>+ <Heading size="2xl">{t(labels.sources)}</Heading><Tabs><TabList>- <Tab id="referrer">{formatMessage(labels.referrers)}</Tab>- <Tab id="channel">{formatMessage(labels.channels)}</Tab>+ <Tab id="referrer">{t(labels.referrers)}</Tab>+ <Tab id="channel">{t(labels.channels)}</Tab></TabList><TabPanel id="referrer">- <MetricsTable type="referrer" title={formatMessage(labels.domain)} {...tableProps} />+ <MetricsTable type="referrer" title={t(labels.domain)} {...tableProps} /></TabPanel><TabPanel id="channel">- <MetricsTable type="channel" title={formatMessage(labels.type)} {...tableProps} />+ <MetricsTable type="channel" title={t(labels.type)} {...tableProps} /></TabPanel></Tabs></Panel><Panel>- <Heading size="2xl">{formatMessage(labels.environment)}</Heading>+ <Heading size="2xl">{t(labels.environment)}</Heading><Tabs><TabList>- <Tab id="browser">{formatMessage(labels.browsers)}</Tab>- <Tab id="os">{formatMessage(labels.os)}</Tab>- <Tab id="device">{formatMessage(labels.devices)}</Tab>+ <Tab id="browser">{t(labels.browsers)}</Tab>+ <Tab id="os">{t(labels.os)}</Tab>+ <Tab id="device">{t(labels.devices)}</Tab></TabList><TabPanel id="browser">- <MetricsTable type="browser" title={formatMessage(labels.browser)} {...tableProps} />+ <MetricsTable type="browser" title={t(labels.browser)} {...tableProps} /></TabPanel><TabPanel id="os">- <MetricsTable type="os" title={formatMessage(labels.os)} {...tableProps} />+ <MetricsTable type="os" title={t(labels.os)} {...tableProps} /></TabPanel><TabPanel id="device">- <MetricsTable type="device" title={formatMessage(labels.device)} {...tableProps} />+ <MetricsTable type="device" title={t(labels.device)} {...tableProps} /></TabPanel></Tabs></Panel>@@ -59,21 +59,21 @@ export function LinkPanels({ linkId }: { linkId: string }) {<WorldMap websiteId={linkId} /></Panel><Panel>- <Heading size="2xl">{formatMessage(labels.location)}</Heading>+ <Heading size="2xl">{t(labels.location)}</Heading><Tabs><TabList>- <Tab id="country">{formatMessage(labels.countries)}</Tab>- <Tab id="region">{formatMessage(labels.regions)}</Tab>- <Tab id="city">{formatMessage(labels.cities)}</Tab>+ <Tab id="country">{t(labels.countries)}</Tab>+ <Tab id="region">{t(labels.regions)}</Tab>+ <Tab id="city">{t(labels.cities)}</Tab></TabList><TabPanel id="country">- <MetricsTable type="country" title={formatMessage(labels.country)} {...tableProps} />+ <MetricsTable type="country" title={t(labels.country)} {...tableProps} /></TabPanel><TabPanel id="region">- <MetricsTable type="region" title={formatMessage(labels.region)} {...tableProps} />+ <MetricsTable type="region" title={t(labels.region)} {...tableProps} /></TabPanel><TabPanel id="city">- <MetricsTable type="city" title={formatMessage(labels.city)} {...tableProps} />+ <MetricsTable type="city" title={t(labels.city)} {...tableProps} /></TabPanel></Tabs></Panel>diff --git a/src/app/(main)/pixels/PixelAddButton.tsx b/src/app/(main)/pixels/PixelAddButton.tsxindex 1573b9e0f..be8edd418 100644--- a/src/app/(main)/pixels/PixelAddButton.tsx+++ b/src/app/(main)/pixels/PixelAddButton.tsx@@ -4,15 +4,10 @@ import { DialogButton } from '@/components/input/DialogButton';import { PixelEditForm } from './PixelEditForm';export function PixelAddButton({ teamId }: { teamId?: string }) {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();return (- <DialogButton- icon={<Plus />}- label={formatMessage(labels.addPixel)}- variant="primary"- width="600px"- >+ <DialogButton icon={<Plus />} label={t(labels.addPixel)} variant="primary" width="600px">{({ close }) => <PixelEditForm teamId={teamId} onClose={close} />}</DialogButton>);diff --git a/src/app/(main)/pixels/PixelDeleteButton.tsx b/src/app/(main)/pixels/PixelDeleteButton.tsxindex 436dba5c4..68bb896ce 100644--- a/src/app/(main)/pixels/PixelDeleteButton.tsx+++ b/src/app/(main)/pixels/PixelDeleteButton.tsx@@ -2,7 +2,6 @@ import { ConfirmationForm } from '@/components/common/ConfirmationForm';import { useDeleteQuery, useMessages, useModified } from '@/components/hooks';import { Trash } from '@/components/icons';import { DialogButton } from '@/components/input/DialogButton';-import { messages } from '@/components/messages';export function PixelDeleteButton({pixelId,@@ -13,7 +12,7 @@ export function PixelDeleteButton({name: string;onSave?: () => void;}) {- const { formatMessage, labels, getErrorMessage, FormattedMessage } = useMessages();+ const { t, labels, messages, getErrorMessage } = useMessages();const { mutateAsync, isPending, error } = useDeleteQuery(`/pixels/${pixelId}`);const { touch } = useModified();@@ -28,27 +27,18 @@ export function PixelDeleteButton({};return (- <DialogButton- icon={<Trash />}- variant="quiet"- title={formatMessage(labels.confirm)}- width="400px"- >+ <DialogButton icon={<Trash />} variant="quiet" title={t(labels.confirm)} width="400px">{({ close }) => (<ConfirmationForm- message={- <FormattedMessage- {...messages.confirmRemove}- values={{- target: <b>{name}</b>,- }}- />- }+ message={t.rich(messages.confirmRemove, {+ target: name,+ b: chunks => <b>{chunks}</b>,+ })}isLoading={isPending}error={getErrorMessage(error)}onConfirm={handleConfirm.bind(null, close)}onClose={close}- buttonLabel={formatMessage(labels.delete)}+ buttonLabel={t(labels.delete)}buttonVariant="danger"/>)}diff --git a/src/app/(main)/pixels/PixelEditButton.tsx b/src/app/(main)/pixels/PixelEditButton.tsxindex 3c5924da4..2a16118c2 100644--- a/src/app/(main)/pixels/PixelEditButton.tsx+++ b/src/app/(main)/pixels/PixelEditButton.tsx@@ -4,15 +4,10 @@ import { DialogButton } from '@/components/input/DialogButton';import { PixelEditForm } from './PixelEditForm';export function PixelEditButton({ pixelId }: { pixelId: string }) {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();return (- <DialogButton- icon={<Edit />}- title={formatMessage(labels.addPixel)}- variant="quiet"- width="600px"- >+ <DialogButton icon={<Edit />} title={t(labels.addPixel)} variant="quiet" width="600px">{({ close }) => {return <PixelEditForm pixelId={pixelId} onClose={close} />;}}diff --git a/src/app/(main)/pixels/PixelEditForm.tsx b/src/app/(main)/pixels/PixelEditForm.tsxindex 46241c1cf..54c5e64c5 100644--- a/src/app/(main)/pixels/PixelEditForm.tsx+++ b/src/app/(main)/pixels/PixelEditForm.tsx@@ -30,7 +30,7 @@ export function PixelEditForm({onSave?: () => void;onClose?: () => void;}) {- const { formatMessage, labels, messages, getErrorMessage } = useMessages();+ const { t, labels, messages, getErrorMessage } = useMessages();const { mutateAsync, error, isPending, touch, toast } = useUpdateQuery(pixelId ? `/pixels/${pixelId}` : '/pixels',{@@ -46,7 +46,7 @@ export function PixelEditForm({const handleSubmit = async (data: any) => {await mutateAsync(data, {onSuccess: async () => {- toast(formatMessage(messages.saved));+ toast(t(messages.saved));touch('pixels');touch(`pixel:${pixelId}`);onSave?.();@@ -78,18 +78,14 @@ export function PixelEditForm({{({ setValue }) => {return (<>- <FormField- label={formatMessage(labels.name)}- name="name"- rules={{ required: formatMessage(labels.required) }}- >+ <FormField label={t(labels.name)} name="name" rules={{ required: t(labels.required) }}><TextField autoComplete="off" /></FormField><FormFieldname="slug"rules={{- required: formatMessage(labels.required),+ required: t(labels.required),}}style={{ display: 'none' }}>@@ -97,7 +93,7 @@ export function PixelEditForm({</FormField><Column>- <Label>{formatMessage(labels.link)}</Label>+ <Label>{t(labels.link)}</Label><Row alignItems="center" gap><TextFieldvalue={`${hostUrl}/${slug}`}@@ -117,10 +113,10 @@ export function PixelEditForm({<Row justifyContent="flex-end" paddingTop="3" gap="3">{onClose && (<Button isDisabled={isPending} onPress={onClose}>- {formatMessage(labels.cancel)}+ {t(labels.cancel)}</Button>)}- <FormSubmitButton isDisabled={false}>{formatMessage(labels.save)}</FormSubmitButton>+ <FormSubmitButton isDisabled={false}>{t(labels.save)}</FormSubmitButton></Row></>);diff --git a/src/app/(main)/pixels/PixelsPage.tsx b/src/app/(main)/pixels/PixelsPage.tsxindex 91ddcdcda..76e210061 100644--- a/src/app/(main)/pixels/PixelsPage.tsx+++ b/src/app/(main)/pixels/PixelsPage.tsx@@ -10,7 +10,7 @@ import { PixelsDataTable } from './PixelsDataTable';export function PixelsPage() {const { user } = useLoginQuery();- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const { teamId } = useNavigation();const { data } = useTeamMembersQuery(teamId);@@ -23,7 +23,7 @@ export function PixelsPage() {return (<PageBody><Column gap="6" margin="2">- <PageHeader title={formatMessage(labels.pixels)}>+ <PageHeader title={t(labels.pixels)}>{showActions && <PixelAddButton teamId={teamId} />}</PageHeader><Panel>diff --git a/src/app/(main)/pixels/PixelsTable.tsx b/src/app/(main)/pixels/PixelsTable.tsxindex 018b40eb5..98ae6a8ac 100644--- a/src/app/(main)/pixels/PixelsTable.tsx+++ b/src/app/(main)/pixels/PixelsTable.tsx@@ -11,13 +11,13 @@ export interface PixelsTableProps extends DataTableProps {}export function PixelsTable({ showActions, ...props }: PixelsTableProps) {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const { renderUrl } = useNavigation();const { getSlugUrl } = useSlug('pixel');return (<DataTable {...props}>- <DataColumn id="name" label={formatMessage(labels.name)}>+ <DataColumn id="name" label={t(labels.name)}>{({ id, name }: any) => {return <Link href={renderUrl(`/pixels/${id}`)}>{name}</Link>;}}@@ -32,7 +32,7 @@ export function PixelsTable({ showActions, ...props }: PixelsTableProps) {);}}</DataColumn>- <DataColumn id="created" label={formatMessage(labels.created)}>+ <DataColumn id="created" label={t(labels.created)}>{(row: any) => <DateDistance date={new Date(row.createdAt)} />}</DataColumn>{showActions && (diff --git a/src/app/(main)/pixels/[pixelId]/PixelHeader.tsx b/src/app/(main)/pixels/[pixelId]/PixelHeader.tsxindex 3fab6b73f..26afc811e 100644--- a/src/app/(main)/pixels/[pixelId]/PixelHeader.tsx+++ b/src/app/(main)/pixels/[pixelId]/PixelHeader.tsx@@ -5,14 +5,14 @@ import { useMessages, usePixel, useSlug } from '@/components/hooks';import { ExternalLink, Grid2x2 } from '@/components/icons';export function PixelHeader() {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const { getSlugUrl } = useSlug('pixel');const pixel = usePixel();return (<PageHeader title={pixel.name} icon={<Grid2x2 />}><LinkButton href={getSlugUrl(pixel.slug)} target="_blank" prefetch={false} asAnchor>- <IconLabel icon={<ExternalLink />} label={formatMessage(labels.view)} />+ <IconLabel icon={<ExternalLink />} label={t(labels.view)} /></LinkButton></PageHeader>);diff --git a/src/app/(main)/pixels/[pixelId]/PixelMetricsBar.tsx b/src/app/(main)/pixels/[pixelId]/PixelMetricsBar.tsxindex c9dcd357c..3a46291e1 100644--- a/src/app/(main)/pixels/[pixelId]/PixelMetricsBar.tsx+++ b/src/app/(main)/pixels/[pixelId]/PixelMetricsBar.tsx@@ -13,7 +13,7 @@ export function PixelMetricsBar({compareMode?: boolean;}) {const { isAllTime } = useDateRange();- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const { data, isLoading, isFetching, error } = useWebsiteStatsQuery(pixelId);const { pageviews, visitors, visits, comparison } = data || {};@@ -22,19 +22,19 @@ export function PixelMetricsBar({? [{value: visitors,- label: formatMessage(labels.visitors),+ label: t(labels.visitors),change: visitors - comparison.visitors,formatValue: formatLongNumber,},{value: visits,- label: formatMessage(labels.visits),+ label: t(labels.visits),change: visits - comparison.visits,formatValue: formatLongNumber,},{value: pageviews,- label: formatMessage(labels.views),+ label: t(labels.views),change: pageviews - comparison.pageviews,formatValue: formatLongNumber,},diff --git a/src/app/(main)/pixels/[pixelId]/PixelPanels.tsx b/src/app/(main)/pixels/[pixelId]/PixelPanels.tsxindex 9f19d65aa..54079a168 100644--- a/src/app/(main)/pixels/[pixelId]/PixelPanels.tsx+++ b/src/app/(main)/pixels/[pixelId]/PixelPanels.tsx@@ -6,13 +6,13 @@ import { MetricsTable } from '@/components/metrics/MetricsTable';import { WorldMap } from '@/components/metrics/WorldMap';export function PixelPanels({ pixelId }: { pixelId: string }) {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const tableProps = {websiteId: pixelId,limit: 10,allowDownload: false,showMore: true,- metric: formatMessage(labels.visitors),+ metric: t(labels.visitors),};const rowProps = { minHeight: 570 };@@ -20,36 +20,36 @@ export function PixelPanels({ pixelId }: { pixelId: string }) {<Grid gap="3"><GridRow layout="two" {...rowProps}><Panel>- <Heading size="2xl">{formatMessage(labels.sources)}</Heading>+ <Heading size="2xl">{t(labels.sources)}</Heading><Tabs><TabList>- <Tab id="referrer">{formatMessage(labels.referrers)}</Tab>- <Tab id="channel">{formatMessage(labels.channels)}</Tab>+ <Tab id="referrer">{t(labels.referrers)}</Tab>+ <Tab id="channel">{t(labels.channels)}</Tab></TabList><TabPanel id="referrer">- <MetricsTable type="referrer" title={formatMessage(labels.domain)} {...tableProps} />+ <MetricsTable type="referrer" title={t(labels.domain)} {...tableProps} /></TabPanel><TabPanel id="channel">- <MetricsTable type="channel" title={formatMessage(labels.type)} {...tableProps} />+ <MetricsTable type="channel" title={t(labels.type)} {...tableProps} /></TabPanel></Tabs></Panel><Panel>- <Heading size="2xl">{formatMessage(labels.environment)}</Heading>+ <Heading size="2xl">{t(labels.environment)}</Heading><Tabs><TabList>- <Tab id="browser">{formatMessage(labels.browsers)}</Tab>- <Tab id="os">{formatMessage(labels.os)}</Tab>- <Tab id="device">{formatMessage(labels.devices)}</Tab>+ <Tab id="browser">{t(labels.browsers)}</Tab>+ <Tab id="os">{t(labels.os)}</Tab>+ <Tab id="device">{t(labels.devices)}</Tab></TabList><TabPanel id="browser">- <MetricsTable type="browser" title={formatMessage(labels.browser)} {...tableProps} />+ <MetricsTable type="browser" title={t(labels.browser)} {...tableProps} /></TabPanel><TabPanel id="os">- <MetricsTable type="os" title={formatMessage(labels.os)} {...tableProps} />+ <MetricsTable type="os" title={t(labels.os)} {...tableProps} /></TabPanel><TabPanel id="device">- <MetricsTable type="device" title={formatMessage(labels.device)} {...tableProps} />+ <MetricsTable type="device" title={t(labels.device)} {...tableProps} /></TabPanel></Tabs></Panel>@@ -59,21 +59,21 @@ export function PixelPanels({ pixelId }: { pixelId: string }) {<WorldMap websiteId={pixelId} /></Panel><Panel>- <Heading size="2xl">{formatMessage(labels.location)}</Heading>+ <Heading size="2xl">{t(labels.location)}</Heading><Tabs><TabList>- <Tab id="country">{formatMessage(labels.countries)}</Tab>- <Tab id="region">{formatMessage(labels.regions)}</Tab>- <Tab id="city">{formatMessage(labels.cities)}</Tab>+ <Tab id="country">{t(labels.countries)}</Tab>+ <Tab id="region">{t(labels.regions)}</Tab>+ <Tab id="city">{t(labels.cities)}</Tab></TabList><TabPanel id="country">- <MetricsTable type="country" title={formatMessage(labels.country)} {...tableProps} />+ <MetricsTable type="country" title={t(labels.country)} {...tableProps} /></TabPanel><TabPanel id="region">- <MetricsTable type="region" title={formatMessage(labels.region)} {...tableProps} />+ <MetricsTable type="region" title={t(labels.region)} {...tableProps} /></TabPanel><TabPanel id="city">- <MetricsTable type="city" title={formatMessage(labels.city)} {...tableProps} />+ <MetricsTable type="city" title={t(labels.city)} {...tableProps} /></TabPanel></Tabs></Panel>diff --git a/src/app/(main)/settings/SettingsNav.tsx b/src/app/(main)/settings/SettingsNav.tsxindex 5274ed84e..bfe8a0aee 100644--- a/src/app/(main)/settings/SettingsNav.tsx+++ b/src/app/(main)/settings/SettingsNav.tsx@@ -3,33 +3,33 @@ import { useMessages, useNavigation } from '@/components/hooks';import { Settings2, UserCircle, Users } from '@/components/icons';export function SettingsNav({ onItemClick }: { onItemClick?: () => void }) {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const { renderUrl, pathname } = useNavigation();const items = [{- label: formatMessage(labels.application),+ label: t(labels.application),items: [{id: 'preferences',- label: formatMessage(labels.preferences),+ label: t(labels.preferences),path: renderUrl('/settings/preferences'),icon: <Settings2 />,},],},{- label: formatMessage(labels.account),+ label: t(labels.account),items: [{id: 'profile',- label: formatMessage(labels.profile),+ label: t(labels.profile),path: renderUrl('/settings/profile'),icon: <UserCircle />,},{id: 'teams',- label: formatMessage(labels.teams),+ label: t(labels.teams),path: renderUrl('/settings/teams'),icon: <Users />,},@@ -44,7 +44,7 @@ export function SettingsNav({ onItemClick }: { onItemClick?: () => void }) {return (<NavMenuitems={items}- title={formatMessage(labels.settings)}+ title={t(labels.settings)}selectedKey={selectedKey}allowMinimize={false}onItemClick={onItemClick}diff --git a/src/app/(main)/settings/preferences/DateRangeSetting.tsx b/src/app/(main)/settings/preferences/DateRangeSetting.tsxindex 28745aab6..6719cd22e 100644--- a/src/app/(main)/settings/preferences/DateRangeSetting.tsx+++ b/src/app/(main)/settings/preferences/DateRangeSetting.tsx@@ -6,7 +6,7 @@ import { DATE_RANGE_CONFIG, DEFAULT_DATE_RANGE_VALUE } from '@/lib/constants';import { getItem, setItem } from '@/lib/storage';export function DateRangeSetting() {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const [date, setDate] = useState(getItem(DATE_RANGE_CONFIG) || DEFAULT_DATE_RANGE_VALUE);const handleChange = (value: string) => {@@ -27,7 +27,7 @@ export function DateRangeSetting() {placement="bottom start"style={{ minWidth: '250px' }}/>- <Button onPress={handleReset}>{formatMessage(labels.reset)}</Button>+ <Button onPress={handleReset}>{t(labels.reset)}</Button></Row>);}diff --git a/src/app/(main)/settings/preferences/LanguageSetting.tsx b/src/app/(main)/settings/preferences/LanguageSetting.tsxindex 2b2d0febe..34470c36c 100644--- a/src/app/(main)/settings/preferences/LanguageSetting.tsx+++ b/src/app/(main)/settings/preferences/LanguageSetting.tsx@@ -6,7 +6,7 @@ import { languages } from '@/lib/lang';export function LanguageSetting() {const [search, setSearch] = useState('');- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const { locale, saveLocale } = useLocale();const items = search? Object.keys(languages).filter(n => {@@ -43,7 +43,7 @@ export function LanguageSetting() {))}{!items.length && <ListItem></ListItem>}</Select>- <Button onPress={handleReset}>{formatMessage(labels.reset)}</Button>+ <Button onPress={handleReset}>{t(labels.reset)}</Button></Row>);}diff --git a/src/app/(main)/settings/preferences/PreferenceSettings.tsx b/src/app/(main)/settings/preferences/PreferenceSettings.tsxindex c91a6eff2..55695946b 100644--- a/src/app/(main)/settings/preferences/PreferenceSettings.tsx+++ b/src/app/(main)/settings/preferences/PreferenceSettings.tsx@@ -8,7 +8,7 @@ import { VersionSetting } from './VersionSetting';export function PreferenceSettings() {const { user } = useLoginQuery();- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();if (!user) {return null;@@ -17,23 +17,23 @@ export function PreferenceSettings() {return (<Column gap="6"><Column>- <Label>{formatMessage(labels.defaultDateRange)}</Label>+ <Label>{t(labels.defaultDateRange)}</Label><DateRangeSetting /></Column><Column>- <Label>{formatMessage(labels.timezone)}</Label>+ <Label>{t(labels.timezone)}</Label><TimezoneSetting /></Column><Column>- <Label>{formatMessage(labels.language)}</Label>+ <Label>{t(labels.language)}</Label><LanguageSetting /></Column><Column>- <Label>{formatMessage(labels.theme)}</Label>+ <Label>{t(labels.theme)}</Label><ThemeSetting /></Column><Column>- <Label>{formatMessage(labels.version)}</Label>+ <Label>{t(labels.version)}</Label><VersionSetting /></Column></Column>diff --git a/src/app/(main)/settings/preferences/PreferencesPage.tsx b/src/app/(main)/settings/preferences/PreferencesPage.tsxindex 61e26694f..2cbfd6dbf 100644--- a/src/app/(main)/settings/preferences/PreferencesPage.tsx+++ b/src/app/(main)/settings/preferences/PreferencesPage.tsx@@ -7,12 +7,12 @@ import { useMessages } from '@/components/hooks';import { PreferenceSettings } from './PreferenceSettings';export function PreferencesPage() {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();return (<PageBody><Column gap="6">- <PageHeader title={formatMessage(labels.preferences)} />+ <PageHeader title={t(labels.preferences)} /><Panel><PreferenceSettings /></Panel>diff --git a/src/app/(main)/settings/preferences/TimezoneSetting.tsx b/src/app/(main)/settings/preferences/TimezoneSetting.tsxindex 8551e8cf0..f206a6e4f 100644--- a/src/app/(main)/settings/preferences/TimezoneSetting.tsx+++ b/src/app/(main)/settings/preferences/TimezoneSetting.tsx@@ -7,7 +7,7 @@ const timezones = Intl.supportedValuesOf('timeZone');export function TimezoneSetting() {const [search, setSearch] = useState('');- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const { timezone, saveTimezone } = useTimezone();const items = search? timezones.filter(n => n.toLowerCase().includes(search.toLowerCase()))@@ -39,7 +39,7 @@ export function TimezoneSetting() {))}{!items.length && <ListItem></ListItem>}</Select>- <Button onPress={handleReset}>{formatMessage(labels.reset)}</Button>+ <Button onPress={handleReset}>{t(labels.reset)}</Button></Row>);}diff --git a/src/app/(main)/settings/profile/PasswordChangeButton.tsx b/src/app/(main)/settings/profile/PasswordChangeButton.tsxindex 6ce8ef842..105269dd4 100644--- a/src/app/(main)/settings/profile/PasswordChangeButton.tsx+++ b/src/app/(main)/settings/profile/PasswordChangeButton.tsx@@ -4,11 +4,11 @@ import { LockKeyhole } from '@/components/icons';import { PasswordEditForm } from './PasswordEditForm';export function PasswordChangeButton() {- const { formatMessage, labels, messages } = useMessages();+ const { t, labels, messages } = useMessages();const { toast } = useToast();const handleSave = () => {- toast(formatMessage(messages.saved));+ toast(t(messages.saved));};return (@@ -17,10 +17,10 @@ export function PasswordChangeButton() {<Icon><LockKeyhole /></Icon>- <Text>{formatMessage(labels.changePassword)}</Text>+ <Text>{t(labels.changePassword)}</Text></Button><Modal>- <Dialog title={formatMessage(labels.changePassword)} style={{ width: 400 }}>+ <Dialog title={t(labels.changePassword)} style={{ width: 400 }}>{({ close }) => <PasswordEditForm onSave={handleSave} onClose={close} />}</Dialog></Modal>diff --git a/src/app/(main)/settings/profile/PasswordEditForm.tsx b/src/app/(main)/settings/profile/PasswordEditForm.tsxindex 6f782e44b..8a1615a07 100644--- a/src/app/(main)/settings/profile/PasswordEditForm.tsx+++ b/src/app/(main)/settings/profile/PasswordEditForm.tsx@@ -9,7 +9,7 @@ import {import { useMessages, useUpdateQuery } from '@/components/hooks';export function PasswordEditForm({ onSave, onClose }) {- const { formatMessage, labels, messages, getErrorMessage } = useMessages();+ const { t, labels, messages, getErrorMessage } = useMessages();const { mutateAsync, error, isPending } = useUpdateQuery('/me/password');const handleSubmit = async (data: any) => {@@ -23,7 +23,7 @@ export function PasswordEditForm({ onSave, onClose }) {const samePassword = (value: string, values: Record<string, any>) => {if (value !== values.newPassword) {- return formatMessage(messages.noMatchPassword);+ return t(messages.noMatchPassword);}return true;};@@ -31,7 +31,7 @@ export function PasswordEditForm({ onSave, onClose }) {return (<Form onSubmit={handleSubmit} error={getErrorMessage(error)}><FormField- label={formatMessage(labels.currentPassword)}+ label={t(labels.currentPassword)}name="currentPassword"rules={{ required: 'Required' }}>@@ -39,28 +39,28 @@ export function PasswordEditForm({ onSave, onClose }) {</FormField><FormFieldname="newPassword"- label={formatMessage(labels.newPassword)}+ label={t(labels.newPassword)}rules={{required: 'Required',- minLength: { value: 8, message: formatMessage(messages.minPasswordLength, { n: '8' }) },+ minLength: { value: 8, message: t(messages.minPasswordLength, { n: '8' }) },}}><PasswordField autoComplete="new-password" /></FormField><FormFieldname="confirmPassword"- label={formatMessage(labels.confirmPassword)}+ label={t(labels.confirmPassword)}rules={{- required: formatMessage(labels.required),- minLength: { value: 8, message: formatMessage(messages.minPasswordLength, { n: '8' }) },+ required: t(labels.required),+ minLength: { value: 8, message: t(messages.minPasswordLength, { n: '8' }) },validate: samePassword,}}><PasswordField autoComplete="confirm-password" /></FormField><FormButtons>- <Button onPress={onClose}>{formatMessage(labels.cancel)}</Button>- <FormSubmitButton isDisabled={isPending}>{formatMessage(labels.save)}</FormSubmitButton>+ <Button onPress={onClose}>{t(labels.cancel)}</Button>+ <FormSubmitButton isDisabled={isPending}>{t(labels.save)}</FormSubmitButton></FormButtons></Form>);diff --git a/src/app/(main)/settings/profile/ProfileHeader.tsx b/src/app/(main)/settings/profile/ProfileHeader.tsxindex 05f799637..09cabbe2c 100644--- a/src/app/(main)/settings/profile/ProfileHeader.tsx+++ b/src/app/(main)/settings/profile/ProfileHeader.tsx@@ -2,7 +2,7 @@ import { SectionHeader } from '@/components/common/SectionHeader';import { useMessages } from '@/components/hooks';export function ProfileHeader() {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();- return <SectionHeader title={formatMessage(labels.profile)}></SectionHeader>;+ return <SectionHeader title={t(labels.profile)}></SectionHeader>;}diff --git a/src/app/(main)/settings/profile/ProfilePage.tsx b/src/app/(main)/settings/profile/ProfilePage.tsxindex f03499a37..896464a13 100644--- a/src/app/(main)/settings/profile/ProfilePage.tsx+++ b/src/app/(main)/settings/profile/ProfilePage.tsx@@ -7,12 +7,12 @@ import { useMessages } from '@/components/hooks';import { ProfileSettings } from './ProfileSettings';export function ProfilePage() {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();return (<PageBody><Column gap="6">- <PageHeader title={formatMessage(labels.profile)} />+ <PageHeader title={t(labels.profile)} /><Panel><ProfileSettings /></Panel>diff --git a/src/app/(main)/settings/profile/ProfileSettings.tsx b/src/app/(main)/settings/profile/ProfileSettings.tsxindex d53a68a03..e991dcda5 100644--- a/src/app/(main)/settings/profile/ProfileSettings.tsx+++ b/src/app/(main)/settings/profile/ProfileSettings.tsx@@ -5,7 +5,7 @@ import { PasswordChangeButton } from './PasswordChangeButton';export function ProfileSettings() {const { user } = useLoginQuery();- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const { cloudMode } = useConfig();if (!user) {@@ -16,31 +16,31 @@ export function ProfileSettings() {const renderRole = (value: string) => {if (value === ROLES.user) {- return formatMessage(labels.user);+ return t(labels.user);}if (value === ROLES.admin) {- return formatMessage(labels.admin);+ return t(labels.admin);}if (value === ROLES.viewOnly) {- return formatMessage(labels.viewOnly);+ return t(labels.viewOnly);}- return formatMessage(labels.unknown);+ return t(labels.unknown);};return (<Column gap="6"><Column>- <Label>{formatMessage(labels.username)}</Label>+ <Label>{t(labels.username)}</Label>{username}</Column><Column>- <Label>{formatMessage(labels.role)}</Label>+ <Label>{t(labels.role)}</Label>{renderRole(role)}</Column>{!cloudMode && (<Column>- <Label>{formatMessage(labels.password)}</Label>+ <Label>{t(labels.password)}</Label><Row><PasswordChangeButton /></Row>diff --git a/src/app/(main)/settings/websites/WebsitesSettingsPage.tsx b/src/app/(main)/settings/websites/WebsitesSettingsPage.tsxindex 5009ec6c6..d83dfbf02 100644--- a/src/app/(main)/settings/websites/WebsitesSettingsPage.tsx+++ b/src/app/(main)/settings/websites/WebsitesSettingsPage.tsx@@ -5,11 +5,11 @@ import { SectionHeader } from '@/components/common/SectionHeader';import { useMessages } from '@/components/hooks';export function WebsitesSettingsPage({ teamId }: { teamId: string }) {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();return (<Column gap>- <SectionHeader title={formatMessage(labels.websites)} />+ <SectionHeader title={t(labels.websites)} /><WebsitesDataTable teamId={teamId} /></Column>);diff --git a/src/app/(main)/teams/TeamAddForm.tsx b/src/app/(main)/teams/TeamAddForm.tsxindex 3b827776b..2599baa40 100644--- a/src/app/(main)/teams/TeamAddForm.tsx+++ b/src/app/(main)/teams/TeamAddForm.tsx@@ -18,7 +18,7 @@ export function TeamAddForm({onClose: () => void;isAdmin: boolean;}) {- const { formatMessage, labels, getErrorMessage } = useMessages();+ const { t, labels, getErrorMessage } = useMessages();const { mutateAsync, error, isPending } = useUpdateQuery('/teams');const handleSubmit = async (data: any) => {@@ -32,20 +32,20 @@ export function TeamAddForm({return (<Form onSubmit={handleSubmit} error={getErrorMessage(error)}>- <FormField name="name" label={formatMessage(labels.name)}>+ <FormField name="name" label={t(labels.name)}><TextField autoComplete="off" /></FormField>{isAdmin && (- <FormField name="ownerId" label={formatMessage(labels.teamOwner)}>+ <FormField name="ownerId" label={t(labels.teamOwner)}><UserSelect buttonProps={{ style: { outline: 'none' } }} /></FormField>)}<FormButtons><Button isDisabled={isPending} onPress={onClose}>- {formatMessage(labels.cancel)}+ {t(labels.cancel)}</Button><FormSubmitButton variant="primary" isDisabled={isPending}>- {formatMessage(labels.save)}+ {t(labels.save)}</FormSubmitButton></FormButtons></Form>diff --git a/src/app/(main)/teams/TeamJoinForm.tsx b/src/app/(main)/teams/TeamJoinForm.tsxindex 697807889..3aa865319 100644--- a/src/app/(main)/teams/TeamJoinForm.tsx+++ b/src/app/(main)/teams/TeamJoinForm.tsx@@ -9,7 +9,7 @@ import {import { useMessages, useUpdateQuery } from '@/components/hooks';export function TeamJoinForm({ onSave, onClose }: { onSave: () => void; onClose: () => void }) {- const { formatMessage, labels, getErrorMessage } = useMessages();+ const { t, labels, getErrorMessage } = useMessages();const { mutateAsync, error, touch } = useUpdateQuery('/teams/join');const handleSubmit = async (data: any) => {@@ -25,15 +25,15 @@ export function TeamJoinForm({ onSave, onClose }: { onSave: () => void; onClose:return (<Form onSubmit={handleSubmit} error={getErrorMessage(error)}><FormField- label={formatMessage(labels.accessCode)}+ label={t(labels.accessCode)}name="accessCode"- rules={{ required: formatMessage(labels.required) }}+ rules={{ required: t(labels.required) }}><TextField autoComplete="off" /></FormField><FormButtons>- <Button onPress={onClose}>{formatMessage(labels.cancel)}</Button>- <FormSubmitButton variant="primary">{formatMessage(labels.join)}</FormSubmitButton>+ <Button onPress={onClose}>{t(labels.cancel)}</Button>+ <FormSubmitButton variant="primary">{t(labels.join)}</FormSubmitButton></FormButtons></Form>);diff --git a/src/app/(main)/teams/TeamLeaveButton.tsx b/src/app/(main)/teams/TeamLeaveButton.tsxindex 2cca76f86..b4902fa01 100644--- a/src/app/(main)/teams/TeamLeaveButton.tsx+++ b/src/app/(main)/teams/TeamLeaveButton.tsx@@ -5,7 +5,7 @@ import { LogOut } from '@/components/icons';import { TeamLeaveForm } from './TeamLeaveForm';export function TeamLeaveButton({ teamId, teamName }: { teamId: string; teamName: string }) {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const router = useRouter();const { user } = useLoginQuery();const { touch } = useModified();@@ -21,10 +21,10 @@ export function TeamLeaveButton({ teamId, teamName }: { teamId: string; teamName<Icon><LogOut /></Icon>- <Text>{formatMessage(labels.leave)}</Text>+ <Text>{t(labels.leave)}</Text></Button><Modal>- <Dialog title={formatMessage(labels.leaveTeam)} style={{ width: 400 }}>+ <Dialog title={t(labels.leaveTeam)} style={{ width: 400 }}>{({ close }) => (<TeamLeaveFormteamId={teamId}diff --git a/src/app/(main)/teams/TeamLeaveForm.tsx b/src/app/(main)/teams/TeamLeaveForm.tsxindex b3dcaf585..09415239d 100644--- a/src/app/(main)/teams/TeamLeaveForm.tsx+++ b/src/app/(main)/teams/TeamLeaveForm.tsx@@ -14,7 +14,7 @@ export function TeamLeaveForm({onSave: () => void;onClose: () => void;}) {- const { formatMessage, labels, messages, getErrorMessage, FormattedMessage } = useMessages();+ const { t, labels, messages, getErrorMessage } = useMessages();const { mutateAsync, error, isPending } = useDeleteQuery(`/teams/${teamId}/users/${userId}`);const { touch } = useModified();@@ -30,15 +30,11 @@ export function TeamLeaveForm({return (<ConfirmationForm- buttonLabel={formatMessage(labels.leave)}- message={- <FormattedMessage- {...messages.confirmLeave}- values={{- target: <b>{teamName}</b>,- }}- />- }+ buttonLabel={t(labels.leave)}+ message={t.rich(messages.confirmLeave, {+ target: teamName,+ b: chunks => <b>{chunks}</b>,+ })}onConfirm={handleConfirm}onClose={onClose}isLoading={isPending}diff --git a/src/app/(main)/teams/TeamMemberAddForm.tsx b/src/app/(main)/teams/TeamMemberAddForm.tsxindex d929364eb..4ab314752 100644--- a/src/app/(main)/teams/TeamMemberAddForm.tsx+++ b/src/app/(main)/teams/TeamMemberAddForm.tsx@@ -22,7 +22,7 @@ export function TeamMemberAddForm({onSave?: () => void;onClose?: () => void;}) {- const { formatMessage, labels, getErrorMessage } = useMessages();+ const { t, labels, getErrorMessage } = useMessages();const { mutateAsync, error, isPending } = useUpdateQuery(`/teams/${teamId}/users`);const handleSubmit = async (data: any) => {@@ -37,24 +37,20 @@ export function TeamMemberAddForm({const renderRole = role => {switch (role) {case ROLES.teamManager:- return formatMessage(labels.manager);+ return t(labels.manager);case ROLES.teamMember:- return formatMessage(labels.member);+ return t(labels.member);case ROLES.teamViewOnly:- return formatMessage(labels.viewOnly);+ return t(labels.viewOnly);}};return (<Form onSubmit={handleSubmit} error={getErrorMessage(error)}>- <FormField- name="userId"- label={formatMessage(labels.username)}- rules={{ required: 'Required' }}- >+ <FormField name="userId" label={t(labels.username)} rules={{ required: 'Required' }}><UserSelect teamId={teamId} /></FormField>- <FormField name="role" label={formatMessage(labels.role)} rules={{ required: 'Required' }}>+ <FormField name="role" label={t(labels.role)} rules={{ required: 'Required' }}><Select renderValue={value => renderRole(value as any)}>{roles.map(value => (<ListItem key={value} id={value}>@@ -65,10 +61,10 @@ export function TeamMemberAddForm({</FormField><FormButtons><Button isDisabled={isPending} onPress={onClose}>- {formatMessage(labels.cancel)}+ {t(labels.cancel)}</Button><FormSubmitButton variant="primary" isDisabled={isPending}>- {formatMessage(labels.save)}+ {t(labels.save)}</FormSubmitButton></FormButtons></Form>diff --git a/src/app/(main)/teams/TeamsAddButton.tsx b/src/app/(main)/teams/TeamsAddButton.tsxindex 138730887..c993296ff 100644--- a/src/app/(main)/teams/TeamsAddButton.tsx+++ b/src/app/(main)/teams/TeamsAddButton.tsx@@ -1,7 +1,6 @@import { Button, Dialog, DialogTrigger, Icon, Modal, Text, useToast } from '@umami/react-zen';import { useMessages, useModified } from '@/components/hooks';import { Plus } from '@/components/icons';-import { messages } from '@/components/messages';import { TeamAddForm } from './TeamAddForm';export function TeamsAddButton({@@ -11,12 +10,12 @@ export function TeamsAddButton({onSave?: () => void;isAdmin?: boolean;}) {- const { formatMessage, labels } = useMessages();+ const { t, labels, messages } = useMessages();const { toast } = useToast();const { touch } = useModified();const handleSave = async () => {- toast(formatMessage(messages.saved));+ toast(t(messages.saved));touch('teams');onSave?.();};@@ -27,10 +26,10 @@ export function TeamsAddButton({<Icon><Plus /></Icon>- <Text>{formatMessage(labels.createTeam)}</Text>+ <Text>{t(labels.createTeam)}</Text></Button><Modal>- <Dialog title={formatMessage(labels.createTeam)} style={{ width: 400 }}>+ <Dialog title={t(labels.createTeam)} style={{ width: 400 }}>{({ close }) => <TeamAddForm onSave={handleSave} onClose={close} isAdmin={isAdmin} />}</Dialog></Modal>diff --git a/src/app/(main)/teams/TeamsHeader.tsx b/src/app/(main)/teams/TeamsHeader.tsxindex 579ba5957..7d77229a3 100644--- a/src/app/(main)/teams/TeamsHeader.tsx+++ b/src/app/(main)/teams/TeamsHeader.tsx@@ -12,11 +12,11 @@ export function TeamsHeader({allowCreate?: boolean;allowJoin?: boolean;}) {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const { user } = useLoginQuery();return (- <PageHeader title={formatMessage(labels.teams)}>+ <PageHeader title={t(labels.teams)}><Row gap="3">{allowJoin && <TeamsJoinButton />}{allowCreate && user.role !== ROLES.viewOnly && <TeamsAddButton />}diff --git a/src/app/(main)/teams/TeamsJoinButton.tsx b/src/app/(main)/teams/TeamsJoinButton.tsxindex 017211e2f..eb7062966 100644--- a/src/app/(main)/teams/TeamsJoinButton.tsx+++ b/src/app/(main)/teams/TeamsJoinButton.tsx@@ -4,12 +4,12 @@ import { UserPlus } from '@/components/icons';import { TeamJoinForm } from './TeamJoinForm';export function TeamsJoinButton() {- const { formatMessage, labels, messages } = useMessages();+ const { t, labels, messages } = useMessages();const { toast } = useToast();const { touch } = useModified();const handleJoin = () => {- toast(formatMessage(messages.saved));+ toast(t(messages.saved));touch('teams');};@@ -19,10 +19,10 @@ export function TeamsJoinButton() {<Icon><UserPlus /></Icon>- <Text>{formatMessage(labels.joinTeam)}</Text>+ <Text>{t(labels.joinTeam)}</Text></Button><Modal>- <Dialog title={formatMessage(labels.joinTeam)} style={{ width: 400 }}>+ <Dialog title={t(labels.joinTeam)} style={{ width: 400 }}>{({ close }) => <TeamJoinForm onSave={handleJoin} onClose={close} />}</Dialog></Modal>diff --git a/src/app/(main)/teams/TeamsMemberAddButton.tsx b/src/app/(main)/teams/TeamsMemberAddButton.tsxindex f1bbf2586..ac33e98cb 100644--- a/src/app/(main)/teams/TeamsMemberAddButton.tsx+++ b/src/app/(main)/teams/TeamsMemberAddButton.tsx@@ -1,7 +1,6 @@import { Button, Dialog, DialogTrigger, Icon, Modal, Text, useToast } from '@umami/react-zen';import { useMessages, useModified } from '@/components/hooks';import { Plus } from '@/components/icons';-import { messages } from '@/components/messages';import { TeamMemberAddForm } from './TeamMemberAddForm';export function TeamsMemberAddButton({@@ -12,12 +11,12 @@ export function TeamsMemberAddButton({onSave?: () => void;isAdmin?: boolean;}) {- const { formatMessage, labels } = useMessages();+ const { t, labels, messages } = useMessages();const { toast } = useToast();const { touch } = useModified();const handleSave = async () => {- toast(formatMessage(messages.saved));+ toast(t(messages.saved));touch('teams:members');onSave?.();};@@ -28,10 +27,10 @@ export function TeamsMemberAddButton({<Icon><Plus /></Icon>- <Text>{formatMessage(labels.addMember)}</Text>+ <Text>{t(labels.addMember)}</Text></Button><Modal>- <Dialog title={formatMessage(labels.addMember)} style={{ width: 400 }}>+ <Dialog title={t(labels.addMember)} style={{ width: 400 }}>{({ close }) => <TeamMemberAddForm teamId={teamId} onSave={handleSave} onClose={close} />}</Dialog></Modal>diff --git a/src/app/(main)/teams/TeamsTable.tsx b/src/app/(main)/teams/TeamsTable.tsxindex 754f0b2b1..66c7355ac 100644--- a/src/app/(main)/teams/TeamsTable.tsx+++ b/src/app/(main)/teams/TeamsTable.tsx@@ -8,20 +8,20 @@ export interface TeamsTableProps extends DataTableProps {}export function TeamsTable({ renderLink, ...props }: TeamsTableProps) {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();return (<DataTable {...props}>- <DataColumn id="name" label={formatMessage(labels.name)}>+ <DataColumn id="name" label={t(labels.name)}>{renderLink}</DataColumn>- <DataColumn id="owner" label={formatMessage(labels.owner)}>+ <DataColumn id="owner" label={t(labels.owner)}>{(row: any) => row?.members?.find(({ role }) => role === ROLES.teamOwner)?.user?.username}</DataColumn>- <DataColumn id="members" label={formatMessage(labels.members)} align="end">+ <DataColumn id="members" label={t(labels.members)} align="end">{(row: any) => row?._count?.members}</DataColumn>- <DataColumn id="websites" label={formatMessage(labels.websites)} align="end">+ <DataColumn id="websites" label={t(labels.websites)} align="end">{(row: any) => row?._count?.websites}</DataColumn></DataTable>diff --git a/src/app/(main)/teams/[teamId]/TeamDeleteForm.tsx b/src/app/(main)/teams/[teamId]/TeamDeleteForm.tsxindex 7adc9b341..d593e0dc2 100644--- a/src/app/(main)/teams/[teamId]/TeamDeleteForm.tsx+++ b/src/app/(main)/teams/[teamId]/TeamDeleteForm.tsx@@ -12,7 +12,7 @@ export function TeamDeleteForm({onSave?: () => void;onClose?: () => void;}) {- const { labels, formatMessage, getErrorMessage } = useMessages();+ const { labels, t, getErrorMessage } = useMessages();const { mutateAsync, error, isPending, touch } = useDeleteQuery(`/teams/${teamId}`);const handleConfirm = async () => {@@ -33,7 +33,7 @@ export function TeamDeleteForm({onClose={onClose}isLoading={isPending}error={getErrorMessage(error)}- buttonLabel={formatMessage(labels.delete)}+ buttonLabel={t(labels.delete)}buttonVariant="danger"/>);diff --git a/src/app/(main)/teams/[teamId]/TeamEditForm.tsx b/src/app/(main)/teams/[teamId]/TeamEditForm.tsxindex 56789f9ca..04904c116 100644--- a/src/app/(main)/teams/[teamId]/TeamEditForm.tsx+++ b/src/app/(main)/teams/[teamId]/TeamEditForm.tsx@@ -26,14 +26,14 @@ export function TeamEditForm({onSave?: () => void;}) {const team = useTeam();- const { formatMessage, labels, messages, getErrorMessage } = useMessages();+ const { t, labels, messages, getErrorMessage } = useMessages();const { mutateAsync, error, isPending, touch, toast } = useUpdateQuery(`/teams/${teamId}`);const handleSubmit = async (data: any) => {await mutateAsync(data, {onSuccess: async () => {- toast(formatMessage(messages.saved));+ toast(t(messages.saved));touch('teams');touch(`teams:${teamId}`);onSave?.();@@ -46,30 +46,22 @@ export function TeamEditForm({{({ setValue }) => {return (<>- <FormField name="id" label={formatMessage(labels.teamId)}>+ <FormField name="id" label={t(labels.teamId)}><TextField isReadOnly allowCopy /></FormField>- <FormField- name="name"- label={formatMessage(labels.name)}- rules={{ required: formatMessage(labels.required) }}- >+ <FormField name="name" label={t(labels.name)} rules={{ required: t(labels.required) }}><TextField isReadOnly={!allowEdit} /></FormField>{showAccessCode && (<Row alignItems="flex-end" gap>- <FormField- name="accessCode"- label={formatMessage(labels.accessCode)}- style={{ flex: 1 }}- >+ <FormField name="accessCode" label={t(labels.accessCode)} style={{ flex: 1 }}><TextField isReadOnly allowCopy /></FormField>{allowEdit && (<ButtononPress={() => setValue('accessCode', generateId(), { shouldDirty: true })}>- <IconLabel icon={<RefreshCw />} label={formatMessage(labels.regenerate)} />+ <IconLabel icon={<RefreshCw />} label={t(labels.regenerate)} /></Button>)}</Row>@@ -77,7 +69,7 @@ export function TeamEditForm({{allowEdit && (<FormButtons justifyContent="flex-end"><FormSubmitButton variant="primary" isPending={isPending}>- {formatMessage(labels.save)}+ {t(labels.save)}</FormSubmitButton></FormButtons>)}diff --git a/src/app/(main)/teams/[teamId]/TeamManage.tsx b/src/app/(main)/teams/[teamId]/TeamManage.tsxindex 88cbad9ee..52e76a25b 100644--- a/src/app/(main)/teams/[teamId]/TeamManage.tsx+++ b/src/app/(main)/teams/[teamId]/TeamManage.tsx@@ -5,7 +5,7 @@ import { useMessages, useModified } from '@/components/hooks';import { TeamDeleteForm } from './TeamDeleteForm';export function TeamManage({ teamId }: { teamId: string }) {- const { formatMessage, labels, messages } = useMessages();+ const { t, labels, messages } = useMessages();const router = useRouter();const { touch } = useModified();@@ -15,14 +15,11 @@ export function TeamManage({ teamId }: { teamId: string }) {};return (- <ActionForm- label={formatMessage(labels.deleteTeam)}- description={formatMessage(messages.deleteTeamWarning)}- >+ <ActionForm label={t(labels.deleteTeam)} description={t(messages.deleteTeamWarning)}><DialogTrigger>- <Button variant="danger">{formatMessage(labels.delete)}</Button>+ <Button variant="danger">{t(labels.delete)}</Button><Modal>- <Dialog title={formatMessage(labels.deleteTeam)} style={{ width: 400 }}>+ <Dialog title={t(labels.deleteTeam)} style={{ width: 400 }}>{({ close }) => <TeamDeleteForm teamId={teamId} onSave={handleLeave} onClose={close} />}</Dialog></Modal>diff --git a/src/app/(main)/teams/[teamId]/TeamMemberEditButton.tsx b/src/app/(main)/teams/[teamId]/TeamMemberEditButton.tsxindex f75b6d18e..f5d958713 100644--- a/src/app/(main)/teams/[teamId]/TeamMemberEditButton.tsx+++ b/src/app/(main)/teams/[teamId]/TeamMemberEditButton.tsx@@ -15,23 +15,18 @@ export function TeamMemberEditButton({role: string;onSave?: () => void;}) {- const { formatMessage, labels, messages } = useMessages();+ const { t, labels, messages } = useMessages();const { toast } = useToast();const { touch } = useModified();const handleSave = () => {touch('teams:members');- toast(formatMessage(messages.saved));+ toast(t(messages.saved));onSave?.();};return (- <DialogButton- icon={<Edit />}- title={formatMessage(labels.editMember)}- variant="quiet"- width="400px"- >+ <DialogButton icon={<Edit />} title={t(labels.editMember)} variant="quiet" width="400px">{({ close }) => (<TeamMemberEditFormteamId={teamId}diff --git a/src/app/(main)/teams/[teamId]/TeamMemberEditForm.tsx b/src/app/(main)/teams/[teamId]/TeamMemberEditForm.tsxindex 4826746fd..baf519ca1 100644--- a/src/app/(main)/teams/[teamId]/TeamMemberEditForm.tsx+++ b/src/app/(main)/teams/[teamId]/TeamMemberEditForm.tsx@@ -24,7 +24,7 @@ export function TeamMemberEditForm({onClose?: () => void;}) {const { mutateAsync, error, isPending } = useUpdateQuery(`/teams/${teamId}/users/${userId}`);- const { formatMessage, labels, getErrorMessage } = useMessages();+ const { t, labels, getErrorMessage } = useMessages();const handleSubmit = async (data: any) => {await mutateAsync(data, {@@ -37,24 +37,20 @@ export function TeamMemberEditForm({return (<Form onSubmit={handleSubmit} error={getErrorMessage(error)} defaultValues={{ role }}>- <FormField- name="role"- rules={{ required: formatMessage(labels.required) }}- label={formatMessage(labels.role)}- >+ <FormField name="role" rules={{ required: t(labels.required) }} label={t(labels.role)}><Select>- <ListItem id={ROLES.teamManager}>{formatMessage(labels.manager)}</ListItem>- <ListItem id={ROLES.teamMember}>{formatMessage(labels.member)}</ListItem>- <ListItem id={ROLES.teamViewOnly}>{formatMessage(labels.viewOnly)}</ListItem>+ <ListItem id={ROLES.teamManager}>{t(labels.manager)}</ListItem>+ <ListItem id={ROLES.teamMember}>{t(labels.member)}</ListItem>+ <ListItem id={ROLES.teamViewOnly}>{t(labels.viewOnly)}</ListItem></Select></FormField><FormButtons><Button isDisabled={isPending} onPress={onClose}>- {formatMessage(labels.cancel)}+ {t(labels.cancel)}</Button><FormSubmitButton variant="primary" isDisabled={false}>- {formatMessage(labels.save)}+ {t(labels.save)}</FormSubmitButton></FormButtons></Form>diff --git a/src/app/(main)/teams/[teamId]/TeamMemberRemoveButton.tsx b/src/app/(main)/teams/[teamId]/TeamMemberRemoveButton.tsxindex 4d3e8e91e..ff55a7aab 100644--- a/src/app/(main)/teams/[teamId]/TeamMemberRemoveButton.tsx+++ b/src/app/(main)/teams/[teamId]/TeamMemberRemoveButton.tsx@@ -2,7 +2,6 @@ import { ConfirmationForm } from '@/components/common/ConfirmationForm';import { useDeleteQuery, useMessages, useModified } from '@/components/hooks';import { Trash } from '@/components/icons';import { DialogButton } from '@/components/input/DialogButton';-import { messages } from '@/components/messages';export function TeamMemberRemoveButton({teamId,@@ -16,7 +15,7 @@ export function TeamMemberRemoveButton({disabled?: boolean;onSave?: () => void;}) {- const { formatMessage, labels, FormattedMessage } = useMessages();+ const { t, labels, messages } = useMessages();const { mutateAsync, isPending, error } = useDeleteQuery(`/teams/${teamId}/users/${userId}`);const { touch } = useModified();@@ -31,27 +30,18 @@ export function TeamMemberRemoveButton({};return (- <DialogButton- icon={<Trash />}- title={formatMessage(labels.confirm)}- variant="quiet"- width="400px"- >+ <DialogButton icon={<Trash />} title={t(labels.confirm)} variant="quiet" width="400px">{({ close }) => (<ConfirmationForm- message={- <FormattedMessage- {...messages.confirmRemove}- values={{- target: <b>{userName}</b>,- }}- />- }+ message={t.rich(messages.confirmRemove, {+ target: userName,+ b: chunks => <b>{chunks}</b>,+ })}isLoading={isPending}error={error}onConfirm={handleConfirm.bind(null, close)}onClose={close}- buttonLabel={formatMessage(labels.remove)}+ buttonLabel={t(labels.remove)}buttonVariant="danger"/>)}diff --git a/src/app/(main)/teams/[teamId]/TeamMembersTable.tsx b/src/app/(main)/teams/[teamId]/TeamMembersTable.tsxindex 8414908c1..6c77c89b1 100644--- a/src/app/(main)/teams/[teamId]/TeamMembersTable.tsx+++ b/src/app/(main)/teams/[teamId]/TeamMembersTable.tsx@@ -13,21 +13,21 @@ export function TeamMembersTable({teamId: string;allowEdit: boolean;}) {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const roles = {- [ROLES.teamOwner]: formatMessage(labels.teamOwner),- [ROLES.teamManager]: formatMessage(labels.teamManager),- [ROLES.teamMember]: formatMessage(labels.teamMember),- [ROLES.teamViewOnly]: formatMessage(labels.viewOnly),+ [ROLES.teamOwner]: t(labels.teamOwner),+ [ROLES.teamManager]: t(labels.teamManager),+ [ROLES.teamMember]: t(labels.teamMember),+ [ROLES.teamViewOnly]: t(labels.viewOnly),};return (<DataTable data={data}>- <DataColumn id="username" label={formatMessage(labels.username)}>+ <DataColumn id="username" label={t(labels.username)}>{(row: any) => row?.user?.username}</DataColumn>- <DataColumn id="role" label={formatMessage(labels.role)}>+ <DataColumn id="role" label={t(labels.role)}>{(row: any) => roles[row?.role]}</DataColumn>{allowEdit && (diff --git a/src/app/(main)/teams/[teamId]/TeamSettings.tsx b/src/app/(main)/teams/[teamId]/TeamSettings.tsxindex c0259f47d..e854c127e 100644--- a/src/app/(main)/teams/[teamId]/TeamSettings.tsx+++ b/src/app/(main)/teams/[teamId]/TeamSettings.tsx@@ -4,7 +4,6 @@ import { PageHeader } from '@/components/common/PageHeader';import { Panel } from '@/components/common/Panel';import { useLoginQuery, useMessages, useNavigation, useTeam } from '@/components/hooks';import { Users } from '@/components/icons';-import { labels } from '@/components/messages';import { ROLES } from '@/lib/constants';import { TeamsMemberAddButton } from '../TeamsMemberAddButton';import { TeamEditForm } from './TeamEditForm';@@ -15,7 +14,7 @@ export function TeamSettings({ teamId }: { teamId: string }) {const team: any = useTeam();const { user } = useLoginQuery();const { pathname } = useNavigation();- const { formatMessage } = useMessages();+ const { t, labels } = useMessages();const isAdmin = pathname.includes('/admin');@@ -41,7 +40,7 @@ export function TeamSettings({ teamId }: { teamId: string }) {</Panel><Panel><Row alignItems="center" justifyContent="space-between">- <Heading size="base">{formatMessage(labels.members)}</Heading>+ <Heading size="base">{t(labels.members)}</Heading>{isAdmin && <TeamsMemberAddButton teamId={teamId} />}</Row><TeamMembersDataTable teamId={teamId} allowEdit={canEdit} />diff --git a/src/app/(main)/teams/[teamId]/TeamWebsiteRemoveButton.tsx b/src/app/(main)/teams/[teamId]/TeamWebsiteRemoveButton.tsxindex f2b4ecea0..7ba5ba11a 100644--- a/src/app/(main)/teams/[teamId]/TeamWebsiteRemoveButton.tsx+++ b/src/app/(main)/teams/[teamId]/TeamWebsiteRemoveButton.tsx@@ -3,7 +3,7 @@ import { useDeleteQuery, useMessages } from '@/components/hooks';import { X } from '@/components/icons';export function TeamWebsiteRemoveButton({ teamId, websiteId, onSave }) {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const { mutateAsync } = useDeleteQuery(`/teams/${teamId}/websites/${websiteId}`);const handleRemoveTeamMember = async () => {@@ -19,7 +19,7 @@ export function TeamWebsiteRemoveButton({ teamId, websiteId, onSave }) {<Icon><X /></Icon>- <Text>{formatMessage(labels.remove)}</Text>+ <Text>{t(labels.remove)}</Text></LoadingButton>);}diff --git a/src/app/(main)/teams/[teamId]/TeamWebsitesTable.tsx b/src/app/(main)/teams/[teamId]/TeamWebsitesTable.tsxindex 10f565432..f4ed2df7e 100644--- a/src/app/(main)/teams/[teamId]/TeamWebsitesTable.tsx+++ b/src/app/(main)/teams/[teamId]/TeamWebsitesTable.tsx@@ -14,15 +14,15 @@ export function TeamWebsitesTable({data: any[];allowEdit: boolean;}) {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();return (<DataTable data={data}>- <DataColumn id="name" label={formatMessage(labels.name)}>+ <DataColumn id="name" label={t(labels.name)}>{(row: any) => <Link href={`/teams/${teamId}/websites/${row.id}`}>{row.name}</Link>}</DataColumn>- <DataColumn id="domain" label={formatMessage(labels.domain)} />- <DataColumn id="createdBy" label={formatMessage(labels.createdBy)}>+ <DataColumn id="domain" label={t(labels.domain)} />+ <DataColumn id="createdBy" label={t(labels.createdBy)}>{(row: any) => row?.createUser?.username}</DataColumn>{allowEdit && (diff --git a/src/app/(main)/websites/WebsiteAddButton.tsx b/src/app/(main)/websites/WebsiteAddButton.tsxindex 76710abbd..340c6fdc0 100644--- a/src/app/(main)/websites/WebsiteAddButton.tsx+++ b/src/app/(main)/websites/WebsiteAddButton.tsx@@ -5,23 +5,18 @@ import { DialogButton } from '@/components/input/DialogButton';import { WebsiteAddForm } from './WebsiteAddForm';export function WebsiteAddButton({ teamId, onSave }: { teamId: string; onSave?: () => void }) {- const { formatMessage, labels, messages } = useMessages();+ const { t, labels, messages } = useMessages();const { toast } = useToast();const { touch } = useModified();const handleSave = async () => {- toast(formatMessage(messages.saved));+ toast(t(messages.saved));touch('websites');onSave?.();};return (- <DialogButton- icon={<Plus />}- label={formatMessage(labels.addWebsite)}- variant="primary"- width="400px"- >+ <DialogButton icon={<Plus />} label={t(labels.addWebsite)} variant="primary" width="400px">{({ close }) => <WebsiteAddForm teamId={teamId} onSave={handleSave} onClose={close} />}</DialogButton>);diff --git a/src/app/(main)/websites/WebsiteAddForm.tsx b/src/app/(main)/websites/WebsiteAddForm.tsxindex df17ad5a6..7f28651fc 100644--- a/src/app/(main)/websites/WebsiteAddForm.tsx+++ b/src/app/(main)/websites/WebsiteAddForm.tsx@@ -11,7 +11,7 @@ export function WebsiteAddForm({onSave?: () => void;onClose?: () => void;}) {- const { formatMessage, labels, messages } = useMessages();+ const { t, labels, messages } = useMessages();const { mutateAsync, error, isPending } = useUpdateQuery('/websites', { teamId });const handleSubmit = async (data: any) => {@@ -26,21 +26,21 @@ export function WebsiteAddForm({return (<Form onSubmit={handleSubmit} error={error?.message}><FormField- label={formatMessage(labels.name)}+ label={t(labels.name)}data-test="input-name"name="name"- rules={{ required: formatMessage(labels.required) }}+ rules={{ required: t(labels.required) }}><TextField autoComplete="off" /></FormField><FormField- label={formatMessage(labels.domain)}+ label={t(labels.domain)}data-test="input-domain"name="domain"rules={{- required: formatMessage(labels.required),- pattern: { value: DOMAIN_REGEX, message: formatMessage(messages.invalidDomain) },+ required: t(labels.required),+ pattern: { value: DOMAIN_REGEX, message: t(messages.invalidDomain) },}}><TextField autoComplete="off" />@@ -48,11 +48,11 @@ export function WebsiteAddForm({<Row justifyContent="flex-end" paddingTop="3" gap="3">{onClose && (<Button isDisabled={isPending} onPress={onClose}>- {formatMessage(labels.cancel)}+ {t(labels.cancel)}</Button>)}<FormSubmitButton data-test="button-submit" isDisabled={false}>- {formatMessage(labels.save)}+ {t(labels.save)}</FormSubmitButton></Row></Form>diff --git a/src/app/(main)/websites/WebsitesHeader.tsx b/src/app/(main)/websites/WebsitesHeader.tsxindex 889b6025f..da9fd7e87 100644--- a/src/app/(main)/websites/WebsitesHeader.tsx+++ b/src/app/(main)/websites/WebsitesHeader.tsx@@ -7,11 +7,11 @@ export interface WebsitesHeaderProps {}export function WebsitesHeader({ allowCreate = true }: WebsitesHeaderProps) {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const { teamId } = useNavigation();return (- <PageHeader title={formatMessage(labels.websites)}>+ <PageHeader title={t(labels.websites)}>{allowCreate && <WebsiteAddButton teamId={teamId} />}</PageHeader>);diff --git a/src/app/(main)/websites/WebsitesPage.tsx b/src/app/(main)/websites/WebsitesPage.tsxindex 6f3548a97..4decd8f19 100644--- a/src/app/(main)/websites/WebsitesPage.tsx+++ b/src/app/(main)/websites/WebsitesPage.tsx@@ -11,7 +11,7 @@ import { WebsitesDataTable } from './WebsitesDataTable';export function WebsitesPage() {const { user } = useLoginQuery();const { teamId } = useNavigation();- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const { data } = useTeamMembersQuery(teamId);const showActions =@@ -23,7 +23,7 @@ export function WebsitesPage() {return (<PageBody><Column gap="6" margin="2">- <PageHeader title={formatMessage(labels.websites)}>+ <PageHeader title={t(labels.websites)}>{showActions && <WebsiteAddButton teamId={teamId} />}</PageHeader><Panel>diff --git a/src/app/(main)/websites/WebsitesTable.tsx b/src/app/(main)/websites/WebsitesTable.tsxindex 70648ed78..714e1c66c 100644--- a/src/app/(main)/websites/WebsitesTable.tsx+++ b/src/app/(main)/websites/WebsitesTable.tsx@@ -12,15 +12,15 @@ export interface WebsitesTableProps extends DataTableProps {}export function WebsitesTable({ showActions, renderLink, ...props }: WebsitesTableProps) {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const { renderUrl } = useNavigation();return (<DataTable {...props}>- <DataColumn id="name" label={formatMessage(labels.name)}>+ <DataColumn id="name" label={t(labels.name)}>{renderLink}</DataColumn>- <DataColumn id="domain" label={formatMessage(labels.domain)} />+ <DataColumn id="domain" label={t(labels.domain)} />{showActions && (<DataColumn id="action" label=" " align="end">{(row: any) => {diff --git a/src/app/(main)/websites/[websiteId]/(reports)/attribution/Attribution.tsx b/src/app/(main)/websites/[websiteId]/(reports)/attribution/Attribution.tsxindex 629c91391..e11308fb3 100644--- a/src/app/(main)/websites/[websiteId]/(reports)/attribution/Attribution.tsx+++ b/src/app/(main)/websites/[websiteId]/(reports)/attribution/Attribution.tsx@@ -37,7 +37,7 @@ export function Attribution({step,});- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const { pageviews, visitors, visits } = data?.total || {};@@ -45,17 +45,17 @@ export function Attribution({? [{value: visitors,- label: formatMessage(labels.visitors),+ label: t(labels.visitors),formatValue: formatLongNumber,},{value: visits,- label: formatMessage(labels.visits),+ label: t(labels.visits),formatValue: formatLongNumber,},{value: pageviews,- label: formatMessage(labels.views),+ label: t(labels.views),formatValue: formatLongNumber,},]@@ -72,7 +72,7 @@ export function Attribution({return (<ListTabletitle={title}- metric={formatMessage(currency ? labels.revenue : labels.visitors)}+ metric={t(currency ? labels.revenue : labels.visitors)}currency={currency}data={attributionData.map(({ x, y, z }: { x: string; y: number; z: number }) => ({label: x,@@ -94,31 +94,31 @@ export function Attribution({);})}</MetricsBar>- <SectionHeader title={formatMessage(labels.sources)} />+ <SectionHeader title={t(labels.sources)} /><Grid columns={{ base: '1fr', md: '1fr 1fr' }} gap><Panel>- <AttributionTable data={data?.referrer} title={formatMessage(labels.referrer)} />+ <AttributionTable data={data?.referrer} title={t(labels.referrer)} /></Panel><Panel>- <AttributionTable data={data?.paidAds} title={formatMessage(labels.paidAds)} />+ <AttributionTable data={data?.paidAds} title={t(labels.paidAds)} /></Panel></Grid><SectionHeader title="UTM" /><Grid columns={{ base: '1fr', md: '1fr 1fr' }} gap><Panel>- <AttributionTable data={data?.utm_source} title={formatMessage(labels.sources)} />+ <AttributionTable data={data?.utm_source} title={t(labels.sources)} /></Panel><Panel>- <AttributionTable data={data?.utm_medium} title={formatMessage(labels.medium)} />+ <AttributionTable data={data?.utm_medium} title={t(labels.medium)} /></Panel><Panel>- <AttributionTable data={data?.utm_cmapaign} title={formatMessage(labels.campaigns)} />+ <AttributionTable data={data?.utm_cmapaign} title={t(labels.campaigns)} /></Panel><Panel>- <AttributionTable data={data?.utm_content} title={formatMessage(labels.content)} />+ <AttributionTable data={data?.utm_content} title={t(labels.content)} /></Panel><Panel>- <AttributionTable data={data?.utm_term} title={formatMessage(labels.terms)} />+ <AttributionTable data={data?.utm_term} title={t(labels.terms)} /></Panel></Grid></Column>diff --git a/src/app/(main)/websites/[websiteId]/(reports)/attribution/AttributionPage.tsx b/src/app/(main)/websites/[websiteId]/(reports)/attribution/AttributionPage.tsxindex 485277f20..f0786332a 100644--- a/src/app/(main)/websites/[websiteId]/(reports)/attribution/AttributionPage.tsx+++ b/src/app/(main)/websites/[websiteId]/(reports)/attribution/AttributionPage.tsx@@ -9,7 +9,7 @@ export function AttributionPage({ websiteId }: { websiteId: string }) {const [model, setModel] = useState('first-click');const [type, setType] = useState('path');const [step, setStep] = useState('/');- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const {dateRange: { startDate, endDate },} = useDateRange();@@ -19,30 +19,20 @@ export function AttributionPage({ websiteId }: { websiteId: string }) {<WebsiteControls websiteId={websiteId} /><Grid columns={{ base: '1fr', md: '1fr 1fr 1fr' }} gap><Column>- <Select- label={formatMessage(labels.model)}- value={model}- defaultValue={model}- onChange={setModel}- >- <ListItem id="first-click">{formatMessage(labels.firstClick)}</ListItem>- <ListItem id="last-click">{formatMessage(labels.lastClick)}</ListItem>+ <Select label={t(labels.model)} value={model} defaultValue={model} onChange={setModel}>+ <ListItem id="first-click">{t(labels.firstClick)}</ListItem>+ <ListItem id="last-click">{t(labels.lastClick)}</ListItem></Select></Column><Column>- <Select- label={formatMessage(labels.type)}- value={type}- defaultValue={type}- onChange={setType}- >- <ListItem id="path">{formatMessage(labels.viewedPage)}</ListItem>- <ListItem id="event">{formatMessage(labels.triggeredEvent)}</ListItem>+ <Select label={t(labels.type)} value={type} defaultValue={type} onChange={setType}>+ <ListItem id="path">{t(labels.viewedPage)}</ListItem>+ <ListItem id="event">{t(labels.triggeredEvent)}</ListItem></Select></Column><Column><SearchField- label={formatMessage(labels.conversionStep)}+ label={t(labels.conversionStep)}value={step}defaultValue={step}onSearch={setStep}diff --git a/src/app/(main)/websites/[websiteId]/(reports)/breakdown/Breakdown.tsx b/src/app/(main)/websites/[websiteId]/(reports)/breakdown/Breakdown.tsxindex 4532d9728..0092a506e 100644--- a/src/app/(main)/websites/[websiteId]/(reports)/breakdown/Breakdown.tsx+++ b/src/app/(main)/websites/[websiteId]/(reports)/breakdown/Breakdown.tsx@@ -11,7 +11,7 @@ export interface BreakdownProps {}export function Breakdown({ websiteId, selectedFields = [], startDate, endDate }: BreakdownProps) {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const { formatValue } = useFormat();const { fields } = useFields();const { data, error, isLoading } = useResultQuery<any>(@@ -48,37 +48,22 @@ export function Breakdown({ websiteId, selectedFields = [], startDate, endDate }</DataColumn>);})}- <DataColumn- id="visitors"- label={formatMessage(labels.visitors)}- align="end"- width="120px"- >+ <DataColumn id="visitors" label={t(labels.visitors)} align="end" width="120px">{row => row?.visitors?.toLocaleString()}</DataColumn>- <DataColumn id="visits" label={formatMessage(labels.visits)} align="end" width="120px">+ <DataColumn id="visits" label={t(labels.visits)} align="end" width="120px">{row => row?.visits?.toLocaleString()}</DataColumn>- <DataColumn id="views" label={formatMessage(labels.views)} align="end" width="120px">+ <DataColumn id="views" label={t(labels.views)} align="end" width="120px">{row => row?.views?.toLocaleString()}</DataColumn>- <DataColumn- id="bounceRate"- label={formatMessage(labels.bounceRate)}- align="end"- width="120px"- >+ <DataColumn id="bounceRate" label={t(labels.bounceRate)} align="end" width="120px">{row => {const n = (Math.min(row?.visits, row?.bounces) / row?.visits) * 100;return `${Math.round(+n)}%`;}}</DataColumn>- <DataColumn- id="visitDuration"- label={formatMessage(labels.visitDuration)}- align="end"- width="120px"- >+ <DataColumn id="visitDuration" label={t(labels.visitDuration)} align="end" width="120px">{row => {const n = row?.totaltime / row?.visits;return `${+n < 0 ? '-' : ''}${formatShortTime(Math.abs(~~n), ['m', 's'], ' ')}`;diff --git a/src/app/(main)/websites/[websiteId]/(reports)/breakdown/BreakdownPage.tsx b/src/app/(main)/websites/[websiteId]/(reports)/breakdown/BreakdownPage.tsxindex fdead9fbf..17e4a2829 100644--- a/src/app/(main)/websites/[websiteId]/(reports)/breakdown/BreakdownPage.tsx+++ b/src/app/(main)/websites/[websiteId]/(reports)/breakdown/BreakdownPage.tsx@@ -33,12 +33,12 @@ export function BreakdownPage({ websiteId }: { websiteId: string }) {}const FieldsButton = ({ value, onChange }) => {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();return (<DialogButtonicon={<ListCheck />}- label={formatMessage(labels.fields)}+ label={t(labels.fields)}width="400px"minHeight="300px"variant="outline"diff --git a/src/app/(main)/websites/[websiteId]/(reports)/breakdown/FieldSelectForm.tsx b/src/app/(main)/websites/[websiteId]/(reports)/breakdown/FieldSelectForm.tsxindex fbad47491..b7537c7fa 100644--- a/src/app/(main)/websites/[websiteId]/(reports)/breakdown/FieldSelectForm.tsx+++ b/src/app/(main)/websites/[websiteId]/(reports)/breakdown/FieldSelectForm.tsx@@ -12,7 +12,7 @@ export function FieldSelectForm({onClose?: () => void;}) {const [selected, setSelected] = useState(selectedFields);- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const { fields, groupLabels } = useFields();const handleChange = (value: string[]) => {@@ -57,9 +57,9 @@ export function FieldSelectForm({</List></Column><Grid columns="1fr 1fr" gap>- <Button onPress={onClose}>{formatMessage(labels.cancel)}</Button>+ <Button onPress={onClose}>{t(labels.cancel)}</Button><Button onPress={handleApply} variant="primary">- {formatMessage(labels.apply)}+ {t(labels.apply)}</Button></Grid></Column>diff --git a/src/app/(main)/websites/[websiteId]/(reports)/funnels/Funnel.tsx b/src/app/(main)/websites/[websiteId]/(reports)/funnels/Funnel.tsxindex 7821b07c1..dc11544d9 100644--- a/src/app/(main)/websites/[websiteId]/(reports)/funnels/Funnel.tsx+++ b/src/app/(main)/websites/[websiteId]/(reports)/funnels/Funnel.tsx@@ -19,7 +19,7 @@ type FunnelResult = {};export function Funnel({ id, name, type, parameters, websiteId }) {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const { pathname } = useNavigation();const isSharePage = pathname.includes('/share/');const { data, error, isLoading } = useResultQuery(type, {@@ -43,10 +43,7 @@ export function Funnel({ id, name, type, parameters, websiteId }) {<ReportEditButton id={id} name={name} type={type}>{({ close }) => {return (- <Dialog- title={formatMessage(labels.funnel)}- style={{ minHeight: 300, minWidth: 400 }}- >+ <Dialog title={t(labels.funnel)} style={{ minHeight: 300, minWidth: 400 }}><FunnelEditForm id={id} websiteId={websiteId} onClose={close} /></Dialog>);@@ -90,9 +87,9 @@ export function Funnel({ id, name, type, parameters, websiteId }) {<Column gap><Row alignItems="center" justifyContent="space-between" gap><Text color="muted">- {formatMessage(isPage ? labels.viewedPage : labels.triggeredEvent)}+ {t(isPage ? labels.viewedPage : labels.triggeredEvent)}</Text>- <Text color="muted">{formatMessage(labels.conversionRate)}</Text>+ <Text color="muted">{t(labels.conversionRate)}</Text></Row><Row alignItems="center" justifyContent="space-between" gap><Row alignItems="center" gap>@@ -109,7 +106,7 @@ export function Funnel({ id, name, type, parameters, websiteId }) {<User /></Icon><Text title={visitors.toString()} transform="lowercase">- {`${formatLongNumber(visitors)} ${formatMessage(labels.visitors)}`}+ {`${formatLongNumber(visitors)} ${t(labels.visitors)}`}</Text></Row></Row>diff --git a/src/app/(main)/websites/[websiteId]/(reports)/funnels/FunnelAddButton.tsx b/src/app/(main)/websites/[websiteId]/(reports)/funnels/FunnelAddButton.tsxindex 29b548032..699ff83bf 100644--- a/src/app/(main)/websites/[websiteId]/(reports)/funnels/FunnelAddButton.tsx+++ b/src/app/(main)/websites/[websiteId]/(reports)/funnels/FunnelAddButton.tsx@@ -4,7 +4,7 @@ import { Plus } from '@/components/icons';import { FunnelEditForm } from './FunnelEditForm';export function FunnelAddButton({ websiteId }: { websiteId: string }) {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();return (<DialogTrigger>@@ -12,14 +12,10 @@ export function FunnelAddButton({ websiteId }: { websiteId: string }) {<Icon><Plus /></Icon>- <Text>{formatMessage(labels.funnel)}</Text>+ <Text>{t(labels.funnel)}</Text></Button><Modal>- <Dialog- variant="modal"- title={formatMessage(labels.funnel)}- style={{ minHeight: 375, minWidth: 600 }}- >+ <Dialog variant="modal" title={t(labels.funnel)} style={{ minHeight: 375, minWidth: 600 }}>{({ close }) => <FunnelEditForm websiteId={websiteId} onClose={close} />}</Dialog></Modal>diff --git a/src/app/(main)/websites/[websiteId]/(reports)/funnels/FunnelEditForm.tsx b/src/app/(main)/websites/[websiteId]/(reports)/funnels/FunnelEditForm.tsxindex 5d950ea66..a00c916de 100644--- a/src/app/(main)/websites/[websiteId]/(reports)/funnels/FunnelEditForm.tsx+++ b/src/app/(main)/websites/[websiteId]/(reports)/funnels/FunnelEditForm.tsx@@ -31,7 +31,7 @@ export function FunnelEditForm({onSave?: () => void;onClose?: () => void;}) {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const { data } = useReportQuery(id);const { mutateAsync, error, isPending, touch } = useUpdateQuery(`/reports${id ? `/${id}` : ''}`);@@ -61,23 +61,15 @@ export function FunnelEditForm({return (<Form onSubmit={handleSubmit} error={error?.message} defaultValues={defaultValues}>- <FormField- name="name"- label={formatMessage(labels.name)}- rules={{ required: formatMessage(labels.required) }}- >+ <FormField name="name" label={t(labels.name)} rules={{ required: t(labels.required) }}><TextField autoFocus /></FormField>- <FormField- name="window"- label={formatMessage(labels.window)}- rules={{ required: formatMessage(labels.required) }}- >+ <FormField name="window" label={t(labels.window)} rules={{ required: t(labels.required) }}><TextField /></FormField><FormFieldArrayname="steps"- label={formatMessage(labels.steps)}+ label={t(labels.steps)}rules={{validate: value => value.length > 1 || 'At least two steps are required',}}@@ -91,7 +83,7 @@ export function FunnelEditForm({<Column><FormFieldname={`steps.${index}.type`}- rules={{ required: formatMessage(labels.required) }}+ rules={{ required: t(labels.required) }}><ActionSelect /></FormField>@@ -99,7 +91,7 @@ export function FunnelEditForm({<Column><FormFieldname={`steps.${index}.value`}- rules={{ required: formatMessage(labels.required) }}+ rules={{ required: t(labels.required) }}>{({ field, context }) => {const type = context.watch(`steps.${index}.type`);@@ -123,7 +115,7 @@ export function FunnelEditForm({<Icon><Plus /></Icon>- <Text>{formatMessage(labels.add)}</Text>+ <Text>{t(labels.add)}</Text></Button></Row></Grid>@@ -132,9 +124,9 @@ export function FunnelEditForm({</FormFieldArray><FormButtons><Button onPress={onClose} isDisabled={isPending}>- {formatMessage(labels.cancel)}+ {t(labels.cancel)}</Button>- <FormSubmitButton>{formatMessage(labels.save)}</FormSubmitButton>+ <FormSubmitButton>{t(labels.save)}</FormSubmitButton></FormButtons></Form>);diff --git a/src/app/(main)/websites/[websiteId]/(reports)/goals/Goal.tsx b/src/app/(main)/websites/[websiteId]/(reports)/goals/Goal.tsxindex 40abea27c..d7553eea5 100644--- a/src/app/(main)/websites/[websiteId]/(reports)/goals/Goal.tsx+++ b/src/app/(main)/websites/[websiteId]/(reports)/goals/Goal.tsx@@ -24,7 +24,7 @@ export interface GoalProps {export type GoalData = { num: number; total: number };export function Goal({ id, name, type, parameters, websiteId, startDate, endDate }: GoalProps) {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const { pathname } = useNavigation();const isSharePage = pathname.includes('/share/');const { data, error, isLoading, isFetching } = useResultQuery<GoalData>(type, {@@ -53,7 +53,7 @@ export function Goal({ id, name, type, parameters, websiteId, startDate, endDate{({ close }) => {return (<Dialog- title={formatMessage(labels.goal)}+ title={t(labels.goal)}variant="modal"style={{ minHeight: 300, minWidth: 400 }}>@@ -66,10 +66,8 @@ export function Goal({ id, name, type, parameters, websiteId, startDate, endDate)}</Grid><Row alignItems="center" justifyContent="space-between" gap>- <Text color="muted">- {formatMessage(isPage ? labels.viewedPage : labels.triggeredEvent)}- </Text>- <Text color="muted">{formatMessage(labels.conversionRate)}</Text>+ <Text color="muted">{t(isPage ? labels.viewedPage : labels.triggeredEvent)}</Text>+ <Text color="muted">{t(labels.conversionRate)}</Text></Row><Row alignItems="center" justifyContent="space-between" gap><Row alignItems="center" gap>diff --git a/src/app/(main)/websites/[websiteId]/(reports)/goals/GoalAddButton.tsx b/src/app/(main)/websites/[websiteId]/(reports)/goals/GoalAddButton.tsxindex c85b79c54..bf42b6560 100644--- a/src/app/(main)/websites/[websiteId]/(reports)/goals/GoalAddButton.tsx+++ b/src/app/(main)/websites/[websiteId]/(reports)/goals/GoalAddButton.tsx@@ -4,7 +4,7 @@ import { Plus } from '@/components/icons';import { GoalEditForm } from './GoalEditForm';export function GoalAddButton({ websiteId }: { websiteId: string }) {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();return (<DialogTrigger>@@ -12,12 +12,12 @@ export function GoalAddButton({ websiteId }: { websiteId: string }) {<Icon><Plus /></Icon>- <Text>{formatMessage(labels.goal)}</Text>+ <Text>{t(labels.goal)}</Text></Button><Modal><Dialogaria-label="add goal"- title={formatMessage(labels.goal)}+ title={t(labels.goal)}style={{ minWidth: 400, minHeight: 300 }}>{({ close }) => <GoalEditForm websiteId={websiteId} onClose={close} />}diff --git a/src/app/(main)/websites/[websiteId]/(reports)/goals/GoalEditForm.tsx b/src/app/(main)/websites/[websiteId]/(reports)/goals/GoalEditForm.tsxindex 7f68047c3..159e43828 100644--- a/src/app/(main)/websites/[websiteId]/(reports)/goals/GoalEditForm.tsx+++ b/src/app/(main)/websites/[websiteId]/(reports)/goals/GoalEditForm.tsx@@ -25,7 +25,7 @@ export function GoalEditForm({onSave?: () => void;onClose?: () => void;}) {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const { data } = useReportQuery(id);const { mutateAsync, error, isPending, touch } = useUpdateQuery(`/reports${id ? `/${id}` : ''}`);@@ -59,29 +59,19 @@ export function GoalEditForm({return (<>- <FormField- name="name"- label={formatMessage(labels.name)}- rules={{ required: formatMessage(labels.required) }}- >+ <FormField name="name" label={t(labels.name)} rules={{ required: t(labels.required) }}><TextField autoFocus /></FormField><Column>- <Label>{formatMessage(labels.action)}</Label>+ <Label>{t(labels.action)}</Label><Grid columns="260px 1fr" gap><Column>- <FormField- name="parameters.type"- rules={{ required: formatMessage(labels.required) }}- >+ <FormField name="parameters.type" rules={{ required: t(labels.required) }}><ActionSelect /></FormField></Column><Column>- <FormField- name="parameters.value"- rules={{ required: formatMessage(labels.required) }}- >+ <FormField name="parameters.value" rules={{ required: t(labels.required) }}>{({ field }) => {return <LookupField websiteId={websiteId} type={type} {...field} />;}}@@ -92,9 +82,9 @@ export function GoalEditForm({<FormButtons><Button onPress={onClose} isDisabled={isPending}>- {formatMessage(labels.cancel)}+ {t(labels.cancel)}</Button>- <FormSubmitButton>{formatMessage(labels.save)}</FormSubmitButton>+ <FormSubmitButton>{t(labels.save)}</FormSubmitButton></FormButtons></>);diff --git a/src/app/(main)/websites/[websiteId]/(reports)/journeys/Journey.tsx b/src/app/(main)/websites/[websiteId]/(reports)/journeys/Journey.tsxindex 2afa08f3b..8b3c47499 100644--- a/src/app/(main)/websites/[websiteId]/(reports)/journeys/Journey.tsx+++ b/src/app/(main)/websites/[websiteId]/(reports)/journeys/Journey.tsx@@ -32,7 +32,7 @@ const EVENT_TYPES = {export function Journey({ websiteId, steps, startStep, endStep, view }: JourneyProps) {const [selectedNode, setSelectedNode] = useState(null);const [activeNode, setActiveNode] = useState(null);- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const { data, error, isLoading } = useResultQuery<any>('journey', {websiteId,steps,@@ -178,7 +178,7 @@ export function Journey({ websiteId, steps, startStep, endStep, view }: JourneyP<div className={styles.num}>{columnIndex + 1}</div><div className={styles.stats}><div className={styles.visitors} title={visitorCount}>- {formatLongNumber(visitorCount)} {formatMessage(labels.visitors)}+ {formatLongNumber(visitorCount)} {t(labels.visitors)}</div></div></div>@@ -237,11 +237,11 @@ export function Journey({ websiteId, steps, startStep, endStep, view }: JourneyP</Focusable><Tooltip placement="top" offset={20} showArrow><Text transform="lowercase" color="red">- {`${dropped}% ${formatMessage(labels.dropoff)}`}+ {`${dropped}% ${t(labels.dropoff)}`}</Text><Column><Text transform="lowercase">- {`${remaining}% ${formatMessage(labels.conversion)}`}+ {`${remaining}% ${t(labels.conversion)}`}</Text></Column></Tooltip>diff --git a/src/app/(main)/websites/[websiteId]/(reports)/journeys/JourneysPage.tsx b/src/app/(main)/websites/[websiteId]/(reports)/journeys/JourneysPage.tsxindex c8276edca..f7cc4a88d 100644--- a/src/app/(main)/websites/[websiteId]/(reports)/journeys/JourneysPage.tsx+++ b/src/app/(main)/websites/[websiteId]/(reports)/journeys/JourneysPage.tsx@@ -11,7 +11,7 @@ const JOURNEY_STEPS = [2, 3, 4, 5, 6, 7];const DEFAULT_STEP = 3;export function JourneysPage({ websiteId }: { websiteId: string }) {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const {dateRange: { startDate, endDate },} = useDateRange();@@ -23,15 +23,15 @@ export function JourneysPage({ websiteId }: { websiteId: string }) {const buttons = [{id: 'all',- label: formatMessage(labels.all),+ label: t(labels.all),},{id: 'views',- label: formatMessage(labels.views),+ label: t(labels.views),},{id: 'events',- label: formatMessage(labels.events),+ label: t(labels.events),},];@@ -39,12 +39,7 @@ export function JourneysPage({ websiteId }: { websiteId: string }) {<Column gap><WebsiteControls websiteId={websiteId} /><Grid columns="repeat(3, 1fr)" gap>- <Select- label={formatMessage(labels.steps)}- value={steps}- defaultValue={steps}- onChange={setSteps}- >+ <Select label={t(labels.steps)} value={steps} defaultValue={steps} onChange={setSteps}>{JOURNEY_STEPS.map(step => (<ListItem key={step} id={step}>{step}@@ -53,7 +48,7 @@ export function JourneysPage({ websiteId }: { websiteId: string }) {</Select><Column><SearchField- label={formatMessage(labels.startStep)}+ label={t(labels.startStep)}value={startStep}onSearch={setStartStep}delay={1000}@@ -61,7 +56,7 @@ export function JourneysPage({ websiteId }: { websiteId: string }) {</Column><Column><SearchField- label={formatMessage(labels.endStep)}+ label={t(labels.endStep)}value={endStep}onSearch={setEndStep}delay={1000}diff --git a/src/app/(main)/websites/[websiteId]/(reports)/retention/Retention.tsx b/src/app/(main)/websites/[websiteId]/(reports)/retention/Retention.tsxindex a1e2813cd..4b9053d51 100644--- a/src/app/(main)/websites/[websiteId]/(reports)/retention/Retention.tsx+++ b/src/app/(main)/websites/[websiteId]/(reports)/retention/Retention.tsx@@ -17,7 +17,7 @@ export interface RetentionProps {}export function Retention({ websiteId, days = DAYS, startDate, endDate }: RetentionProps) {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const { locale } = useLocale();const { data, error, isLoading } = useResultQuery('retention', {websiteId,@@ -72,13 +72,13 @@ export function Retention({ websiteId, days = DAYS, startDate, endDate }: Retent><Column><Text weight="bold" align="center">- {formatMessage(labels.cohort)}+ {t(labels.cohort)}</Text></Column>{days.map(n => (<Column key={n}><Text weight="bold" align="center" wrap="nowrap">- {formatMessage(labels.day)} {n}+ {t(labels.day)} {n}</Text></Column>))}diff --git a/src/app/(main)/websites/[websiteId]/(reports)/revenue/Revenue.tsx b/src/app/(main)/websites/[websiteId]/(reports)/revenue/Revenue.tsxindex faee8b9a4..3a7b2058b 100644--- a/src/app/(main)/websites/[websiteId]/(reports)/revenue/Revenue.tsx+++ b/src/app/(main)/websites/[websiteId]/(reports)/revenue/Revenue.tsx@@ -34,7 +34,7 @@ export function Revenue({ websiteId, startDate, endDate, unit }: RevenueProps) {setItem(CURRENCY_CONFIG, value);};- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const { locale, dateLocale } = useLocale();const { countryNames } = useCountryNames(locale);const { data, error, isLoading } = useResultQuery<any>('revenue', {@@ -48,7 +48,7 @@ export function Revenue({ websiteId, startDate, endDate, unit }: RevenueProps) {({ label: code }) => (<Row className={classNames(locale)} gap><TypeIcon type="country" value={code} />- <Text>{countryNames[code] || formatMessage(labels.unknown)}</Text>+ <Text>{countryNames[code] || t(labels.unknown)}</Text></Row>),[countryNames, locale],@@ -90,22 +90,22 @@ export function Revenue({ websiteId, startDate, endDate, unit }: RevenueProps) {return [{value: sum,- label: formatMessage(labels.total),+ label: t(labels.total),formatValue: n => formatLongCurrency(n, currency),},{value: count ? sum / count : 0,- label: formatMessage(labels.average),+ label: t(labels.average),formatValue: n => formatLongCurrency(n, currency),},{value: count,- label: formatMessage(labels.transactions),+ label: t(labels.transactions),formatValue: formatLongNumber,},{value: unique_count,- label: formatMessage(labels.uniqueCustomers),+ label: t(labels.uniqueCustomers),formatValue: formatLongNumber,},] as any;@@ -142,8 +142,8 @@ export function Revenue({ websiteId, startDate, endDate, unit }: RevenueProps) {</Panel><Panel><ListTable- title={formatMessage(labels.country)}- metric={formatMessage(labels.revenue)}+ title={t(labels.country)}+ metric={t(labels.revenue)}data={data?.country.map(({ name, value }: { name: string; value: number }) => ({label: name,count: Number(value),diff --git a/src/app/(main)/websites/[websiteId]/(reports)/revenue/RevenueTable.tsx b/src/app/(main)/websites/[websiteId]/(reports)/revenue/RevenueTable.tsxindex e30d54c76..f8164147f 100644--- a/src/app/(main)/websites/[websiteId]/(reports)/revenue/RevenueTable.tsx+++ b/src/app/(main)/websites/[websiteId]/(reports)/revenue/RevenueTable.tsx@@ -3,19 +3,19 @@ import { useMessages } from '@/components/hooks';import { formatLongCurrency } from '@/lib/format';export function RevenueTable({ data = [] }) {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();return (<DataTable data={data}>- <DataColumn id="currency" label={formatMessage(labels.currency)} align="end" />- <DataColumn id="total" label={formatMessage(labels.total)} align="end">+ <DataColumn id="currency" label={t(labels.currency)} align="end" />+ <DataColumn id="total" label={t(labels.total)} align="end">{(row: any) => formatLongCurrency(row.sum, row.currency)}</DataColumn>- <DataColumn id="average" label={formatMessage(labels.average)} align="end">+ <DataColumn id="average" label={t(labels.average)} align="end">{(row: any) => formatLongCurrency(row.count ? row.sum / row.count : 0, row.currency)}</DataColumn>- <DataColumn id="count" label={formatMessage(labels.transactions)} align="end" />- <DataColumn id="unique_count" label={formatMessage(labels.uniqueCustomers)} align="end" />+ <DataColumn id="count" label={t(labels.transactions)} align="end" />+ <DataColumn id="unique_count" label={t(labels.uniqueCustomers)} align="end" /></DataTable>);}diff --git a/src/app/(main)/websites/[websiteId]/(reports)/utm/UTM.tsx b/src/app/(main)/websites/[websiteId]/(reports)/utm/UTM.tsxindex d6265802b..846546106 100644--- a/src/app/(main)/websites/[websiteId]/(reports)/utm/UTM.tsx+++ b/src/app/(main)/websites/[websiteId]/(reports)/utm/UTM.tsx@@ -13,7 +13,7 @@ export interface UTMProps {}export function UTM({ websiteId, startDate, endDate }: UTMProps) {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const { data, error, isLoading } = useResultQuery<any>('utm', {websiteId,startDate,@@ -49,7 +49,7 @@ export function UTM({ websiteId, startDate, endDate }: UTMProps) {<Text transform="capitalize">{param.replace(/^utm_/, '')}</Text></Heading><ListTable- metric={formatMessage(labels.views)}+ metric={t(labels.views)}data={items.map(({ utm, views }) => ({label: utm,count: views,diff --git a/src/app/(main)/websites/[websiteId]/WebsiteExpandedMenu.tsx b/src/app/(main)/websites/[websiteId]/WebsiteExpandedMenu.tsxindex b504bd360..c49eaa02f 100644--- a/src/app/(main)/websites/[websiteId]/WebsiteExpandedMenu.tsx+++ b/src/app/(main)/websites/[websiteId]/WebsiteExpandedMenu.tsx@@ -35,7 +35,7 @@ export function WebsiteExpandedMenu({excludedIds?: string[];onItemClick?: () => void;}) {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const {updateParams,query: { view },@@ -49,176 +49,176 @@ export function WebsiteExpandedMenu({items: [{id: 'path',- label: formatMessage(labels.path),+ label: t(labels.path),path: updateParams({ view: 'path' }),icon: <SquareSlash />,},{id: 'entry',- label: formatMessage(labels.entry),+ label: t(labels.entry),path: updateParams({ view: 'entry' }),icon: <LogIn />,},{id: 'exit',- label: formatMessage(labels.exit),+ label: t(labels.exit),path: updateParams({ view: 'exit' }),icon: <LogOut />,},{id: 'title',- label: formatMessage(labels.title),+ label: t(labels.title),path: updateParams({ view: 'title' }),icon: <Type />,},{id: 'query',- label: formatMessage(labels.query),+ label: t(labels.query),path: updateParams({ view: 'query' }),icon: <Search />,},].filter(filterExcluded),},{- label: formatMessage(labels.sources),+ label: t(labels.sources),items: [{id: 'referrer',- label: formatMessage(labels.referrer),+ label: t(labels.referrer),path: updateParams({ view: 'referrer' }),icon: <Share2 />,},{id: 'channel',- label: formatMessage(labels.channel),+ label: t(labels.channel),path: updateParams({ view: 'channel' }),icon: <Megaphone />,},{id: 'domain',- label: formatMessage(labels.domain),+ label: t(labels.domain),path: updateParams({ view: 'domain' }),icon: <Globe />,},].filter(filterExcluded),},{- label: formatMessage(labels.location),+ label: t(labels.location),items: [{id: 'country',- label: formatMessage(labels.country),+ label: t(labels.country),path: updateParams({ view: 'country' }),icon: <Earth />,},{id: 'region',- label: formatMessage(labels.region),+ label: t(labels.region),path: updateParams({ view: 'region' }),icon: <MapPin />,},{id: 'city',- label: formatMessage(labels.city),+ label: t(labels.city),path: updateParams({ view: 'city' }),icon: <Landmark />,},].filter(filterExcluded),},{- label: formatMessage(labels.environment),+ label: t(labels.environment),items: [{id: 'browser',- label: formatMessage(labels.browser),+ label: t(labels.browser),path: updateParams({ view: 'browser' }),icon: <AppWindow />,},{id: 'os',- label: formatMessage(labels.os),+ label: t(labels.os),path: updateParams({ view: 'os' }),icon: <Cpu />,},{id: 'device',- label: formatMessage(labels.device),+ label: t(labels.device),path: updateParams({ view: 'device' }),icon: <Laptop />,},{id: 'language',- label: formatMessage(labels.language),+ label: t(labels.language),path: updateParams({ view: 'language' }),icon: <Languages />,},{id: 'screen',- label: formatMessage(labels.screen),+ label: t(labels.screen),path: updateParams({ view: 'screen' }),icon: <Monitor />,},].filter(filterExcluded),},{- label: formatMessage(labels.utm),+ label: t(labels.utm),items: [{id: 'utmSource',- label: formatMessage(labels.source),+ label: t(labels.source),path: updateParams({ view: 'utmSource' }),icon: <Link2 />,},{id: 'utmMedium',- label: formatMessage(labels.medium),+ label: t(labels.medium),path: updateParams({ view: 'utmMedium' }),icon: <Send />,},{id: 'utmCampaign',- label: formatMessage(labels.campaign),+ label: t(labels.campaign),path: updateParams({ view: 'utmCampaign' }),icon: <Target />,},{id: 'utmContent',- label: formatMessage(labels.content),+ label: t(labels.content),path: updateParams({ view: 'utmContent' }),icon: <Layers />,},{id: 'utmTerm',- label: formatMessage(labels.term),+ label: t(labels.term),path: updateParams({ view: 'utmTerm' }),icon: <KeyRound />,},].filter(filterExcluded),},{- label: formatMessage(labels.other),+ label: t(labels.other),items: [{id: 'event',- label: formatMessage(labels.event),+ label: t(labels.event),path: updateParams({ view: 'event' }),icon: <Lightning />,},{id: 'hostname',- label: formatMessage(labels.hostname),+ label: t(labels.hostname),path: updateParams({ view: 'hostname' }),icon: <Network />,},{id: 'distinctId',- label: formatMessage(labels.distinctId),+ label: t(labels.distinctId),path: updateParams({ view: 'distinctId' }),icon: <Fingerprint />,},{id: 'tag',- label: formatMessage(labels.tag),+ label: t(labels.tag),path: updateParams({ view: 'tag' }),icon: <Tag />,},diff --git a/src/app/(main)/websites/[websiteId]/WebsiteExpandedView.tsx b/src/app/(main)/websites/[websiteId]/WebsiteExpandedView.tsxindex 3641e75d8..71fbdc703 100644--- a/src/app/(main)/websites/[websiteId]/WebsiteExpandedView.tsx+++ b/src/app/(main)/websites/[websiteId]/WebsiteExpandedView.tsx@@ -13,7 +13,7 @@ export function WebsiteExpandedView({excludedIds?: string[];onClose?: () => void;}) {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const {query: { view },} = useNavigation();@@ -45,7 +45,7 @@ export function WebsiteExpandedView({</Column><Column id="metrics-expanded-table" overflow="hidden"><MetricsExpandedTable- title={formatMessage(labels[view])}+ title={t(labels[view])}type={view}websiteId={websiteId}onClose={onClose}diff --git a/src/app/(main)/websites/[websiteId]/WebsiteHeader.tsx b/src/app/(main)/websites/[websiteId]/WebsiteHeader.tsxindex 23bcdb5d0..1739cb4c1 100644--- a/src/app/(main)/websites/[websiteId]/WebsiteHeader.tsx+++ b/src/app/(main)/websites/[websiteId]/WebsiteHeader.tsx@@ -18,7 +18,7 @@ export function WebsiteHeader({const { renderUrl, pathname } = useNavigation();const isSettings = pathname.endsWith('/settings');- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();if (isSettings) {return null;@@ -35,7 +35,7 @@ export function WebsiteHeader({{showActions && (<LinkButton href={renderUrl(`/websites/${website.id}/settings`, false)}>- <IconLabel icon={<Edit />}>{formatMessage(labels.edit)}</IconLabel>+ <IconLabel icon={<Edit />}>{t(labels.edit)}</IconLabel></LinkButton>)}</Row>diff --git a/src/app/(main)/websites/[websiteId]/WebsiteMenu.tsx b/src/app/(main)/websites/[websiteId]/WebsiteMenu.tsxindex 132d3b14e..3446440c1 100644--- a/src/app/(main)/websites/[websiteId]/WebsiteMenu.tsx+++ b/src/app/(main)/websites/[websiteId]/WebsiteMenu.tsx@@ -13,12 +13,12 @@ import { useMessages, useNavigation } from '@/components/hooks';import { Edit, MoreHorizontal, Share } from '@/components/icons';export function WebsiteMenu({ websiteId }: { websiteId: string }) {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const { router, updateParams, renderUrl } = useNavigation();const menuItems = [- { id: 'share', label: formatMessage(labels.share), icon: <Share /> },- { id: 'edit', label: formatMessage(labels.edit), icon: <Edit />, seperator: true },+ { id: 'share', label: t(labels.share), icon: <Share /> },+ { id: 'edit', label: t(labels.edit), icon: <Edit />, seperator: true },];const handleAction = (id: any) => {diff --git a/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsx b/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsxindex 605ee3855..e3c263373 100644--- a/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsx+++ b/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsx@@ -14,7 +14,7 @@ export function WebsiteMetricsBar({compareMode?: boolean;}) {const { isAllTime, dateCompare } = useDateRange();- const { formatMessage, labels, getErrorMessage } = useMessages();+ const { t, labels, getErrorMessage } = useMessages();const { data, isLoading, isFetching, error } = useWebsiteStatsQuery({websiteId,compare: compareMode ? dateCompare?.compare : undefined,@@ -26,24 +26,24 @@ export function WebsiteMetricsBar({? [{value: visitors,- label: formatMessage(labels.visitors),+ label: t(labels.visitors),change: visitors - comparison.visitors,formatValue: formatLongNumber,},{value: visits,- label: formatMessage(labels.visits),+ label: t(labels.visits),change: visits - comparison.visits,formatValue: formatLongNumber,},{value: pageviews,- label: formatMessage(labels.views),+ label: t(labels.views),change: pageviews - comparison.pageviews,formatValue: formatLongNumber,},{- label: formatMessage(labels.bounceRate),+ label: t(labels.bounceRate),value: (Math.min(visits, bounces) / visits) * 100,prev: (Math.min(comparison.visits, comparison.bounces) / comparison.visits) * 100,change:@@ -53,7 +53,7 @@ export function WebsiteMetricsBar({reverseColors: true,},{- label: formatMessage(labels.visitDuration),+ label: t(labels.visitDuration),value: totaltime / visits,prev: comparison.totaltime / comparison.visits,change: totaltime / visits - comparison.totaltime / comparison.visits,diff --git a/src/app/(main)/websites/[websiteId]/WebsiteNav.tsx b/src/app/(main)/websites/[websiteId]/WebsiteNav.tsxindex c23b1fe23..6bd892e40 100644--- a/src/app/(main)/websites/[websiteId]/WebsiteNav.tsx+++ b/src/app/(main)/websites/[websiteId]/WebsiteNav.tsx@@ -24,7 +24,7 @@ export function WebsiteNav({isCollapsed?: boolean;onItemClick?: () => void;}) {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const { teamId, router, renderUrl } = useNavigation();const { items, selectedKey } = useWebsiteNavItems(websiteId);@@ -52,14 +52,10 @@ export function WebsiteNav({borderRadiusminHeight="40px">- <IconLabel- icon={<ArrowLeft />}- label={isCollapsed ? '' : formatMessage(labels.back)}- padding- />+ <IconLabel icon={<ArrowLeft />} label={isCollapsed ? '' : t(labels.back)} padding /></Row></Focusable>- <Tooltip placement="right">{formatMessage(labels.back)}</Tooltip>+ <Tooltip placement="right">{t(labels.back)}</Tooltip></TooltipTrigger></Link>{!isCollapsed && (diff --git a/src/app/(main)/websites/[websiteId]/WebsitePanels.tsx b/src/app/(main)/websites/[websiteId]/WebsitePanels.tsxindex d76db4af3..7d5d08c8c 100644--- a/src/app/(main)/websites/[websiteId]/WebsitePanels.tsx+++ b/src/app/(main)/websites/[websiteId]/WebsitePanels.tsx@@ -7,13 +7,13 @@ import { WeeklyTraffic } from '@/components/metrics/WeeklyTraffic';import { WorldMap } from '@/components/metrics/WorldMap';export function WebsitePanels({ websiteId }: { websiteId: string }) {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const tableProps = {websiteId,limit: 10,allowDownload: false,showMore: true,- metric: formatMessage(labels.visitors),+ metric: t(labels.visitors),};const rowProps = { minHeight: '570px' };const { isMobile } = useMobile();@@ -22,40 +22,36 @@ export function WebsitePanels({ websiteId }: { websiteId: string }) {<Grid gap="3"><GridRow layout="two" {...rowProps}><Panel>- <Heading size="2xl">{formatMessage(labels.pages)}</Heading>+ <Heading size="2xl">{t(labels.pages)}</Heading><Tabs><TabList>- <Tab id="path">{formatMessage(labels.path)}</Tab>- <Tab id="entry">{formatMessage(labels.entry)}</Tab>- <Tab id="exit">{formatMessage(labels.exit)}</Tab>+ <Tab id="path">{t(labels.path)}</Tab>+ <Tab id="entry">{t(labels.entry)}</Tab>+ <Tab id="exit">{t(labels.exit)}</Tab></TabList><TabPanel id="path">- <MetricsTable type="path" title={formatMessage(labels.path)} {...tableProps} />+ <MetricsTable type="path" title={t(labels.path)} {...tableProps} /></TabPanel><TabPanel id="entry">- <MetricsTable type="entry" title={formatMessage(labels.path)} {...tableProps} />+ <MetricsTable type="entry" title={t(labels.path)} {...tableProps} /></TabPanel><TabPanel id="exit">- <MetricsTable type="exit" title={formatMessage(labels.path)} {...tableProps} />+ <MetricsTable type="exit" title={t(labels.path)} {...tableProps} /></TabPanel></Tabs></Panel><Panel>- <Heading size="2xl">{formatMessage(labels.sources)}</Heading>+ <Heading size="2xl">{t(labels.sources)}</Heading><Tabs><TabList>- <Tab id="referrer">{formatMessage(labels.referrers)}</Tab>- <Tab id="channel">{formatMessage(labels.channels)}</Tab>+ <Tab id="referrer">{t(labels.referrers)}</Tab>+ <Tab id="channel">{t(labels.channels)}</Tab></TabList><TabPanel id="referrer">- <MetricsTable- type="referrer"- title={formatMessage(labels.referrer)}- {...tableProps}- />+ <MetricsTable type="referrer" title={t(labels.referrer)} {...tableProps} /></TabPanel><TabPanel id="channel">- <MetricsTable type="channel" title={formatMessage(labels.channel)} {...tableProps} />+ <MetricsTable type="channel" title={t(labels.channel)} {...tableProps} /></TabPanel></Tabs></Panel>@@ -63,41 +59,41 @@ export function WebsitePanels({ websiteId }: { websiteId: string }) {<GridRow layout="two" {...rowProps}><Panel>- <Heading size="2xl">{formatMessage(labels.environment)}</Heading>+ <Heading size="2xl">{t(labels.environment)}</Heading><Tabs><TabList>- <Tab id="browser">{formatMessage(labels.browsers)}</Tab>- <Tab id="os">{formatMessage(labels.os)}</Tab>- <Tab id="device">{formatMessage(labels.devices)}</Tab>+ <Tab id="browser">{t(labels.browsers)}</Tab>+ <Tab id="os">{t(labels.os)}</Tab>+ <Tab id="device">{t(labels.devices)}</Tab></TabList><TabPanel id="browser">- <MetricsTable type="browser" title={formatMessage(labels.browser)} {...tableProps} />+ <MetricsTable type="browser" title={t(labels.browser)} {...tableProps} /></TabPanel><TabPanel id="os">- <MetricsTable type="os" title={formatMessage(labels.os)} {...tableProps} />+ <MetricsTable type="os" title={t(labels.os)} {...tableProps} /></TabPanel><TabPanel id="device">- <MetricsTable type="device" title={formatMessage(labels.device)} {...tableProps} />+ <MetricsTable type="device" title={t(labels.device)} {...tableProps} /></TabPanel></Tabs></Panel><Panel>- <Heading size="2xl">{formatMessage(labels.location)}</Heading>+ <Heading size="2xl">{t(labels.location)}</Heading><Tabs><TabList>- <Tab id="country">{formatMessage(labels.countries)}</Tab>- <Tab id="region">{formatMessage(labels.regions)}</Tab>- <Tab id="city">{formatMessage(labels.cities)}</Tab>+ <Tab id="country">{t(labels.countries)}</Tab>+ <Tab id="region">{t(labels.regions)}</Tab>+ <Tab id="city">{t(labels.cities)}</Tab></TabList><TabPanel id="country">- <MetricsTable type="country" title={formatMessage(labels.country)} {...tableProps} />+ <MetricsTable type="country" title={t(labels.country)} {...tableProps} /></TabPanel><TabPanel id="region">- <MetricsTable type="region" title={formatMessage(labels.region)} {...tableProps} />+ <MetricsTable type="region" title={t(labels.region)} {...tableProps} /></TabPanel><TabPanel id="city">- <MetricsTable type="city" title={formatMessage(labels.city)} {...tableProps} />+ <MetricsTable type="city" title={t(labels.city)} {...tableProps} /></TabPanel></Tabs></Panel>@@ -109,7 +105,7 @@ export function WebsitePanels({ websiteId }: { websiteId: string }) {</Panel><Panel>- <Heading size="2xl">{formatMessage(labels.traffic)}</Heading>+ <Heading size="2xl">{t(labels.traffic)}</Heading><Row border="bottom" marginBottom="4" /><WeeklyTraffic websiteId={websiteId} /></Panel>diff --git a/src/app/(main)/websites/[websiteId]/WebsiteTabs.tsx b/src/app/(main)/websites/[websiteId]/WebsiteTabs.tsxindex ac978a238..782d55ad8 100644--- a/src/app/(main)/websites/[websiteId]/WebsiteTabs.tsx+++ b/src/app/(main)/websites/[websiteId]/WebsiteTabs.tsx@@ -6,36 +6,36 @@ import { Lightning } from '@/components/svg';export function WebsiteTabs() {const website = useWebsite();const { pathname, renderUrl } = useNavigation();- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const links = [{id: 'overview',- label: formatMessage(labels.overview),+ label: t(labels.overview),icon: <Eye />,path: '',},{id: 'events',- label: formatMessage(labels.events),+ label: t(labels.events),icon: <Lightning />,path: '/events',},{id: 'sessions',- label: formatMessage(labels.sessions),+ label: t(labels.sessions),icon: <User />,path: '/sessions',},{id: 'realtime',- label: formatMessage(labels.realtime),+ label: t(labels.realtime),icon: <Clock />,path: '/realtime',},{id: 'reports',- label: formatMessage(labels.reports),+ label: t(labels.reports),icon: <ChartPie />,path: '/reports',},diff --git a/src/app/(main)/websites/[websiteId]/cohorts/CohortAddButton.tsx b/src/app/(main)/websites/[websiteId]/cohorts/CohortAddButton.tsxindex 3f7f87232..80699ae99 100644--- a/src/app/(main)/websites/[websiteId]/cohorts/CohortAddButton.tsx+++ b/src/app/(main)/websites/[websiteId]/cohorts/CohortAddButton.tsx@@ -4,15 +4,10 @@ import { DialogButton } from '@/components/input/DialogButton';import { CohortEditForm } from './CohortEditForm';export function CohortAddButton({ websiteId }: { websiteId: string }) {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();return (- <DialogButton- icon={<Plus />}- label={formatMessage(labels.cohort)}- variant="primary"- width="800px"- >+ <DialogButton icon={<Plus />} label={t(labels.cohort)} variant="primary" width="800px">{({ close }) => {return <CohortEditForm websiteId={websiteId} onClose={close} />;}}diff --git a/src/app/(main)/websites/[websiteId]/cohorts/CohortDeleteButton.tsx b/src/app/(main)/websites/[websiteId]/cohorts/CohortDeleteButton.tsxindex 94d62ff2a..1493ed297 100644--- a/src/app/(main)/websites/[websiteId]/cohorts/CohortDeleteButton.tsx+++ b/src/app/(main)/websites/[websiteId]/cohorts/CohortDeleteButton.tsx@@ -2,7 +2,6 @@ import { ConfirmationForm } from '@/components/common/ConfirmationForm';import { useDeleteQuery, useMessages } from '@/components/hooks';import { Trash } from '@/components/icons';import { DialogButton } from '@/components/input/DialogButton';-import { messages } from '@/components/messages';export function CohortDeleteButton({cohortId,@@ -15,7 +14,7 @@ export function CohortDeleteButton({name: string;onSave?: () => void;}) {- const { formatMessage, labels, FormattedMessage } = useMessages();+ const { t, labels, messages } = useMessages();const { mutateAsync, isPending, error, touch } = useDeleteQuery(`/websites/${websiteId}/segments/${cohortId}`,);@@ -31,27 +30,18 @@ export function CohortDeleteButton({};return (- <DialogButton- icon={<Trash />}- variant="quiet"- title={formatMessage(labels.confirm)}- width="400px"- >+ <DialogButton icon={<Trash />} variant="quiet" title={t(labels.confirm)} width="400px">{({ close }) => (<ConfirmationForm- message={- <FormattedMessage- {...messages.confirmRemove}- values={{- target: <b>{name}</b>,- }}- />- }+ message={t.rich(messages.confirmRemove, {+ target: name,+ b: chunks => <b>{chunks}</b>,+ })}isLoading={isPending}error={error}onConfirm={handleConfirm.bind(null, close)}onClose={close}- buttonLabel={formatMessage(labels.delete)}+ buttonLabel={t(labels.delete)}buttonVariant="danger"/>)}diff --git a/src/app/(main)/websites/[websiteId]/cohorts/CohortEditButton.tsx b/src/app/(main)/websites/[websiteId]/cohorts/CohortEditButton.tsxindex 07990712a..02f533dbf 100644--- a/src/app/(main)/websites/[websiteId]/cohorts/CohortEditButton.tsx+++ b/src/app/(main)/websites/[websiteId]/cohorts/CohortEditButton.tsx@@ -13,15 +13,10 @@ export function CohortEditButton({websiteId: string;filters: Filter[];}) {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();return (- <DialogButton- icon={<Edit />}- variant="quiet"- title={formatMessage(labels.cohort)}- width="800px"- >+ <DialogButton icon={<Edit />} variant="quiet" title={t(labels.cohort)} width="800px">{({ close }) => {return (<CohortEditFormdiff --git a/src/app/(main)/websites/[websiteId]/cohorts/CohortEditForm.tsx b/src/app/(main)/websites/[websiteId]/cohorts/CohortEditForm.tsxindex b63c507fe..dbce37df8 100644--- a/src/app/(main)/websites/[websiteId]/cohorts/CohortEditForm.tsx+++ b/src/app/(main)/websites/[websiteId]/cohorts/CohortEditForm.tsx@@ -31,7 +31,7 @@ export function CohortEditForm({onClose?: () => void;}) {const { data } = useWebsiteCohortQuery(websiteId, cohortId);- const { formatMessage, labels, messages, getErrorMessage } = useMessages();+ const { t, labels, messages, getErrorMessage } = useMessages();const { mutateAsync, error, isPending, touch, toast } = useUpdateQuery(`/websites/${websiteId}/segments${cohortId ? `/${cohortId}` : ''}`,@@ -43,7 +43,7 @@ export function CohortEditForm({const handleSubmit = async (formData: any) => {await mutateAsync(formData, {onSuccess: async () => {- toast(formatMessage(messages.saved));+ toast(t(messages.saved));touch('cohorts');onSave?.();onClose?.();@@ -70,29 +70,22 @@ export function CohortEditForm({return (<>- <FormField- name="name"- label={formatMessage(labels.name)}- rules={{ required: formatMessage(labels.required) }}- >+ <FormField name="name" label={t(labels.name)} rules={{ required: t(labels.required) }}><TextField autoFocus /></FormField><Column>- <Label>{formatMessage(labels.action)}</Label>+ <Label>{t(labels.action)}</Label><Grid columns={{ base: '1fr', md: '1fr 1fr' }} gap><Column>- <FormField- name="parameters.action.type"- rules={{ required: formatMessage(labels.required) }}- >+ <FormField name="parameters.action.type" rules={{ required: t(labels.required) }}><ActionSelect /></FormField></Column><Column><FormFieldname="parameters.action.value"- rules={{ required: formatMessage(labels.required) }}+ rules={{ required: t(labels.required) }}>{({ field }) => {return <LookupField websiteId={websiteId} type={type} {...field} />;@@ -103,17 +96,14 @@ export function CohortEditForm({</Column><Column width="260px">- <Label>{formatMessage(labels.dateRange)}</Label>- <FormField- name="parameters.dateRange"- rules={{ required: formatMessage(labels.required) }}- >+ <Label>{t(labels.dateRange)}</Label>+ <FormField name="parameters.dateRange" rules={{ required: t(labels.required) }}><DateFilter placement="bottom start" /></FormField></Column><Column>- <Label>{formatMessage(labels.filters)}</Label>+ <Label>{t(labels.filters)}</Label><FormField name="parameters.filters"><FieldFilters websiteId={websiteId} exclude={['path', 'event']} /></FormField>@@ -121,10 +111,10 @@ export function CohortEditForm({<FormButtons><Button isDisabled={isPending} onPress={onClose}>- {formatMessage(labels.cancel)}+ {t(labels.cancel)}</Button><FormSubmitButton variant="primary" data-test="button-submit" isDisabled={isPending}>- {formatMessage(labels.save)}+ {t(labels.save)}</FormSubmitButton></FormButtons></>diff --git a/src/app/(main)/websites/[websiteId]/cohorts/CohortsTable.tsx b/src/app/(main)/websites/[websiteId]/cohorts/CohortsTable.tsxindex 5c7ac03fa..fe9c95441 100644--- a/src/app/(main)/websites/[websiteId]/cohorts/CohortsTable.tsx+++ b/src/app/(main)/websites/[websiteId]/cohorts/CohortsTable.tsx@@ -7,17 +7,17 @@ import { useMessages, useNavigation } from '@/components/hooks';import { filtersObjectToArray } from '@/lib/params';export function CohortsTable(props: DataTableProps) {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const { websiteId, renderUrl } = useNavigation();return (<DataTable {...props}>- <DataColumn id="name" label={formatMessage(labels.name)}>+ <DataColumn id="name" label={t(labels.name)}>{(row: any) => (<Link href={renderUrl(`/websites/${websiteId}?cohort=${row.id}`, false)}>{row.name}</Link>)}</DataColumn>- <DataColumn id="created" label={formatMessage(labels.created)}>+ <DataColumn id="created" label={t(labels.created)}>{(row: any) => <DateDistance date={new Date(row.createdAt)} />}</DataColumn><DataColumn id="action" align="end" width="100px">diff --git a/src/app/(main)/websites/[websiteId]/compare/CompareTables.tsx b/src/app/(main)/websites/[websiteId]/compare/CompareTables.tsxindex c44a05508..3a07f9e66 100644--- a/src/app/(main)/websites/[websiteId]/compare/CompareTables.tsx+++ b/src/app/(main)/websites/[websiteId]/compare/CompareTables.tsx@@ -10,7 +10,7 @@ import { formatNumber } from '@/lib/format';export function CompareTables({ websiteId }: { websiteId: string }) {const [data, setData] = useState([]);const { dateRange, dateCompare } = useDateRange();- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const {router,updateParams,@@ -30,102 +30,102 @@ export function CompareTables({ websiteId }: { websiteId: string }) {const items = [{id: 'path',- label: formatMessage(labels.path),+ label: t(labels.path),path: renderPath('path'),},{id: 'channel',- label: formatMessage(labels.channels),+ label: t(labels.channels),path: renderPath('channel'),},{id: 'referrer',- label: formatMessage(labels.referrers),+ label: t(labels.referrers),path: renderPath('referrer'),},{id: 'browser',- label: formatMessage(labels.browsers),+ label: t(labels.browsers),path: renderPath('browser'),},{id: 'os',- label: formatMessage(labels.os),+ label: t(labels.os),path: renderPath('os'),},{id: 'device',- label: formatMessage(labels.devices),+ label: t(labels.devices),path: renderPath('device'),},{id: 'country',- label: formatMessage(labels.countries),+ label: t(labels.countries),path: renderPath('country'),},{id: 'region',- label: formatMessage(labels.regions),+ label: t(labels.regions),path: renderPath('region'),},{id: 'city',- label: formatMessage(labels.cities),+ label: t(labels.cities),path: renderPath('city'),},{id: 'language',- label: formatMessage(labels.languages),+ label: t(labels.languages),path: renderPath('language'),},{id: 'screen',- label: formatMessage(labels.screens),+ label: t(labels.screens),path: renderPath('screen'),},{id: 'event',- label: formatMessage(labels.events),+ label: t(labels.events),path: renderPath('event'),},{id: 'utmSource',- label: formatMessage(labels.utmSource),+ label: t(labels.utmSource),path: renderPath('utmSource'),},{id: 'utmMedium',- label: formatMessage(labels.utmMedium),+ label: t(labels.utmMedium),path: renderPath('utmMedium'),},{id: 'utmCampaign',- label: formatMessage(labels.utmCampaign),+ label: t(labels.utmCampaign),path: renderPath('utmCampaign'),},{id: 'utmContent',- label: formatMessage(labels.utmContent),+ label: t(labels.utmContent),path: renderPath('utmContent'),},{id: 'utmTerm',- label: formatMessage(labels.utmTerm),+ label: t(labels.utmTerm),path: renderPath('utmTerm'),},{id: 'hostname',- label: formatMessage(labels.hostname),+ label: t(labels.hostname),path: renderPath('hostname'),},{id: 'distinctId',- label: formatMessage(labels.distinctId),+ label: t(labels.distinctId),path: renderPath('distinctId'),},{id: 'tag',- label: formatMessage(labels.tags),+ label: t(labels.tags),path: renderPath('tag'),},];@@ -152,7 +152,7 @@ export function CompareTables({ websiteId }: { websiteId: string }) {<><Row width="300px"><Select- label={formatMessage(labels.compare)}+ label={t(labels.compare)}value={view}defaultValue={view}onChange={handleChange}@@ -170,7 +170,7 @@ export function CompareTables({ websiteId }: { websiteId: string }) {<Grid columns={{ base: '1fr', lg: '1fr 1fr' }} gap="6" height="100%"><Column gap="6"><Row alignItems="center" justifyContent="space-between">- <Heading size="base">{formatMessage(labels.previous)}</Heading>+ <Heading size="base">{t(labels.previous)}</Heading><DateDisplay startDate={startDate} endDate={endDate} /></Row><MetricsTable@@ -184,7 +184,7 @@ export function CompareTables({ websiteId }: { websiteId: string }) {</Column><Column border="left" paddingLeft="6" gap="6"><Row alignItems="center" justifyContent="space-between">- <Heading size="base"> {formatMessage(labels.current)}</Heading>+ <Heading size="base"> {t(labels.current)}</Heading><DateDisplay startDate={dateRange.startDate} endDate={dateRange.endDate} /></Row><MetricsTablediff --git a/src/app/(main)/websites/[websiteId]/events/EventProperties.tsx b/src/app/(main)/websites/[websiteId]/events/EventProperties.tsxindex c3b1325db..0c03c0f52 100644--- a/src/app/(main)/websites/[websiteId]/events/EventProperties.tsx+++ b/src/app/(main)/websites/[websiteId]/events/EventProperties.tsx@@ -14,7 +14,7 @@ export function EventProperties({ websiteId }: { websiteId: string }) {const [propertyName, setPropertyName] = useState('');const [eventName, setEventName] = useState('');- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const { data, isLoading, isFetching, error } = useEventDataPropertiesQuery(websiteId);const events: string[] = data@@ -38,7 +38,7 @@ export function EventProperties({ websiteId }: { websiteId: string }) {{data && (<Grid columns="repeat(auto-fill, minmax(300px, 1fr))" marginBottom="3" gap><Select- label={formatMessage(labels.event)}+ label={t(labels.event)}value={eventName}onChange={setEventName}placeholder=""@@ -50,7 +50,7 @@ export function EventProperties({ websiteId }: { websiteId: string }) {))}</Select><Select- label={formatMessage(labels.property)}+ label={t(labels.property)}value={propertyName}onChange={setPropertyName}isDisabled={!eventName}diff --git a/src/app/(main)/websites/[websiteId]/events/EventsDataTable.tsx b/src/app/(main)/websites/[websiteId]/events/EventsDataTable.tsxindex f686b3fd4..70de0fd93 100644--- a/src/app/(main)/websites/[websiteId]/events/EventsDataTable.tsx+++ b/src/app/(main)/websites/[websiteId]/events/EventsDataTable.tsx@@ -11,22 +11,22 @@ export function EventsDataTable({teamId?: string;children?: ReactNode;}) {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const [view, setView] = useState('all');const query = useWebsiteEventsQuery(websiteId, { view });const buttons = [{id: 'all',- label: formatMessage(labels.all),+ label: t(labels.all),},{id: 'views',- label: formatMessage(labels.views),+ label: t(labels.views),},{id: 'events',- label: formatMessage(labels.events),+ label: t(labels.events),},];diff --git a/src/app/(main)/websites/[websiteId]/events/EventsMetricsBar.tsx b/src/app/(main)/websites/[websiteId]/events/EventsMetricsBar.tsxindex a7ed399ce..ff5bd74f1 100644--- a/src/app/(main)/websites/[websiteId]/events/EventsMetricsBar.tsx+++ b/src/app/(main)/websites/[websiteId]/events/EventsMetricsBar.tsx@@ -6,7 +6,7 @@ import { MetricsBar } from '@/components/metrics/MetricsBar';import { formatLongNumber } from '@/lib/format';export function EventsMetricsBar({ websiteId }: { websiteId: string }) {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const { data, isLoading, isFetching, error } = useWebsiteSessionStatsQuery(websiteId);return (@@ -15,22 +15,22 @@ export function EventsMetricsBar({ websiteId }: { websiteId: string }) {<MetricsBar><MetricCardvalue={data?.visitors?.value}- label={formatMessage(labels.visitors)}+ label={t(labels.visitors)}formatValue={formatLongNumber}/><MetricCardvalue={data?.visits?.value}- label={formatMessage(labels.visits)}+ label={t(labels.visits)}formatValue={formatLongNumber}/><MetricCardvalue={data?.pageviews?.value}- label={formatMessage(labels.views)}+ label={t(labels.views)}formatValue={formatLongNumber}/><MetricCardvalue={data?.events?.value}- label={formatMessage(labels.events)}+ label={t(labels.events)}formatValue={formatLongNumber}/></MetricsBar>diff --git a/src/app/(main)/websites/[websiteId]/events/EventsPage.tsx b/src/app/(main)/websites/[websiteId]/events/EventsPage.tsxindex f62d8a4c8..f75f735ad 100644--- a/src/app/(main)/websites/[websiteId]/events/EventsPage.tsx+++ b/src/app/(main)/websites/[websiteId]/events/EventsPage.tsx@@ -21,7 +21,7 @@ const KEY_NAME = 'umami.events.tab';export function EventsPage({ websiteId }) {const [tab, setTab] = useState(getItem(KEY_NAME) || 'chart');- const { formatMessage, labels, getErrorMessage } = useMessages();+ const { t, labels, getErrorMessage } = useMessages();const { data, isLoading, isFetching, error } = useEventStatsQuery({websiteId,});@@ -39,22 +39,22 @@ export function EventsPage({ websiteId }) {return [{value: visitors,- label: formatMessage(labels.visitors),+ label: t(labels.visitors),formatValue: formatLongNumber,},{value: visits,- label: formatMessage(labels.visits),+ label: t(labels.visits),formatValue: formatLongNumber,},{value: events,- label: formatMessage(labels.events),+ label: t(labels.events),formatValue: formatLongNumber,},{value: uniqueEvents,- label: formatMessage(labels.uniqueEvents),+ label: t(labels.uniqueEvents),formatValue: formatLongNumber,},] as any;@@ -79,9 +79,9 @@ export function EventsPage({ websiteId }) {<Panel><Tabs selectedKey={tab} onSelectionChange={key => handleSelect(key)}><TabList>- <Tab id="chart">{formatMessage(labels.chart)}</Tab>- <Tab id="activity">{formatMessage(labels.activity)}</Tab>- <Tab id="properties">{formatMessage(labels.properties)}</Tab>+ <Tab id="chart">{t(labels.chart)}</Tab>+ <Tab id="activity">{t(labels.activity)}</Tab>+ <Tab id="properties">{t(labels.properties)}</Tab></TabList><TabPanel id="activity"><EventsDataTable websiteId={websiteId} />@@ -94,8 +94,8 @@ export function EventsPage({ websiteId }) {<MetricsTablewebsiteId={websiteId}type="event"- title={formatMessage(labels.event)}- metric={formatMessage(labels.count)}+ title={t(labels.event)}+ metric={t(labels.count)}/></Column></TabPanel>diff --git a/src/app/(main)/websites/[websiteId]/events/EventsTable.tsx b/src/app/(main)/websites/[websiteId]/events/EventsTable.tsxindex a5eae12a6..d44b74ba0 100644--- a/src/app/(main)/websites/[websiteId]/events/EventsTable.tsx+++ b/src/app/(main)/websites/[websiteId]/events/EventsTable.tsx@@ -21,7 +21,7 @@ import { EventData } from '@/components/metrics/EventData';import { Lightning } from '@/components/svg';export function EventsTable(props: DataTableProps) {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const { updateParams } = useNavigation();const { formatValue } = useFormat();@@ -40,14 +40,14 @@ export function EventsTable(props: DataTableProps) {return (<DataTable {...props}>- <DataColumn id="event" label={formatMessage(labels.event)} width="2fr">+ <DataColumn id="event" label={t(labels.event)} width="2fr">{(row: any) => {return (<Row alignItems="center" wrap="wrap" gap><Row><IconLabelicon={row.eventName ? <Lightning /> : <Eye />}- label={formatMessage(row.eventName ? labels.triggeredEvent : labels.viewedPage)}+ label={t(row.eventName ? labels.triggeredEvent : labels.viewedPage)}/></Row><Text@@ -63,7 +63,7 @@ export function EventsTable(props: DataTableProps) {);}}</DataColumn>- <DataColumn id="session" label={formatMessage(labels.session)} width="80px">+ <DataColumn id="session" label={t(labels.session)} width="80px">{(row: any) => {return (<Link href={updateParams({ session: row.sessionId })}>@@ -72,21 +72,21 @@ export function EventsTable(props: DataTableProps) {);}}</DataColumn>- <DataColumn id="location" label={formatMessage(labels.location)}>+ <DataColumn id="location" label={t(labels.location)}>{(row: any) => (<TypeIcon type="country" value={row.country}>{row.city ? `${row.city}, ` : ''} {formatValue(row.country, 'country')}</TypeIcon>)}</DataColumn>- <DataColumn id="browser" label={formatMessage(labels.browser)} width="140px">+ <DataColumn id="browser" label={t(labels.browser)} width="140px">{(row: any) => (<TypeIcon type="browser" value={row.browser}>{formatValue(row.browser, 'browser')}</TypeIcon>)}</DataColumn>- <DataColumn id="device" label={formatMessage(labels.device)} width="120px">+ <DataColumn id="device" label={t(labels.device)} width="120px">{(row: any) => (<TypeIcon type="device" value={row.device}>{formatValue(row.device, 'device')}diff --git a/src/app/(main)/websites/[websiteId]/realtime/RealtimeCountries.tsx b/src/app/(main)/websites/[websiteId]/realtime/RealtimeCountries.tsxindex eb48433a1..144eeeecd 100644--- a/src/app/(main)/websites/[websiteId]/realtime/RealtimeCountries.tsx+++ b/src/app/(main)/websites/[websiteId]/realtime/RealtimeCountries.tsx@@ -5,7 +5,7 @@ import { useCountryNames, useLocale, useMessages } from '@/components/hooks';import { ListTable } from '@/components/metrics/ListTable';export function RealtimeCountries({ data }) {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const { locale } = useLocale();const { countryNames } = useCountryNames(locale);@@ -18,8 +18,8 @@ export function RealtimeCountries({ data }) {return (<ListTable- title={formatMessage(labels.countries)}- metric={formatMessage(labels.visitors)}+ title={t(labels.countries)}+ metric={t(labels.visitors)}data={data.map(({ x, y, z }: { x: string; y: number; z: number }) => ({label: x,count: y,diff --git a/src/app/(main)/websites/[websiteId]/realtime/RealtimeHeader.tsx b/src/app/(main)/websites/[websiteId]/realtime/RealtimeHeader.tsxindex 2b9d881ee..a7af9205b 100644--- a/src/app/(main)/websites/[websiteId]/realtime/RealtimeHeader.tsx+++ b/src/app/(main)/websites/[websiteId]/realtime/RealtimeHeader.tsx@@ -3,15 +3,15 @@ import { MetricCard } from '@/components/metrics/MetricCard';import { MetricsBar } from '@/components/metrics/MetricsBar';export function RealtimeHeader({ data }: { data: any }) {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const { totals }: any = data || {};return (<MetricsBar>- <MetricCard label={formatMessage(labels.views)} value={totals.views} />- <MetricCard label={formatMessage(labels.visitors)} value={totals.visitors} />- <MetricCard label={formatMessage(labels.events)} value={totals.events} />- <MetricCard label={formatMessage(labels.countries)} value={totals.countries} />+ <MetricCard label={t(labels.views)} value={totals.views} />+ <MetricCard label={t(labels.visitors)} value={totals.visitors} />+ <MetricCard label={t(labels.events)} value={totals.events} />+ <MetricCard label={t(labels.countries)} value={totals.countries} /></MetricsBar>);}diff --git a/src/app/(main)/websites/[websiteId]/realtime/RealtimeLog.tsx b/src/app/(main)/websites/[websiteId]/realtime/RealtimeLog.tsxindex 7bd3f62ee..69760eb75 100644--- a/src/app/(main)/websites/[websiteId]/realtime/RealtimeLog.tsx+++ b/src/app/(main)/websites/[websiteId]/realtime/RealtimeLog.tsx@@ -35,7 +35,7 @@ const icons = {export function RealtimeLog({ data }: { data: any }) {const website = useWebsite();const [search, setSearch] = useState('');- const { formatMessage, labels, messages, FormattedMessage } = useMessages();+ const { t, labels, messages } = useMessages();const { formatValue } = useFormat();const { locale } = useLocale();const { formatTimezoneDate } = useTimezone();@@ -46,19 +46,19 @@ export function RealtimeLog({ data }: { data: any }) {const buttons = [{- label: formatMessage(labels.all),+ label: t(labels.all),id: TYPE_ALL,},{- label: formatMessage(labels.views),+ label: t(labels.views),id: TYPE_PAGEVIEW,},{- label: formatMessage(labels.visitors),+ label: t(labels.visitors),id: TYPE_SESSION,},{- label: formatMessage(labels.events),+ label: t(labels.events),id: TYPE_EVENT,},];@@ -80,25 +80,21 @@ export function RealtimeLog({ data }: { data: any }) {const { __type, eventName, urlPath, browser, os, country, device, hostname } = log;if (__type === TYPE_EVENT) {- return (- <FormattedMessage- {...messages.eventLog}- values={{- event: <b key="b">{eventName || formatMessage(labels.unknown)}</b>,- url: (- <a- key="a"- href={`//${hostname}${urlPath}`}- style={{ fontWeight: 'bold' }}- target="_blank"- rel="noreferrer noopener"- >- {urlPath}- </a>- ),- }}- />- );+ return t.rich(messages.eventLog, {+ event: eventName || t(labels.unknown),+ url: urlPath,+ b: chunks => <b>{chunks}</b>,+ a: chunks => (+ <a+ href={`//${hostname}${urlPath}`}+ style={{ fontWeight: 'bold' }}+ target="_blank"+ rel="noreferrer noopener"+ >+ {chunks}+ </a>+ ),+ });}if (__type === TYPE_PAGEVIEW) {@@ -115,17 +111,13 @@ export function RealtimeLog({ data }: { data: any }) {}if (__type === TYPE_SESSION) {- return (- <FormattedMessage- {...messages.visitorLog}- values={{- country: <b key="country">{countryNames[country] || formatMessage(labels.unknown)}</b>,- browser: <b key="browser">{BROWSERS[browser]}</b>,- os: <b key="os">{OS_NAMES[os] || os}</b>,- device: <b key="device">{formatMessage(labels[device] || labels.unknown)}</b>,- }}- />- );+ return t.rich(messages.visitorLog, {+ country: countryNames[country] || t(labels.unknown),+ browser: BROWSERS[browser],+ os: OS_NAMES[os] || os,+ device: t(labels[device] || labels.unknown),+ b: chunks => <b>{chunks}</b>,+ });}};@@ -183,7 +175,7 @@ export function RealtimeLog({ data }: { data: any }) {return (<Column gap>- <Heading size="base">{formatMessage(labels.activity)}</Heading>+ <Heading size="base">{t(labels.activity)}</Heading>{isPhone ? (<><Row>diff --git a/src/app/(main)/websites/[websiteId]/realtime/RealtimePaths.tsx b/src/app/(main)/websites/[websiteId]/realtime/RealtimePaths.tsxindex 1f90ad831..e69d9e645 100644--- a/src/app/(main)/websites/[websiteId]/realtime/RealtimePaths.tsx+++ b/src/app/(main)/websites/[websiteId]/realtime/RealtimePaths.tsx@@ -5,7 +5,7 @@ import { percentFilter } from '@/lib/filters';export function RealtimePaths({ data }: { data: any }) {const website = useWebsite();- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const { urls } = data || {};const limit = 15;@@ -32,8 +32,8 @@ export function RealtimePaths({ data }: { data: any }) {return (<ListTable- title={formatMessage(labels.pages)}- metric={formatMessage(labels.views)}+ title={t(labels.pages)}+ metric={t(labels.views)}renderLabel={renderLink}data={pages.map(({ x, y, z }: { x: string; y: number; z: number }) => ({label: x,diff --git a/src/app/(main)/websites/[websiteId]/realtime/RealtimeReferrers.tsx b/src/app/(main)/websites/[websiteId]/realtime/RealtimeReferrers.tsxindex 9fd4477b7..fa2a56b9f 100644--- a/src/app/(main)/websites/[websiteId]/realtime/RealtimeReferrers.tsx+++ b/src/app/(main)/websites/[websiteId]/realtime/RealtimeReferrers.tsx@@ -5,7 +5,7 @@ import { percentFilter } from '@/lib/filters';export function RealtimeReferrers({ data }: { data: any }) {const website = useWebsite();- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const { referrers } = data || {};const limit = 15;@@ -32,8 +32,8 @@ export function RealtimeReferrers({ data }: { data: any }) {return (<ListTable- title={formatMessage(labels.referrers)}- metric={formatMessage(labels.views)}+ title={t(labels.referrers)}+ metric={t(labels.views)}renderLabel={renderLink}data={domains.map(({ x, y, z }: { x: string; y: number; z: number }) => ({label: x,diff --git a/src/app/(main)/websites/[websiteId]/segments/SegmentAddButton.tsx b/src/app/(main)/websites/[websiteId]/segments/SegmentAddButton.tsxindex 7b70fee6a..8786f82bc 100644--- a/src/app/(main)/websites/[websiteId]/segments/SegmentAddButton.tsx+++ b/src/app/(main)/websites/[websiteId]/segments/SegmentAddButton.tsx@@ -4,15 +4,10 @@ import { DialogButton } from '@/components/input/DialogButton';import { SegmentEditForm } from './SegmentEditForm';export function SegmentAddButton({ websiteId }: { websiteId: string }) {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();return (- <DialogButton- icon={<Plus />}- label={formatMessage(labels.segment)}- variant="primary"- width="800px"- >+ <DialogButton icon={<Plus />} label={t(labels.segment)} variant="primary" width="800px">{({ close }) => {return <SegmentEditForm websiteId={websiteId} onClose={close} />;}}diff --git a/src/app/(main)/websites/[websiteId]/segments/SegmentDeleteButton.tsx b/src/app/(main)/websites/[websiteId]/segments/SegmentDeleteButton.tsxindex bb52a2209..8f596f4cf 100644--- a/src/app/(main)/websites/[websiteId]/segments/SegmentDeleteButton.tsx+++ b/src/app/(main)/websites/[websiteId]/segments/SegmentDeleteButton.tsx@@ -2,7 +2,6 @@ import { ConfirmationForm } from '@/components/common/ConfirmationForm';import { useDeleteQuery, useMessages } from '@/components/hooks';import { Trash } from '@/components/icons';import { DialogButton } from '@/components/input/DialogButton';-import { messages } from '@/components/messages';export function SegmentDeleteButton({segmentId,@@ -15,7 +14,7 @@ export function SegmentDeleteButton({name: string;onSave?: () => void;}) {- const { formatMessage, labels, FormattedMessage } = useMessages();+ const { t, labels, messages } = useMessages();const { mutateAsync, isPending, error, touch } = useDeleteQuery(`/websites/${websiteId}/segments/${segmentId}`,);@@ -31,27 +30,18 @@ export function SegmentDeleteButton({};return (- <DialogButton- icon={<Trash />}- title={formatMessage(labels.confirm)}- variant="quiet"- width="600px"- >+ <DialogButton icon={<Trash />} title={t(labels.confirm)} variant="quiet" width="600px">{({ close }) => (<ConfirmationForm- message={- <FormattedMessage- {...messages.confirmRemove}- values={{- target: <b>{name}</b>,- }}- />- }+ message={t.rich(messages.confirmRemove, {+ target: name,+ b: chunks => <b>{chunks}</b>,+ })}isLoading={isPending}error={error}onConfirm={handleConfirm.bind(null, close)}onClose={close}- buttonLabel={formatMessage(labels.delete)}+ buttonLabel={t(labels.delete)}buttonVariant="danger"/>)}diff --git a/src/app/(main)/websites/[websiteId]/segments/SegmentEditButton.tsx b/src/app/(main)/websites/[websiteId]/segments/SegmentEditButton.tsxindex 5c56cf1ea..79d4c390f 100644--- a/src/app/(main)/websites/[websiteId]/segments/SegmentEditButton.tsx+++ b/src/app/(main)/websites/[websiteId]/segments/SegmentEditButton.tsx@@ -13,15 +13,10 @@ export function SegmentEditButton({websiteId: string;filters?: Filter[];}) {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();return (- <DialogButton- icon={<Edit />}- title={formatMessage(labels.segment)}- variant="quiet"- width="800px"- >+ <DialogButton icon={<Edit />} title={t(labels.segment)} variant="quiet" width="800px">{({ close }) => {return (<SegmentEditFormdiff --git a/src/app/(main)/websites/[websiteId]/segments/SegmentEditForm.tsx b/src/app/(main)/websites/[websiteId]/segments/SegmentEditForm.tsxindex c3529d97c..5798351ac 100644--- a/src/app/(main)/websites/[websiteId]/segments/SegmentEditForm.tsx+++ b/src/app/(main)/websites/[websiteId]/segments/SegmentEditForm.tsx@@ -10,7 +10,6 @@ import {} from '@umami/react-zen';import { useMessages, useUpdateQuery, useWebsiteSegmentQuery } from '@/components/hooks';import { FieldFilters } from '@/components/input/FieldFilters';-import { messages } from '@/components/messages';export function SegmentEditForm({segmentId,@@ -28,7 +27,7 @@ export function SegmentEditForm({onClose?: () => void;}) {const { data } = useWebsiteSegmentQuery(websiteId, segmentId);- const { formatMessage, labels, getErrorMessage } = useMessages();+ const { t, labels, messages, getErrorMessage } = useMessages();const { mutateAsync, error, isPending, touch, toast } = useUpdateQuery(`/websites/${websiteId}/segments${segmentId ? `/${segmentId}` : ''}`,@@ -40,7 +39,7 @@ export function SegmentEditForm({const handleSubmit = async (formData: any) => {await mutateAsync(formData, {onSuccess: async () => {- toast(formatMessage(messages.saved));+ toast(t(messages.saved));touch('segments');onSave?.();onClose?.();@@ -58,27 +57,23 @@ export function SegmentEditForm({defaultValues={data || { parameters: { filters } }}error={getErrorMessage(error)}>- <FormField- name="name"- label={formatMessage(labels.name)}- rules={{ required: formatMessage(labels.required) }}- >+ <FormField name="name" label={t(labels.name)} rules={{ required: t(labels.required) }}><TextField autoFocus={!segmentId} /></FormField>{showFilters && (<>- <Label>{formatMessage(labels.filters)}</Label>- <FormField name="parameters.filters" rules={{ required: formatMessage(labels.required) }}>+ <Label>{t(labels.filters)}</Label>+ <FormField name="parameters.filters" rules={{ required: t(labels.required) }}><FieldFilters websiteId={websiteId} /></FormField></>)}<FormButtons><Button isDisabled={isPending} onPress={onClose}>- {formatMessage(labels.cancel)}+ {t(labels.cancel)}</Button><FormSubmitButton variant="primary" data-test="button-submit" isDisabled={isPending}>- {formatMessage(labels.save)}+ {t(labels.save)}</FormSubmitButton></FormButtons></Form>diff --git a/src/app/(main)/websites/[websiteId]/segments/SegmentsTable.tsx b/src/app/(main)/websites/[websiteId]/segments/SegmentsTable.tsxindex 4dbe51146..7e8ddb2a6 100644--- a/src/app/(main)/websites/[websiteId]/segments/SegmentsTable.tsx+++ b/src/app/(main)/websites/[websiteId]/segments/SegmentsTable.tsx@@ -6,19 +6,19 @@ import { DateDistance } from '@/components/common/DateDistance';import { useMessages, useNavigation } from '@/components/hooks';export function SegmentsTable(props: DataTableProps) {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const { websiteId, renderUrl } = useNavigation();return (<DataTable {...props}>- <DataColumn id="name" label={formatMessage(labels.name)}>+ <DataColumn id="name" label={t(labels.name)}>{(row: any) => (<Link href={renderUrl(`/websites/${websiteId}?segment=${row.id}`, false)}>{row.name}</Link>)}</DataColumn>- <DataColumn id="created" label={formatMessage(labels.created)}>+ <DataColumn id="created" label={t(labels.created)}>{(row: any) => <DateDistance date={new Date(row.createdAt)} />}</DataColumn><DataColumn id="action" align="end" width="100px">diff --git a/src/app/(main)/websites/[websiteId]/sessions/SessionActivity.tsx b/src/app/(main)/websites/[websiteId]/sessions/SessionActivity.tsxindex 162279d96..1a54f506a 100644--- a/src/app/(main)/websites/[websiteId]/sessions/SessionActivity.tsx+++ b/src/app/(main)/websites/[websiteId]/sessions/SessionActivity.tsx@@ -28,7 +28,7 @@ export function SessionActivity({startDate: Date;endDate: Date;}) {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const { formatTimezoneDate } = useTimezone();const { data, isLoading, error } = useSessionActivityQuery(websiteId,@@ -69,9 +69,7 @@ export function SessionActivity({<Row alignItems="center" gap="2"><Icon>{eventName ? <Lightning /> : <Eye />}</Icon><Text wrap="nowrap">- {eventName- ? formatMessage(labels.triggeredEvent)- : formatMessage(labels.viewedPage)}+ {eventName ? t(labels.triggeredEvent) : t(labels.viewedPage)}</Text><Text weight="bold" style={{ maxWidth: isMobile ? '400px' : null }} truncate>{eventName || renderLink(urlPath, hostname)}diff --git a/src/app/(main)/websites/[websiteId]/sessions/SessionInfo.tsx b/src/app/(main)/websites/[websiteId]/sessions/SessionInfo.tsxindex f15e6ee51..8ccaede42 100644--- a/src/app/(main)/websites/[websiteId]/sessions/SessionInfo.tsx+++ b/src/app/(main)/websites/[websiteId]/sessions/SessionInfo.tsx@@ -7,57 +7,48 @@ import { Calendar, KeyRound, Landmark, MapPin } from '@/components/icons';export function SessionInfo({ data }) {const { locale } = useLocale();- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const { formatValue } = useFormat();const { getRegionName } = useRegionNames(locale);return (<Grid columns="repeat(auto-fit, minmax(200px, 1fr)" gap>- <Info label={formatMessage(labels.distinctId)} icon={<KeyRound />}>+ <Info label={t(labels.distinctId)} icon={<KeyRound />}>{data?.distinctId}</Info>- <Info label={formatMessage(labels.lastSeen)} icon={<Calendar />}>+ <Info label={t(labels.lastSeen)} icon={<Calendar />}><DateDistance date={new Date(data.lastAt)} /></Info>- <Info label={formatMessage(labels.firstSeen)} icon={<Calendar />}>+ <Info label={t(labels.firstSeen)} icon={<Calendar />}><DateDistance date={new Date(data.firstAt)} /></Info>- <Info- label={formatMessage(labels.country)}- icon={<TypeIcon type="country" value={data?.country} />}- >+ <Info label={t(labels.country)} icon={<TypeIcon type="country" value={data?.country} />}>{formatValue(data?.country, 'country')}</Info>- <Info label={formatMessage(labels.region)} icon={<MapPin />}>+ <Info label={t(labels.region)} icon={<MapPin />}>{getRegionName(data?.region)}</Info>- <Info label={formatMessage(labels.city)} icon={<Landmark />}>+ <Info label={t(labels.city)} icon={<Landmark />}>{data?.city}</Info>- <Info- label={formatMessage(labels.browser)}- icon={<TypeIcon type="browser" value={data?.browser} />}- >+ <Info label={t(labels.browser)} icon={<TypeIcon type="browser" value={data?.browser} />}>{formatValue(data?.browser, 'browser')}</Info><Info- label={formatMessage(labels.os)}+ label={t(labels.os)}icon={<TypeIcon type="os" value={data?.os?.toLowerCase()?.replaceAll(/\W/g, '-')} />}>{formatValue(data?.os, 'os')}</Info>- <Info- label={formatMessage(labels.device)}- icon={<TypeIcon type="device" value={data?.device} />}- >+ <Info label={t(labels.device)} icon={<TypeIcon type="device" value={data?.device} />}>{formatValue(data?.device, 'device')}</Info></Grid>diff --git a/src/app/(main)/websites/[websiteId]/sessions/SessionProfile.tsx b/src/app/(main)/websites/[websiteId]/sessions/SessionProfile.tsxindex 6624d439d..91375cf1b 100644--- a/src/app/(main)/websites/[websiteId]/sessions/SessionProfile.tsx+++ b/src/app/(main)/websites/[websiteId]/sessions/SessionProfile.tsx@@ -28,7 +28,7 @@ export function SessionProfile({onClose?: () => void;}) {const { data, isLoading, error } = useWebsiteSessionQuery(websiteId, sessionId);- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();return (<LoadingPanel@@ -61,8 +61,8 @@ export function SessionProfile({<Tabs><TabList>- <Tab id="activity">{formatMessage(labels.activity)}</Tab>- <Tab id="properties">{formatMessage(labels.properties)}</Tab>+ <Tab id="activity">{t(labels.activity)}</Tab>+ <Tab id="properties">{t(labels.properties)}</Tab></TabList><TabPanel id="activity"><SessionActivitydiff --git a/src/app/(main)/websites/[websiteId]/sessions/SessionProperties.tsx b/src/app/(main)/websites/[websiteId]/sessions/SessionProperties.tsxindex 1693d0570..6d21750ac 100644--- a/src/app/(main)/websites/[websiteId]/sessions/SessionProperties.tsx+++ b/src/app/(main)/websites/[websiteId]/sessions/SessionProperties.tsx@@ -12,7 +12,7 @@ import { CHART_COLORS } from '@/lib/constants';export function SessionProperties({ websiteId }: { websiteId: string }) {const [propertyName, setPropertyName] = useState('');- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const { data, isLoading, isFetching, error } = useSessionDataPropertiesQuery(websiteId);const properties: string[] = data?.map(e => e.propertyName);@@ -29,7 +29,7 @@ export function SessionProperties({ websiteId }: { websiteId: string }) {{data && (<Grid columns="repeat(auto-fill, minmax(300px, 1fr))" gap><Select- label={formatMessage(labels.event)}+ label={t(labels.event)}value={propertyName}onChange={setPropertyName}placeholder=""diff --git a/src/app/(main)/websites/[websiteId]/sessions/SessionStats.tsx b/src/app/(main)/websites/[websiteId]/sessions/SessionStats.tsxindex e25be9ad8..511d8596f 100644--- a/src/app/(main)/websites/[websiteId]/sessions/SessionStats.tsx+++ b/src/app/(main)/websites/[websiteId]/sessions/SessionStats.tsx@@ -4,15 +4,15 @@ import { MetricsBar } from '@/components/metrics/MetricsBar';import { formatShortTime } from '@/lib/format';export function SessionStats({ data }) {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();return (<MetricsBar>- <MetricCard label={formatMessage(labels.visits)} value={data?.visits} />- <MetricCard label={formatMessage(labels.views)} value={data?.views} />- <MetricCard label={formatMessage(labels.events)} value={data?.events} />+ <MetricCard label={t(labels.visits)} value={data?.visits} />+ <MetricCard label={t(labels.views)} value={data?.views} />+ <MetricCard label={t(labels.events)} value={data?.events} /><MetricCard- label={formatMessage(labels.visitDuration)}+ label={t(labels.visitDuration)}value={data?.totaltime / data?.visits}formatValue={n => `${+n < 0 ? '-' : ''}${formatShortTime(Math.abs(~~n), ['m', 's'], ' ')}`}/>diff --git a/src/app/(main)/websites/[websiteId]/sessions/SessionsMetricsBar.tsx b/src/app/(main)/websites/[websiteId]/sessions/SessionsMetricsBar.tsxindex c8317a2be..34dfcefee 100644--- a/src/app/(main)/websites/[websiteId]/sessions/SessionsMetricsBar.tsx+++ b/src/app/(main)/websites/[websiteId]/sessions/SessionsMetricsBar.tsx@@ -6,7 +6,7 @@ import { MetricsBar } from '@/components/metrics/MetricsBar';import { formatLongNumber } from '@/lib/format';export function SessionsMetricsBar({ websiteId }: { websiteId: string }) {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const { data, isLoading, isFetching, error } = useWebsiteSessionStatsQuery(websiteId);return (@@ -15,22 +15,22 @@ export function SessionsMetricsBar({ websiteId }: { websiteId: string }) {<MetricsBar><MetricCardvalue={data?.visitors?.value}- label={formatMessage(labels.visitors)}+ label={t(labels.visitors)}formatValue={formatLongNumber}/><MetricCardvalue={data?.visits?.value}- label={formatMessage(labels.visits)}+ label={t(labels.visits)}formatValue={formatLongNumber}/><MetricCardvalue={data?.pageviews?.value}- label={formatMessage(labels.views)}+ label={t(labels.views)}formatValue={formatLongNumber}/><MetricCardvalue={data?.countries?.value}- label={formatMessage(labels.countries)}+ label={t(labels.countries)}formatValue={formatLongNumber}/></MetricsBar>diff --git a/src/app/(main)/websites/[websiteId]/sessions/SessionsPage.tsx b/src/app/(main)/websites/[websiteId]/sessions/SessionsPage.tsxindex 8e9d2f218..7b0a1afb1 100644--- a/src/app/(main)/websites/[websiteId]/sessions/SessionsPage.tsx+++ b/src/app/(main)/websites/[websiteId]/sessions/SessionsPage.tsx@@ -13,7 +13,7 @@ const KEY_NAME = 'umami.sessions.tab';export function SessionsPage({ websiteId }) {const [tab, setTab] = useState(getItem(KEY_NAME) || 'activity');- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const handleSelect = (value: Key) => {setItem(KEY_NAME, value);@@ -26,8 +26,8 @@ export function SessionsPage({ websiteId }) {<Panel><Tabs selectedKey={tab} onSelectionChange={handleSelect}><TabList>- <Tab id="activity">{formatMessage(labels.activity)}</Tab>- <Tab id="properties">{formatMessage(labels.properties)}</Tab>+ <Tab id="activity">{t(labels.activity)}</Tab>+ <Tab id="properties">{t(labels.properties)}</Tab></TabList><TabPanel id="activity"><SessionsDataTable websiteId={websiteId} />diff --git a/src/app/(main)/websites/[websiteId]/sessions/SessionsTable.tsx b/src/app/(main)/websites/[websiteId]/sessions/SessionsTable.tsxindex 5d3bb374e..78a41359b 100644--- a/src/app/(main)/websites/[websiteId]/sessions/SessionsTable.tsx+++ b/src/app/(main)/websites/[websiteId]/sessions/SessionsTable.tsx@@ -6,51 +6,51 @@ import { TypeIcon } from '@/components/common/TypeIcon';import { useFormat, useMessages, useNavigation } from '@/components/hooks';export function SessionsTable(props: DataTableProps) {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const { formatValue } = useFormat();const { updateParams } = useNavigation();return (<DataTable {...props}>- <DataColumn id="id" label={formatMessage(labels.session)} width="100px">+ <DataColumn id="id" label={t(labels.session)} width="100px">{(row: any) => (<Link href={updateParams({ session: row.id })}><Avatar seed={row.id} size={32} /></Link>)}</DataColumn>- <DataColumn id="visits" label={formatMessage(labels.visits)} width="80px" />- <DataColumn id="views" label={formatMessage(labels.views)} width="80px" />- <DataColumn id="country" label={formatMessage(labels.country)}>+ <DataColumn id="visits" label={t(labels.visits)} width="80px" />+ <DataColumn id="views" label={t(labels.views)} width="80px" />+ <DataColumn id="country" label={t(labels.country)}>{(row: any) => (<TypeIcon type="country" value={row.country}>{formatValue(row.country, 'country')}</TypeIcon>)}</DataColumn>- <DataColumn id="city" label={formatMessage(labels.city)} />- <DataColumn id="browser" label={formatMessage(labels.browser)}>+ <DataColumn id="city" label={t(labels.city)} />+ <DataColumn id="browser" label={t(labels.browser)}>{(row: any) => (<TypeIcon type="browser" value={row.browser}>{formatValue(row.browser, 'browser')}</TypeIcon>)}</DataColumn>- <DataColumn id="os" label={formatMessage(labels.os)}>+ <DataColumn id="os" label={t(labels.os)}>{(row: any) => (<TypeIcon type="os" value={row.os}>{formatValue(row.os, 'os')}</TypeIcon>)}</DataColumn>- <DataColumn id="device" label={formatMessage(labels.device)}>+ <DataColumn id="device" label={t(labels.device)}>{(row: any) => (<TypeIcon type="device" value={row.device}>{formatValue(row.device, 'device')}</TypeIcon>)}</DataColumn>- <DataColumn id="lastAt" label={formatMessage(labels.lastSeen)}>+ <DataColumn id="lastAt" label={t(labels.lastSeen)}>{(row: any) => <DateDistance date={new Date(row.createdAt)} />}</DataColumn></DataTable>diff --git a/src/app/(main)/websites/[websiteId]/settings/ShareDeleteButton.tsx b/src/app/(main)/websites/[websiteId]/settings/ShareDeleteButton.tsxindex 35e96df3f..0c05c5819 100644--- a/src/app/(main)/websites/[websiteId]/settings/ShareDeleteButton.tsx+++ b/src/app/(main)/websites/[websiteId]/settings/ShareDeleteButton.tsx@@ -2,7 +2,6 @@ import { ConfirmationForm } from '@/components/common/ConfirmationForm';import { useDeleteQuery, useMessages, useModified } from '@/components/hooks';import { Trash } from '@/components/icons';import { DialogButton } from '@/components/input/DialogButton';-import { messages } from '@/components/messages';export function ShareDeleteButton({shareId,@@ -13,7 +12,7 @@ export function ShareDeleteButton({slug: string;onSave?: () => void;}) {- const { formatMessage, labels, getErrorMessage, FormattedMessage } = useMessages();+ const { t, labels, messages, getErrorMessage } = useMessages();const { mutateAsync, isPending, error } = useDeleteQuery(`/share/id/${shareId}`);const { touch } = useModified();@@ -28,27 +27,18 @@ export function ShareDeleteButton({};return (- <DialogButton- icon={<Trash />}- title={formatMessage(labels.confirm)}- variant="quiet"- width="400px"- >+ <DialogButton icon={<Trash />} title={t(labels.confirm)} variant="quiet" width="400px">{({ close }) => (<ConfirmationForm- message={- <FormattedMessage- {...messages.confirmRemove}- values={{- target: <b>{slug}</b>,- }}- />- }+ message={t.rich(messages.confirmRemove, {+ target: slug,+ b: chunks => <b>{chunks}</b>,+ })}isLoading={isPending}error={getErrorMessage(error)}onConfirm={handleConfirm.bind(null, close)}onClose={close}- buttonLabel={formatMessage(labels.delete)}+ buttonLabel={t(labels.delete)}buttonVariant="danger"/>)}diff --git a/src/app/(main)/websites/[websiteId]/settings/ShareEditButton.tsx b/src/app/(main)/websites/[websiteId]/settings/ShareEditButton.tsxindex df1c2e648..66664c5c1 100644--- a/src/app/(main)/websites/[websiteId]/settings/ShareEditButton.tsx+++ b/src/app/(main)/websites/[websiteId]/settings/ShareEditButton.tsx@@ -4,10 +4,10 @@ import { DialogButton } from '@/components/input/DialogButton';import { ShareEditForm } from './ShareEditForm';export function ShareEditButton({ shareId }: { shareId: string }) {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();return (- <DialogButton icon={<Edit />} title={formatMessage(labels.share)} variant="quiet" width="600px">+ <DialogButton icon={<Edit />} title={t(labels.share)} variant="quiet" width="600px">{({ close }) => {return <ShareEditForm shareId={shareId} onClose={close} />;}}diff --git a/src/app/(main)/websites/[websiteId]/settings/ShareEditForm.tsx b/src/app/(main)/websites/[websiteId]/settings/ShareEditForm.tsxindex a71a49277..ff62226b1 100644--- a/src/app/(main)/websites/[websiteId]/settings/ShareEditForm.tsx+++ b/src/app/(main)/websites/[websiteId]/settings/ShareEditForm.tsx@@ -27,7 +27,7 @@ export function ShareEditForm({onSave?: () => void;onClose?: () => void;}) {- const { formatMessage, labels, getErrorMessage } = useMessages();+ const { t, labels, getErrorMessage } = useMessages();const { cloudMode } = useConfig();const { get, post } = useApi();const { touch } = useModified();@@ -125,25 +125,21 @@ export function ShareEditForm({<Column gap="6">{url && (<Column>- <Label>{formatMessage(labels.shareUrl)}</Label>+ <Label>{t(labels.shareUrl)}</Label><TextField value={url} isReadOnly allowCopy /></Column>)}- <FormField- label={formatMessage(labels.name)}- name="name"- rules={{ required: formatMessage(labels.required) }}- >+ <FormField label={t(labels.name)} name="name" rules={{ required: t(labels.required) }}><TextField autoComplete="off" autoFocus={!isEditing} /></FormField><Grid columns="repeat(auto-fit, minmax(150px, 1fr))" gap="3">{SHARE_NAV_ITEMS.map(section => (<Column key={section.section} gap="3">- <Text weight="bold">{formatMessage((labels as any)[section.section])}</Text>+ <Text weight="bold">{t((labels as any)[section.section])}</Text><Column gap="1">{section.items.map(item => (<FormField key={item.id} name={item.id}>- <Checkbox>{formatMessage((labels as any)[item.label])}</Checkbox>+ <Checkbox>{t((labels as any)[item.label])}</Checkbox></FormField>))}</Column>@@ -153,14 +149,14 @@ export function ShareEditForm({<Row justifyContent="flex-end" paddingTop="3" gap="3">{onClose && (<Button isDisabled={isPending} onPress={onClose}>- {formatMessage(labels.cancel)}+ {t(labels.cancel)}</Button>)}<FormSubmitButtonvariant="primary"isDisabled={isPending || !hasSelection || !values.name}>- {formatMessage(labels.save)}+ {t(labels.save)}</FormSubmitButton></Row></Column>diff --git a/src/app/(main)/websites/[websiteId]/settings/SharesTable.tsx b/src/app/(main)/websites/[websiteId]/settings/SharesTable.tsxindex 52f8a0579..933fb65ff 100644--- a/src/app/(main)/websites/[websiteId]/settings/SharesTable.tsx+++ b/src/app/(main)/websites/[websiteId]/settings/SharesTable.tsx@@ -6,7 +6,7 @@ import { ShareDeleteButton } from './ShareDeleteButton';import { ShareEditButton } from './ShareEditButton';export function SharesTable(props: DataTableProps) {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const { cloudMode } = useConfig();const { isMobile } = useMobile();@@ -19,10 +19,10 @@ export function SharesTable(props: DataTableProps) {return (<DataTable {...props}>- <DataColumn id="name" label={formatMessage(labels.name)}>+ <DataColumn id="name" label={t(labels.name)}>{({ name }: any) => name}</DataColumn>- <DataColumn id="slug" label={formatMessage(labels.shareUrl)} width="2fr">+ <DataColumn id="slug" label={t(labels.shareUrl)} width="2fr">{({ slug }: any) => {const url = getUrl(slug);return (@@ -33,7 +33,7 @@ export function SharesTable(props: DataTableProps) {}}</DataColumn>{!isMobile && (- <DataColumn id="created" label={formatMessage(labels.created)}>+ <DataColumn id="created" label={t(labels.created)}>{(row: any) => <DateDistance date={new Date(row.createdAt)} />}</DataColumn>)}diff --git a/src/app/(main)/websites/[websiteId]/settings/WebsiteData.tsx b/src/app/(main)/websites/[websiteId]/settings/WebsiteData.tsxindex 21cd61370..daf39f8de 100644--- a/src/app/(main)/websites/[websiteId]/settings/WebsiteData.tsx+++ b/src/app/(main)/websites/[websiteId]/settings/WebsiteData.tsx@@ -13,7 +13,7 @@ import { WebsiteResetForm } from './WebsiteResetForm';import { WebsiteTransferForm } from './WebsiteTransferForm';export function WebsiteData({ websiteId, onSave }: { websiteId: string; onSave?: () => void }) {- const { formatMessage, labels, messages } = useMessages();+ const { t, labels, messages } = useMessages();const { user } = useLoginQuery();const { touch } = useModified();const { router, pathname, teamId, renderUrl } = useNavigation();@@ -49,14 +49,11 @@ export function WebsiteData({ websiteId, onSave }: { websiteId: string; onSave?:return (<Column gap="6">{!isAdmin && (- <ActionForm- label={formatMessage(labels.transferWebsite)}- description={formatMessage(messages.transferWebsite)}- >+ <ActionForm label={t(labels.transferWebsite)} description={t(messages.transferWebsite)}><DialogTrigger>- <Button isDisabled={!canTransferWebsite}>{formatMessage(labels.transfer)}</Button>+ <Button isDisabled={!canTransferWebsite}>{t(labels.transfer)}</Button><Modal>- <Dialog title={formatMessage(labels.transferWebsite)} style={{ width: 400 }}>+ <Dialog title={t(labels.transferWebsite)} style={{ width: 400 }}>{({ close }) => (<WebsiteTransferForm websiteId={websiteId} onSave={handleSave} onClose={close} />)}@@ -66,14 +63,11 @@ export function WebsiteData({ websiteId, onSave }: { websiteId: string; onSave?:</ActionForm>)}- <ActionForm- label={formatMessage(labels.resetWebsite)}- description={formatMessage(messages.resetWebsiteWarning)}- >+ <ActionForm label={t(labels.resetWebsite)} description={t(messages.resetWebsiteWarning)}><DialogTrigger>- <Button>{formatMessage(labels.reset)}</Button>+ <Button>{t(labels.reset)}</Button><Modal>- <Dialog title={formatMessage(labels.resetWebsite)} style={{ width: 400 }}>+ <Dialog title={t(labels.resetWebsite)} style={{ width: 400 }}>{({ close }) => (<WebsiteResetForm websiteId={websiteId} onSave={handleReset} onClose={close} />)}@@ -82,16 +76,13 @@ export function WebsiteData({ websiteId, onSave }: { websiteId: string; onSave?:</DialogTrigger></ActionForm>- <ActionForm- label={formatMessage(labels.deleteWebsite)}- description={formatMessage(messages.deleteWebsiteWarning)}- >+ <ActionForm label={t(labels.deleteWebsite)} description={t(messages.deleteWebsiteWarning)}><DialogTrigger><Button data-test="button-delete" variant="danger">- {formatMessage(labels.delete)}+ {t(labels.delete)}</Button><Modal>- <Dialog title={formatMessage(labels.deleteWebsite)} style={{ width: 400 }}>+ <Dialog title={t(labels.deleteWebsite)} style={{ width: 400 }}>{({ close }) => (<WebsiteDeleteForm websiteId={websiteId} onSave={handleSave} onClose={close} />)}diff --git a/src/app/(main)/websites/[websiteId]/settings/WebsiteDeleteForm.tsx b/src/app/(main)/websites/[websiteId]/settings/WebsiteDeleteForm.tsxindex 2fc027687..fb450f478 100644--- a/src/app/(main)/websites/[websiteId]/settings/WebsiteDeleteForm.tsx+++ b/src/app/(main)/websites/[websiteId]/settings/WebsiteDeleteForm.tsx@@ -12,7 +12,7 @@ export function WebsiteDeleteForm({onSave?: () => void;onClose?: () => void;}) {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const { mutateAsync, isPending, error, touch } = useDeleteQuery(`/websites/${websiteId}`);const handleConfirm = async () => {@@ -33,7 +33,7 @@ export function WebsiteDeleteForm({onClose={onClose}isLoading={isPending}error={error}- buttonLabel={formatMessage(labels.delete)}+ buttonLabel={t(labels.delete)}buttonVariant="danger"/>);diff --git a/src/app/(main)/websites/[websiteId]/settings/WebsiteEditForm.tsx b/src/app/(main)/websites/[websiteId]/settings/WebsiteEditForm.tsxindex 4ae819ee5..49344558c 100644--- a/src/app/(main)/websites/[websiteId]/settings/WebsiteEditForm.tsx+++ b/src/app/(main)/websites/[websiteId]/settings/WebsiteEditForm.tsx@@ -4,13 +4,13 @@ import { DOMAIN_REGEX } from '@/lib/constants';export function WebsiteEditForm({ websiteId, onSave }: { websiteId: string; onSave?: () => void }) {const website = useWebsite();- const { formatMessage, labels, messages, getErrorMessage } = useMessages();+ const { t, labels, messages, getErrorMessage } = useMessages();const { mutateAsync, error, touch, toast } = useUpdateQuery(`/websites/${websiteId}`);const handleSubmit = async (data: any) => {await mutateAsync(data, {onSuccess: async () => {- toast(formatMessage(messages.saved));+ toast(t(messages.saved));touch('websites');touch(`website:${website.id}`);onSave?.();@@ -20,26 +20,26 @@ export function WebsiteEditForm({ websiteId, onSave }: { websiteId: string; onSareturn (<Form onSubmit={handleSubmit} error={getErrorMessage(error)} values={website}>- <FormField name="id" label={formatMessage(labels.websiteId)}>+ <FormField name="id" label={t(labels.websiteId)}><TextField data-test="text-field-websiteId" value={website?.id} isReadOnly allowCopy /></FormField><FormField- label={formatMessage(labels.name)}+ label={t(labels.name)}data-test="input-name"name="name"- rules={{ required: formatMessage(labels.required) }}+ rules={{ required: t(labels.required) }}><TextField /></FormField><FormField- label={formatMessage(labels.domain)}+ label={t(labels.domain)}data-test="input-domain"name="domain"rules={{- required: formatMessage(labels.required),+ required: t(labels.required),pattern: {value: DOMAIN_REGEX,- message: formatMessage(messages.invalidDomain),+ message: t(messages.invalidDomain),},}}>@@ -47,7 +47,7 @@ export function WebsiteEditForm({ websiteId, onSave }: { websiteId: string; onSa</FormField><FormButtons><FormSubmitButton data-test="button-submit" variant="primary">- {formatMessage(labels.save)}+ {t(labels.save)}</FormSubmitButton></FormButtons></Form>diff --git a/src/app/(main)/websites/[websiteId]/settings/WebsiteResetForm.tsx b/src/app/(main)/websites/[websiteId]/settings/WebsiteResetForm.tsxindex d791bc965..72a308eb0 100644--- a/src/app/(main)/websites/[websiteId]/settings/WebsiteResetForm.tsx+++ b/src/app/(main)/websites/[websiteId]/settings/WebsiteResetForm.tsx@@ -12,7 +12,7 @@ export function WebsiteResetForm({onSave?: () => void;onClose?: () => void;}) {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const { mutateAsync, isPending, error } = useUpdateQuery(`/websites/${websiteId}/reset`);const handleConfirm = async () => {@@ -31,7 +31,7 @@ export function WebsiteResetForm({onClose={onClose}isLoading={isPending}error={error}- buttonLabel={formatMessage(labels.reset)}+ buttonLabel={t(labels.reset)}/>);}diff --git a/src/app/(main)/websites/[websiteId]/settings/WebsiteSettingsHeader.tsx b/src/app/(main)/websites/[websiteId]/settings/WebsiteSettingsHeader.tsxindex 4332577b7..ec9eb0b81 100644--- a/src/app/(main)/websites/[websiteId]/settings/WebsiteSettingsHeader.tsx+++ b/src/app/(main)/websites/[websiteId]/settings/WebsiteSettingsHeader.tsx@@ -7,14 +7,14 @@ import { ArrowLeft, Globe } from '@/components/icons';export function WebsiteSettingsHeader() {const website = useWebsite();- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const { renderUrl } = useNavigation();return (<><Row marginTop="6"><Link href={renderUrl(`/websites/${website.id}`)}>- <IconLabel icon={<ArrowLeft />} label={formatMessage(labels.website)} />+ <IconLabel icon={<ArrowLeft />} label={t(labels.website)} /></Link></Row><PageHeader title={website?.name} description={website?.domain} icon={<Globe />} />diff --git a/src/app/(main)/websites/[websiteId]/settings/WebsiteShareForm.tsx b/src/app/(main)/websites/[websiteId]/settings/WebsiteShareForm.tsxindex 2ba9764d2..57b52cfb7 100644--- a/src/app/(main)/websites/[websiteId]/settings/WebsiteShareForm.tsx+++ b/src/app/(main)/websites/[websiteId]/settings/WebsiteShareForm.tsx@@ -11,7 +11,7 @@ export interface WebsiteShareFormProps {}export function WebsiteShareForm({ websiteId }: WebsiteShareFormProps) {- const { formatMessage, labels, messages } = useMessages();+ const { t, labels, messages } = useMessages();const { data, error, isLoading } = useWebsiteSharesQuery({ websiteId });const shares = data?.data || [];@@ -21,11 +21,11 @@ export function WebsiteShareForm({ websiteId }: WebsiteShareFormProps) {<LoadingPanel data={data} isLoading={isLoading} error={error}><Column gap="4"><Row justifyContent="space-between" alignItems="center">- <Heading>{formatMessage(labels.share)}</Heading>+ <Heading>{t(labels.share)}</Heading><DialogButtonicon={<Plus size={16} />}- label={formatMessage(labels.add)}- title={formatMessage(labels.share)}+ label={t(labels.add)}+ title={t(labels.share)}variant="primary"width="600px">@@ -34,12 +34,12 @@ export function WebsiteShareForm({ websiteId }: WebsiteShareFormProps) {</Row>{hasShares ? (<>- <Text>{formatMessage(messages.shareUrl)}</Text>+ <Text>{t(messages.shareUrl)}</Text><SharesTable data={shares} /></>) : (- <Text color="muted">{formatMessage(messages.noDataAvailable)}</Text>+ <Text color="muted">{t(messages.noDataAvailable)}</Text>)}</Column></LoadingPanel>diff --git a/src/app/(main)/websites/[websiteId]/settings/WebsiteTrackingCode.tsx b/src/app/(main)/websites/[websiteId]/settings/WebsiteTrackingCode.tsxindex d24f9485d..4fdf7ca70 100644--- a/src/app/(main)/websites/[websiteId]/settings/WebsiteTrackingCode.tsx+++ b/src/app/(main)/websites/[websiteId]/settings/WebsiteTrackingCode.tsx@@ -10,7 +10,7 @@ export function WebsiteTrackingCode({websiteId: string;hostUrl?: string;}) {- const { formatMessage, messages, labels } = useMessages();+ const { t, messages, labels } = useMessages();const config = useConfig();const trackerScriptName =@@ -32,8 +32,8 @@ export function WebsiteTrackingCode({return (<Column gap>- <Label>{formatMessage(labels.trackingCode)}</Label>- <Text color="muted">{formatMessage(messages.trackingCode)}</Text>+ <Label>{t(labels.trackingCode)}</Label>+ <Text color="muted">{t(messages.trackingCode)}</Text><TextField value={code} isReadOnly allowCopy asTextArea resize="none" /></Column>);diff --git a/src/app/(main)/websites/[websiteId]/settings/WebsiteTransferForm.tsx b/src/app/(main)/websites/[websiteId]/settings/WebsiteTransferForm.tsxindex 8af4f05c2..ce54f8199 100644--- a/src/app/(main)/websites/[websiteId]/settings/WebsiteTransferForm.tsx+++ b/src/app/(main)/websites/[websiteId]/settings/WebsiteTransferForm.tsx@@ -31,7 +31,7 @@ export function WebsiteTransferForm({const { user } = useLoginQuery();const website = useWebsite();const [teamId, setTeamId] = useState<string>(null);- const { formatMessage, labels, messages, getErrorMessage } = useMessages();+ const { t, labels, messages, getErrorMessage } = useMessages();const { mutateAsync, error, isPending } = useUpdateQuery(`/websites/${websiteId}/transfer`);const { data: teams, isLoading } = useUserTeamsQuery(user.id);const isTeamWebsite = !!website?.teamId;@@ -70,9 +70,7 @@ export function WebsiteTransferForm({return (<Form onSubmit={handleSubmit} error={getErrorMessage(error)} values={{ teamId }}><Text>- {formatMessage(- isTeamWebsite ? messages.transferTeamWebsiteToUser : messages.transferUserWebsiteToTeam,- )}+ {t(isTeamWebsite ? messages.transferTeamWebsiteToUser : messages.transferUserWebsiteToTeam)}</Text><FormField name="teamId">{!isTeamWebsite && (@@ -88,13 +86,13 @@ export function WebsiteTransferForm({)}</FormField><FormButtons>- <Button onPress={onClose}>{formatMessage(labels.cancel)}</Button>+ <Button onPress={onClose}>{t(labels.cancel)}</Button><FormSubmitButtonvariant="primary"isPending={isPending}isDisabled={!isTeamWebsite && !teamId}>- {formatMessage(labels.transfer)}+ {t(labels.transfer)}</FormSubmitButton></FormButtons></Form>diff --git a/src/app/login/LoginForm.tsx b/src/app/login/LoginForm.tsxindex 26d78dd54..936a30e77 100644--- a/src/app/login/LoginForm.tsx+++ b/src/app/login/LoginForm.tsx@@ -16,7 +16,7 @@ import { setClientAuthToken } from '@/lib/client';import { setUser } from '@/store/app';export function LoginForm() {- const { formatMessage, labels, getErrorMessage } = useMessages();+ const { t, labels, getErrorMessage } = useMessages();const router = useRouter();const { mutateAsync, error } = useUpdateQuery('/auth/login');@@ -38,19 +38,19 @@ export function LoginForm() {<Heading>umami</Heading><Form onSubmit={handleSubmit} error={getErrorMessage(error)}><FormField- label={formatMessage(labels.username)}+ label={t(labels.username)}data-test="input-username"name="username"- rules={{ required: formatMessage(labels.required) }}+ rules={{ required: t(labels.required) }}><TextField autoComplete="username" /></FormField><FormField- label={formatMessage(labels.password)}+ label={t(labels.password)}data-test="input-password"name="password"- rules={{ required: formatMessage(labels.required) }}+ rules={{ required: t(labels.required) }}><PasswordField autoComplete="current-password" /></FormField>@@ -61,7 +61,7 @@ export function LoginForm() {style={{ flex: 1 }}isDisabled={false}>- {formatMessage(labels.login)}+ {t(labels.login)}</FormSubmitButton></FormButtons></Form>diff --git a/src/app/not-found.tsx b/src/app/not-found.tsxindex b37615134..fe7e70442 100644--- a/src/app/not-found.tsx+++ b/src/app/not-found.tsx@@ -3,11 +3,11 @@ import { Flexbox } from '@umami/react-zen';import { useMessages } from '@/components/hooks';export default function () {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();return (<Flexbox alignItems="center" justifyContent="center" flexGrow="1" minHeight="600px">- <h1>{formatMessage(labels.pageNotFound)}</h1>+ <h1>{t(labels.pageNotFound)}</h1></Flexbox>);}diff --git a/src/app/share/[slug]/[[...path]]/ShareNav.tsx b/src/app/share/[slug]/[[...path]]/ShareNav.tsxindex c05be050d..8afe1ce64 100644--- a/src/app/share/[slug]/[[...path]]/ShareNav.tsx+++ b/src/app/share/[slug]/[[...path]]/ShareNav.tsx@@ -16,7 +16,7 @@ export function ShareNav({onItemClick?: () => void;}) {const share = useShare();- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const { pathname } = useNavigation();const { slug, parameters, whiteLabel } = share;@@ -29,41 +29,41 @@ export function ShareNav({const allItems = [{section: 'traffic',- label: formatMessage(labels.traffic),+ label: t(labels.traffic),items: [{id: 'overview',- label: formatMessage(labels.overview),+ label: t(labels.overview),icon: <Eye />,path: renderPath(''),},{id: 'events',- label: formatMessage(labels.events),+ label: t(labels.events),icon: <Lightning />,path: renderPath('/events'),},{id: 'sessions',- label: formatMessage(labels.sessions),+ label: t(labels.sessions),icon: <User />,path: renderPath('/sessions'),},{id: 'realtime',- label: formatMessage(labels.realtime),+ label: t(labels.realtime),icon: <Clock />,path: renderPath('/realtime'),},{id: 'compare',- label: formatMessage(labels.compare),+ label: t(labels.compare),icon: <AlignEndHorizontal />,path: renderPath('/compare'),},{id: 'breakdown',- label: formatMessage(labels.breakdown),+ label: t(labels.breakdown),icon: <Sheet />,path: renderPath('/breakdown'),},@@ -71,29 +71,29 @@ export function ShareNav({},{section: 'behavior',- label: formatMessage(labels.behavior),+ label: t(labels.behavior),items: [{id: 'goals',- label: formatMessage(labels.goals),+ label: t(labels.goals),icon: <Target />,path: renderPath('/goals'),},{id: 'funnels',- label: formatMessage(labels.funnels),+ label: t(labels.funnels),icon: <Funnel />,path: renderPath('/funnels'),},{id: 'journeys',- label: formatMessage(labels.journeys),+ label: t(labels.journeys),icon: <Path />,path: renderPath('/journeys'),},{id: 'retention',- label: formatMessage(labels.retention),+ label: t(labels.retention),icon: <Magnet />,path: renderPath('/retention'),},@@ -101,23 +101,23 @@ export function ShareNav({},{section: 'growth',- label: formatMessage(labels.growth),+ label: t(labels.growth),items: [{id: 'utm',- label: formatMessage(labels.utm),+ label: t(labels.utm),icon: <Tag />,path: renderPath('/utm'),},{id: 'revenue',- label: formatMessage(labels.revenue),+ label: t(labels.revenue),icon: <Money />,path: renderPath('/revenue'),},{id: 'attribution',- label: formatMessage(labels.attribution),+ label: t(labels.attribution),icon: <Network />,path: renderPath('/attribution'),},diff --git a/src/components/common/ConfirmationForm.tsx b/src/components/common/ConfirmationForm.tsxindex b909ef58a..fd7663369 100644--- a/src/components/common/ConfirmationForm.tsx+++ b/src/components/common/ConfirmationForm.tsx@@ -21,20 +21,20 @@ export function ConfirmationForm({onConfirm,onClose,}: ConfirmationFormProps) {- const { formatMessage, labels, getErrorMessage } = useMessages();+ const { t, labels, getErrorMessage } = useMessages();return (<Form onSubmit={onConfirm} error={getErrorMessage(error)}><Box marginY="4">{message}</Box><FormButtons>- <Button onPress={onClose}>{formatMessage(labels.cancel)}</Button>+ <Button onPress={onClose}>{t(labels.cancel)}</Button><FormSubmitButtondata-test="button-confirm"isLoading={isLoading}variant={buttonVariant}isDisabled={false}>- {buttonLabel || formatMessage(labels.ok)}+ {buttonLabel || t(labels.ok)}</FormSubmitButton></FormButtons></Form>diff --git a/src/components/common/DataGrid.tsx b/src/components/common/DataGrid.tsxindex b98367e2f..e01891a5f 100644--- a/src/components/common/DataGrid.tsx+++ b/src/components/common/DataGrid.tsx@@ -37,7 +37,7 @@ export function DataGrid({renderEmpty = () => <Empty />,children,}: DataGridProps) {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const { data, error, isLoading, isFetching } = query;const { router, updateParams, query: queryParams } = useNavigation();const [search, setSearch] = useState(queryParams?.search || data?.search || '');@@ -70,7 +70,7 @@ export function DataGrid({onSearch={handleSearch}delay={searchDelay || DEFAULT_SEARCH_DELAY}autoFocus={autoFocus}- placeholder={formatMessage(labels.search)}+ placeholder={t(labels.search)}/>{renderActions?.()}</Row>diff --git a/src/components/common/Empty.tsx b/src/components/common/Empty.tsxindex 8bd8d82db..3f1374c7c 100644--- a/src/components/common/Empty.tsx+++ b/src/components/common/Empty.tsx@@ -6,7 +6,7 @@ export interface EmptyProps {}export function Empty({ message }: EmptyProps) {- const { formatMessage, messages } = useMessages();+ const { t, messages } = useMessages();return (<Row@@ -18,7 +18,7 @@ export function Empty({ message }: EmptyProps) {minHeight="70px"flexGrow={1}>- {message || formatMessage(messages.noDataAvailable)}+ {message || t(messages.noDataAvailable)}</Row>);}diff --git a/src/components/common/ErrorBoundary.tsx b/src/components/common/ErrorBoundary.tsxindex 4c0c82ed3..e70c193a3 100644--- a/src/components/common/ErrorBoundary.tsx+++ b/src/components/common/ErrorBoundary.tsx@@ -9,7 +9,7 @@ const logError = (error: Error, info: ErrorInfo) => {};export function ErrorBoundary({ children }: { children: ReactNode }) {- const { formatMessage, messages } = useMessages();+ const { t, messages } = useMessages();const fallbackRender = ({ error, resetErrorBoundary }) => {return (@@ -22,7 +22,7 @@ export function ErrorBoundary({ children }: { children: ReactNode }) {justifyContent="center"alignItems="center">- <h1>{formatMessage(messages.error)}</h1>+ <h1>{t(messages.error)}</h1><h3>{error.message}</h3><pre>{error.stack}</pre><Button onClick={resetErrorBoundary}>OK</Button>diff --git a/src/components/common/ErrorMessage.tsx b/src/components/common/ErrorMessage.tsxindex 3c3015131..a1ff16bb8 100644--- a/src/components/common/ErrorMessage.tsx+++ b/src/components/common/ErrorMessage.tsx@@ -3,14 +3,14 @@ import { useMessages } from '@/components/hooks';import { AlertTriangle } from '@/components/icons';export function ErrorMessage() {- const { formatMessage, messages } = useMessages();+ const { t, messages } = useMessages();return (<Row alignItems="center" justifyContent="center" gap><Icon><AlertTriangle /></Icon>- <Text>{formatMessage(messages.error)}</Text>+ <Text>{t(messages.error)}</Text></Row>);}diff --git a/src/components/common/FilterLink.tsx b/src/components/common/FilterLink.tsxindex d719a37e8..df9eab9b7 100644--- a/src/components/common/FilterLink.tsx+++ b/src/components/common/FilterLink.tsx@@ -14,7 +14,7 @@ export interface FilterLinkProps extends HTMLAttributes<HTMLDivElement> {export function FilterLink({ type, value, label, externalUrl, icon }: FilterLinkProps) {const [showLink, setShowLink] = useState(false);- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const { updateParams, query } = useNavigation();const active = query[type] !== undefined;const selected = query[type] === value;@@ -29,7 +29,7 @@ export function FilterLink({ type, value, label, externalUrl, icon }: FilterLinkonMouseOut={() => setShowLink(false)}>{icon}- {!value && `(${label || formatMessage(labels.unknown)})`}+ {!value && `(${label || t(labels.unknown)})`}{value && (<Text title={label || value} truncate><Link href={updateParams({ [type]: `eq.${value}` })} replace>diff --git a/src/components/common/PageBody.tsx b/src/components/common/PageBody.tsxindex 9feab71fe..45bfdc8bb 100644--- a/src/components/common/PageBody.tsx+++ b/src/components/common/PageBody.tsx@@ -17,10 +17,10 @@ export function PageBody({isLoading?: boolean;children?: ReactNode;} & ColumnProps) {- const { formatMessage, messages } = useMessages();+ const { t, messages } = useMessages();if (error) {- return <AlertBanner title={formatMessage(messages.error)} variant="error" />;+ return <AlertBanner title={t(messages.error)} variant="error" />;}if (isLoading) {diff --git a/src/components/common/Pager.tsx b/src/components/common/Pager.tsxindex c65e2f6ab..128d33e24 100644--- a/src/components/common/Pager.tsx+++ b/src/components/common/Pager.tsx@@ -11,7 +11,7 @@ export interface PagerProps {}export function Pager({ page, pageSize, count, onPageChange }: PagerProps) {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const maxPage = pageSize && count ? Math.ceil(+count / +pageSize) : 0;const lastPage = page === maxPage;const firstPage = page === 1;@@ -34,10 +34,10 @@ export function Pager({ page, pageSize, count, onPageChange }: PagerProps) {return (<Row alignItems="center" justifyContent="space-between" gap="3" flexGrow={1}>- <Text>{formatMessage(labels.numberOfRecords, { x: count.toLocaleString() })}</Text>+ <Text>{t(labels.numberOfRecords, { x: count.toLocaleString() })}</Text><Row alignItems="center" justifyContent="flex-end" gap="3"><Text>- {formatMessage(labels.pageOf, {+ {t(labels.pageOf, {current: page.toLocaleString(),total: maxPage.toLocaleString(),})}diff --git a/src/components/common/Panel.tsx b/src/components/common/Panel.tsxindex 0eba55677..0af322bc6 100644--- a/src/components/common/Panel.tsx+++ b/src/components/common/Panel.tsx@@ -36,7 +36,7 @@ export function Panel({width,...props}: PanelProps) {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const [isFullscreen, setIsFullscreen] = useState(false);const handleFullscreen = () => {@@ -62,7 +62,7 @@ export function Panel({<Button size="sm" variant="quiet" onPress={handleFullscreen}><Icon>{isFullscreen ? <X /> : <Maximize />}</Icon></Button>- <Tooltip>{formatMessage(labels.maximize)}</Tooltip>+ <Tooltip>{t(labels.maximize)}</Tooltip></TooltipTrigger></Row>)}diff --git a/src/components/common/TypeConfirmationForm.tsx b/src/components/common/TypeConfirmationForm.tsxindex 1121fa7d6..3b6413cf0 100644--- a/src/components/common/TypeConfirmationForm.tsx+++ b/src/components/common/TypeConfirmationForm.tsx@@ -25,7 +25,7 @@ export function TypeConfirmationForm({onConfirm?: () => void;onClose?: () => void;}) {- const { formatMessage, labels, messages, getErrorMessage } = useMessages();+ const { t, labels, messages, getErrorMessage } = useMessages();if (!confirmationValue) {return null;}@@ -33,21 +33,21 @@ export function TypeConfirmationForm({return (<Form onSubmit={onConfirm} error={getErrorMessage(error)}><p>- {formatMessage(messages.actionConfirmation, {+ {t(messages.actionConfirmation, {confirmation: confirmationValue,})}</p><FormField- label={formatMessage(labels.confirm)}+ label={t(labels.confirm)}name="confirm"rules={{ validate: value => value === confirmationValue }}><TextField autoComplete="off" /></FormField><FormButtons>- <Button onPress={onClose}>{formatMessage(labels.cancel)}</Button>+ <Button onPress={onClose}>{t(labels.cancel)}</Button><FormSubmitButton isLoading={isLoading} variant={buttonVariant}>- {buttonLabel || formatMessage(labels.ok)}+ {buttonLabel || t(labels.ok)}</FormSubmitButton></FormButtons></Form>diff --git a/src/components/hooks/useFields.ts b/src/components/hooks/useFields.tsindex 644be3a03..7b473cf89 100644--- a/src/components/hooks/useFields.ts+++ b/src/components/hooks/useFields.ts@@ -10,132 +10,132 @@ export interface Field {}export function useFields() {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const fields: Field[] = [{name: 'path',- filterLabel: formatMessage(labels.path),- label: formatMessage(labels.path),+ filterLabel: t(labels.path),+ label: t(labels.path),group: 'url',},{name: 'query',- filterLabel: formatMessage(labels.query),- label: formatMessage(labels.query),+ filterLabel: t(labels.query),+ label: t(labels.query),group: 'url',},{name: 'title',- filterLabel: formatMessage(labels.pageTitle),- label: formatMessage(labels.pageTitle),+ filterLabel: t(labels.pageTitle),+ label: t(labels.pageTitle),group: 'url',},{name: 'referrer',- filterLabel: formatMessage(labels.referrer),- label: formatMessage(labels.referrer),+ filterLabel: t(labels.referrer),+ label: t(labels.referrer),group: 'sources',},{name: 'country',- filterLabel: formatMessage(labels.country),- label: formatMessage(labels.country),+ filterLabel: t(labels.country),+ label: t(labels.country),group: 'location',},{name: 'region',- filterLabel: formatMessage(labels.region),- label: formatMessage(labels.region),+ filterLabel: t(labels.region),+ label: t(labels.region),group: 'location',},{name: 'city',- filterLabel: formatMessage(labels.city),- label: formatMessage(labels.city),+ filterLabel: t(labels.city),+ label: t(labels.city),group: 'location',},{name: 'browser',- filterLabel: formatMessage(labels.browser),- label: formatMessage(labels.browser),+ filterLabel: t(labels.browser),+ label: t(labels.browser),group: 'environment',},{name: 'os',- filterLabel: formatMessage(labels.os),- label: formatMessage(labels.os),+ filterLabel: t(labels.os),+ label: t(labels.os),group: 'environment',},{name: 'device',- filterLabel: formatMessage(labels.device),- label: formatMessage(labels.device),+ filterLabel: t(labels.device),+ label: t(labels.device),group: 'environment',},{name: 'utmSource',- filterLabel: formatMessage(labels.source),- label: formatMessage(labels.utmSource),+ filterLabel: t(labels.source),+ label: t(labels.utmSource),group: 'utm',},{name: 'utmMedium',- filterLabel: formatMessage(labels.medium),- label: formatMessage(labels.utmMedium),+ filterLabel: t(labels.medium),+ label: t(labels.utmMedium),group: 'utm',},{name: 'utmCampaign',- filterLabel: formatMessage(labels.campaign),- label: formatMessage(labels.utmCampaign),+ filterLabel: t(labels.campaign),+ label: t(labels.utmCampaign),group: 'utm',},{name: 'utmContent',- filterLabel: formatMessage(labels.content),- label: formatMessage(labels.utmContent),+ filterLabel: t(labels.content),+ label: t(labels.utmContent),group: 'utm',},{name: 'utmTerm',- filterLabel: formatMessage(labels.term),- label: formatMessage(labels.utmTerm),+ filterLabel: t(labels.term),+ label: t(labels.utmTerm),group: 'utm',},{name: 'hostname',- filterLabel: formatMessage(labels.hostname),- label: formatMessage(labels.hostname),+ filterLabel: t(labels.hostname),+ label: t(labels.hostname),group: 'other',},{name: 'distinctId',- filterLabel: formatMessage(labels.distinctId),- label: formatMessage(labels.distinctId),+ filterLabel: t(labels.distinctId),+ label: t(labels.distinctId),group: 'other',},{name: 'tag',- filterLabel: formatMessage(labels.tag),- label: formatMessage(labels.tag),+ filterLabel: t(labels.tag),+ label: t(labels.tag),group: 'other',},{name: 'event',- filterLabel: formatMessage(labels.event),- label: formatMessage(labels.event),+ filterLabel: t(labels.event),+ label: t(labels.event),group: 'other',},];const groupLabels: { key: FieldGroup; label: string }[] = [- { key: 'url', label: formatMessage(labels.url) },- { key: 'sources', label: formatMessage(labels.sources) },- { key: 'location', label: formatMessage(labels.location) },- { key: 'environment', label: formatMessage(labels.environment) },- { key: 'utm', label: formatMessage(labels.utm) },- { key: 'other', label: formatMessage(labels.other) },+ { key: 'url', label: t(labels.url) },+ { key: 'sources', label: t(labels.sources) },+ { key: 'location', label: t(labels.location) },+ { key: 'environment', label: t(labels.environment) },+ { key: 'utm', label: t(labels.utm) },+ { key: 'other', label: t(labels.other) },];return { fields, groupLabels };diff --git a/src/components/hooks/useFilters.ts b/src/components/hooks/useFilters.tsindex 850e2afb1..0dd9a00bb 100644--- a/src/components/hooks/useFilters.ts+++ b/src/components/hooks/useFilters.ts@@ -5,45 +5,45 @@ import { useMessages } from './useMessages';import { useNavigation } from './useNavigation';export function useFilters() {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const { query } = useNavigation();const { fields } = useFields();const operators = [- { name: 'eq', type: 'string', label: formatMessage(labels.is) },- { name: 'neq', type: 'string', label: formatMessage(labels.isNot) },- { name: 'c', type: 'string', label: formatMessage(labels.contains) },- { name: 'dnc', type: 'string', label: formatMessage(labels.doesNotContain) },- { name: 'i', type: 'array', label: formatMessage(labels.includes) },- { name: 'dni', type: 'array', label: formatMessage(labels.doesNotInclude) },- { name: 't', type: 'boolean', label: formatMessage(labels.isTrue) },- { name: 'f', type: 'boolean', label: formatMessage(labels.isFalse) },- { name: 'eq', type: 'number', label: formatMessage(labels.is) },- { name: 'neq', type: 'number', label: formatMessage(labels.isNot) },- { name: 'gt', type: 'number', label: formatMessage(labels.greaterThan) },- { name: 'lt', type: 'number', label: formatMessage(labels.lessThan) },- { name: 'gte', type: 'number', label: formatMessage(labels.greaterThanEquals) },- { name: 'lte', type: 'number', label: formatMessage(labels.lessThanEquals) },- { name: 'bf', type: 'date', label: formatMessage(labels.before) },- { name: 'af', type: 'date', label: formatMessage(labels.after) },- { name: 'eq', type: 'uuid', label: formatMessage(labels.is) },+ { name: 'eq', type: 'string', label: t(labels.is) },+ { name: 'neq', type: 'string', label: t(labels.isNot) },+ { name: 'c', type: 'string', label: t(labels.contains) },+ { name: 'dnc', type: 'string', label: t(labels.doesNotContain) },+ { name: 'i', type: 'array', label: t(labels.includes) },+ { name: 'dni', type: 'array', label: t(labels.doesNotInclude) },+ { name: 't', type: 'boolean', label: t(labels.isTrue) },+ { name: 'f', type: 'boolean', label: t(labels.isFalse) },+ { name: 'eq', type: 'number', label: t(labels.is) },+ { name: 'neq', type: 'number', label: t(labels.isNot) },+ { name: 'gt', type: 'number', label: t(labels.greaterThan) },+ { name: 'lt', type: 'number', label: t(labels.lessThan) },+ { name: 'gte', type: 'number', label: t(labels.greaterThanEquals) },+ { name: 'lte', type: 'number', label: t(labels.lessThanEquals) },+ { name: 'bf', type: 'date', label: t(labels.before) },+ { name: 'af', type: 'date', label: t(labels.after) },+ { name: 'eq', type: 'uuid', label: t(labels.is) },];const operatorLabels = {- [OPERATORS.equals]: formatMessage(labels.is),- [OPERATORS.notEquals]: formatMessage(labels.isNot),- [OPERATORS.set]: formatMessage(labels.isSet),- [OPERATORS.notSet]: formatMessage(labels.isNotSet),- [OPERATORS.contains]: formatMessage(labels.contains),- [OPERATORS.doesNotContain]: formatMessage(labels.doesNotContain),- [OPERATORS.true]: formatMessage(labels.true),- [OPERATORS.false]: formatMessage(labels.false),- [OPERATORS.greaterThan]: formatMessage(labels.greaterThan),- [OPERATORS.lessThan]: formatMessage(labels.lessThan),- [OPERATORS.greaterThanEquals]: formatMessage(labels.greaterThanEquals),- [OPERATORS.lessThanEquals]: formatMessage(labels.lessThanEquals),- [OPERATORS.before]: formatMessage(labels.before),- [OPERATORS.after]: formatMessage(labels.after),+ [OPERATORS.equals]: t(labels.is),+ [OPERATORS.notEquals]: t(labels.isNot),+ [OPERATORS.set]: t(labels.isSet),+ [OPERATORS.notSet]: t(labels.isNotSet),+ [OPERATORS.contains]: t(labels.contains),+ [OPERATORS.doesNotContain]: t(labels.doesNotContain),+ [OPERATORS.true]: t(labels.true),+ [OPERATORS.false]: t(labels.false),+ [OPERATORS.greaterThan]: t(labels.greaterThan),+ [OPERATORS.lessThan]: t(labels.lessThan),+ [OPERATORS.greaterThanEquals]: t(labels.greaterThanEquals),+ [OPERATORS.lessThanEquals]: t(labels.lessThanEquals),+ [OPERATORS.before]: t(labels.before),+ [OPERATORS.after]: t(labels.after),};const typeFilters = {diff --git a/src/components/hooks/useFormat.ts b/src/components/hooks/useFormat.tsindex 896fa0769..998102c31 100644--- a/src/components/hooks/useFormat.ts+++ b/src/components/hooks/useFormat.ts@@ -6,7 +6,7 @@ import { useLocale } from './useLocale';import { useMessages } from './useMessages';export function useFormat() {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const { locale } = useLocale();const { countryNames } = useCountryNames(locale);const { languageNames } = useLanguageNames(locale);@@ -20,7 +20,7 @@ export function useFormat() {};const formatDevice = (value: string): string => {- return formatMessage(labels[value] || labels.unknown);+ return t(labels[value] || labels.unknown);};const formatCountry = (value: string): string => {diff --git a/src/components/hooks/useMessages.ts b/src/components/hooks/useMessages.tsindex ec2088ed9..b8ed46f2e 100644--- a/src/components/hooks/useMessages.ts+++ b/src/components/hooks/useMessages.ts@@ -1,47 +1,11 @@import { useTranslations } from 'next-intl';-import { createElement, type ReactNode } from 'react';-import { labels, type MessageDescriptor, messages } from '@/components/messages';+import { labels, messages } from '@/components/messages';import type { ApiError } from '@/lib/types';-type FormatMessage = (- descriptor: MessageDescriptor,- values?: Record<string, string | number | boolean | null | undefined>,- opts?: any,-) => string | null;--interface FormattedMessageProps extends MessageDescriptor {- values?: Record<string, ReactNode>;-}--interface UseMessages {- formatMessage: FormatMessage;- messages: typeof messages;- labels: typeof labels;- getMessage: (id: string) => string;- getErrorMessage: (error: ApiError) => string | undefined;- FormattedMessage: (props: FormattedMessageProps) => ReactNode;-}--export function useMessages(): UseMessages {+export function useMessages() {const t = useTranslations();- const formatMessage = (- descriptor: MessageDescriptor,- values?: Record<string, string | number | boolean | null | undefined>,- ) => {- if (!descriptor) return null;- try {- return t(descriptor.id, values);- } catch {- return descriptor.defaultMessage || descriptor.id;- }- };-- const getMessage = (id: string) => {- const message = Object.values(messages).find(value => value.id === `message.${id}`);-- return message ? formatMessage(message) : id;- };+ const getMessage = (id: string) => t(`message.${id}`);const getErrorMessage = (error: ApiError) => {if (!error) {@@ -53,50 +17,5 @@ export function useMessages(): UseMessages {return code ? getMessage(code) : error?.message || 'Unknown error';};- function FormattedMessage({ id, defaultMessage, values }: FormattedMessageProps) {- if (- !values ||- Object.values(values).every(v => typeof v === 'string' || typeof v === 'number')- ) {- try {- return t(id, values as any);- } catch {- return defaultMessage || id;- }- }-- // For JSX values: get the raw ICU template and manually interpolate- let template: string;- try {- template = t.raw(id) as string;- } catch {- template = defaultMessage || id;- }-- if (typeof template !== 'string') {- return defaultMessage || id;- }-- // Split on {placeholder} tokens and interleave with values- const parts: ReactNode[] = [];- const regex = /\{(\w+)\}/g;- let lastIndex = 0;-- for (let match = regex.exec(template); match !== null; match = regex.exec(template)) {- if (match.index > lastIndex) {- parts.push(template.slice(lastIndex, match.index));- }- const key = match[1];- parts.push(values[key] !== undefined ? values[key] : match[0]);- lastIndex = regex.lastIndex;- }-- if (lastIndex < template.length) {- parts.push(template.slice(lastIndex));- }-- return createElement('span', null, ...parts);- }-- return { formatMessage, messages, labels, getMessage, getErrorMessage, FormattedMessage };+ return { t, messages, labels, getMessage, getErrorMessage };}diff --git a/src/components/hooks/useWebsiteNavItems.tsx b/src/components/hooks/useWebsiteNavItems.tsxindex eb43eea49..918a423d6 100644--- a/src/components/hooks/useWebsiteNavItems.tsx+++ b/src/components/hooks/useWebsiteNavItems.tsx@@ -13,7 +13,7 @@ import { useMessages } from './useMessages';import { useNavigation } from './useNavigation';export function useWebsiteNavItems(websiteId: string) {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const { pathname, renderUrl } = useNavigation();const renderPath = (path: string) =>@@ -27,110 +27,110 @@ export function useWebsiteNavItems(websiteId: string) {const items = [{- label: formatMessage(labels.traffic),+ label: t(labels.traffic),items: [{id: 'overview',- label: formatMessage(labels.overview),+ label: t(labels.overview),icon: <Eye />,path: renderPath(''),},{id: 'events',- label: formatMessage(labels.events),+ label: t(labels.events),icon: <Lightning />,path: renderPath('/events'),},{id: 'sessions',- label: formatMessage(labels.sessions),+ label: t(labels.sessions),icon: <User />,path: renderPath('/sessions'),},{id: 'realtime',- label: formatMessage(labels.realtime),+ label: t(labels.realtime),icon: <Clock />,path: renderPath('/realtime'),},{id: 'compare',- label: formatMessage(labels.compare),+ label: t(labels.compare),icon: <AlignEndHorizontal />,path: renderPath('/compare'),},{id: 'breakdown',- label: formatMessage(labels.breakdown),+ label: t(labels.breakdown),icon: <Sheet />,path: renderPath('/breakdown'),},],},{- label: formatMessage(labels.behavior),+ label: t(labels.behavior),items: [{id: 'goals',- label: formatMessage(labels.goals),+ label: t(labels.goals),icon: <Target />,path: renderPath('/goals'),},{id: 'funnel',- label: formatMessage(labels.funnels),+ label: t(labels.funnels),icon: <Funnel />,path: renderPath('/funnels'),},{id: 'journeys',- label: formatMessage(labels.journeys),+ label: t(labels.journeys),icon: <Path />,path: renderPath('/journeys'),},{id: 'retention',- label: formatMessage(labels.retention),+ label: t(labels.retention),icon: <Magnet />,path: renderPath('/retention'),},],},{- label: formatMessage(labels.audience),+ label: t(labels.audience),items: [{id: 'segments',- label: formatMessage(labels.segments),+ label: t(labels.segments),icon: <ChartPie />,path: renderPath('/segments'),},{id: 'cohorts',- label: formatMessage(labels.cohorts),+ label: t(labels.cohorts),icon: <UserPlus />,path: renderPath('/cohorts'),},],},{- label: formatMessage(labels.growth),+ label: t(labels.growth),items: [{id: 'utm',- label: formatMessage(labels.utm),+ label: t(labels.utm),icon: <Tag />,path: renderPath('/utm'),},{id: 'revenue',- label: formatMessage(labels.revenue),+ label: t(labels.revenue),icon: <Money />,path: renderPath('/revenue'),},{id: 'attribution',- label: formatMessage(labels.attribution),+ label: t(labels.attribution),icon: <Network />,path: renderPath('/attribution'),},diff --git a/src/components/input/ActionSelect.tsx b/src/components/input/ActionSelect.tsxindex 616ee3471..79827ea0c 100644--- a/src/components/input/ActionSelect.tsx+++ b/src/components/input/ActionSelect.tsx@@ -7,12 +7,12 @@ export interface ActionSelectProps {}export function ActionSelect({ value = 'path', onChange }: ActionSelectProps) {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();return (<Select value={value} onChange={onChange}>- <ListItem id="path">{formatMessage(labels.viewedPage)}</ListItem>- <ListItem id="event">{formatMessage(labels.triggeredEvent)}</ListItem>+ <ListItem id="path">{t(labels.viewedPage)}</ListItem>+ <ListItem id="event">{t(labels.triggeredEvent)}</ListItem></Select>);}diff --git a/src/components/input/BounceFilter.tsx b/src/components/input/BounceFilter.tsxindex e8a4b31b6..2b5c45388 100644--- a/src/components/input/BounceFilter.tsx+++ b/src/components/input/BounceFilter.tsx@@ -5,7 +5,7 @@ import { useNavigation } from '@/components/hooks/useNavigation';export function BounceFilter() {const { router, query, updateParams } = useNavigation();- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const isSelected = query.excludeBounce === 'true';const handleChange = (value: boolean) => {@@ -19,7 +19,7 @@ export function BounceFilter() {return (<Row alignItems="center" gap><Checkbox isSelected={isSelected} onChange={handleChange}>- {formatMessage(labels.excludeBounce)}+ {t(labels.excludeBounce)}</Checkbox></Row>);diff --git a/src/components/input/CurrencySelect.tsx b/src/components/input/CurrencySelect.tsxindex 84e0ee21d..8bad9821c 100644--- a/src/components/input/CurrencySelect.tsx+++ b/src/components/input/CurrencySelect.tsx@@ -4,12 +4,12 @@ import { useMessages } from '@/components/hooks';import { CURRENCIES } from '@/lib/constants';export function CurrencySelect({ value, onChange }) {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const [search, setSearch] = useState('');return (<Select- label={formatMessage(labels.currency)}+ label={t(labels.currency)}value={value}defaultValue={value}onChange={onChange}diff --git a/src/components/input/DateFilter.tsx b/src/components/input/DateFilter.tsxindex 71014aaf2..ca55bbefa 100644--- a/src/components/input/DateFilter.tsx+++ b/src/components/input/DateFilter.tsx@@ -22,56 +22,56 @@ export function DateFilter({placement = 'bottom',...props}: DateFilterProps) {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const [showPicker, setShowPicker] = useState(false);const { startDate, endDate } = parseDateRange(value) || {};const { isMobile } = useMobile();const options = [- { label: formatMessage(labels.today), value: '0day' },+ { label: t(labels.today), value: '0day' },{- label: formatMessage(labels.lastHours, { x: '24' }),+ label: t(labels.lastHours, { x: '24' }),value: '24hour',},{- label: formatMessage(labels.thisWeek),+ label: t(labels.thisWeek),value: '0week',divider: true,},{- label: formatMessage(labels.lastDays, { x: '7' }),+ label: t(labels.lastDays, { x: '7' }),value: '7day',},{- label: formatMessage(labels.thisMonth),+ label: t(labels.thisMonth),value: '0month',divider: true,},{- label: formatMessage(labels.lastDays, { x: '30' }),+ label: t(labels.lastDays, { x: '30' }),value: '30day',},{- label: formatMessage(labels.lastDays, { x: '90' }),+ label: t(labels.lastDays, { x: '90' }),value: '90day',},- { label: formatMessage(labels.thisYear), value: '0year' },+ { label: t(labels.thisYear), value: '0year' },{- label: formatMessage(labels.lastMonths, { x: '6' }),+ label: t(labels.lastMonths, { x: '6' }),value: '6month',divider: true,},{- label: formatMessage(labels.lastMonths, { x: '12' }),+ label: t(labels.lastMonths, { x: '12' }),value: '12month',},showAllTime && {- label: formatMessage(labels.allTime),+ label: t(labels.allTime),value: 'all',divider: true,},{- label: formatMessage(labels.customRange),+ label: t(labels.customRange),value: 'custom',divider: true,},@@ -107,7 +107,7 @@ export function DateFilter({<Select{...props}value={selectedValue}- placeholder={formatMessage(labels.selectDate)}+ placeholder={t(labels.selectDate)}onChange={handleChange}renderValue={renderValue}popoverProps={{ placement, style: { minWidth: 200 } }}diff --git a/src/components/input/DownloadButton.tsx b/src/components/input/DownloadButton.tsxindex 47e6d00e4..cf961fa4c 100644--- a/src/components/input/DownloadButton.tsx+++ b/src/components/input/DownloadButton.tsx@@ -11,7 +11,7 @@ export function DownloadButton({data?: any;onClick?: () => void;}) {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const handleClick = async () => {downloadCsv(`${filename}.csv`, Papa.unparse(data));@@ -25,7 +25,7 @@ export function DownloadButton({</Icon></Button><Tooltip>- <Text size="sm">{formatMessage(labels.download)}</Text>+ <Text size="sm">{t(labels.download)}</Text></Tooltip></TooltipTrigger>);diff --git a/src/components/input/ExportButton.tsx b/src/components/input/ExportButton.tsxindex 7b65a57bc..04f2a59dc 100644--- a/src/components/input/ExportButton.tsx+++ b/src/components/input/ExportButton.tsx@@ -7,7 +7,7 @@ import { useFilterParameters } from '@/components/hooks/useFilterParameters';import { Download } from '@/components/icons';export function ExportButton({ websiteId }: { websiteId: string }) {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const [isLoading, setIsLoading] = useState(false);const date = useDateParameters();const filters = useFilterParameters();@@ -41,7 +41,7 @@ export function ExportButton({ websiteId }: { websiteId: string }) {<Download /></Icon></LoadingButton>- <Tooltip>{formatMessage(labels.download)}</Tooltip>+ <Tooltip>{t(labels.download)}</Tooltip></TooltipTrigger>);}diff --git a/src/components/input/FieldFilters.tsx b/src/components/input/FieldFilters.tsxindex 2a80bb04a..df2b4cd3f 100644--- a/src/components/input/FieldFilters.tsx+++ b/src/components/input/FieldFilters.tsx@@ -28,7 +28,7 @@ export interface FieldFiltersProps {}export function FieldFilters({ websiteId, value, exclude = [], onChange }: FieldFiltersProps) {- const { formatMessage, messages } = useMessages();+ const { t, messages } = useMessages();const { fields, groupLabels } = useFields();const startDate = subMonths(endOfDay(new Date()), 6);const endDate = endOfDay(new Date());@@ -143,7 +143,7 @@ export function FieldFilters({ websiteId, value, exclude = [], onChange }: Field/>);})}- {!value.length && <Empty message={formatMessage(messages.nothingSelected)} />}+ {!value.length && <Empty message={t(messages.nothingSelected)} />}</Column></Grid>);diff --git a/src/components/input/FilterBar.tsx b/src/components/input/FilterBar.tsxindex 11707949d..d53c45676 100644--- a/src/components/input/FilterBar.tsx+++ b/src/components/input/FilterBar.tsx@@ -21,7 +21,7 @@ import { Bookmark, X } from '@/components/icons';import { isSearchOperator } from '@/lib/params';export function FilterBar({ websiteId }: { websiteId: string }) {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const { formatValue } = useFormat();const {router,@@ -62,7 +62,7 @@ export function FilterBar({ websiteId }: { websiteId: string }) {{segment && !isLoading && (<FilterItemname="segment"- label={formatMessage(labels.segment)}+ label={t(labels.segment)}value={data?.name || segment}operator={operatorLabels.eq}onRemove={() => handleSegmentRemove('segment')}@@ -71,7 +71,7 @@ export function FilterBar({ websiteId }: { websiteId: string }) {{cohort && !isLoading && (<FilterItemname="cohort"- label={formatMessage(labels.cohort)}+ label={t(labels.cohort)}value={data?.name || cohort}operator={operatorLabels.eq}onRemove={() => handleSegmentRemove('cohort')}@@ -103,12 +103,12 @@ export function FilterBar({ websiteId }: { websiteId: string }) {</Icon></Button><Tooltip>- <Text>{formatMessage(labels.saveSegment)}</Text>+ <Text>{t(labels.saveSegment)}</Text></Tooltip></TooltipTrigger>)}<Modal>- <Dialog title={formatMessage(labels.segment)} style={{ width: 800, minHeight: 300 }}>+ <Dialog title={t(labels.segment)} style={{ width: 800, minHeight: 300 }}>{({ close }) => {return <SegmentEditForm websiteId={websiteId} onClose={close} filters={filters} />;}}@@ -122,7 +122,7 @@ export function FilterBar({ websiteId }: { websiteId: string }) {</Icon></Button><Tooltip>- <Text>{formatMessage(labels.clearAll)}</Text>+ <Text>{t(labels.clearAll)}</Text></Tooltip></TooltipTrigger></Row>diff --git a/src/components/input/FilterEditForm.tsx b/src/components/input/FilterEditForm.tsxindex 87acc515f..89877e446 100644--- a/src/components/input/FilterEditForm.tsx+++ b/src/components/input/FilterEditForm.tsx@@ -16,7 +16,7 @@ export function FilterEditForm({ websiteId, onChange, onClose }: FilterEditFormPpathname,} = useNavigation();const { filters } = useFilters();- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const [currentFilters, setCurrentFilters] = useState(filters);const [currentSegment, setCurrentSegment] = useState(segment);const [currentCohort, setCurrentCohort] = useState(cohort);@@ -49,11 +49,11 @@ export function FilterEditForm({ websiteId, onChange, onClose }: FilterEditFormP<Column minHeight="500px"><Tabs><TabList>- <Tab id="fields">{formatMessage(labels.fields)}</Tab>+ <Tab id="fields">{t(labels.fields)}</Tab>{!excludeFilters && (<>- <Tab id="segments">{formatMessage(labels.segments)}</Tab>- <Tab id="cohorts">{formatMessage(labels.cohorts)}</Tab>+ <Tab id="segments">{t(labels.segments)}</Tab>+ <Tab id="cohorts">{t(labels.cohorts)}</Tab></>)}</TabList>@@ -89,11 +89,11 @@ export function FilterEditForm({ websiteId, onChange, onClose }: FilterEditFormP</Tabs></Column><Row alignItems="center" justifyContent="space-between" gap>- <Button onPress={handleReset}>{formatMessage(labels.reset)}</Button>+ <Button onPress={handleReset}>{t(labels.reset)}</Button><Row alignItems="center" justifyContent="flex-end" gridColumn="span 2" gap>- <Button onPress={onClose}>{formatMessage(labels.cancel)}</Button>+ <Button onPress={onClose}>{t(labels.cancel)}</Button><Button variant="primary" onPress={handleSave}>- {formatMessage(labels.apply)}+ {t(labels.apply)}</Button></Row></Row>diff --git a/src/components/input/LookupField.tsx b/src/components/input/LookupField.tsxindex c1d419f74..5b448c8f8 100644--- a/src/components/input/LookupField.tsx+++ b/src/components/input/LookupField.tsx@@ -12,7 +12,7 @@ export interface LookupFieldProps extends ComboBoxProps {}export function LookupField({ websiteId, type, value, onChange, ...props }: LookupFieldProps) {- const { formatMessage, messages } = useMessages();+ const { t, messages } = useMessages();const [search, setSearch] = useState(value);const searchValue = useDebounce(search, 300);const startDate = subMonths(endOfDay(new Date()), 6);@@ -51,7 +51,7 @@ export function LookupField({ websiteId, type, value, onChange, ...props }: LookisLoading ? (<Loading placement="center" icon="dots" />) : (- <Empty message={formatMessage(messages.noResultsFound)} />+ <Empty message={t(messages.noResultsFound)} />)}>diff --git a/src/components/input/NavButton.tsx b/src/components/input/NavButton.tsxindex c5eb1e5ba..9f11ab2a0 100644--- a/src/components/input/NavButton.tsx+++ b/src/components/input/NavButton.tsx@@ -45,7 +45,7 @@ export interface TeamsButtonProps {export function NavButton({ showText = true }: TeamsButtonProps) {const { user } = useLoginQuery();const { cloudMode } = useConfig();- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const { teamId, router } = useNavigation();const { isMobile } = useMobile();const team = user?.teams?.find(({ id }) => id === teamId);@@ -98,18 +98,18 @@ export function NavButton({ showText = true }: TeamsButtonProps) {<Menu autoFocus="last"><SubmenuTrigger><MenuItem id="teams" showChecked={false} showSubMenuIcon>- <IconLabel icon={<Switch />} label={formatMessage(labels.switchAccount)} />+ <IconLabel icon={<Switch />} label={t(labels.switchAccount)} /></MenuItem><Popover placement={isMobile ? 'bottom start' : 'right top'}><Column minWidth="300px"><Menu selectionMode="single" selectedKeys={selectedKeys} onAction={handleAction}>- <MenuSection title={formatMessage(labels.myAccount)}>+ <MenuSection title={t(labels.myAccount)}><MenuItem id="user"><IconLabel icon={<User />} label={user.username} /></MenuItem></MenuSection><MenuSeparator />- <MenuSection title={formatMessage(labels.teams)}>+ <MenuSection title={t(labels.teams)}>{user?.teams?.map(({ id, name }) => (<MenuItem key={id} id={id} href={getUrl(`/teams/${id}`)}><IconLabel icon={<Users />}>@@ -139,7 +139,7 @@ export function NavButton({ showText = true }: TeamsButtonProps) {id="settings"href={getUrl('/settings')}icon={<Settings />}- label={formatMessage(labels.settings)}+ label={t(labels.settings)}/>{cloudMode && (<>@@ -148,7 +148,7 @@ export function NavButton({ showText = true }: TeamsButtonProps) {href={DOCS_URL}target="_blank"icon={<BookText />}- label={formatMessage(labels.documentation)}+ label={t(labels.documentation)}><Icon color="muted"><ExternalLink />@@ -158,7 +158,7 @@ export function NavButton({ showText = true }: TeamsButtonProps) {id="support"href={getUrl('/settings/support')}icon={<LifeBuoy />}- label={formatMessage(labels.support)}+ label={t(labels.support)}/></>)}@@ -169,7 +169,7 @@ export function NavButton({ showText = true }: TeamsButtonProps) {id="/admin"href="/admin"icon={<LockKeyhole />}- label={formatMessage(labels.admin)}+ label={t(labels.admin)}/></>)}@@ -178,7 +178,7 @@ export function NavButton({ showText = true }: TeamsButtonProps) {id="logout"href={getUrl('/logout')}icon={<LogOut />}- label={formatMessage(labels.logout)}+ label={t(labels.logout)}/></Menu></Column>diff --git a/src/components/input/PreferencesButton.tsx b/src/components/input/PreferencesButton.tsxindex 710a7faeb..aa1550ea2 100644--- a/src/components/input/PreferencesButton.tsx+++ b/src/components/input/PreferencesButton.tsx@@ -6,7 +6,7 @@ import { useMessages } from '@/components/hooks';import { Settings } from '@/components/icons';export function PreferencesButton() {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();return (<DialogTrigger>@@ -18,11 +18,11 @@ export function PreferencesButton() {<Popover placement="bottom end"><Panel gap="3"><Column>- <Label>{formatMessage(labels.timezone)}</Label>+ <Label>{t(labels.timezone)}</Label><TimezoneSetting /></Column><Column>- <Label>{formatMessage(labels.defaultDateRange)}</Label>+ <Label>{t(labels.defaultDateRange)}</Label><DateRangeSetting /></Column></Panel>diff --git a/src/components/input/ProfileButton.tsx b/src/components/input/ProfileButton.tsxindex 505cd8889..114c7668c 100644--- a/src/components/input/ProfileButton.tsx+++ b/src/components/input/ProfileButton.tsx@@ -15,27 +15,27 @@ import { useLoginQuery, useMessages, useNavigation } from '@/components/hooks';import { LockKeyhole, LogOut, UserCircle } from '@/components/icons';export function ProfileButton() {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const { user } = useLoginQuery();const { renderUrl } = useNavigation();const items = [{id: 'settings',- label: formatMessage(labels.profile),+ label: t(labels.profile),path: renderUrl('/settings/profile'),icon: <UserCircle />,},user.isAdmin &&!process.env.cloudMode && {id: 'admin',- label: formatMessage(labels.admin),+ label: t(labels.admin),path: '/admin',icon: <LockKeyhole />,},{id: 'logout',- label: formatMessage(labels.logout),+ label: t(labels.logout),path: '/logout',icon: <LogOut />,separator: true,diff --git a/src/components/input/RefreshButton.tsx b/src/components/input/RefreshButton.tsxindex b52f830eb..6163fb7ee 100644--- a/src/components/input/RefreshButton.tsx+++ b/src/components/input/RefreshButton.tsx@@ -10,7 +10,7 @@ export function RefreshButton({websiteId: string;isLoading?: boolean;}) {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const { dateRange } = useDateRange();function handleClick() {@@ -26,7 +26,7 @@ export function RefreshButton({<RefreshCw /></Icon></LoadingButton>- <Tooltip>{formatMessage(labels.refresh)}</Tooltip>+ <Tooltip>{t(labels.refresh)}</Tooltip></TooltipTrigger>);}diff --git a/src/components/input/ReportEditButton.tsx b/src/components/input/ReportEditButton.tsxindex b333077ac..f61899277 100644--- a/src/components/input/ReportEditButton.tsx+++ b/src/components/input/ReportEditButton.tsx@@ -28,7 +28,7 @@ export function ReportEditButton({onDelete?: () => void;children: ({ close }: { close: () => void }) => ReactNode;}) {- const { formatMessage, labels, messages } = useMessages();+ const { t, labels, messages } = useMessages();const [showEdit, setShowEdit] = useState(false);const [showDelete, setShowDelete] = useState(false);const { mutateAsync, touch } = useDeleteQuery(`/reports/${id}`);@@ -70,13 +70,13 @@ export function ReportEditButton({<Icon><Edit /></Icon>- <Text>{formatMessage(labels.edit)}</Text>+ <Text>{t(labels.edit)}</Text></MenuItem><MenuItem id="delete"><Icon><Trash /></Icon>- <Text>{formatMessage(labels.delete)}</Text>+ <Text>{t(labels.delete)}</Text></MenuItem></Menu></Popover>@@ -85,12 +85,12 @@ export function ReportEditButton({{showEdit && children({ close: handleClose })}{showDelete && (<AlertDialog- title={formatMessage(labels.delete)}+ title={t(labels.delete)}onConfirm={handleDelete}onCancel={handleClose}isDanger>- <Row gap="1">{formatMessage(messages.confirmDelete, { target: name })}</Row>+ <Row gap="1">{t(messages.confirmDelete, { target: name })}</Row></AlertDialog>)}</Modal>diff --git a/src/components/input/SegmentSaveButton.tsx b/src/components/input/SegmentSaveButton.tsxindex 5f6cac10d..9acf3ded8 100644--- a/src/components/input/SegmentSaveButton.tsx+++ b/src/components/input/SegmentSaveButton.tsx@@ -4,7 +4,7 @@ import { useMessages } from '@/components/hooks';import { Plus } from '@/components/icons';export function SegmentSaveButton({ websiteId }: { websiteId: string }) {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();return (<DialogTrigger>@@ -12,10 +12,10 @@ export function SegmentSaveButton({ websiteId }: { websiteId: string }) {<Icon><Plus /></Icon>- <Text>{formatMessage(labels.segment)}</Text>+ <Text>{t(labels.segment)}</Text></Button><Modal>- <Dialog title={formatMessage(labels.segment)} style={{ width: 800 }}>+ <Dialog title={t(labels.segment)} style={{ width: 800 }}>{({ close }) => {return <SegmentEditForm websiteId={websiteId} onClose={close} />;}}diff --git a/src/components/input/SettingsButton.tsx b/src/components/input/SettingsButton.tsxindex bd51fb532..797d16314 100644--- a/src/components/input/SettingsButton.tsx+++ b/src/components/input/SettingsButton.tsx@@ -22,7 +22,7 @@ import {import { DOCS_URL } from '@/lib/constants';export function SettingsButton() {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const { user } = useLoginQuery();const { router } = useNavigation();const { cloudMode } = useConfig();@@ -52,30 +52,22 @@ export function SettingsButton() {<Menu autoFocus="last" onAction={handleAction}><MenuSection title={user.username}><MenuSeparator />- <MenuItem id="/settings" icon={<Settings />} label={formatMessage(labels.settings)} />+ <MenuItem id="/settings" icon={<Settings />} label={t(labels.settings)} />{!cloudMode && user.isAdmin && (- <MenuItem id="/admin" icon={<LockKeyhole />} label={formatMessage(labels.admin)} />+ <MenuItem id="/admin" icon={<LockKeyhole />} label={t(labels.admin)} />)}{cloudMode && (<>- <MenuItem- id="/docs"- icon={<BookText />}- label={formatMessage(labels.documentation)}- >+ <MenuItem id="/docs" icon={<BookText />} label={t(labels.documentation)}><Icon color="muted"><ExternalLink /></Icon></MenuItem>- <MenuItem- id="/settings/support"- icon={<LifeBuoy />}- label={formatMessage(labels.support)}- />+ <MenuItem id="/settings/support" icon={<LifeBuoy />} label={t(labels.support)} /></>)}<MenuSeparator />- <MenuItem id="/logout" icon={<LogOut />} label={formatMessage(labels.logout)} />+ <MenuItem id="/logout" icon={<LogOut />} label={t(labels.logout)} /></MenuSection></Menu></Popover>diff --git a/src/components/input/UnitFilter.tsx b/src/components/input/UnitFilter.tsxindex 84a15f350..cabe87eaf 100644--- a/src/components/input/UnitFilter.tsx+++ b/src/components/input/UnitFilter.tsx@@ -4,7 +4,7 @@ import { DATE_RANGE_CONFIG, DEFAULT_DATE_RANGE_VALUE } from '@/lib/constants';import { getItem } from '@/lib/storage';export function UnitFilter() {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const { router, query, updateParams } = useNavigation();const DATE_RANGE_UNIT_CONFIG = {@@ -47,7 +47,7 @@ export function UnitFilter() {const options = unitConfig.availableUnits.map(unit => ({id: unit,- label: formatMessage(labels[unit]),+ label: t(labels[unit]),}));const selectedUnit = query.unit ?? unitConfig.defaultUnit;diff --git a/src/components/input/UserSelect.tsx b/src/components/input/UserSelect.tsxindex 17a697bc2..bd3a766a7 100644--- a/src/components/input/UserSelect.tsx+++ b/src/components/input/UserSelect.tsx@@ -10,7 +10,7 @@ export function UserSelect({}: {teamId?: string;} & SelectProps) {- const { formatMessage, messages } = useMessages();+ const { t, messages } = useMessages();const { data: users, isLoading: usersLoading } = useUsersQuery();const { data: teamMembers, isLoading: teamMembersLoading } = useTeamMembersQuery(teamId);const [username, setUsername] = useState<string>();@@ -51,7 +51,7 @@ export function UserSelect({onChange={handleChange}onOpenChange={handleOpenChange}listProps={{- renderEmptyState: () => <Empty message={formatMessage(messages.noResultsFound)} />,+ renderEmptyState: () => <Empty message={t(messages.noResultsFound)} />,style: { maxHeight: 'calc(42vh - 65px)' },}}>diff --git a/src/components/input/WebsiteDateFilter.tsx b/src/components/input/WebsiteDateFilter.tsxindex 027a4c91a..b8f6ca6e7 100644--- a/src/components/input/WebsiteDateFilter.tsx+++ b/src/components/input/WebsiteDateFilter.tsx@@ -21,7 +21,7 @@ export function WebsiteDateFilter({allowCompare,}: WebsiteDateFilterProps) {const { dateRange, isAllTime, isCustomRange } = useDateRange();- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const {router,updateParams,@@ -93,8 +93,8 @@ export function WebsiteDateFilter({style={{ width: 200 }}popoverProps={{ style: { width: 200 } }}>- <ListItem id="prev">{formatMessage(labels.previousPeriod)}</ListItem>- <ListItem id="yoy">{formatMessage(labels.previousYear)}</ListItem>+ <ListItem id="prev">{t(labels.previousPeriod)}</ListItem>+ <ListItem id="yoy">{t(labels.previousYear)}</ListItem></Select></Row></Row>diff --git a/src/components/input/WebsiteFilterButton.tsx b/src/components/input/WebsiteFilterButton.tsxindex d00c27865..c558374ec 100644--- a/src/components/input/WebsiteFilterButton.tsx+++ b/src/components/input/WebsiteFilterButton.tsx@@ -13,7 +13,7 @@ export function WebsiteFilterButton({position?: 'bottom' | 'top' | 'left' | 'right';alignment?: 'end' | 'center' | 'start';}) {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const { updateParams, pathname, router, query } = useNavigation();const [excludeBounce, setExcludeBounce] = useState(!!query.excludeBounce);const isOverview =@@ -33,7 +33,7 @@ export function WebsiteFilterButton({};return (- <DialogButton icon={<ListFilter />} label={formatMessage(labels.filter)} variant="outline">+ <DialogButton icon={<ListFilter />} label={t(labels.filter)} variant="outline">{({ close }) => {return (<>@@ -44,7 +44,7 @@ export function WebsiteFilterButton({onChange={setExcludeBounce}style={{ marginTop: '3px' }}>- {formatMessage(labels.excludeBounce)}+ {t(labels.excludeBounce)}</Checkbox></Row>)}diff --git a/src/components/input/WebsiteSelect.tsx b/src/components/input/WebsiteSelect.tsxindex 636911844..f3b8e7ff5 100644--- a/src/components/input/WebsiteSelect.tsx+++ b/src/components/input/WebsiteSelect.tsx@@ -19,7 +19,7 @@ export function WebsiteSelect({teamId?: string;includeTeams?: boolean;} & SelectProps) {- const { formatMessage, messages } = useMessages();+ const { t, messages } = useMessages();const { data: website } = useWebsiteQuery(websiteId);const [name, setName] = useState<string>(website?.name);const [search, setSearch] = useState('');@@ -63,7 +63,7 @@ export function WebsiteSelect({onOpenChange={handleOpenChange}renderValue={renderValue}listProps={{- renderEmptyState: () => <Empty message={formatMessage(messages.noResultsFound)} />,+ renderEmptyState: () => <Empty message={t(messages.noResultsFound)} />,style: { maxHeight: 'calc(42vh - 65px)', width: 280 },}}buttonProps={{ style: { minHeight: 40 } }}diff --git a/src/components/messages.ts b/src/components/messages.tsindex ba45ae468..e93cb8f81 100644--- a/src/components/messages.ts+++ b/src/components/messages.ts@@ -1,536 +1,388 @@-export interface MessageDescriptor {- id: string;- defaultMessage: string;-}--export const labels: Record<string, MessageDescriptor> = {- ok: { id: 'label.ok', defaultMessage: 'OK' },- unknown: { id: 'label.unknown', defaultMessage: 'Unknown' },- required: { id: 'label.required', defaultMessage: 'Required' },- save: { id: 'label.save', defaultMessage: 'Save' },- cancel: { id: 'label.cancel', defaultMessage: 'Cancel' },- continue: { id: 'label.continue', defaultMessage: 'Continue' },- delete: { id: 'label.delete', defaultMessage: 'Delete' },- leave: { id: 'label.leave', defaultMessage: 'Leave' },- users: { id: 'label.users', defaultMessage: 'Users' },- createUser: { id: 'label.create-user', defaultMessage: 'Create user' },- deleteUser: { id: 'label.delete-user', defaultMessage: 'Delete user' },- username: { id: 'label.username', defaultMessage: 'Username' },- password: { id: 'label.password', defaultMessage: 'Password' },- role: { id: 'label.role', defaultMessage: 'Role' },- user: { id: 'label.user', defaultMessage: 'User' },- viewOnly: { id: 'label.view-only', defaultMessage: 'View only' },- manage: { id: 'label.manage', defaultMessage: 'Manage' },- admin: { id: 'label.admin', defaultMessage: 'Admin' },- confirm: { id: 'label.confirm', defaultMessage: 'Confirm' },- details: { id: 'label.details', defaultMessage: 'Details' },- website: { id: 'label.website', defaultMessage: 'Website' },- websites: { id: 'label.websites', defaultMessage: 'Websites' },- myWebsites: { id: 'label.my-websites', defaultMessage: 'My websites' },- teamWebsites: { id: 'label.team-websites', defaultMessage: 'Team websites' },- created: { id: 'label.created', defaultMessage: 'Created' },- createdBy: { id: 'label.created-by', defaultMessage: 'Created By' },- edit: { id: 'label.edit', defaultMessage: 'Edit' },- name: { id: 'label.name', defaultMessage: 'Name' },- manager: { id: 'label.manager', defaultMessage: 'Manager' },- member: { id: 'label.member', defaultMessage: 'Member' },- members: { id: 'label.members', defaultMessage: 'Members' },- accessCode: { id: 'label.access-code', defaultMessage: 'Access code' },- teamId: { id: 'label.team-id', defaultMessage: 'Team ID' },- team: { id: 'label.team', defaultMessage: 'Team' },- teamName: { id: 'label.team-name', defaultMessage: 'Team name' },- regenerate: { id: 'label.regenerate', defaultMessage: 'Regenerate' },- remove: { id: 'label.remove', defaultMessage: 'Remove' },- join: { id: 'label.join', defaultMessage: 'Join' },- createTeam: { id: 'label.create-team', defaultMessage: 'Create team' },- joinTeam: { id: 'label.join-team', defaultMessage: 'Join team' },- settings: { id: 'label.settings', defaultMessage: 'Settings' },- owner: { id: 'label.owner', defaultMessage: 'Owner' },- url: { id: 'label.url', defaultMessage: 'URL' },- teamOwner: { id: 'label.team-owner', defaultMessage: 'Team owner' },- teamManager: { id: 'label.team-manager', defaultMessage: 'Team manager' },- teamMember: { id: 'label.team-member', defaultMessage: 'Team member' },- teamViewOnly: { id: 'label.team-view-only', defaultMessage: 'Team view only' },- enableShareUrl: { id: 'label.enable-share-url', defaultMessage: 'Enable share URL' },- data: { id: 'label.data', defaultMessage: 'Data' },- trackingCode: { id: 'label.tracking-code', defaultMessage: 'Tracking code' },- shareUrl: { id: 'label.share-url', defaultMessage: 'Share URL' },- action: { id: 'label.action', defaultMessage: 'Action' },- actions: { id: 'label.actions', defaultMessage: 'Actions' },- domain: { id: 'label.domain', defaultMessage: 'Domain' },- websiteId: { id: 'label.website-id', defaultMessage: 'Website ID' },- resetWebsite: { id: 'label.reset-website', defaultMessage: 'Reset website' },- deleteWebsite: { id: 'label.delete-website', defaultMessage: 'Delete website' },- transferWebsite: { id: 'label.transfer-website', defaultMessage: 'Transfer website' },- deleteReport: { id: 'label.delete-report', defaultMessage: 'Delete report' },- reset: { id: 'label.reset', defaultMessage: 'Reset' },- addWebsite: { id: 'label.add-website', defaultMessage: 'Add website' },- addMember: { id: 'label.add-member', defaultMessage: 'Add member' },- editMember: { id: 'label.edit-member', defaultMessage: 'Edit member' },- removeMember: { id: 'label.remove-member', defaultMessage: 'Remove member' },- addDescription: { id: 'label.add-description', defaultMessage: 'Add description' },- changePassword: { id: 'label.change-password', defaultMessage: 'Change password' },- currentPassword: { id: 'label.current-password', defaultMessage: 'Current password' },- newPassword: { id: 'label.new-password', defaultMessage: 'New password' },- confirmPassword: { id: 'label.confirm-password', defaultMessage: 'Confirm password' },- timezone: { id: 'label.timezone', defaultMessage: 'Timezone' },- defaultDateRange: { id: 'label.default-date-range', defaultMessage: 'Default date range' },- language: { id: 'label.language', defaultMessage: 'Language' },- theme: { id: 'label.theme', defaultMessage: 'Theme' },- profile: { id: 'label.profile', defaultMessage: 'Profile' },- profiles: { id: 'label.profiles', defaultMessage: 'Profiles' },- dashboard: { id: 'label.dashboard', defaultMessage: 'Dashboard' },- more: { id: 'label.more', defaultMessage: 'More' },- realtime: { id: 'label.realtime', defaultMessage: 'Realtime' },- queries: { id: 'label.queries', defaultMessage: 'Queries' },- teams: { id: 'label.teams', defaultMessage: 'Teams' },- teamSettings: { id: 'label.team-settings', defaultMessage: 'Team settings' },- analytics: { id: 'label.analytics', defaultMessage: 'Analytics' },- login: { id: 'label.login', defaultMessage: 'Login' },- logout: { id: 'label.logout', defaultMessage: 'Logout' },- singleDay: { id: 'label.single-day', defaultMessage: 'Single day' },- dateRange: { id: 'label.date-range', defaultMessage: 'Date range' },- viewDetails: { id: 'label.view-details', defaultMessage: 'View details' },- deleteTeam: { id: 'label.delete-team', defaultMessage: 'Delete team' },- leaveTeam: { id: 'label.leave-team', defaultMessage: 'Leave team' },- refresh: { id: 'label.refresh', defaultMessage: 'Refresh' },- page: { id: 'label.page', defaultMessage: 'Page' },- pages: { id: 'label.pages', defaultMessage: 'Pages' },- entry: { id: 'label.entry', defaultMessage: 'Entry' },- exit: { id: 'label.exit', defaultMessage: 'Exit' },- referrers: { id: 'label.referrers', defaultMessage: 'Referrers' },- screen: { id: 'label.screen', defaultMessage: 'Screen' },- screens: { id: 'label.screens', defaultMessage: 'Screens' },- browsers: { id: 'label.browsers', defaultMessage: 'Browsers' },- os: { id: 'label.os', defaultMessage: 'OS' },- devices: { id: 'label.devices', defaultMessage: 'Devices' },- countries: { id: 'label.countries', defaultMessage: 'Countries' },- languages: { id: 'label.languages', defaultMessage: 'Languages' },- tags: { id: 'label.tags', defaultMessage: 'Tags' },- segments: { id: 'label.segments', defaultMessage: 'Segments' },- cohorts: { id: 'label.cohorts', defaultMessage: 'Cohorts' },- count: { id: 'label.count', defaultMessage: 'Count' },- average: { id: 'label.average', defaultMessage: 'Average' },- sum: { id: 'label.sum', defaultMessage: 'Sum' },- event: { id: 'label.event', defaultMessage: 'Event' },- events: { id: 'label.events', defaultMessage: 'Events' },- eventName: { id: 'label.event-name', defaultMessage: 'Event name' },- excludeBounce: { id: 'label.exclude-bounce', defaultMessage: 'Exclude bounces' },- query: { id: 'label.query', defaultMessage: 'Query' },- queryParameters: { id: 'label.query-parameters', defaultMessage: 'Query parameters' },- back: { id: 'label.back', defaultMessage: 'Back' },- visitors: { id: 'label.visitors', defaultMessage: 'Visitors' },- visits: { id: 'label.visits', defaultMessage: 'Visits' },- filterCombined: { id: 'label.filter-combined', defaultMessage: 'Combined' },- filterRaw: { id: 'label.filter-raw', defaultMessage: 'Raw' },- views: { id: 'label.views', defaultMessage: 'Views' },- none: { id: 'label.none', defaultMessage: 'None' },- clearAll: { id: 'label.clear-all', defaultMessage: 'Clear all' },- property: { id: 'label.property', defaultMessage: 'Property' },- today: { id: 'label.today', defaultMessage: 'Today' },- lastHours: { id: 'label.last-hours', defaultMessage: 'Last {x} hours' },- yesterday: { id: 'label.yesterday', defaultMessage: 'Yesterday' },- thisWeek: { id: 'label.this-week', defaultMessage: 'This week' },- lastDays: { id: 'label.last-days', defaultMessage: 'Last {x} days' },- lastMonths: { id: 'label.last-months', defaultMessage: 'Last {x} months' },- thisMonth: { id: 'label.this-month', defaultMessage: 'This month' },- thisYear: { id: 'label.this-year', defaultMessage: 'This year' },- allTime: { id: 'label.all-time', defaultMessage: 'All time' },- customRange: { id: 'label.custom-range', defaultMessage: 'Custom range' },- selectWebsite: { id: 'label.select-website', defaultMessage: 'Select website' },- selectRole: { id: 'label.select-role', defaultMessage: 'Select role' },- selectDate: { id: 'label.select-date', defaultMessage: 'Select date' },- selectFilter: { id: 'label.select-filter', defaultMessage: 'Select filter' },- all: { id: 'label.all', defaultMessage: 'All' },- session: { id: 'label.session', defaultMessage: 'Session' },- sessions: { id: 'label.sessions', defaultMessage: 'Sessions' },- distinctId: { id: 'label.distinct-id', defaultMessage: 'Distinct ID' },- pageNotFound: { id: 'message.page-not-found', defaultMessage: 'Page not found' },- activity: { id: 'label.activity', defaultMessage: 'Activity' },- dismiss: { id: 'label.dismiss', defaultMessage: 'Dismiss' },- poweredBy: { id: 'label.powered-by', defaultMessage: 'Powered by {name}' },- pageViews: { id: 'label.page-views', defaultMessage: 'Page views' },- uniqueVisitors: { id: 'label.unique-visitors', defaultMessage: 'Unique visitors' },- uniqueEvents: { id: 'label.unique-events', defaultMessage: 'Unique Events' },- bounceRate: { id: 'label.bounce-rate', defaultMessage: 'Bounce rate' },- viewsPerVisit: { id: 'label.views-per-visit', defaultMessage: 'Views per visit' },- visitDuration: { id: 'label.visit-duration', defaultMessage: 'Visit duration' },- desktop: { id: 'label.desktop', defaultMessage: 'Desktop' },- laptop: { id: 'label.laptop', defaultMessage: 'Laptop' },- tablet: { id: 'label.tablet', defaultMessage: 'Tablet' },- mobile: { id: 'label.mobile', defaultMessage: 'Mobile' },- toggleCharts: { id: 'label.toggle-charts', defaultMessage: 'Toggle charts' },- editDashboard: { id: 'label.edit-dashboard', defaultMessage: 'Edit dashboard' },- title: { id: 'label.title', defaultMessage: 'Title' },- view: { id: 'label.view', defaultMessage: 'View' },- cities: { id: 'label.cities', defaultMessage: 'Cities' },- regions: { id: 'label.regions', defaultMessage: 'Regions' },- reports: { id: 'label.reports', defaultMessage: 'Reports' },- eventData: { id: 'label.event-data', defaultMessage: 'Event data' },- sessionData: { id: 'label.session-data', defaultMessage: 'Session data' },- funnel: { id: 'label.funnel', defaultMessage: 'Funnel' },- funnels: { id: 'label.funnels', defaultMessage: 'Funnels' },- funnelDescription: {- id: 'label.funnel-description',- defaultMessage: 'Understand the conversion and drop-off rate of users.',- },- revenue: { id: 'label.revenue', defaultMessage: 'Revenue' },- revenueDescription: {- id: 'label.revenue-description',- defaultMessage: 'Look into your revenue data and how users are spending.',- },- attribution: { id: 'label.attribution', defaultMessage: 'Attribution' },- attributionDescription: {- id: 'label.attribution-description',- defaultMessage: 'See how users engage with your marketing and what drives conversions.',- },- currency: { id: 'label.currency', defaultMessage: 'Currency' },- model: { id: 'label.model', defaultMessage: 'Model' },- path: { id: 'label.path', defaultMessage: 'Path' },- paths: { id: 'label.paths', defaultMessage: 'Paths' },- add: { id: 'label.add', defaultMessage: 'Add' },- update: { id: 'label.update', defaultMessage: 'Update' },- window: { id: 'label.window', defaultMessage: 'Window' },- runQuery: { id: 'label.run-query', defaultMessage: 'Run query' },- field: { id: 'label.field', defaultMessage: 'Field' },- fields: { id: 'label.fields', defaultMessage: 'Fields' },- createReport: { id: 'label.create-report', defaultMessage: 'Create report' },- description: { id: 'label.description', defaultMessage: 'Description' },- untitled: { id: 'label.untitled', defaultMessage: 'Untitled' },- type: { id: 'label.type', defaultMessage: 'Type' },- filter: { id: 'label.filter', defaultMessage: 'Filter' },- filters: { id: 'label.filters', defaultMessage: 'Filters' },- breakdown: { id: 'label.breakdown', defaultMessage: 'Breakdown' },- true: { id: 'label.true', defaultMessage: 'True' },- false: { id: 'label.false', defaultMessage: 'False' },- is: { id: 'label.is', defaultMessage: 'Is' },- isNot: { id: 'label.is-not', defaultMessage: 'Is not' },- isSet: { id: 'label.is-set', defaultMessage: 'Is set' },- isNotSet: { id: 'label.is-not-set', defaultMessage: 'Is not set' },- greaterThan: { id: 'label.greater-than', defaultMessage: 'Greater than' },- lessThan: { id: 'label.less-than', defaultMessage: 'Less than' },- greaterThanEquals: { id: 'label.greater-than-equals', defaultMessage: 'Greater than or equals' },- lessThanEquals: { id: 'label.less-than-equals', defaultMessage: 'Less than or equals' },- contains: { id: 'label.contains', defaultMessage: 'Contains' },- doesNotContain: { id: 'label.does-not-contain', defaultMessage: 'Does not contain' },- includes: { id: 'label.includes', defaultMessage: 'Includes' },- doesNotInclude: { id: 'label.does-not-include', defaultMessage: 'Does not include' },- before: { id: 'label.before', defaultMessage: 'Before' },- after: { id: 'label.after', defaultMessage: 'After' },- isTrue: { id: 'label.is-true', defaultMessage: 'Is true' },- isFalse: { id: 'label.is-false', defaultMessage: 'Is false' },- exists: { id: 'label.exists', defaultMessage: 'Exists' },- doesNotExist: { id: 'label.doest-not-exist', defaultMessage: 'Does not exist' },- total: { id: 'label.total', defaultMessage: 'Total' },- min: { id: 'label.min', defaultMessage: 'Min' },- max: { id: 'label.max', defaultMessage: 'Max' },- unique: { id: 'label.unique', defaultMessage: 'Unique' },- value: { id: 'label.value', defaultMessage: 'Value' },- overview: { id: 'label.overview', defaultMessage: 'Overview' },- totalRecords: { id: 'label.total-records', defaultMessage: 'Total records' },- insight: { id: 'label.insight', defaultMessage: 'Insight' },- insights: { id: 'label.insights', defaultMessage: 'Insights' },- insightsDescription: {- id: 'label.insights-description',- defaultMessage: 'Dive deeper into your data by using segments and filters.',- },- retention: { id: 'label.retention', defaultMessage: 'Retention' },- retentionDescription: {- id: 'label.retention-description',- defaultMessage: 'Measure your website stickiness by tracking how often users return.',- },- dropoff: { id: 'label.dropoff', defaultMessage: 'Dropoff' },- referrer: { id: 'label.referrer', defaultMessage: 'Referrer' },- hostname: { id: 'label.hostname', defaultMessage: 'Hostname' },- country: { id: 'label.country', defaultMessage: 'Country' },- region: { id: 'label.region', defaultMessage: 'Region' },- city: { id: 'label.city', defaultMessage: 'City' },- browser: { id: 'label.browser', defaultMessage: 'Browser' },- device: { id: 'label.device', defaultMessage: 'Device' },- pageTitle: { id: 'label.pageTitle', defaultMessage: 'Page title' },- tag: { id: 'label.tag', defaultMessage: 'Tag' },- source: { id: 'label.source', defaultMessage: 'Source' },- medium: { id: 'label.medium', defaultMessage: 'Medium' },- campaign: { id: 'label.campaign', defaultMessage: 'Campaign' },- content: { id: 'label.content', defaultMessage: 'Content' },- term: { id: 'label.term', defaultMessage: 'Term' },- utmSource: { id: 'label.utm-source', defaultMessage: 'UTM source' },- utmMedium: { id: 'label.utm-medium', defaultMessage: 'UTM medium' },- utmCampaign: { id: 'label.utm-campaign', defaultMessage: 'UTM campaign' },- utmContent: { id: 'label.utm-content', defaultMessage: 'UTM content' },- utmTerm: { id: 'label.utm-term', defaultMessage: 'UTM term' },- segment: { id: 'label.segment', defaultMessage: 'Segment' },- cohort: { id: 'label.cohort', defaultMessage: 'Cohort' },- minute: { id: 'label.minute', defaultMessage: 'Minute' },- hour: { id: 'label.hour', defaultMessage: 'Hour' },- day: { id: 'label.day', defaultMessage: 'Day' },- month: { id: 'label.month', defaultMessage: 'Month' },- date: { id: 'label.date', defaultMessage: 'Date' },- pageOf: { id: 'label.page-of', defaultMessage: 'Page {current} of {total}' },- create: { id: 'label.create', defaultMessage: 'Create' },- search: { id: 'label.search', defaultMessage: 'Search' },- numberOfRecords: {- id: 'label.number-of-records',- defaultMessage: '{x} {x, plural, one {record} other {records}}',- },- select: { id: 'label.select', defaultMessage: 'Select' },- myAccount: { id: 'label.my-account', defaultMessage: 'My account' },- transfer: { id: 'label.transfer', defaultMessage: 'Transfer' },- transactions: { id: 'label.transactions', defaultMessage: 'Transactions' },- uniqueCustomers: { id: 'label.uniqueCustomers', defaultMessage: 'Unique Customers' },- viewedPage: {- id: 'message.viewed-page',- defaultMessage: 'Viewed page',- },- collectedData: {- id: 'message.collected-data',- defaultMessage: 'Collected data',- },- triggeredEvent: {- id: 'message.triggered-event',- defaultMessage: 'Triggered event',- },- utm: { id: 'label.utm', defaultMessage: 'UTM' },- utmDescription: {- id: 'label.utm-description',- defaultMessage: 'Track your campaigns through UTM parameters.',- },- conversionStep: { id: 'label.conversion-step', defaultMessage: 'Conversion step' },- conversionRate: { id: 'label.conversion-rate', defaultMessage: 'Conversion rate' },- steps: { id: 'label.steps', defaultMessage: 'Steps' },- startStep: { id: 'label.start-step', defaultMessage: 'Start Step' },- endStep: { id: 'label.end-step', defaultMessage: 'End Step' },- addStep: { id: 'label.add-step', defaultMessage: 'Add step' },- goal: { id: 'label.goal', defaultMessage: 'Goal' },- goals: { id: 'label.goals', defaultMessage: 'Goals' },- goalsDescription: {- id: 'label.goals-description',- defaultMessage: 'Track your goals for pageviews and events.',- },- journey: { id: 'label.journey', defaultMessage: 'Journey' },- journeys: { id: 'label.journeys', defaultMessage: 'Journeys' },- journeyDescription: {- id: 'label.journey-description',- defaultMessage: 'Understand how users navigate through your website.',- },- compareDates: { id: 'label.compare-dates', defaultMessage: 'Compare dates' },- compare: { id: 'label.compare', defaultMessage: 'Compare' },- current: { id: 'label.current', defaultMessage: 'Current' },- previous: { id: 'label.previous', defaultMessage: 'Previous' },- previousPeriod: { id: 'label.previous-period', defaultMessage: 'Previous period' },- previousYear: { id: 'label.previous-year', defaultMessage: 'Previous year' },- lastSeen: { id: 'label.last-seen', defaultMessage: 'Last seen' },- firstSeen: { id: 'label.first-seen', defaultMessage: 'First seen' },- properties: { id: 'label.properties', defaultMessage: 'Properties' },- channel: { id: 'label.channel', defaultMessage: 'Channel' },- channels: { id: 'label.channels', defaultMessage: 'Channels' },- sources: { id: 'label.sources', defaultMessage: 'Sources' },- campaigns: { id: 'label.campaigns', defaultMessage: 'Campaigns' },- terms: { id: 'label.terms', defaultMessage: 'Terms' },- direct: { id: 'label.direct', defaultMessage: 'Direct' },- referral: { id: 'label.referral', defaultMessage: 'Referral' },- affiliate: { id: 'label.affiliate', defaultMessage: 'Affiliate' },- email: { id: 'label.email', defaultMessage: 'Email' },- sms: { id: 'label.sms', defaultMessage: 'SMS' },- organicSearch: { id: 'label.organic-search', defaultMessage: 'Organic search' },- organicSocial: { id: 'label.organic-social', defaultMessage: 'Organic social' },- organicShopping: { id: 'label.organic-shopping', defaultMessage: 'Organic shopping' },- organicVideo: { id: 'label.organic-video', defaultMessage: 'Organic video' },- paidAds: { id: 'label.paid-ads', defaultMessage: 'Paid ads' },- paidSearch: { id: 'label.paid-search', defaultMessage: 'Paid search' },- paidSocial: { id: 'label.paid-social', defaultMessage: 'Paid social' },- paidShopping: { id: 'label.paid-shopping', defaultMessage: 'Paid shopping' },- paidVideo: { id: 'label.paid-video', defaultMessage: 'Paid video' },- grouped: { id: 'label.grouped', defaultMessage: 'Grouped' },- other: { id: 'label.other', defaultMessage: 'Other' },- boards: { id: 'label.boards', defaultMessage: 'Boards' },- apply: { id: 'label.apply', defaultMessage: 'Apply' },- link: { id: 'label.link', defaultMessage: 'Link' },- links: { id: 'label.links', defaultMessage: 'Links' },- pixel: { id: 'label.pixel', defaultMessage: 'Pixel' },- pixels: { id: 'label.pixels', defaultMessage: 'Pixels' },- addBoard: { id: 'label.add-board', defaultMessage: 'Add board' },- addLink: { id: 'label.add-link', defaultMessage: 'Add link' },- addPixel: { id: 'label.add-pixel', defaultMessage: 'Add pixel' },- maximize: { id: 'label.maximize', defaultMessage: 'Maximize' },- remaining: { id: 'label.remaining', defaultMessage: 'Remaining' },- conversion: { id: 'label.conversion', defaultMessage: 'Conversion' },- firstClick: { id: 'label.first-click', defaultMessage: 'First click' },- lastClick: { id: 'label.last-click', defaultMessage: 'Last click' },- online: { id: 'label.online', defaultMessage: 'Online' },- preferences: { id: 'label.preferences', defaultMessage: 'Preferences' },- location: { id: 'label.location', defaultMessage: 'Location' },- chart: { id: 'label.chart', defaultMessage: 'Chart' },- table: { id: 'label.table', defaultMessage: 'Table' },- download: { id: 'label.download', defaultMessage: 'Download' },- traffic: { id: 'label.traffic', defaultMessage: 'Traffic' },- behavior: { id: 'label.behavior', defaultMessage: 'Behavior' },- growth: { id: 'label.growth', defaultMessage: 'Growth' },- account: { id: 'label.account', defaultMessage: 'Account' },- application: { id: 'label.application', defaultMessage: 'Application' },- version: { id: 'label.version', defaultMessage: 'Version' },- saveSegment: { id: 'label.save-segment', defaultMessage: 'Save as segment' },- saveCohort: { id: 'label.save-cohort', defaultMessage: 'Save as cohort' },- analysis: { id: 'label.analysis', defaultMessage: 'Analysis' },- destinationUrl: { id: 'label.destination-url', defaultMessage: 'Destination URL' },- audience: { id: 'label.audience', defaultMessage: 'Audience' },- invalidUrl: { id: 'label.invalid-url', defaultMessage: 'Invalid URL' },- environment: { id: 'label.environment', defaultMessage: 'Environment' },- criteria: { id: 'label.criteria', defaultMessage: 'Criteria' },- share: { id: 'label.share', defaultMessage: 'Share' },- support: { id: 'label.support', defaultMessage: 'Support' },- documentation: { id: 'label.documentation', defaultMessage: 'Documentation' },- switchAccount: { id: 'label.switch-account', defaultMessage: 'Switch account' },+export const labels: Record<string, string> = {+ ok: 'label.ok',+ unknown: 'label.unknown',+ required: 'label.required',+ save: 'label.save',+ cancel: 'label.cancel',+ continue: 'label.continue',+ delete: 'label.delete',+ leave: 'label.leave',+ users: 'label.users',+ createUser: 'label.create-user',+ deleteUser: 'label.delete-user',+ username: 'label.username',+ password: 'label.password',+ role: 'label.role',+ user: 'label.user',+ viewOnly: 'label.view-only',+ manage: 'label.manage',+ admin: 'label.admin',+ confirm: 'label.confirm',+ details: 'label.details',+ website: 'label.website',+ websites: 'label.websites',+ myWebsites: 'label.my-websites',+ teamWebsites: 'label.team-websites',+ created: 'label.created',+ createdBy: 'label.created-by',+ edit: 'label.edit',+ name: 'label.name',+ manager: 'label.manager',+ member: 'label.member',+ members: 'label.members',+ accessCode: 'label.access-code',+ teamId: 'label.team-id',+ team: 'label.team',+ teamName: 'label.team-name',+ regenerate: 'label.regenerate',+ remove: 'label.remove',+ join: 'label.join',+ createTeam: 'label.create-team',+ joinTeam: 'label.join-team',+ settings: 'label.settings',+ owner: 'label.owner',+ url: 'label.url',+ teamOwner: 'label.team-owner',+ teamManager: 'label.team-manager',+ teamMember: 'label.team-member',+ teamViewOnly: 'label.team-view-only',+ enableShareUrl: 'label.enable-share-url',+ data: 'label.data',+ trackingCode: 'label.tracking-code',+ shareUrl: 'label.share-url',+ action: 'label.action',+ actions: 'label.actions',+ domain: 'label.domain',+ websiteId: 'label.website-id',+ resetWebsite: 'label.reset-website',+ deleteWebsite: 'label.delete-website',+ transferWebsite: 'label.transfer-website',+ deleteReport: 'label.delete-report',+ reset: 'label.reset',+ addWebsite: 'label.add-website',+ addMember: 'label.add-member',+ editMember: 'label.edit-member',+ removeMember: 'label.remove-member',+ addDescription: 'label.add-description',+ changePassword: 'label.change-password',+ currentPassword: 'label.current-password',+ newPassword: 'label.new-password',+ confirmPassword: 'label.confirm-password',+ timezone: 'label.timezone',+ defaultDateRange: 'label.default-date-range',+ language: 'label.language',+ theme: 'label.theme',+ profile: 'label.profile',+ profiles: 'label.profiles',+ dashboard: 'label.dashboard',+ more: 'label.more',+ realtime: 'label.realtime',+ queries: 'label.queries',+ teams: 'label.teams',+ teamSettings: 'label.team-settings',+ analytics: 'label.analytics',+ login: 'label.login',+ logout: 'label.logout',+ singleDay: 'label.single-day',+ dateRange: 'label.date-range',+ viewDetails: 'label.view-details',+ deleteTeam: 'label.delete-team',+ leaveTeam: 'label.leave-team',+ refresh: 'label.refresh',+ page: 'label.page',+ pages: 'label.pages',+ entry: 'label.entry',+ exit: 'label.exit',+ referrers: 'label.referrers',+ screen: 'label.screen',+ screens: 'label.screens',+ browsers: 'label.browsers',+ os: 'label.os',+ devices: 'label.devices',+ countries: 'label.countries',+ languages: 'label.languages',+ tags: 'label.tags',+ segments: 'label.segments',+ cohorts: 'label.cohorts',+ count: 'label.count',+ average: 'label.average',+ sum: 'label.sum',+ event: 'label.event',+ events: 'label.events',+ eventName: 'label.event-name',+ excludeBounce: 'label.exclude-bounce',+ query: 'label.query',+ queryParameters: 'label.query-parameters',+ back: 'label.back',+ visitors: 'label.visitors',+ visits: 'label.visits',+ filterCombined: 'label.filter-combined',+ filterRaw: 'label.filter-raw',+ views: 'label.views',+ none: 'label.none',+ clearAll: 'label.clear-all',+ property: 'label.property',+ today: 'label.today',+ lastHours: 'label.last-hours',+ yesterday: 'label.yesterday',+ thisWeek: 'label.this-week',+ lastDays: 'label.last-days',+ lastMonths: 'label.last-months',+ thisMonth: 'label.this-month',+ thisYear: 'label.this-year',+ allTime: 'label.all-time',+ customRange: 'label.custom-range',+ selectWebsite: 'label.select-website',+ selectRole: 'label.select-role',+ selectDate: 'label.select-date',+ selectFilter: 'label.select-filter',+ all: 'label.all',+ session: 'label.session',+ sessions: 'label.sessions',+ distinctId: 'label.distinct-id',+ pageNotFound: 'message.page-not-found',+ activity: 'label.activity',+ dismiss: 'label.dismiss',+ poweredBy: 'label.powered-by',+ pageViews: 'label.page-views',+ uniqueVisitors: 'label.unique-visitors',+ uniqueEvents: 'label.unique-events',+ bounceRate: 'label.bounce-rate',+ viewsPerVisit: 'label.views-per-visit',+ visitDuration: 'label.visit-duration',+ desktop: 'label.desktop',+ laptop: 'label.laptop',+ tablet: 'label.tablet',+ mobile: 'label.mobile',+ toggleCharts: 'label.toggle-charts',+ editDashboard: 'label.edit-dashboard',+ title: 'label.title',+ view: 'label.view',+ cities: 'label.cities',+ regions: 'label.regions',+ reports: 'label.reports',+ eventData: 'label.event-data',+ sessionData: 'label.session-data',+ funnel: 'label.funnel',+ funnels: 'label.funnels',+ funnelDescription: 'label.funnel-description',+ revenue: 'label.revenue',+ revenueDescription: 'label.revenue-description',+ attribution: 'label.attribution',+ attributionDescription: 'label.attribution-description',+ currency: 'label.currency',+ model: 'label.model',+ path: 'label.path',+ paths: 'label.paths',+ add: 'label.add',+ update: 'label.update',+ window: 'label.window',+ runQuery: 'label.run-query',+ field: 'label.field',+ fields: 'label.fields',+ createReport: 'label.create-report',+ description: 'label.description',+ untitled: 'label.untitled',+ type: 'label.type',+ filter: 'label.filter',+ filters: 'label.filters',+ breakdown: 'label.breakdown',+ true: 'label.true',+ false: 'label.false',+ is: 'label.is',+ isNot: 'label.is-not',+ isSet: 'label.is-set',+ isNotSet: 'label.is-not-set',+ greaterThan: 'label.greater-than',+ lessThan: 'label.less-than',+ greaterThanEquals: 'label.greater-than-equals',+ lessThanEquals: 'label.less-than-equals',+ contains: 'label.contains',+ doesNotContain: 'label.does-not-contain',+ includes: 'label.includes',+ doesNotInclude: 'label.does-not-include',+ before: 'label.before',+ after: 'label.after',+ isTrue: 'label.is-true',+ isFalse: 'label.is-false',+ exists: 'label.exists',+ doesNotExist: 'label.doest-not-exist',+ total: 'label.total',+ min: 'label.min',+ max: 'label.max',+ unique: 'label.unique',+ value: 'label.value',+ overview: 'label.overview',+ totalRecords: 'label.total-records',+ insight: 'label.insight',+ insights: 'label.insights',+ insightsDescription: 'label.insights-description',+ retention: 'label.retention',+ retentionDescription: 'label.retention-description',+ dropoff: 'label.dropoff',+ referrer: 'label.referrer',+ hostname: 'label.hostname',+ country: 'label.country',+ region: 'label.region',+ city: 'label.city',+ browser: 'label.browser',+ device: 'label.device',+ pageTitle: 'label.pageTitle',+ tag: 'label.tag',+ source: 'label.source',+ medium: 'label.medium',+ campaign: 'label.campaign',+ content: 'label.content',+ term: 'label.term',+ utmSource: 'label.utm-source',+ utmMedium: 'label.utm-medium',+ utmCampaign: 'label.utm-campaign',+ utmContent: 'label.utm-content',+ utmTerm: 'label.utm-term',+ segment: 'label.segment',+ cohort: 'label.cohort',+ minute: 'label.minute',+ hour: 'label.hour',+ day: 'label.day',+ month: 'label.month',+ date: 'label.date',+ pageOf: 'label.page-of',+ create: 'label.create',+ search: 'label.search',+ numberOfRecords: 'label.number-of-records',+ select: 'label.select',+ myAccount: 'label.my-account',+ transfer: 'label.transfer',+ transactions: 'label.transactions',+ uniqueCustomers: 'label.uniqueCustomers',+ viewedPage: 'message.viewed-page',+ collectedData: 'message.collected-data',+ triggeredEvent: 'message.triggered-event',+ utm: 'label.utm',+ utmDescription: 'label.utm-description',+ conversionStep: 'label.conversion-step',+ conversionRate: 'label.conversion-rate',+ steps: 'label.steps',+ startStep: 'label.start-step',+ endStep: 'label.end-step',+ addStep: 'label.add-step',+ goal: 'label.goal',+ goals: 'label.goals',+ goalsDescription: 'label.goals-description',+ journey: 'label.journey',+ journeys: 'label.journeys',+ journeyDescription: 'label.journey-description',+ compareDates: 'label.compare-dates',+ compare: 'label.compare',+ current: 'label.current',+ previous: 'label.previous',+ previousPeriod: 'label.previous-period',+ previousYear: 'label.previous-year',+ lastSeen: 'label.last-seen',+ firstSeen: 'label.first-seen',+ properties: 'label.properties',+ channel: 'label.channel',+ channels: 'label.channels',+ sources: 'label.sources',+ campaigns: 'label.campaigns',+ terms: 'label.terms',+ direct: 'label.direct',+ referral: 'label.referral',+ affiliate: 'label.affiliate',+ email: 'label.email',+ sms: 'label.sms',+ organicSearch: 'label.organic-search',+ organicSocial: 'label.organic-social',+ organicShopping: 'label.organic-shopping',+ organicVideo: 'label.organic-video',+ paidAds: 'label.paid-ads',+ paidSearch: 'label.paid-search',+ paidSocial: 'label.paid-social',+ paidShopping: 'label.paid-shopping',+ paidVideo: 'label.paid-video',+ grouped: 'label.grouped',+ other: 'label.other',+ boards: 'label.boards',+ apply: 'label.apply',+ link: 'label.link',+ links: 'label.links',+ pixel: 'label.pixel',+ pixels: 'label.pixels',+ addBoard: 'label.add-board',+ addLink: 'label.add-link',+ addPixel: 'label.add-pixel',+ maximize: 'label.maximize',+ remaining: 'label.remaining',+ conversion: 'label.conversion',+ firstClick: 'label.first-click',+ lastClick: 'label.last-click',+ online: 'label.online',+ preferences: 'label.preferences',+ location: 'label.location',+ chart: 'label.chart',+ table: 'label.table',+ download: 'label.download',+ traffic: 'label.traffic',+ behavior: 'label.behavior',+ growth: 'label.growth',+ account: 'label.account',+ application: 'label.application',+ version: 'label.version',+ saveSegment: 'label.save-segment',+ saveCohort: 'label.save-cohort',+ analysis: 'label.analysis',+ destinationUrl: 'label.destination-url',+ audience: 'label.audience',+ invalidUrl: 'label.invalid-url',+ environment: 'label.environment',+ criteria: 'label.criteria',+ share: 'label.share',+ support: 'label.support',+ documentation: 'label.documentation',+ switchAccount: 'label.switch-account',};-export const messages: Record<string, MessageDescriptor> = {- error: { id: 'message.error', defaultMessage: 'Something went wrong.' },- saved: { id: 'message.saved', defaultMessage: 'Saved successfully.' },- noUsers: { id: 'message.no-users', defaultMessage: 'There are no users.' },- userDeleted: { id: 'message.user-deleted', defaultMessage: 'User deleted.' },- noDataAvailable: { id: 'message.no-data-available', defaultMessage: 'No data available.' },- nothingSelected: { id: 'message.nothing-selected', defaultMessage: 'Nothing selected.' },- confirmReset: {- id: 'message.confirm-reset',- defaultMessage: 'Are you sure you want to reset {target}?',- },- confirmDelete: {- id: 'message.confirm-delete',- defaultMessage: 'Are you sure you want to delete {target}?',- },- confirmRemove: {- id: 'message.confirm-remove',- defaultMessage: 'Are you sure you want to remove {target}?',- },- confirmLeave: {- id: 'message.confirm-leave',- defaultMessage: 'Are you sure you want to leave {target}?',- },- minPasswordLength: {- id: 'message.min-password-length',- defaultMessage: 'Minimum length of {n} characters',- },- noTeams: {- id: 'message.no-teams',- defaultMessage: 'You have not created any teams.',- },- shareUrl: {- id: 'message.share-url',- defaultMessage: 'Your website stats are publicly available at the following URL:',- },- trackingCode: {- id: 'message.tracking-code',- defaultMessage:- 'To track stats for this website, place the following code in the <head>...</head> section of your HTML.',- },- joinTeamWarning: {- id: 'message.team-already-member',- defaultMessage: 'You are already a member of the team.',- },- actionConfirmation: {- id: 'message.action-confirmation',- defaultMessage: 'Type {confirmation} in the box below to confirm.',- },- resetWebsite: {- id: 'message.reset-website',- defaultMessage: 'To reset this website, type {confirmation} in the box below to confirm.',- },- invalidDomain: {- id: 'message.invalid-domain',- defaultMessage: 'Invalid domain. Do not include http/https.',- },- resetWebsiteWarning: {- id: 'message.reset-website-warning',- defaultMessage:- 'All statistics for this website will be deleted, but your settings will remain intact.',- },- deleteWebsiteWarning: {- id: 'message.delete-website-warning',- defaultMessage: 'All website data will be deleted.',- },- deleteTeamWarning: {- id: 'message.delete-team-warning',- defaultMessage: 'Deleting a team will also delete all team websites.',- },- noResultsFound: {- id: 'message.no-results-found',- defaultMessage: 'No results found.',- },- noWebsitesConfigured: {- id: 'message.no-websites-configured',- defaultMessage: 'You do not have any websites configured.',- },- noTeamWebsites: {- id: 'message.no-team-websites',- defaultMessage: 'This team does not have any websites.',- },- teamWebsitesInfo: {- id: 'message.team-websites-info',- defaultMessage: 'Websites can be viewed by anyone on the team.',- },- noMatchPassword: { id: 'message.no-match-password', defaultMessage: 'Passwords do not match.' },- goToSettings: {- id: 'message.go-to-settings',- defaultMessage: 'Go to settings',- },- activeUsers: {- id: 'message.active-users',- defaultMessage: '{x} current {x, plural, one {visitor} other {visitors}}',- },- teamNotFound: {- id: 'message.team-not-found',- defaultMessage: 'Team not found.',- },- visitorLog: {- id: 'message.visitor-log',- defaultMessage: 'Visitor from {country} using {browser} on {os} {device}',- },- eventLog: {- id: 'message.event-log',- defaultMessage: '{event} on {url}',- },- incorrectUsernamePassword: {- id: 'message.incorrect-username-password',- defaultMessage: 'Incorrect username and/or password.',- },- noEventData: {- id: 'message.no-event-data',- defaultMessage: 'No event data is available.',- },- newVersionAvailable: {- id: 'message.new-version-available',- defaultMessage: 'A new version of Umami {version} is available!',- },- transferWebsite: {- id: 'message.transfer-website',- defaultMessage: 'Transfer website ownership to your account or another team.',- },- transferTeamWebsiteToUser: {- id: 'message.transfer-team-website-to-user',- defaultMessage: 'Transfer this website to your account?',- },- transferUserWebsiteToTeam: {- id: 'message.transfer-user-website-to-team',- defaultMessage: 'Select the team to transfer this website to.',- },- unauthorized: {- id: 'message.unauthorized',- defaultMessage: 'Unauthorized',- },- badRequest: {- id: 'message.bad-request',- defaultMessage: 'Bad request',- },- forbidden: {- id: 'message.forbidden',- defaultMessage: 'Forbidden',- },- notFound: {- id: 'message.not-found',- defaultMessage: 'Not found',- },- serverError: {- id: 'message.sever-error',- defaultMessage: 'Server error',- },+export const messages: Record<string, string> = {+ error: 'message.error',+ saved: 'message.saved',+ noUsers: 'message.no-users',+ userDeleted: 'message.user-deleted',+ noDataAvailable: 'message.no-data-available',+ nothingSelected: 'message.nothing-selected',+ confirmReset: 'message.confirm-reset',+ confirmDelete: 'message.confirm-delete',+ confirmRemove: 'message.confirm-remove',+ confirmLeave: 'message.confirm-leave',+ minPasswordLength: 'message.min-password-length',+ noTeams: 'message.no-teams',+ shareUrl: 'message.share-url',+ trackingCode: 'message.tracking-code',+ joinTeamWarning: 'message.team-already-member',+ actionConfirmation: 'message.action-confirmation',+ resetWebsite: 'message.reset-website',+ invalidDomain: 'message.invalid-domain',+ resetWebsiteWarning: 'message.reset-website-warning',+ deleteWebsiteWarning: 'message.delete-website-warning',+ deleteTeamWarning: 'message.delete-team-warning',+ noResultsFound: 'message.no-results-found',+ noWebsitesConfigured: 'message.no-websites-configured',+ noTeamWebsites: 'message.no-team-websites',+ teamWebsitesInfo: 'message.team-websites-info',+ noMatchPassword: 'message.no-match-password',+ goToSettings: 'message.go-to-settings',+ activeUsers: 'message.active-users',+ teamNotFound: 'message.team-not-found',+ visitorLog: 'message.visitor-log',+ eventLog: 'message.event-log',+ incorrectUsernamePassword: 'message.incorrect-username-password',+ noEventData: 'message.no-event-data',+ newVersionAvailable: 'message.new-version-available',+ transferWebsite: 'message.transfer-website',+ transferTeamWebsiteToUser: 'message.transfer-team-website-to-user',+ transferUserWebsiteToTeam: 'message.transfer-user-website-to-team',+ unauthorized: 'message.unauthorized',+ badRequest: 'message.bad-request',+ forbidden: 'message.forbidden',+ notFound: 'message.not-found',+ serverError: 'message.sever-error',};diff --git a/src/components/metrics/ActiveUsers.tsx b/src/components/metrics/ActiveUsers.tsxindex d440f9ae7..fda0ba2a4 100644--- a/src/components/metrics/ActiveUsers.tsx+++ b/src/components/metrics/ActiveUsers.tsx@@ -12,7 +12,7 @@ export function ActiveUsers({value?: number;refetchInterval?: number;}) {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const { data } = useActyiveUsersQuery(websiteId, { refetchInterval });const count = useMemo(() => {@@ -31,7 +31,7 @@ export function ActiveUsers({<LinkButton href={`/websites/${websiteId}/realtime`} variant="quiet"><StatusLight variant="success"><Text size="sm" weight="medium">- {count} {formatMessage(labels.online)}+ {count} {t(labels.online)}</Text></StatusLight></LinkButton>diff --git a/src/components/metrics/DatePickerForm.tsx b/src/components/metrics/DatePickerForm.tsxindex 59d170937..cb6041af6 100644--- a/src/components/metrics/DatePickerForm.tsx+++ b/src/components/metrics/DatePickerForm.tsx@@ -20,7 +20,7 @@ export function DatePickerForm({const [date, setDate] = useState(defaultStartDate || new Date());const [startDate, setStartDate] = useState(defaultStartDate || new Date());const [endDate, setEndDate] = useState(defaultEndDate || new Date());- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const disabled = selected.includes(FILTER_DAY)? isAfter(minDate, date) && isBefore(maxDate, date)@@ -38,8 +38,8 @@ export function DatePickerForm({<Column gap><Row justifyContent="center"><ToggleGroup disallowEmptySelection value={selected} onChange={setSelected}>- <ToggleGroupItem id={FILTER_DAY}>{formatMessage(labels.singleDay)}</ToggleGroupItem>- <ToggleGroupItem id={FILTER_RANGE}>{formatMessage(labels.dateRange)}</ToggleGroupItem>+ <ToggleGroupItem id={FILTER_DAY}>{t(labels.singleDay)}</ToggleGroupItem>+ <ToggleGroupItem id={FILTER_RANGE}>{t(labels.dateRange)}</ToggleGroupItem></ToggleGroup></Row><Column>@@ -64,9 +64,9 @@ export function DatePickerForm({)}</Column><Row justifyContent="end" gap>- <Button onPress={onClose}>{formatMessage(labels.cancel)}</Button>+ <Button onPress={onClose}>{t(labels.cancel)}</Button><Button variant="primary" onPress={handleSave} isDisabled={disabled}>- {formatMessage(labels.apply)}+ {t(labels.apply)}</Button></Row></Column>diff --git a/src/components/metrics/ListTable.tsx b/src/components/metrics/ListTable.tsxindex 00192d1b2..b2924b374 100644--- a/src/components/metrics/ListTable.tsx+++ b/src/components/metrics/ListTable.tsx@@ -41,7 +41,7 @@ export function ListTable({itemCount = 10,currency,}: ListTableProps) {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const { isPhone } = useMobile();const getRow = (row: ListData, index: number) => {@@ -50,7 +50,7 @@ export function ListTable({return (<AnimatedRowkey={`${label}${index}`}- label={renderLabel ? renderLabel(row, index) : (label ?? formatMessage(labels.unknown))}+ label={renderLabel ? renderLabel(row, index) : (label ?? t(labels.unknown))}value={count}percent={percent}animate={animate && !virtualize}diff --git a/src/components/metrics/MetricLabel.tsx b/src/components/metrics/MetricLabel.tsxindex 31c331f5f..dae5dbabf 100644--- a/src/components/metrics/MetricLabel.tsx+++ b/src/components/metrics/MetricLabel.tsx@@ -18,7 +18,7 @@ export interface MetricLabelProps {}export function MetricLabel({ type, data }: MetricLabelProps) {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const { formatValue, formatCity } = useFormat();const { locale } = useLocale();const { countryNames } = useCountryNames(locale);@@ -39,7 +39,7 @@ export function MetricLabel({ type, data }: MetricLabelProps) {);case 'channel':- return formatMessage(labels[label]);+ return t(labels[label]);case 'city':return (@@ -87,7 +87,7 @@ export function MetricLabel({ type, data }: MetricLabelProps) {<FilterLinktype={type === 'entry' || type === 'exit' ? 'path' : type}value={label}- label={!label && formatMessage(labels.none)}+ label={!label && t(labels.none)}externalUrl={domain ? `${domain?.startsWith('http') ? domain : `https://${domain}`}${label}` : null}@@ -110,14 +110,14 @@ export function MetricLabel({ type, data }: MetricLabelProps) {type="referrer"value={label}externalUrl={`https://${label}`}- label={!label && formatMessage(labels.none)}+ label={!label && t(labels.none)}icon={<Favicon domain={label} />}/>);case 'domain':if (label === 'Other') {- return `(${formatMessage(labels.other)})`;+ return `(${t(labels.other)})`;} else {const name = GROUPED_DOMAINS.find(({ domain }) => domain === label)?.name;diff --git a/src/components/metrics/MetricsExpandedTable.tsx b/src/components/metrics/MetricsExpandedTable.tsxindex f24c952de..c4c49e75a 100644--- a/src/components/metrics/MetricsExpandedTable.tsx+++ b/src/components/metrics/MetricsExpandedTable.tsx@@ -33,7 +33,7 @@ export function MetricsExpandedTable({children,}: MetricsExpandedTableProps) {const [search, setSearch] = useState('');- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const isType = ['browser', 'country', 'device', 'os'].includes(type);const showBounceDuration = SESSION_COLUMNS.includes(type);@@ -79,35 +79,20 @@ export function MetricsExpandedTable({</Row>)}</DataColumn>- <DataColumn- id="visitors"- label={formatMessage(labels.visitors)}- align="end"- width="120px"- >+ <DataColumn id="visitors" label={t(labels.visitors)} align="end" width="120px">{row => row?.visitors?.toLocaleString()}</DataColumn>- <DataColumn- id="visits"- label={formatMessage(labels.visits)}- align="end"- width="120px"- >+ <DataColumn id="visits" label={t(labels.visits)} align="end" width="120px">{row => row?.visits?.toLocaleString()}</DataColumn>- <DataColumn- id="pageviews"- label={formatMessage(labels.views)}- align="end"- width="120px"- >+ <DataColumn id="pageviews" label={t(labels.views)} align="end" width="120px">{row => row?.pageviews?.toLocaleString()}</DataColumn>{showBounceDuration && [<DataColumnkey="bounceRate"id="bounceRate"- label={formatMessage(labels.bounceRate)}+ label={t(labels.bounceRate)}align="end"width="120px">@@ -120,7 +105,7 @@ export function MetricsExpandedTable({<DataColumnkey="visitDuration"id="visitDuration"- label={formatMessage(labels.visitDuration)}+ label={t(labels.visitDuration)}align="end"width="120px">diff --git a/src/components/metrics/MetricsTable.tsx b/src/components/metrics/MetricsTable.tsxindex e2fbc287e..8c94b26b4 100644--- a/src/components/metrics/MetricsTable.tsx+++ b/src/components/metrics/MetricsTable.tsx@@ -32,7 +32,7 @@ export function MetricsTable({...props}: MetricsTableProps) {const { updateParams } = useNavigation();- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const { data, isLoading, isFetching, error } = useWebsiteMetricsQuery(websiteId, {type,limit,@@ -83,7 +83,7 @@ export function MetricsTable({{showMore && limit && (<Row justifyContent="center" alignItems="flex-end" paddingTop="4"><LinkButton href={updateParams({ view: type })} variant="quiet">- <IconLabel icon={<Maximize />}>{formatMessage(labels.more)}</IconLabel>+ <IconLabel icon={<Maximize />}>{t(labels.more)}</IconLabel></LinkButton></Row>)}diff --git a/src/components/metrics/PageviewsChart.tsx b/src/components/metrics/PageviewsChart.tsxindex b83f8dc3a..6727facaa 100644--- a/src/components/metrics/PageviewsChart.tsx+++ b/src/components/metrics/PageviewsChart.tsx@@ -19,7 +19,7 @@ export interface PageviewsChartProps extends BarChartProps {}export function PageviewsChart({ data, unit, minDate, maxDate, ...props }: PageviewsChartProps) {- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const { theme } = useTheme();const { locale, dateLocale } = useLocale();const { colors } = useMemo(() => getThemeColors(theme), [theme]);@@ -32,7 +32,7 @@ export function PageviewsChart({ data, unit, minDate, maxDate, ...props }: Pagevdatasets: [{type: 'bar',- label: formatMessage(labels.visitors),+ label: t(labels.visitors),data: generateTimeSeries(data.sessions, minDate, maxDate, unit, dateLocale),borderWidth: 1,barPercentage: 0.9,@@ -42,7 +42,7 @@ export function PageviewsChart({ data, unit, minDate, maxDate, ...props }: Pagev},{type: 'bar',- label: formatMessage(labels.views),+ label: t(labels.views),data: generateTimeSeries(data.pageviews, minDate, maxDate, unit, dateLocale),barPercentage: 0.9,categoryPercentage: 0.9,@@ -54,7 +54,7 @@ export function PageviewsChart({ data, unit, minDate, maxDate, ...props }: Pagev? [{type: 'line',- label: `${formatMessage(labels.views)} (${formatMessage(labels.previous)})`,+ label: `${t(labels.views)} (${t(labels.previous)})`,data: generateTimeSeries(data.compare.pageviews,minDate,@@ -69,7 +69,7 @@ export function PageviewsChart({ data, unit, minDate, maxDate, ...props }: Pagev},{type: 'line',- label: `${formatMessage(labels.visitors)} (${formatMessage(labels.previous)})`,+ label: `${t(labels.visitors)} (${t(labels.previous)})`,data: generateTimeSeries(data.compare.sessions, minDate, maxDate, unit, dateLocale),borderWidth: 2,backgroundColor: '#f15bb5',diff --git a/src/components/metrics/WeeklyTraffic.tsx b/src/components/metrics/WeeklyTraffic.tsxindex 40d562d6a..c1c58ee82 100644--- a/src/components/metrics/WeeklyTraffic.tsx+++ b/src/components/metrics/WeeklyTraffic.tsx@@ -7,7 +7,7 @@ import { getDayOfWeekAsDate } from '@/lib/date';export function WeeklyTraffic({ websiteId }: { websiteId: string }) {const { data, isLoading, error } = useWeeklyTrafficQuery(websiteId);const { dateLocale } = useLocale();- const { labels, formatMessage } = useMessages();+ const { labels, t } = useMessages();const { weekStartsOn } = dateLocale.options;const daysOfWeek = Array(7).fill(weekStartsOn)@@ -96,7 +96,7 @@ export function WeeklyTraffic({ websiteId }: { websiteId: string }) {</Row></Focusable><Tooltip placement="right">- <Text>{`${formatMessage(labels.visitors)}: ${count}`}</Text>+ <Text size="base">{`${t(labels.visitors)}: ${count}`}</Text></Tooltip></TooltipTrigger>);diff --git a/src/components/metrics/WorldMap.tsx b/src/components/metrics/WorldMap.tsxindex 1939fe89d..f0df71487 100644--- a/src/components/metrics/WorldMap.tsx+++ b/src/components/metrics/WorldMap.tsx@@ -23,10 +23,10 @@ export function WorldMap({ websiteId, data, ...props }: WorldMapProps) {const { theme } = useTheme();const { colors } = getThemeColors(theme);const { locale } = useLocale();- const { formatMessage, labels } = useMessages();+ const { t, labels } = useMessages();const { countryNames } = useCountryNames(locale);- const visitorsLabel = formatMessage(labels.visitors).toLocaleLowerCase(locale);- const unknownLabel = formatMessage(labels.unknown);+ const visitorsLabel = t(labels.visitors).toLocaleLowerCase(locale);+ const unknownLabel = t(labels.unknown);const { data: mapData } = useWebsiteMetricsQuery(websiteId, {type: 'country',