telegram_libs 0.1.6__tar.gz → 0.1.7__tar.gz

{telegram_libs-0.1.6 → telegram_libs-0.1.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: telegram_libs
-Version: 0.1.6
+Version: 0.1.7
 Summary: Common libraries for Telegram bots
 Author: Andrey Gritsaenko gricaenko.95a@gmail.com
 Requires-Python: >=3.11,<4.0

{telegram_libs-0.1.6 → telegram_libs-0.1.7}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "telegram_libs"
-version = "0.1.6"
+version = "0.1.7"
 description = "Common libraries for Telegram bots"
 authors = ["Andrey Gritsaenko gricaenko.95a@gmail.com"]
 readme = "README.md"

{telegram_libs-0.1.6 → telegram_libs-0.1.7}/src/telegram_libs/__init__.py

@@ -2,4 +2,4 @@
 Telegram Libs - Common libraries for Telegram bots
 """
 
-__version__ = "0.1.6" 
+__version__ = "0.1.7"

telegram_libs-0.1.7/src/telegram_libs/locales/en.json

@@ -0,0 +1,10 @@
+{
+  "subscription": {
+    "choose_plan": "Choose a subscription plan:",
+    "plans": {
+      "1month": "1 Month - 250 Stars",
+      "3months": "3 Months - 500 Stars",
+      "1year": "1 Year - 1600 Stars"
+    }
+  }
+}

telegram_libs-0.1.7/src/telegram_libs/locales/ru.json

@@ -0,0 +1,10 @@
+{
+  "subscription": {
+    "choose_plan": "Выберите план подписки:",
+    "plans": {
+      "1month": "1 месяц - 250 Stars",
+      "3months": "3 месяца - 500 Stars",
+      "1year": "1 год - 1600 Stars"
+    }
+  }
+}

{telegram_libs-0.1.6 → telegram_libs-0.1.7}/src/telegram_libs/subscription.py

@@ -52,4 +52,4 @@ def check_subscription_status(user_id: int) -> bool:
         return False
         
     expiration = datetime.fromisoformat(subscription["premium_expiration"])
-    return expiration > datetime.now() 
+    return expiration > datetime.now()

{telegram_libs-0.1.6 → telegram_libs-0.1.7}/src/telegram_libs/translation.py

@@ -3,37 +3,55 @@ import os
 from typing import Any
 
 
-def load_translations() -> dict:
-    """Load translations from locales directory
-
-    Returns:
-        dict: Translations dictionary
-    """
+def _load_translations_from_dir(locales_dir: str) -> dict:
+    """Helper to load translations from a given directory"""
     translations = {}
-    # Get the project's root directory (where the script is being run from)
-    project_root = os.path.abspath(os.getcwd())
-    locales_dir = os.path.join(project_root, 'locales')
-    
     if not os.path.exists(locales_dir):
-        print(f"Warning: No 'locales' directory found in {project_root}")
+        print(f"Warning: No 'locales' directory found in {locales_dir}")
         return translations
-    
     for filename in os.listdir(locales_dir):
         if filename.endswith('.json'):
             lang = filename.split('.')[0]
             with open(os.path.join(locales_dir, filename), 'r', encoding='utf-8') as f:
                 translations[lang] = json.load(f)
-    
     return translations
 
+
+def load_translations() -> dict:
+    """Load translations from locales directory
+
+    Returns:
+        dict: Translations dictionary
+    """
+    # Get the project's root directory (where the script is being run from)
+    project_root = os.path.abspath(os.getcwd())
+    locales_dir = os.path.join(project_root, 'locales')
+    return _load_translations_from_dir(locales_dir)
+
+
+def load_common_translations() -> dict:
+    """Load translations from locales directory in the project
+
+    Returns:
+        dict: Translations dictionary
+    """
+    locales_dir = os.path.join(os.path.dirname(__file__), 'locales')
+    return _load_translations_from_dir(locales_dir)
+
+
 TRANSLATIONS = load_translations()
+COMMON_TRANSLATIONS = load_common_translations()
+
 
-def t(key: str, lang: str = 'ru', **kwargs: Any) -> str:
+def t(key: str, lang: str = 'ru', common: bool = False, **kwargs: Any) -> str:
     """Get translation for a key with optional formatting"""
     try:
         # Support nested keys like "buttons.start"
         keys = key.split('.')
-        value = TRANSLATIONS[lang]
+        if common:
+            value = COMMON_TRANSLATIONS[lang]
+        else:
+            value = TRANSLATIONS[lang]
         for k in keys:
             value = value[k]
         
@@ -41,5 +59,5 @@ def t(key: str, lang: str = 'ru', **kwargs: Any) -> str:
     except KeyError:
         # Fallback to English if translation missing
         if lang != 'en':
-            return t(key, 'en', **kwargs)
+            return t(key, 'en', common=common, **kwargs)
         return key  # Return the key itself as last resort

{telegram_libs-0.1.6 → telegram_libs-0.1.7}/src/telegram_libs/utils.py

@@ -24,15 +24,15 @@ async def get_subscription_keyboard(update: Update, lang: str) -> InlineKeyboard
     return [
         [
             InlineKeyboardButton(
-                t("subscription.plans.1month", lang), callback_data="sub_1month"
+                t("subscription.plans.1month", lang, common=True), callback_data="sub_1month"
             ),
             InlineKeyboardButton(
-                t("subscription.plans.3months", lang), callback_data="sub_3months"
+                t("subscription.plans.3months", lang, common=True), callback_data="sub_3months"
             ),
         ],
         [
             InlineKeyboardButton(
-                t("subscription.plans.1year", lang), callback_data="sub_1year"
+                t("subscription.plans.1year", lang, common=True), callback_data="sub_1year"
             ),
         ],
     ]