From dd8a8ddd53ff0e788dd1dcf430528cb457aa4407 Mon Sep 17 00:00:00 2001 From: SDE Date: Wed, 21 Feb 2024 17:12:45 +0300 Subject: [PATCH 1/2] 0.12.26 get_phone_valid_error change --- BaseModels/validators/form_field_validators.py | 2 +- ChatServiceApp/js_views.py | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/BaseModels/validators/form_field_validators.py b/BaseModels/validators/form_field_validators.py index a364ca8..dfb2c3a 100644 --- a/BaseModels/validators/form_field_validators.py +++ b/BaseModels/validators/form_field_validators.py @@ -3,7 +3,7 @@ from django.utils.safestring import mark_safe def get_phone_valid_error(val): allow_chars = '01234567890()+ -' - error_msg = mark_safe(_('Некорректные символы в номере телефона,
пример корректного ввода +7 925 8600100')) + error_msg = mark_safe(_('Некорректные символы в номере, введите номер в международном формате с кодом страны')) if not val: return None diff --git a/ChatServiceApp/js_views.py b/ChatServiceApp/js_views.py index 596d4f4..2ac0275 100644 --- a/ChatServiceApp/js_views.py +++ b/ChatServiceApp/js_views.py @@ -516,9 +516,11 @@ def create_ticket_ajax(request): except Exception as e: + msg = f'{_("ошибка в запросе")} = {str(e)}' + errors_Dict = { 'errors': { - 'all__': f'{_("ошибка в запросе")} = {str(e)}' + 'all__': msg } } Dict = {'form': errors_Dict} From 4331b265429577bc71303a4aa1574191057168c3 Mon Sep 17 00:00:00 2001 From: ArtemB Date: Thu, 22 Feb 2024 18:54:15 +0300 Subject: [PATCH 2/2] 0.1.362 fix language bug redirect to main page --- templates/blocks/b_header.html | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/templates/blocks/b_header.html b/templates/blocks/b_header.html index 4a7c857..0f2373f 100644 --- a/templates/blocks/b_header.html +++ b/templates/blocks/b_header.html @@ -6,10 +6,13 @@
- +{# #} +