Skip to content
Snippets Groups Projects
Commit f856789a authored by Vincent Texier's avatar Vincent Texier
Browse files

Fix bugs with self.tr method when self is not a qobject

parent 0bebfc59
No related branches found
No related tags found
No related merge requests found
...@@ -27,6 +27,7 @@ class StepPageInit(Step): ...@@ -27,6 +27,7 @@ class StepPageInit(Step):
''' '''
First step when adding a community First step when adding a community
''' '''
def __init__(self, config_dialog): def __init__(self, config_dialog):
super().__init__(config_dialog) super().__init__(config_dialog)
...@@ -61,29 +62,31 @@ class StepPageKey(Step): ...@@ -61,29 +62,31 @@ class StepPageKey(Step):
''' '''
First step when adding a community First step when adding a community
''' '''
def __init__(self, config_dialog): def __init__(self, config_dialog):
super().__init__(config_dialog) super().__init__(config_dialog)
def is_valid(self): def is_valid(self):
if len(self.config_dialog.edit_salt.text()) < 6: if len(self.config_dialog.edit_salt.text()) < 6:
self.config_dialog.label_info.setText(self.tr("Forbidden : salt is too short")) self.config_dialog.label_info.setText(self.config_dialog.tr("Forbidden : salt is too short"))
return False return False
if len(self.config_dialog.edit_password.text()) < 6: if len(self.config_dialog.edit_password.text()) < 6:
self.config_dialog.label_info.setText(self.tr("Forbidden : password is too short")) self.config_dialog.label_info.setText(self.config_dialog.tr("Forbidden : password is too short"))
return False return False
if detect_non_printable(self.config_dialog.edit_salt.text()): if detect_non_printable(self.config_dialog.edit_salt.text()):
self.config_dialog.label_info.setText(self.tr("Forbidden : Invalid characters in salt field")) self.config_dialog.label_info.setText(self.config_dialog.tr("Forbidden : Invalid characters in salt field"))
return False return False
if detect_non_printable(self.config_dialog.edit_password.text()): if detect_non_printable(self.config_dialog.edit_password.text()):
self.config_dialog.label_info.setText(self.tr("Forbidden : Invalid characters in password field")) self.config_dialog.label_info.setText(
self.config_dialog.tr("Forbidden : Invalid characters in password field"))
return False return False
if self.config_dialog.edit_password.text() != \ if self.config_dialog.edit_password.text() != \
self.config_dialog.edit_password_repeat.text(): self.config_dialog.edit_password_repeat.text():
self.config_dialog.label_info.setText(self.tr("Error : passwords are different")) self.config_dialog.label_info.setText(self.config_dialog.tr("Error : passwords are different"))
return False return False
self.config_dialog.label_info.setText("") self.config_dialog.label_info.setText("")
...@@ -107,6 +110,7 @@ class StepPageCommunities(Step): ...@@ -107,6 +110,7 @@ class StepPageCommunities(Step):
''' '''
First step when adding a community First step when adding a community
''' '''
def __init__(self, config_dialog): def __init__(self, config_dialog):
super().__init__(config_dialog) super().__init__(config_dialog)
......
...@@ -86,7 +86,7 @@ class StepPageAddpeers(Step): ...@@ -86,7 +86,7 @@ class StepPageAddpeers(Step):
self.config_dialog.tree_peers.setModel(tree_model) self.config_dialog.tree_peers.setModel(tree_model)
self.config_dialog.button_previous.setEnabled(False) self.config_dialog.button_previous.setEnabled(False)
self.config_dialog.button_next.setText(self.tr("Ok")) self.config_dialog.button_next.setText(self.config_dialog.tr("Ok"))
class ProcessConfigureCommunity(QDialog, Ui_CommunityConfigurationDialog): class ProcessConfigureCommunity(QDialog, Ui_CommunityConfigurationDialog):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment