diff --git a/pyi2phosts/lib/validation.py b/pyi2phosts/lib/validation.py index 1cca22f..da7a7f9 100755 --- a/pyi2phosts/lib/validation.py +++ b/pyi2phosts/lib/validation.py @@ -3,6 +3,7 @@ import re from django.core.exceptions import ValidationError +from django.utils.translation import ugettext_lazy as _ from pyi2phosts.postkey.models import i2phost @@ -18,45 +19,45 @@ def validate_hostname(data): # do lenght check here for avoiding django.db.utils.DatabaseError exceptions # when trying to add too long hostname with py-i2phosts-injector if len(data) > 67: - raise ValidationError('Too long hostname (should be 67 chars max)') + raise ValidationError(_('Too long hostname (should be 67 chars max)')) # Must end with '.i2p'. if re.match(r'.*\.i2p$', data) == None: - raise ValidationError('Hostname doesn\'t ends with .i2p') + raise ValidationError(_('Hostname doesn\'t ends with .i2p')) # Base 32 hostnames (*.b32.i2p) are not allowed if re.match(r'.*\.b32\.i2p$', data): - raise ValidationError('Base32 hostnames are not allowed') + raise ValidationError(_('Base32 hostnames are not allowed')) # prevent common errors if re.match(r'\.i2p$', data): - raise ValidationError('Incomplete hostname') + raise ValidationError(_('Incomplete hostname')) if re.match(r'^http:/', data): - raise ValidationError('Do not paste full URL, just domain') + raise ValidationError(_('Do not paste full URL, just domain')) # Must not contain '..' if re.search(r'\.\.', data): - raise ValidationError('".." in hostname') + raise ValidationError(_('".." in hostname')) # Allow only 4ld domains and below if data.count('.') > 3: - raise ValidationError('Subdomains deeper than 4LD are not allowed') + raise ValidationError(_('Subdomains deeper than 4LD are not allowed')) # Must contain only [a-z] [0-9] '.' and '-' h = re.match(r'([a-z0-9.-]+)\.i2p$', data) if h == None: - raise ValidationError('Illegal characters in hostname') + raise ValidationError(_('Illegal characters in hostname')) else: namepart = h.groups()[0] # Must not start with '.' or '-' if re.match(r'^\.|-', namepart): - raise ValidationError('Hostname must not starts with "." or "-"') + raise ValidationError(_('Hostname must not starts with "." or "-"')) # Must not contain '.-' or '-.' (as of 0.6.1.33) if re.search(r'(\.-)|(-\.)', namepart): - raise ValidationError('Hostname contain ".-" or "-."') + raise ValidationError(_('Hostname contain ".-" or "-."')) # Must not contain '--' except in 'xn--' for IDN if re.search(r'(? 616: - raise ValidationError('Specified base64 hash is bigger than 616 bytes') + raise ValidationError(_('Specified base64 hash is bigger than 616 bytes')) # keys with cert may ends with anything, so check is relaxed if length > 516 and re.match(r'[a-zA-Z0-9\-~]+$', data) == None: - raise ValidationError('Invalid characters in base64 hash') + raise ValidationError(_('Invalid characters in base64 hash')) # base64-validity test if length > 516: # we need temporary variable here to avoid modifying main "data" @@ -99,15 +100,15 @@ def validate_b64hash(data, check_uniq=True): break # if more than 2 pad chars were added, raise an error if i > 2: - raise ValidationError('Corrupted base64 hash') + raise ValidationError(_('Corrupted base64 hash')) # base64-i2p if length == 516 and re.match(r'[a-zA-Z0-9\-~]+AA$', data) == None: - raise ValidationError('Invalid base64 hash') + raise ValidationError(_('Invalid base64 hash')) if check_uniq == True: # Avoid adding non-unique hashes qs = i2phost.objects.filter(b64hash=data) if qs.exists(): - raise ValidationError('Base64 hash must be unique') + raise ValidationError(_('Base64 hash must be unique')) return data @@ -117,4 +118,4 @@ def validate_i2purl(data): data = data.lower().strip() # check for http://, .i2p in domain and GET validity if re.match(r'^http://(?:.+?\.i2p)(?:/?|[/?]\S+)$', data) == None: - raise ValidationError('Bad I2P url') + raise ValidationError(_('Bad I2P url'))