Compare commits
5 Commits
Author | SHA1 | Date | |
---|---|---|---|
a843f77290 | |||
21ce78f475 | |||
753255e649 | |||
b40d1fe911 | |||
ce0503500a |
@@ -1,5 +1,5 @@
|
||||
__name__ = "libbot"
|
||||
__version__ = "0.4"
|
||||
__version__ = "0.6"
|
||||
__license__ = "GPL3"
|
||||
__author__ = "Profitroll"
|
||||
|
||||
|
@@ -31,7 +31,7 @@ async def _(key: str, *args: str, locale: str = sync.config_get("locale")) -> An
|
||||
)
|
||||
)
|
||||
except FileNotFoundError:
|
||||
return f'⚠️ Locale in config is invalid: could not get "{key}" in {str(args)} from locale "{locale}"'
|
||||
return f'⚠️ Locale in config is invalid: could not get "{key}" in {args} from locale "{locale}"'
|
||||
|
||||
this_key = this_dict
|
||||
for dict_key in args:
|
||||
@@ -40,7 +40,7 @@ async def _(key: str, *args: str, locale: str = sync.config_get("locale")) -> An
|
||||
try:
|
||||
return this_key[key]
|
||||
except KeyError:
|
||||
return f'⚠️ Locale in config is invalid: could not get "{key}" in {str(args)} from locale "{locale}"'
|
||||
return f'⚠️ Locale in config is invalid: could not get "{key}" in {args} from locale "{locale}"'
|
||||
|
||||
|
||||
async def in_all_locales(key: str, *args: str) -> list:
|
||||
@@ -55,13 +55,9 @@ async def in_all_locales(key: str, *args: str) -> list:
|
||||
"""
|
||||
|
||||
output = []
|
||||
valid_locales = []
|
||||
|
||||
files_locales = listdir(await config_get("locale", "locations"))
|
||||
|
||||
for entry in files_locales:
|
||||
valid_locales.append(".".join(entry.split(".")[:-1]))
|
||||
|
||||
valid_locales = [".".join(entry.split(".")[:-1]) for entry in files_locales]
|
||||
for lc in valid_locales:
|
||||
try:
|
||||
this_dict = await json_read(
|
||||
|
77
libbot/i18n/sync/__init__.py
Normal file
77
libbot/i18n/sync/__init__.py
Normal file
@@ -0,0 +1,77 @@
|
||||
from os import listdir
|
||||
from pathlib import Path
|
||||
from typing import Any
|
||||
|
||||
from libbot import sync
|
||||
from libbot.sync import config_get, json_read
|
||||
|
||||
|
||||
def _(key: str, *args: str, locale: str = sync.config_get("locale")) -> Any:
|
||||
"""Get value of locale string
|
||||
|
||||
### Args:
|
||||
* key (`str`): The last key of the locale's keys path
|
||||
* *args (`list`): Path to key like: `dict[args][key]`
|
||||
* locale (`str`): Locale to looked up in. Defaults to config's `"locale"` value
|
||||
|
||||
### Returns:
|
||||
* `Any`: Value of provided locale key. Is usually `str`, `dict` or `list`
|
||||
"""
|
||||
if locale is None:
|
||||
locale = sync.config_get("locale")
|
||||
|
||||
try:
|
||||
this_dict = json_read(
|
||||
Path(f'{config_get("locale", "locations")}/{locale}.json')
|
||||
)
|
||||
except FileNotFoundError:
|
||||
try:
|
||||
this_dict = json_read(
|
||||
Path(f'{config_get("locale", "locations")}/{config_get("locale")}.json')
|
||||
)
|
||||
except FileNotFoundError:
|
||||
return f'⚠️ Locale in config is invalid: could not get "{key}" in {args} from locale "{locale}"'
|
||||
|
||||
this_key = this_dict
|
||||
for dict_key in args:
|
||||
this_key = this_key[dict_key]
|
||||
|
||||
try:
|
||||
return this_key[key]
|
||||
except KeyError:
|
||||
return f'⚠️ Locale in config is invalid: could not get "{key}" in {args} from locale "{locale}"'
|
||||
|
||||
|
||||
def in_all_locales(key: str, *args: str) -> list:
|
||||
"""Get value of the provided key and path in all available locales
|
||||
|
||||
### Args:
|
||||
* key (`str`): The last key of the locale's keys path.
|
||||
* *args (`list`): Path to key like: `dict[args][key]`.
|
||||
|
||||
### Returns:
|
||||
* `list`: List of values in all locales
|
||||
"""
|
||||
|
||||
output = []
|
||||
files_locales = listdir(config_get("locale", "locations"))
|
||||
|
||||
valid_locales = [".".join(entry.split(".")[:-1]) for entry in files_locales]
|
||||
for lc in valid_locales:
|
||||
try:
|
||||
this_dict = json_read(
|
||||
Path(f'{config_get("locale", "locations")}/{lc}.json')
|
||||
)
|
||||
except FileNotFoundError:
|
||||
continue
|
||||
|
||||
this_key = this_dict
|
||||
for dict_key in args:
|
||||
this_key = this_key[dict_key]
|
||||
|
||||
try:
|
||||
output.append(this_key[key])
|
||||
except KeyError:
|
||||
continue
|
||||
|
||||
return output
|
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
|
||||
|
||||
[project]
|
||||
name = "libbot"
|
||||
version = "0.4"
|
||||
version = "0.6"
|
||||
authors = [{ name = "Profitroll" }]
|
||||
description = "Universal bot library with functions needed for basic Discord/Telegram bot development."
|
||||
readme = "README.md"
|
||||
@@ -36,7 +36,7 @@ Documentation = "https://git.end-play.xyz/profitroll/LibBotUniversal/wiki"
|
||||
Tracker = "https://git.end-play.xyz/profitroll/LibBotUniversal/issues"
|
||||
|
||||
[tool.setuptools]
|
||||
packages = ["libbot", "libbot.i18n", "libbot.sync"]
|
||||
packages = ["libbot", "libbot.i18n", "libbot.sync", "libbot.i18n.sync"]
|
||||
|
||||
[tool.setuptools_scm]
|
||||
|
||||
|
Reference in New Issue
Block a user