fix bugs

Author: alexeev-prog

.gitignore

@@ -160,7 +160,7 @@ cython_debug/
 #  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
 #  and can be added to the global gitignore or merged into this file.  For a more nuclear
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
-#.idea/
+.idea/
 
 ignored/
 *.db

CHANGELOG.md

@@ -1,3 +1,9 @@
+commit caa9caba60cdb9c4c8253e52b7f2924df4059815
+Author: Alexeev Bronislav <[email protected]>
+Date:   Sun Apr 20 02:58:25 2025 +0700
+
+    fix docs
+
 commit a1617c83dd14fd359664e204443b69bce887afc4
 Author: Alexeev Bronislav <[email protected]>
 Date:   Sun Apr 20 02:56:37 2025 +0700

README.md

@@ -32,7 +32,7 @@
     <img src="https://img.shields.io/github/issues/alexeev-prog/pyEchoNext?style=for-the-badge">
     <img src="https://img.shields.io/github/last-commit/alexeev-prog/pyEchoNext?style=for-the-badge">
     <img src="https://img.shields.io/pypi/wheel/uvolution?style=for-the-badge">
-    <img src="https://img.shields.io/badge/coverage-54%25-54%25?style=for-the-badge" alt="">
+    <img src="https://img.shields.io/badge/coverage-73%25-73%25?style=for-the-badge" alt="">
     <img alt="PyPI - Downloads" src="https://img.shields.io/pypi/dm/pyEchoNext?style=for-the-badge">
     <img alt="PyPI - Version" src="https://img.shields.io/pypi/v/pyEchoNext?style=for-the-badge">
     <img alt="PyPI - Python Version" src="https://img.shields.io/pypi/pyversions/pyEchoNext?style=for-the-badge">
@@ -60,7 +60,7 @@ Welcome to **EchoNext**, where innovation meets simplicity! Are you tired of the
 
 **Imagine** a lightweight framework that empowers you to create modern web applications with lightning speed and flexibility. With EchoNext, you're not just coding; you're building a masterpiece!
 
- > Last stable version: 0.7.14 alpha
+ > Last stable version: 0.7.15 alpha
 
  > Next Big Update: ASYNC & unicorn support
 
@@ -105,7 +105,7 @@ Welcome to **EchoNext**, where innovation meets simplicity! Are you tired of the
 
 ## ⚙️ Functionality
 
