sysadminix/tripwithbonus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

0.0.247 add translate for words with letter А

Browse Source
This commit is contained in:
ArtemB
2023-11-21 18:29:02 +03:00
parent a2688c4a15
commit c660d8cb72
31 changed files with 250 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
static/css/mobile_styles.css
View File

@@ -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;
}

3
static/css/styles(boris).css
View File

@@ -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*/

12
static/css/styles.css
View File

@@ -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;

46
static/js/user_profile.js
View File

@@ -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){

1
templates/blocks/b_finded_routes.html
View File

@@ -20,6 +20,7 @@
</div>
{% endif %}
<div class="page_paging_elements_1">
{% include "blocks/b_search_routes.html" %}
</div>

8
templates/blocks/b_footer.html
View File

@@ -71,18 +71,18 @@
<div class="second-footer">
<div>
<div class="sf_1_column">Copyright © 2023. Все права защищены.</div>
<div class="sf_1_column">Copyright © 2023. {% trans "Все права защищены." %}</div>
<div class="sf_2_column">
<a href="/ru/info_page/publichnaya-oferta/">Публичная оферта</a>
<a href="/ru/info_page/publichnaya-oferta/">{% trans "Публичная оферта" %}</a>
</div>
<div class="sf_3_column">
<a href="/ru/info_page/politika-konfidencialnosti/">Политика конфиденциальности</a>
<a href="/ru/info_page/politika-konfidencialnosti/">{% trans "Политика конфиденциальности" %}</a>
</div>
<div class="sf_4_column">
<a href="/ru/info_page/pravila-polzovaniya-servisom/">Правила пользования сервисом</a>
<a href="/ru/info_page/pravila-polzovaniya-servisom/">{% trans "Правила пользования сервисом" %}</a>
</div>
</div>

34
templates/blocks/b_header.html
View File

@@ -18,24 +18,26 @@
onblur="hideMenu(event)"
class="dropdown-content"
>
<a href="/">Главная</a>
<a href="{% url 'static_page' 'for_movers' %}">Для отправителя</a>
<a href="{% url 'static_page' 'for_customers' %}">Для перевозчика</a>
<a href="{% url "static_page" "about_service" %}">О Trip With Bonus</a>
<a href="{% url 'static_page' 'contacts' %}">Контакты</a>
<a href="{% url 'static_page' 'advertisement' %}">Реклама</a>
<a href="{% url "articles" %}">Новости</a>
<a href="{% url 'static_page' 'customer_service' %}">Служба поддержки</a>
<a href="{% url "static_page" "partners" %}">Партнерам</a>
<a href="/">{% trans "Главная" %}</a>
<a href="{% url 'static_page' 'for_movers' %}">{% trans "Для отправителя" %}</a>
<a href="{% url 'static_page' 'for_customers' %}">{% trans "Для перевозчика" %}</a>
<a href="{% url "static_page" "about_service" %}">{% trans "" %}О Trip With Bonus</a>
<a href="{% url 'static_page' 'contacts' %}">{% trans "Контакты" %}</a>
<a href="{% url 'static_page' 'advertisement' %}">{% trans "Реклама" %}</a>
<a href="{% url "articles" %}">{% trans "Новости" %}</a>
<a href="{% url 'static_page' 'customer_service' %}">{% trans "Служба поддержки" %}</a>
<a href="{% url "static_page" "partners" %}">{% trans "Партнерам" %}</a>
</div>
</div>
<div class="header_btn_mover">
<a href="{% url 'profile_page' 'create_route_for_mover' %}">Перевезти посылку</a>
<a href="{% url 'profile_page' 'create_route_for_mover' %}">{% trans "Перевезти посылку" %}</a>
</div>
<div class="header_btn_sender">
<a href="{% url 'profile_page' 'create_route_for_customer' %}">Отправить посылку</a>
<a href="{% url 'profile_page' 'create_route_for_customer' %}">{% trans "Отправить посылку" %}</a>
</div>
</div>
@@ -53,7 +55,7 @@
<img class="svg" src="/static/img/svg/Helpdesk_%20Icon.svg">
</div>
<div class="header-second-item">
<a id="customer_service" href="{% url 'static_page' 'customer_service' %}">Служба поддержки</a>
<a id="customer_service" href="{% url 'static_page' 'customer_service' %}">{% trans "Служба поддержки" %}</a>
</div>
@@ -94,13 +96,13 @@
<a
class="registration_button"
href="{% url "registration_page" %}">
Регистрация
{% trans "Регистрация" %}
</a>
<a
class="enter_button"
href="{% url "login_profile" %}">
Войти
{% trans "Войти" %}
</a>
</div>
@@ -111,8 +113,8 @@
</div>
<div class="menu_profile_btn">
<a class="btn_menu_profile" href="{% url "login_profile" %}" >Войти</a>
<a class="btn_menu_profile" href="{% url "registration_page" %}">Регистрация</a>
<a class="btn_menu_profile" href="{% url "login_profile" %}" >{% trans "Войти" %}</a>
<a class="btn_menu_profile" href="{% url "registration_page" %}">{% trans "Регистрация" %}</a>
</div>

33
templates/blocks/profile/b_buttons_menu_profile.html
View File

@@ -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 %}
<div class="menu_profile {% if not page_type == 'profile' %}background{% endif %}">
{% if user_subscribe %}<div class="subscribe_type_txt"><span class="f-l">Подписка:</span> <span class="f-r">{{ user_subscribe.subscribe.name }}</span><div class="clear_both"></div></div>{% 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 %}<div class="subscribe_type_txt"><span class="f-l">{% trans "Подписка" %}:</span> <span class="f-r">{{ user_subscribe.subscribe.name }}</span><div class="clear_both"></div></div>{% 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 %}
{# <div>#}

5
templates/blocks/profile/b_chats.html
View File

@@ -1,4 +1,7 @@
{% load static %}
{% load i18n %}
{% trans 'Отправить сообщение' as p_send_msg %}
<div class="menu_buttons curtain left {% if not cur_receiver %}open{% else %}close chat{% endif %}" data-name="<img style='width: 25px;display: block;position: relative;bottom: 2px;' src='{% static "/img/svg/group.png" %}'>">
<div class="container_block_list_of_users">
@@ -69,7 +72,7 @@
<div class="footer-chat">
<div class="left-part-block-enter-message">
<input class="enter-message-inp" onfocus="check_new_messages_timeout()" onkeypress="sendMessageEnter(event,null,{{ user.id }},{{ cur_receiver.id }})" placeholder="Отправить сообщение">
<input class="enter-message-inp" onfocus="check_new_messages_timeout()" onkeypress="sendMessageEnter(event,null,{{ user.id }},{{ cur_receiver.id }})" placeholder="{{ p_send_msg }}">
</div>
<div class="right-part-block-enter-message">
{# <button class="attach-file-btn-message" onclick="attachFilemeassge(event,this,null,{{ user.id }},{{ cur_receiver.id }})"></button>#}

12
templates/blocks/profile/b_create_ticket.html
View File

@@ -1,4 +1,9 @@
{% load static %}
{% load i18n %}
{%trans "Введите сообщение..." as p_write_msg %}
{%trans "Тема запроса" as p_create_ticket %}
<form class="form-create-ticket" name="create-ticket">
{% if errors.all__ %}<div class="errors_all" style="margin-bottom: 12px;width: 100%;font-size: 16px;">{{ errors.all__ }}</div>{% 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 %}<div class="errors">{{ form.errors.name }}</div>{% endif %}
@@ -30,7 +35,8 @@
<textarea name="text"
id="id_text"
class="el-form-create-ticket-textarea"
placeholder="Введите сообщение..."
placeholder="{{ p_write_msg }}"
{# placeholder=p_write_msg #}
value="{% if form.adding_machine.text %}{{ form.initial.text }}{% endif %}"
onclick="countLetters()"
oninput="countLetters()"
@@ -41,7 +47,7 @@
</div>
<div class="form-create-tickets-btns">
<button class="create-ticket-btn" onclick="createTicket(this)">Создать тикет</button>
<button class="create-ticket-btn" onclick="createTicket(this)">{% translate "Создать тикет" %}</button>
<button class="attach-file-btn" onclick="attachFileCreateTicket()"></button>
{# <input class="create-ticket-file" type="file" value="">#}

3
templates/blocks/profile/b_list_of_users_messenger.html
View File

@@ -1,6 +1,7 @@
{% load static %}
{% load i18n %}
<span class="title-list-of-users">Чаты:</span>
<span class="title-list-of-users">{% translate "Чаты" %}:</span>
<div class="insert_users">
{% for item in receivers %}
{% include "widgets/w_chat_right_panel_user.html" %}

9
templates/blocks/profile/b_new_route.html
View File

@@ -1,4 +1,7 @@
{% load static %}
{% load i18n %}
{% trans "Укажите вес" as p_weight %}
<link rel="stylesheet" href="{% static 'css/ion.rangeSlider.min.css' %}">
@@ -276,7 +279,7 @@
type="number"
maxlength="4"
class="js-input"
placeholder="Укажите вес"
placeholder="{{ p_weight }}"
class="el_form_b_new_route"
{% if form.fields.weight.required %} required{% endif %}
@@ -360,7 +363,7 @@
<img id="img_msg_by_email"
src="/static/img/svg/info2.svg"
alt="">
<div class="title_for_msg_by_email">Выберите, чтобы получать уведомление на E-mail, как только появится посылка по заданным критериям</div>
<div class="title_for_msg_by_email">{% translate "Выберите, чтобы получать уведомление на E-mail, как только появится посылка по заданным критериям" %}</div>
</label>
@@ -371,7 +374,7 @@
{% endif %}
</div>
<div class="button_register">
<button id="registration" onclick="sendRoute(this, {% if route.id%}{{ route.id }}{% endif %})"> Разместить объявления </button>
<button id="registration" onclick="sendRoute(this, {% if route.id%}{{ route.id }}{% endif %})"> {% translate "Разместить объявления" %} </button>
</div>

23
templates/blocks/profile/b_profile.html
View File

@@ -1,4 +1,5 @@
{% load static %}
{% load i18n %}
<div class="block_inf_profile">
<div class="f-l width-50">
@@ -7,15 +8,15 @@
src="{{ user.user_profile.avatar.url }}"
{% else %}src="{% static "img/svg/User.svg" %}"{% endif %} >
<input type="file" onchange="upload_photo_f_profile(this)" class="btn_f_upload_photo" id="id_btn_f_upload_photo">
<label class="upload_photo_label" for="id_btn_f_upload_photo">Загрузить фото</label>
<label class="upload_photo_label" for="id_btn_f_upload_photo">{% translate "Загрузить фото" %}</label>
</div>
<div class="clear_both"></div>
</div>
<div class="f-r width-50">
<div class="f-r">
<div class="cur_subscribe_label">Текущая подписка:</div>
<div class="cur_subscribe_label">{% translate "Текущая подписка:" %}</div>
<div class="cur_subscribe_f_profile">{{ user_subscribe.subscribe.name }}</div>
<div class="btn_go_to_subscribes pointer" onclick="select_tab_profile(this,'show_cur_subscribe')">Перейти к подпискам</div>
<div class="btn_go_to_subscribes pointer" onclick="select_tab_profile(this,'show_cur_subscribe')">{% translate "Перейти к подпискам" %}</div>
</div>
<div class="clear_both"></div>
</div>
@@ -24,17 +25,17 @@
<form name="form_user_data">
<div class="container_form_profile">
<div class="container_el_form_profile">
<label class="label_f_profile" for="name">{% if profileForm.fields.firstname.required %}<span class="orange-text">*</span>{% endif %} Ваше имя</label>
<label class="label_f_profile" for="name">{% if profileForm.fields.firstname.required %}<span class="orange-text">*</span>{% endif %}{% translate "Ваше имя" %} </label>
<input class="input_f_profile" type="text" id="id_firstname" name="firstname" {% if profileForm.initial.firstname %}value="{{ profileForm.initial.firstname }}" {% endif %} {% if profileForm.initial.firstname %}data-initial-value="{{ profileForm.initial.firstname }}"{% else %}data-initial-value=""{% endif %} >
{% if profileForm.errors.firstname %}<div class="error_form_profile">{{ profileForm.errors.firstname }}</div>{% endif %}
</div>
<div class="container_el_form_profile">
<label class="label_f_profile" for="id_lastname">{% if profileForm.fields.lastname.required %}<span class="orange-text">*</span>{% endif %} Ваша фамилия</label>
<label class="label_f_profile" for="id_lastname">{% if profileForm.fields.lastname.required %}<span class="orange-text">*</span>{% endif %}{% translate "Ваша фамилия" %} </label>
<input class="input_f_profile" type="text" id="id_lastname" name="lastname" {% if profileForm.initial.lastname %}value="{{ profileForm.initial.lastname }}" {% endif %} {% if profileForm.initial.lastname %}data-initial-value="{{ profileForm.initial.lastname }}"{% else %}data-initial-value=""{% endif %}>
{% if profileForm.errors.lastname %}<div class="error_form_profile">{{ profileForm.errors.lastname }}</div>{% endif %}
</div>
<div class="container_el_form_profile">
<label class="label_f_profile" for="id_tel">{% if profileForm.fields.tel.required %}<span class="orange-text">*</span>{% endif %} Номер телефона</label>
<label class="label_f_profile" for="id_tel">{% if profileForm.fields.tel.required %}<span class="orange-text">*</span>{% endif %}{% translate "Номер телефона" %} </label>
<input class="input_f_profile" type="text" id="id_tel" name="tel" {% if profileForm.initial.tel %}value="{{ profileForm.initial.tel }}" {% endif %} {% if profileForm.initial.tel %}data-initial-value="{{ profileForm.initial.tel }}"{% else %}data-initial-value=""{% endif %}>
{% if profileForm.errors.tel %}<div class="error_form_profile">{{ profileForm.errors.tel }}</div>{% endif %}
</div>
@@ -44,12 +45,12 @@
{% if profileForm.errors.email %}<div class="error_form_profile">{{ profileForm.errors.email }}</div>{% endif %}
</div>
<div class="container_el_form_profile">
<label class="label_f_profile" for="id_country">{% if profileForm.fields.country.required %}<span class="orange-text">*</span>{% endif %} Страна проживания</label>
<label class="label_f_profile" for="id_country">{% if profileForm.fields.country.required %}<span class="orange-text">*</span>{% endif %}{% translate "Страна проживания" %} </label>
<input class="input_f_profile" type="text" id="id_country" name="country" {% if profileForm.initial.country %}value="{{ profileForm.initial.country }}" {% endif %} {% if profileForm.initial.country %}data-initial-value="{{ profileForm.initial.country }}"{% else %}data-initial-value=""{% endif %}>
{% if profileForm.errors.country %}<div class="error_form_profile">{{ profileForm.errors.country }}</div>{% endif %}
</div>
<div class="container_el_form_profile">
<label class="label_f_profile" for="id_city">{% if profileForm.fields.city.required %}<span class="orange-text">*</span>{% endif %} Город проживаня</label>
<label class="label_f_profile" for="id_city">{% if profileForm.fields.city.required %}<span class="orange-text">*</span>{% endif %}{% translate "Город проживаня" %} </label>
<input class="input_f_profile" type="text" id="id_city" name="city" {% if profileForm.initial.city %}value="{{ profileForm.initial.city }}" {% endif %} {% if profileForm.initial.city %}data-initial-value="{{ profileForm.initial.city }}"{% else %}data-initial-value=""{% endif %}>
{% if profileForm.errors.city %}<div class="error_form_profile">{{ profileForm.errors.city }}</div>{% endif %}
</div>
@@ -57,14 +58,14 @@
<div class="line_f_form_profile"></div>
<div class="container_el_form_profile">
<label class="label_f_profile" for="id_password">{% if profileForm.fields.password.required %}<span class="orange-text">*</span>{% endif %} Новый пароль</label>
<label class="label_f_profile" for="id_password">{% if profileForm.fields.password.required %}<span class="orange-text">*</span>{% endif %}{% translate "Новый пароль" %} </label>
<input class="input_f_profile" type="text" id="id_password" name="password" {% if profileForm.initial.password %}value="{{ profileForm.initial.password }}" {% endif %} {% if profileForm.initial.password %}data-initial-value="{{ profileForm.initial.password }}"{% else %}data-initial-value=""{% endif %}>
</div>
<div class="container_el_form_profile">
<label class="label_f_profile" for="id_confirm_password">{% if profileForm.fields.confirm_password.required %}<span class="orange-text">*</span>{% endif %} Подвердить пароль</label>
<label class="label_f_profile" for="id_confirm_password">{% if profileForm.fields.confirm_password.required %}<span class="orange-text">*</span>{% endif %}{% translate "Подвердить пароль" %} </label>
<input class="input_f_profile" type="text" id="id_confirm_password" name="confirm_password" {% if profileForm.initial.confirm_password %}value="{{ profileForm.initial.confirm_password }}" {% endif %} {% if profileForm.initial.confirm_password %}data-initial-value="{{ profileForm.initial.confirm_password }}"{% else %}data-initial-value=""{% endif %}>
</div>
<button class="confirm_profile_btn" onclick="change_profile_confirm(this)">Сохарнить</button>
<button class="confirm_profile_btn" onclick="change_profile_confirm(this)">{% translate "Сохарнить" %}</button>
</div>
</form>

13
templates/blocks/profile/b_profile_first_page.html
View File

@@ -1,6 +1,7 @@
{% load static %}
{% load i18n %}
<h1>Добро пожаловать: <span>{{ user.first_name }} {{ user.last_name }}</span> <span>({{ user.username }})</span></h1>
<h1>{% translate "Добро пожаловать:" %} <span>{{ user.first_name }} {{ user.last_name }}</span> <span>({{ user.username }})</span></h1>
<div class="profile_prof"><img class="avatar_user_profile" {% if user.user_profile.avatar %}
src="{{ user.user_profile.avatar.url }}"
{% else %}src="{% static "img/svg/User.svg" %}"{% endif %} alt="">
@@ -10,7 +11,7 @@
{# src="{{ user.user_profile.avatar.url }}"#}
{# {% else %}src="{% static "img/svg/User.svg" %}"{% endif %} >#}
{# </div>#}
<div>Статус: {{ user.user_profile.get_account_type_display }}</div>
<div>{% translate "Статус:" %} {{ user.user_profile.get_account_type_display }}</div>
{# <div>#}
{# <select name="" id="">#}
{# <option>Перевозчик</option>#}
@@ -18,7 +19,7 @@
{# </select></div>#}
</div>
</div>
<div class="advice_text">Если хотите отправить посылку - зарегистрируйтесь, как отправитель</div>
<div>Если у Вас возникнут вопросы Вы можете связаться с нами: <a href="mailto:support@twb.com">support@twb.com</a></div>
<div>У Вас <a href="#">три</a> новых сообщения. <a href="#">Посмотреть</a></div>
<div>Хотите получать уведомление о появлении посылок? <a href="#">Заполните форму</a></div>
<div class="advice_text">{% translate "Если хотите отправить посылку - зарегистрируйтесь, как отправитель" %}</div>
<div>{% translate "Если у Вас возникнут вопросы Вы можете связаться с нами:" %} <a href="mailto:support@twb.com">support@twb.com</a></div>
<div>{% translate "У Вас" %} <a href="#">{% translate "три" %}</a>{% translate "новых сообщения." %} <a href="#">{% translate "Посмотреть" %}</a></div>
<div>{% translate "Хотите получать уведомление о появлении посылок?" %} <a href="#">{% translate "Заполните форму" %}</a></div>

21
templates/blocks/profile/b_subscribe_current.html
View File

@@ -1,4 +1,5 @@
{% load static %}
{% load i18n %}
{#<div class="title-profile-cont">#}
{# Подписка#}
@@ -6,15 +7,15 @@
<div class="subscribe_inf">
<div class="subscribe_inf_left_part">
<div class="text-align-center">
<div class="title_subscribe">Ваш тарифный план</div>
<div class="title_subscribe">{% translate "Ваш тарифный план" %}</div>
<div class="name_subscribe">{{ subscribe_for_user.subscribe.name }}</div>
<button class="extend_subscribe_btn">Продлить</button>
<div class="subscribe_was_paid">Тариф оплачен до: {{ subscribe_for_user.paid_period_to_DT|date:"d.m.y" }}</div>
<button class="extend_subscribe_btn">{% translate "Продлить" %}</button>
<div class="subscribe_was_paid">{% translate "оплачен до:" %} {{ subscribe_for_user.paid_period_to_DT|date:"d.m.y" }}</div>
</div>
<div class="wrapper_switch_cont">
<div class="width-100">
<div class="label_toggle_switch_cont">
<label for="id_paid_toggle">Автопродление тарифного плана</label>
<label for="id_paid_toggle">{% translate "Автопродление тарифного плана" %}</label>
</div>
<div class="toggle_switch_cont">
<input class="input_toggle_switch" id="id_paid_toggle" name="paid_toggle" type="checkbox">
@@ -25,7 +26,7 @@
</div>
<div class="width-100">
<div class="label_toggle_switch_cont">
<label for="id_email_toggle">Получать уведомление на почту о завершении подписки</label>
<label for="id_email_toggle">{% translate "Получать уведомление на почту о завершении подписки" %}</label>
</div>
<div class="toggle_switch_cont">
<input class="input_toggle_switch" id="id_email_toggle" name="email_toggle" type="checkbox">
@@ -38,7 +39,7 @@
</div>
</div>
<div class="subscribe_inf_right_part">
<div class="title_options">Опции тарифа</div>
<div class="title_options">{% translate "Опции тарифа" %}</div>
<ul class="option_list">
{% for opt in subscribe_for_user.subscribe.options.all %}
<li class="items_subscribe select green" style="color: {{ subscribe.text_color }}"><text>{{ opt.name }}</text></li>
@@ -51,7 +52,7 @@
</div>
<div class="clear_both"></div>
</div>
<div class="inf_about_tarif_plan_text"><div style="font-weight: 600;">При понижении тарифного</div> плана оплаченный период действия текущей подписки не пересчитывается.</div>
<div class="inf_about_tarif_plan_text"><div style="font-weight: 600;">{% translate "При понижении тарифного" %}</div> {% translate "плана оплаченный период действия текущей подписки не пересчитывается." %}</div>
<div class="b_another_subscribes">
{% for item in subscribes %}
{% if item.id != subscribe_for_user.subscribe.id %}
@@ -59,18 +60,18 @@
<div class="another_subscribe">
<div class="name_subscribe_another padding-n-width-another-subscribes">{{ item.name }}</div>
<div class="text_another_subscribe padding-n-width-another-subscribes">
Стоимость:<span class="orange-text">
{% translate "Стоимость:" %}<span class="orange-text">
{% if item.price %}
{{ item.price|floatformat }}$
{% else %}
Бесплатно
{% translate "Бесплатно" %}
{% endif %}
</span>
</div>
<div class="text_another_subscribe padding-n-width-another-subscribes ">
Период: <span class="orange-text">{{ item.period_name }}</span>
</div>
<button class="read_more_about_subscribe" onclick="send_subscribe({{ item.id }})">Перейти</button>
<button class="read_more_about_subscribe" onclick="send_subscribe({{ item.id }})">{% translate "Перейти" %}</button>
</div>
{% endif %}

12
templates/blocks/profile/b_subscribe_variants.html
View File

@@ -2,7 +2,7 @@
{% load i18n %}
<div class="title-profile-cont">
Подписка
{% translate "Подписка" %}
</div>
<div>
@@ -12,7 +12,7 @@
</div>
<div class="state_subscribe">
Для того, чтобы воспользоваться сервисом - оформите подписку
{% translate "Для того, чтобы воспользоваться сервисом - оформите подписку" %}
</div>
</div>
@@ -28,16 +28,16 @@
{% if subscribe.price %}
{{ subscribe.price|floatformat }}$
{% else %}
Бесплатно
{% translate "Бесплатно" %}
{% endif %}
</div>
<div class="periud_subscribe" style="color: {{ subscribe.text_color }}">
Период: {{ subscribe.period_name }}
{% translate "Период:" %} {{ subscribe.period_name }}
</div>
</div>
<div class="options_subscribe">
<div class="options_subscribe_title light" style="color: {{ subscribe.text_color }}">
Опции:
{% translate "Опции:" %}
</div>
<div class="list_options_subscribe">
<ul class="option_list">
@@ -52,7 +52,7 @@
</div>
</div>
<div class="text-align-center">
<button onclick="send_subscribe({{ subscribe.id }})" class="arrange_subscribe">Оформить подписку</button>
<button onclick="send_subscribe({{ subscribe.id }})" class="arrange_subscribe">{% translate "Оформить подписку" %}</button>
</div>
</div>
{% endfor %}

5
templates/blocks/profile/b_support_chat.html
View File

@@ -1,4 +1,7 @@
{% load static %}
{% load i18n %}
{% trans "Отправить сообщение" as p_send_msg %}
{#{% load static %}#}
@@ -64,7 +67,7 @@
<div class="footer-chat{% if not new_msg_allow %} hide{% endif %}">
<div class="left-part-block-enter-message">
<input class="enter-message-inp" onfocus="check_new_messages_timeout()" onkeypress="sendMessageEnter(event,{{ ticket.id }},{{ user.id }},{{ cur_receiver.id }})" placeholder="Отправить сообщение">
<input class="enter-message-inp" onfocus="check_new_messages_timeout()" onkeypress="sendMessageEnter(event,{{ ticket.id }},{{ user.id }},{{ cur_receiver.id }})" placeholder="{{ p_send_msg }}">
</div>
{# <div class="right-part-block-enter-message">#}
{# <button class="attach-file-btn-message" onclick="attachFilemeassge(event,this,{{ ticket.id }},{{ user.id }},{{ cur_receiver.id }})"></button>#}

9
templates/blocks/profile/b_support_tickets.html
View File

@@ -1,4 +1,5 @@
{% load static %}
{% load i18n %}
{#<div>Тех поддрежка</div>#}
@@ -6,17 +7,17 @@
<div>
<div class="title-profile-cont">
<h1>Техническая поддержка</h1>
<h1>{% translate "Техническая поддержка" %}</h1>
</div>
<div class="insert-tech-place">
<div class="container-sprt-inf">
<div class="container-support-btn">
<button class="send-ticket-suprt-btn" onclick="createTicketShow()">Создать тикет</button>
<button class="send-ticket-suprt-btn" onclick="createTicketShow()">{% translate "Создать тикет" %}</button>
</div>
<div class="container-sprt-inf-txt">Время работы технической поддержки: ежедневно с 9:00 до 17:00</div>
<div class="container-sprt-inf-txt">{% translate "Время работы технической поддержки: ежедневно с 9:00 до 17:00" %}</div>
</div>
<div class="container-requests-tech-sprt">
<div class="cont-req-tech-sup">Мои обращения:</div>
<div class="cont-req-tech-sup">{% translate "Мои обращения:" %}</div>
{% for ticket in tickets %}
{% include "widgets/w_request_tech_support.html" %}
{% endfor %}

4
templates/blocks/static_pages_blocks/b_mover_search.html
View File

@@ -141,11 +141,11 @@
{% if subscribe.price %}
{{ subscribe.price|floatformat }}$
{% else %}
Бесплатно
{% translate "Бесплатно" %}
{% endif %}
</div>
<div class="periud_subscribe" style="color: {{ subscribe.text_color }}">
Период: {{ subscribe.period_name }}
{% translate "Период" %}: {{ subscribe.period_name }}
</div>
</div>
<div class="options_subscribe">

19
templates/forms/f_find_route_filters_form.html
View File

@@ -1,9 +1,10 @@
{% load static %}
{% load i18n %}
{#<div class="block-filters-find-route">#}
<div class="title_filters_find_route">Все фильтры</div>
<div class="title_filters_find_route">{% translate "Все фильтры" %}</div>
<div class="methods_transportation_form_filters">
<div class="title_el_methods_transportation">Способ перевозки</div>
<div class="title_el_methods_transportation">{% translate "Способ перевозки:" %}</div>
{# <div>#}
{# <div class="method_transport">#}
{# <input class="method_transport_inp_hide" type="checkbox">#}
@@ -55,9 +56,9 @@
{# </div>#}
</div>
<div class="methods_transportation_form_filters">
<div class="title_el_methods_transportation">Откуда забрать посылку</div>
<div class="title_el_methods_transportation">{% translate "Откуда забрать посылку" %}</div>
<select onchange="filters_func_find_route_main(this,'{{ owner_type }}')" class="custom_select select_form_filters_find_route el_form_find_route" name="from_place">
<option value="" selected="selected">не имеет значения</option>
<option value="" selected="selected">{% translate "не имеет значения" %}</option>
{% for item in route_form.fields.from_place.choices %}
<option value="{{ item.0 }}" {% if route_form.initial.from_place == item.0 %} selected{% endif %}>{{ item.1 }}</option>
{% endfor %}
@@ -67,16 +68,16 @@
</select>
</div>
<div class="methods_transportation_form_filters">
<div class="title_el_methods_transportation">Куда доставить посылку</div>
<div class="title_el_methods_transportation">{% translate "Куда доставить посылку" %}</div>
<select onchange="filters_func_find_route_main(this,'{{ owner_type }}')" class="custom_select select_form_filters_find_route el_form_find_route" name="to_place">
<option value="" selected="selected">не имеет значения</option>
<option value="" selected="selected">{% translate "не имеет значения" %}</option>
{% for item in route_form.fields.to_place.choices %}
<option value="{{ item.0 }}" {% if route_form.initial.to_place == item.0 %} selected{% endif %}>{{ item.1 }}</option>
{% endfor %}
</select>
</div>
<div class="methods_transportation_form_filters">
<label for="weight">Вес посылки (кг)</label>
<label for="weight">{% translate "Вес посылки (кг)" %}</label>
<div class="range-slider">
<input oninput="filters_func_find_route_main(this,'{{ owner_type }}',null,'weight')" type="text" class="range_slider_form_filters el_form_find_route" name="weight" value="{{ route_form.fields.weight.initial }}" />
</div>
@@ -88,9 +89,9 @@
</div>
<div class="methods_transportation_form_filters">
<div class="title_el_methods_transportation">Сортировать по:</div>
<div class="title_el_methods_transportation">{% translate "Сортировать по:" %}</div>
<select onchange="filters_func_find_route_main(this,'{{ owner_type }}')" name="sort" class="custom_select select_form_filters_find_route el_form_find_route">
<option value="last" {% if route_form.initial.sort == item.0 %} selected{% endif %}>По последним</option>
<option value="last" {% if route_form.initial.sort == item.0 %} selected{% endif %}>{% translate "По последним" %}</option>
</select>
</div>

15
templates/forms/f_find_route_form_main_find_routes.html
View File

@@ -1,7 +1,8 @@
{% load static %}
{% load i18n %}
<div class="container_form_search_carrier">
<div class="cont-el-form-search-carrier first abbreviation">
<label for="id_from_address_point_txt">Откуда</label>
<label for="id_from_address_point_txt">{% translate "Откуда" %}</label>
{# <input onfocus="focus_el_ins(this)" onclick="show_list_w_places(this)" oninput="searchTown(this)" class="inp_form_find_route_w_abbreviation first" id="inp_form_find_route_w_abbreviation_1" type="text">#}
@@ -39,7 +40,7 @@
</div>
</div>
<div class="cont-el-form-search-carrier">
<label for="id_to_address_point_txt">Куда</label>
<label for="id_to_address_point_txt">{% translate "Куда" %}</label>
{# <div class="container_inp_w_abr">#}
{# <input onfocus="focus_el_ins(this)" onclick="show_list_w_places(this)" oninput="searchTown(this)" class="inp_form_find_route_w_abbreviation" id="inp_form_find_route_w_abbreviation_2" type="text">#}
@@ -76,13 +77,13 @@
</div>
</div>
<div class="cont-el-form-search-carrier">
<label for="id_departure_DT">Дата отправки</label>
<label for="id_departure_DT">{% translate "Дата отправки" %}</label>
{# <input class="el_form_find_route" name="departure_DT" id="id_departure_DT" type="date" {% if route_form.fields.departure_DT.required %} {% endif %} {% if route_form.initial.departure_DT %} value="{{ route_form.initial.departure_DT }}"{% endif %} >#}
<input class="el_form_find_route" type="text" id="id_departure_DT" name="departure_DT" placeholder="" {% if route_form.initial.departure_DT %} value="{{ route_form.initial.departure_DT }}"{% endif %}/>
<div id="displayRegervation"></div>
</div>
<div class="cont-el-form-search-carrier">
<label for="id_arrival_DT">Дата прибытия</label>
<label for="id_arrival_DT">{% translate "Дата прибытия" %}</label>
{# <input class="el_form_find_route" name="arrival_DT" id="id_arrival_DT" type="date" {% if route_form.initial.arrival_DT %} value="{{ route_form.initial.arrival_DT }}"{% endif %}>#}
<input class="el_form_find_route" type="text" name="arrival_DT" id="id_arrival_DT" placeholder="" {% if route_form.initial.arrival_DT %} value="{{ route_form.initial.arrival_DT }}"{% endif %}/>
<div id="displayRegervation"></div>
@@ -90,7 +91,7 @@
<div class="cont-el-form-search-carrier last">
<label>test</label>
<select class="custom_select el_form_find_route" name="cargo_type" id="id_cargo_type" {% if route_form.fields.cargo_type.required %} {% endif %}>
<option value="" selected="selected">не имеет значения</option>
<option value="" selected="selected">{% translate "не имеет значения" %}</option>
{% for item in route_form.fields.cargo_type.choices %}
<option value="{{ item.0 }}" {% if route_form.initial.cargo_type == item.0 %} selected{% endif %}>{{ item.1 }}</option>
{% endfor %}
@@ -101,9 +102,9 @@
<div class="cont-el-form-search-carrier el_form_find_route">
<label style="opacity: 0">test</label>
{% if show_filter_and_results %}
<button class="btn_find_routes" onclick="filters_func_find_route_main(this,'{{ owner_type }}')" data-owner_type='{{ owner_type }}'>Найти</button>
<button class="btn_find_routes" onclick="filters_func_find_route_main(this,'{{ owner_type }}')" data-owner_type='{{ owner_type }}'>{% translate "Найти" %}</button>
{% else %}
<button class="btn_find_routes" onclick="filters_func_find_route_main(this,'{{ owner_type }}','{% url "route_search_results_View" %}')" data-owner_type='{{ owner_type }}'>Найти</button>
<button class="btn_find_routes" onclick="filters_func_find_route_main(this,'{{ owner_type }}','{% url "route_search_results_View" %}')" data-owner_type='{{ owner_type }}'>{% translate "Найти" %}</button>
{% endif %}
</div>
</div>

70
templates/forms/f_login.html
View File

@@ -1,33 +1,39 @@
<section class="login">
<h1>Войдите в профиль</h1>
<form class="login_form" name="login_form" method="post">
{% csrf_token %}
<div>
{% if form.errors.all__ %}
<span>
{{ form.errors.all__ }}
</span>
{% endif %}
{% load i18n %}
<div class="inputs_l">
<input name="username" type="text" placeholder="Логин" {% if form.data.username %} value="{{ form.data.username }}"{% endif %}>
{% if form.username and form.errors.username %}
<span>{{ form.errors.username }}</span>
{% endif %}
</div>
<div class="inputs_l">
<input name="password" type="password" placeholder="Пароль"{% if form.data.password %} value="{{ form.data.password }}"{% endif %}>
{% if form.password and form.errors.password %}
<span>{{ form.errors.password }}</span>
{% endif %}
</div>
<div class="button_register"><button onclick="SendLoginForm(this)">Войти</button></div>
<div>Авторизуясь, вы соглашаетесь с Лицензионным соглашением Политикой конфиденциальности</div>
{# <div>Или</div>#}
{# <div class="google"><img src="/static/img/png/google.png" alt="">#}
{# <div>Войти через Google</div>#}
{# </div>#}
<div>Нет аккаунта? <a href="/ru/profile/registration/">Зарегистрируйтесь</a></div>
</div>
</form>
</section>
{% trans "Логин" as p_login %}
{% trans "Пароль" as p_password %}
<section class="login">
<h1>{% translate "Войдите в профиль" %}</h1>
<form class="login_form" name="login_form" method="post">
{% csrf_token %}
<div>
{% if form.errors.all__ %}
<span>
{{ form.errors.all__ }}
</span>
{% endif %}
<div class="inputs_l">
<input name="username" type="text" placeholder="{{ p_login }}" {% if form.data.username %} value="{{ form.data.username }}"{% endif %}>
{% if form.username and form.errors.username %}
<span>{{ form.errors.username }}</span>
{% endif %}
</div>
<div class="inputs_l">
<input name="password" type="password" placeholder="{{ p_password }}"{% if form.data.password %} value="{{ form.data.password }}"{% endif %}>
{% if form.password and form.errors.password %}
<span>{{ form.errors.password }}</span>
{% endif %}
</div>
<div class="button_register"><button onclick="SendLoginForm(this)">{% translate "Войти" %}</button></div>
<div>{% translate "Авторизуясь, вы соглашаетесь с Лицензионным соглашением Политикой конфиденциальности" %}</div>
{# <div>Или</div>#}
{# <div class="google"><img src="/static/img/png/google.png" alt="">#}
{# <div>Войти через Google</div>#}
{# </div>#}
<div>{% translate "Нет аккаунта?" %} <a href="/ru/profile/registration/">{% translate "Зарегистрируйтесь" %}</a></div>
</div>
</form>
</section>

24
templates/forms/f_registration.html
View File

@@ -1,5 +1,13 @@
{% load i18n %}
{% trans "Имя" as p_name %}
{% trans "Фамилия" as p_lastname %}
{% trans "Телефон" as p_tel %}
{% trans "Пароль" as p_password %}
{% trans "Подтвердить пароль" as p_con_password %}
<section class="register">
<h1>Регистрация</h1>
<h1>{% translate "Регистрация" %}</h1>
<form name="registration_form" method="POST">
{% csrf_token %}
@@ -22,12 +30,12 @@
<div class="inputs">
<div><input name="firstname" type="text" placeholder="Имя"{% if form.data.firstname %} value="{{ form.data.firstname }}"{% endif %}>
<div><input name="firstname" type="text" placeholder="{{ p_name }}"{% if form.data.firstname %} value="{{ form.data.firstname }}"{% endif %}>
{% if form.errors and form.errors.firstname %}
<span>{{ form.errors.firstname }}</span>
{% endif %}
</div>
<div><input name="lastname" type="text" placeholder="Фамилия"{% if form.data.lastname %} value="{{ form.data.lastname }}"{% endif %}>
<div><input name="lastname" type="text" placeholder="{{ p_lastname }}"{% if form.data.lastname %} value="{{ form.data.lastname }}"{% endif %}>
{% if form.errors and form.errors.lastname %}
<span>{{ form.errors.lastname }}</span>
{% endif %}
@@ -39,19 +47,19 @@
<span>{{ form.errors.email }}</span>
{% endif %}
</div>
<div><input name="tel" type="text" placeholder="Телефон"{% if form.data.tel %} value="{{ form.data.tel }}"{% endif %}>
<div><input name="tel" type="text" placeholder="{{ p_tel }}"{% if form.data.tel %} value="{{ form.data.tel }}"{% endif %}>
{% if form.errors and form.errors.tel %}
<span>{{ form.errors.tel }}</span>
{% endif %}
</div>
</div>
<div class="inputs">
<div><input name="password" type="password" placeholder="Пароль"{% if form.data.password %} value="{{ form.data.password }}"{% endif %}>
<div><input name="password" type="password" placeholder="{{ p_password }}"{% if form.data.password %} value="{{ form.data.password }}"{% endif %}>
{% if form.errors and form.errors.password %}
<span>{{ form.errors.password }}</span>
{% endif %}
</div>
<div><input name="confirm_password" type="password" placeholder="Подтвердить пароль"{% if form.data.confirm_password %} value="{{ form.data.confirm_password }}"{% endif %}>
<div><input name="confirm_password" type="password" placeholder="{{ p_con_password }}"{% if form.data.confirm_password %} value="{{ form.data.confirm_password }}"{% endif %}>
{% if form.errors and form.errors.confirm_password %}
<span>{{ form.errors.confirm_password }}</span>
{% endif %}
@@ -65,10 +73,10 @@
{% if form.errors and form.errors.agreement %}
<span>{{ form.errors.agreement }}</span>
{% endif %}
<div>Регистрируясь, я соглашаюсь с Лицензионным соглашениеми и Политикой конфиденциальности</div>
<div>{% translate "Регистрируясь, я соглашаюсь с Лицензионным соглашениеми и Политикой конфиденциальности" %}</div>
</div>
<div class="button_register">
<button id="registration" onclick="SendRegistrationForm(this)"> Зарегистрироваться </button>
<button id="registration" onclick="SendRegistrationForm(this)"> {% translate "Зарегистрироваться" %} </button>
</div>
</form>
</section>

2
templates/pages/p_article.html
View File

@@ -4,7 +4,7 @@
<div class="advertisement_block_news">
<div class="advertisement_content">
Сюда вставляется реклама из админки, веротяно баннер
</div>
</div>
<div class="self_news">

2
templates/pages/p_articles.html
View File

@@ -6,7 +6,7 @@
<div class="wrapper_advertisement">
<div class="advertisement_block_news">
<div class="advertisement_content">
Сюда вставляется реклама из админки, веротяно баннер
</div>
</div>
</div>

5
templates/pages/p_results_find_route.html
View File

@@ -1,5 +1,6 @@
{% extends "tb_base.html" %}
{% load static %}
{% load i18n %}
{% block meta %}
@@ -25,9 +26,9 @@
<div class="text-align-center">
<h1 class="title_page">
{% if owner_type == 'mover' %}
Поиск перевозчика
{% translate "Поиск перевозчика" %}
{% else %}
Поиск посылки
{% translate "Поиск посылки"%}
{% endif %}
</h1>
</div>

13
templates/small_INCLUDES/carrier_card/inf_about_moving.html
View File

@@ -1,28 +1,29 @@
{% load static %}
{% load i18n %}
<div class="container_inf_about_moving">
<div class="line_inf_about_moving">
<div class="carrier_inf_moving left">
<div>Отправка:</div>
<div class="from-to-city-text">{% if route.departure_DT %}{{ route.departure_DT|date:"l: d.m.Y H:i" }}{% else %}Неизвестно{% endif %}</div>
<div>{% translate "Отправка:" %}</div>
<div class="from-to-city-text">{% if route.departure_DT %}{{ route.departure_DT|date:"l: d.m.Y H:i" }}{% else %}{% translate "Неизвестно" %}{% endif %}</div>
</div>
<img class="arrow_inf_about_moving" src="{% static "/img/svg/arrow.svg" %}">
<div class="carrier_inf_moving right">
<div>Прибытие:</div>
<div class="from-to-city-text">{% if route.arrival_DT %}{{ route.arrival_DT|date:"l: d.m.Y H:i" }}{% else %}Неизвестно{% endif %}</div>
<div>{% translate "Прибытие" %}:</div>
<div class="from-to-city-text">{% if route.arrival_DT %}{{ route.arrival_DT|date:"l: d.m.Y H:i" }}{% else %}{% translate "Неизвестно" %}{% endif %}</div>
</div>
<div class="clear_both"></div>
</div>
<div class="line_inf_about_moving second">
<div class="carrier_inf_moving left">
<div>Откуда заберёт:</div>
<div>{% translate "Откуда заберёт:" %}</div>
<div class="from-to-city-text">{% if route.from_place == 'airport' %}{{ route.from_airport }}{% else %}{{ route.get_from_place_display }}{% endif %}</div>
</div>
<img class="arrow_inf_about_moving" src="{% static "/img/svg/arrow.svg" %}">
<div class="carrier_inf_moving right">
<div>Куда доставит:</div>
<div>{% translate "Куда доставит:" %}</div>
<div class="from-to-city-text">{% if route.to_place == 'airport' %}{{ route.to_airport }}{% else %}{{ route.get_to_place_display }}{% endif %}</div>
</div>

3
templates/widgets/w_request_tech_support.html
View File

@@ -1,9 +1,10 @@
{% load static %}
{% load i18n %}
<div class="container-message-req-sprt" onclick="openTicket({{ ticket.id }})">
<div class="message-sprt-inf">
<div>
<span>
Статус: {{ ticket.get_status_display }}
{% translate "Статус:" %} {{ ticket.get_status_display }}
{# Статус: Открыт#}
</span>
{# <img>#}

12
templates/widgets/w_route_info.html
View File

@@ -17,11 +17,11 @@
{# </div>#}
<div class="route_info_about">
<span>
Тип:{{ route.get_cargo_type_display }}
{% translate "Тип:" %}{{ route.get_cargo_type_display }}
</span>
<span>
Вес:{{ route.weight }} кг
{% translate "Вес:" %}{{ route.weight }} {% translate "кг" %}
</span>
<span>
@@ -76,24 +76,24 @@
<div class="button_edit_route">
<button onclick="editRoute({{ route.id }})"
id="edit_route">
Редактировать
{% translate "Редактировать" %}
</button>
</div>
<div class="button_remove_route">
<button
onclick="confirmRemove(this)"
id="remove_route">
Удалить
{% translate "Удалить" %}
</button>
</div>
</div>
{% if route.owner != user %}
<button class="open_chat_carrier" onclick="open_chat({{ route.owner_id }})">
<img src="{% static "img/svg/Logo.svg" %}" width="30px">
<span >Написать сообщение</span>
<span >{% translate "Написать сообщение" %}</span>
<img src="{% static "/img/svg/email.svg" %}" width="25px" style="position:relative;left: 3px;">
</button>
<button class="open_inf_carrier" onclick="show_inf_carrier(this)">Открыть контакт</button>
<button class="open_inf_carrier" onclick="show_inf_carrier(this)">{% translate "Открыть контакт" %}</button>
{% endif %}
</div>

3
templates/widgets/w_tickets_w_manager.html
View File

@@ -1,6 +1,7 @@
{% load static %}
{% load i18n %}
<div class="block_tickets_in_work">
<span class="title-list-of-users">Тикеты в работе</span>
<span class="title-list-of-users">{% translate "Тикеты в работе" %}</span>
{% if tickets_for_manager %}
{% for item in tickets_for_manager %}
{% include "widgets/w_chat_right_panel_tickets.html" %}

3
templates/widgets/w_tickets_wo_manager.html
View File

@@ -1,7 +1,8 @@
{% load static %}
{% load i18n %}
<span class="title-list-of-users">Неразобранные тикеты</span>
<span class="title-list-of-users">{% translate "Неразобранные тикеты" %}</span>
<div class="insert_users">
{% if tickets_wo_manager %}
{% for item in tickets_wo_manager %}