0.0.4 fix text for contact page

ArticlesApp/js_views.py

@@ -21,6 +21,9 @@ def get_articles_block_ajax(request):
     if request.method != 'POST':
         raise Http404
 
+    from GeneralApp.funcs import get_and_set_lang
+    lang = get_and_set_lang(request)
+
     try:
 
         data = request.POST.dict()

AuthApp/js_views.py

@@ -18,7 +18,7 @@ from django.core.files import File
 import base64
 from django.core.validators import validate_email
 from django.urls import reverse
-
+from GeneralApp.funcs import get_and_set_lang
 
 # @login_required(login_url='/profile/login/')
 # def subscribe_ajax(request):
@@ -36,6 +36,8 @@ def mailing_subscribe_ajax(request):
     if request.method != 'POST':
         raise Http404
 
+    lang = get_and_set_lang(request)
+
     try:
 
         email = request.POST['email']
@@ -80,6 +82,8 @@ def send_message_ajax(request):
     if request.method != 'POST':
         raise Http404
 
+    lang = get_and_set_lang(request)
+
     try:
 
         data = request.POST
@@ -212,6 +216,8 @@ def chats_ajax(request):
     if request.method != 'POST':
         raise Http404
 
+    lang = get_and_set_lang(request)
+
     from ChatServiceApp.funcs import get_chat_receivers_for_user, get_msgs_for_chat_w_users
 
     receivers, unread_msgs_count = get_chat_receivers_for_user(request.user)
@@ -242,6 +248,8 @@ def support_tickets_ajax(request):
     if request.method != 'POST':
         raise Http404
 
+    lang = get_and_set_lang(request)
+
     html = get_profile_support_page_content_html(request)
 
     return JsonResponse({'html': html}, status=200)
@@ -255,6 +263,8 @@ def change_avatar_confirm_ajax(request):
     if request.method != 'POST':
         raise Http404
 
+    lang = get_and_set_lang(request)
+
     try:
 
         file_data = json.loads(request.body)
@@ -281,6 +291,8 @@ def change_profile_confirm_ajax(request):
     if request.method != 'POST':
         raise Http404
 
+    lang = get_and_set_lang(request)
+
     data = request.POST
     if not data:
         data = json.loads(request.body)
@@ -354,6 +366,8 @@ def dashboard_ajax(request):
     if request.method != 'POST':
         raise Http404
 
+    lang = get_and_set_lang(request)
+
     try:
 
         from .funcs import get_dashboard_page_content_html
@@ -372,6 +386,7 @@ def change_profile_ajax(request):
     if request.method != 'POST':
         raise Http404
 
+    lang = get_and_set_lang(request)
 
     html = get_profile_change_page_content_html(request)
     return JsonResponse({'html': html}, status=200)
@@ -382,6 +397,8 @@ def my_routes_ajax(request):
     if request.method != 'POST':
         raise Http404
 
+    lang = get_and_set_lang(request)
+
     Dict = {
     }
 
@@ -396,6 +413,8 @@ def login_ajax(request):
     if request.method != 'POST':
         raise Http404
 
+    lang = get_and_set_lang(request)
+
     try:
 
         data = request.POST
@@ -483,6 +502,9 @@ def registration_ajax(request):
     if request.method != 'POST':
         raise Http404
 
+    from GeneralApp.funcs import get_and_set_lang
+    lang = get_and_set_lang(request)
+
     try:
 
         data = request.POST

ChatServiceApp/js_views.py

@@ -24,6 +24,9 @@ def get_file_from_msg_ajax(request):
     if request.method != 'POST':
         raise Http404
 
+    from GeneralApp.funcs import get_and_set_lang
+    lang = get_and_set_lang(request)
+
     try:
 
         data = json.loads(request.body)
@@ -49,6 +52,9 @@ def show_chat_w_user_ajax(request):
     if request.method != 'POST':
         raise Http404
 
+    from GeneralApp.funcs import get_and_set_lang
+    lang = get_and_set_lang(request)
+
     try:
 
         data = json.loads(request.body)
@@ -74,6 +80,9 @@ def update_chat_ajax2(request):
     if request.method != 'POST':
         raise Http404
 
+    from GeneralApp.funcs import get_and_set_lang
+    lang = get_and_set_lang(request)
+
     res_Dict = {}
     msgs = []
     Dict = {}
@@ -163,6 +172,9 @@ def update_chat_ajax(request):
     if request.method != 'POST':
         raise Http404
 
+    from GeneralApp.funcs import get_and_set_lang
+    lang = get_and_set_lang(request)
+
     res_Dict = {}
     msgs = []
     Dict = {}
