cinnamon-settings-users: always show the username rules

https://bugs.launchpad.net/linuxmint/+bug/1438960
linuxmint · May 11, 2015 · 9c965bb · 9c965bb
1 parent d3d3b16
commit 9c965bb
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/files/usr/lib/cinnamon-settings-users/cinnamon-settings-users.py b/files/usr/lib/cinnamon-settings-users/cinnamon-settings-users.py
@@ -8,6 +8,7 @@
 import PIL
 from PIL import Image
 from random import randint
+import re
 
 gettext.install("cinnamon", "/usr/share/locale")
 
@@ -294,15 +295,19 @@ def __init__ (self):
 
             self.username_entry = Gtk.Entry()
             self.username_entry.connect("changed", self._on_info_changed)
-
+
+            label = Gtk.Label()
+            label.set_markup(_("The username must consist of only:\n    - lower case letters (a-z)\n    - numerals (0-9)\n    - '.', '-', and '_' characters"))
+
             table = DimmedTable()
             table.add_labels([_("Account Type"), _("Full Name"), _("Username")])     
             table.add_controls([self.account_type_combo, self.realname_entry, self.username_entry])
-                     
+
             self.set_border_width(6)       
 
             box = self.get_content_area()
             box.add(table)
+            box.add(label)
             self.show_all()
 
             self.add_buttons(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL, Gtk.STOCK_ADD, Gtk.ResponseType.OK, )
@@ -315,12 +320,12 @@ def _on_info_changed(self, widget):
         fullname = self.realname_entry.get_text()
         username = self.username_entry.get_text()
         valid = True
-        if " " in username or username.lower() != username:
+        if re.search('[^[a-z0-9_.-]', username):
             self.username_entry.set_icon_from_stock(Gtk.EntryIconPosition.SECONDARY, Gtk.STOCK_DIALOG_WARNING)
-            self.username_entry.set_icon_tooltip_text(Gtk.EntryIconPosition.SECONDARY, _("The username cannot contain upper-case or space characters"))
+            self.username_entry.set_icon_tooltip_text(Gtk.EntryIconPosition.SECONDARY, _("Invalid username"))
             valid = False
         else:
-            self.username_entry.set_icon_from_stock(Gtk.EntryIconPosition.SECONDARY, None)     
+            self.username_entry.set_icon_from_stock(Gtk.EntryIconPosition.SECONDARY, None)
         if username == "" or fullname == "":
             valid = False