diff --git a/facefusion/installer.py b/facefusion/installer.py index 6cf76a80..4deebe2f 100644 --- a/facefusion/installer.py +++ b/facefusion/installer.py @@ -10,7 +10,7 @@ from types import FrameType from facefusion import metadata from facefusion.common_helper import is_linux, is_windows -LOCALS =\ +LOCALES =\ { 'install_dependency': 'install the {dependency} package', 'force_reinstall': 'force reinstall of packages', @@ -34,9 +34,9 @@ if is_linux(): def cli() -> None: signal.signal(signal.SIGINT, signal_exit) program = ArgumentParser(formatter_class = partial(HelpFormatter, max_help_position = 50)) - program.add_argument('--onnxruntime', help = LOCALS.get('install_dependency').format(dependency = 'onnxruntime'), choices = ONNXRUNTIME_SET.keys(), required = True) - program.add_argument('--force-reinstall', help = LOCALS.get('force_reinstall'), action = 'store_true') - program.add_argument('--skip-conda', help = LOCALS.get('skip_conda'), action = 'store_true') + program.add_argument('--onnxruntime', help = LOCALES.get('install_dependency').format(dependency = 'onnxruntime'), choices = ONNXRUNTIME_SET.keys(), required = True) + program.add_argument('--force-reinstall', help = LOCALES.get('force_reinstall'), action = 'store_true') + program.add_argument('--skip-conda', help = LOCALES.get('skip_conda'), action = 'store_true') program.add_argument('-v', '--version', version = metadata.get('name') + ' ' + metadata.get('version'), action = 'version') run(program) @@ -54,7 +54,7 @@ def run(program : ArgumentParser) -> None: commands.append('--force-reinstall') if not args.skip_conda and not has_conda: - sys.stdout.write(LOCALS.get('conda_not_activated') + os.linesep) + sys.stdout.write(LOCALES.get('conda_not_activated') + os.linesep) sys.exit(1) with open('requirements.txt') as file: diff --git a/facefusion/locals.py b/facefusion/locales.py similarity index 99% rename from facefusion/locals.py rename to facefusion/locales.py index 08cc187c..2959b2eb 100644 --- a/facefusion/locals.py +++ b/facefusion/locales.py @@ -1,6 +1,6 @@ -from facefusion.types import Locals +from facefusion.types import Locales -LOCALS : Locals =\ +LOCALES : Locales =\ { 'en': { diff --git a/facefusion/processors/modules/age_modifier/locals.py b/facefusion/processors/modules/age_modifier/locales.py similarity index 83% rename from facefusion/processors/modules/age_modifier/locals.py rename to facefusion/processors/modules/age_modifier/locales.py index 90cf9e06..c72bbbb4 100644 --- a/facefusion/processors/modules/age_modifier/locals.py +++ b/facefusion/processors/modules/age_modifier/locales.py @@ -1,6 +1,6 @@ -from facefusion.types import Locals +from facefusion.types import Locales -LOCALS : Locals =\ +LOCALES : Locales =\ { 'en': { diff --git a/facefusion/processors/modules/background_remover/locals.py b/facefusion/processors/modules/background_remover/locales.py similarity index 88% rename from facefusion/processors/modules/background_remover/locals.py rename to facefusion/processors/modules/background_remover/locales.py index 854f589f..e65082c0 100644 --- a/facefusion/processors/modules/background_remover/locals.py +++ b/facefusion/processors/modules/background_remover/locales.py @@ -1,6 +1,6 @@ -from facefusion.types import Locals +from facefusion.types import Locales -LOCALS : Locals =\ +LOCALES : Locales =\ { 'en': { diff --git a/facefusion/processors/modules/deep_swapper/locals.py b/facefusion/processors/modules/deep_swapper/locales.py similarity index 81% rename from facefusion/processors/modules/deep_swapper/locals.py rename to facefusion/processors/modules/deep_swapper/locales.py index 112de49d..4c42c951 100644 --- a/facefusion/processors/modules/deep_swapper/locals.py +++ b/facefusion/processors/modules/deep_swapper/locales.py @@ -1,6 +1,6 @@ -from facefusion.types import Locals +from facefusion.types import Locales -LOCALS : Locals =\ +LOCALES : Locales =\ { 'en': { diff --git a/facefusion/processors/modules/expression_restorer/locals.py b/facefusion/processors/modules/expression_restorer/locales.py similarity index 88% rename from facefusion/processors/modules/expression_restorer/locals.py rename to facefusion/processors/modules/expression_restorer/locales.py index 0fd4c7d0..2e1c6da8 100644 --- a/facefusion/processors/modules/expression_restorer/locals.py +++ b/facefusion/processors/modules/expression_restorer/locales.py @@ -1,6 +1,6 @@ -from facefusion.types import Locals +from facefusion.types import Locales -LOCALS : Locals =\ +LOCALES : Locales =\ { 'en': { diff --git a/facefusion/processors/modules/face_debugger/locals.py b/facefusion/processors/modules/face_debugger/locales.py similarity index 75% rename from facefusion/processors/modules/face_debugger/locals.py rename to facefusion/processors/modules/face_debugger/locales.py index 412a68e9..db33a82e 100644 --- a/facefusion/processors/modules/face_debugger/locals.py +++ b/facefusion/processors/modules/face_debugger/locales.py @@ -1,6 +1,6 @@ -from facefusion.types import Locals +from facefusion.types import Locales -LOCALS : Locals =\ +LOCALES : Locales =\ { 'en': { diff --git a/facefusion/processors/modules/face_editor/locals.py b/facefusion/processors/modules/face_editor/locales.py similarity index 96% rename from facefusion/processors/modules/face_editor/locals.py rename to facefusion/processors/modules/face_editor/locales.py index 86a134b3..c400c23e 100644 --- a/facefusion/processors/modules/face_editor/locals.py +++ b/facefusion/processors/modules/face_editor/locales.py @@ -1,6 +1,6 @@ -from facefusion.types import Locals +from facefusion.types import Locales -LOCALS : Locals =\ +LOCALES : Locales =\ { 'en': { diff --git a/facefusion/processors/modules/face_enhancer/locals.py b/facefusion/processors/modules/face_enhancer/locales.py similarity index 86% rename from facefusion/processors/modules/face_enhancer/locals.py rename to facefusion/processors/modules/face_enhancer/locales.py index 9e3d78d1..5cd314d1 100644 --- a/facefusion/processors/modules/face_enhancer/locals.py +++ b/facefusion/processors/modules/face_enhancer/locales.py @@ -1,6 +1,6 @@ -from facefusion.types import Locals +from facefusion.types import Locales -LOCALS : Locals =\ +LOCALES : Locales =\ { 'en': { diff --git a/facefusion/processors/modules/face_swapper/locals.py b/facefusion/processors/modules/face_swapper/locales.py similarity index 87% rename from facefusion/processors/modules/face_swapper/locals.py rename to facefusion/processors/modules/face_swapper/locales.py index a1680a54..ac48146a 100644 --- a/facefusion/processors/modules/face_swapper/locals.py +++ b/facefusion/processors/modules/face_swapper/locales.py @@ -1,6 +1,6 @@ -from facefusion.types import Locals +from facefusion.types import Locales -LOCALS : Locals =\ +LOCALES : Locales =\ { 'en': { diff --git a/facefusion/processors/modules/frame_colorizer/locals.py b/facefusion/processors/modules/frame_colorizer/locales.py similarity index 86% rename from facefusion/processors/modules/frame_colorizer/locals.py rename to facefusion/processors/modules/frame_colorizer/locales.py index cad3678e..8c439944 100644 --- a/facefusion/processors/modules/frame_colorizer/locals.py +++ b/facefusion/processors/modules/frame_colorizer/locales.py @@ -1,6 +1,6 @@ -from facefusion.types import Locals +from facefusion.types import Locales -LOCALS : Locals =\ +LOCALES : Locales =\ { 'en': { diff --git a/facefusion/processors/modules/frame_enhancer/locals.py b/facefusion/processors/modules/frame_enhancer/locales.py similarity index 82% rename from facefusion/processors/modules/frame_enhancer/locals.py rename to facefusion/processors/modules/frame_enhancer/locales.py index 4b707a0f..2df9ff91 100644 --- a/facefusion/processors/modules/frame_enhancer/locals.py +++ b/facefusion/processors/modules/frame_enhancer/locales.py @@ -1,6 +1,6 @@ -from facefusion.types import Locals +from facefusion.types import Locales -LOCALS : Locals =\ +LOCALES : Locales =\ { 'en': { diff --git a/facefusion/processors/modules/lip_syncer/locals.py b/facefusion/processors/modules/lip_syncer/locales.py similarity index 81% rename from facefusion/processors/modules/lip_syncer/locals.py rename to facefusion/processors/modules/lip_syncer/locales.py index bf53c31a..62bc259f 100644 --- a/facefusion/processors/modules/lip_syncer/locals.py +++ b/facefusion/processors/modules/lip_syncer/locales.py @@ -1,6 +1,6 @@ -from facefusion.types import Locals +from facefusion.types import Locales -LOCALS : Locals =\ +LOCALES : Locales =\ { 'en': { diff --git a/facefusion/translator.py b/facefusion/translator.py index f2f4e3ff..9f5fb4f1 100644 --- a/facefusion/translator.py +++ b/facefusion/translator.py @@ -1,29 +1,29 @@ import importlib from typing import Optional -from facefusion.types import Language, LocalPoolSet, Locals +from facefusion.types import Language, LocalePoolSet, Locales -LOCAL_POOL_SET : LocalPoolSet = {} +LOCALE_POOL_SET : LocalePoolSet = {} CURRENT_LANGUAGE : Language = 'en' def __autoload__(module_name : str) -> None: try: - __locals__ = importlib.import_module(module_name + '.locals') - load(__locals__.LOCALS, module_name) + __locales__ = importlib.import_module(module_name + '.locales') + load(__locales__.LOCALES, module_name) except ImportError: pass -def load(__locals__ : Locals, module_name : str) -> None: - LOCAL_POOL_SET[module_name] = __locals__ +def load(__locales__ : Locales, module_name : str) -> None: + LOCALE_POOL_SET[module_name] = __locales__ def get(notation : str, module_name : str = 'facefusion') -> Optional[str]: - if module_name not in LOCAL_POOL_SET: + if module_name not in LOCALE_POOL_SET: __autoload__(module_name) - current = LOCAL_POOL_SET.get(module_name).get(CURRENT_LANGUAGE) + current = LOCALE_POOL_SET.get(module_name).get(CURRENT_LANGUAGE) for fragment in notation.split('.'): if fragment in current: diff --git a/facefusion/types.py b/facefusion/types.py index ac58699d..1503ed71 100755 --- a/facefusion/types.py +++ b/facefusion/types.py @@ -51,8 +51,8 @@ FaceStore = TypedDict('FaceStore', }) Language = Literal['en'] -Locals : TypeAlias = Dict[Language, Dict[str, Any]] -LocalPoolSet : TypeAlias = Dict[str, Locals] +Locales : TypeAlias = Dict[Language, Dict[str, Any]] +LocalePoolSet : TypeAlias = Dict[str, Locales] VideoCaptureSet : TypeAlias = Dict[str, cv2.VideoCapture] VideoWriterSet : TypeAlias = Dict[str, cv2.VideoWriter] diff --git a/tests/test_translator.py b/tests/test_translator.py index dbf85280..3773cb9e 100644 --- a/tests/test_translator.py +++ b/tests/test_translator.py @@ -1,11 +1,11 @@ from facefusion import translator -from facefusion.locals import LOCALS +from facefusion.locales import LOCALES def test_load() -> None: - translator.load(LOCALS, __name__) + translator.load(LOCALES, __name__) - assert __name__ in translator.LOCAL_POOL_SET + assert __name__ in translator.LOCALE_POOL_SET def test_get() -> None: