From c428e08cc872b0ff989f0e770d424fac6a0a5ffc Mon Sep 17 00:00:00 2001 From: Taly Date: Thu, 18 Dec 2025 03:14:21 +0300 Subject: [PATCH 01/52] Localize email templates to Russian Translated all user-facing text in email templates from English to Russian, including subjects, button labels, and message bodies. Updated pluralization and formatting to use Russian language rules and improved consistency across all notification types. --- .../src/templates/components/event-info.twig | 8 +++--- .../src/templates/components/layout.twig | 2 +- .../src/templates/emails/assignee/html.twig | 8 +++--- .../templates/emails/assignee/subject.twig | 2 +- .../src/templates/emails/assignee/text.twig | 18 ++++++------- .../emails/block-workspace/text.twig | 2 +- .../blocked-workspace-reminder/text.twig | 2 +- .../days-limit-almost-reached/html.twig | 9 ++++--- .../days-limit-almost-reached/subject.twig | 2 +- .../days-limit-almost-reached/text.twig | 12 +++++---- .../src/templates/emails/event/html.twig | 8 +++--- .../src/templates/emails/event/text.twig | 25 +++++++++++-------- .../events-limit-almost-reached/html.twig | 10 ++++---- .../events-limit-almost-reached/subject.twig | 2 +- .../events-limit-almost-reached/text.twig | 12 ++++----- .../templates/emails/password-reset/html.twig | 9 ++++--- .../emails/password-reset/subject.twig | 2 +- .../templates/emails/password-reset/text.twig | 12 ++++----- .../templates/emails/payment-failed/html.twig | 10 ++++---- .../emails/payment-failed/subject.twig | 2 +- .../templates/emails/payment-failed/text.twig | 14 +++++------ .../emails/payment-success/html.twig | 6 ++--- .../emails/payment-success/subject.twig | 2 +- .../emails/payment-success/text.twig | 16 ++++++------ .../templates/emails/several-events/html.twig | 10 ++++---- .../emails/several-events/subject.twig | 2 +- .../templates/emails/several-events/text.twig | 20 +++++++-------- .../src/templates/emails/sign-up/html.twig | 9 ++++--- .../src/templates/emails/sign-up/subject.twig | 2 +- .../src/templates/emails/sign-up/text.twig | 12 ++++----- .../emails/workspace-invite/html.twig | 9 ++++--- .../emails/workspace-invite/subject.twig | 2 +- .../emails/workspace-invite/text.twig | 14 ++++++----- 33 files changed, 140 insertions(+), 135 deletions(-) diff --git a/workers/email/src/templates/components/event-info.twig b/workers/email/src/templates/components/event-info.twig index 13d0572dd..b1a50cdec 100644 --- a/workers/email/src/templates/components/event-info.twig +++ b/workers/email/src/templates/components/event-info.twig @@ -3,7 +3,7 @@
- {{ event.newCount | abbrNumber }} new + {{ event.newCount | abbrNumber }} {{ pluralize_ru(event.newCount, ['новое событие', 'новых события', 'новых событий']) }}
@@ -11,7 +11,7 @@ {% if event.event.totalCount is not empty %} - {{ event.event.totalCount | abbrNumber }} total + {{ event.event.totalCount | abbrNumber }} {{ pluralize_ru(event.event.totalCount, ['раз', 'раза', 'раз']) }}    @@ -19,7 +19,7 @@ {% if event.daysRepeated is not empty %} - {{ event.daysRepeated }} days repeating + {{ event.daysRepeated }} {{ pluralize_ru(event.daysRepeated, ['день', 'дня', 'дней']) }} повторяется    @@ -27,7 +27,7 @@ {% if event.usersAffected %} - {{ event.usersAffected }} users affected + {{ event.usersAffected }} {{ pluralize_ru(event.usersAffected, ['пользователь', 'пользователя', 'пользователей']) }} затронуто {% endif %} diff --git a/workers/email/src/templates/components/layout.twig b/workers/email/src/templates/components/layout.twig index 539967d8d..6dc6a85d3 100644 --- a/workers/email/src/templates/components/layout.twig +++ b/workers/email/src/templates/components/layout.twig @@ -160,7 +160,7 @@ - Made by + Сделан в  CodeX diff --git a/workers/email/src/templates/emails/assignee/html.twig b/workers/email/src/templates/emails/assignee/html.twig index ead2fc8fa..c5a7a391f 100644 --- a/workers/email/src/templates/emails/assignee/html.twig +++ b/workers/email/src/templates/emails/assignee/html.twig @@ -19,7 +19,7 @@ {% else %} {{ whoAssigned.email }} {% endif %} - assigned you to resolve the event + поручил вам обработать событие @@ -28,7 +28,7 @@ {% set url = host ~ '/project/' ~ project._id ~ '/event/' ~ event._id ~ '/overview' %} - {% include '../../components/button.twig' with {href: url, label: 'View event'} %} + {% include '../../components/button.twig' with {href: url, label: 'Просмотреть событие'} %} @@ -39,7 +39,5 @@ {% endblock %} {% block unsubscribeText %} - You received this email because you are currently opted in to receive such alerts via your - personal notifications settings. You may adjust your preferences at any time by clicking - the link above. + Вы получили это письмо, потому что подписаны на получение подобных оповещений в настройках вашего профиля. Вы можете их изменить, перейдя по ссылке выше. {% endblock %} diff --git a/workers/email/src/templates/emails/assignee/subject.twig b/workers/email/src/templates/emails/assignee/subject.twig index acc159cb3..ab053cdd4 100644 --- a/workers/email/src/templates/emails/assignee/subject.twig +++ b/workers/email/src/templates/emails/assignee/subject.twig @@ -1 +1 @@ -You're assigned: ({{ project.name | escape }}) {{ event.payload.title }} \ No newline at end of file +Вам поручили обработать событие в проекте «{{ project.name | escape }}» \ No newline at end of file diff --git a/workers/email/src/templates/emails/assignee/text.twig b/workers/email/src/templates/emails/assignee/text.twig index 3e2fa3c48..0c7b8dc3d 100644 --- a/workers/email/src/templates/emails/assignee/text.twig +++ b/workers/email/src/templates/emails/assignee/text.twig @@ -1,18 +1,18 @@ -{% if whoAssigned.name %}{{ whoAssigned.name | escape }}{% else %}{{ whoAssigned.email }}{% endif %} assigned you to resolve the event +{% if whoAssigned.name %}{{ whoAssigned.name | escape }}{% else %}{{ whoAssigned.email }}{% endif %} поручил вам обработать событие в проекте «{{ project.name | escape }}» {{ event.payload.title }} -{{ event.totalCount }} total -{{ daysRepeated }} {% if daysRepeated == 1 %}day{% else %}days{% endif %} repeating -{{ event.usersAffected }} {% if event.usersAffected == 1 %}user{% else %}users{% endif %} affected +{{ event.totalCount }} {{ pluralize_ru(event.totalCount, ['раз', 'раза', 'раз']) }} +{{ daysRepeated }} {{ pluralize_ru(daysRepeated, ['день', 'дня', 'дней']) }} повторяется +{{ event.usersAffected }} {{ pluralize_ru(event.usersAffected, ['пользователь', 'пользователя', 'пользователей']) }} затронуто -View event: {{ host }}/project/{{ project._id }}/event/{{ event._id }}/overview +Просмотреть событие: {{ host }}/project/{{ project._id }}/event/{{ event._id }}/overview *** -You received this email because you are currently opted in to receive such alerts via your personal notifications settings. You may adjust your preferences at any time by clicking the link: {{ host }}/account/notifications +Вы получили это письмо, потому что подписаны на получение подобных оповещений в своих личных настройках. Вы можете изменить свои предпочтения в любое время, перейдя по ссылке: {{ host }}/account/notifications -Hawk -Errors tracking system +Хоук +Российский трекер ошибок -Made by CodeX +Сделан в CodeX diff --git a/workers/email/src/templates/emails/block-workspace/text.twig b/workers/email/src/templates/emails/block-workspace/text.twig index e0994e1fd..7cbd6bdec 100644 --- a/workers/email/src/templates/emails/block-workspace/text.twig +++ b/workers/email/src/templates/emails/block-workspace/text.twig @@ -9,4 +9,4 @@ Хоук Российский трекер ошибок -Made by CodeX \ No newline at end of file +Сделан в CodeX \ No newline at end of file diff --git a/workers/email/src/templates/emails/blocked-workspace-reminder/text.twig b/workers/email/src/templates/emails/blocked-workspace-reminder/text.twig index 8d95bc7b0..34bcb4736 100644 --- a/workers/email/src/templates/emails/blocked-workspace-reminder/text.twig +++ b/workers/email/src/templates/emails/blocked-workspace-reminder/text.twig @@ -7,4 +7,4 @@ Хоук Российский трекер ошибок -Made by CodeX \ No newline at end of file +Сделан в CodeX \ No newline at end of file diff --git a/workers/email/src/templates/emails/days-limit-almost-reached/html.twig b/workers/email/src/templates/emails/days-limit-almost-reached/html.twig index d568fc185..bcac0c2c1 100644 --- a/workers/email/src/templates/emails/days-limit-almost-reached/html.twig +++ b/workers/email/src/templates/emails/days-limit-almost-reached/html.twig @@ -14,7 +14,7 @@ - {{ daysLeft | escape }} day{{ daysLeft > 1 ? 's' : '' }} left to the paid plan ending + {{ daysLeft | escape }} {{ pluralize_ru(daysLeft, ['день', 'дня', 'дней']) }} до окончания платного тарифа @@ -22,14 +22,15 @@ - Please, make sure that you have linked a card as a payment method for the workspace "{{ workspace.name | escape }}". - Otherwise it will be blocked because the plan was not renewed. + Пожалуйста, убедитесь, что вы привязали карту для автоматического продления тарифа в воркспейсе «{{ workspace.name | escape }}».
+
+ Если оплата не пройдет, то мониторинг ошибок будет приостановлен.
- {% include '../../components/button.twig' with {href: host ~ '/workspace/' ~ workspace._id ~ '/settings/billing', label: 'Go to payment settings'} %} + {% include '../../components/button.twig' with {href: host ~ '/workspace/' ~ workspace._id ~ '/settings/billing', label: 'Перейти к настройкам'} %} {% endblock %} diff --git a/workers/email/src/templates/emails/days-limit-almost-reached/subject.twig b/workers/email/src/templates/emails/days-limit-almost-reached/subject.twig index 099b1cfd5..02a61a825 100644 --- a/workers/email/src/templates/emails/days-limit-almost-reached/subject.twig +++ b/workers/email/src/templates/emails/days-limit-almost-reached/subject.twig @@ -1 +1 @@ -{{ daysLeft | escape }} day{{ daysLeft > 1 ? 's' : '' }} left to the paid plan ending for workspace {{ workspace.name | escape }}! +Через {{ daysLeft | escape }} {{ pluralize_ru(daysLeft, ['день', 'дня', 'дней']) }} заканчивается тариф воркспейса «{{ workspace.name | escape }}»! diff --git a/workers/email/src/templates/emails/days-limit-almost-reached/text.twig b/workers/email/src/templates/emails/days-limit-almost-reached/text.twig index 6856d602f..7f1853dbe 100644 --- a/workers/email/src/templates/emails/days-limit-almost-reached/text.twig +++ b/workers/email/src/templates/emails/days-limit-almost-reached/text.twig @@ -1,10 +1,12 @@ -{{ daysLeft | escape }} day{{ daysLeft > 1 ? 's' : '' }} left to the paid plan ending for workspace {{ workspace.name | escape }}. +{{ daysLeft | escape }} {{ pluralize_ru(daysLeft, ['день', 'дня', 'дней']) }} до окончания платного тарифа воркспейса «{{ workspace.name | escape }}». -Please, check payment settings and renew the plan: {{ host }}/workspace/{{ workspace._id }}/settings/billing +Если оплата не пройдет, то мониторинг ошибок будет приостановлен. + +Пожалуйста, проверьте настройки оплаты: {{ host }}/workspace/{{ workspace._id }}/settings/billing *** -Hawk -Errors tracking system +Хоук +Российский трекер ошибок -Made by CodeX +Сделан в CodeX diff --git a/workers/email/src/templates/emails/event/html.twig b/workers/email/src/templates/emails/event/html.twig index 35c7c5032..147cce0e7 100644 --- a/workers/email/src/templates/emails/event/html.twig +++ b/workers/email/src/templates/emails/event/html.twig @@ -16,7 +16,7 @@ - {{ event.payload.type ? event.payload.type : 'Uncaught Error' }} + {{ event.payload.type ? event.payload.type : 'Необработанное событие' }} @@ -52,7 +52,7 @@ {% set eventURL = host ~ '/project/' ~ project._id ~ '/event/' ~ event._id %} - {% include '../../components/button.twig' with {href: eventURL, label: 'View event'} %} + {% include '../../components/button.twig' with {href: eventURL, label: 'Просмотреть событие'} %} {% endblock %} @@ -62,7 +62,5 @@ {% endblock %} {% block unsubscribeText %} - You received this email because you are currently opted in to receive such alerts via your - project’s notifications settings. You may adjust your preferences at any time by clicking - the link above. + Вы получили это письмо, потому что подписаны на получение подобных оповещений в настройках уведомлений вашего проекта. Вы можете изменить свои предпочтения в любое время, перейдя по ссылке выше. {% endblock %} diff --git a/workers/email/src/templates/emails/event/text.twig b/workers/email/src/templates/emails/event/text.twig index 7f60e9429..dcc1abecc 100644 --- a/workers/email/src/templates/emails/event/text.twig +++ b/workers/email/src/templates/emails/event/text.twig @@ -2,15 +2,15 @@ {% set daysRepeated = events[0].daysRepeated %} {% set newCount = events[0].newCount %} {% set usersAffected = events[0].usersAffected %} -{% set newLabel = 'a new event' %} -{% if newCount > 1 %} - {% set newLabel = newCount ~ ' new events' %} +{% set newLabel = newCount ~ ' ' ~ pluralize_ru(newCount, ['новое событие', 'новых события', 'новых событий']) %} +{% if newCount == 1 %} + {# Оставить как есть #} {% endif %} -You have {{ newLabel }} on «{{ project.name }}» project. +{{ newLabel }} в проекте «{{ project.name }}» ------------------------ -{{ event.payload.type ? event.payload.type : 'Uncaught Error' }}: {{ event.payload.title | escape }} +{{ event.payload.type ? event.payload.type : 'Необработанное событие' }}: {{ event.payload.title | escape }} ------------------------ {% if event.payload.backtrace is not empty %} {% if event.payload.backtrace[0] is not empty %} @@ -21,18 +21,21 @@ You have {{ newLabel }} on «{{ project.name }}» project. {% endif %} {% endif %} -This event appears {{ event.totalCount }} total times, {{ daysRepeated }} days repeating. +Это событие произошло {{ event.totalCount }} {{ pluralize_ru(event.totalCount, ['раз', 'раза', 'раз']) }}, повторяется {{ daysRepeated }} {{ pluralize_ru(daysRepeated, ['день', 'дня', 'дней']) }}. -View event: {{ host }}/project/{{ project._id }}/event/{{ event._id }} +Просмотреть событие: {{ host }}/project/{{ project._id }}/event/{{ event._id }} *** -You received this email because you are currently opted in to receive such alerts via your project’s notifications settings. You may adjust your preferences at any time by clicking the link above. To unsubscribe, follow the link: {{ host }}/unsubscribe/{{ project._id }} +Вы получили это письмо, потому что подписаны на получение подобных оповещений в настройках уведомлений вашего проекта. Вы можете изменить свои предпочтения в любое время, перейдя по ссылке выше. Чтобы отписаться, перейдите по ссылке: {{ host }}/unsubscribe/{{ project._id }} -Hawk -Errors tracking system +*** + +Хоук +Российский трекер ошибок + +Сделан в CodeX -Made by CodeX diff --git a/workers/email/src/templates/emails/events-limit-almost-reached/html.twig b/workers/email/src/templates/emails/events-limit-almost-reached/html.twig index d5b3a1d11..00dabdbb1 100644 --- a/workers/email/src/templates/emails/events-limit-almost-reached/html.twig +++ b/workers/email/src/templates/emails/events-limit-almost-reached/html.twig @@ -14,7 +14,7 @@ - You’re almost out of your error tracking limit + Вы почти исчерпали лимит событий @@ -22,17 +22,17 @@ - You’ve used {{ eventsCount }} of {{ eventsLimit }} events this month in the {{ workspace.name | escape }} workspace. + Вы использовали {{ eventsCount }} из {{ eventsLimit }} событий в этом месяце в воркспейсе «{{ workspace.name | escape }}» в текущем расчетном периоде. - Your project is growing — that’s awesome! Let’s make sure you don’t miss any important errors. + Ваш проект растет — это прекрасно! Давайте не пропустим никакие важные ошибки. - Upgrade your plan to stay on top of everything. + Обновите план, чтобы всегда быть в курсе. - {% include '../../components/button.twig' with {href: host ~ '/workspace/' ~ workspace._id ~ '/settings/billing', label: 'Increase limit — from 99₽'} %} + {% include '../../components/button.twig' with {href: host ~ '/workspace/' ~ workspace._id ~ '/settings/billing', label: 'Увеличить лимит — от 99₽'} %} {% endblock %} diff --git a/workers/email/src/templates/emails/events-limit-almost-reached/subject.twig b/workers/email/src/templates/emails/events-limit-almost-reached/subject.twig index 7acf18269..47994c482 100644 --- a/workers/email/src/templates/emails/events-limit-almost-reached/subject.twig +++ b/workers/email/src/templates/emails/events-limit-almost-reached/subject.twig @@ -1 +1 @@ -You’re almost out of error tracking events in {{ workspace.name }} workspace \ No newline at end of file +Лимит событий в воркспейсе {{ workspace.name }} почти достигнут \ No newline at end of file diff --git a/workers/email/src/templates/emails/events-limit-almost-reached/text.twig b/workers/email/src/templates/emails/events-limit-almost-reached/text.twig index c6c413144..939d9e65e 100644 --- a/workers/email/src/templates/emails/events-limit-almost-reached/text.twig +++ b/workers/email/src/templates/emails/events-limit-almost-reached/text.twig @@ -1,12 +1,12 @@ -You’ve used {{ eventsCount }} of {{ eventsLimit }} events this month in the {{ workspace.name | escape }} workspace. +Вы получили {{ eventsCount }} из {{ eventsLimit }} событий в воркспейсе «{{ workspace.name | escape }}» в текущем расчетном периоде. -Your project is growing — that’s awesome! Let’s make sure you don’t miss any important errors. +Ваш проект растет — это прекрасно! Давайте убедимся, что вы не пропустите никаких важных ошибок. -Upgrade your plan to stay on top of everything: {{ host }}/workspace/{{ workspace._id }}/settings/billing +При необходимости обновите свой тариф, чтобы всегда быть в курсе: {{ host }}/workspace/{{ workspace._id }}/settings/billing *** -Hawk -Errors tracking system +Хоук +Российский трекер ошибок -Made by CodeX +Сделан в CodeX diff --git a/workers/email/src/templates/emails/password-reset/html.twig b/workers/email/src/templates/emails/password-reset/html.twig index 9d663a03a..ace1c0c06 100644 --- a/workers/email/src/templates/emails/password-reset/html.twig +++ b/workers/email/src/templates/emails/password-reset/html.twig @@ -9,21 +9,22 @@ - Your password has been reset + Ваш пароль обновлен - Thank you for using Hawk. Use this password to sign in.

- Your new password: {{ password }} + Используйте новый пароль для входа в ваш аккаунт.
+
+ Новый пароль: {{ password }}
- {% include '../../components/button.twig' with {href: host ~ '/login', label: 'Sign in'} %} + {% include '../../components/button.twig' with {href: host ~ '/login', label: 'Войти'} %} diff --git a/workers/email/src/templates/emails/password-reset/subject.twig b/workers/email/src/templates/emails/password-reset/subject.twig index 6072e8631..2cfc60dca 100644 --- a/workers/email/src/templates/emails/password-reset/subject.twig +++ b/workers/email/src/templates/emails/password-reset/subject.twig @@ -1 +1 @@ -Hawk password reset \ No newline at end of file +Новый пароль для вашего аккаунта в Хоуке \ No newline at end of file diff --git a/workers/email/src/templates/emails/password-reset/text.twig b/workers/email/src/templates/emails/password-reset/text.twig index c291546ae..f7f7380e1 100644 --- a/workers/email/src/templates/emails/password-reset/text.twig +++ b/workers/email/src/templates/emails/password-reset/text.twig @@ -1,11 +1,11 @@ -Thank you for using Hawk. Use this password to sign in. +Используйте новый пароль для входа в ваш аккаунт. -Your new password: {{ password }} -Sign in: {{ host ~ '/login' }} +Новый пароль: {{ password }} +Войти: {{ host ~ '/login' }} *** -Hawk -Errors tracking system +Хоук +Российский трекер ошибок -Made by CodeX \ No newline at end of file +Сделан в CodeX \ No newline at end of file diff --git a/workers/email/src/templates/emails/payment-failed/html.twig b/workers/email/src/templates/emails/payment-failed/html.twig index 531aa86b9..11ff343a3 100644 --- a/workers/email/src/templates/emails/payment-failed/html.twig +++ b/workers/email/src/templates/emails/payment-failed/html.twig @@ -14,7 +14,7 @@ - Your payment has been failed + Оплата отклонена @@ -22,16 +22,16 @@ - The payment attempt for «{{ workspace.name | escape }}» monthly plan was rejected - because of {{ reason }}.
- Contact support@hawk.so for more details. + Очередная оплата ежемесячного плана для воркспейса «{{ workspace.name | escape }}» была отклонена по причине: {{ reason }}.
+
+ Обратитесь в support@hawk.so для получения дополнительной информации.
{% set url = host ~ '/workspace/' ~ workspace._id ~ '/settings/billing' %} - {% include '../../components/button.twig' with {href: url, label: 'Go to payment settings'} %} + {% include '../../components/button.twig' with {href: url, label: 'Настройки оплаты'} %} {% endblock %} diff --git a/workers/email/src/templates/emails/payment-failed/subject.twig b/workers/email/src/templates/emails/payment-failed/subject.twig index 21ab39a5e..c5e49faf6 100644 --- a/workers/email/src/templates/emails/payment-failed/subject.twig +++ b/workers/email/src/templates/emails/payment-failed/subject.twig @@ -1 +1 @@ -Payment failed for {{ workspace.name | escape }} workspace \ No newline at end of file +Оплата тарифа для воркспейса {{ workspace.name | escape }} не прошла \ No newline at end of file diff --git a/workers/email/src/templates/emails/payment-failed/text.twig b/workers/email/src/templates/emails/payment-failed/text.twig index 3cd6087a0..84900b228 100644 --- a/workers/email/src/templates/emails/payment-failed/text.twig +++ b/workers/email/src/templates/emails/payment-failed/text.twig @@ -1,14 +1,12 @@ -Payment failed for {{ workspace.name | escape }} workspace +Очередная оплата ежемесячного плана для воркспейса «{{ workspace.name | escape }}» не прошла. -Your payment has been failed +Причина: {{ reason }} -The payment attempt for «{{ workspace.name | escape }}» monthly plan was rejected -because of {{ reason }} -Contact support@hawk.so for more details. +Напишите нам на support@hawk.so для получения дополнительной информации. *** -Hawk -Errors tracking system +Хоук +Российский трекер ошибок -Made by CodeX +Сделан в CodeX diff --git a/workers/email/src/templates/emails/payment-success/html.twig b/workers/email/src/templates/emails/payment-success/html.twig index fe7c85f4f..150cd4108 100644 --- a/workers/email/src/templates/emails/payment-success/html.twig +++ b/workers/email/src/templates/emails/payment-success/html.twig @@ -14,7 +14,7 @@ - Payment successful + Платеж выполнен успешно @@ -22,14 +22,14 @@ - The "{{ plan.name }}" plan for "{{ workspace.name | escape }}" workspace has been extended by one month. Thanks for using Hawk. + Тариф «{{ plan.name }}» для воркспейса «{{ workspace.name | escape }}» продлен на один месяц. Спасибо за использование Хоука. {% set url = host ~ '/workspace/' ~ workspace._id ~ '/settings/billing' %} - {% include '../../components/button.twig' with {href: url, label: 'Go to payment settings'} %} + {% include '../../components/button.twig' with {href: url, label: 'Настройки оплаты'} %} {% endblock %} diff --git a/workers/email/src/templates/emails/payment-success/subject.twig b/workers/email/src/templates/emails/payment-success/subject.twig index 7abc1cfde..1866c1e28 100644 --- a/workers/email/src/templates/emails/payment-success/subject.twig +++ b/workers/email/src/templates/emails/payment-success/subject.twig @@ -1 +1 @@ -Payment successful \ No newline at end of file +Тариф успешно оплачен для воркспейса «{{ workspace.name | escape }}» \ No newline at end of file diff --git a/workers/email/src/templates/emails/payment-success/text.twig b/workers/email/src/templates/emails/payment-success/text.twig index 2742903e6..9b245faf8 100644 --- a/workers/email/src/templates/emails/payment-success/text.twig +++ b/workers/email/src/templates/emails/payment-success/text.twig @@ -1,15 +1,15 @@ -Payment successful +Платеж выполнен успешно -The "{{ plan.name }}" plan for "{{ workspace.name | escape }}" workspace has been extended by one month. -Thanks for using Hawk. +Тариф «{{ plan.name }}» для воркспейса «{{ workspace.name | escape }}» продлен на один месяц. +Спасибо за использование Хоука. -Go to payment settings : {{ host }}/workspace/{{ workspace._id }}/settings/billing +Перейти к настройкам оплаты: {{ host }}/workspace/{{ workspace._id }}/settings/billing *** -You received this email because you are currently opted in to receive such alerts via your personal notifications settings. You may adjust your preferences at any time by clicking the link: {{ host }}/account/notifications +Вы получили это письмо, потому что подписаны на получение подобных оповещений в своих личных настройках. Вы можете изменить свои предпочтения в любое время, перейдя по ссылке: {{ host }}/account/notifications -Hawk -Errors tracking system +Хоук +Российский трекер ошибок -Made by CodeX +Сделан в CodeX diff --git a/workers/email/src/templates/emails/several-events/html.twig b/workers/email/src/templates/emails/several-events/html.twig index 802f3b0dd..5f68f2739 100644 --- a/workers/email/src/templates/emails/several-events/html.twig +++ b/workers/email/src/templates/emails/several-events/html.twig @@ -50,10 +50,10 @@ {% set url = host ~ '/project/' ~ project._id %} {% if events.length - eventsToShow > 0 %} {% set hiddenEventsLen = events.length - eventsToShow %} - {% set hiddenEventsMessage = 'and ' ~ hiddenEventsLen ~ ' more…' %} + {% set hiddenEventsMessage = 'и еще ' ~ hiddenEventsLen ~ '…' %} {% include '../../components/button.twig' with {href: url, label: hiddenEventsMessage} %} {% else %} - {% include '../../components/button.twig' with {href: url, label: 'View events'} %} + {% include '../../components/button.twig' with {href: url, label: 'Просмотреть события'} %} {% endif %} @@ -65,7 +65,7 @@ {% endblock %} {% block unsubscribeText %} - You received this email because you are currently opted in to receive such alerts via your - project’s notifications settings. You may adjust your preferences at any time by clicking - the link above. + Вы получили это письмо, потому что подписаны на получение подобных оповещений в настройках + уведомлений вашего проекта. Вы можете изменить свои предпочтения в любое время, перейдя по ссылке + выше. {% endblock %} diff --git a/workers/email/src/templates/emails/several-events/subject.twig b/workers/email/src/templates/emails/several-events/subject.twig index 75f975cf1..cde2a64f9 100644 --- a/workers/email/src/templates/emails/several-events/subject.twig +++ b/workers/email/src/templates/emails/several-events/subject.twig @@ -1 +1 @@ -{{ project.name | escape }} — {{ events.length }} new events for the last {{ period | prettyTime }} +{{ project.name | escape }} — {{ events.length }} {{ pluralize_ru(events.length, ['новое событие', 'новых события', 'новых событий']) }} за последние {{ period | prettyTime }} diff --git a/workers/email/src/templates/emails/several-events/text.twig b/workers/email/src/templates/emails/several-events/text.twig index 24ecc9eab..ad24cb560 100644 --- a/workers/email/src/templates/emails/several-events/text.twig +++ b/workers/email/src/templates/emails/several-events/text.twig @@ -1,33 +1,33 @@ -You have {{ events.length }} new events on «{{ project.name|escape }}» project for the last {{ period | prettyTime }} +У вас {{ events.length }} {{ pluralize_ru(events.length, ['новое событие', 'новых события', 'новых событий']) }} в проекте «{{ project.name|escape }}» за последние {{ period | prettyTime }} {% set eventsToShow = 5 %} {% for eventData in events | sortEvents | slice(0, eventsToShow) %} -{{ eventData.event.payload.type ?: 'Uncaught Error' }}: {{ eventData.event.payload.title }} +{{ eventData.event.payload.type ?: 'Необработанная ошибка' }}: {{ eventData.event.payload.title }} -In file: {{ eventData.event.payload.backtrace[0].file }} at line {{ eventData.event.payload.backtrace[0].line }}. +В файле: {{ eventData.event.payload.backtrace[0].file }} на строке {{ eventData.event.payload.backtrace[0].line }}. -{{ eventData.newCount }} new and {{ eventData.event.totalCount }} total{{ event.daysRepeated ? ', ' ~ event.daysRepeated ~ 'days repeating' : '' }} {{ event.usersAffected ? ', ' ~ event.userAffected ~ ' users affected' : '' }} +{{ eventData.newCount }} {{ pluralize_ru(eventData.newCount, ['новое', 'новых события', 'новых событий']) }} и {{ eventData.event.totalCount }} {{ pluralize_ru(eventData.event.totalCount, ['раз', 'раза', 'раз']) }}{{ event.daysRepeated ? ', повторяется ' ~ event.daysRepeated ~ ' ' ~ pluralize_ru(event.daysRepeated, ['день', 'дня', 'дней']) : '' }} {{ event.usersAffected ? ', затронуто ' ~ event.userAffected ~ ' ' ~ pluralize_ru(event.userAffected, ['пользователь', 'пользователя', 'пользователей']) : '' }} {% endfor %} {% if events.length - eventsToShow > 0 %} -View other {{ events.length - eventsToShow }} events: {{ host }}/project/{{ project._id }} +Просмотреть еще {{ events.length - eventsToShow }} событий: {{ host }}/project/{{ project._id }} {% else %} -View events: {{ host }}/project/{{ project._id }} +Просмотреть события: {{ host }}/project/{{ project._id }} {% endif %} *** -You received this email because you are currently opted in to receive such alerts via your project’s notifications settings. You may adjust your preferences at any time by clicking the link above. To unsubscribe, follow the link: {{ host }}/unsubscribe/{{ project._id }} +Вы получили это письмо, потому что подписаны на получение подобных оповещений в настройках уведомлений вашего проекта. Вы можете изменить свои предпочтения в любое время, перейдя по ссылке выше. Чтобы отписаться, перейдите по ссылке: {{ host }}/unsubscribe/{{ project._id }} -Hawk -Errors tracking system +Хоук +Российский трекер ошибок -Made by CodeX +Сделан в CodeX diff --git a/workers/email/src/templates/emails/sign-up/html.twig b/workers/email/src/templates/emails/sign-up/html.twig index f472f12b6..039720610 100644 --- a/workers/email/src/templates/emails/sign-up/html.twig +++ b/workers/email/src/templates/emails/sign-up/html.twig @@ -9,21 +9,22 @@ - Your account has been created + Войдите в ваш аккаунт - Use this password to sign in. You can change it later.

- Password: {{ password }} + Используйте этот пароль для входа. Вы сможете изменить его позже.
+
+ Пароль: {{ password }}
- {% include '../../components/button.twig' with {href: host ~ '/login', label: 'Sign in'} %} + {% include '../../components/button.twig' with {href: host ~ '/login', label: 'Войти'} %} diff --git a/workers/email/src/templates/emails/sign-up/subject.twig b/workers/email/src/templates/emails/sign-up/subject.twig index b65de85b8..7d766f498 100644 --- a/workers/email/src/templates/emails/sign-up/subject.twig +++ b/workers/email/src/templates/emails/sign-up/subject.twig @@ -1 +1 @@ -Hawk - sign in to your account \ No newline at end of file +Добро пожаловать в Хоук! \ No newline at end of file diff --git a/workers/email/src/templates/emails/sign-up/text.twig b/workers/email/src/templates/emails/sign-up/text.twig index 33414949a..ab896399b 100644 --- a/workers/email/src/templates/emails/sign-up/text.twig +++ b/workers/email/src/templates/emails/sign-up/text.twig @@ -1,11 +1,11 @@ -Use this password to sign in. You can change it later. +Используйте этот пароль для входа. Вы сможете изменить его позже. -Password: {{ password }} -Sign in: {{ host ~ '/login' }} +Пароль: {{ password }} +Войти: {{ host ~ '/login' }} *** -Hawk -Errors tracking system +Хоук +Российский трекер ошибок -Made by CodeX \ No newline at end of file +Сделан в CodeX \ No newline at end of file diff --git a/workers/email/src/templates/emails/workspace-invite/html.twig b/workers/email/src/templates/emails/workspace-invite/html.twig index 8621e61ef..b5dfe8f46 100644 --- a/workers/email/src/templates/emails/workspace-invite/html.twig +++ b/workers/email/src/templates/emails/workspace-invite/html.twig @@ -9,21 +9,22 @@ - Your have an invitation + Присоединяйтесь к воркспейсу - You have been invited to {{workspaceName}} workspace.
- Join to get access to all projects of this workspace. + Вас пригласили в «{{workspaceName}}».
+
+ Чтобы получить доступ ко всем проектам этого воркспейса, нажмите кнопку ниже.
- {% include '../../components/button.twig' with {href: inviteLink, label: 'Join the workspace'} %} + {% include '../../components/button.twig' with {href: inviteLink, label: 'Присоединиться'} %} diff --git a/workers/email/src/templates/emails/workspace-invite/subject.twig b/workers/email/src/templates/emails/workspace-invite/subject.twig index c8b094795..6b5dc6de2 100644 --- a/workers/email/src/templates/emails/workspace-invite/subject.twig +++ b/workers/email/src/templates/emails/workspace-invite/subject.twig @@ -1 +1 @@ -Invitation to {{name}} workspace \ No newline at end of file +Вас пригласили в воркспейс «{{name}}» \ No newline at end of file diff --git a/workers/email/src/templates/emails/workspace-invite/text.twig b/workers/email/src/templates/emails/workspace-invite/text.twig index 8a55d0df4..6d8ab7a5e 100644 --- a/workers/email/src/templates/emails/workspace-invite/text.twig +++ b/workers/email/src/templates/emails/workspace-invite/text.twig @@ -1,12 +1,14 @@ -Your have an invitation +Присоединяйтесь к воркспейсу + +Вас пригласили в «{{workspaceName}}». + +Чтобы получить доступ ко всем проектам этого воркспейса, нажмите ссылку ниже. -You have been invited to "{{workspaceName}}" workspace. -Join to get access to all projects of this workspace. {{ inviteLink }} *** -Hawk -Errors tracking system +Хоук +Российский трекер ошибок -Made by CodeX \ No newline at end of file +Сделан в CodeX \ No newline at end of file From c78f40ccc592c451bd0cec6ff8ee9505e3f6ca80 Mon Sep 17 00:00:00 2001 From: Taly Date: Thu, 18 Dec 2025 19:46:04 +0300 Subject: [PATCH 02/52] Update workers/email/src/templates/emails/assignee/html.twig Co-authored-by: Peter --- workers/email/src/templates/emails/assignee/html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workers/email/src/templates/emails/assignee/html.twig b/workers/email/src/templates/emails/assignee/html.twig index c5a7a391f..bb2ae8eed 100644 --- a/workers/email/src/templates/emails/assignee/html.twig +++ b/workers/email/src/templates/emails/assignee/html.twig @@ -39,5 +39,5 @@ {% endblock %} {% block unsubscribeText %} - Вы получили это письмо, потому что подписаны на получение подобных оповещений в настройках вашего профиля. Вы можете их изменить, перейдя по ссылке выше. + Вы получили это письмо, потому что подписаны на подобные уведомления. Вы можете изменить настройки, перейдя по ссылке выше. {% endblock %} From 34c089ca9a434f018382238779864155769a0fbc Mon Sep 17 00:00:00 2001 From: Taly Date: Fri, 19 Dec 2025 13:50:52 +0300 Subject: [PATCH 03/52] Update text.twig --- workers/email/src/templates/emails/assignee/text.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workers/email/src/templates/emails/assignee/text.twig b/workers/email/src/templates/emails/assignee/text.twig index 0c7b8dc3d..e951830de 100644 --- a/workers/email/src/templates/emails/assignee/text.twig +++ b/workers/email/src/templates/emails/assignee/text.twig @@ -10,7 +10,7 @@ *** -Вы получили это письмо, потому что подписаны на получение подобных оповещений в своих личных настройках. Вы можете изменить свои предпочтения в любое время, перейдя по ссылке: {{ host }}/account/notifications +Вы получили это письмо, потому что подписаны на подобные уведомления. Вы можете изменить настройки, перейдя по ссылке: {{ host }}/account/notifications Хоук Российский трекер ошибок From 8b309baa392401f265b5ef959a0a8ab76ab8f3e5 Mon Sep 17 00:00:00 2001 From: Taly Date: Fri, 19 Dec 2025 13:51:18 +0300 Subject: [PATCH 04/52] Update workers/email/src/templates/emails/sign-up/html.twig Co-authored-by: Peter --- workers/email/src/templates/emails/sign-up/html.twig | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/workers/email/src/templates/emails/sign-up/html.twig b/workers/email/src/templates/emails/sign-up/html.twig index 039720610..6c64bb315 100644 --- a/workers/email/src/templates/emails/sign-up/html.twig +++ b/workers/email/src/templates/emails/sign-up/html.twig @@ -16,7 +16,9 @@ - Используйте этот пароль для входа. Вы сможете изменить его позже.
+ Добро пожаловать в Хоук!

+ +Ниже — данные для входа в аккаунт. Используйте этот пароль для первого входа, позже вы сможете изменить его в настройках.

Пароль: {{ password }}
From 2133e94122df485a8d31b8f1608913b774e79f8e Mon Sep 17 00:00:00 2001 From: Taly Date: Fri, 19 Dec 2025 13:52:39 +0300 Subject: [PATCH 05/52] Update text.twig --- workers/email/src/templates/emails/sign-up/text.twig | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/workers/email/src/templates/emails/sign-up/text.twig b/workers/email/src/templates/emails/sign-up/text.twig index ab896399b..15d9dbc46 100644 --- a/workers/email/src/templates/emails/sign-up/text.twig +++ b/workers/email/src/templates/emails/sign-up/text.twig @@ -1,4 +1,6 @@ -Используйте этот пароль для входа. Вы сможете изменить его позже. +Добро пожаловать в Хоук! + +Ниже — данные для входа в аккаунт. Используйте этот пароль для первого входа, позже вы сможете изменить его в настройках. Пароль: {{ password }} Войти: {{ host ~ '/login' }} From 640e5259dfd1509247bcf85eb354fd8ef7a6b2b8 Mon Sep 17 00:00:00 2001 From: Taly Date: Fri, 19 Dec 2025 14:07:31 +0300 Subject: [PATCH 06/52] Update workers/email/src/templates/emails/payment-failed/html.twig Co-authored-by: Peter --- workers/email/src/templates/emails/payment-failed/html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workers/email/src/templates/emails/payment-failed/html.twig b/workers/email/src/templates/emails/payment-failed/html.twig index 11ff343a3..112ba3622 100644 --- a/workers/email/src/templates/emails/payment-failed/html.twig +++ b/workers/email/src/templates/emails/payment-failed/html.twig @@ -14,7 +14,7 @@ - Оплата отклонена + Оплата не прошла From 69c8702540c27cd6c289eff71b84d391397ff92a Mon Sep 17 00:00:00 2001 From: Taly Date: Fri, 19 Dec 2025 14:15:10 +0300 Subject: [PATCH 07/52] Update workers/email/src/templates/emails/payment-success/html.twig Co-authored-by: Peter --- workers/email/src/templates/emails/payment-success/html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workers/email/src/templates/emails/payment-success/html.twig b/workers/email/src/templates/emails/payment-success/html.twig index 150cd4108..83b0c3283 100644 --- a/workers/email/src/templates/emails/payment-success/html.twig +++ b/workers/email/src/templates/emails/payment-success/html.twig @@ -22,7 +22,7 @@ - Тариф «{{ plan.name }}» для воркспейса «{{ workspace.name | escape }}» продлен на один месяц. Спасибо за использование Хоука. + Тариф «{{ plan.name }}» для воркспейса «{{ workspace.name | escape }}» продлен на один месяц. Ошибки под контролем. From 05ff5b51be52f4a82fc42117058ec3b3b12bb506 Mon Sep 17 00:00:00 2001 From: Taly Date: Fri, 19 Dec 2025 14:15:41 +0300 Subject: [PATCH 08/52] Update text.twig --- workers/email/src/templates/emails/payment-success/text.twig | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/workers/email/src/templates/emails/payment-success/text.twig b/workers/email/src/templates/emails/payment-success/text.twig index 9b245faf8..ed66eb058 100644 --- a/workers/email/src/templates/emails/payment-success/text.twig +++ b/workers/email/src/templates/emails/payment-success/text.twig @@ -1,7 +1,6 @@ Платеж выполнен успешно -Тариф «{{ plan.name }}» для воркспейса «{{ workspace.name | escape }}» продлен на один месяц. -Спасибо за использование Хоука. +Тариф «{{ plan.name }}» для воркспейса «{{ workspace.name | escape }}» продлен на один месяц. Ошибки под контролем. Перейти к настройкам оплаты: {{ host }}/workspace/{{ workspace._id }}/settings/billing From cb2d4da4510b0bd17ee3c6ab063fbc0ff446d3bc Mon Sep 17 00:00:00 2001 From: Taly Date: Fri, 19 Dec 2025 14:17:21 +0300 Subject: [PATCH 09/52] Update workers/email/src/templates/emails/events-limit-almost-reached/html.twig Co-authored-by: Peter --- .../src/templates/emails/events-limit-almost-reached/html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workers/email/src/templates/emails/events-limit-almost-reached/html.twig b/workers/email/src/templates/emails/events-limit-almost-reached/html.twig index 00dabdbb1..56c85fbdd 100644 --- a/workers/email/src/templates/emails/events-limit-almost-reached/html.twig +++ b/workers/email/src/templates/emails/events-limit-almost-reached/html.twig @@ -26,7 +26,7 @@ Ваш проект растет — это прекрасно! Давайте не пропустим никакие важные ошибки. - Обновите план, чтобы всегда быть в курсе. + Обновите план и оставайтесь в курсе всех происшествий. From cab4f71222bd8801b27ed81602f0ffbd7c3dd369 Mon Sep 17 00:00:00 2001 From: Taly Date: Fri, 19 Dec 2025 14:21:13 +0300 Subject: [PATCH 10/52] Update wording in events limit notification emails Refined the message in both HTML and text templates for the 'events limit almost reached' email to clarify staying informed about all incidents. --- .../src/templates/emails/events-limit-almost-reached/html.twig | 2 +- .../src/templates/emails/events-limit-almost-reached/text.twig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/workers/email/src/templates/emails/events-limit-almost-reached/html.twig b/workers/email/src/templates/emails/events-limit-almost-reached/html.twig index 56c85fbdd..907cd5cc3 100644 --- a/workers/email/src/templates/emails/events-limit-almost-reached/html.twig +++ b/workers/email/src/templates/emails/events-limit-almost-reached/html.twig @@ -26,7 +26,7 @@ Ваш проект растет — это прекрасно! Давайте не пропустим никакие важные ошибки. - Обновите план и оставайтесь в курсе всех происшествий. + Обновите план и оставайтесь в курсе всех происшествий. diff --git a/workers/email/src/templates/emails/events-limit-almost-reached/text.twig b/workers/email/src/templates/emails/events-limit-almost-reached/text.twig index 939d9e65e..e32279b5d 100644 --- a/workers/email/src/templates/emails/events-limit-almost-reached/text.twig +++ b/workers/email/src/templates/emails/events-limit-almost-reached/text.twig @@ -2,7 +2,7 @@ Ваш проект растет — это прекрасно! Давайте убедимся, что вы не пропустите никаких важных ошибок. -При необходимости обновите свой тариф, чтобы всегда быть в курсе: {{ host }}/workspace/{{ workspace._id }}/settings/billing +При необходимости обновите свой тариф, чтобы всегда быть в курсе всех происшествий: {{ host }}/workspace/{{ workspace._id }}/settings/billing *** From 5cbe119823ba42d53cc8c1718ff03158d622816a Mon Sep 17 00:00:00 2001 From: Taly Date: Fri, 19 Dec 2025 14:25:48 +0300 Subject: [PATCH 11/52] Update assignee email templates wording Revised the message in both HTML and text email templates to clarify that the recipient is assigned as responsible for fixing a bug in the project, instead of just processing an event. --- workers/email/src/templates/emails/assignee/html.twig | 2 +- workers/email/src/templates/emails/assignee/text.twig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/workers/email/src/templates/emails/assignee/html.twig b/workers/email/src/templates/emails/assignee/html.twig index bb2ae8eed..71226cffa 100644 --- a/workers/email/src/templates/emails/assignee/html.twig +++ b/workers/email/src/templates/emails/assignee/html.twig @@ -19,7 +19,7 @@ {% else %} {{ whoAssigned.email }} {% endif %} - поручил вам обработать событие + назначил вас ответственным за исправление ошибки в проекте «{{ project.name | escape }}» diff --git a/workers/email/src/templates/emails/assignee/text.twig b/workers/email/src/templates/emails/assignee/text.twig index e951830de..18ef0c7da 100644 --- a/workers/email/src/templates/emails/assignee/text.twig +++ b/workers/email/src/templates/emails/assignee/text.twig @@ -1,4 +1,4 @@ -{% if whoAssigned.name %}{{ whoAssigned.name | escape }}{% else %}{{ whoAssigned.email }}{% endif %} поручил вам обработать событие в проекте «{{ project.name | escape }}» +{% if whoAssigned.name %}{{ whoAssigned.name | escape }}{% else %}{{ whoAssigned.email }}{% endif %} назначил вас ответственным за исправление ошибки в проекте «{{ project.name | escape }}» {{ event.payload.title }} From 10a6df76b25d10c989abb31784bc895b4f8f6451 Mon Sep 17 00:00:00 2001 From: Taly Date: Fri, 19 Dec 2025 14:27:03 +0300 Subject: [PATCH 12/52] Update subject.twig --- workers/email/src/templates/emails/assignee/subject.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workers/email/src/templates/emails/assignee/subject.twig b/workers/email/src/templates/emails/assignee/subject.twig index ab053cdd4..dced2421e 100644 --- a/workers/email/src/templates/emails/assignee/subject.twig +++ b/workers/email/src/templates/emails/assignee/subject.twig @@ -1 +1 @@ -Вам поручили обработать событие в проекте «{{ project.name | escape }}» \ No newline at end of file +Вы были назначены ответственным за исправление ошибки «{{ event.payload.title }}» — {{ project.name | escape }} \ No newline at end of file From 021a0ef8f8c5d8c3b08d6cd3cdf114b4c4aba2c7 Mon Sep 17 00:00:00 2001 From: Taly Date: Fri, 19 Dec 2025 14:28:15 +0300 Subject: [PATCH 13/52] Update workers/email/src/templates/emails/days-limit-almost-reached/html.twig Co-authored-by: Peter --- .../src/templates/emails/days-limit-almost-reached/html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workers/email/src/templates/emails/days-limit-almost-reached/html.twig b/workers/email/src/templates/emails/days-limit-almost-reached/html.twig index bcac0c2c1..5c7c52fa2 100644 --- a/workers/email/src/templates/emails/days-limit-almost-reached/html.twig +++ b/workers/email/src/templates/emails/days-limit-almost-reached/html.twig @@ -14,7 +14,7 @@ - {{ daysLeft | escape }} {{ pluralize_ru(daysLeft, ['день', 'дня', 'дней']) }} до окончания платного тарифа + Осталось {{ daysLeft | escape }} {{ pluralize_ru(daysLeft, ['день', 'дня', 'дней']) }} до окончания вашей подписки на мониторинг ошибок. From 1e07a82c36e11c2bfd8edb3df892ec6c9a914fb5 Mon Sep 17 00:00:00 2001 From: Taly Date: Fri, 19 Dec 2025 14:28:55 +0300 Subject: [PATCH 14/52] Refine event email templates formatting Improved the formatting of the unsubscribe text in the HTML template by consolidating it into a single line. Updated the text template to conditionally display the event type with a colon only if it exists, enhancing clarity in event listings. --- workers/email/src/templates/emails/several-events/html.twig | 4 +--- workers/email/src/templates/emails/several-events/text.twig | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/workers/email/src/templates/emails/several-events/html.twig b/workers/email/src/templates/emails/several-events/html.twig index 5f68f2739..cca6b1191 100644 --- a/workers/email/src/templates/emails/several-events/html.twig +++ b/workers/email/src/templates/emails/several-events/html.twig @@ -65,7 +65,5 @@ {% endblock %} {% block unsubscribeText %} - Вы получили это письмо, потому что подписаны на получение подобных оповещений в настройках - уведомлений вашего проекта. Вы можете изменить свои предпочтения в любое время, перейдя по ссылке - выше. + Вы получили это письмо, потому что подписаны на получение подобных оповещений в настройках уведомлений вашего проекта. Вы можете изменить свои предпочтения в любое время, перейдя по ссылке выше. {% endblock %} diff --git a/workers/email/src/templates/emails/several-events/text.twig b/workers/email/src/templates/emails/several-events/text.twig index ad24cb560..21bc51bfb 100644 --- a/workers/email/src/templates/emails/several-events/text.twig +++ b/workers/email/src/templates/emails/several-events/text.twig @@ -4,7 +4,7 @@ {% for eventData in events | sortEvents | slice(0, eventsToShow) %} -{{ eventData.event.payload.type ?: 'Необработанная ошибка' }}: {{ eventData.event.payload.title }} +{{ eventData.event.payload.type ? eventData.event.payload.type + ': ' : '' }}{{ eventData.event.payload.title }} В файле: {{ eventData.event.payload.backtrace[0].file }} на строке {{ eventData.event.payload.backtrace[0].line }}. From e24899a07e02fc15fbc829854eace6bc2202afae Mon Sep 17 00:00:00 2001 From: Taly Date: Fri, 19 Dec 2025 14:31:31 +0300 Subject: [PATCH 15/52] Update event-info.twig --- workers/email/src/templates/components/event-info.twig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/workers/email/src/templates/components/event-info.twig b/workers/email/src/templates/components/event-info.twig index b1a50cdec..ab9a9081b 100644 --- a/workers/email/src/templates/components/event-info.twig +++ b/workers/email/src/templates/components/event-info.twig @@ -3,7 +3,7 @@
- {{ event.newCount | abbrNumber }} {{ pluralize_ru(event.newCount, ['новое событие', 'новых события', 'новых событий']) }} + {{ event.newCount | abbrNumber }} {{ pluralize_ru(event.newCount, ['новое', 'новых', 'новых']) }}
@@ -11,7 +11,7 @@ {% if event.event.totalCount is not empty %} - {{ event.event.totalCount | abbrNumber }} {{ pluralize_ru(event.event.totalCount, ['раз', 'раза', 'раз']) }} + {{ event.event.totalCount | abbrNumber }} всего    From 5499a98dfa87fb6651e811d1e4140b0850868dfd Mon Sep 17 00:00:00 2001 From: Taly Date: Fri, 19 Dec 2025 14:32:34 +0300 Subject: [PATCH 16/52] Update workers/email/src/templates/emails/days-limit-almost-reached/html.twig Co-authored-by: Peter --- .../src/templates/emails/days-limit-almost-reached/html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workers/email/src/templates/emails/days-limit-almost-reached/html.twig b/workers/email/src/templates/emails/days-limit-almost-reached/html.twig index 5c7c52fa2..166a00b4a 100644 --- a/workers/email/src/templates/emails/days-limit-almost-reached/html.twig +++ b/workers/email/src/templates/emails/days-limit-almost-reached/html.twig @@ -24,7 +24,7 @@ Пожалуйста, убедитесь, что вы привязали карту для автоматического продления тарифа в воркспейсе «{{ workspace.name | escape }}».

- Если оплата не пройдет, то мониторинг ошибок будет приостановлен. + Если план не продить, то мониторинг ошибок будет приостановлен.
From 82813eb55c9be0840835c8c1b29a370645fee54c Mon Sep 17 00:00:00 2001 From: Taly Date: Fri, 19 Dec 2025 14:33:02 +0300 Subject: [PATCH 17/52] Update text.twig --- .../src/templates/emails/days-limit-almost-reached/text.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workers/email/src/templates/emails/days-limit-almost-reached/text.twig b/workers/email/src/templates/emails/days-limit-almost-reached/text.twig index 7f1853dbe..fbad0f5ca 100644 --- a/workers/email/src/templates/emails/days-limit-almost-reached/text.twig +++ b/workers/email/src/templates/emails/days-limit-almost-reached/text.twig @@ -1,6 +1,6 @@ {{ daysLeft | escape }} {{ pluralize_ru(daysLeft, ['день', 'дня', 'дней']) }} до окончания платного тарифа воркспейса «{{ workspace.name | escape }}». -Если оплата не пройдет, то мониторинг ошибок будет приостановлен. +Если план не продить, то мониторинг ошибок будет приостановлен. Пожалуйста, проверьте настройки оплаты: {{ host }}/workspace/{{ workspace._id }}/settings/billing From e49b81006f0e4963a349b4757255ef9c9771e67d Mon Sep 17 00:00:00 2001 From: Taly Date: Fri, 19 Dec 2025 14:33:29 +0300 Subject: [PATCH 18/52] Update workers/email/src/templates/emails/days-limit-almost-reached/subject.twig Co-authored-by: Peter --- .../src/templates/emails/days-limit-almost-reached/subject.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workers/email/src/templates/emails/days-limit-almost-reached/subject.twig b/workers/email/src/templates/emails/days-limit-almost-reached/subject.twig index 02a61a825..7a10d8439 100644 --- a/workers/email/src/templates/emails/days-limit-almost-reached/subject.twig +++ b/workers/email/src/templates/emails/days-limit-almost-reached/subject.twig @@ -1 +1 @@ -Через {{ daysLeft | escape }} {{ pluralize_ru(daysLeft, ['день', 'дня', 'дней']) }} заканчивается тариф воркспейса «{{ workspace.name | escape }}»! +Через {{ daysLeft | escape }} {{ pluralize_ru(daysLeft, ['день', 'дня', 'дней']) }} заканчивается подписка воркспейса «{{ workspace.name | escape }}» на мониторинг ошибок! From 0c42184e3796bdbf30d06d27f109fa4181acfb0d Mon Sep 17 00:00:00 2001 From: Taly Date: Fri, 19 Dec 2025 14:38:21 +0300 Subject: [PATCH 19/52] Update workers/email/src/templates/emails/event/text.twig Co-authored-by: Peter --- workers/email/src/templates/emails/event/text.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workers/email/src/templates/emails/event/text.twig b/workers/email/src/templates/emails/event/text.twig index dcc1abecc..73ea6cee0 100644 --- a/workers/email/src/templates/emails/event/text.twig +++ b/workers/email/src/templates/emails/event/text.twig @@ -21,7 +21,7 @@ {% endif %} {% endif %} -Это событие произошло {{ event.totalCount }} {{ pluralize_ru(event.totalCount, ['раз', 'раза', 'раз']) }}, повторяется {{ daysRepeated }} {{ pluralize_ru(daysRepeated, ['день', 'дня', 'дней']) }}. +Это событие произошло {{ event.totalCount }} {{ pluralize_ru(event.totalCount, ['раз', 'раза', 'раз']) }} за {{ daysRepeated }} {{ pluralize_ru(daysRepeated, ['день', 'дня', 'дней']) }}. Просмотреть событие: {{ host }}/project/{{ project._id }}/event/{{ event._id }} From aaad2d85d02d3cdba92d0583708e8ea9fc957f35 Mon Sep 17 00:00:00 2001 From: Taly Date: Fri, 19 Dec 2025 14:38:29 +0300 Subject: [PATCH 20/52] Improve event type and title display in email templates Updated both HTML and text email templates to conditionally display the event type followed by the event title only if the type exists, improving clarity and formatting. --- workers/email/src/templates/emails/event/html.twig | 2 +- workers/email/src/templates/emails/event/text.twig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/workers/email/src/templates/emails/event/html.twig b/workers/email/src/templates/emails/event/html.twig index 147cce0e7..d82f7b284 100644 --- a/workers/email/src/templates/emails/event/html.twig +++ b/workers/email/src/templates/emails/event/html.twig @@ -16,7 +16,7 @@ - {{ event.payload.type ? event.payload.type : 'Необработанное событие' }} + {{ event.payload.type ? event.payload.type + ': ' : '' }}{{ event.payload.title | escape }} diff --git a/workers/email/src/templates/emails/event/text.twig b/workers/email/src/templates/emails/event/text.twig index dcc1abecc..a83732af8 100644 --- a/workers/email/src/templates/emails/event/text.twig +++ b/workers/email/src/templates/emails/event/text.twig @@ -10,7 +10,7 @@ {{ newLabel }} в проекте «{{ project.name }}» ------------------------ -{{ event.payload.type ? event.payload.type : 'Необработанное событие' }}: {{ event.payload.title | escape }} +{{ event.payload.type ? event.payload.type + ': ' : '' }}{{ event.payload.title | escape }} ------------------------ {% if event.payload.backtrace is not empty %} {% if event.payload.backtrace[0] is not empty %} From 621e95b1139ba04a5f634ce3c7f1b1e1bce36ec7 Mon Sep 17 00:00:00 2001 From: Taly Date: Fri, 19 Dec 2025 14:40:17 +0300 Subject: [PATCH 21/52] Update workers/email/src/templates/emails/events-limit-almost-reached/html.twig Co-authored-by: Peter --- .../src/templates/emails/events-limit-almost-reached/html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workers/email/src/templates/emails/events-limit-almost-reached/html.twig b/workers/email/src/templates/emails/events-limit-almost-reached/html.twig index 907cd5cc3..fad0d81e0 100644 --- a/workers/email/src/templates/emails/events-limit-almost-reached/html.twig +++ b/workers/email/src/templates/emails/events-limit-almost-reached/html.twig @@ -22,7 +22,7 @@ - Вы использовали {{ eventsCount }} из {{ eventsLimit }} событий в этом месяце в воркспейсе «{{ workspace.name | escape }}» в текущем расчетном периоде. + Вы использовали {{ eventsCount }} из {{ eventsLimit }} событий воркспейса «{{ workspace.name | escape }}» в текущем расчетном периоде. Ваш проект растет — это прекрасно! Давайте не пропустим никакие важные ошибки. From f451d31bd015887da03da4d942cb3f23ea8d9ddc Mon Sep 17 00:00:00 2001 From: Taly Date: Fri, 19 Dec 2025 14:40:28 +0300 Subject: [PATCH 22/52] Update text.twig --- .../src/templates/emails/events-limit-almost-reached/text.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workers/email/src/templates/emails/events-limit-almost-reached/text.twig b/workers/email/src/templates/emails/events-limit-almost-reached/text.twig index e32279b5d..151a988b8 100644 --- a/workers/email/src/templates/emails/events-limit-almost-reached/text.twig +++ b/workers/email/src/templates/emails/events-limit-almost-reached/text.twig @@ -1,4 +1,4 @@ -Вы получили {{ eventsCount }} из {{ eventsLimit }} событий в воркспейсе «{{ workspace.name | escape }}» в текущем расчетном периоде. +Вы использовали {{ eventsCount }} из {{ eventsLimit }} событий воркспейса «{{ workspace.name | escape }}» в текущем расчетном периоде. Ваш проект растет — это прекрасно! Давайте убедимся, что вы не пропустите никаких важных ошибок. From 1a490fea8c023d59fc10e5673820d3134fb1349b Mon Sep 17 00:00:00 2001 From: Taly Date: Fri, 19 Dec 2025 14:41:11 +0300 Subject: [PATCH 23/52] Update event email templates button and link text MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Changed the button label and link text from 'Просмотреть событие' to 'Просмотреть детали' in both HTML and text event email templates for improved clarity. --- workers/email/src/templates/emails/event/html.twig | 2 +- workers/email/src/templates/emails/event/text.twig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/workers/email/src/templates/emails/event/html.twig b/workers/email/src/templates/emails/event/html.twig index d82f7b284..7bf2760c3 100644 --- a/workers/email/src/templates/emails/event/html.twig +++ b/workers/email/src/templates/emails/event/html.twig @@ -52,7 +52,7 @@ {% set eventURL = host ~ '/project/' ~ project._id ~ '/event/' ~ event._id %} - {% include '../../components/button.twig' with {href: eventURL, label: 'Просмотреть событие'} %} + {% include '../../components/button.twig' with {href: eventURL, label: 'Просмотреть детали'} %} {% endblock %} diff --git a/workers/email/src/templates/emails/event/text.twig b/workers/email/src/templates/emails/event/text.twig index 63e94e2b1..d08555bfa 100644 --- a/workers/email/src/templates/emails/event/text.twig +++ b/workers/email/src/templates/emails/event/text.twig @@ -23,7 +23,7 @@ Это событие произошло {{ event.totalCount }} {{ pluralize_ru(event.totalCount, ['раз', 'раза', 'раз']) }} за {{ daysRepeated }} {{ pluralize_ru(daysRepeated, ['день', 'дня', 'дней']) }}. -Просмотреть событие: {{ host }}/project/{{ project._id }}/event/{{ event._id }} +Просмотреть детали: {{ host }}/project/{{ project._id }}/event/{{ event._id }} *** From 6ecddb233ee2104eb6c41b854557e6a8cb9aa64f Mon Sep 17 00:00:00 2001 From: Taly Date: Fri, 19 Dec 2025 14:41:58 +0300 Subject: [PATCH 24/52] Update Russian email templates for events limit notice Improved the wording in both HTML and text versions of the 'events limit almost reached' email templates in Russian for better clarity and tone. --- .../src/templates/emails/events-limit-almost-reached/html.twig | 2 +- .../src/templates/emails/events-limit-almost-reached/text.twig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/workers/email/src/templates/emails/events-limit-almost-reached/html.twig b/workers/email/src/templates/emails/events-limit-almost-reached/html.twig index fad0d81e0..af2d74f72 100644 --- a/workers/email/src/templates/emails/events-limit-almost-reached/html.twig +++ b/workers/email/src/templates/emails/events-limit-almost-reached/html.twig @@ -24,7 +24,7 @@ Вы использовали {{ eventsCount }} из {{ eventsLimit }} событий воркспейса «{{ workspace.name | escape }}» в текущем расчетном периоде. - Ваш проект растет — это прекрасно! Давайте не пропустим никакие важные ошибки. + Ваш проект растёт — это здорово. Давайте убедимся, что ни одна важная ошибка не останется незамеченной. Обновите план и оставайтесь в курсе всех происшествий. diff --git a/workers/email/src/templates/emails/events-limit-almost-reached/text.twig b/workers/email/src/templates/emails/events-limit-almost-reached/text.twig index 151a988b8..44539faa9 100644 --- a/workers/email/src/templates/emails/events-limit-almost-reached/text.twig +++ b/workers/email/src/templates/emails/events-limit-almost-reached/text.twig @@ -1,6 +1,6 @@ Вы использовали {{ eventsCount }} из {{ eventsLimit }} событий воркспейса «{{ workspace.name | escape }}» в текущем расчетном периоде. -Ваш проект растет — это прекрасно! Давайте убедимся, что вы не пропустите никаких важных ошибок. +Ваш проект растёт — это здорово. Давайте убедимся, что ни одна важная ошибка не останется незамеченной. При необходимости обновите свой тариф, чтобы всегда быть в курсе всех происшествий: {{ host }}/workspace/{{ workspace._id }}/settings/billing From 648642f0d19b750c1e06b704d29a26d2bb8b3ccb Mon Sep 17 00:00:00 2001 From: Taly Date: Fri, 19 Dec 2025 14:48:52 +0300 Subject: [PATCH 25/52] Update days-limit email templates with renewal info Added conditional messaging in both HTML and text email templates to inform users if their subscription will be auto-renewed or if they need to attach a card or pay manually, based on the presence of a subscription ID. --- .../templates/emails/days-limit-almost-reached/html.twig | 8 ++++++-- .../templates/emails/days-limit-almost-reached/text.twig | 6 ++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/workers/email/src/templates/emails/days-limit-almost-reached/html.twig b/workers/email/src/templates/emails/days-limit-almost-reached/html.twig index 166a00b4a..0f25b3091 100644 --- a/workers/email/src/templates/emails/days-limit-almost-reached/html.twig +++ b/workers/email/src/templates/emails/days-limit-almost-reached/html.twig @@ -14,7 +14,7 @@ - Осталось {{ daysLeft | escape }} {{ pluralize_ru(daysLeft, ['день', 'дня', 'дней']) }} до окончания вашей подписки на мониторинг ошибок. + Осталось {{ daysLeft | escape }} {{ pluralize_ru(daysLeft, ['день', 'дня', 'дней']) }} до окончания вашей подписки на мониторинг ошибок. @@ -22,7 +22,11 @@ - Пожалуйста, убедитесь, что вы привязали карту для автоматического продления тарифа в воркспейсе «{{ workspace.name | escape }}».
+ {% if workspace.subscriptionId %} + Через {{ daysLeft | escape }} {{ pluralize_ru(daysLeft, ['день', 'дня', 'дней']) }} мы продлим вашу подписку.
+ {% else %} + Привяжите карту для автоматического продления тарифа в воркспейсе «{{ workspace.name | escape }}». Или оплатите следующий месяц разово.
+ {% endif %}
Если план не продить, то мониторинг ошибок будет приостановлен.
diff --git a/workers/email/src/templates/emails/days-limit-almost-reached/text.twig b/workers/email/src/templates/emails/days-limit-almost-reached/text.twig index fbad0f5ca..198c11eef 100644 --- a/workers/email/src/templates/emails/days-limit-almost-reached/text.twig +++ b/workers/email/src/templates/emails/days-limit-almost-reached/text.twig @@ -1,5 +1,11 @@ {{ daysLeft | escape }} {{ pluralize_ru(daysLeft, ['день', 'дня', 'дней']) }} до окончания платного тарифа воркспейса «{{ workspace.name | escape }}». +{% if workspace.subscriptionId %} + Через {{ daysLeft | escape }} {{ pluralize_ru(daysLeft, ['день', 'дня', 'дней']) }} мы продлим вашу подписку. +{% else %} + Привяжите карту для автоматического продления тарифа в воркспейсе «{{ workspace.name | escape }}». Или оплатите следующий месяц разово. +{% endif %} + Если план не продить, то мониторинг ошибок будет приостановлен. Пожалуйста, проверьте настройки оплаты: {{ host }}/workspace/{{ workspace._id }}/settings/billing From 87a3d3b094d8b0549506b6ab1808d0a21659c808 Mon Sep 17 00:00:00 2001 From: Taly Date: Fri, 19 Dec 2025 17:12:48 +0300 Subject: [PATCH 26/52] Update email templates branding and footer text MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Replaces 'Российский трекер ошибок' and 'Сделан в CodeX' with 'Мониторинг ошибок' in all email templates and layout. This unifies and simplifies the branding across all notification emails. --- workers/email/src/templates/components/layout.twig | 12 +----------- .../email/src/templates/emails/assignee/text.twig | 4 +--- .../src/templates/emails/block-workspace/text.twig | 4 +--- .../emails/blocked-workspace-reminder/text.twig | 4 +--- .../emails/days-limit-almost-reached/text.twig | 4 +--- workers/email/src/templates/emails/event/text.twig | 10 +--------- .../emails/events-limit-almost-reached/text.twig | 4 +--- .../src/templates/emails/password-reset/text.twig | 4 +--- .../src/templates/emails/payment-failed/text.twig | 4 +--- .../src/templates/emails/payment-success/text.twig | 4 +--- .../src/templates/emails/several-events/text.twig | 9 +-------- workers/email/src/templates/emails/sign-up/text.twig | 4 +--- .../src/templates/emails/workspace-invite/text.twig | 4 +--- 13 files changed, 13 insertions(+), 58 deletions(-) diff --git a/workers/email/src/templates/components/layout.twig b/workers/email/src/templates/components/layout.twig index 6dc6a85d3..4d6e4f278 100644 --- a/workers/email/src/templates/components/layout.twig +++ b/workers/email/src/templates/components/layout.twig @@ -152,17 +152,7 @@ - Российский трекер ошибок - - - - - - - Сделан в  - CodeX + Мониторинг ошибок diff --git a/workers/email/src/templates/emails/assignee/text.twig b/workers/email/src/templates/emails/assignee/text.twig index 18ef0c7da..b816d599f 100644 --- a/workers/email/src/templates/emails/assignee/text.twig +++ b/workers/email/src/templates/emails/assignee/text.twig @@ -13,6 +13,4 @@ Вы получили это письмо, потому что подписаны на подобные уведомления. Вы можете изменить настройки, перейдя по ссылке: {{ host }}/account/notifications Хоук -Российский трекер ошибок - -Сделан в CodeX +Мониторинг ошибок diff --git a/workers/email/src/templates/emails/block-workspace/text.twig b/workers/email/src/templates/emails/block-workspace/text.twig index 7cbd6bdec..d6339b01b 100644 --- a/workers/email/src/templates/emails/block-workspace/text.twig +++ b/workers/email/src/templates/emails/block-workspace/text.twig @@ -7,6 +7,4 @@ *** Хоук -Российский трекер ошибок - -Сделан в CodeX \ No newline at end of file +Мониторинг ошибок diff --git a/workers/email/src/templates/emails/blocked-workspace-reminder/text.twig b/workers/email/src/templates/emails/blocked-workspace-reminder/text.twig index 34bcb4736..b3af03857 100644 --- a/workers/email/src/templates/emails/blocked-workspace-reminder/text.twig +++ b/workers/email/src/templates/emails/blocked-workspace-reminder/text.twig @@ -5,6 +5,4 @@ *** Хоук -Российский трекер ошибок - -Сделан в CodeX \ No newline at end of file +Мониторинг ошибок diff --git a/workers/email/src/templates/emails/days-limit-almost-reached/text.twig b/workers/email/src/templates/emails/days-limit-almost-reached/text.twig index 198c11eef..12662b96f 100644 --- a/workers/email/src/templates/emails/days-limit-almost-reached/text.twig +++ b/workers/email/src/templates/emails/days-limit-almost-reached/text.twig @@ -13,6 +13,4 @@ *** Хоук -Российский трекер ошибок - -Сделан в CodeX +Мониторинг ошибок diff --git a/workers/email/src/templates/emails/event/text.twig b/workers/email/src/templates/emails/event/text.twig index d08555bfa..3cd148df2 100644 --- a/workers/email/src/templates/emails/event/text.twig +++ b/workers/email/src/templates/emails/event/text.twig @@ -32,12 +32,4 @@ *** Хоук -Российский трекер ошибок - -Сделан в CodeX - - - - - - +Мониторинг ошибок diff --git a/workers/email/src/templates/emails/events-limit-almost-reached/text.twig b/workers/email/src/templates/emails/events-limit-almost-reached/text.twig index 44539faa9..789683f1c 100644 --- a/workers/email/src/templates/emails/events-limit-almost-reached/text.twig +++ b/workers/email/src/templates/emails/events-limit-almost-reached/text.twig @@ -7,6 +7,4 @@ *** Хоук -Российский трекер ошибок - -Сделан в CodeX +Мониторинг ошибок diff --git a/workers/email/src/templates/emails/password-reset/text.twig b/workers/email/src/templates/emails/password-reset/text.twig index f7f7380e1..287f6c6a6 100644 --- a/workers/email/src/templates/emails/password-reset/text.twig +++ b/workers/email/src/templates/emails/password-reset/text.twig @@ -6,6 +6,4 @@ *** Хоук -Российский трекер ошибок - -Сделан в CodeX \ No newline at end of file +Мониторинг ошибок diff --git a/workers/email/src/templates/emails/payment-failed/text.twig b/workers/email/src/templates/emails/payment-failed/text.twig index 84900b228..fc2faeeaf 100644 --- a/workers/email/src/templates/emails/payment-failed/text.twig +++ b/workers/email/src/templates/emails/payment-failed/text.twig @@ -7,6 +7,4 @@ *** Хоук -Российский трекер ошибок - -Сделан в CodeX +Мониторинг ошибок diff --git a/workers/email/src/templates/emails/payment-success/text.twig b/workers/email/src/templates/emails/payment-success/text.twig index ed66eb058..933b6cdd5 100644 --- a/workers/email/src/templates/emails/payment-success/text.twig +++ b/workers/email/src/templates/emails/payment-success/text.twig @@ -9,6 +9,4 @@ Вы получили это письмо, потому что подписаны на получение подобных оповещений в своих личных настройках. Вы можете изменить свои предпочтения в любое время, перейдя по ссылке: {{ host }}/account/notifications Хоук -Российский трекер ошибок - -Сделан в CodeX +Мониторинг ошибок diff --git a/workers/email/src/templates/emails/several-events/text.twig b/workers/email/src/templates/emails/several-events/text.twig index 21bc51bfb..1307ee09d 100644 --- a/workers/email/src/templates/emails/several-events/text.twig +++ b/workers/email/src/templates/emails/several-events/text.twig @@ -25,11 +25,4 @@ Вы получили это письмо, потому что подписаны на получение подобных оповещений в настройках уведомлений вашего проекта. Вы можете изменить свои предпочтения в любое время, перейдя по ссылке выше. Чтобы отписаться, перейдите по ссылке: {{ host }}/unsubscribe/{{ project._id }} Хоук -Российский трекер ошибок - -Сделан в CodeX - - - - - +Мониторинг ошибок diff --git a/workers/email/src/templates/emails/sign-up/text.twig b/workers/email/src/templates/emails/sign-up/text.twig index 15d9dbc46..f125646e3 100644 --- a/workers/email/src/templates/emails/sign-up/text.twig +++ b/workers/email/src/templates/emails/sign-up/text.twig @@ -8,6 +8,4 @@ *** Хоук -Российский трекер ошибок - -Сделан в CodeX \ No newline at end of file +Мониторинг ошибок diff --git a/workers/email/src/templates/emails/workspace-invite/text.twig b/workers/email/src/templates/emails/workspace-invite/text.twig index 6d8ab7a5e..963107e65 100644 --- a/workers/email/src/templates/emails/workspace-invite/text.twig +++ b/workers/email/src/templates/emails/workspace-invite/text.twig @@ -9,6 +9,4 @@ *** Хоук -Российский трекер ошибок - -Сделан в CodeX \ No newline at end of file +Мониторинг ошибок From 364356baa3917ba19e68c8a44a18622e4641e5ec Mon Sep 17 00:00:00 2001 From: Taly Date: Fri, 19 Dec 2025 17:14:00 +0300 Subject: [PATCH 27/52] Fix placement of plan suspension notice in email templates Moved the warning about error monitoring suspension to appear only when appropriate in both HTML and text versions of the days-limit-almost-reached email. This ensures the message is shown in the correct context for users without an active subscription. --- .../templates/emails/days-limit-almost-reached/html.twig | 3 ++- .../templates/emails/days-limit-almost-reached/text.twig | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/workers/email/src/templates/emails/days-limit-almost-reached/html.twig b/workers/email/src/templates/emails/days-limit-almost-reached/html.twig index 0f25b3091..a3df28254 100644 --- a/workers/email/src/templates/emails/days-limit-almost-reached/html.twig +++ b/workers/email/src/templates/emails/days-limit-almost-reached/html.twig @@ -26,9 +26,10 @@ Через {{ daysLeft | escape }} {{ pluralize_ru(daysLeft, ['день', 'дня', 'дней']) }} мы продлим вашу подписку.
{% else %} Привяжите карту для автоматического продления тарифа в воркспейсе «{{ workspace.name | escape }}». Или оплатите следующий месяц разово.
+
+ Если план не продить, то мониторинг ошибок будет приостановлен. {% endif %}
- Если план не продить, то мониторинг ошибок будет приостановлен.
diff --git a/workers/email/src/templates/emails/days-limit-almost-reached/text.twig b/workers/email/src/templates/emails/days-limit-almost-reached/text.twig index 12662b96f..b64563c88 100644 --- a/workers/email/src/templates/emails/days-limit-almost-reached/text.twig +++ b/workers/email/src/templates/emails/days-limit-almost-reached/text.twig @@ -1,12 +1,12 @@ {{ daysLeft | escape }} {{ pluralize_ru(daysLeft, ['день', 'дня', 'дней']) }} до окончания платного тарифа воркспейса «{{ workspace.name | escape }}». {% if workspace.subscriptionId %} - Через {{ daysLeft | escape }} {{ pluralize_ru(daysLeft, ['день', 'дня', 'дней']) }} мы продлим вашу подписку. +Через {{ daysLeft | escape }} {{ pluralize_ru(daysLeft, ['день', 'дня', 'дней']) }} мы продлим вашу подписку. {% else %} - Привяжите карту для автоматического продления тарифа в воркспейсе «{{ workspace.name | escape }}». Или оплатите следующий месяц разово. -{% endif %} +Привяжите карту для автоматического продления тарифа в воркспейсе «{{ workspace.name | escape }}». Или оплатите следующий месяц разово. Если план не продить, то мониторинг ошибок будет приостановлен. +{% endif %} Пожалуйста, проверьте настройки оплаты: {{ host }}/workspace/{{ workspace._id }}/settings/billing From f59ac883b4cb427609da01bc26020f2df45b9f39 Mon Sep 17 00:00:00 2001 From: Taly Date: Fri, 19 Dec 2025 17:21:15 +0300 Subject: [PATCH 28/52] Unify unsubscribe text in email templates Standardized the wording of unsubscribe and notification preference instructions across all email templates for consistency and clarity. --- workers/email/src/templates/emails/assignee/text.twig | 2 ++ workers/email/src/templates/emails/event/html.twig | 2 +- workers/email/src/templates/emails/event/text.twig | 2 +- workers/email/src/templates/emails/payment-success/text.twig | 4 +++- workers/email/src/templates/emails/several-events/html.twig | 2 +- workers/email/src/templates/emails/several-events/text.twig | 4 +++- 6 files changed, 11 insertions(+), 5 deletions(-) diff --git a/workers/email/src/templates/emails/assignee/text.twig b/workers/email/src/templates/emails/assignee/text.twig index b816d599f..b0d522364 100644 --- a/workers/email/src/templates/emails/assignee/text.twig +++ b/workers/email/src/templates/emails/assignee/text.twig @@ -12,5 +12,7 @@ Вы получили это письмо, потому что подписаны на подобные уведомления. Вы можете изменить настройки, перейдя по ссылке: {{ host }}/account/notifications +*** + Хоук Мониторинг ошибок diff --git a/workers/email/src/templates/emails/event/html.twig b/workers/email/src/templates/emails/event/html.twig index 7bf2760c3..800a7fe77 100644 --- a/workers/email/src/templates/emails/event/html.twig +++ b/workers/email/src/templates/emails/event/html.twig @@ -62,5 +62,5 @@ {% endblock %} {% block unsubscribeText %} - Вы получили это письмо, потому что подписаны на получение подобных оповещений в настройках уведомлений вашего проекта. Вы можете изменить свои предпочтения в любое время, перейдя по ссылке выше. + Вы получили это письмо, потому что подписаны на подобные уведомления. Вы можете изменить настройки, перейдя по ссылке выше. {% endblock %} diff --git a/workers/email/src/templates/emails/event/text.twig b/workers/email/src/templates/emails/event/text.twig index 3cd148df2..724adf980 100644 --- a/workers/email/src/templates/emails/event/text.twig +++ b/workers/email/src/templates/emails/event/text.twig @@ -27,7 +27,7 @@ *** -Вы получили это письмо, потому что подписаны на получение подобных оповещений в настройках уведомлений вашего проекта. Вы можете изменить свои предпочтения в любое время, перейдя по ссылке выше. Чтобы отписаться, перейдите по ссылке: {{ host }}/unsubscribe/{{ project._id }} +Вы получили это письмо, потому что подписаны на подобные уведомления. Вы можете изменить настройки, перейдя по ссылке: {{ host }}/unsubscribe/{{ project._id }} *** diff --git a/workers/email/src/templates/emails/payment-success/text.twig b/workers/email/src/templates/emails/payment-success/text.twig index 933b6cdd5..3c0f32202 100644 --- a/workers/email/src/templates/emails/payment-success/text.twig +++ b/workers/email/src/templates/emails/payment-success/text.twig @@ -6,7 +6,9 @@ *** -Вы получили это письмо, потому что подписаны на получение подобных оповещений в своих личных настройках. Вы можете изменить свои предпочтения в любое время, перейдя по ссылке: {{ host }}/account/notifications +Вы получили это письмо, потому что подписаны на подобные уведомления. Вы можете изменить настройки, перейдя по ссылке: {{ host }}/account/notifications + +*** Хоук Мониторинг ошибок diff --git a/workers/email/src/templates/emails/several-events/html.twig b/workers/email/src/templates/emails/several-events/html.twig index cca6b1191..f5bcca233 100644 --- a/workers/email/src/templates/emails/several-events/html.twig +++ b/workers/email/src/templates/emails/several-events/html.twig @@ -65,5 +65,5 @@ {% endblock %} {% block unsubscribeText %} - Вы получили это письмо, потому что подписаны на получение подобных оповещений в настройках уведомлений вашего проекта. Вы можете изменить свои предпочтения в любое время, перейдя по ссылке выше. + Вы получили это письмо, потому что подписаны на подобные уведомления. Вы можете изменить настройки, перейдя по ссылке выше. {% endblock %} diff --git a/workers/email/src/templates/emails/several-events/text.twig b/workers/email/src/templates/emails/several-events/text.twig index 1307ee09d..902fce1ea 100644 --- a/workers/email/src/templates/emails/several-events/text.twig +++ b/workers/email/src/templates/emails/several-events/text.twig @@ -22,7 +22,9 @@ *** -Вы получили это письмо, потому что подписаны на получение подобных оповещений в настройках уведомлений вашего проекта. Вы можете изменить свои предпочтения в любое время, перейдя по ссылке выше. Чтобы отписаться, перейдите по ссылке: {{ host }}/unsubscribe/{{ project._id }} +Вы получили это письмо, потому что подписаны на подобные уведомления. Вы можете изменить настройки, перейдя по ссылке: {{ host }}/unsubscribe/{{ project._id }} + +*** Хоук Мониторинг ошибок From 9b0a87a518142d7d15a2e7525d93edb3a4b34e85 Mon Sep 17 00:00:00 2001 From: Taly Date: Fri, 19 Dec 2025 17:25:09 +0300 Subject: [PATCH 29/52] Update Russian email templates wording and formatting MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Changed button labels from 'Просмотреть' to 'Смотреть' for consistency across assignee, event, and several-events templates. Improved formatting in events-limit-almost-reached and sign-up HTML templates by adding line breaks for better readability. --- workers/email/src/templates/emails/assignee/html.twig | 2 +- workers/email/src/templates/emails/assignee/text.twig | 2 +- workers/email/src/templates/emails/event/html.twig | 2 +- workers/email/src/templates/emails/event/text.twig | 2 +- .../emails/events-limit-almost-reached/html.twig | 8 ++++---- .../email/src/templates/emails/several-events/html.twig | 2 +- .../email/src/templates/emails/several-events/text.twig | 4 ++-- workers/email/src/templates/emails/sign-up/html.twig | 6 +++--- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/workers/email/src/templates/emails/assignee/html.twig b/workers/email/src/templates/emails/assignee/html.twig index 71226cffa..0e44418e9 100644 --- a/workers/email/src/templates/emails/assignee/html.twig +++ b/workers/email/src/templates/emails/assignee/html.twig @@ -28,7 +28,7 @@ {% set url = host ~ '/project/' ~ project._id ~ '/event/' ~ event._id ~ '/overview' %} - {% include '../../components/button.twig' with {href: url, label: 'Просмотреть событие'} %} + {% include '../../components/button.twig' with {href: url, label: 'Смотреть событие'} %} diff --git a/workers/email/src/templates/emails/assignee/text.twig b/workers/email/src/templates/emails/assignee/text.twig index b0d522364..58ad310aa 100644 --- a/workers/email/src/templates/emails/assignee/text.twig +++ b/workers/email/src/templates/emails/assignee/text.twig @@ -6,7 +6,7 @@ {{ daysRepeated }} {{ pluralize_ru(daysRepeated, ['день', 'дня', 'дней']) }} повторяется {{ event.usersAffected }} {{ pluralize_ru(event.usersAffected, ['пользователь', 'пользователя', 'пользователей']) }} затронуто -Просмотреть событие: {{ host }}/project/{{ project._id }}/event/{{ event._id }}/overview +Смотреть событие: {{ host }}/project/{{ project._id }}/event/{{ event._id }}/overview *** diff --git a/workers/email/src/templates/emails/event/html.twig b/workers/email/src/templates/emails/event/html.twig index 800a7fe77..0aafa3bd2 100644 --- a/workers/email/src/templates/emails/event/html.twig +++ b/workers/email/src/templates/emails/event/html.twig @@ -52,7 +52,7 @@ {% set eventURL = host ~ '/project/' ~ project._id ~ '/event/' ~ event._id %} - {% include '../../components/button.twig' with {href: eventURL, label: 'Просмотреть детали'} %} + {% include '../../components/button.twig' with {href: eventURL, label: 'Смотреть детали'} %} {% endblock %} diff --git a/workers/email/src/templates/emails/event/text.twig b/workers/email/src/templates/emails/event/text.twig index 724adf980..472cd1556 100644 --- a/workers/email/src/templates/emails/event/text.twig +++ b/workers/email/src/templates/emails/event/text.twig @@ -23,7 +23,7 @@ Это событие произошло {{ event.totalCount }} {{ pluralize_ru(event.totalCount, ['раз', 'раза', 'раз']) }} за {{ daysRepeated }} {{ pluralize_ru(daysRepeated, ['день', 'дня', 'дней']) }}. -Просмотреть детали: {{ host }}/project/{{ project._id }}/event/{{ event._id }} +Смотреть детали: {{ host }}/project/{{ project._id }}/event/{{ event._id }} *** diff --git a/workers/email/src/templates/emails/events-limit-almost-reached/html.twig b/workers/email/src/templates/emails/events-limit-almost-reached/html.twig index af2d74f72..2f0c2c0e4 100644 --- a/workers/email/src/templates/emails/events-limit-almost-reached/html.twig +++ b/workers/email/src/templates/emails/events-limit-almost-reached/html.twig @@ -22,10 +22,10 @@ - Вы использовали {{ eventsCount }} из {{ eventsLimit }} событий воркспейса «{{ workspace.name | escape }}» в текущем расчетном периоде. - - Ваш проект растёт — это здорово. Давайте убедимся, что ни одна важная ошибка не останется незамеченной. - + Вы использовали {{ eventsCount }} из {{ eventsLimit }} событий воркспейса «{{ workspace.name | escape }}» в текущем расчетном периоде.
+
+ Ваш проект растёт — это здорово. Давайте убедимся, что ни одна важная ошибка не останется незамеченной.
+
Обновите план и оставайтесь в курсе всех происшествий.
diff --git a/workers/email/src/templates/emails/several-events/html.twig b/workers/email/src/templates/emails/several-events/html.twig index f5bcca233..d4f69ad0f 100644 --- a/workers/email/src/templates/emails/several-events/html.twig +++ b/workers/email/src/templates/emails/several-events/html.twig @@ -53,7 +53,7 @@ {% set hiddenEventsMessage = 'и еще ' ~ hiddenEventsLen ~ '…' %} {% include '../../components/button.twig' with {href: url, label: hiddenEventsMessage} %} {% else %} - {% include '../../components/button.twig' with {href: url, label: 'Просмотреть события'} %} + {% include '../../components/button.twig' with {href: url, label: 'Смотреть события'} %} {% endif %} diff --git a/workers/email/src/templates/emails/several-events/text.twig b/workers/email/src/templates/emails/several-events/text.twig index 902fce1ea..2287e80f2 100644 --- a/workers/email/src/templates/emails/several-events/text.twig +++ b/workers/email/src/templates/emails/several-events/text.twig @@ -14,9 +14,9 @@ {% endfor %} {% if events.length - eventsToShow > 0 %} -Просмотреть еще {{ events.length - eventsToShow }} событий: {{ host }}/project/{{ project._id }} +Смотреть еще {{ events.length - eventsToShow }} событий: {{ host }}/project/{{ project._id }} {% else %} -Просмотреть события: {{ host }}/project/{{ project._id }} +Смотреть события: {{ host }}/project/{{ project._id }} {% endif %} diff --git a/workers/email/src/templates/emails/sign-up/html.twig b/workers/email/src/templates/emails/sign-up/html.twig index 6c64bb315..ad13af4b3 100644 --- a/workers/email/src/templates/emails/sign-up/html.twig +++ b/workers/email/src/templates/emails/sign-up/html.twig @@ -16,9 +16,9 @@ - Добро пожаловать в Хоук!

- -Ниже — данные для входа в аккаунт. Используйте этот пароль для первого входа, позже вы сможете изменить его в настройках.
+ Добро пожаловать в Хоук!
+
+ Ниже — данные для входа в аккаунт. Используйте этот пароль для первого входа, позже вы сможете изменить его в настройках.

Пароль: {{ password }}
From 88b1fcc5dadc7bf7cbdc3c1fff29841437f1324b Mon Sep 17 00:00:00 2001 From: Taly Date: Fri, 19 Dec 2025 17:45:51 +0300 Subject: [PATCH 30/52] Prefill email in login link for sign-up email Updated the login button in the sign-up email template to include the email as a query parameter, allowing the login form to be prefilled for the user. --- workers/email/src/templates/emails/sign-up/html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workers/email/src/templates/emails/sign-up/html.twig b/workers/email/src/templates/emails/sign-up/html.twig index ad13af4b3..2bb0bf68f 100644 --- a/workers/email/src/templates/emails/sign-up/html.twig +++ b/workers/email/src/templates/emails/sign-up/html.twig @@ -26,7 +26,7 @@ - {% include '../../components/button.twig' with {href: host ~ '/login', label: 'Войти'} %} + {% include '../../components/button.twig' with {href: host ~ '/login?emailPrefilled=' ~ endpoint, label: 'Войти'} %} From bbc499c7f92fc3ab0902d677277f5f99492a5669 Mon Sep 17 00:00:00 2001 From: Taly Date: Fri, 19 Dec 2025 17:52:44 +0300 Subject: [PATCH 31/52] Update workers/email/src/templates/emails/assignee/html.twig Co-authored-by: Peter --- workers/email/src/templates/emails/assignee/html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workers/email/src/templates/emails/assignee/html.twig b/workers/email/src/templates/emails/assignee/html.twig index 0e44418e9..f32fe8ad9 100644 --- a/workers/email/src/templates/emails/assignee/html.twig +++ b/workers/email/src/templates/emails/assignee/html.twig @@ -19,7 +19,7 @@ {% else %} {{ whoAssigned.email }} {% endif %} - назначил вас ответственным за исправление ошибки в проекте «{{ project.name | escape }}» + назначил вас ответственным за исправление ошибки From 1da23e986ea8fa933fd58660ae295f7d67e32edb Mon Sep 17 00:00:00 2001 From: Taly Date: Fri, 19 Dec 2025 18:08:23 +0300 Subject: [PATCH 32/52] Prefill email in sign-up email login link Updated the login link in the sign-up email template to include the email as a query parameter, allowing the login form to be prefilled for new users. --- workers/email/src/templates/emails/sign-up/text.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workers/email/src/templates/emails/sign-up/text.twig b/workers/email/src/templates/emails/sign-up/text.twig index f125646e3..37a1e2b0c 100644 --- a/workers/email/src/templates/emails/sign-up/text.twig +++ b/workers/email/src/templates/emails/sign-up/text.twig @@ -3,7 +3,7 @@ Ниже — данные для входа в аккаунт. Используйте этот пароль для первого входа, позже вы сможете изменить его в настройках. Пароль: {{ password }} -Войти: {{ host ~ '/login' }} +Войти: {{ host ~ '/login?emailPrefilled=' ~ endpoint }} *** From e0ec1327c35f6ea725eda9081e5d6c97af145b9a Mon Sep 17 00:00:00 2001 From: Taly Date: Fri, 19 Dec 2025 19:56:38 +0300 Subject: [PATCH 33/52] Simplify days-limit-almost-reached email templates Removed conditional logic for subscription status in both HTML and text email templates. Now always informs the user that the subscription will be renewed in the specified number of days. --- .../templates/emails/days-limit-almost-reached/html.twig | 9 +-------- .../templates/emails/days-limit-almost-reached/text.twig | 6 ------ 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/workers/email/src/templates/emails/days-limit-almost-reached/html.twig b/workers/email/src/templates/emails/days-limit-almost-reached/html.twig index a3df28254..e8e45b3d2 100644 --- a/workers/email/src/templates/emails/days-limit-almost-reached/html.twig +++ b/workers/email/src/templates/emails/days-limit-almost-reached/html.twig @@ -22,14 +22,7 @@ - {% if workspace.subscriptionId %} - Через {{ daysLeft | escape }} {{ pluralize_ru(daysLeft, ['день', 'дня', 'дней']) }} мы продлим вашу подписку.
- {% else %} - Привяжите карту для автоматического продления тарифа в воркспейсе «{{ workspace.name | escape }}». Или оплатите следующий месяц разово.
-
- Если план не продить, то мониторинг ошибок будет приостановлен. - {% endif %} -
+ Через {{ daysLeft | escape }} {{ pluralize_ru(daysLeft, ['день', 'дня', 'дней']) }} мы продлим вашу подписку.
diff --git a/workers/email/src/templates/emails/days-limit-almost-reached/text.twig b/workers/email/src/templates/emails/days-limit-almost-reached/text.twig index b64563c88..127ede9d4 100644 --- a/workers/email/src/templates/emails/days-limit-almost-reached/text.twig +++ b/workers/email/src/templates/emails/days-limit-almost-reached/text.twig @@ -1,12 +1,6 @@ {{ daysLeft | escape }} {{ pluralize_ru(daysLeft, ['день', 'дня', 'дней']) }} до окончания платного тарифа воркспейса «{{ workspace.name | escape }}». -{% if workspace.subscriptionId %} Через {{ daysLeft | escape }} {{ pluralize_ru(daysLeft, ['день', 'дня', 'дней']) }} мы продлим вашу подписку. -{% else %} -Привяжите карту для автоматического продления тарифа в воркспейсе «{{ workspace.name | escape }}». Или оплатите следующий месяц разово. - -Если план не продить, то мониторинг ошибок будет приостановлен. -{% endif %} Пожалуйста, проверьте настройки оплаты: {{ host }}/workspace/{{ workspace._id }}/settings/billing From 32d212efb3c3354fd2b7f96ce5d343edcb0a551b Mon Sep 17 00:00:00 2001 From: Taly Date: Fri, 19 Dec 2025 20:18:35 +0300 Subject: [PATCH 34/52] Update days-limit email templates with clearer renewal info Revised both HTML and text email templates to clarify the need to link a card for automatic renewal or pay for the next month manually. Added a warning that error monitoring will be suspended if the plan is not renewed. --- .../src/templates/emails/days-limit-almost-reached/html.twig | 5 ++++- .../src/templates/emails/days-limit-almost-reached/text.twig | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/workers/email/src/templates/emails/days-limit-almost-reached/html.twig b/workers/email/src/templates/emails/days-limit-almost-reached/html.twig index e8e45b3d2..f4af77080 100644 --- a/workers/email/src/templates/emails/days-limit-almost-reached/html.twig +++ b/workers/email/src/templates/emails/days-limit-almost-reached/html.twig @@ -22,7 +22,10 @@ - Через {{ daysLeft | escape }} {{ pluralize_ru(daysLeft, ['день', 'дня', 'дней']) }} мы продлим вашу подписку. + Привяжите карту для автоматического продления тарифа в воркспейсе «{{ workspace.name | escape }}». Или оплатите следующий месяц разово.
+
+ Если план не продить, то мониторинг ошибок будет приостановлен. +
diff --git a/workers/email/src/templates/emails/days-limit-almost-reached/text.twig b/workers/email/src/templates/emails/days-limit-almost-reached/text.twig index 127ede9d4..e190ec63e 100644 --- a/workers/email/src/templates/emails/days-limit-almost-reached/text.twig +++ b/workers/email/src/templates/emails/days-limit-almost-reached/text.twig @@ -1,6 +1,8 @@ {{ daysLeft | escape }} {{ pluralize_ru(daysLeft, ['день', 'дня', 'дней']) }} до окончания платного тарифа воркспейса «{{ workspace.name | escape }}». -Через {{ daysLeft | escape }} {{ pluralize_ru(daysLeft, ['день', 'дня', 'дней']) }} мы продлим вашу подписку. +Привяжите карту для автоматического продления тарифа в воркспейсе «{{ workspace.name | escape }}». Или оплатите следующий месяц разово. + +Если план не продить, то мониторинг ошибок будет приостановлен. Пожалуйста, проверьте настройки оплаты: {{ host }}/workspace/{{ workspace._id }}/settings/billing From b4d165d047c570bda972bf05eb78f3d913ed409b Mon Sep 17 00:00:00 2001 From: Taly Date: Fri, 19 Dec 2025 23:17:27 +0300 Subject: [PATCH 35/52] Fix event type display when type is undefined in email templates Updated event email templates to use the default filter for event type, preventing display issues when the type is undefined or missing. This ensures consistent formatting in both HTML and text versions of event notification emails. --- workers/email/src/templates/emails/event/html.twig | 2 +- workers/email/src/templates/emails/event/text.twig | 2 +- workers/email/src/templates/emails/several-events/text.twig | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/workers/email/src/templates/emails/event/html.twig b/workers/email/src/templates/emails/event/html.twig index 0aafa3bd2..d9f03fdc1 100644 --- a/workers/email/src/templates/emails/event/html.twig +++ b/workers/email/src/templates/emails/event/html.twig @@ -16,7 +16,7 @@ - {{ event.payload.type ? event.payload.type + ': ' : '' }}{{ event.payload.title | escape }} + {{ event.payload.type | default('') ? event.payload.type + ': ' : '' }}{{ event.payload.title | escape }} diff --git a/workers/email/src/templates/emails/event/text.twig b/workers/email/src/templates/emails/event/text.twig index 472cd1556..51298f6d5 100644 --- a/workers/email/src/templates/emails/event/text.twig +++ b/workers/email/src/templates/emails/event/text.twig @@ -10,7 +10,7 @@ {{ newLabel }} в проекте «{{ project.name }}» ------------------------ -{{ event.payload.type ? event.payload.type + ': ' : '' }}{{ event.payload.title | escape }} +{{ event.payload.type | default('') ? event.payload.type + ': ' : '' }}{{ event.payload.title | escape }} ------------------------ {% if event.payload.backtrace is not empty %} {% if event.payload.backtrace[0] is not empty %} diff --git a/workers/email/src/templates/emails/several-events/text.twig b/workers/email/src/templates/emails/several-events/text.twig index 2287e80f2..307b146da 100644 --- a/workers/email/src/templates/emails/several-events/text.twig +++ b/workers/email/src/templates/emails/several-events/text.twig @@ -4,7 +4,8 @@ {% for eventData in events | sortEvents | slice(0, eventsToShow) %} -{{ eventData.event.payload.type ? eventData.event.payload.type + ': ' : '' }}{{ eventData.event.payload.title }} +{{ eventData.event.payload.type | default('') ? eventData.event.payload.type + ': ' : '' }}{{ eventData.event.payload.title }} + В файле: {{ eventData.event.payload.backtrace[0].file }} на строке {{ eventData.event.payload.backtrace[0].line }}. From 94812b21d27f5dcb17ee8d92621cd15ce9558720 Mon Sep 17 00:00:00 2001 From: Taly Date: Fri, 19 Dec 2025 23:30:03 +0300 Subject: [PATCH 36/52] Refactor event type display in email templates Replaced inline ternary logic with Twig if statements for displaying event types in event email templates. This improves readability and consistency across HTML and text versions. --- workers/email/src/templates/emails/event/html.twig | 2 +- workers/email/src/templates/emails/event/text.twig | 2 +- workers/email/src/templates/emails/several-events/text.twig | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/workers/email/src/templates/emails/event/html.twig b/workers/email/src/templates/emails/event/html.twig index d9f03fdc1..b85abe25b 100644 --- a/workers/email/src/templates/emails/event/html.twig +++ b/workers/email/src/templates/emails/event/html.twig @@ -16,7 +16,7 @@ - {{ event.payload.type | default('') ? event.payload.type + ': ' : '' }}{{ event.payload.title | escape }} + {% if event.payload.type %}{{ event.payload.type }}: {% endif %}{{ event.payload.title | escape }} diff --git a/workers/email/src/templates/emails/event/text.twig b/workers/email/src/templates/emails/event/text.twig index 51298f6d5..f04701969 100644 --- a/workers/email/src/templates/emails/event/text.twig +++ b/workers/email/src/templates/emails/event/text.twig @@ -10,7 +10,7 @@ {{ newLabel }} в проекте «{{ project.name }}» ------------------------ -{{ event.payload.type | default('') ? event.payload.type + ': ' : '' }}{{ event.payload.title | escape }} +{% if event.payload.type %}{{ event.payload.type }}: {% endif %}{{ event.payload.title | escape }} ------------------------ {% if event.payload.backtrace is not empty %} {% if event.payload.backtrace[0] is not empty %} diff --git a/workers/email/src/templates/emails/several-events/text.twig b/workers/email/src/templates/emails/several-events/text.twig index 307b146da..40706688a 100644 --- a/workers/email/src/templates/emails/several-events/text.twig +++ b/workers/email/src/templates/emails/several-events/text.twig @@ -4,8 +4,7 @@ {% for eventData in events | sortEvents | slice(0, eventsToShow) %} -{{ eventData.event.payload.type | default('') ? eventData.event.payload.type + ': ' : '' }}{{ eventData.event.payload.title }} - +{% if eventData.event.payload.type %}{{ eventData.event.payload.type }}: {% endif %}{{ eventData.event.payload.title | escape }} В файле: {{ eventData.event.payload.backtrace[0].file }} на строке {{ eventData.event.payload.backtrace[0].line }}. From 03c02270a647c17dda51baf5c9855ca8f308e107 Mon Sep 17 00:00:00 2001 From: Taly Date: Fri, 19 Dec 2025 23:48:10 +0300 Subject: [PATCH 37/52] Update workspace invite subject variable name Changed the variable in the workspace invite email subject from 'name' to 'workspaceName' for improved clarity and consistency. --- .../email/src/templates/emails/workspace-invite/subject.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workers/email/src/templates/emails/workspace-invite/subject.twig b/workers/email/src/templates/emails/workspace-invite/subject.twig index 6b5dc6de2..30322511f 100644 --- a/workers/email/src/templates/emails/workspace-invite/subject.twig +++ b/workers/email/src/templates/emails/workspace-invite/subject.twig @@ -1 +1 @@ -Вас пригласили в воркспейс «{{name}}» \ No newline at end of file +Вас пригласили в воркспейс «{{workspaceName}}» \ No newline at end of file From 4b5fefa1066380ad9e68f4f26e2ad11b911f8ea0 Mon Sep 17 00:00:00 2001 From: Taly Date: Sat, 20 Dec 2025 00:08:04 +0300 Subject: [PATCH 38/52] Remove duplicate event title block in email template Deleted a redundant table row displaying the event title and icon above the main event title block in the event email template to avoid duplicate information. --- workers/email/src/templates/emails/event/html.twig | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/workers/email/src/templates/emails/event/html.twig b/workers/email/src/templates/emails/event/html.twig index b85abe25b..6124a0bda 100644 --- a/workers/email/src/templates/emails/event/html.twig +++ b/workers/email/src/templates/emails/event/html.twig @@ -11,16 +11,6 @@ {% set newCount = events[0].newCount %} {% set usersAffected = events[0].usersAffected %} - - - - - - {% if event.payload.type %}{{ event.payload.type }}: {% endif %}{{ event.payload.title | escape }} - - - -
From 04db419e567f72bc719670a6da474099bfcc8f36 Mon Sep 17 00:00:00 2001 From: Taly Date: Sat, 20 Dec 2025 00:28:07 +0300 Subject: [PATCH 39/52] Update html.twig --- workers/email/src/templates/emails/event/html.twig | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/workers/email/src/templates/emails/event/html.twig b/workers/email/src/templates/emails/event/html.twig index 6124a0bda..b88b7713f 100644 --- a/workers/email/src/templates/emails/event/html.twig +++ b/workers/email/src/templates/emails/event/html.twig @@ -11,6 +11,20 @@ {% set newCount = events[0].newCount %} {% set usersAffected = events[0].usersAffected %} + + + + + + {% if event.payload.type %} + {{ event.payload.type }} + {% else %} + Ошибка + {% endif %} + + + +
From 6d40fd0fb5362a4b421705fab8787d9deb9e2dce Mon Sep 17 00:00:00 2001 From: Peter Savchenko Date: Sat, 20 Dec 2025 00:28:47 +0300 Subject: [PATCH 40/52] fix some styles --- workers/email/src/templates/components/backtrace.twig | 5 +---- workers/email/src/templates/components/button.twig | 4 ++-- workers/email/src/templates/components/event.twig | 4 ++-- workers/email/src/templates/emails/event/html.twig | 2 +- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/workers/email/src/templates/components/backtrace.twig b/workers/email/src/templates/components/backtrace.twig index f1495646d..e26303886 100644 --- a/workers/email/src/templates/components/backtrace.twig +++ b/workers/email/src/templates/components/backtrace.twig @@ -19,10 +19,7 @@
-
- {{ frame.content | escape }} -
+
{{ frame.content | escape }}
{% endfor %} diff --git a/workers/email/src/templates/components/button.twig b/workers/email/src/templates/components/button.twig index e4e40131b..4ff9f5aab 100644 --- a/workers/email/src/templates/components/button.twig +++ b/workers/email/src/templates/components/button.twig @@ -1,8 +1,8 @@
- {{ label }} + style="font-size: 14.4px; color: #dbe6ff;"> + {{ label }}
diff --git a/workers/email/src/templates/components/event.twig b/workers/email/src/templates/components/event.twig index 26932d3f1..f47567451 100644 --- a/workers/email/src/templates/components/event.twig +++ b/workers/email/src/templates/components/event.twig @@ -1,5 +1,5 @@ - + {{ event.payload.title | escape }} @@ -7,4 +7,4 @@ {% include './event-info.twig' with {event: { daysRepeated: daysRepeated, event: {totalCount: event.totalCount}, usersAffected: event.usersAffected}} %} - \ No newline at end of file + diff --git a/workers/email/src/templates/emails/event/html.twig b/workers/email/src/templates/emails/event/html.twig index b88b7713f..3450f2f3e 100644 --- a/workers/email/src/templates/emails/event/html.twig +++ b/workers/email/src/templates/emails/event/html.twig @@ -27,7 +27,7 @@ -
+
{{ event.payload.title | escape }} From 37d224de934f5c551f538abf7ff84c390decbe30 Mon Sep 17 00:00:00 2001 From: Peter Savchenko Date: Sat, 20 Dec 2025 00:50:35 +0300 Subject: [PATCH 41/52] Update backtrace.twig --- workers/email/src/templates/components/backtrace.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workers/email/src/templates/components/backtrace.twig b/workers/email/src/templates/components/backtrace.twig index e26303886..4bb171ca5 100644 --- a/workers/email/src/templates/components/backtrace.twig +++ b/workers/email/src/templates/components/backtrace.twig @@ -19,7 +19,7 @@
-
{{ frame.content | escape }}
+
{{ frame.content | escape }}
{% endfor %} From 799a2d9335127cfd8ea879ddbbfcb9bb2b370cc3 Mon Sep 17 00:00:00 2001 From: Peter Savchenko Date: Sat, 20 Dec 2025 00:53:02 +0300 Subject: [PATCH 42/52] Update event-info.twig --- workers/email/src/templates/components/event-info.twig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/workers/email/src/templates/components/event-info.twig b/workers/email/src/templates/components/event-info.twig index ab9a9081b..9b8eee70f 100644 --- a/workers/email/src/templates/components/event-info.twig +++ b/workers/email/src/templates/components/event-info.twig @@ -19,7 +19,7 @@ {% if event.daysRepeated is not empty %} - {{ event.daysRepeated }} {{ pluralize_ru(event.daysRepeated, ['день', 'дня', 'дней']) }} повторяется + {{ event.daysRepeated }} {{ pluralize_ru(event.daysRepeated, ['день', 'дня', 'дней']) }}    @@ -27,7 +27,7 @@ {% if event.usersAffected %} - {{ event.usersAffected }} {{ pluralize_ru(event.usersAffected, ['пользователь', 'пользователя', 'пользователей']) }} затронуто + {{ event.usersAffected }} {{ pluralize_ru(event.usersAffected, ['пользователь', 'пользователя', 'пользователей']) }} {% endif %} From 5c42dfd915c41963bba801660731c253665d9929 Mon Sep 17 00:00:00 2001 From: Peter Savchenko Date: Sat, 20 Dec 2025 01:31:28 +0300 Subject: [PATCH 43/52] few more fixes --- workers/email/scripts/emailOverview.ts | 10 ++++++++++ .../src/templates/emails/block-workspace/html.twig | 10 ++++++++-- .../emails/blocked-workspace-reminder/html.twig | 8 +++++++- .../emails/days-limit-almost-reached/html.twig | 2 +- 4 files changed, 26 insertions(+), 4 deletions(-) diff --git a/workers/email/scripts/emailOverview.ts b/workers/email/scripts/emailOverview.ts index b49b2b910..ff36ed82a 100644 --- a/workers/email/scripts/emailOverview.ts +++ b/workers/email/scripts/emailOverview.ts @@ -149,6 +149,16 @@ class EmailTestServer { period: 10, reason: 'error on the payment server side', daysAfterPayday: countDaysAfterPayday(workspace.lastChargeDate, workspace.paidUntil), + daysAfterBlock: 5, + daysLeft: 3, + eventsCount: workspace.billingPeriodEventsCount, + eventsLimit: 100000, + tariffPlanId: '5f47f031ff71510040f433c1', + password: '1as2eadd321a3cDf', + plan: { + name: 'Корпоративный' + }, + workspaceName: workspace.name, }; try { diff --git a/workers/email/src/templates/emails/block-workspace/html.twig b/workers/email/src/templates/emails/block-workspace/html.twig index 3bdc4830a..bda105bcd 100644 --- a/workers/email/src/templates/emails/block-workspace/html.twig +++ b/workers/email/src/templates/emails/block-workspace/html.twig @@ -14,7 +14,7 @@ - «{{ workspace.name | escape }}» не принимает события + «{{ workspace.name | escape }}» не видит новые ошибки @@ -33,7 +33,13 @@ - {% include '../../components/button.twig' with {href: host ~ '/workspace/' ~ workspace._id ~ '/settings/billing', label: workspace.tariffPlanId is same as('5f47f031ff71510040f433c1') ? 'Увеличить лимит от 99 ₽' : 'Открыть настройки'} %} + {% set tariffPlanIdString = workspace.tariffPlanId ~ '' %} + {% if tariffPlanIdString == '5f47f031ff71510040f433c1' %} + {% set buttonLabel = 'Увеличить лимит от 99 ₽' %} + {% else %} + {% set buttonLabel = 'Открыть настройки' %} + {% endif %} + {% include '../../components/button.twig' with {href: host ~ '/workspace/' ~ workspace._id ~ '/settings/billing', label: buttonLabel} %} {% endblock %} diff --git a/workers/email/src/templates/emails/blocked-workspace-reminder/html.twig b/workers/email/src/templates/emails/blocked-workspace-reminder/html.twig index 51cfa48fe..79fee4219 100644 --- a/workers/email/src/templates/emails/blocked-workspace-reminder/html.twig +++ b/workers/email/src/templates/emails/blocked-workspace-reminder/html.twig @@ -33,7 +33,13 @@ - {% include '../../components/button.twig' with {href: host ~ '/workspace/' ~ workspace._id ~ '/settings/billing', label: workspace.tariffPlanId is same as('5f47f031ff71510040f433c1') ? 'Выбрать тариф от 99 ₽' : 'Открыть настройки'} %} + {% set tariffPlanIdString = workspace.tariffPlanId ~ '' %} + {% if tariffPlanIdString == '5f47f031ff71510040f433c1' %} + {% set buttonLabel = 'Выбрать тариф от 99 ₽' %} + {% else %} + {% set buttonLabel = 'Открыть настройки' %} + {% endif %} + {% include '../../components/button.twig' with {href: host ~ '/workspace/' ~ workspace._id ~ '/settings/billing', label: buttonLabel} %} {% endblock %} diff --git a/workers/email/src/templates/emails/days-limit-almost-reached/html.twig b/workers/email/src/templates/emails/days-limit-almost-reached/html.twig index f4af77080..0053d9db1 100644 --- a/workers/email/src/templates/emails/days-limit-almost-reached/html.twig +++ b/workers/email/src/templates/emails/days-limit-almost-reached/html.twig @@ -14,7 +14,7 @@ - Осталось {{ daysLeft | escape }} {{ pluralize_ru(daysLeft, ['день', 'дня', 'дней']) }} до окончания вашей подписки на мониторинг ошибок. + Осталось {{ daysLeft | escape }} {{ pluralize_ru(daysLeft, ['день', 'дня', 'дней']) }} до окончания подписки на мониторинг ошибок. From 46108670708ef3fad51229cb678973701cd5bf6c Mon Sep 17 00:00:00 2001 From: Peter Savchenko Date: Sat, 20 Dec 2025 01:40:04 +0300 Subject: [PATCH 44/52] Update backtrace.twig --- workers/email/src/templates/components/backtrace.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workers/email/src/templates/components/backtrace.twig b/workers/email/src/templates/components/backtrace.twig index 4bb171ca5..64a54dcaa 100644 --- a/workers/email/src/templates/components/backtrace.twig +++ b/workers/email/src/templates/components/backtrace.twig @@ -19,7 +19,7 @@
-
{{ frame.content | escape }}
+
{{ frame.content | escape }}
{% endfor %} From e3873b01d8a755d9086129c0f4b17a4a3861a6f6 Mon Sep 17 00:00:00 2001 From: Peter Savchenko Date: Sat, 20 Dec 2025 17:37:22 +0300 Subject: [PATCH 45/52] Update subject.twig --- workers/email/src/templates/emails/assignee/subject.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workers/email/src/templates/emails/assignee/subject.twig b/workers/email/src/templates/emails/assignee/subject.twig index dced2421e..f73b21c36 100644 --- a/workers/email/src/templates/emails/assignee/subject.twig +++ b/workers/email/src/templates/emails/assignee/subject.twig @@ -1 +1 @@ -Вы были назначены ответственным за исправление ошибки «{{ event.payload.title }}» — {{ project.name | escape }} \ No newline at end of file +Вы были назначены ответственным за фикс «{{ event.payload.title }}» — {{ project.name | escape }} From 29adaa631c2c6e91768f5baee8449154e7f9dbe8 Mon Sep 17 00:00:00 2001 From: Peter Savchenko Date: Sat, 20 Dec 2025 22:34:23 +0300 Subject: [PATCH 46/52] Add environment prefix to email sender name Non-production environments now include the environment name in the email sender name to help distinguish emails sent from staging or development. --- workers/email/src/provider.ts | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/workers/email/src/provider.ts b/workers/email/src/provider.ts index 9ffaba12c..9fa7d51f1 100644 --- a/workers/email/src/provider.ts +++ b/workers/email/src/provider.ts @@ -81,8 +81,17 @@ export default class EmailProvider extends NotificationsProvider { return; } + let sender = `"${process.env.SMTP_SENDER_NAME}" <${process.env.SMTP_SENDER_ADDRESS}>`; + + /** + * Add prefix for Stage and Dev emails sender name + */ + if (process.env.ENVIRONMENT_NAME !== 'prod') { + sender = `"${process.env.SMTP_SENDER_NAME}[${process.env.ENVIRONMENT_NAME}]" <${process.env.SMTP_SENDER_ADDRESS}>`; + } + const mailOptions = { - from: `"${process.env.SMTP_SENDER_NAME}" <${process.env.SMTP_SENDER_ADDRESS}>`, + from: sender, to, ...content, }; From 2225058e51015daafeb9057e255e5eacd5191e9f Mon Sep 17 00:00:00 2001 From: Peter Savchenko Date: Sun, 21 Dec 2025 09:09:29 +0300 Subject: [PATCH 47/52] Revert "Add environment prefix to email sender name" This reverts commit 29adaa631c2c6e91768f5baee8449154e7f9dbe8. --- workers/email/src/provider.ts | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/workers/email/src/provider.ts b/workers/email/src/provider.ts index 9fa7d51f1..9ffaba12c 100644 --- a/workers/email/src/provider.ts +++ b/workers/email/src/provider.ts @@ -81,17 +81,8 @@ export default class EmailProvider extends NotificationsProvider { return; } - let sender = `"${process.env.SMTP_SENDER_NAME}" <${process.env.SMTP_SENDER_ADDRESS}>`; - - /** - * Add prefix for Stage and Dev emails sender name - */ - if (process.env.ENVIRONMENT_NAME !== 'prod') { - sender = `"${process.env.SMTP_SENDER_NAME}[${process.env.ENVIRONMENT_NAME}]" <${process.env.SMTP_SENDER_ADDRESS}>`; - } - const mailOptions = { - from: sender, + from: `"${process.env.SMTP_SENDER_NAME}" <${process.env.SMTP_SENDER_ADDRESS}>`, to, ...content, }; From 057d01ca1e5a5403899a17bef3bf4173de8fb1e0 Mon Sep 17 00:00:00 2001 From: Taly Date: Mon, 22 Dec 2025 01:06:44 +0300 Subject: [PATCH 48/52] Add user email to sign-up email template variables Introduces an 'email' field to the sign-up template variables and updates the email template to use this value for the login button link. This ensures the correct email is prefilled in the login URL. --- workers/email/src/templates/emails/sign-up/html.twig | 2 +- workers/sender/src/index.ts | 1 + workers/sender/types/template-variables/sign-up.ts | 7 ++++++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/workers/email/src/templates/emails/sign-up/html.twig b/workers/email/src/templates/emails/sign-up/html.twig index 2bb0bf68f..a45df094a 100644 --- a/workers/email/src/templates/emails/sign-up/html.twig +++ b/workers/email/src/templates/emails/sign-up/html.twig @@ -26,7 +26,7 @@ - {% include '../../components/button.twig' with {href: host ~ '/login?emailPrefilled=' ~ endpoint, label: 'Войти'} %} + {% include '../../components/button.twig' with {href: host ~ '/login?emailPrefilled=' ~ email, label: 'Войти'} %} diff --git a/workers/sender/src/index.ts b/workers/sender/src/index.ts index ce1f86b95..7f24c1dc3 100644 --- a/workers/sender/src/index.ts +++ b/workers/sender/src/index.ts @@ -598,6 +598,7 @@ export default abstract class SenderWorker extends Worker { host: process.env.GARAGE_URL, hostOfStatic: process.env.API_STATIC_URL, password, + email: endpoint, }, } as SignUpNotification); } diff --git a/workers/sender/types/template-variables/sign-up.ts b/workers/sender/types/template-variables/sign-up.ts index 21cb06919..a2a982ea3 100644 --- a/workers/sender/types/template-variables/sign-up.ts +++ b/workers/sender/types/template-variables/sign-up.ts @@ -8,7 +8,12 @@ export interface SignUpVariables extends CommonTemplateVariables { /** * Password generated for the user */ - password: string + password: string; + + /** + * Email of the user + */ + email: string; } /** From d8e18413ce7057b5a9b98e8144aac0b03b79bf55 Mon Sep 17 00:00:00 2001 From: Peter Savchenko Date: Tue, 23 Dec 2025 20:16:30 +0300 Subject: [PATCH 49/52] Update backtrace.twig --- workers/email/src/templates/components/backtrace.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workers/email/src/templates/components/backtrace.twig b/workers/email/src/templates/components/backtrace.twig index 64a54dcaa..44a6b3a94 100644 --- a/workers/email/src/templates/components/backtrace.twig +++ b/workers/email/src/templates/components/backtrace.twig @@ -19,7 +19,7 @@
-
{{ frame.content | escape }}
+
{{ frame.content | escape }}
{% endfor %} From a2949f7f56944a044982d12e147814ba890ea85d Mon Sep 17 00:00:00 2001 From: Peter Savchenko Date: Tue, 23 Dec 2025 20:24:42 +0300 Subject: [PATCH 50/52] move nobr outside or pre --- workers/email/src/templates/components/backtrace.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workers/email/src/templates/components/backtrace.twig b/workers/email/src/templates/components/backtrace.twig index 44a6b3a94..a8f8771eb 100644 --- a/workers/email/src/templates/components/backtrace.twig +++ b/workers/email/src/templates/components/backtrace.twig @@ -19,7 +19,7 @@ -
{{ frame.content | escape }}
+
{{ frame.content | escape }}
{% endfor %} From 4c394d9195423177a815bf2213d3b9e5243914fc Mon Sep 17 00:00:00 2001 From: Peter Savchenko Date: Tue, 23 Dec 2025 20:27:43 +0300 Subject: [PATCH 51/52] fix typo --- .../src/templates/emails/days-limit-almost-reached/html.twig | 2 +- .../src/templates/emails/days-limit-almost-reached/text.twig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/workers/email/src/templates/emails/days-limit-almost-reached/html.twig b/workers/email/src/templates/emails/days-limit-almost-reached/html.twig index 0053d9db1..9352e91ce 100644 --- a/workers/email/src/templates/emails/days-limit-almost-reached/html.twig +++ b/workers/email/src/templates/emails/days-limit-almost-reached/html.twig @@ -24,7 +24,7 @@ Привяжите карту для автоматического продления тарифа в воркспейсе «{{ workspace.name | escape }}». Или оплатите следующий месяц разово.

- Если план не продить, то мониторинг ошибок будет приостановлен. + Если план не продлить, то мониторинг ошибок будет приостановлен.
diff --git a/workers/email/src/templates/emails/days-limit-almost-reached/text.twig b/workers/email/src/templates/emails/days-limit-almost-reached/text.twig index e190ec63e..b949ed31c 100644 --- a/workers/email/src/templates/emails/days-limit-almost-reached/text.twig +++ b/workers/email/src/templates/emails/days-limit-almost-reached/text.twig @@ -2,7 +2,7 @@ Привяжите карту для автоматического продления тарифа в воркспейсе «{{ workspace.name | escape }}». Или оплатите следующий месяц разово. -Если план не продить, то мониторинг ошибок будет приостановлен. +Если план не продлить, то мониторинг ошибок будет приостановлен. Пожалуйста, проверьте настройки оплаты: {{ host }}/workspace/{{ workspace._id }}/settings/billing From e4b5f1882926ac8b597bcb6f061c5464a9fe8c08 Mon Sep 17 00:00:00 2001 From: Peter Savchenko Date: Tue, 23 Dec 2025 20:37:50 +0300 Subject: [PATCH 52/52] remove nobr --- workers/email/src/templates/components/backtrace.twig | 2 +- .../src/templates/emails/days-limit-almost-reached/text.twig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/workers/email/src/templates/components/backtrace.twig b/workers/email/src/templates/components/backtrace.twig index a8f8771eb..64a54dcaa 100644 --- a/workers/email/src/templates/components/backtrace.twig +++ b/workers/email/src/templates/components/backtrace.twig @@ -19,7 +19,7 @@ -
{{ frame.content | escape }}
+
{{ frame.content | escape }}
{% endfor %} diff --git a/workers/email/src/templates/emails/days-limit-almost-reached/text.twig b/workers/email/src/templates/emails/days-limit-almost-reached/text.twig index b949ed31c..1fe6f9eb6 100644 --- a/workers/email/src/templates/emails/days-limit-almost-reached/text.twig +++ b/workers/email/src/templates/emails/days-limit-almost-reached/text.twig @@ -4,7 +4,7 @@ Если план не продлить, то мониторинг ошибок будет приостановлен. -Пожалуйста, проверьте настройки оплаты: {{ host }}/workspace/{{ workspace._id }}/settings/billing +Перейти к настройкам оплаты: {{ host }}/workspace/{{ workspace._id }}/settings/billing ***