From c660d8cb72a39036db759199d97c7fe8d102601e Mon Sep 17 00:00:00 2001 From: ArtemB Date: Tue, 21 Nov 2023 18:29:02 +0300 Subject: [PATCH] =?UTF-8?q?0.0.247=20add=20translate=20for=20words=20with?= =?UTF-8?q?=20letter=20=D0=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- static/css/mobile_styles.css | 8 ++- static/css/styles(boris).css | 3 +- static/css/styles.css | 12 +++- static/js/user_profile.js | 46 ++++++------ templates/blocks/b_finded_routes.html | 1 + templates/blocks/b_footer.html | 8 +-- templates/blocks/b_header.html | 34 ++++----- .../profile/b_buttons_menu_profile.html | 33 ++++++--- templates/blocks/profile/b_chats.html | 5 +- templates/blocks/profile/b_create_ticket.html | 12 +++- .../profile/b_list_of_users_messenger.html | 3 +- templates/blocks/profile/b_new_route.html | 9 ++- templates/blocks/profile/b_profile.html | 23 +++--- .../blocks/profile/b_profile_first_page.html | 13 ++-- .../blocks/profile/b_subscribe_current.html | 21 +++--- .../blocks/profile/b_subscribe_variants.html | 12 ++-- templates/blocks/profile/b_support_chat.html | 5 +- .../blocks/profile/b_support_tickets.html | 9 +-- .../static_pages_blocks/b_mover_search.html | 4 +- .../forms/f_find_route_filters_form.html | 19 ++--- .../f_find_route_form_main_find_routes.html | 15 ++-- templates/forms/f_login.html | 70 ++++++++++--------- templates/forms/f_registration.html | 24 ++++--- templates/pages/p_article.html | 2 +- templates/pages/p_articles.html | 2 +- templates/pages/p_results_find_route.html | 5 +- .../carrier_card/inf_about_moving.html | 13 ++-- templates/widgets/w_request_tech_support.html | 3 +- templates/widgets/w_route_info.html | 12 ++-- templates/widgets/w_tickets_w_manager.html | 3 +- templates/widgets/w_tickets_wo_manager.html | 3 +- 31 files changed, 250 insertions(+), 182 deletions(-) diff --git a/static/css/mobile_styles.css b/static/css/mobile_styles.css index 809f96f..36138fc 100644 --- a/static/css/mobile_styles.css +++ b/static/css/mobile_styles.css @@ -447,7 +447,7 @@ max-width: 290px; } .button_register>button{ - width: 109%; + width: 100%; } #request_btn{ @@ -481,7 +481,7 @@ } .inputs>div>input{ - width: 96%; + width: 100%; } .agree>div:last-child{ @@ -1651,6 +1651,10 @@ line-height: 30px; } + summary:before{ + right: 10px; + } + diff --git a/static/css/styles(boris).css b/static/css/styles(boris).css index 09ca78a..17aebe0 100644 --- a/static/css/styles(boris).css +++ b/static/css/styles(boris).css @@ -2607,6 +2607,7 @@ aspect-ratio: 4/3; height: 225px; object-fit: cover; + border-radius: 10px; } .cont_content_one_news{ @@ -2627,7 +2628,7 @@ width: 100%; overflow-wrap: break-word; font-weight: 600; - padding-bottom: 20px; + padding: 20px 0; } /* checkbox type transport*/ diff --git a/static/css/styles.css b/static/css/styles.css index 76eeeea..0bab188 100644 --- a/static/css/styles.css +++ b/static/css/styles.css @@ -329,6 +329,11 @@ footer>div { .social_media_footer { margin-top: 19px; } +.social_media_footer>img { + margin-right: 10px; +} + + @@ -837,7 +842,7 @@ section.register>form { display: block; /* Body text 3 */ height: 60px; - width: 105%; + width: 101%; background: #FF613A; color: #FFF; /* Heading 5 */ @@ -2190,6 +2195,7 @@ button#more_button{ .button_container{ text-align: -webkit-center; + text-align: -moz-center; width: 100%; margin-top: 40px; } @@ -2621,8 +2627,8 @@ summary { margin: 10px 0 10px 0px; } summary:before { - top: .4em; - right: .3em; + top: 10px; + right: 20px; color: transparent; background: url(/static/img/svg/icon_cross.svg) no-repeat 50% 50% / 1em 1em; width: 1em; diff --git a/static/js/user_profile.js b/static/js/user_profile.js index e0aa2b3..cf42b84 100644 --- a/static/js/user_profile.js +++ b/static/js/user_profile.js @@ -760,29 +760,29 @@ function showLang(el) { // // } -function checkDate() { - let dateDeparture = document.getElementById('id_departure_DT'); - let dateArrival = document.getElementById('id_arrival_DT'); - let DateStart = new Date(dateDeparture.value); - let DateEnd = new Date(dateArrival.value); - if (DateEnd < DateStart) { - - // alert("End date cannot be less than Start date."); - dateArrival.value = "" - - let arrivalDiv = document.getElementById('arrival_div') - let errorMessage = document.createElement('span'); - errorMessage.textContent = "Дата прибытия, не может быть установлена раньше даты отправки" - errorMessage.classList.add('errorlist') - arrivalDiv.appendChild(errorMessage); - } - else if (DateEnd > DateStart){ - let arrivalDiv = document.getElementById('arrival_div'); - let errorMessage = document.querySelector('.errorlist'); - arrivalDiv.removeChild((errorMessage)) - } - -} +// function checkDate() { +// let dateDeparture = document.getElementById('id_departure_DT'); +// let dateArrival = document.getElementById('id_arrival_DT'); +// let DateStart = new Date(dateDeparture.value); +// let DateEnd = new Date(dateArrival.value); +// if (DateEnd < DateStart) { +// +// // alert("End date cannot be less than Start date."); +// dateArrival.value = "" +// +// let arrivalDiv = document.getElementById('arrival_div') +// let errorMessage = document.createElement('span'); +// errorMessage.textContent = "Дата прибытия, не может быть установлена раньше даты отправки" +// errorMessage.classList.add('errorlist') +// arrivalDiv.appendChild(errorMessage); +// } +// else if (DateEnd > DateStart){ +// let arrivalDiv = document.getElementById('arrival_div'); +// let errorMessage = document.querySelector('.errorlist'); +// arrivalDiv.removeChild((errorMessage)) +// } +// +// } function RequestCommercialOffer (el){ diff --git a/templates/blocks/b_finded_routes.html b/templates/blocks/b_finded_routes.html index fdb15d5..211c606 100644 --- a/templates/blocks/b_finded_routes.html +++ b/templates/blocks/b_finded_routes.html @@ -20,6 +20,7 @@ {% endif %} +
{% include "blocks/b_search_routes.html" %}
diff --git a/templates/blocks/b_footer.html b/templates/blocks/b_footer.html index 758318f..5c0b378 100644 --- a/templates/blocks/b_footer.html +++ b/templates/blocks/b_footer.html @@ -71,18 +71,18 @@
-
Copyright © 2023. Все права защищены.
+
Copyright © 2023. {% trans "Все права защищены." %}
- Публичная оферта + {% trans "Публичная оферта" %}
- Политика конфиденциальности + {% trans "Политика конфиденциальности" %}
- Правила пользования сервисом + {% trans "Правила пользования сервисом" %}
diff --git a/templates/blocks/b_header.html b/templates/blocks/b_header.html index eeead6a..5744ea0 100644 --- a/templates/blocks/b_header.html +++ b/templates/blocks/b_header.html @@ -18,24 +18,26 @@ onblur="hideMenu(event)" class="dropdown-content" > - Главная - Для отправителя - Для перевозчика - О Trip With Bonus - Контакты - Реклама - Новости - Служба поддержки - Партнерам + + {% trans "Главная" %} + {% trans "Для отправителя" %} + {% trans "Для перевозчика" %} + {% trans "" %}О Trip With Bonus + {% trans "Контакты" %} + {% trans "Реклама" %} + {% trans "Новости" %} + {% trans "Служба поддержки" %} + {% trans "Партнерам" %} +
- Перевезти посылку + {% trans "Перевезти посылку" %}
- Отправить посылку + {% trans "Отправить посылку" %}
@@ -53,7 +55,7 @@
- Служба поддержки + {% trans "Служба поддержки" %}
@@ -94,13 +96,13 @@ - Регистрация + {% trans "Регистрация" %} - Войти + {% trans "Войти" %} @@ -111,8 +113,8 @@
- Войти - Регистрация + {% trans "Войти" %} + {% trans "Регистрация" %}
diff --git a/templates/blocks/profile/b_buttons_menu_profile.html b/templates/blocks/profile/b_buttons_menu_profile.html index db7ba50..4367028 100644 --- a/templates/blocks/profile/b_buttons_menu_profile.html +++ b/templates/blocks/profile/b_buttons_menu_profile.html @@ -1,32 +1,45 @@ {% load static %} {% csrf_token %} +{% load i18n %} + +{%trans "Профиль" as t_prof %} +{%trans "Разместить объявление как отправитель" as t_customer %} +{%trans "Разместить объявление как перевозчик" as t_mover %} +{%trans "Мои объявления" as t_my_routes %} +{%trans "Написать сообщение" as t_chats %} +{%trans "Тех. поддержка" as t_support %} +{%trans "Моя подписка" as t_subscribe %} +{%trans "Мой профиль" as t_change_profile %} +{%trans "Выход" as t_logout %} +
- {% if user_subscribe %}{% endif %} - {% with sel_page_name='create_route_for_mover' sel_page_name='dashboard' ajax_url="dashboard" title="Профиль" img_path="/static/img/svg/User.svg"%} + {% if user_subscribe %}{% endif %} + + {% with sel_page_name='create_route_for_mover' sel_page_name='dashboard' ajax_url="dashboard" title=t_prof img_path="/static/img/svg/User.svg"%} {% include "widgets/profile/w_button_for_profile_menu.html" %} {% endwith %} - {% with sel_page_name='create_route_for_customer' dom_id="customer" ajax_url="new_route_view" owner_type="customer" title="Разместить объявление как отправитель" img_path="/static/img/svg/PushPin.svg"%} + {% with sel_page_name='create_route_for_customer' dom_id="customer" ajax_url="new_route_view" owner_type="customer" title=t_customer img_path="/static/img/svg/PushPin.svg"%} {% include "widgets/profile/w_button_for_profile_menu.html" %} {% endwith %} - {% with sel_page_name='create_route_for_mover' dom_id="mover" ajax_url="new_route_view" owner_type="mover" title="Разместить объявление как перевозчик" img_path="/static/img/svg/PushPin.svg"%} + {% with sel_page_name='create_route_for_mover' dom_id="mover" ajax_url="new_route_view" owner_type="mover" title=t_mover img_path="/static/img/svg/PushPin.svg"%} {% include "widgets/profile/w_button_for_profile_menu.html" %} {% endwith %} - {% with sel_page_name='my_routes' dom_id="my_routes_id" ajax_url="get_routes" title="Мои объявления" img_path="/static/img/svg/Cards.svg"%} + {% with sel_page_name='my_routes' dom_id="my_routes_id" ajax_url="get_routes" title=t_my_routes img_path="/static/img/svg/Cards.svg"%} {% include "widgets/profile/w_button_for_profile_menu.html" %} {% endwith %} - {% with sel_page_name='chat' ajax_url="chats" title="Написать сообщение" img_path="/static/img/svg/ChatCircleDots.svg"%} + {% with sel_page_name='chat' ajax_url="chats" title=t_chats img_path="/static/img/svg/ChatCircleDots.svg"%} {% include "widgets/profile/w_button_for_profile_menu.html" %} {% endwith %} - {% with sel_page_name='support' ajax_url="support_tickets" title="Тех. поддержка" img_path="/static/img/svg/Headset.svg"%} + {% with sel_page_name='support' ajax_url="support_tickets" title=t_support img_path="/static/img/svg/Headset.svg"%} {% include "widgets/profile/w_button_for_profile_menu.html" %} {% endwith %} - {% with sel_page_name='my_subscribe' ajax_url="show_cur_subscribe" title="Моя подписка" img_path="/static/img/svg/CurrencyDollar.svg"%} + {% with sel_page_name='my_subscribe' ajax_url="show_cur_subscribe" title=t_subscribe img_path="/static/img/svg/CurrencyDollar.svg"%} {% include "widgets/profile/w_button_for_profile_menu.html" %} {% endwith %} - {% with sel_page_name='change_profile' ajax_url="change_profile" title="Мой профиль" img_path="/static/img/svg/User.svg"%} + {% with sel_page_name='change_profile' ajax_url="change_profile" title=t_change_profile img_path="/static/img/svg/User.svg"%} {% include "widgets/profile/w_button_for_profile_menu.html" %} {% endwith %} - {% with sel_page_name='create_route_for_mover' sel_page_name='logout' title="Выход"%} + {% with sel_page_name='create_route_for_mover' sel_page_name='logout' title=t_logout%} {% include "widgets/profile/w_button_for_profile_menu.html" %} {% endwith %} {#
#} diff --git a/templates/blocks/profile/b_chats.html b/templates/blocks/profile/b_chats.html index 2be3278..bb1d687 100644 --- a/templates/blocks/profile/b_chats.html +++ b/templates/blocks/profile/b_chats.html @@ -1,4 +1,7 @@ {% load static %} +{% load i18n %} + +{% trans 'Отправить сообщение' as p_send_msg %}
">
@@ -69,7 +72,7 @@
- +
{# #} diff --git a/templates/blocks/profile/b_create_ticket.html b/templates/blocks/profile/b_create_ticket.html index be1ead7..9ce4390 100644 --- a/templates/blocks/profile/b_create_ticket.html +++ b/templates/blocks/profile/b_create_ticket.html @@ -1,4 +1,9 @@ {% load static %} +{% load i18n %} + + +{%trans "Введите сообщение..." as p_write_msg %} +{%trans "Тема запроса" as p_create_ticket %}
{% if errors.all__ %}
{{ errors.all__ }}
{% endif %} @@ -20,7 +25,7 @@ class="el-form-create-ticket" name="name" id="id_name" - placeholder="Тема запроса" + placeholder= "{{ p_create_ticket }}" value="{% if form.adding_machine.name %}{{ form.initial.name }}{% endif %}" > {% if form.errors.name %}
{{ form.errors.name }}
{% endif %} @@ -30,7 +35,8 @@