Changed imports

This commit is contained in:
Profitroll 2023-08-06 12:42:37 +02:00
parent 723cc40221
commit 783443e448
Signed by: profitroll
GPG Key ID: FA35CAB49DACD3B2
2 changed files with 16 additions and 14 deletions

View File

@ -2,7 +2,8 @@ from os import listdir
from pathlib import Path from pathlib import Path
from typing import Any, Dict, Union from typing import Any, Dict, Union
from libbot import config_get, json_read, sync import libbot
from libbot.i18n import sync
from libbot.i18n.classes.bot_locale import BotLocale from libbot.i18n.classes.bot_locale import BotLocale
@ -23,14 +24,14 @@ async def _(
### Returns: ### Returns:
* `Any`: Value of provided locale key. Is usually `str`, `dict` or `list` * `Any`: Value of provided locale key. Is usually `str`, `dict` or `list`
""" """
locale = sync.config_get("locale") if locale is None else locale locale = libbot.sync.config_get("locale") if locale is None else locale
try: try:
this_dict = await json_read(Path(f"{locales_root}/{locale}.json")) this_dict = await libbot.json_read(Path(f"{locales_root}/{locale}.json"))
except FileNotFoundError: except FileNotFoundError:
try: try:
this_dict = await json_read( this_dict = await libbot.json_read(
Path(f'{locales_root}/{await config_get("locale")}.json') Path(f'{locales_root}/{await libbot.config_get("locale")}.json')
) )
except FileNotFoundError: except FileNotFoundError:
return f'⚠️ Locale in config is invalid: could not get "{key}" in {args} from locale "{locale}"' return f'⚠️ Locale in config is invalid: could not get "{key}" in {args} from locale "{locale}"'
@ -65,7 +66,7 @@ async def in_all_locales(
valid_locales = [".".join(entry.split(".")[:-1]) for entry in files_locales] valid_locales = [".".join(entry.split(".")[:-1]) for entry in files_locales]
for lc in valid_locales: for lc in valid_locales:
try: try:
this_dict = await json_read(Path(f"{locales_root}/{lc}.json")) this_dict = await libbot.json_read(Path(f"{locales_root}/{lc}.json"))
except FileNotFoundError: except FileNotFoundError:
continue continue
@ -101,7 +102,7 @@ async def in_every_locale(
valid_locales = [".".join(entry.split(".")[:-1]) for entry in files_locales] valid_locales = [".".join(entry.split(".")[:-1]) for entry in files_locales]
for lc in valid_locales: for lc in valid_locales:
try: try:
this_dict = await json_read(Path(f"{locales_root}/{lc}.json")) this_dict = await libbot.json_read(Path(f"{locales_root}/{lc}.json"))
except FileNotFoundError: except FileNotFoundError:
continue continue

View File

@ -2,8 +2,7 @@ from os import listdir
from pathlib import Path from pathlib import Path
from typing import Any, Dict, Union from typing import Any, Dict, Union
from libbot import sync import libbot
from libbot.sync import config_get, json_read
def _( def _(
@ -24,13 +23,15 @@ def _(
* `Any`: Value of provided locale key. Is usually `str`, `dict` or `list` * `Any`: Value of provided locale key. Is usually `str`, `dict` or `list`
""" """
if locale is None: if locale is None:
locale = sync.config_get("locale") locale = libbot.sync.config_get("locale")
try: try:
this_dict = json_read(Path(f"{locales_root}/{locale}.json")) this_dict = libbot.sync.json_read(Path(f"{locales_root}/{locale}.json"))
except FileNotFoundError: except FileNotFoundError:
try: try:
this_dict = json_read(Path(f'{locales_root}/{config_get("locale")}.json')) this_dict = libbot.sync.json_read(
Path(f'{locales_root}/{libbot.sync.config_get("locale")}.json')
)
except FileNotFoundError: except FileNotFoundError:
return f'⚠️ Locale in config is invalid: could not get "{key}" in {args} from locale "{locale}"' return f'⚠️ Locale in config is invalid: could not get "{key}" in {args} from locale "{locale}"'
@ -64,7 +65,7 @@ def in_all_locales(
valid_locales = [".".join(entry.split(".")[:-1]) for entry in files_locales] valid_locales = [".".join(entry.split(".")[:-1]) for entry in files_locales]
for lc in valid_locales: for lc in valid_locales:
try: try:
this_dict = json_read(Path(f"{locales_root}/{lc}.json")) this_dict = libbot.sync.json_read(Path(f"{locales_root}/{lc}.json"))
except FileNotFoundError: except FileNotFoundError:
continue continue
@ -100,7 +101,7 @@ def in_every_locale(
valid_locales = [".".join(entry.split(".")[:-1]) for entry in files_locales] valid_locales = [".".join(entry.split(".")[:-1]) for entry in files_locales]
for lc in valid_locales: for lc in valid_locales:
try: try:
this_dict = json_read(Path(f"{locales_root}/{lc}.json")) this_dict = libbot.sync.json_read(Path(f"{locales_root}/{lc}.json"))
except FileNotFoundError: except FileNotFoundError:
continue continue