From f07e8304fb4cf7f9265c8a344f8de990d3b47d3f Mon Sep 17 00:00:00 2001
From: Nico Alt <nicoalt@posteo.org>
Date: Fri, 27 Mar 2020 12:00:17 +0000
Subject: [PATCH] Introduce show_error_message function in registration
---
.../briar_gtk/containers/registration.py | 33 +++++++++++--------
briar-gtk/data/ui/registration.ui | 1 -
2 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/briar-gtk/briar_gtk/containers/registration.py b/briar-gtk/briar_gtk/containers/registration.py
index f14f222..0fee2a2 100644
--- a/briar-gtk/briar_gtk/containers/registration.py
+++ b/briar-gtk/briar_gtk/containers/registration.py
@@ -54,11 +54,11 @@ class RegistrationContainer(Container):
self.proceed_from_nickname()
def proceed_from_nickname(self):
- nickname_error_label = self.builder.get_object("nickname_error_label")
if self._nickname_is_empty():
- nickname_error_label.show()
+ self._show_nickname_error_message(_("Please enter a nickname"))
return
- nickname_error_label.hide()
+ error_label = self.builder.get_object("nickname_error_label")
+ error_label.hide()
self._show_passwords_page()
def _nickname_is_empty(self):
@@ -92,14 +92,13 @@ class RegistrationContainer(Container):
def on_create_account_pressed(self):
if self._password_is_empty():
- self._show_error_message(_("Please enter a password"))
+ self._show_passwords_error_message(_("Please enter a password"))
return
if not self._passwords_match():
- self._show_error_message(_("The passwords do not match"))
+ self._show_passwords_error_message(_("The passwords do not match"))
return
- passwords_error_label = self.builder.get_object(
- "passwords_error_label")
- passwords_error_label.hide()
+ error_label = self.builder.get_object("passwords_error_label")
+ error_label.hide()
self._show_loading_animation()
self._register()
@@ -130,11 +129,17 @@ class RegistrationContainer(Container):
GLib.idle_add(function)
def _registration_failed(self):
- self._show_error_message(_("Couldn't register account"))
+ self._show_passwords_error_message(_("Couldn't register account"))
self._show_passwords_page()
- def _show_error_message(self, error_message):
- passwords_error_label = self.builder.get_object(
- "passwords_error_label")
- passwords_error_label.set_label(error_message)
- passwords_error_label.show()
+ def _show_nickname_error_message(self, error_message):
+ error_label = self.builder.get_object("nickname_error_label")
+ self._show_error_message(error_label, error_message)
+
+ def _show_passwords_error_message(self, error_message):
+ error_label = self.builder.get_object("passwords_error_label")
+ self._show_error_message(error_label, error_message)
+
+ def _show_error_message(self, error_label, error_message):
+ error_label.set_label(error_message)
+ error_label.show()
diff --git a/briar-gtk/data/ui/registration.ui b/briar-gtk/data/ui/registration.ui
index 68c107e..9d5d829 100644
--- a/briar-gtk/data/ui/registration.ui
+++ b/briar-gtk/data/ui/registration.ui
@@ -79,7 +79,6 @@
<property name="visible">False</property>
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
- <property name="label" translatable="yes">The nickname may not be empty.</property>
<property name="wrap">True</property>
<property name="wrap_mode">PANGO_WRAP_WORD_CHAR</property>
<style>
--
GitLab