diff --git a/src/core/__init__.py b/src/core/__init__.py index d6a9e2c..99a4920 100644 --- a/src/core/__init__.py +++ b/src/core/__init__.py @@ -56,7 +56,7 @@ if config.Server['debug'] is True: # i18n init log.debug("Initializing i18n...") ml = MultiLanguage() -ml.set_language(args.language) +ml.set_language(args.language or config.Server['language']) ml.builtins_hook() log.debug("Initializing EventsSystem...") diff --git a/src/main.py b/src/main.py index bef5518..fc41bb9 100644 --- a/src/main.py +++ b/src/main.py @@ -12,7 +12,7 @@ import argparse parser = argparse.ArgumentParser(description='KuiToi-Server - BeamingDrive server compatible with BeamMP clients!') parser.add_argument('-v', '--version', action="store_true", help='Print version and exit.', default=False) parser.add_argument('--config', help='Patch to config file.', nargs='?', default=None, type=str) -parser.add_argument('--language', help='Setting localisation.', nargs='?', default="en", type=str) +parser.add_argument('--language', help='Setting localisation.', nargs='?', default=None, type=str) if __name__ == '__main__': diff --git a/src/modules/ConfigProvider/config_provider.py b/src/modules/ConfigProvider/config_provider.py index c0ec705..4e13e72 100644 --- a/src/modules/ConfigProvider/config_provider.py +++ b/src/modules/ConfigProvider/config_provider.py @@ -7,17 +7,19 @@ # Licence: FPA # (c) kuitoi.su 2023 import os +import secrets import yaml class Config: - def __init__(self, auth=None, game=None, server=None): + def __init__(self, auth=None, game=None, server=None, web=None): self.Auth = auth or {"key": None, "private": True} self.Game = game or {"map": "gridmap_v2", "players": 8, "max_cars": 1} - self.Server = server or {"name": "KuiToi-Server", - "description": "This server uses KuiToi!", - "server_port": 30814, "server_ip": "0.0.0.0", "debug": False} + self.Server = server or {"name": "KuiToi-Server", "description": "Welcome to KuiToi Server!", "language": "en", + "server_ip": "0.0.0.0", "server_port": 30814, "debug": False} + # self.WebAPI = web or {"enabled": False, "server_ip": "127.0.0.1", "server_port": 8433, + # "secret_key": secrets.token_hex(16)} def __repr__(self): return "%s(Auth=%r, Game=%r, Server=%r)" % (self.__class__.__name__, self.Auth, self.Game, self.Server) diff --git a/src/modules/i18n/i18n.py b/src/modules/i18n/i18n.py index 4f216cc..4a4c6ca 100644 --- a/src/modules/i18n/i18n.py +++ b/src/modules/i18n/i18n.py @@ -78,7 +78,7 @@ class MultiLanguage: def set_language(self, language): if language is None: - return + language = "en" self.log.debug(f"set_language({language})") self.language = language if language != "en":