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

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>