Skip to content

📈 Open source, privacy-first web analytics — a cookie-less Google Analytics alternative with built-in error tracking and performance monitoring. Self-host it or use our cloud. Get started for free!

Billing page redesign

Blue Mousec159d8b71b9e
diff --git a/web/app/pages/Billing/index.tsx b/web/app/pages/Billing/index.tsx
index 7b4838083..2b088e084 100644
--- a/web/app/pages/Billing/index.tsx
+++ b/web/app/pages/Billing/index.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable jsx-a11y/anchor-has-content, lodash/prefer-lodash-method */
import React, { memo, useMemo, useState, useEffect } from 'react'
import { useTranslation, Trans } from 'react-i18next'
import { useSelector, useDispatch } from 'react-redux'
@@ -25,7 +24,6 @@ import Modal from 'ui/Modal'
import Button from 'ui/Button'
import MultiProgress from 'ui/MultiProgress'
import Tooltip from 'ui/Tooltip'
-import { IUser } from 'redux/models/IUser'
import UIActions from 'redux/reducers/ui'
import Pricing from '../../components/marketing/Pricing'
import DashboardLockedBanner from 'components/DashboardLockedBanner'
@@ -38,16 +36,10 @@ interface IBilling {
ssrTheme: 'dark' | 'light'
}
-const Billing: React.FC<IBilling> = ({ ssrAuthenticated, ssrTheme }): JSX.Element => {
+const Billing = ({ ssrAuthenticated, ssrTheme }: IBilling) => {
const [isCancelSubModalOpened, setIsCancelSubModalOpened] = useState<boolean>(false)
const { metainfo, usageinfo } = useSelector((state: StateType) => state.ui.misc)
- const {
- user,
- loading,
- }: {
- user: IUser
- loading: boolean
- } = useSelector((state: StateType) => state.auth)
+ const { user, loading } = useSelector((state: StateType) => state.auth)
const { theme: reduxTheme } = useSelector((state: StateType) => state.ui.theme)
const theme = isBrowser ? reduxTheme : ssrTheme
const paddleLoaded = useSelector((state: StateType) => state.ui.misc.paddleLoaded)
@@ -69,10 +61,10 @@ const Billing: React.FC<IBilling> = ({ ssrAuthenticated, ssrTheme }): JSX.Elemen
subCancelURL,
maxEventsCount,
} = user
- const isSubscriber = user.planCode !== 'none' && user.planCode !== 'trial' && user.planCode !== 'free'
- const isTrial: boolean = planCode === 'trial'
- const isNoSub: boolean = planCode === 'none'
+ const isSubscriber = user.planCode !== 'none' && user.planCode !== 'trial' && user.planCode !== 'free'
+ const isTrial = planCode === 'trial'
+ const isNoSub = planCode === 'none'
const totalUsage = _round((usageinfo.total / maxEventsCount) * 100, 2) || 0
// Paddle (payment processor) set-up
@@ -148,13 +140,11 @@ const Billing: React.FC<IBilling> = ({ ssrAuthenticated, ssrTheme }): JSX.Elemen
}, [language, trialEndDate, isTrial, timeFormat, isTrialEnded, t])
const onSubscriptionCancel = () => {
- // @ts-ignore
if (!window.Paddle) {
if (subCancelURL) window.location.replace(subCancelURL)
return
}
- // @ts-ignore
window.Paddle.Checkout.open({
override: subCancelURL,
method: 'inline',
@@ -167,19 +157,16 @@ const Billing: React.FC<IBilling> = ({ ssrAuthenticated, ssrTheme }): JSX.Elemen
country: metainfo.country,
})
setTimeout(() => {
- // @ts-ignore
- document.querySelector('#checkout-container').scrollIntoView()
+ document.querySelector('#checkout-container')?.scrollIntoView()
}, 500)
}
const onUpdatePaymentDetails = () => {
- // @ts-ignore
if (!window.Paddle) {
if (subUpdateURL) window.location.replace(subUpdateURL)
return
}
- // @ts-ignore
window.Paddle.Checkout.open({
override: subUpdateURL,
method: 'inline',
@@ -192,68 +179,102 @@ const Billing: React.FC<IBilling> = ({ ssrAuthenticated, ssrTheme }): JSX.Elemen
country: metainfo.country,
})
setTimeout(() => {
- // @ts-ignore
- document.querySelector('#checkout-container').scrollIntoView()
+ document.querySelector('#checkout-container')?.scrollIntoView()
}, 500)
}
return (
<div className='min-h-page bg-gray-50 dark:bg-slate-900'>
<DashboardLockedBanner />
- <div className='mx-auto w-11/12 whitespace-pre-line px-4 pb-16 pt-12 sm:px-6 md:w-4/5 lg:px-8'>
- <div className='mb-4 flex flex-wrap justify-between gap-y-2'>
- <h1 className='mr-2 text-4xl font-extrabold tracking-tight text-gray-900 dark:text-gray-50'>
- {t('billing.title')}
- </h1>
- </div>
- <h2 id='billing' className='mb-2 text-2xl font-medium tracking-tight text-gray-900 dark:text-gray-50'>
- {t('billing.subscription')}
- </h2>
- <p className='mt-1 text-base tracking-tight text-gray-900 dark:text-gray-50'>
- {isSubscriber ? t('billing.selectPlan') : t('billing.changePlan')}
- </p>
- <p className='text-base tracking-tight text-gray-900 dark:text-gray-50'>{t('billing.membersNotification')}</p>
- {isSubscriber && nextBillDate && (
+
+ <div className='mx-auto w-11/12 whitespace-pre-line px-4 pt-12 sm:px-6 md:w-5/6'>
+ <h1 className='text-4xl font-extrabold tracking-tight text-gray-900 dark:text-gray-50'>{t('billing.title')}</h1>
+ </div>
+
+ <div className='mx-auto mt-5 grid w-11/12 gap-8 whitespace-pre-line px-4 pb-16 sm:px-6 md:w-5/6 lg:grid-cols-2'>
+ <div>
+ <h2 id='billing' className='mb-2 text-2xl font-medium tracking-tight text-gray-900 dark:text-gray-50'>
+ {t('billing.subscription')}
+ </h2>
<p className='mt-1 text-base tracking-tight text-gray-900 dark:text-gray-50'>
- {t('billing.nextBillDateIs', {
- date:
- language === 'en'
- ? dayjs(nextBillDate).locale(language).format('MMMM D, YYYY')
- : dayjs(nextBillDate).locale(language).format('D MMMM, YYYY'),
- })}
+ {isSubscriber ? t('billing.selectPlan') : t('billing.changePlan')}
+ </p>
+ <p className='max-w-prose text-base tracking-tight text-gray-900 dark:text-gray-50'>
+ {t('billing.membersNotification')}
</p>
- )}
- {cancellationEffectiveDate && (
- <div className='mt-3 flex items-center text-lg tracking-tight text-gray-900 dark:text-gray-50'>
- <InformationCircleIcon className='mr-2 h-10 w-10 text-blue-600' aria-hidden='true' />
- <span className='max-w-prose font-medium'>
- {t('billing.cancelledSubMessage', {
- date:
- language === 'en'
- ? dayjs(cancellationEffectiveDate).locale(language).format('MMMM D, YYYY')
- : dayjs(cancellationEffectiveDate).locale(language).format('D MMMM, YYYY'),
- })}
- </span>
- </div>
- )}
- {isTrial && trialMessage && (
- <div className='mt-3 text-lg tracking-tight text-gray-900 dark:text-gray-50'>
- <span className='font-medium'>{trialMessage}</span>
- </div>
- )}
- {isNoSub && (
- <div className='mt-3 flex items-center text-lg tracking-tight text-gray-900 dark:text-gray-50'>
- <ExclamationTriangleIcon className='mr-2 h-10 w-10 text-red-600' aria-hidden='true' />
- <span className='max-w-prose font-medium'>{t('billing.noSubWarning')}</span>
- </div>
- )}
- {loading ? (
- <Loader />
- ) : (
- <>
- <div className='mt-5 flex flex-col xl:flex-row xl:space-x-5'>
+ {isSubscriber && nextBillDate && (
+ <div className='mt-5 max-w-prose rounded-md bg-blue-50 p-4 dark:bg-blue-600/30'>
+ <div className='flex'>
+ <div className='flex-shrink-0'>
+ <InformationCircleIcon aria-hidden='true' className='h-5 w-5 text-blue-400 dark:text-blue-100' />
+ </div>
+ <p className='ml-3 text-sm font-medium text-blue-700 dark:text-blue-100'>
+ {t('billing.nextBillDateIs', {
+ date:
+ language === 'en'
+ ? dayjs(nextBillDate).locale(language).format('MMMM D, YYYY')
+ : dayjs(nextBillDate).locale(language).format('D MMMM, YYYY'),
+ })}
+ </p>
+ </div>
+ </div>
+ )}
+ {cancellationEffectiveDate && (
+ <div className='mt-5 max-w-prose rounded-md bg-blue-50 p-4 dark:bg-blue-600/30'>
+ <div className='flex'>
+ <div className='flex-shrink-0'>
+ <InformationCircleIcon aria-hidden='true' className='h-5 w-5 text-blue-400 dark:text-blue-100' />
+ </div>
+ <div className='ml-3'>
+ <h3 className='text-sm font-medium text-blue-700 dark:text-blue-100'>
+ {t('billing.subscriptionCancelled')}
+ </h3>
+ <p className='mt-2 text-sm text-blue-700 dark:text-blue-100'>
+ {t('billing.subscriptionCancelledDescription', {
+ date:
+ language === 'en'
+ ? dayjs(cancellationEffectiveDate).locale(language).format('MMMM D, YYYY')
+ : dayjs(cancellationEffectiveDate).locale(language).format('D MMMM, YYYY'),
+ })}
+ </p>
+ </div>
+ </div>
+ </div>
+ )}
+ {isTrial && trialMessage && (
+ <div className='mt-5 max-w-prose rounded-md bg-blue-50 p-4 dark:bg-blue-600/30'>
+ <div className='flex'>
+ <div className='flex-shrink-0'>
+ <InformationCircleIcon aria-hidden='true' className='h-5 w-5 text-blue-400 dark:text-blue-100' />
+ </div>
+ <p className='ml-3 text-sm font-medium text-blue-700 dark:text-blue-100'>{trialMessage}</p>
+ </div>
+ </div>
+ )}
+ {isNoSub && (
+ <div className='mt-5 max-w-prose rounded-md bg-red-50 p-4 dark:bg-red-600/30'>
+ <div className='flex'>
+ <div className='flex-shrink-0'>
+ <ExclamationTriangleIcon aria-hidden='true' className='h-5 w-5 text-red-400 dark:text-red-100' />
+ </div>
+ <div className='ml-3'>
+ <h3 className='text-sm font-medium text-red-800 dark:text-red-100'>
+ {t('billing.noActiveSubscription')}
+ </h3>
+ <p className='mt-2 text-sm text-red-700 dark:text-red-200'>
+ {t('billing.noActiveSubscriptionDescription')}
+ </p>
+ </div>
+ </div>
+ </div>
+ )}
+
+ {loading ? (
+ <Loader />
+ ) : (
+ <div className='mt-8 flex flex-col'>
<Pricing authenticated={authenticated} isBillingPage />
- <div className='space-y-2'>
+ <div className='mt-2 space-y-2'>
{subUpdateURL && (
<Button className='mr-2' onClick={onUpdatePaymentDetails} type='button' primary large>
{t('billing.update')}
@@ -266,12 +287,20 @@ const Billing: React.FC<IBilling> = ({ ssrAuthenticated, ssrTheme }): JSX.Elemen
)}
</div>
</div>
- <h2 id='usage' className='mt-5 text-2xl font-medium tracking-tight text-gray-900 dark:text-gray-50'>
- {t('billing.planUsage')}
- </h2>
- <p className='mt-1 text-base tracking-tight text-gray-900 dark:text-gray-50'>
- {t('billing.planUsageDesc')}
- </p>
+ )}
+ </div>
+
+ <div>
+ <h2 id='usage' className='text-2xl font-medium tracking-tight text-gray-900 dark:text-gray-50'>
+ {t('billing.planUsage')}
+ </h2>
+ <p className='mt-1 max-w-prose text-base tracking-tight text-gray-900 dark:text-gray-50'>
+ {t('billing.planUsageDesc')}
+ </p>
+
+ {loading ? (
+ <Loader />
+ ) : (
<div className='mt-2 text-lg tracking-tight text-gray-900 dark:text-gray-50'>
<p className='mb-1 text-base font-medium tracking-tight text-gray-900 dark:text-gray-50'>
{t('billing.xofy', {
@@ -345,8 +374,8 @@ const Billing: React.FC<IBilling> = ({ ssrAuthenticated, ssrTheme }): JSX.Elemen
/>
<p className='mt-1 text-base tracking-tight text-gray-900 dark:text-gray-50'>{t('billing.resetDate')}</p>
</div>
- </>
- )}
+ )}
+ </div>
</div>
<Modal
onClose={() => {
@@ -363,7 +392,6 @@ const Billing: React.FC<IBilling> = ({ ssrAuthenticated, ssrTheme }): JSX.Elemen
type='error'
message={
<Trans
- // @ts-ignore
t={t}
i18nKey='pricing.cancelDesc'
values={{
diff --git a/web/app/root.tsx b/web/app/root.tsx
index 7be0a01f5..afd393afe 100644
--- a/web/app/root.tsx
+++ b/web/app/root.tsx
@@ -46,6 +46,8 @@ declare global {
REMIX_ENV: any
// Set by Docker for self-hosted
env: any
+
+ Paddle: any
}
}
@@ -62,7 +64,7 @@ export const links: LinksFunction = () => [
{ rel: 'stylesheet', href: FontsCss },
]
-export const headers: HeadersFunction = (stuff) => ({
+export const headers: HeadersFunction = () => ({
// General headers
'access-control-allow-origin': '*',
'Cross-Origin-Embedder-Policy': 'require-corp; report-to="default";',
diff --git a/web/public/locales/de.json b/web/public/locales/de.json
index d6400e091..91c6633a1 100644
--- a/web/public/locales/de.json
+++ b/web/public/locales/de.json
@@ -807,6 +807,8 @@
"overrideCurrentlyFilters": "Aktuell angewendete Filter überschreiben",
"noExist": "Das ausgewählte Projekt existiert nicht",
"geo": "Standortbestimmung",
+ "browserInfo": "Browser information",
+ "osInfo": "OS information",
"campaigns": "Kampagnen",
"pageviewX": "<span>Pageview</span> <value>{{x}}</value>",
"eventX": "<span>Event</span> <value>{{x}}</value>",
@@ -859,7 +861,9 @@
"ref": "Referrer",
"dv": "Gerätetyp",
"br": "Browser",
+ "brv": "Browser version",
"os": "Betriebssystem",
+ "osv": "OS version",
"so": "UTM Source",
"me": "UTM Medium",
"ca": "UTM Campaign",
@@ -1046,9 +1050,11 @@
"nextBillDateIs": "Ihr nächstes Rechnungsdatum ist {{date}}",
"trialEnds": "Testphase endet am {{date}}",
"cancelSub": "Abonnement kündigen",
- "noSubWarning": "Sie haben kein aktives Abonnement.\nEs werden keine neuen Analysedaten in unserer Datenbank gespeichert. Sie können die Daten, die vor der Kündigung des Abonnements gesammelt wurden, weiterhin einsehen.",
+ "noActiveSubscription": "You don't have an active subscription.",
+ "noActiveSubscriptionDescription": "Don't worry, we still collect your analytics data. But if you want to continue using Swetrix, please upgrade your account to one of our subscription tiers.",
"inactive": "Inaktiv",
- "cancelledSubMessage": "Sie haben Ihr Abonnement gekündigt.\nDas Abonnement ist noch bis {{date}} aktiv.\nDanach werden keine neuen Analysedaten mehr in unserer Datenbank gespeichert. Sie können die Daten, die vor der Kündigung des Abonnements gesammelt wurden, weiterhin einsehen.",
+ "subscriptionCancelled": "Subscription cancelled",
+ "subscriptionCancelledDescription": "Your subscription is active until {{date}}. After that, you will not be able to access your analytics data. Don't worry, we will still store incoming events and pageviews for your projects in case you change your mind.",
"planUsage": "Plan-Nutzung",
"usageOverview": "Diesen Monat haben Sie {{tracked}} Events ({{trackedPerc}}%) der {{maxEvents}} Events in Ihrem Paket verfolgt.",
"breakdown": "Aufschlüsselung nach Ereignistyp:",
diff --git a/web/public/locales/el.json b/web/public/locales/el.json
index 42729ef8d..412e84157 100644
--- a/web/public/locales/el.json
+++ b/web/public/locales/el.json
@@ -807,6 +807,8 @@
"overrideCurrentlyFilters": "Override currently applied filters",
"noExist": "Το επιλεγμένο έργο δεν υπάρχει",
"geo": "Geolocation",
+ "browserInfo": "Browser information",
+ "osInfo": "OS information",
"campaigns": "Campaigns",
"pageviewX": "<span>Pageview</span> <value>{{x}}</value>",
"eventX": "<span>Event</span> <value>{{x}}</value>",
@@ -859,7 +861,9 @@
"ref": "Αναφέρων",
"dv": "Τύπος συσκευής",
"br": "Περιηγητής",
+ "brv": "Browser version",
"os": "Όνομα Λειτουργικού Συστήματος",
+ "osv": "OS version",
"so": "UTM Source",
"me": "UTM Medium",
"ca": "UTM Campaign",
@@ -1046,9 +1050,11 @@
"nextBillDateIs": "Your next bill date is {{date}}",
"trialEnds": "Trial ends {{date}}",
"cancelSub": "Cancel subscription",
- "noSubWarning": "You don't have an active subscription.\nNo new analytics data will be stored into our database. You can still view the data that was collected before the subscription was cancelled.",
+ "noActiveSubscription": "You don't have an active subscription.",
+ "noActiveSubscriptionDescription": "Don't worry, we still collect your analytics data. But if you want to continue using Swetrix, please upgrade your account to one of our subscription tiers.",
"inactive": "Inactive",
- "cancelledSubMessage": "You've cancelled your subscription.\nThe subscription will be active until {{date}}.\nAfter that, no new analytics data will be stored into our database. You can still view the data that was collected before the subscription was cancelled.",
+ "subscriptionCancelled": "Subscription cancelled",
+ "subscriptionCancelledDescription": "Your subscription is active until {{date}}. After that, you will not be able to access your analytics data. Don't worry, we will still store incoming events and pageviews for your projects in case you change your mind.",
"planUsage": "Plan usage",
"usageOverview": "This month you have tracked {{tracked}} events ({{trackedPerc}}%) of the {{maxEvents}} events in your plan.",
"breakdown": "Breakdown by the event type:",
diff --git a/web/public/locales/en.json b/web/public/locales/en.json
index bb5371943..14ef50afd 100644
--- a/web/public/locales/en.json
+++ b/web/public/locales/en.json
@@ -1050,9 +1050,11 @@
"nextBillDateIs": "Your next bill date is {{date}}",
"trialEnds": "Trial ends {{date}}",
"cancelSub": "Cancel subscription",
- "noSubWarning": "You don't have an active subscription.\nNo new analytics data will be stored into our database. You can still view the data that was collected before the subscription was cancelled.",
+ "noActiveSubscription": "You don't have an active subscription.",
+ "noActiveSubscriptionDescription": "Don't worry, we still collect your analytics data. But if you want to continue using Swetrix, please upgrade your account to one of our subscription tiers.",
"inactive": "Inactive",
- "cancelledSubMessage": "You've cancelled your subscription.\nThe subscription will be active until {{date}}.\nAfter that, no new analytics data will be stored into our database. You can still view the data that was collected before the subscription was cancelled.",
+ "subscriptionCancelled": "Subscription cancelled",
+ "subscriptionCancelledDescription": "Your subscription is active until {{date}}. After that, you will not be able to access your analytics data. Don't worry, we will still store incoming events and pageviews for your projects in case you change your mind.",
"planUsage": "Plan usage",
"usageOverview": "This month you have tracked {{tracked}} events ({{trackedPerc}}%) of the {{maxEvents}} events in your plan.",
"breakdown": "Breakdown by the event type:",
diff --git a/web/public/locales/es.json b/web/public/locales/es.json
index fc73d54e3..a054863b8 100644
--- a/web/public/locales/es.json
+++ b/web/public/locales/es.json
@@ -807,6 +807,8 @@
"overrideCurrentlyFilters": "Override currently applied filters",
"noExist": "The selected project does not exist",
"geo": "Geolocation",
+ "browserInfo": "Browser information",
+ "osInfo": "OS information",
"campaigns": "Campaigns",
"pageviewX": "<span>Pageview</span> <value>{{x}}</value>",
"eventX": "<span>Event</span> <value>{{x}}</value>",
@@ -859,7 +861,9 @@
"ref": "Referrer",
"dv": "Device type",
"br": "Browser",
+ "brv": "Browser version",
"os": "OS name",
+ "osv": "OS version",
"so": "UTM Source",
"me": "UTM Medium",
"ca": "UTM Campaign",
@@ -1046,9 +1050,11 @@
"nextBillDateIs": "Your next bill date is {{date}}",
"trialEnds": "Trial ends {{date}}",
"cancelSub": "Cancel subscription",
- "noSubWarning": "You don't have an active subscription.\nNo new analytics data will be stored into our database. You can still view the data that was collected before the subscription was cancelled.",
+ "noActiveSubscription": "You don't have an active subscription.",
+ "noActiveSubscriptionDescription": "Don't worry, we still collect your analytics data. But if you want to continue using Swetrix, please upgrade your account to one of our subscription tiers.",
"inactive": "Inactive",
- "cancelledSubMessage": "You've cancelled your subscription.\nThe subscription will be active until {{date}}.\nAfter that, no new analytics data will be stored into our database. You can still view the data that was collected before the subscription was cancelled.",
+ "subscriptionCancelled": "Subscription cancelled",
+ "subscriptionCancelledDescription": "Your subscription is active until {{date}}. After that, you will not be able to access your analytics data. Don't worry, we will still store incoming events and pageviews for your projects in case you change your mind.",
"planUsage": "Plan usage",
"usageOverview": "This month you have tracked {{tracked}} events ({{trackedPerc}}%) of the {{maxEvents}} events in your plan.",
"breakdown": "Breakdown by the event type:",
diff --git a/web/public/locales/pl.json b/web/public/locales/pl.json
index 062a4e902..123d87278 100644
--- a/web/public/locales/pl.json
+++ b/web/public/locales/pl.json
@@ -807,6 +807,8 @@
"overrideCurrentlyFilters": "Override currently applied filters",
"noExist": "Wybrany projekt nie istnieje",
"geo": "Geolocation",
+ "browserInfo": "Browser information",
+ "osInfo": "OS information",
"campaigns": "Campaigns",
"pageviewX": "<span>Pageview</span> <value>{{x}}</value>",
"eventX": "<span>Event</span> <value>{{x}}</value>",
@@ -859,7 +861,9 @@
"ref": "Źródło",
"dv": "Rodzaj urządzenia",
"br": "Przeglądarka",
+ "brv": "Browser version",
"os": "System operacyjny",
+ "osv": "OS version",
"so": "UTM Source",
"me": "UTM Medium",
"ca": "UTM Campaign",
@@ -1046,9 +1050,11 @@
"nextBillDateIs": "Your next bill date is {{date}}",
"trialEnds": "Okres próbny kończy się {{date}}",
"cancelSub": "Anuluj subskrypcję",
- "noSubWarning": "Nie masz aktywnej subskrypcji.\nŻadne nowe dane analityczne nie zostaną zapisane w naszej bazie danych. Nadal możesz wyświetlić dane, które zostały zebrane przed anulowaniem subskrypcji.",
+ "noActiveSubscription": "You don't have an active subscription.",
+ "noActiveSubscriptionDescription": "Don't worry, we still collect your analytics data. But if you want to continue using Swetrix, please upgrade your account to one of our subscription tiers.",
"inactive": "Nieaktywny",
- "cancelledSubMessage": "Anulowałeś subskrypcję.\nSubskrypcja będzie aktywna do {{date}}.\nNastępnie żadne nowe dane analityczne nie zostaną zapisane w naszej bazie danych. Nadal możesz wyświetlić dane, które zostały zebrane przed anulowaniem subskrypcji.",
+ "subscriptionCancelled": "Subscription cancelled",
+ "subscriptionCancelledDescription": "Your subscription is active until {{date}}. After that, you will not be able to access your analytics data. Don't worry, we will still store incoming events and pageviews for your projects in case you change your mind.",
"planUsage": "Plan usage",
"usageOverview": "This month you have tracked {{tracked}} events ({{trackedPerc}}%) of the {{maxEvents}} events in your plan.",
"breakdown": "Breakdown by the event type:",
diff --git a/web/public/locales/sv.json b/web/public/locales/sv.json
index 4071a4296..45475443a 100644
--- a/web/public/locales/sv.json
+++ b/web/public/locales/sv.json
@@ -807,6 +807,8 @@
"overrideCurrentlyFilters": "Override currently applied filters",
"noExist": "Det valda projektet finns inte",
"geo": "Geolocation",
+ "browserInfo": "Browser information",
+ "osInfo": "OS information",
"campaigns": "Campaigns",
"pageviewX": "<span>Pageview</span> <value>{{x}}</value>",
"eventX": "<span>Event</span> <value>{{x}}</value>",
@@ -859,7 +861,9 @@
"ref": "Hänvisare",
"dv": "Enhetstyp",
"br": "Webbläsare",
+ "brv": "Browser version",
"os": "OS-namn",
+ "osv": "OS version",
"so": "UTM Source",
"me": "UTM Medium",
"ca": "UTM Campaign",
@@ -1046,9 +1050,11 @@
"nextBillDateIs": "Your next bill date is {{date}}",
"trialEnds": "Trial ends {{date}}",
"cancelSub": "Cancel subscription",
- "noSubWarning": "You don't have an active subscription.\nNo new analytics data will be stored into our database. You can still view the data that was collected before the subscription was cancelled.",
+ "noActiveSubscription": "You don't have an active subscription.",
+ "noActiveSubscriptionDescription": "Don't worry, we still collect your analytics data. But if you want to continue using Swetrix, please upgrade your account to one of our subscription tiers.",
"inactive": "Inactive",
- "cancelledSubMessage": "You've cancelled your subscription.\nThe subscription will be active until {{date}}.\nAfter that, no new analytics data will be stored into our database. You can still view the data that was collected before the subscription was cancelled.",
+ "subscriptionCancelled": "Subscription cancelled",
+ "subscriptionCancelledDescription": "Your subscription is active until {{date}}. After that, you will not be able to access your analytics data. Don't worry, we will still store incoming events and pageviews for your projects in case you change your mind.",
"planUsage": "Plan usage",
"usageOverview": "This month you have tracked {{tracked}} events ({{trackedPerc}}%) of the {{maxEvents}} events in your plan.",
"breakdown": "Breakdown by the event type:",
diff --git a/web/public/locales/uk.json b/web/public/locales/uk.json
index 1c4ca5266..710212f50 100644
--- a/web/public/locales/uk.json
+++ b/web/public/locales/uk.json
@@ -807,6 +807,8 @@
"overrideCurrentlyFilters": "Перевизначити застосовані фільтри",
"noExist": "Обраний проєкт не існує",
"geo": "Геолокація",
+ "browserInfo": "Browser information",
+ "osInfo": "OS information",
"campaigns": "Кампанії",
"pageviewX": "<span>Pageview</span> <value>{{x}}</value>",
"eventX": "<span>Event</span> <value>{{x}}</value>",
@@ -859,7 +861,9 @@
"ref": "Джерело",
"dv": "Тип пристрою",
"br": "Браузер",
+ "brv": "Browser version",
"os": "Операційна система",
+ "osv": "OS version",
"so": "UTM Source",
"me": "UTM Medium",
"ca": "UTM Campaign",
@@ -1046,9 +1050,11 @@
"nextBillDateIs": "Наступна дата оплати {{date}}",
"trialEnds": "Пробний період закінчується {{date}}",
"cancelSub": "Скасувати підписку",
- "noSubWarning": "У вас немає активної підписки.\nНові дані аналітики не будуть зберігатися в нашій базі даних. Ви все ще можете переглянути дані, зібрані до того, як підписка була скасована.",
+ "noActiveSubscription": "You don't have an active subscription.",
+ "noActiveSubscriptionDescription": "Don't worry, we still collect your analytics data. But if you want to continue using Swetrix, please upgrade your account to one of our subscription tiers.",
"inactive": "Неактивний",
- "cancelledSubMessage": "Ви скасували підписку.\nПідписка буде активна до {{date}}.\nПісля цього нові дані аналітики не будуть зберігатися в нашій базі даних. Ви все ще можете переглянути дані, зібрані до того, як підписка була скасована.",
+ "subscriptionCancelled": "Subscription cancelled",
+ "subscriptionCancelledDescription": "Your subscription is active until {{date}}. After that, you will not be able to access your analytics data. Don't worry, we will still store incoming events and pageviews for your projects in case you change your mind.",
"planUsage": "Використання плану",
"usageOverview": "У цьому місяці ви відстежували події {{tracked}} ({{trackedPerc}}%) від {{maxEvents}} подій у вашому тарифному плані.",
"breakdown": "Аналіз за типом події:",