@@ -381,6 +393,9 @@ def support_show_chat_by_ticket_ajax(request):
     if request.method != 'POST':
         raise Http404
 
+    from GeneralApp.funcs import get_and_set_lang
+    lang = get_and_set_lang(request)
+
     try:
 
         data = json.loads(request.body)
@@ -434,6 +449,8 @@ def support_create_ticket_form_ajax(request):
     if request.method != 'POST':
         raise Http404
 
+    from GeneralApp.funcs import get_and_set_lang
+    lang = get_and_set_lang(request)
 
     Dict = {
         'form': TicketForm()
@@ -454,6 +471,9 @@ def create_ticket_ajax(request):
     if request.method != 'POST':
         raise Http404
 
+    from GeneralApp.funcs import get_and_set_lang
+    lang = get_and_set_lang(request)
+
     try:
 
         data = request.POST

GeneralApp/admin.py

@@ -47,7 +47,7 @@ class Admin_StaticPage(Admin_Trans_BaseModelViewPage):
         if request.user.is_superuser:
            return True
 
-        if obj.url in ('main', 'spec_technics', 'works'):
+        if not obj or obj.url in ('main', 'works'):
             return False
 
 admin.site.register(StaticPage,Admin_StaticPage)

GeneralApp/funcs.py

@@ -1,6 +1,29 @@
 from django.http import HttpResponse, Http404, FileResponse
 from django.conf import settings
 
+
+def get_and_set_lang(request):
+    from django.utils.translation import activate, get_language
+    lang = None
+
+    referer_url = request.META.get('HTTP_REFERER')
+    if referer_url:
+        url_list = referer_url.split('//')
+        if len(url_list) > 1:
+            url_list = url_list[1].split('/')
+            if len(url_list) > 1 and url_list[1] in settings.MODELTRANSLATION_LANGUAGES:
+                lang = url_list[1]
+
+    if not lang:
+        lang = get_language()
+
+    if not lang:
+        lang = 'en'
+
+    return activate(lang)
+
+
+
 def get_inter_Dict(user):
 
     from SubscribesApp.funcs import get_cur_user_subscribe

ReferenceDataApp/js_views.py

@@ -14,6 +14,7 @@ from django.urls import reverse
 from django.db.models import Q
 import json
 from GeneralApp.funcs import get_inter_http_respose
+from GeneralApp.funcs import get_and_set_lang
 
 def get_address_point_ajax(request):
     from .funcs import search_cities_in_db, search_airports_in_db
@@ -21,6 +22,9 @@ def get_address_point_ajax(request):
     if request.method != 'POST':
         raise Http404
 
+
+    lang = get_and_set_lang(request)
+
     try:
 
         data = json.loads(request.body)

RoutesApp/js_views.py

@@ -15,12 +15,16 @@ from django.template.loader import render_to_string
 from django.urls import reverse
 from .forms import *
 from .funcs import *
+from GeneralApp.funcs import get_and_set_lang
+
 
 
 def del_route_ajax(request):
     if request.method != 'POST':
         raise Http404
 
+    lang = get_and_set_lang(request)
+
     try:
 
         data = json.loads(request.body)
@@ -54,6 +58,8 @@ def edit_route_ajax(request):
     if request.method != 'POST':
         raise Http404
 
+    lang = get_and_set_lang(request)
+
     data = json.loads(request.body)
 
     Dict = {}
@@ -99,6 +105,8 @@ def new_route_view_ajax(request):
     if request.method != 'POST':
         raise Http404
 
+    lang = get_and_set_lang(request)
+
     # form = RouteForm()
     # Dict = {
     #     'form': form
@@ -132,6 +140,8 @@ def find_routes_ajax(request):
     if request.method != 'POST':
         raise Http404
 
+    lang = get_and_set_lang(request)
+
     try:
 
 
@@ -175,6 +185,8 @@ def get_my_routes_ajax(request):
     if request.method != 'POST':
         raise Http404
 
+    lang = get_and_set_lang(request)
+
     try:
         routes_Dict = get_routes_Dict(request.user)
         if 'errors' in routes_Dict:
@@ -206,6 +218,8 @@ def create_or_change_route_ajax(request, route_id=None):
     if request.method != 'POST':
         raise Http404
 
+    lang = get_and_set_lang(request)
+
     Dict = {}
 
     try:

SubscribesApp/funcs.py

@@ -1,5 +1,6 @@
 from .models import *
 from django.template.loader import render_to_string
+from django.utils.translation import get_language, activate
 
 def get_cur_user_subscribe(user):
 
@@ -26,6 +27,9 @@ def get_profile_subscribe_page_content_html(request):
 
     try:
 
+        from GeneralApp.funcs import get_and_set_lang
+        lang = get_and_set_lang(request)
+
         # data = json.loads(request.body)
         # all_options = SubscribeOption.objects.filter(enable=True)
         subscribes, all_options = get_subsribes_w_options()

SubscribesApp/js_views.py

@@ -16,7 +16,7 @@ import json
 from datetime import datetime, time, timedelta
 from channels.layers import get_channel_layer
 from asgiref.sync import async_to_sync
-
+from GeneralApp.funcs import get_and_set_lang
 
 
 @login_required(login_url='/profile/login/')
@@ -25,6 +25,8 @@ def subscribe_now_ajax(request):
     if request.method != 'POST':
         raise Http404
 
+    lang = get_and_set_lang(request)
+
     try:
 
         data = json.loads(request.body)
@@ -77,6 +79,8 @@ def show_cur_subscribe_ajax(request):
     if request.method != 'POST':
         raise Http404
 
+    lang = get_and_set_lang(request)
+
     html = get_profile_subscribe_page_content_html(request)
     return JsonResponse({'html': html}, status=200)
 

static/css/mobile_styles.css

@@ -121,6 +121,10 @@
         width: 70%;
     }
 