- + i18n/l10n localization
+ + i18n/l10n localization with [hermes-langlib](https://github.com/alexeev-prog/hermes_langlib).
  + basic project documentation generator
  + request/response
  + middlewares (with basic session cookie middleware)
@@ -173,6 +173,99 @@ calculate(4) # Output: 16
 ## 💻 Usage Examples
 You can view examples at [examples directory](./examples).
 
+### i18n with hermes-langlib
+Hermes LangLib - a fast and light python library for translating, localizing and internationalizing your applications. The library is aimed at high speed and stability; it can be used in highly loaded projects.
+
+Directory tree:
+
+```
+├── example.toml
+└── locales
+    └── default.json
+```
+
+Example config-file `example.toml`:
+
+```toml
+locale_directory="locales"
+default_locale_file="default.json"
+default_language="RU_RU"
+translator="google"
+```
+
+Example locale file `locales/default.json`:
+
+```json
+{
+  "locales": {
+    "RU": ["RU_RU"],
+    "EN": ["EN_EN", "EN_US"]
+  },
+  "RU": {
+    "RU_RU": {
+      "title": "Библиотека для интернационализации",
+      "description": "Библиотека, которая позволит переводить ваши приложения",
+      "mails_message": {
+        "plural": "count",
+        "^0$": "У вас нет ни одного письма",
+        "11": "У вас есть {count} писем",
+        "1$|1$": "У вас есть {count} письмо",
+        "^(2|3|4)$|(2|3|4)$": "У вас есть {count} письма",
+        "other": "У вас есть {count} писем"
+      }
+    }
+  },
+  "EN": {
+    "EN_EN": {
+      "title": "Library for internationalization",
+      "description": "A library that will allow you to translate your applications",
+      "mails_message": {
+        "plural": "count",
+        "^0$": "You do not have any mail.",
+        "^1$": "You have a new mail.",
+        "other": "You have {count} new mails."
+      }
+    },
+    "EN_US": {
+      "title": "Library for internationalization",
+      "description": "A library that will allow you to translate your applications",
+      "mails_message": {
+        "plural": "count",
+        "^0$": "You do not have any mail.",
+        "^1$": "You have a new mail.",
+        "other": "You have {count} new mails."
+      }
+    }
+  }
+}
+```
+
+Example usage:
+
+```python
+from hermes_langlib.locales import LocaleManager
+from hermes_langlib.storage import load_config
+
+config = load_config('example.toml')
+
+locale_manager = LocaleManager(config)
+print(locale_manager.get('title - {version}', 'default', 'RU_RU', version="0.1.0"))
+print(locale_manager.get('title - {version}', 'default', 'RU', version="0.1.0"))
+print(locale_manager.get('mails_message.', 'default', 'RU_RU', count=0))
+print(locale_manager.get('mails_message', 'default', 'RU_RU', count=1))
+print(locale_manager.get('mails_message', 'default', 'RU_RU', count=11))
+print(locale_manager.get('mails_message', 'default', 'RU_RU', count=2))
+print(locale_manager.get('mails_message', 'default', 'RU_RU', count=22))
+print(locale_manager.get('mails_message', 'default', 'RU_RU', count=46))
+print(locale_manager.get('mails_message', 'default', 'RU_RU', count=100000001))
+print(locale_manager.translate("You have only three mails", "en", 'ru'))
+print(locale_manager.translate("У вас всего три письма", "ru", 'en'))
+```
+
+You can read [Hermes-Langlib Specification at this link](https://github.com/alexeev-prog/hermes_langlib/tree/main?tab=readme-ov-file#-specifications).
+
+<p align="right">(<a href="#readme-top">back to top</a>)</p>
+
 ### Basic With Depends Injection
 
 ```python
@@ -326,141 +419,6 @@ if __name__ == "__main__":
     main()
 ```
 
-### FullApp with locale, static files, docs generation
-Also see in [examples](./examples/example_locale.py)
-
-```python
-from pyechonext.apidoc_ui import APIDocUI, APIDocumentation
-from pyechonext.app import ApplicationType, EchoNext
-from pyechonext.config import SettingsConfigType, SettingsLoader
-from pyechonext.middleware import middlewares
-from pyechonext.mvc.controllers import PageController
-from pyechonext.static import StaticFile
-from pyechonext.template_engine.jinja import render_template
-from pyechonext.urls import URL
-from pyechonext.utils.exceptions import MethodNotAllow
-
-
-class UsersView(PageController):
-    def get(self, request, response, *args, **kwargs):
-        return render_template(
-            request,
-            "index.html",
-            user_name="User",
-            session_id=request.session_id,
-            friends=["Bob", "Anna", "John"],
-        )
-
-    def post(self, request, response, *args, **kwargs):
-        raise MethodNotAllow(f"Request {request.path}: method not allow")
-
-
-url_patterns = [URL(path="/users", controller=UsersView)]
-config_loader = SettingsLoader(SettingsConfigType.PYMODULE, "el_config.py")
-settings = config_loader.get_settings()
-static_files = [StaticFile(settings, "styles.css")]
-echonext = EchoNext(
-    __name__,
-    settings,
-    middlewares,
-    urls=url_patterns,
-    application_type=ApplicationType.HTML,
-    static_files=static_files,
-)
-apidoc = APIDocumentation(echonext)
-
-
-@echonext.route_page("/api-docs")
-def api_docs(request, response):
-    ui = APIDocUI(apidoc.generate_spec())
-    return ui.generate_html_page()
-
-
-@echonext.route_page("/book")
-class BooksResource(PageController):
-    """
-    This class describes a books resource.
-    """
-
-    def get(self, request, response, **kwargs):
-        """
-        get queries
-
-        :param      request:   The request
-        :type       request:   Request
-        :param      response:  The response
-        :type       response:  Response
-        :param      kwargs:    The keywords arguments
-        :type       kwargs:    dictionary
-
-        :returns:   result
-        :rtype:     str
-        """
-        return echonext.i18n_loader.get_string("title %{name}", name=str(request.GET))
-
-    def post(self, request, response, **kwargs):
-        """
-        post queries
-
-        :param      request:   The request
-        :type       request:   Request
-        :param      response:  The response
-        :type       response:  Response
-        :param      kwargs:    The keywords arguments
-        :type       kwargs:    dictionary
-
-        :returns:   result
-        :rtype:     str
-        """
-        return echonext.l10n_loader.format_currency(1305.50)
-
-```
-
-Create file `static/styles.css`:
-
-```css
-body {
-    color: #f8f2f2;
-    background: #1f1f1f;
-    font-family: monospace;
-}
-```
-
-Create file `el_config.py`:
-
-```python
-import os
-
-BASE_DIR = os.path.dirname(os.path.abspath(__file__))
-TEMPLATES_DIR = 'templates'
-SECRET_KEY = 'secret-key'
-LOCALE = 'RU_RU'
-LOCALE_DIR = 'locales'
-VERSION = "0.1.0"
-DESCRIPTION = 'Example echonext webapp'
-STATIC_DIR = 'static'
-```
-
-Create file `locales/RU_RU.json`:
-
-```python
-{
-    "i18n": {
-        "title": "pyEchoNext Веб-приложение с локалью",
-        "example one": "пример один"
-    },
-    "l10n": {
-        "date_format": "%Y-%m-%d",
-        "time_format": "%H:%M",
-        "date_time_fromat": "%Y-%m-%d %H:%M",
-        "thousands_separator": ",",
-        "decimal_separator": ".",
-        "currency_symbol": "$",
-        "currency_format": "{symbol}{amount}"
-    }
-}
-```
-
 <p align="right">(<a href="#readme-top">back to top</a>)</p>
 
 ## 🔧 Specifications

SECURITY.md

@@ -6,7 +6,8 @@ Use this section to tell people about which versions of your project are
 currently being supported with security updates.
 
 | Version | Supported          |
-| ------- | ------------------ |
+|---------| ------------------ |
+| 0.7.15  | :white_check_mark: |
 | 0.7.14  | :white_check_mark: |
 | 0.7.13  | :white_check_mark: |
 | 0.7.12  | :x:                |

docs/conf.py

@@ -9,7 +9,7 @@
 
 project = "pyEchoNext"
 author = "name"
-version = "0.7.14"
+version = "0.7.15"
 release = "0.7"
 project_copyright = "2025, Alexeev Bronislaw"
 

docs/index.rst

@@ -15,7 +15,6 @@ pyEchoNext documentation
    webapp_creation
    routes_and_views
    requests_responses
-   i18n_locales
    security
    mvc
    permissions

docs/pyechonext.i18n_l10n.rst

@@ -7,6 +7,7 @@
 from pyechonext.template_engine.jinja import render_template
 from pyechonext.urls import URL
 from pyechonext.utils.exceptions import MethodNotAllow
+from pyechonext.static import StaticFile
 
 
 class UsersView(PageController):
@@ -33,6 +34,7 @@ def post(self, request, response, **kwargs):
     __name__,
     settings,
     middlewares,
+    static_files=[StaticFile(settings, 'styles.css')],
     urls=url_patterns,
     application_type=ApplicationType.HTML,
 )

examples/random_examples/webapp.py

@@ -10,6 +10,7 @@
 from pyechonext.urls import URL
 
 
+
 class UsersPageController(PageController):
     def get(self, request, response, **kwargs):
         return Response(request, body={"users": "get"})