From b52a57f95a2343ca2c0c4f9e6d8443bb3e5747f7 Mon Sep 17 00:00:00 2001 From: adator <85586985+adator85@users.noreply.github.com> Date: Fri, 7 Nov 2025 22:46:09 +0100 Subject: [PATCH] Fix library path in settings.py --- core/classes/modules/settings.py | 2 +- core/irc.py | 17 ++++++----------- core/language/fr/core-fr.yaml | 2 ++ 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/core/classes/modules/settings.py b/core/classes/modules/settings.py index 913fbbc..3026359 100644 --- a/core/classes/modules/settings.py +++ b/core/classes/modules/settings.py @@ -7,7 +7,7 @@ from typing import Any, Optional, TYPE_CHECKING from core.definition import MSModule, MAdmin if TYPE_CHECKING: - from core.classes.user import User + from core.classes.modules.user import User class Settings: """This Class will never be reloaded. diff --git a/core/irc.py b/core/irc.py index 2fd8616..7efe779 100644 --- a/core/irc.py +++ b/core/irc.py @@ -129,7 +129,6 @@ class Irc: # Define the IrcSocket object self.IrcSocket: Optional[Union[socket.socket, SSLSocket]] = None - self.__create_table() self.Base.create_thread(func=self.heartbeat, func_args=(self.beat, )) ############################################## @@ -353,11 +352,6 @@ class Irc: self.Protocol.send2socket(f":{self.Config.SERVEUR_LINK} SASL {self.Settings.MAIN_SERVER_HOSTNAME} {s.client_uid} D F") self.Protocol.send2socket(f":{self.Config.SERVEUR_LINK} 904 {s.username} :SASL authentication failed") - def __create_table(self) -> None: - """## Create core tables - """ - pass - def get_defender_uptime(self) -> str: """Savoir depuis quand Defender est connecté @@ -526,6 +520,7 @@ class Irc: RED = self.Config.COLORS.red GREEN = self.Config.COLORS.green + BLACK = self.Config.COLORS.black NOGC = self.Config.COLORS.nogc # Defender information @@ -596,7 +591,7 @@ class Irc: nick_to=fromuser, msg=tr("You can't use this command anymore ! Please use [%sauth] instead", self.Config.SERVICE_PREFIX) ) - return False + return None if current_nickname is None: self.Logs.critical(f"This nickname [{fromuser}] don't exist") @@ -641,7 +636,7 @@ class Irc: self.Base.db_create_first_admin() self.insert_db_admin(current_uid, cmd_owner, 5, self.Config.LANG) self.Protocol.send_priv_msg( - msg=f"[ {self.Config.COLORS.green}{str(current_command).upper()} ]{self.Config.COLORS.black} - {self.User.get_nickname(fromuser)} est désormais connecté a {dnickname}", + msg=f"[ {GREEN}{str(current_command).upper()} {NOGC}] - {self.User.get_nickname(fromuser)} est désormais connecté a {dnickname}", nick_from=dnickname, channel=dchanlog ) @@ -649,11 +644,11 @@ class Irc: self.Protocol.send_notice( nick_from=dnickname, nick_to=fromuser, - msg=f"Connexion a {dnickname} réussie!" + msg=tr("Successfuly connected to %s", dnickname) ) else: self.Protocol.send_priv_msg( - msg=f"[ {self.Config.COLORS.red}{str(current_command).upper()} ]{self.Config.COLORS.black} - {self.User.get_nickname(fromuser)} a tapé un mauvais mot de pass", + msg=f"[ {RED}{str(current_command).upper()} {NOGC}] - {self.User.get_nickname(fromuser)} a tapé un mauvais mot de pass", nick_from=dnickname, channel=dchanlog ) @@ -661,7 +656,7 @@ class Irc: self.Protocol.send_notice( nick_from=dnickname, nick_to=fromuser, - msg=f"Mot de passe incorrecte" + msg=tr("Wrong password!") ) case 'auth': diff --git a/core/language/fr/core-fr.yaml b/core/language/fr/core-fr.yaml index d879cfb..2f491d0 100644 --- a/core/language/fr/core-fr.yaml +++ b/core/language/fr/core-fr.yaml @@ -2,6 +2,8 @@ traduction: # Message help - orig: "Access denied!" trad: "Accès refusé." + - orig: "Wrong password!" + tard: "Mot de passe incorrect!" - orig: "%s - %sLoaded%s by %s on %s" trad: "%s - %sChargé%s par %s le %s" - orig: "%s - %sNot Loaded%s"