diff options
| author | Brian Rosner <brosner@gmail.com> | 2008-03-10 18:08:30 +0000 |
|---|---|---|
| committer | Brian Rosner <brosner@gmail.com> | 2008-03-10 18:08:30 +0000 |
| commit | 9d4db678f4f979e5bc1ae0a1cd3e4e86b72760e7 (patch) | |
| tree | 8fd2f0ad7806dd898c28534223295ac262109ba9 | |
| parent | ac4f5efc4f8dbbb85b43c17e605cf699e89e0dff (diff) | |
newforms-admin: Fixed #5695. AdminFileWidget now properly marks strings for translation and a minor XHTML fix.
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7212 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | django/contrib/admin/tests/widgets.py | 2 | ||||
| -rw-r--r-- | django/contrib/admin/widgets.py | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/django/contrib/admin/tests/widgets.py b/django/contrib/admin/tests/widgets.py index aded917612..3b87c8aa5a 100644 --- a/django/contrib/admin/tests/widgets.py +++ b/django/contrib/admin/tests/widgets.py @@ -28,7 +28,7 @@ HTML escaped. >>> w = AdminFileWidget() >>> print conditional_escape(w.render('test', 'test')) -Currently: <a target="_blank" href="%(MEDIA_URL)stest">test</a> <br>Change: <input type="file" name="test" /> +Currently: <a target="_blank" href="%(MEDIA_URL)stest">test</a> <br />Change: <input type="file" name="test" /> To test ForeignKeyRawIdWidget a user object must be created. Its pk is explicitly set to 100 to avoid having to potentially overmatch in the test. diff --git a/django/contrib/admin/widgets.py b/django/contrib/admin/widgets.py index f5c14e64f4..9072a961fd 100644 --- a/django/contrib/admin/widgets.py +++ b/django/contrib/admin/widgets.py @@ -72,7 +72,8 @@ class AdminFileWidget(forms.FileInput): from django.conf import settings output = [] if value: - output.append('Currently: <a target="_blank" href="%s%s">%s</a> <br>Change: ' % (settings.MEDIA_URL, value, value)) + output.append('%s <a target="_blank" href="%s%s">%s</a> <br />%s ' % \ + (_('Currently:'), settings.MEDIA_URL, value, value, _('Change:'))) output.append(super(AdminFileWidget, self).render(name, value, attrs)) return mark_safe(u''.join(output)) |