diff --git a/res/i18n/ts/de_DE.ts b/res/i18n/ts/de_DE.ts index bfc68a54360f3b9401d342197c9d91c099ecd186..4539f69cdfe61e8f16e8df701c96e0d4e176e3de 100644 --- a/res/i18n/ts/de_DE.ts +++ b/res/i18n/ts/de_DE.ts @@ -992,8 +992,8 @@ This money transfer will be removed and not sent.</source> </message> <message> <location filename="../../ui/homescreen.ui" line="127"/> - <source>Get to know more about duniter</source> - <translation type="obsolete">Erstmal mehr über duniter erfahren</translation> + <source>Get to know more about ucoin</source> + <translation type="obsolete">Erstmal mehr über ucoin erfahren</translation> </message> <message> <location filename="../../../src/cutecoin/gui/homescreen.py" line="35"/> @@ -1698,7 +1698,7 @@ This money transfer will be removed and not sent.</source> <source> <h1>Cutecoin</h1> - <p>Python/Qt duniter client</p> + <p>Python/Qt uCoin client</p> <p>Version : {:}</p> {new_version_text} @@ -1714,7 +1714,7 @@ This money transfer will be removed and not sent.</source> <translation type="obsolete"> <h1>Cutecoin</h1> - <p>Python/Qt duniter client</p> + <p>Python/Qt uCoin client</p> <p>Fassung : {:}</p> {new_version_text} @@ -1793,7 +1793,7 @@ This money transfer will be removed and not sent.</source> <source> <h1>sakia</h1> - <p>Python/Qt duniter client</p> + <p>Python/Qt uCoin client</p> <p>Version : {:}</p> {new_version_text} @@ -2173,22 +2173,22 @@ Are you sure ?</source> <context> <name>ProcessConfigureCommunity</name> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="230"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="240"/> <source>Configure community {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="233"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="243"/> <source>Add a community</source> <translation type="unfinished">Community hinzufügen</translation> </message> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="266"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="276"/> <source>Error</source> <translation type="unfinished">Fehler</translation> </message> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="295"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="305"/> <source>Delete</source> <translation type="unfinished">Löschen</translation> </message> @@ -2379,54 +2379,64 @@ Are you sure ?</source> <context> <name>StepPageInit</name> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="96"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="101"/> <source>Could not find your identity on the network.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="130"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="138"/> <source>Broadcasting identity...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="134"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="142"/> <source>UID broadcast</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="134"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="142"/> <source>Identity broadcasted to the network</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="141"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="149"/> <source>Error</source> <translation type="unfinished">Fehler</translation> </message> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="141"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="149"/> <source>{0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="145"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="153"/> <source>Your pubkey or UID was already found on the network. Yours : {0}, the network : {1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="148"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="156"/> <source>Your account already exists on the network</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="98"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="103"/> <source>Your pubkey or UID is different on the network. Yours : {0}, the network : {1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="154"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="124"/> + <source>connecting...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="164"/> + <source>Could not connect. Check hostname, ip address or port</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="162"/> <source>Could not connect. Check node peering entry</source> <translation type="unfinished"></translation> </message> @@ -2927,7 +2937,7 @@ Sie können die UID nur widerrufen, wenn sie noch nicht vom Netzwerk validiert w <context> <name>self.config_dialog</name> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="194"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="204"/> <source>Ok</source> <translation type="unfinished">OK</translation> </message> diff --git a/res/i18n/ts/es_ES.ts b/res/i18n/ts/es_ES.ts index e6c8b450914a3a6f0ab6c01e90ae73b72ec7e3c9..3370177e73358b4443bd239af4506ce7e744737d 100644 --- a/res/i18n/ts/es_ES.ts +++ b/res/i18n/ts/es_ES.ts @@ -1006,8 +1006,8 @@ Esta transferencia de dinero será eliminado y no se ha enviado.</translation> </message> <message> <location filename="../../ui/homescreen.ui" line="127"/> - <source>Get to know more about duniter</source> - <translation type="obsolete">Conozca más sobre duniter</translation> + <source>Get to know more about ucoin</source> + <translation type="obsolete">Conozca más sobre uCoin</translation> </message> <message> <location filename="../../../src/cutecoin/gui/homescreen.py" line="35"/> @@ -1707,7 +1707,7 @@ Esta transferencia de dinero será eliminado y no se ha enviado.</translation> <source> <h1>Cutecoin</h1> - <p>Python/Qt duniter client</p> + <p>Python/Qt uCoin client</p> <p>Version : {:}</p> {new_version_text} @@ -1723,7 +1723,7 @@ Esta transferencia de dinero será eliminado y no se ha enviado.</translation> <translation type="obsolete"> <h1>CuteCoin</h1> - <p>Python / Qt duniter cliente</p> + <p>Python / Qt uCoin cliente</p> <p>Version : {:}</p> {new_version_text} @@ -1802,7 +1802,7 @@ Esta transferencia de dinero será eliminado y no se ha enviado.</translation> <source> <h1>sakia</h1> - <p>Python/Qt duniter client</p> + <p>Python/Qt uCoin client</p> <p>Version : {:}</p> {new_version_text} @@ -2233,22 +2233,22 @@ Su cuenta no será retirado de las redes a las que se unieron. <context> <name>ProcessConfigureCommunity</name> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="230"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="240"/> <source>Configure community {0}</source> <translation>Configurar comunidad {0}</translation> </message> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="233"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="243"/> <source>Add a community</source> <translation>Añadir una comunidad</translation> </message> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="266"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="276"/> <source>Error</source> <translation>Error</translation> </message> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="295"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="305"/> <source>Delete</source> <translation>Borrar</translation> </message> @@ -2487,27 +2487,27 @@ Would you like to publish the key ?</source> <context> <name>StepPageInit</name> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="96"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="101"/> <source>Could not find your identity on the network.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="130"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="138"/> <source>Broadcasting identity...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="134"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="142"/> <source>UID broadcast</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="134"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="142"/> <source>Identity broadcasted to the network</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="141"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="149"/> <source>Error</source> <translation type="unfinished">Error</translation> </message> @@ -2517,29 +2517,39 @@ Would you like to publish the key ?</source> <translation type="obsolete">{0} : {1}</translation> </message> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="141"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="149"/> <source>{0}</source> <translation type="unfinished">{0}</translation> </message> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="145"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="153"/> <source>Your pubkey or UID was already found on the network. Yours : {0}, the network : {1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="148"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="156"/> <source>Your account already exists on the network</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="98"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="103"/> <source>Your pubkey or UID is different on the network. Yours : {0}, the network : {1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="154"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="124"/> + <source>connecting...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="164"/> + <source>Could not connect. Check hostname, ip address or port</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="162"/> <source>Could not connect. Check node peering entry</source> <translation type="unfinished"></translation> </message> @@ -3215,7 +3225,7 @@ Revocar de su UID sólo puede éxito si no está ya validado por la red.</transl <context> <name>self.config_dialog</name> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="194"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="204"/> <source>Ok</source> <translation type="unfinished">Ok</translation> </message> diff --git a/res/i18n/ts/fr_FR.ts b/res/i18n/ts/fr_FR.ts index f027fd70caabe62d928f079445a5d8d9f8e723ed..c69989b04130640404dc57c735a12483c4612a1b 100644 --- a/res/i18n/ts/fr_FR.ts +++ b/res/i18n/ts/fr_FR.ts @@ -1162,8 +1162,8 @@ Le transfert de monnaie sera annulé et non envoyé.</translation> </message> <message> <location filename="../../ui/homescreen.ui" line="127"/> - <source>Get to know more about duniter</source> - <translation type="obsolete">En savoir plus sur duniter</translation> + <source>Get to know more about ucoin</source> + <translation type="obsolete">En savoir plus sur ucoin</translation> </message> <message> <location filename="../../../src/cutecoin/gui/homescreen.py" line="35"/> @@ -1848,7 +1848,7 @@ Le transfert de monnaie sera annulé et non envoyé.</translation> <source> <h1>Cutecoin</h1> - <p>Python/Qt duniter client</p> + <p>Python/Qt uCoin client</p> <p>Version : {:}</p> {new_version_text} @@ -1864,7 +1864,7 @@ Le transfert de monnaie sera annulé et non envoyé.</translation> <translation type="obsolete"> <h1>Cutecoin</h1> - <p>Client Python/Qt pour duniter</p> + <p>Client Python/Qt pour uCoin</p> <p>Version : {:}</p> {new_version_text} @@ -2034,7 +2034,7 @@ Le transfert de monnaie sera annulé et non envoyé.</translation> <source> <h1>Cutecoin</h1> - <p>Python/Qt duniter client</p> + <p>Python/Qt uCoin client</p> <p>Version : {:}</p> {new_version_text} @@ -2051,7 +2051,7 @@ Le transfert de monnaie sera annulé et non envoyé.</translation> <translation type="obsolete"> <h1>Cutecoin</h1> - <p>Python/Qt duniter client</p> + <p>Python/Qt uCoin client</p> <p>Version : {:}</p> {new_version_text} @@ -2071,7 +2071,7 @@ Le transfert de monnaie sera annulé et non envoyé.</translation> <source> <h1>sakia</h1> - <p>Python/Qt duniter client</p> + <p>Python/Qt uCoin client</p> <p>Version : {:}</p> {new_version_text} @@ -2088,7 +2088,7 @@ Le transfert de monnaie sera annulé et non envoyé.</translation> <translation> <h1>sakia</h1> - <p>Python/Qt duniter client</p> + <p>Python/Qt uCoin client</p> <p>Version : {:}</p> {new_version_text} @@ -2533,22 +2533,22 @@ Votre compte ne sera pas supprimer des réseaux rejoins. <context> <name>ProcessConfigureCommunity</name> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="230"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="240"/> <source>Configure community {0}</source> <translation>Configurer la communauté {0}</translation> </message> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="233"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="243"/> <source>Add a community</source> <translation>Ajouter une communauté</translation> </message> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="266"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="276"/> <source>Error</source> <translation>Erreur</translation> </message> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="295"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="305"/> <source>Delete</source> <translation>Supprimer</translation> </message> @@ -2797,44 +2797,44 @@ Souhaitez-vous publier votre clé publique ?</translation> <context> <name>StepPageInit</name> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="96"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="101"/> <source>Could not find your identity on the network.</source> <translation>Impossible de trouver votre identité sur le réseau.</translation> </message> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="130"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="138"/> <source>Broadcasting identity...</source> <translation>Diffusion de votre identité...</translation> </message> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="134"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="142"/> <source>UID broadcast</source> <translation>Diffusion de l'UID</translation> </message> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="134"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="142"/> <source>Identity broadcasted to the network</source> <translation>Identité diffusée sur le réseau</translation> </message> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="141"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="149"/> <source>Error</source> <translation>Erreur</translation> </message> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="141"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="149"/> <source>{0}</source> <translation>{0}</translation> </message> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="145"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="153"/> <source>Your pubkey or UID was already found on the network. Yours : {0}, the network : {1}</source> <translation>Votre clé publique ou votre UID est déja présent sur le réseau. Vous : {0}, le réseau : {1}</translation> </message> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="148"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="156"/> <source>Your account already exists on the network</source> <translation>Votre compte existe déjà sur le réseau</translation> </message> @@ -2846,14 +2846,24 @@ Vous : {0}, le réseau : {1}</translation> Le votre : {0}, le réseau : {1}</translation> </message> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="98"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="103"/> <source>Your pubkey or UID is different on the network. Yours : {0}, the network : {1}</source> <translation>Votre clé publique ou votre UID est différent sur le réseau. De votre coté : {0}, du coté du réseau : {1}</translation> </message> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="154"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="124"/> + <source>connecting...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="164"/> + <source>Could not connect. Check hostname, ip address or port</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="162"/> <source>Could not connect. Check node peering entry</source> <translation type="unfinished"></translation> </message> @@ -3600,7 +3610,7 @@ Revoking your UID can only success if it is not already validated by the network <context> <name>self.config_dialog</name> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="194"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="204"/> <source>Ok</source> <translation>Ok</translation> </message> diff --git a/res/i18n/ts/it_IT.ts b/res/i18n/ts/it_IT.ts index c87a0e8af6b135217196243f5d260b67505afad8..6580c815144f03ab238ce58e30328360372728bc 100644 --- a/res/i18n/ts/it_IT.ts +++ b/res/i18n/ts/it_IT.ts @@ -995,8 +995,8 @@ Questo trasferimento di denaro sarà rimosso e non inviato.</translation> </message> <message> <location filename="../../ui/homescreen.ui" line="127"/> - <source>Get to know more about duniter</source> - <translation type="obsolete">Accedere a più di conoscenze su duniter</translation> + <source>Get to know more about ucoin</source> + <translation type="obsolete">Accedere a più di conoscenze su ucoin</translation> </message> <message> <location filename="../../../src/cutecoin/gui/homescreen.py" line="35"/> @@ -1701,7 +1701,7 @@ Questo trasferimento di denaro sarà rimosso e non inviato.</translation> <source> <h1>Cutecoin</h1> - <p>Python/Qt duniter client</p> + <p>Python/Qt uCoin client</p> <p>Version : {:}</p> {new_version_text} @@ -1717,7 +1717,7 @@ Questo trasferimento di denaro sarà rimosso e non inviato.</translation> <translation type="obsolete"> <h1>Cutecoin</h1> - <p>Python/Qt duniter cliente</p> + <p>Python/Qt uCoin cliente</p> <p>Versione : {:}</p> {new_version_text} @@ -1796,7 +1796,7 @@ Questo trasferimento di denaro sarà rimosso e non inviato.</translation> <source> <h1>sakia</h1> - <p>Python/Qt duniter client</p> + <p>Python/Qt uCoin client</p> <p>Version : {:}</p> {new_version_text} @@ -2227,22 +2227,22 @@ sei sicuro ?</translation> <context> <name>ProcessConfigureCommunity</name> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="230"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="240"/> <source>Configure community {0}</source> <translation>Configura comunità {0}</translation> </message> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="233"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="243"/> <source>Add a community</source> <translation>Aggiungi una comunità </translation> </message> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="266"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="276"/> <source>Error</source> <translation>Errore</translation> </message> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="295"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="305"/> <source>Delete</source> <translation>Elimina</translation> </message> @@ -2481,27 +2481,27 @@ Vuoi pubblicare la chiave?</translation> <context> <name>StepPageInit</name> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="96"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="101"/> <source>Could not find your identity on the network.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="130"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="138"/> <source>Broadcasting identity...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="134"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="142"/> <source>UID broadcast</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="134"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="142"/> <source>Identity broadcasted to the network</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="141"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="149"/> <source>Error</source> <translation type="unfinished">Errore</translation> </message> @@ -2511,29 +2511,39 @@ Vuoi pubblicare la chiave?</translation> <translation type="obsolete">{0} : {1}</translation> </message> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="141"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="149"/> <source>{0}</source> <translation type="unfinished">{0}</translation> </message> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="145"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="153"/> <source>Your pubkey or UID was already found on the network. Yours : {0}, the network : {1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="148"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="156"/> <source>Your account already exists on the network</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="98"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="103"/> <source>Your pubkey or UID is different on the network. Yours : {0}, the network : {1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="154"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="124"/> + <source>connecting...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="164"/> + <source>Could not connect. Check hostname, ip address or port</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="162"/> <source>Could not connect. Check node peering entry</source> <translation type="unfinished"></translation> </message> @@ -3217,7 +3227,7 @@ Revoca tuo UID può solo successo se non è già convalidato dalla rete.</transl <context> <name>self.config_dialog</name> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="194"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="204"/> <source>Ok</source> <translation>Ok</translation> </message> diff --git a/res/i18n/ts/pl_PL.ts b/res/i18n/ts/pl_PL.ts index 1d652bcef39b12ac264996fb7dd8a654e82ff02b..ed5086a3c4d234e84203862b9ac938634acce51c 100644 --- a/res/i18n/ts/pl_PL.ts +++ b/res/i18n/ts/pl_PL.ts @@ -930,8 +930,8 @@ Ten przelew zostanie usuniÄ™ty i nie wysÅ‚aÅ‚.</translation> </message> <message> <location filename="../../ui/homescreen.ui" line="127"/> - <source>Get to know more about duniter</source> - <translation type="obsolete">Dowiedz siÄ™ wiÄ™cej na temat duniter</translation> + <source>Get to know more about ucoin</source> + <translation type="obsolete">Dowiedz siÄ™ wiÄ™cej na temat uCoin</translation> </message> <message> <location filename="../../../src/cutecoin/gui/homescreen.py" line="35"/> @@ -1626,7 +1626,7 @@ Ten przelew zostanie usuniÄ™ty i nie wysÅ‚aÅ‚.</translation> <source> <h1>Cutecoin</h1> - <p>Python/Qt duniter client</p> + <p>Python/Qt uCoin client</p> <p>Version : {:}</p> {new_version_text} @@ -1642,7 +1642,7 @@ Ten przelew zostanie usuniÄ™ty i nie wysÅ‚aÅ‚.</translation> <translation type="obsolete"> <h1>Cutecoin</h1> - <p>Python/Qt duniter client</p> + <p>Python/Qt uCoin client</p> <p>Wersja : {:}</p> {new_version_text} @@ -1721,7 +1721,7 @@ Ten przelew zostanie usuniÄ™ty i nie wysÅ‚aÅ‚.</translation> <source> <h1>sakia</h1> - <p>Python/Qt duniter client</p> + <p>Python/Qt uCoin client</p> <p>Version : {:}</p> {new_version_text} @@ -2119,22 +2119,22 @@ Are you sure ?</source> <context> <name>ProcessConfigureCommunity</name> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="230"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="240"/> <source>Configure community {0}</source> <translation>Skonfiguruj spoÅ‚ecznoÅ›ci {0}</translation> </message> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="233"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="243"/> <source>Add a community</source> <translation>Dodać spoÅ‚ecznoÅ›ci</translation> </message> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="266"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="276"/> <source>Error</source> <translation>Błąd</translation> </message> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="295"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="305"/> <source>Delete</source> <translation>Kasować</translation> </message> @@ -2338,27 +2338,27 @@ ChciaÅ‚byÅ› opublikować klucz ?</translation> <context> <name>StepPageInit</name> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="96"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="101"/> <source>Could not find your identity on the network.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="130"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="138"/> <source>Broadcasting identity...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="134"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="142"/> <source>UID broadcast</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="134"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="142"/> <source>Identity broadcasted to the network</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="141"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="149"/> <source>Error</source> <translation type="unfinished">Błąd</translation> </message> @@ -2368,29 +2368,39 @@ ChciaÅ‚byÅ› opublikować klucz ?</translation> <translation type="obsolete">{0} : {1}</translation> </message> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="141"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="149"/> <source>{0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="145"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="153"/> <source>Your pubkey or UID was already found on the network. Yours : {0}, the network : {1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="148"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="156"/> <source>Your account already exists on the network</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="98"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="103"/> <source>Your pubkey or UID is different on the network. Yours : {0}, the network : {1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="154"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="124"/> + <source>connecting...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="164"/> + <source>Could not connect. Check hostname, ip address or port</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="162"/> <source>Could not connect. Check node peering entry</source> <translation type="unfinished"></translation> </message> @@ -3049,7 +3059,7 @@ OdwoÅ‚anie UID może tylko sukcesem, jeÅ›li nie jest on już zatwierdzony przez <context> <name>self.config_dialog</name> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="194"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="204"/> <source>Ok</source> <translation>Ok</translation> </message> diff --git a/res/i18n/ts/pt_BR.ts b/res/i18n/ts/pt_BR.ts index 1278d9b2e562e9d6282b0b07fff99560480be914..024effa72142e81503fe110687886c4039850494 100644 --- a/res/i18n/ts/pt_BR.ts +++ b/res/i18n/ts/pt_BR.ts @@ -1004,8 +1004,8 @@ Esta transferência monetária será removida e não enviada.</translation> </message> <message> <location filename="../../ui/homescreen.ui" line="127"/> - <source>Get to know more about duniter</source> - <translation type="obsolete">Saiba mais sobre o duniter</translation> + <source>Get to know more about ucoin</source> + <translation type="obsolete">Saiba mais sobre o uCoin</translation> </message> <message> <location filename="../../../src/cutecoin/gui/homescreen.py" line="35"/> @@ -1715,7 +1715,7 @@ Esta transferência monetária será removida e não enviada.</translation> <source> <h1>Cutecoin</h1> - <p>Python/Qt duniter client</p> + <p>Python/Qt uCoin client</p> <p>Version : {:}</p> {new_version_text} @@ -1730,7 +1730,7 @@ Esta transferência monetária será removida e não enviada.</translation> </source> <translation type="obsolete"> <h1>Cutecoin</h1> -<p>Cliente de duniter, feito com Python/Qt</p> +<p>Cliente de uCoin, feito com Python/Qt</p> <p>Versão: {:}</p> {new_version_text} <p>Licença: MIT</p> @@ -1805,7 +1805,7 @@ Esta transferência monetária será removida e não enviada.</translation> <source> <h1>sakia</h1> - <p>Python/Qt duniter client</p> + <p>Python/Qt uCoin client</p> <p>Version : {:}</p> {new_version_text} @@ -2216,22 +2216,22 @@ Você tem certeza?</translation> <context> <name>ProcessConfigureCommunity</name> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="230"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="240"/> <source>Configure community {0}</source> <translation>Configurar comunidade {0}</translation> </message> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="233"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="243"/> <source>Add a community</source> <translation>Adicionar uma comunidade</translation> </message> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="266"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="276"/> <source>Error</source> <translation>Erro</translation> </message> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="295"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="305"/> <source>Delete</source> <translation>Excluir</translation> </message> @@ -2455,27 +2455,27 @@ Você gostaria de publicar a chave?</translation> <context> <name>StepPageInit</name> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="96"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="101"/> <source>Could not find your identity on the network.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="130"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="138"/> <source>Broadcasting identity...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="134"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="142"/> <source>UID broadcast</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="134"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="142"/> <source>Identity broadcasted to the network</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="141"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="149"/> <source>Error</source> <translation type="unfinished">Erro</translation> </message> @@ -2485,29 +2485,39 @@ Você gostaria de publicar a chave?</translation> <translation type="obsolete">{0} : {1}</translation> </message> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="141"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="149"/> <source>{0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="145"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="153"/> <source>Your pubkey or UID was already found on the network. Yours : {0}, the network : {1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="148"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="156"/> <source>Your account already exists on the network</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="98"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="103"/> <source>Your pubkey or UID is different on the network. Yours : {0}, the network : {1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="154"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="124"/> + <source>connecting...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="164"/> + <source>Could not connect. Check hostname, ip address or port</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="162"/> <source>Could not connect. Check node peering entry</source> <translation type="unfinished"></translation> </message> @@ -3159,7 +3169,7 @@ Revogar seu UID somente funcionará caso ele ainda não tenha sido validado pela <context> <name>self.config_dialog</name> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="194"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="204"/> <source>Ok</source> <translation>Ok</translation> </message> diff --git a/res/i18n/ts/ru_RU.ts b/res/i18n/ts/ru_RU.ts index 8d107500696e370a9c4cfa83701b2368bf479579..f636a0b652c64b8229641db4e608752f68f449c2 100644 --- a/res/i18n/ts/ru_RU.ts +++ b/res/i18n/ts/ru_RU.ts @@ -972,8 +972,8 @@ This money transfer will be removed and not sent.</source> </message> <message> <location filename="../../ui/homescreen.ui" line="127"/> - <source>Get to know more about duniter</source> - <translation type="obsolete">Узнайте больше об duniter</translation> + <source>Get to know more about ucoin</source> + <translation type="obsolete">Узнайте больше об uCoin</translation> </message> <message> <location filename="../../../src/cutecoin/gui/homescreen.py" line="35"/> @@ -1643,7 +1643,7 @@ This money transfer will be removed and not sent.</source> <source> <h1>sakia</h1> - <p>Python/Qt duniter client</p> + <p>Python/Qt uCoin client</p> <p>Version : {:}</p> {new_version_text} @@ -2023,22 +2023,22 @@ Are you sure ?</source> <context> <name>ProcessConfigureCommunity</name> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="230"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="240"/> <source>Configure community {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="233"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="243"/> <source>Add a community</source> <translation type="unfinished">Добавить ÑообщеÑтво</translation> </message> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="266"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="276"/> <source>Error</source> <translation type="unfinished">Ошибка</translation> </message> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="295"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="305"/> <source>Delete</source> <translation type="unfinished"></translation> </message> @@ -2229,27 +2229,27 @@ Are you sure ?</source> <context> <name>StepPageInit</name> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="96"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="101"/> <source>Could not find your identity on the network.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="130"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="138"/> <source>Broadcasting identity...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="134"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="142"/> <source>UID broadcast</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="134"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="142"/> <source>Identity broadcasted to the network</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="141"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="149"/> <source>Error</source> <translation type="unfinished">Ошибка</translation> </message> @@ -2259,29 +2259,39 @@ Are you sure ?</source> <translation type="obsolete">{0} : {1}</translation> </message> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="141"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="149"/> <source>{0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="145"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="153"/> <source>Your pubkey or UID was already found on the network. Yours : {0}, the network : {1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="148"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="156"/> <source>Your account already exists on the network</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="98"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="103"/> <source>Your pubkey or UID is different on the network. Yours : {0}, the network : {1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="154"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="124"/> + <source>connecting...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="164"/> + <source>Could not connect. Check hostname, ip address or port</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="162"/> <source>Could not connect. Check node peering entry</source> <translation type="unfinished"></translation> </message> @@ -2667,7 +2677,7 @@ Yours : {0}, the network : {1}</source> <context> <name>self.config_dialog</name> <message> - <location filename="../../../src/sakia/gui/process_cfg_community.py" line="194"/> + <location filename="../../../src/sakia/gui/process_cfg_community.py" line="204"/> <source>Ok</source> <translation type="unfinished">ОК</translation> </message> diff --git a/src/sakia/core/account.py b/src/sakia/core/account.py index 2811a37e88b7f1d3916f235196aa16562b3b0bf3..1dccb25117dec6f49c739a51124dcae1482acd0a 100644 --- a/src/sakia/core/account.py +++ b/src/sakia/core/account.py @@ -392,7 +392,7 @@ class Account(QObject): if data: registered = parsers[request](data) tries += 1 - except errors.duniterError as e: + except errors.DuniterError as e: if e.ucode in (errors.NO_MEMBER_MATCHING_PUB_OR_UID, e.ucode == errors.NO_MATCHING_IDENTITY): if request == bma.wot.CertifiersOf: @@ -438,7 +438,7 @@ class Account(QObject): block_data = await community.bma_access.simple_request(bma.blockchain.Current) signed_raw = "{0}{1}\n".format(block_data['raw'], block_data['signature']) block_uid = Block.from_signed_raw(signed_raw).blockUID - except errors.duniterError as e: + except errors.DuniterError as e: if e.ucode == errors.NO_CURRENT_BLOCK: block_uid = BlockUID.empty() else: diff --git a/src/sakia/core/community.py b/src/sakia/core/community.py index d8b877e2b6f56e892bdb929107319d8217bb6b65..2b3b1a39e9d86ccfc41a200e59ab99d900adda31 100644 --- a/src/sakia/core/community.py +++ b/src/sakia/core/community.py @@ -168,7 +168,7 @@ class Community(QObject): return block else: return None - except errors.duniterError as e: + except errors.DuniterError as e: if e.ucode == errors.BLOCK_NOT_FOUND: logging.debug(str(e)) return None @@ -203,7 +203,7 @@ class Community(QObject): block = await self.bma_access.future_request(bma.blockchain.Block, req_args={'number': block_number}) return block['membersCount'] - except errors.duniterError as e: + except errors.DuniterError as e: if e.ucode == errors.BLOCK_NOT_FOUND: return 0 except NoPeerAvailable as e: @@ -224,7 +224,7 @@ class Community(QObject): block = await self.bma_access.future_request(bma.blockchain.Block, req_args={'number': block_number}) return block['medianTime'] - except errors.duniterError as e: + except errors.DuniterError as e: if e.ucode == errors.BLOCK_NOT_FOUND: return 0 except NoPeerAvailable as e: diff --git a/src/sakia/core/net/node.py b/src/sakia/core/net/node.py index 88d45e7c9587afe62641f56286506e8528d7d3c4..54e8d6c7aee8060672ad487b9258fe10db45465f 100644 --- a/src/sakia/core/net/node.py +++ b/src/sakia/core/net/node.py @@ -386,7 +386,7 @@ class Node(QObject): conn_handler = self.endpoint.conn_handler() block_data = await bma.blockchain.Current(conn_handler).get(self._session) await self.refresh_block(block_data) - except errors.duniterError as e: + except errors.DuniterError as e: if e.ucode == errors.BLOCK_NOT_FOUND: self.main_chain_previous_block = None self.set_block(None) @@ -419,7 +419,7 @@ class Node(QObject): if self.block: self.main_chain_previous_block = await bma.blockchain.Block(conn_handler, self.block['number']).get(self._session) - except errors.duniterError as e: + except errors.DuniterError as e: if e.ucode == errors.BLOCK_NOT_FOUND: self.main_chain_previous_block = None else: @@ -467,7 +467,7 @@ class Node(QObject): logging.debug("Change : new state corrupted") self.changed.emit() - except errors.duniterError as e: + except errors.DuniterError as e: if e.ucode == errors.PEER_NOT_FOUND: logging.debug("Error in peering reply : {0}".format(str(e))) self.state = Node.OFFLINE @@ -525,7 +525,7 @@ class Node(QObject): if self._uid != uid: self._uid = uid self.identity_changed.emit() - except errors.duniterError as e: + except errors.DuniterError as e: if e.ucode == errors.NO_MATCHING_IDENTITY: logging.debug("UID not found : {0}".format(self.pubkey[:5])) else: @@ -593,7 +593,7 @@ class Node(QObject): leaf_data = await bma.network.peering.Peers(conn_handler).get(leaf=leaf_hash, session=self._session) self.refresh_peer_data(leaf_data['leaf']['value']) - except (AttributeError, ValueError, errors.duniterError) as e: + except (AttributeError, ValueError, errors.DuniterError) as e: logging.debug("{pubkey} : Incorrect peer data in {leaf}".format(pubkey=self.pubkey[:5], leaf=leaf_hash)) self.state = Node.OFFLINE @@ -607,7 +607,7 @@ class Node(QObject): self.state = Node.CORRUPTED self._last_merkle = {'root' : peers_data['root'], 'leaves': peers_data['leaves']} - except errors.duniterError as e: + except errors.DuniterError as e: if e.ucode == errors.PEER_NOT_FOUND: logging.debug("Error in peers reply") self.state = Node.OFFLINE diff --git a/src/sakia/core/registry/identities.py b/src/sakia/core/registry/identities.py index 21a3cca0d117589f4f03d7c88e4a2b9abee75777..a309aa883130a6b20af4fdc10c0e483cc035b0fd 100644 --- a/src/sakia/core/registry/identities.py +++ b/src/sakia/core/registry/identities.py @@ -80,7 +80,7 @@ class IdentitiesRegistry: identity.local_state = LocalState.PARTIAL timestamp = identity.sigdate return identity - except errors.duniterError as e: + except errors.DuniterError as e: if e.ucode == errors.NO_MATCHING_IDENTITY: lookup_tries += 1 except asyncio.TimeoutError: @@ -113,7 +113,7 @@ class IdentitiesRegistry: identity.sigdate = BlockUID.from_str(data['sigDate']) identity.local_state = LocalState.PARTIAL identity.blockchain_state = BlockchainState.VALIDATED - except errors.duniterError as e: + except errors.DuniterError as e: if errors.NO_MEMBER_MATCHING_PUB_OR_UID: identity = await self._find_by_lookup(pubkey, community) return identity diff --git a/src/sakia/core/registry/identity.py b/src/sakia/core/registry/identity.py index b724f55255496a3ef433fed5160c03cab082d78c..dfee884944a7c3c7ee8712148f388c48a2444887 100644 --- a/src/sakia/core/registry/identity.py +++ b/src/sakia/core/registry/identity.py @@ -142,7 +142,7 @@ class Identity(QObject): uid, timestamp, signature) - except errors.duniterError as e: + except errors.DuniterError as e: if e.ucode == errors.NO_MATCHING_IDENTITY: raise LookupFailureError(self.pubkey, community) except MalformedDocumentError: @@ -166,7 +166,7 @@ class Identity(QObject): block = await community.bma_access.future_request(bma.blockchain.Block, req_args={'number': membership_data['blockNumber']}) return block['medianTime'] - except errors.duniterError as e: + except errors.DuniterError as e: if e.ucode == errors.NO_MEMBER_MATCHING_PUB_OR_UID: raise MembershipNotFoundError(self.pubkey, community.name) except NoPeerAvailable as e: @@ -186,7 +186,7 @@ class Identity(QObject): expiration_date = join_date + parameters['sigValidity'] except NoPeerAvailable: expiration_date = None - except errors.duniterError as e: + except errors.DuniterError as e: logging.debug("Expiration date not found") expiration_date = None except MembershipNotFoundError: @@ -222,7 +222,7 @@ class Identity(QObject): else: raise MembershipNotFoundError(self.pubkey, community.name) - except errors.duniterError as e: + except errors.DuniterError as e: if e.ucode == errors.NO_MEMBER_MATCHING_PUB_OR_UID: raise MembershipNotFoundError(self.pubkey, community.name) except NoPeerAvailable as e: @@ -245,7 +245,7 @@ class Identity(QObject): person_uid = uid_data["uid"] if person_uid == self.uid: return True - except errors.duniterError as e: + except errors.DuniterError as e: if e.ucode in (errors.NO_MATCHING_IDENTITY): logging.debug("Lookup error : {0}".format(str(e))) except NoPeerAvailable as e: @@ -258,7 +258,7 @@ class Identity(QObject): try: await community.bma_access.future_request(bma.wot.CertifiersOf, {'search': self.pubkey}) - except errors.duniterError as e: + except errors.DuniterError as e: if e.ucode in (errors.NO_MATCHING_IDENTITY, errors.NO_MEMBER_MATCHING_PUB_OR_UID): logging.debug("Certifiers of error : {0}".format(str(e))) return False @@ -274,7 +274,7 @@ class Identity(QObject): certifiers = await community.bma_access.future_request(bma.wot.CertifiersOf, {'search': self.pubkey}) return certifiers['isMember'] - except errors.duniterError as e: + except errors.DuniterError as e: if e.ucode in (errors.NO_MATCHING_IDENTITY, errors.NO_MEMBER_MATCHING_PUB_OR_UID): pass else: @@ -311,7 +311,7 @@ class Identity(QObject): certifier['block_number'] = None certifiers.append(certifier) - except errors.duniterError as e: + except errors.DuniterError as e: if e.ucode in (errors.NO_MATCHING_IDENTITY, errors.NO_MEMBER_MATCHING_PUB_OR_UID): logging.debug("Certifiers of error : {0}".format(str(e))) else: @@ -339,7 +339,7 @@ class Identity(QObject): certifier['block_number'] = None certifiers.append(certifier) - except errors.duniterError as e: + except errors.DuniterError as e: if e.ucode in (errors.NO_MATCHING_IDENTITY, errors.NO_MEMBER_MATCHING_PUB_OR_UID): logging.debug("Lookup error : {0}".format(str(e))) except NoPeerAvailable as e: @@ -370,7 +370,7 @@ class Identity(QObject): else: certified['block_number'] = None certified_list.append(certified) - except errors.duniterError as e: + except errors.DuniterError as e: if e.ucode in (errors.NO_MATCHING_IDENTITY, errors.NO_MEMBER_MATCHING_PUB_OR_UID): logging.debug("Certified by error : {0}".format(str(e))) except NoPeerAvailable as e: @@ -392,7 +392,7 @@ class Identity(QObject): certified['cert_time'] = await community.time(timestamp.number) certified['block_number'] = None certified_list.append(certified) - except errors.duniterError as e: + except errors.DuniterError as e: if e.ucode in (errors.NO_MATCHING_IDENTITY, errors.NO_MEMBER_MATCHING_PUB_OR_UID): logging.debug("Lookup error : {0}".format(str(e))) except NoPeerAvailable as e: diff --git a/src/sakia/core/txhistory.py b/src/sakia/core/txhistory.py index 913d9b3c3f5058c1b2f09a030113ea1bf9f61760..ec9976bb31bcbc96b1c7e7ea8421c4dfe0e1d3e0 100644 --- a/src/sakia/core/txhistory.py +++ b/src/sakia/core/txhistory.py @@ -111,7 +111,7 @@ class TxHistory(): logging.debug("Error in {0}".format(number)) block = None tries += 1 - except errors.duniterError as e: + except errors.DuniterError as e: if e.ucode == errors.BLOCK_NOT_FOUND: block = None tries += 1 @@ -236,7 +236,7 @@ class TxHistory(): if d['block_number'] < parsed_block: dividends.remove(d) return dividends - except errors.duniterError as e: + except errors.DuniterError as e: if e.ucode == errors.BLOCK_NOT_FOUND: pass return {} @@ -390,7 +390,7 @@ class TxHistory(): logging.debug("Starts a new refresh") task = asyncio.ensure_future(self._refresh(community, block_from, current_block, received_list)) self._running_refresh.append(task) - except errors.duniterError as e: + except errors.DuniterError as e: if e.ucode == errors.BLOCK_NOT_FOUND: logging.debug("Block not found") except NoPeerAvailable: diff --git a/src/sakia/gui/certification.py b/src/sakia/gui/certification.py index 8e7bd0bf1e730b59beac7f33668717ee7c8631ca..b081fa6cfe2f449a2942a75dae22083b4bc29e53 100644 --- a/src/sakia/gui/certification.py +++ b/src/sakia/gui/certification.py @@ -184,7 +184,7 @@ class CertificationDialog(QObject): is_member = await account_identity.is_member(self.community) try: block_0 = await self.community.get_block(0) - except errors.duniterError as e: + except errors.DuniterError as e: if e.ucode == errors.BLOCK_NOT_FOUND: block_0 = None except NoPeerAvailable as e: diff --git a/src/sakia/gui/community_tile.py b/src/sakia/gui/community_tile.py index 11ab592f46ebf7510ed274fd7bbfff10b36cb727..330c7f1087a56047052acc4c12fd3b86e47a6cd6 100644 --- a/src/sakia/gui/community_tile.py +++ b/src/sakia/gui/community_tile.py @@ -130,7 +130,7 @@ background-color: palette(base); message=self.tr("Not connected")) self.text_label.setText(description) self._state = CommunityState.OFFLINE - except errors.duniterError as e: + except errors.DuniterError as e: if e.ucode == errors.BLOCK_NOT_FOUND: description = """<html> <body> diff --git a/src/sakia/gui/community_view.py b/src/sakia/gui/community_view.py index 2120f99219d0d67a5f79c94edbeb4e70cc1cdf8d..f8f80de1bf15f24ddb3e5075314e597dc08f6f5f 100644 --- a/src/sakia/gui/community_view.py +++ b/src/sakia/gui/community_view.py @@ -241,7 +241,7 @@ class CommunityWidget(QWidget, Ui_CommunityWidget): except NoPeerAvailable as e: logging.debug(str(e)) text += " ( ### ) " - except errors.duniterError as e: + except errors.DuniterError as e: if e.ucode == errors.BLOCK_NOT_FOUND: logging.debug(str(e)) diff --git a/src/sakia/gui/identities_tab.py b/src/sakia/gui/identities_tab.py index 1bd84d96eaecef7629db0fe4b37405f0a1899b10..21e5ab64e61f2f5ee56208bfdee97bfcfc56c90d 100644 --- a/src/sakia/gui/identities_tab.py +++ b/src/sakia/gui/identities_tab.py @@ -133,7 +133,7 @@ class IdentitiesTabWidget(QObject): self.ui.edit_textsearch.clear() self.ui.edit_textsearch.setPlaceholderText(text) await self.refresh_identities(identities) - except errors.duniterError as e: + except errors.DuniterError as e: if e.ucode == errors.BLOCK_NOT_FOUND: logging.debug(str(e)) except NoPeerAvailable as e: diff --git a/src/sakia/gui/process_cfg_community.py b/src/sakia/gui/process_cfg_community.py index 2cf6c40096430371222d2ab3260d3eb770256861..5edcb3d7b83511bcd3fd9434bd2b6f82136059e4 100644 --- a/src/sakia/gui/process_cfg_community.py +++ b/src/sakia/gui/process_cfg_community.py @@ -6,6 +6,7 @@ Created on 8 mars 2014 import logging import asyncio + import aiohttp from duniterpy.api import errors @@ -65,6 +66,7 @@ class StepPageInit(Step): server = self.config_dialog.lineedit_server.text() port = self.config_dialog.spinbox_port.value() logging.debug("Is valid ? ") + self.config_dialog.label_error.setText(self.tr("connecting...")) try: self.node = await Node.from_address(None, server, port, session=aiohttp.ClientSession()) community = Community.create(self.node) @@ -78,12 +80,15 @@ class StepPageInit(Step): self.config_dialog.label_error.setText(str(e)) #except (MalformedDocumentError, ValueError) as e: # self.config_dialog.label_error.setText(str(e)) + except aiohttp.errors.TimeoutError: + self.config_dialog.label_error.setText(self.tr("Could not connect. Check hostname, ip address or port")) @asyncify async def check_connect(self, checked=False): server = self.config_dialog.lineedit_server.text() port = self.config_dialog.spinbox_port.value() logging.debug("Is valid ? ") + self.config_dialog.label_error.setText(self.tr("connecting...")) try: self.node = await Node.from_address(None, server, port, session=aiohttp.ClientSession()) community = Community.create(self.node) @@ -108,12 +113,15 @@ Yours : {0}, the network : {1}""".format(registered[1], registered[2]))) self.config_dialog.label_error.setText(str(e)) except NoPeerAvailable: self.config_dialog.label_error.setText(self.tr("Could not connect. Check node peering entry")) + except aiohttp.errors.TimeoutError: + self.config_dialog.label_error.setText(self.tr("Could not connect. Check hostname, ip address or port")) @asyncify async def check_register(self, checked=False): server = self.config_dialog.lineedit_server.text() port = self.config_dialog.spinbox_port.value() logging.debug("Is valid ? ") + self.config_dialog.label_error.setText(self.tr("connecting...")) try: session = aiohttp.ClientSession() self.node = await Node.from_address(None, server, port, session=session) @@ -146,12 +154,14 @@ Yours : {0}, the network : {1}""".format(registered[1], registered[2]))) Yours : {0}, the network : {1}""".format(registered[1], registered[2]))) else: self.config_dialog.label_error.setText(self.tr("Your account already exists on the network")) - except (MalformedDocumentError, ValueError, errors.duniterError, + except (MalformedDocumentError, ValueError, errors.DuniterError, aiohttp.errors.ClientError, aiohttp.errors.DisconnectedError) as e: session.close() self.config_dialog.label_error.setText(str(e)) except NoPeerAvailable: self.config_dialog.label_error.setText(self.tr("Could not connect. Check node peering entry")) + except aiohttp.errors.TimeoutError: + self.config_dialog.label_error.setText(self.tr("Could not connect. Check hostname, ip address or port")) def is_valid(self): return self.node is not None diff --git a/src/sakia/gui/transactions_tab.py b/src/sakia/gui/transactions_tab.py index 3d00badbae6431e0624667c15a06573d8a4837b1..fc76951cec2c2d1fc4bcade2e605295fe8b4d1d8 100644 --- a/src/sakia/gui/transactions_tab.py +++ b/src/sakia/gui/transactions_tab.py @@ -106,7 +106,7 @@ class TransactionsTabWidget(QObject): self.ui.date_to.setMaximumDateTime(tomorrow_datetime) except NoPeerAvailable as e: logging.debug(str(e)) - except errors.duniterError as e: + except errors.DuniterError as e: logging.debug(str(e)) def refresh(self): diff --git a/src/sakia/gui/widgets/search_user.py b/src/sakia/gui/widgets/search_user.py index 19b0a8c0472b6ffb34c8cb46b3b14742de158c31..a2aea2012bdb1d9dcd3fa21c3c2dc154a76069b2 100644 --- a/src/sakia/gui/widgets/search_user.py +++ b/src/sakia/gui/widgets/search_user.py @@ -81,7 +81,7 @@ class SearchUserWidget(QWidget, Ui_SearchUserWidget): self.combobox_search.addItem(uid) self.blockSignals(False) self.combobox_search.showPopup() - except errors.duniterError as e: + except errors.DuniterError as e: if e.ucode == errors.NO_MATCHING_IDENTITY: self.nodes = list() self.blockSignals(True)