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/components/backtrace.twig b/workers/email/src/templates/components/backtrace.twig index f1495646d..64a54dcaa 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-info.twig b/workers/email/src/templates/components/event-info.twig index 13d0572dd..9b8eee70f 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 }} всего    @@ -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/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/components/layout.twig b/workers/email/src/templates/components/layout.twig index 539967d8d..4d6e4f278 100644 --- a/workers/email/src/templates/components/layout.twig +++ b/workers/email/src/templates/components/layout.twig @@ -152,17 +152,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..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 %} - 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..f73b21c36 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 +Вы были назначены ответственным за фикс «{{ event.payload.title }}» — {{ project.name | escape }} diff --git a/workers/email/src/templates/emails/assignee/text.twig b/workers/email/src/templates/emails/assignee/text.twig index 3e2fa3c48..58ad310aa 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 +Хоук +Мониторинг ошибок 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/block-workspace/text.twig b/workers/email/src/templates/emails/block-workspace/text.twig index e0994e1fd..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 @@ *** Хоук -Российский трекер ошибок - -Made by CodeX \ No newline at end of file +Мониторинг ошибок 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/blocked-workspace-reminder/text.twig b/workers/email/src/templates/emails/blocked-workspace-reminder/text.twig index 8d95bc7b0..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 @@ *** Хоук -Российский трекер ошибок - -Made by 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..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 @@ -14,7 +14,7 @@ - {{ daysLeft | escape }} day{{ daysLeft > 1 ? 's' : '' }} left to the paid plan ending + Осталось {{ daysLeft | escape }} {{ pluralize_ru(daysLeft, ['день', 'дня', 'дней']) }} до окончания подписки на мониторинг ошибок. @@ -22,14 +22,16 @@ - 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..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 }} 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..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 @@ -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 +Привяжите карту для автоматического продления тарифа в воркспейсе «{{ workspace.name | escape }}». Или оплатите следующий месяц разово. -*** +Если план не продлить, то мониторинг ошибок будет приостановлен. + +Перейти к настройкам оплаты: {{ host }}/workspace/{{ workspace._id }}/settings/billing -Hawk -Errors tracking system +*** -Made by CodeX +Хоук +Мониторинг ошибок diff --git a/workers/email/src/templates/emails/event/html.twig b/workers/email/src/templates/emails/event/html.twig index 35c7c5032..3450f2f3e 100644 --- a/workers/email/src/templates/emails/event/html.twig +++ b/workers/email/src/templates/emails/event/html.twig @@ -16,14 +16,18 @@ - {{ event.payload.type ? event.payload.type : 'Uncaught Error' }} + {% if event.payload.type %} + {{ event.payload.type }} + {% else %} + Ошибка + {% endif %} -
+
{{ event.payload.title | escape }} @@ -52,7 +56,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 +66,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..f04701969 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 }} +{% 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 %} @@ -21,20 +21,15 @@ 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 }} - -Hawk -Errors tracking system - -Made by CodeX - - - +Вы получили это письмо, потому что подписаны на подобные уведомления. Вы можете изменить настройки, перейдя по ссылке: {{ host }}/unsubscribe/{{ project._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 d5b3a1d11..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 @@ -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. - - 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. + Вы использовали {{ eventsCount }} из {{ eventsLimit }} событий воркспейса «{{ workspace.name | escape }}» в текущем расчетном периоде.
+
+ Ваш проект растёт — это здорово. Давайте убедимся, что ни одна важная ошибка не останется незамеченной.
+
+ Обновите план и оставайтесь в курсе всех происшествий. - {% 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..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 @@ -1,12 +1,10 @@ -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 +Хоук +Мониторинг ошибок 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..287f6c6a6 100644 --- a/workers/email/src/templates/emails/password-reset/text.twig +++ b/workers/email/src/templates/emails/password-reset/text.twig @@ -1,11 +1,9 @@ -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 +Хоук +Мониторинг ошибок diff --git a/workers/email/src/templates/emails/payment-failed/html.twig b/workers/email/src/templates/emails/payment-failed/html.twig index 531aa86b9..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 @@ - 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..fc2faeeaf 100644 --- a/workers/email/src/templates/emails/payment-failed/text.twig +++ b/workers/email/src/templates/emails/payment-failed/text.twig @@ -1,14 +1,10 @@ -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 +Хоук +Мониторинг ошибок diff --git a/workers/email/src/templates/emails/payment-success/html.twig b/workers/email/src/templates/emails/payment-success/html.twig index fe7c85f4f..83b0c3283 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..3c0f32202 100644 --- a/workers/email/src/templates/emails/payment-success/text.twig +++ b/workers/email/src/templates/emails/payment-success/text.twig @@ -1,15 +1,14 @@ -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 +Хоук +Мониторинг ошибок diff --git a/workers/email/src/templates/emails/several-events/html.twig b/workers/email/src/templates/emails/several-events/html.twig index 802f3b0dd..d4f69ad0f 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,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/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..40706688a 100644 --- a/workers/email/src/templates/emails/several-events/text.twig +++ b/workers/email/src/templates/emails/several-events/text.twig @@ -1,35 +1,30 @@ -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 }} +{% if eventData.event.payload.type %}{{ eventData.event.payload.type }}: {% endif %}{{ eventData.event.payload.title | escape }} -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 }} - -Hawk -Errors tracking system - -Made by CodeX - - - +Вы получили это письмо, потому что подписаны на подобные уведомления. Вы можете изменить настройки, перейдя по ссылке: {{ host }}/unsubscribe/{{ project._id }} +*** +Хоук +Мониторинг ошибок diff --git a/workers/email/src/templates/emails/sign-up/html.twig b/workers/email/src/templates/emails/sign-up/html.twig index f472f12b6..a45df094a 100644 --- a/workers/email/src/templates/emails/sign-up/html.twig +++ b/workers/email/src/templates/emails/sign-up/html.twig @@ -9,21 +9,24 @@ - 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?emailPrefilled=' ~ email, 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..37a1e2b0c 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?emailPrefilled=' ~ endpoint }} -Hawk -Errors tracking system +*** -Made by 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..30322511f 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 +Вас пригласили в воркспейс «{{workspaceName}}» \ 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..963107e65 100644 --- a/workers/email/src/templates/emails/workspace-invite/text.twig +++ b/workers/email/src/templates/emails/workspace-invite/text.twig @@ -1,12 +1,12 @@ -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 +Хоук +Мониторинг ошибок 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; } /**