Merge branch 'develop'
This commit is contained in:
commit
0d40816f15
@ -47,10 +47,10 @@ class LangManager:
|
|||||||
case.lower()
|
case.lower()
|
||||||
)
|
)
|
||||||
|
|
||||||
def translate(self, token: Union[Enum, str]) -> Union[Dict, str]:
|
def translate(self, token) -> Union[Dict, str]:
|
||||||
translation_key = str(token)
|
translation_key = str(token)
|
||||||
|
|
||||||
if isinstance(token, type) and type(token).__name__ == 'EnumType':
|
if isinstance(token, type) and 'enum' in type(token).__name__.lower():
|
||||||
values = {}
|
values = {}
|
||||||
for enum_item in token:
|
for enum_item in token:
|
||||||
tkey = self.enum_to_translation_key(enum_item)
|
tkey = self.enum_to_translation_key(enum_item)
|
||||||
|
|||||||
@ -11,7 +11,7 @@ class ModelManager:
|
|||||||
self._lang_manager = lang_manager
|
self._lang_manager = lang_manager
|
||||||
self._database_manager = database_manager
|
self._database_manager = database_manager
|
||||||
|
|
||||||
def t(self, token: Union[Enum, str]) -> Union[Dict, str]:
|
def t(self, token) -> Union[Dict, str]:
|
||||||
return self.lang_manager.translate(token)
|
return self.lang_manager.translate(token)
|
||||||
|
|
||||||
@property
|
@property
|
||||||
|
|||||||
@ -143,7 +143,7 @@ class PluginStore:
|
|||||||
|
|
||||||
# LANGS
|
# LANGS
|
||||||
self._model_store.lang().load(directory=plugin.get_directory(), prefix=plugin.use_id())
|
self._model_store.lang().load(directory=plugin.get_directory(), prefix=plugin.use_id())
|
||||||
self._model_store.variable().reload(lang_map=self._model_store.lang().map())
|
self._model_store.variable().reload()
|
||||||
|
|
||||||
# WEB CONTROLLERS
|
# WEB CONTROLLERS
|
||||||
self.load_controllers(plugin)
|
self.load_controllers(plugin)
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user