From 7e2ffc6dbb7e9a01a82ea40f843af820dedb2feb Mon Sep 17 00:00:00 2001 From: maria-hambardzumian Date: Thu, 20 Jun 2024 17:38:54 +0400 Subject: [PATCH 1/3] EPMRPP-91774 || Modal windows should have notification type in the title --- .../addEditNotificationModal/addEditNotificationModal.jsx | 4 +++- .../notifications/modals/addEditNotificationModal/util.js | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 app/src/pages/inside/projectSettingsPageContainer/content/notifications/modals/addEditNotificationModal/util.js diff --git a/app/src/pages/inside/projectSettingsPageContainer/content/notifications/modals/addEditNotificationModal/addEditNotificationModal.jsx b/app/src/pages/inside/projectSettingsPageContainer/content/notifications/modals/addEditNotificationModal/addEditNotificationModal.jsx index fa23b8cab9..6fad743861 100644 --- a/app/src/pages/inside/projectSettingsPageContainer/content/notifications/modals/addEditNotificationModal/addEditNotificationModal.jsx +++ b/app/src/pages/inside/projectSettingsPageContainer/content/notifications/modals/addEditNotificationModal/addEditNotificationModal.jsx @@ -40,6 +40,7 @@ import { RadioGroup } from 'componentLibrary/radioGroup'; import { EMAIL } from 'common/constants/pluginNames'; import { FieldTextFlex } from 'componentLibrary/fieldTextFlex'; import { ruleField } from 'pages/inside/projectSettingsPageContainer/content/notifications/propTypes'; +import { capitalizeWord } from 'pages/inside/projectSettingsPageContainer/content/notifications/modals/addEditNotificationModal/util'; import { RecipientsContainer } from './recipientsContainer'; import { LaunchNamesContainer } from './launchNamesContainer'; import { @@ -70,7 +71,7 @@ const cx = className.bind(styles); const messages = defineMessages({ title: { id: 'AddEditNotificationCaseModal.title', - defaultMessage: '{actionType} Notification Rule', + defaultMessage: '{actionType} {pluginType} Notification Rule', }, description: { id: 'AddEditNotificationCaseModal.description', @@ -323,6 +324,7 @@ const AddEditNotificationModal = ({ word.charAt(0).toUpperCase() + word.slice(1).toLowerCase(); From 3e7214297e68c0c9d27eb1c5676d0422477080db Mon Sep 17 00:00:00 2001 From: maria-hambardzumian Date: Thu, 20 Jun 2024 17:46:56 +0400 Subject: [PATCH 2/3] EPMRPP-91775 || Incorrect error text on trying to create a rule --- app/src/components/fields/fieldErrorHint/fieldErrorHint.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/components/fields/fieldErrorHint/fieldErrorHint.jsx b/app/src/components/fields/fieldErrorHint/fieldErrorHint.jsx index 2ff1907696..0a9a5f3d67 100644 --- a/app/src/components/fields/fieldErrorHint/fieldErrorHint.jsx +++ b/app/src/components/fields/fieldErrorHint/fieldErrorHint.jsx @@ -226,7 +226,7 @@ const messages = defineMessages({ }, ruleNameDuplicateHint: { id: 'Notifications.ruleNameDuplicateHint', - defaultMessage: 'Rule with the same name already exist on the project', + defaultMessage: 'Rule with the same name already exists for this communication channel', }, customColumnsDuplicationHint: { id: 'ProductStatusControls.customColumnsDuplicationHint', From 48b0485e764cf6c74926bfbd616e8cb7bcfe2760 Mon Sep 17 00:00:00 2001 From: maria-hambardzumian Date: Thu, 20 Jun 2024 17:59:17 +0400 Subject: [PATCH 3/3] EPMRPP-91775 || Translations --- app/localization/translated/be.json | 10 +++++----- app/localization/translated/ru.json | 10 +++++----- app/localization/translated/uk.json | 10 +++++----- app/localization/translated/zh.json | 10 +++++----- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/app/localization/translated/be.json b/app/localization/translated/be.json index a559078f96..fba0ed387c 100644 --- a/app/localization/translated/be.json +++ b/app/localization/translated/be.json @@ -563,16 +563,12 @@ "DeleteFilterDialog.deleteFilterOwnerWarning": "Вы збіраецеся выдаліць не свой фільтр. Гэта можа паўплываць на інфармацыю іншых карыстальнікаў праекта.", "DeleteImageModal.header": "Выдаліць фота", "DeleteImageModal.text": "Вы ўпэўненыя, што жадаеце выдаліць фота профілю?", - "DeleteLaunchModal.deleteImportantLaunch": "Выдаліць важны запуск", "DeleteLaunchModal.deleteImportantLaunchMessage": "”{name}” пазначан як важны.
Вы ўпэўнены, што хочаце выдаліць гэты важны запуск?", - "DeleteLaunchModal.deleteImportantLaunches": "Выдаліць важныя запускі", "DeleteLaunchModal.deleteImportantLaunchesMessage": "Ёсць {importantCount} запускаў, пазначаных як важныя.
Вы ўпэўнены, што хочаце выдаліць гэтыя важныя запускі?", "DeleteLaunchModal.deleteModalContent": "Вы ўпэўненыя, што хочаце выдаліць запуск '{name}'? Вы страціце доступ да яго.", "DeleteLaunchModal.deleteModalHeader": "Выдаліць запуск", "DeleteLaunchModal.deleteModalMultipleContent": "Вы ўпэўненыя, што хочаце выдаліць запускі? Вы страціце доступ да іх.", "DeleteLaunchModal.deleteModalMultipleHeader": "Выдаліць запускі", - "DeleteLaunchModal.deleteOnlyRegular": "Выдаляць толькі звычайныя", - "DeleteLaunchModal.deleteWithImportantLaunch": "Выдаліць з важнымі запускамі", "DeleteLaunchModal.deleteWithImportantLaunchMessage": "Запуск \"{name}\" пазначаны як важны.
Вы ўпэўнены, што хочаце таксама выдаліць гэтыя важныя запускі?", "DeleteLaunchModal.deleteWithImportantLaunchesMessage": "Ёсць {importantCount} запускаў, пазначаных як важныя сярод {totalCount} запускаў, якія вы спрабуеце выдаліць. Вы ўпэўнены, што хочаце таксама выдаліць гэтыя важныя запускі?", "DeleteLaunchModal.warning": "Вы збіраецеся выдаліць не свой запуск. Гэта можа паўплываць на інфармацыю іншых карыстальнікаў праекта.", @@ -851,6 +847,10 @@ "Footer.build": "Зборка", "Footer.contact": "Звяжыцеся з намі", "Footer.copyright": "Усе правы абаронены.", + "Footer.deleteImportantLaunch": "Delete Important Launch", + "Footer.deleteImportantLaunches": "Delete Important Launches", + "Footer.deleteOnlyRegular": "Delete only regular", + "Footer.deleteWithImportantLaunch": "Delete with Important Launches", "Footer.documentation": "Дакументацыя", "Footer.git": "Мы на GitHub", "Footer.privacy": "Палітыка прыватнасці", @@ -1491,7 +1491,7 @@ "NotificationRule.launchNameLabel": "Імя запуску", "NotificationRule.launchOwner": "Уласнік запуску", "Notifications.notifications": "Апавяшчэнні па электроннай пошце", - "Notifications.ruleNameDuplicateHint": "Правіла з такой жа назвай ужо існуе ў праекце", + "Notifications.ruleNameDuplicateHint": "Для гэтага канала сувязі ўжо існуе правіла з такім жа імем", "Notifications.updateEmail": "абноўлены", "NotificationsEnableForm.allNotifications": "Усе апавяшчэнні", "NotificationsEnableForm.attributes": "Атрыбуты", diff --git a/app/localization/translated/ru.json b/app/localization/translated/ru.json index 4f38ea4aad..8d7699fa7a 100644 --- a/app/localization/translated/ru.json +++ b/app/localization/translated/ru.json @@ -563,16 +563,12 @@ "DeleteFilterDialog.deleteFilterOwnerWarning": "Вы собираетесь удалить не свой фильтр. Это может повлиять на информацию других пользователей проекта.", "DeleteImageModal.header": "Удалить фото", "DeleteImageModal.text": "Вы уверены, что хотите удалить фото профиля?", - "DeleteLaunchModal.deleteImportantLaunch": "Удалить важный запуск", "DeleteLaunchModal.deleteImportantLaunchMessage": "”{name}” отмечен как важный.
Вы уверены, что хотите удалить этот важный запуск?", - "DeleteLaunchModal.deleteImportantLaunches": "Удалить важные запуски", "DeleteLaunchModal.deleteImportantLaunchesMessage": "{importantCount} запусков, отмеченных как важные.
Вы уверены, что хотите удалить эти важные запуски?", "DeleteLaunchModal.deleteModalContent": "Вы уверены, что хотите удалить запуск '{name}'? Вы потеряете доступ к нему.", "DeleteLaunchModal.deleteModalHeader": "Удалить запуск", "DeleteLaunchModal.deleteModalMultipleContent": "Вы уверены, что хотите удалить запуски? Вы потеряете доступ к ним.", "DeleteLaunchModal.deleteModalMultipleHeader": "Удалить запуски", - "DeleteLaunchModal.deleteOnlyRegular": "Удалить только обычные", - "DeleteLaunchModal.deleteWithImportantLaunch": "Удалить с важными запусками", "DeleteLaunchModal.deleteWithImportantLaunchMessage": "\"{name}\" запуск отмечен как важный.
Вы уверены, что хотите удалить и эти важные запуски?", "DeleteLaunchModal.deleteWithImportantLaunchesMessage": "{importantCount} запусков отмечены как важные среди {totalCount} запусков, которые вы пытаетесь удалить. Вы уверены, что хотите удалить эти важные запуски тоже?", "DeleteLaunchModal.warning": "Вы собираетесь удалить не свой запуск. Это может повлиять на информацию других пользователей проекта.", @@ -851,6 +847,10 @@ "Footer.build": "Сборка", "Footer.contact": "Свяжитесь с нами", "Footer.copyright": "Все права защищены", + "Footer.deleteImportantLaunch": "Delete Important Launch", + "Footer.deleteImportantLaunches": "Delete Important Launches", + "Footer.deleteOnlyRegular": "Delete only regular", + "Footer.deleteWithImportantLaunch": "Delete with Important Launches", "Footer.documentation": "Документация", "Footer.git": "Мы на GitHub", "Footer.privacy": "Политика конфиденциальности", @@ -1491,7 +1491,7 @@ "NotificationRule.launchNameLabel": "Название запуска", "NotificationRule.launchOwner": "Владелец запуска", "Notifications.notifications": "Уведомления по электронной почте", - "Notifications.ruleNameDuplicateHint": "Правило с таким названием уже существует в проекте", + "Notifications.ruleNameDuplicateHint": "Правило с таким названием уже существует для этого канала связи", "Notifications.updateEmail": "обновлено", "NotificationsEnableForm.allNotifications": "Все уведомления", "NotificationsEnableForm.attributes": "Атрибуты", diff --git a/app/localization/translated/uk.json b/app/localization/translated/uk.json index 1b5e6f6e09..8547c2596c 100644 --- a/app/localization/translated/uk.json +++ b/app/localization/translated/uk.json @@ -563,16 +563,12 @@ "DeleteFilterDialog.deleteFilterOwnerWarning": "Ви збираєтеся видалити свій фільтр. Це може вплинути на інформацію інших користувачів проекту.", "DeleteImageModal.header": "Фото Видалити", "DeleteImageModal.text": "Ви впевнені, що хочете видалити фото профілю?", - "DeleteLaunchModal.deleteImportantLaunch": "Видалити важливий запуск", "DeleteLaunchModal.deleteImportantLaunchMessage": "”{name}” позначений як важливий.
Ви впевнені, що хочете видалити цей важливий запуск?", - "DeleteLaunchModal.deleteImportantLaunches": "Видалення важливих запусків", "DeleteLaunchModal.deleteImportantLaunchesMessage": "{importantCount} запусків, позначених як важливі.
Ви впевнені, що хочете видалити ці важливі запуски?", "DeleteLaunchModal.deleteModalContent": "Вы уверены, что хотите удалить запуск '{name}'? Вы потеряете доступ к нему.", "DeleteLaunchModal.deleteModalHeader": "Видалити запуск", "DeleteLaunchModal.deleteModalMultipleContent": "Ви впевнені, що хочете видалити запуски? Ви втратите доступ до них.", "DeleteLaunchModal.deleteModalMultipleHeader": "Видалити запуски", - "DeleteLaunchModal.deleteOnlyRegular": "Видаляти тільки звичайні", - "DeleteLaunchModal.deleteWithImportantLaunch": "Видалити з важливими запусками", "DeleteLaunchModal.deleteWithImportantLaunchMessage": "\"{name}\" запуск позначений як важливий..
Ви впевнені, що хочете також видалити ці важливі запуски?", "DeleteLaunchModal.deleteWithImportantLaunchesMessage": "{importantCount} запусків позначено як важливі серед {totalCount} запусків, які ви намагаєтеся видалити. Ви впевнені, що хочете також видалити ці важливі запуски?", "DeleteLaunchModal.warning": "Ви збираєтеся видалити свій запуск. Це може вплинути на інформацію інших користувачів проекту.", @@ -851,6 +847,10 @@ "Footer.build": "Збірка", "Footer.contact": "Зв’яжіться з нами", "Footer.copyright": "Всі права захищені", + "Footer.deleteImportantLaunch": "Delete Important Launch", + "Footer.deleteImportantLaunches": "Delete Important Launches", + "Footer.deleteOnlyRegular": "Delete only regular", + "Footer.deleteWithImportantLaunch": "Delete with Important Launches", "Footer.documentation": "Документація", "Footer.git": "Ми на Гітхабі", "Footer.privacy": "Політика конфіденційності", @@ -1491,7 +1491,7 @@ "NotificationRule.launchNameLabel": "Назва запуску", "NotificationRule.launchOwner": "Власник запуску", "Notifications.notifications": "Повідомлення електронною поштою", - "Notifications.ruleNameDuplicateHint": "Правило з такою ж назвою вже існує в проекті", + "Notifications.ruleNameDuplicateHint": "Правило з такою назвою вже існує для цього каналу зв’язку", "Notifications.updateEmail": "оновлено", "NotificationsEnableForm.allNotifications": "Усі сповіщення", "NotificationsEnableForm.attributes": "Атрибути", diff --git a/app/localization/translated/zh.json b/app/localization/translated/zh.json index b423916164..cc9d7c52c6 100644 --- a/app/localization/translated/zh.json +++ b/app/localization/translated/zh.json @@ -563,16 +563,12 @@ "DeleteFilterDialog.deleteFilterOwnerWarning": "您要删除的过滤器不属于您。这可能会影响项目上的其他用户信息。", "DeleteImageModal.header": "删除图片", "DeleteImageModal.text": "您确定要删除简介照片吗？", - "DeleteLaunchModal.deleteImportantLaunch": "Delete Important Launch", "DeleteLaunchModal.deleteImportantLaunchMessage": "”{name}” is marked as important.
Are you sure you want to delete this important launch?", - "DeleteLaunchModal.deleteImportantLaunches": "Delete Important Launches", "DeleteLaunchModal.deleteImportantLaunchesMessage": "There are {importantCount} launches marked as important.
Are you sure you want to delete these important launches?", "DeleteLaunchModal.deleteModalContent": "您确定要删除测试任务“{name}”吗？它将被永久删除。", "DeleteLaunchModal.deleteModalHeader": "删除测试任务", "DeleteLaunchModal.deleteModalMultipleContent": "您确定要删除这些测试任务吗？它们将被永久删除。", "DeleteLaunchModal.deleteModalMultipleHeader": "删除测试任务", - "DeleteLaunchModal.deleteOnlyRegular": "Delete only regular", - "DeleteLaunchModal.deleteWithImportantLaunch": "Delete with Important Launches", "DeleteLaunchModal.deleteWithImportantLaunchMessage": "There is \"{name}\" launch marked as important.
Are you sure you want to delete these important launches also?", "DeleteLaunchModal.deleteWithImportantLaunchesMessage": "There are {importantCount} launches marked as important among the {totalCount} launches you are trying to delete. Are you sure you want to delete these important launches also?", "DeleteLaunchModal.warning": "您要删除的测试任务不属于您。这可能会影响项目上的其他用户信息。", @@ -851,6 +847,10 @@ "Footer.build": "构建", "Footer.contact": "联系我们", "Footer.copyright": "版权所有", + "Footer.deleteImportantLaunch": "Delete Important Launch", + "Footer.deleteImportantLaunches": "Delete Important Launches", + "Footer.deleteOnlyRegular": "Delete only regular", + "Footer.deleteWithImportantLaunch": "Delete with Important Launches", "Footer.documentation": "文档", "Footer.git": "在GitHub上基于我们的代码创建分叉（Fork）", "Footer.privacy": "隐私政策", @@ -1491,7 +1491,7 @@ "NotificationRule.launchNameLabel": "测试任务名称", "NotificationRule.launchOwner": "测试任务负责人", "Notifications.notifications": "电子邮件通知", - "Notifications.ruleNameDuplicateHint": "项目中已存在同名规则", + "Notifications.ruleNameDuplicateHint": "此通信渠道已存在同名规则", "Notifications.updateEmail": "更新成功", "NotificationsEnableForm.allNotifications": "所有通知", "NotificationsEnableForm.attributes": "属性",