+    .dropdown{
+        vertical-align: sub;
+    }
+
     .handler_curtain_left{
         display: block;
     }
@@ -136,6 +140,10 @@
         transition: 200ms;
     }
 
+    .unsubscribe_info {
+    font-size: 12px;
+}
+
     .container_content_handler_curtain_left{
         display: flex;
         rotate: 90deg;
@@ -254,7 +262,7 @@
     }
 
     header{
-        padding: 5px 16px;
+        padding: 3px 16px;
         margin-top: unset;
     }
     .header_logo, .header_btn_mover, .header_btn_sender{
@@ -386,11 +394,14 @@
         margin-left: 5px;
     }
     .header_logo_mobile {
-        margin-right: 37px;
+        margin-right: 20px;
     }
     .line_f_header{
             top: 43px;
     }
+    header .header-second{
+        margin-top: 3px;
+    }
 
     .self_news_img{
         width: 40%;
@@ -495,6 +506,8 @@
     .footer_logo{
         text-align: center;
         margin: 40px 0;
+        max-width: 90px;
+        margin-left: 43%;
     }
 
     .footer_text_sub{

static/css/styles(boris).css

@@ -2201,7 +2201,7 @@ a.open_inf_carrier{
     height: 1px;
     background: #dad7d7;
     width: 100%;
-    top: 60px;
+    top: 100px;
     z-index: 999;
 }
 

static/css/styles.css

@@ -299,7 +299,8 @@ section.register>h1 {
     margin-bottom: 10px;
 }
 .footer_logo{
-    margin-bottom: 40px;
+    margin-bottom: 20px;
+    max-width: 45px;
 }
 
 footer>div {
@@ -502,10 +503,12 @@ footer>div {
 
 header .header-first {
     float: left;
-    margin-top: 12px;
+    /*margin-top: 12px;*/
 
 }
 
+
+
 .header_logo_mobile{
         display: none;
     }
@@ -663,6 +666,7 @@ header>div>a>span{
 
 header .header-second {
     float: right;
+    margin-top: 20px;
 
 }
 
@@ -2620,6 +2624,17 @@ button#send_feedback_form:active{
     /*  display: block;*/
     /*}*/
 
+.unsubscribe_info {
+    color: #27242499;
+    font-size: 12px;
+    margin-top: 5px;
+    background-color: white;
+    border-radius: 10px;
+}
+
+
+
+
     .tab-btn-1,
     .tab-btn-2 {
         display: inline-block;

static/js/chat_socket_functions/etc_operations_for_chat_socket.js

@@ -6,12 +6,14 @@ function update_count_unread_messages (data) {
         let list_unrd_parent = document.querySelectorAll(".icon_unread_messages")
         let i = 0
         for (i;i < list_unrd.length;i++){
+
             if (!list_unrd_parent[i].classList.contains("showed")){
                 list_unrd_parent[i].classList.toggle("showed")
-            }
+
                 list_unrd[i].innerHTML = data.unread_msgs_count.toString()
             }
         }
+    }
 }
 
 function play_required_beep (data,beep) {

templates/blocks/b_footer.html

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

templates/blocks/b_header.html

@@ -7,12 +7,12 @@
         <div class="header-first">
               <div class="header_logo">
                   <a href="{% url 'main' %}">
-                      <img class="svg" src="/static/img/svg/Logo.svg">
+                      <img class="svg" src="/static/img/png/finlogo.png" style="height: 90px;">
                   </a>
               </div>
               <div class="header_logo_mobile">
 {#                  <a href="/"><img class="svg" src="/static/img/svg/LogoMobile.svg"></a>#}
-                  <a href="{% url 'main' %}"><img class="svg" src="/static/img/svg/LogoMobile.svg"></a>
+                  <a href="{% url 'main' %}"><img class="svg" src="/static/img/png/finlogo.png" style="height: 30px;"></a>
               </div>
 
               <div   class="dropdown">

templates/blocks/profile/b_profile.html

@@ -67,7 +67,7 @@
         </div>
         <button class="confirm_profile_btn" onclick="change_profile_confirm(this)">
             <p id="save_changes_txt">
-                {% translate "Сохарнить" %}
+                {% translate "Сохранить" %}
             </p>
             <p id="changes_saved_txt">
                 {% translate "Изменения сохранены" %}

templates/blocks/profile/b_subscribe_current.html

@@ -10,6 +10,7 @@
             <div class="title_subscribe">{% translate "Ваш тарифный план" %}</div>
             <div class="name_subscribe">{{ subscribe_for_user.subscribe.name }}</div>
             <button class="extend_subscribe_btn">{% translate "Продлить" %}</button>
+            <div class="unsubscribe_info">*{% translate "для отмены подписки создайте запрос в техподдерже" %}</div>
             <div class="subscribe_was_paid">{% translate "оплачен до:" %}  {{ subscribe_for_user.paid_period_to_DT|date:"d.m.y" }}</div>
         </div>
         <div class="wrapper_switch_cont">

templates/blocks/profile/b_subscribe_variants.html

@@ -55,6 +55,8 @@
             </div>
             <div class="text-align-center">
                 <button onclick="send_subscribe({{ subscribe.id }})" class="arrange_subscribe">{% translate "Оформить подписку" %}</button>
+                <div class="unsubscribe_info">*{% translate "для отмены подписки создайте запрос в техподдерже" %}</div>
+
             </div>
         </div>
     {% endfor %}

templates/blocks/static_pages_blocks/b_about_service.html

@@ -61,7 +61,7 @@
 
         <div class="form_wrapper">
                 {% if page.url == 'contacts' or page.url == 'about_service' %}
-            <div id=title_static>{% blocktrans %}Мы всегда на <span class="color_title">связи</span>!{% endblocktrans %}</div>
+            <div id=title_static>{% blocktrans %}Мы всегда на <span class="color_title">связи!</span>{% endblocktrans %}</div>
             <span id="sub_title_static">{% translate "У вас есть вопрос? Отправьте нам сообщение" %}</span>
         {% endif %}
 

templates/blocks/static_pages_blocks/b_contacts.html

@@ -2,7 +2,7 @@
 {% load static %}
 
     {% if page.url == 'contacts' or page.url == 'about_service' %}
-            <div id=title_static>{% blocktrans %}Мы всегда на <span class="color_title">связи</span>!{% endblocktrans %}</div>
+            <div id=title_static>{% blocktrans %}Мы всегда на <span class="color_title">связи!</span>{% endblocktrans %}</div>
             <span id="sub_title_static">{% translate "У вас есть вопрос? Отправьте нам сообщение" %}</span>
         {% endif %}
 

templates/blocks/static_pages_blocks/b_customer_service.html

@@ -1,7 +1,7 @@
 {% load i18n %}
 
         {% if page.url == 'contacts' or page.url == 'about_service' %}
-            <div id=title_static>{% blocktrans %}Мы всегда на <span class="color_title">связи</span>!{% endblocktrans %}</div>
+            <div id=title_static>{% blocktrans %}Мы всегда на <span class="color_title">связи!</span>{% endblocktrans %}</div>
             <span id="sub_title_static">{% translate "У вас есть вопрос? Отправьте нам сообщение" %}</span>
         {% endif %}
 

templates/pages/p_main.html

@@ -58,7 +58,7 @@
         <h2 id="title_static">{% translate "О сервисе Trip With Bonus" %}</h2>
             <span id="sub_title_static">
                 <p>
-                    {% translate "TWB — это сервис, созданный для того, чтобы отправитель и перевозчик нашли друг-друга!" %}
+                    {% translate "TripWithBonus — это сервис, созданный для того, чтобы отправитель и перевозчик нашли друг-друга!" %}
                     {% translate "Наш сервис предлагает вам прямые контакты, а не является посредником!" %}
                 </p>
             </span>