From 3020c6d7e6684bbb9f081204815a85a30304a9c5 Mon Sep 17 00:00:00 2001
From: SDE <strigevitch@syncsystems.net>
Date: Tue, 24 Sep 2024 13:16:57 +0300
Subject: [PATCH] 0.6.0 switch off ru lang

---
 GeneralApp/funcs.py             |  3 +++
 pAerBim/settings.py             | 10 ++++++----
 pAerBim/translate_middleware.py | 18 ++++++++++++++++++
 templates/blocks/b_curtain.html | 28 ++++++++++++++--------------
 templates/blocks/b_header.html  | 30 +++++++++++++++---------------
 5 files changed, 56 insertions(+), 33 deletions(-)
 create mode 100644 pAerBim/translate_middleware.py

diff --git a/GeneralApp/funcs.py b/GeneralApp/funcs.py
index 0a3255f..742349f 100644
--- a/GeneralApp/funcs.py
+++ b/GeneralApp/funcs.py
@@ -1,6 +1,9 @@
 from django.http import HttpResponse, Http404, FileResponse
 from admin_interface.templatetags.admin_interface_tags import get_admin_interface_theme
 
+from BaseModels.functions import translit
+
+
 def get_logo_url():
     theme = get_admin_interface_theme()
     return theme.logo.url
diff --git a/pAerBim/settings.py b/pAerBim/settings.py
index 3d0eb22..24a1a8c 100644
--- a/pAerBim/settings.py
+++ b/pAerBim/settings.py
@@ -76,6 +76,7 @@ MIDDLEWARE = [
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
+    'pAerBim.translate_middleware.LocaleMiddleware'
     # 'AuthApp.middleware.ResponseInterceptionMiddleware',
 ]
 
@@ -148,7 +149,7 @@ AUTH_PASSWORD_VALIDATORS = [
 # Internationalization
 # https://docs.djangoproject.com/en/4.2/topics/i18n/
 
-LANGUAGE_CODE = 'ru'
+LANGUAGE_CODE = 'en'
 
 TIME_ZONE = 'Europe/Minsk'
 
@@ -185,13 +186,14 @@ LOCALE_PATHS = (
 
 gettext = lambda s: s
 LANGUAGES = (
-    (u'ru', gettext(u'Russian')),
     (u'en', gettext(u'English')),
+    (u'ru', gettext(u'Russian')),
+
 )
-MODELTRANSLATION_LANGUAGES = ('ru', 'en')
+MODELTRANSLATION_LANGUAGES = ('en', 'ru')
 MODELTRANSLATION_ENABLE_FALLBACKS = True
 MODELTRANSLATION_FALLBACK_LANGUAGES = {
-    'default': ('ru','en'),
+    'default': ('en',),
 }
 
 # Add custom languages not provided by Django
diff --git a/pAerBim/translate_middleware.py b/pAerBim/translate_middleware.py
new file mode 100644
index 0000000..95c6852
--- /dev/null
+++ b/pAerBim/translate_middleware.py
@@ -0,0 +1,18 @@
+from django.utils import translation
+
+class LocaleMiddleware(object):
+
+    def __init__(self, get_response):
+        self.get_response = get_response
+
+    def __call__(self, request):
+
+        language_code = 'en'
+
+        translation.activate(language_code)
+
+        response = self.get_response(request)
+
+        translation.deactivate()
+
+        return response
\ No newline at end of file
diff --git a/templates/blocks/b_curtain.html b/templates/blocks/b_curtain.html
index 848e737..c43b4a0 100644
--- a/templates/blocks/b_curtain.html
+++ b/templates/blocks/b_curtain.html
@@ -5,20 +5,20 @@
     <div class="cut-width">
         <div class="container_curtain_content">
             <div class="container_first_line_curtain">
-                <div class="language_select close curtain">
-                    <div class="first_line_language_select pointer" onclick="open_select_language()">
-                        <div class="name_language standart_txt curtain">RU</div>
-                        <div class="arrow_language_select">
-                            <img class="img_arrow_language_select" src="{% static "images/language_icon.svg" %}">
-                        </div>
-                        <div class="clear_both"></div>
-                    </div>
-                    <div class="content_select_language">
-                        <div class="standart_txt pointer" onclick="select_language(this)">RU</div>
-                        <div class="splinner_select_language"></div>
-                        <div class="standart_txt pointer" onclick="select_language(this)">EN</div>
-                    </div>
-                </div>
+{#                <div class="language_select close curtain">#}
+{#                    <div class="first_line_language_select pointer" onclick="open_select_language()">#}
+{#                        <div class="name_language standart_txt curtain">RU</div>#}
+{#                        <div class="arrow_language_select">#}
+{#                            <img class="img_arrow_language_select" src="{% static "images/language_icon.svg" %}">#}
+{#                        </div>#}
+{#                        <div class="clear_both"></div>#}
+{#                    </div>#}
+{#                    <div class="content_select_language">#}
+{#                        <div class="standart_txt pointer" onclick="select_language(this)">RU</div>#}
+{#                        <div class="splinner_select_language"></div>#}
+{#                        <div class="standart_txt pointer" onclick="select_language(this)">EN</div>#}
+{#                    </div>#}
+{#                </div>#}
                 <div class="standart_txt orange curtain_txt_float">
 {#                    {% translate "Личный кабинет" %}#}
                 </div>
diff --git a/templates/blocks/b_header.html b/templates/blocks/b_header.html
index d069776..543fbb7 100644
--- a/templates/blocks/b_header.html
+++ b/templates/blocks/b_header.html
@@ -14,21 +14,21 @@
 {#                <a href="{% url 'docs_main' %}" class="standart_txt text_header last_left pointer">{% trans "Поддержка" %}</a>#}
             {% endif %}
             <a href="{% url 'contacts' %}" class="standart_txt text_header last_left pointer">{% translate "Контакты" %}</a>
-            <div class="splitter_text_header"></div>
-            <div class="language_select close">
-                <div class="first_line_language_select pointer" onclick="open_select_language()">
-                    <div class="name_language standart_txt">ru</div>
-                    <div class="arrow_language_select">
-                        <img class="img_arrow_language_select" src="{% static "images/language_icon.svg" %}">
-                    </div>
-                    <div class="clear_both"></div>
-                </div>
-                <div class="content_select_language">
-                    <div class="standart_txt pointer" onclick="select_language(this)">ru</div>
-                    <div class="splinner_select_language"></div>
-                    <div class="standart_txt pointer" onclick="select_language(this)">en</div>
-                </div>
-            </div>
+{#            <div class="splitter_text_header"></div>#}
+{#            <div class="language_select close">#}
+{#                <div class="first_line_language_select pointer" onclick="open_select_language()">#}
+{#                    <div class="name_language standart_txt">ru</div>#}
+{#                    <div class="arrow_language_select">#}
+{#                        <img class="img_arrow_language_select" src="{% static "images/language_icon.svg" %}">#}
+{#                    </div>#}
+{#                    <div class="clear_both"></div>#}
+{#                </div>#}
+{#                <div class="content_select_language">#}
+{#                    <div class="standart_txt pointer" onclick="select_language(this)">ru</div>#}
+{#                    <div class="splinner_select_language"></div>#}
+{#                    <div class="standart_txt pointer" onclick="select_language(this)">en</div>#}
+{#                </div>#}
+{#            </div>#}
 {#            <a class="standart_txt text_header last_right orange pointer">Личный кабинет</a>#}
         </div>
         <div class="right_part_header_mobile">