Fix #16.

Birdi7 · Jul 18, 2019 · 542dd7f · 542dd7f
1 parent 14e5718
commit 542dd7f
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/core/handlers.py b/core/handlers.py
@@ -118,6 +118,10 @@ async def language_choice_handler(query: types.CallbackQuery, callback_data: dic
     await query.answer()
     await db.update_user(query.from_user.id,
                          locale=callback_data['user_locale'])
+
+    from core.strings import i18n
+    i18n.ctx_locale.set(callback_data['user_locale'])
+
     await bot.send_message(query.from_user.id,
                            strings.language_set)
 

diff --git a/core/strings/__init__.py b/core/strings/__init__.py
@@ -1,5 +1,8 @@
 from .scripts import (
     on_startup,
-    LANGUAGE_MAPPING
+    LANGUAGE_MAPPING,
+    i18n
 )
+
+
 from .keys import *
diff --git a/core/strings/keys.py b/core/strings/keys.py
@@ -1,7 +1,12 @@
-from .scripts import _
+from .scripts import i18n
 
 # no f-strings here!
 
+
+def _(string, cache_enable=False):
+    return i18n.lazy_gettext(string, cache_enable=cache_enable)
+
+
 start_cmd = _("start_cmd_text")
 help_cmd = _("help_command_text, formats: {name}")
 drop_cmd = _("drop_cmd_text")

diff --git a/core/strings/scripts.py b/core/strings/scripts.py
@@ -15,8 +15,6 @@ def on_startup(dp: Dispatcher):
     dp.middleware.setup(i18n)
 
 
-_ = i18n.lazy_gettext
-
 LANGUAGE_MAPPING = {
     'ru': 'Русский',
     'en': 'Английский'