Skip to content

Commit bc87e16

Browse files
committed
feat(condo): DOMA-9722 fixed error messages
1 parent 8d3a04c commit bc87e16

File tree

6 files changed

+102
-86
lines changed

6 files changed

+102
-86
lines changed

apps/condo/domains/user/constants/errors.js

+2
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,13 @@ const GQL_ERRORS = {
9090
code: 'BAD_USER_INPUT',
9191
type: SMS_FOR_PHONE_DAY_LIMIT_REACHED,
9292
message: 'Too many sms requests for this phone number. Try again tomorrow',
93+
messageForUser: 'api.user.SMS_FOR_PHONE_DAY_LIMIT_REACHED',
9394
},
9495
SMS_FOR_IP_DAY_LIMIT_REACHED: {
9596
code: 'BAD_USER_INPUT',
9697
type: SMS_FOR_IP_DAY_LIMIT_REACHED,
9798
message: 'Too many sms requests from this ip address. Try again tomorrow',
99+
messageForUser: 'api.user.SMS_FOR_IP_DAY_LIMIT_REACHED',
98100
},
99101
DAILY_REQUEST_LIMIT_FOR_IP_REACHED: {
100102
code: 'BAD_USER_INPUT',

apps/condo/lang/en/en.json

+28-26
Original file line numberDiff line numberDiff line change
@@ -375,15 +375,15 @@
375375
"api.meter.meter.METER_RESOURCE_OWNED_BY_ANOTHER_ORGANIZATION": "This resource is owned by another organization. Please contact tech support if you want to resolve this problem",
376376
"api.meter.meter.SAME_ACCOUNT_NUMBER_EXISTS_IN_OTHER_UNIT": "Meter with same account number exist in current organization in unit {unitsCsv}",
377377
"api.meter.meter.SAME_NUMBER_AND_RESOURCE_EXISTS_IN_ORGANIZATION": "Meter with same number and resource exist in current organization and linked with account number {accountNumbersCsv}. Please check your data.",
378-
"api.meter.meterReading.METER_READING_DATE_IN_FUTURE": "Reading date ({givenDate}) can not be from the future",
379-
"api.meter.meterReading.METER_READING_DATE_AFTER_NOTIFY_END": "The date of the meter reading ({givenDate}) must not be later than the end of the specified period for taking readings ({notifyEndDay} day of each month)",
380378
"api.meter.meterReading.METER_ARCHIVED": "It is not allowed to take readings on the device, which is in the archive",
381-
"api.meter.meterReading.METER_VERIFICATION_MISSED": "You cannot take readings on a device that has missed the verification date",
379+
"api.meter.meterReading.METER_READING_DATE_AFTER_NOTIFY_END": "The date of the meter reading ({givenDate}) must not be later than the end of the specified period for taking readings ({notifyEndDay} day of each month)",
380+
"api.meter.meterReading.METER_READING_DATE_IN_FUTURE": "Reading date ({givenDate}) can not be from the future",
382381
"api.meter.meterReading.METER_READING_EXTRA_VALUES": "Meter {meterNumber} has {numberOfTariffs} tariff(s), please remove next fields: {fieldsNames}",
383382
"api.meter.meterReading.METER_READING_FEW_VALUES": "Meter {meterNumber} has {numberOfTariffs} tariff(s), please fill next fields: {fieldsNames}",
383+
"api.meter.meterReading.METER_VERIFICATION_MISSED": "You cannot take readings on a device that has missed the verification date",
384384
"api.meter.meterReportingPeriod.INVALID_FINISH": "The \"finish\" field can take values in the range from 1 to 31",
385-
"api.meter.meterReportingPeriod.INVALID_START": "The \"start\" field can take values in the range from 1 to 31",
386385
"api.meter.meterReportingPeriod.INVALID_RESTRICTION_END_DAY": "The end of the restriction of taking readings can only take a value from 1 to 31",
386+
"api.meter.meterReportingPeriod.INVALID_START": "The \"start\" field can take values in the range from 1 to 31",
387387
"api.meter.meterReportingPeriod.ORGANIZATION_IS_REQUIRED": "Organization is required for create meter reading reporting period",
388388
"api.meter.meterReportingPeriod.PROPERTY_NOT_FOUND": "There is no such property in the organization",
389389
"api.meter.registerMetersReadings.INVALID_ACCOUNT_NUMBER": "Account number field is filled incorrectly",
@@ -478,6 +478,8 @@
478478
"api.user.PASSWORD_CONTAINS_EMAIL": "Password must not contain email",
479479
"api.user.PASSWORD_CONTAINS_PHONE": "Password must not contain phone",
480480
"api.user.PASSWORD_IS_FREQUENTLY_USED": "This password is weak or too obvious please choose something more secure",
481+
"api.user.SMS_FOR_IP_DAY_LIMIT_REACHED": "Too many sms requests. Try again tomorrow",
482+
"api.user.SMS_FOR_PHONE_DAY_LIMIT_REACHED": "Too many sms requests for this phone number. Try again tomorrow",
481483
"api.user.TOO_MANY_REQUESTS": "You have to wait {secondsRemaining} sec. to be able to send request again",
482484
"api.user.TOTAL_REQUEST_LIMIT_FOR_EMAIL_REACHED": "Too many requests with this email. Try again later",
483485
"api.user.TOTAL_REQUEST_LIMIT_FOR_PHONE_REACHED": "Too many requests with this phone. Try again later",
@@ -631,6 +633,7 @@
631633
"callRecord.table.column.startedAt": "Date and time",
632634
"callRecord.table.column.talkTime": "Talk time",
633635
"callRecord.table.column.ticketNumber": "Ticket number",
636+
"common.consentToReceiveMarketingMaterials": "I agree to receive materials about home management, discounts and news from the Domá platform",
634637
"component.CookieAgreement.action.accept": "Accept",
635638
"component.CookieAgreement.action.expand": "Read more",
636639
"component.CookieAgreement.description": "DOMA LLC uses cookies to personalize services and user convenience. Cookies allow you to log in without re-entering your username and password. You can delete cookies or opt out of using them in your browser settings.",
@@ -1149,10 +1152,6 @@
11491152
"import.meter.plural": "Meters and readings",
11501153
"import.meter.prepositional": "Meter readings",
11511154
"import.meter.requiredFields": "Specify address, premises and its type, personal account number, meter type, meter number, number of tariffs and date of transmission of readings",
1152-
"import.propertyMeter.genitive": "Property meter readings",
1153-
"import.propertyMeter.plural": "Property meters",
1154-
"import.propertyMeter.prepositional": "Property meter readings",
1155-
"import.propertyMeter.requiredFields": "Specify address, meter type, number of tariffs and date of transmission of the meter readings",
11561155
"import.meterReading.plural": "Meter readings",
11571156
"import.partlyDataLoadedModal.alert.description": "You can try to add or create a table from this data and try to download again",
11581157
"import.partlyDataLoadedModal.alert.message": "It has become possible to add {success} of {total} {genitive}",
@@ -1163,6 +1162,10 @@
11631162
"import.property.genitive": "Properties",
11641163
"import.property.plural": "Properties",
11651164
"import.property.requiredFields": "Specify the address and number of units, entrances and floors",
1165+
"import.propertyMeter.genitive": "Property meter readings",
1166+
"import.propertyMeter.plural": "Property meters",
1167+
"import.propertyMeter.prepositional": "Property meter readings",
1168+
"import.propertyMeter.requiredFields": "Specify address, meter type, number of tariffs and date of transmission of the meter readings",
11661169
"import.successModal.buttonLabel": "Continue",
11671170
"import.successModal.title": "Everything worked out - data downloaded",
11681171
"import.ticket.genitive": "Tickets",
@@ -1486,6 +1489,7 @@
14861489
"notification.messages.BILLING_RECEIPT_CATEGORY_AVAILABLE.email.subject": "New utility bill",
14871490
"notification.messages.BILLING_RECEIPT_CATEGORY_AVAILABLE.push.title": "New utility bill",
14881491
"notification.messages.BILLING_RECEIPT_FILE_ADDED.email.subject": "{data.organization}. New billing receipt",
1492+
"notification.messages.CANCELED_CALL_MESSAGE_PUSH.push.title": "{title}",
14891493
"notification.messages.CUSTOMER_IMPORTANT_NOTE_TYPE.email.subject": "New organization. (SBBOL)",
14901494
"notification.messages.CUSTOMER_IMPORTANT_NOTE_TYPE.push.title": "New organization. (SBBOL)",
14911495
"notification.messages.CUSTOM_CONTENT_MESSAGE.email.subject": "{subject}",
@@ -1578,9 +1582,9 @@
15781582
"notification.messages.TICKET_STATUS_RETURNED.email.subject": "Hi, it's Doma! 🦖",
15791583
"notification.messages.TICKET_STATUS_RETURNED.push.title": "Ticket is open 💡",
15801584
"notification.messages.VOIP_INCOMING_CALL_MESSAGE.push.title": "{title}",
1581-
"notification.messages.CANCELED_CALL_MESSAGE_PUSH.push.title": "{title}",
15821585
"onboarding.tourStep.tooltip.ticket.message": "Make sure the information is correct and create an ticket",
15831586
"onboarding.tourStep.tooltip.ticket.title": "Multiple fields filled automatically",
1587+
"page.auth.register.inputPhone.submit": "Continue",
15841588
"pages.auth.AlreadyRegistered": "Already registered",
15851589
"pages.auth.ChangePasswordTitle": "Change password",
15861590
"pages.auth.ChangePasswordTokenErrorConfirmLabel": "Reset password",
@@ -1632,12 +1636,10 @@
16321636
"pages.auth.register.field.Name": "Name",
16331637
"pages.auth.register.field.Password": "Password",
16341638
"pages.auth.register.field.Phone": "Phone",
1635-
"page.auth.register.inputPhone.submit": "Continue",
1636-
"common.consentToReceiveMarketingMaterials": "I agree to receive materials about home management, discounts and news from the Domá platform",
1637-
"pages.auth.register.info.dataProcessingContent": "data processing",
16381639
"pages.auth.register.info.PersonalDataProcessingConsent": "By continuing to log in, you agree to {termsOfUse}, {privacyPolicyLink} and {consentLink}",
16391640
"pages.auth.register.info.PrivacyPolicyContent": "privacy policy",
16401641
"pages.auth.register.info.RecaptchaPrivacyPolicyContent": "This site is protected by reCAPTCHA and the Google {PrivacyPolicy} and {TermsOfService} apply.",
1642+
"pages.auth.register.info.dataProcessingContent": "data processing",
16411643
"pages.auth.register.info.termsOfService": "Terms of Service",
16421644
"pages.auth.register.info.termsOfUseContent": "the terms of use",
16431645
"pages.auth.register.step.inputPhone.title": "Registration",
@@ -2148,16 +2150,16 @@
21482150
"pages.condo.meter.reportingPeriod.create.incorrectPeriod": "Finish must be greater than start",
21492151
"pages.condo.meter.reportingPeriod.create.inputPostfix": "date of each month inclusive",
21502152
"pages.condo.meter.reportingPeriod.create.organizationPeriod": "For all properties",
2151-
"pages.condo.meter.reportingPeriod.create.settings.title": "Restrictions setup",
2152-
"pages.condo.meter.reportingPeriod.create.settings.periodType.strict": "Until the end of the period",
2153-
"pages.condo.meter.reportingPeriod.create.settings.periodType.notStrict": "Without restrictions",
2154-
"pages.condo.meter.reportingPeriod.create.settings.periodType": "Allow to take readings",
2153+
"pages.condo.meter.reportingPeriod.create.organizationTooltip": "This period will apply to all properties that do not have a period with a specific address",
2154+
"pages.condo.meter.reportingPeriod.create.save.button": "Create period",
2155+
"pages.condo.meter.reportingPeriod.create.settings.alert": "Residents will receive a notification about the time limit for taking readings",
21552156
"pages.condo.meter.reportingPeriod.create.settings.notStrict.tooltip": "When the period ends, residents will be able to take readings, but they will see a notification that they will be taken into account next month",
2157+
"pages.condo.meter.reportingPeriod.create.settings.periodType": "Allow to take readings",
2158+
"pages.condo.meter.reportingPeriod.create.settings.periodType.notStrict": "Without restrictions",
2159+
"pages.condo.meter.reportingPeriod.create.settings.periodType.strict": "Until the end of the period",
21562160
"pages.condo.meter.reportingPeriod.create.settings.strict.tooltip": "No readings will be accepted after the {notifyEndDay} date and until the end of the month. Residents will be able to turn them in from the 1st of next month",
21572161
"pages.condo.meter.reportingPeriod.create.settings.strictPeriodRestricted.tooltip": "With this setting, residents cannot transmit readings after the end of the period and before the beginning of the next month. You have specified a deadline that starts in one month and ends in the next, so you will not be able to set a limit.",
2158-
"pages.condo.meter.reportingPeriod.create.settings.alert": "Residents will receive a notification about the time limit for taking readings",
2159-
"pages.condo.meter.reportingPeriod.create.save.button": "Create period",
2160-
"pages.condo.meter.reportingPeriod.create.organizationTooltip": "This period will apply to all properties that do not have a period with a specific address",
2162+
"pages.condo.meter.reportingPeriod.create.settings.title": "Restrictions setup",
21612163
"pages.condo.meter.reportingPeriod.create.start": "Beginning of period",
21622164
"pages.condo.meter.reportingPeriod.update.ConfirmDeleteMessage": "The period will be permanently deleted.",
21632165
"pages.condo.meter.reportingPeriod.update.ConfirmDeleteTitle": "Delete period?",
@@ -2314,6 +2316,8 @@
23142316
"pages.condo.property.index.TableField.UninhabitedUnitsCount": "Uninhabited units",
23152317
"pages.condo.property.index.TableField.UnitsCount": "Flats",
23162318
"pages.condo.property.index.UpdatePropertyTitle": "Update",
2319+
"pages.condo.property.info.alert.ReportingPeriodForOrganization.description": "Previously, the period was selected for all houses. It can be changed in the «Meter reporting period» section after the creation of the house.",
2320+
"pages.condo.property.info.alert.ReportingPeriodForOrganization.message": "The reading period is set up automatically — from {notifyStartDay} to {notifyEndDay}",
23172321
"pages.condo.property.map.modal.errorLoadingContacts": "Failed to load residents",
23182322
"pages.condo.property.map.modal.goToContacts": "To contact info",
23192323
"pages.condo.property.map.modal.noContacts": "No residents have been added to this property in the platform yet.",
@@ -2388,8 +2392,6 @@
23882392
"pages.condo.property.type.village": "Village",
23892393
"pages.condo.property.unit.Name": "Name",
23902394
"pages.condo.property.warning.modal.AddressValidationErrorMsg": "It doesn't look like a house address. Check if you have specified everything correctly.",
2391-
"pages.condo.property.info.alert.ReportingPeriodForOrganization.description": "Previously, the period was selected for all houses. It can be changed in the «Meter reporting period» section after the creation of the house.",
2392-
"pages.condo.property.info.alert.ReportingPeriodForOrganization.message": "The reading period is set up automatically — from {notifyStartDay} to {notifyEndDay}",
23932395
"pages.condo.property.warning.modal.HelpMessage": "Unsaved information about this property will be lost if you leave this page. You can save the information or continue to edit by closing this modal window.",
23942396
"pages.condo.property.warning.modal.SameParkingPlaceNamesErrorMsg": "Parking place names must be unique",
23952397
"pages.condo.property.warning.modal.SamePropertyErrorMsg": "Property with this address has already been added to the organization",
@@ -2888,18 +2890,18 @@
28882890
"tasks.MeterReadingsImportTask.progress.description.preparing": "Preparing to import meter readings",
28892891
"tasks.MeterReadingsImportTask.progress.description.processing": "Meter readings processed: {imported} of {total}",
28902892
"tasks.MeterReadingsImportTask.progress.title": "Import meter readings",
2893+
"tasks.NewsItemRecipientsExportTask.progress.description.completed": "File has been created",
2894+
"tasks.NewsItemRecipientsExportTask.progress.description.completed.link.label": "Download",
2895+
"tasks.NewsItemRecipientsExportTask.progress.description.preparing": "Preparing for export",
2896+
"tasks.NewsItemRecipientsExportTask.progress.description.processing": "Recipients exported: {exported} from {total}",
2897+
"tasks.NewsItemRecipientsExportTask.progress.title": "Exporting news item recipients",
28912898
"tasks.PropertyMeterReadingsImportTask.progress.description.completed": "File has been created, please refresh the page",
28922899
"tasks.PropertyMeterReadingsImportTask.progress.description.completed.link.label": "Download",
28932900
"tasks.PropertyMeterReadingsImportTask.progress.description.error": "File not imported. {errorMessage}",
28942901
"tasks.PropertyMeterReadingsImportTask.progress.description.partiallyCompleted": "File partially imported. Fix errors and upload broken records again",
28952902
"tasks.PropertyMeterReadingsImportTask.progress.description.preparing": "Preparing to import meter readings",
28962903
"tasks.PropertyMeterReadingsImportTask.progress.description.processing": "Meter readings processed: {imported} of {total}",
28972904
"tasks.PropertyMeterReadingsImportTask.progress.title": "Import property meter readings",
2898-
"tasks.NewsItemRecipientsExportTask.progress.description.completed": "File has been created",
2899-
"tasks.NewsItemRecipientsExportTask.progress.description.completed.link.label": "Download",
2900-
"tasks.NewsItemRecipientsExportTask.progress.description.preparing": "Preparing for export",
2901-
"tasks.NewsItemRecipientsExportTask.progress.description.processing": "Recipients exported: {exported} from {total}",
2902-
"tasks.NewsItemRecipientsExportTask.progress.title": "Exporting news item recipients",
29032905
"tasks.TicketDocumentGenerationTask.progress.description.completed": "File has been created",
29042906
"tasks.TicketDocumentGenerationTask.progress.description.completed.link.label": "Download",
29052907
"tasks.TicketDocumentGenerationTask.progress.description.processing": "Preparing for download",

0 commit comments

Comments
 (0)