Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #17457 -- Marked strings used in hash descriptions for translat…

…ion.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17270 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit d72c0bdc46a97c53d5e60b7e373d2f8e24673bb1 1 parent fe876f0
Aymeric Augustin aaugustin authored
Showing with 19 additions and 18 deletions.
  1. +2 −2 django/contrib/auth/forms.py
  2. +17 −16 django/contrib/auth/hashers.py
4 django/contrib/auth/forms.py
View
@@ -4,7 +4,7 @@
from django.utils.encoding import smart_str
from django.utils.http import int_to_base36
from django.utils.safestring import mark_safe
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import ugettext, ugettext_lazy as _
from django.contrib.auth import authenticate
from django.contrib.auth.models import User
@@ -36,7 +36,7 @@ def render(self, name, value, attrs):
summary = ""
for key, value in hasher.safe_summary(encoded).iteritems():
- summary += "<strong>%(key)s</strong>: %(value)s " % {"key": key, "value": value}
+ summary += "<strong>%(key)s</strong>: %(value)s " % {"key": ugettext(key), "value": value}
return mark_safe("<div%(attrs)s>%(summary)s</div>" % {"attrs": flatatt(final_attrs), "summary": summary})
33 django/contrib/auth/hashers.py
View
@@ -7,6 +7,7 @@
from django.core.exceptions import ImproperlyConfigured
from django.utils.crypto import (
pbkdf2, constant_time_compare, get_random_string)
+from django.utils.translation import ugettext_noop as _
UNUSABLE_PASSWORD = '!' # This will never be a valid encoded hash
@@ -212,10 +213,10 @@ def safe_summary(self, encoded):
algorithm, iterations, salt, hash = encoded.split('$', 3)
assert algorithm == self.algorithm
return SortedDict([
- ('algorithm', algorithm),
- ('iterations', iterations),
- ('salt', mask_hash(salt)),
- ('hash', mask_hash(hash)),
+ (_('algorithm'), algorithm),
+ (_('iterations'), iterations),
+ (_('salt'), mask_hash(salt)),
+ (_('hash'), mask_hash(hash)),
])
@@ -263,10 +264,10 @@ def safe_summary(self, encoded):
assert algorithm == self.algorithm
salt, checksum = data[:22], data[22:]
return SortedDict([
- ('algorithm', algorithm),
- ('work factor', work_factor),
- ('salt', mask_hash(salt)),
- ('checksum', mask_hash(checksum)),
+ (_('algorithm'), algorithm),
+ (_('work factor'), work_factor),
+ (_('salt'), mask_hash(salt)),
+ (_('checksum'), mask_hash(checksum)),
])
@@ -292,9 +293,9 @@ def safe_summary(self, encoded):
algorithm, salt, hash = encoded.split('$', 2)
assert algorithm == self.algorithm
return SortedDict([
- ('algorithm', algorithm),
- ('salt', mask_hash(salt, show=2)),
- ('hash', mask_hash(hash)),
+ (_('algorithm'), algorithm),
+ (_('salt'), mask_hash(salt, show=2)),
+ (_('hash'), mask_hash(hash)),
])
@@ -321,8 +322,8 @@ def verify(self, password, encoded):
def safe_summary(self, encoded):
return SortedDict([
- ('algorithm', self.algorithm),
- ('hash', mask_hash(encoded, show=3)),
+ (_('algorithm'), self.algorithm),
+ (_('hash'), mask_hash(encoded, show=3)),
])
@@ -355,8 +356,8 @@ def safe_summary(self, encoded):
algorithm, salt, data = encoded.split('$', 2)
assert algorithm == self.algorithm
return SortedDict([
- ('algorithm', algorithm),
- ('salt', salt),
- ('hash', mask_hash(data, show=3)),
+ (_('algorithm'), algorithm),
+ (_('salt'), salt),
+ (_('hash'), mask_hash(data, show=3)),
])
Please sign in to comment.
Something went wrong with that request. Please try again.