rattail/appypod-rattail
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[gen] Finalized pending i18n.

Browse source
This commit is contained in:
Gaetan Delannay 2012-06-03 18:34:56 +02:00
parent 2710fb6c39
commit 8f57163c2a
20 changed files with 156 additions and 105 deletions
Download patch file Download diff file Expand all files Collapse all files

10
gen/wrappers/UserWrapper.py
View file

@ -28,19 +28,18 @@ class UserWrapper(AbstractWrapper):
def validateLogin(self, login):
'''Is this p_login valid?'''
# The login can't be the id of the whole site or "admin"
if login == 'admin':
return 'This username is reserved.' # XXX Translate
if login == 'admin': return self.translate('login_reserved')
# Check that no user or group already uses this login.
if self.count('User', noSecurity=True, login=login) or \
self.count('Group', noSecurity=True, login=login):
return 'This login is already in use.' # XXX Translate
self.translate('login_in_use')
return True
def validatePassword(self, password):
'''Is this p_password valid?'''
# Password must be at least 5 chars length
if len(password) < 5:
return 'Passwords must contain at least 5 letters.' # XXX Translate
return self.translate('password_too_short', mapping={'nb':5})
return True
def showPassword(self):
@ -84,8 +83,7 @@ class UserWrapper(AbstractWrapper):
page = self.request.get('page', 'main')
if page == 'main':
if hasattr(new, 'password1') and (new.password1 != new.password2):
# XXX Translate
msg = 'Passwords do not match.'
msg = self.translate('passwords_mismatch')
errors.password1 = msg
errors.password2 = msg
return self._callCustom('validate', new, errors)