mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-04 01:39:20 +00:00
Code Issues 32 Releases Wiki Activity

unicode: Fixed #4583 -- Fixed a problem with displaying verbose names in

Browse Source 
databrowse.


git-svn-id: http://code.djangoproject.com/svn/django/branches/unicode@5481 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Malcolm Tredinnick 2007-06-17 01:23:49 +00:00
parent d2080dd694
commit 1bfcfe615c
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
django/contrib/databrowse/plugins/calendars.py
View File

@ -6,6 +6,7 @@ from django.shortcuts import render_to_response
from django.utils.text import capfirst from django.utils.text import capfirst
from django.utils.translation import get_date_formats from django.utils.translation import get_date_formats
from django.views.generic import date_based from django.views.generic import date_based
from django.utils.encoding import force_unicode
import datetime import datetime
import time import time
@ -29,7 +30,7 @@ class CalendarPlugin(DatabrowsePlugin):
if not fields: if not fields:
return u'' return u''
return u'<p class="filter"><strong>View calendar by:</strong> %s</p>' % \ return u'<p class="filter"><strong>View calendar by:</strong> %s</p>' % \
u', '.join(['<a href="calendars/%s/">%s</a>' % (f.name, capfirst(f.verbose_name)) for f in fields.values()]) u', '.join(['<a href="calendars/%s/">%s</a>' % (f.name, force_unicode(capfirst(f.verbose_name))) for f in fields.values()])
def urls(self, plugin_name, easy_instance_field): def urls(self, plugin_name, easy_instance_field):
if isinstance(easy_instance_field.field, models.DateField): if isinstance(easy_instance_field.field, models.DateField):

4
django/contrib/databrowse/plugins/fieldchoices.py
View File

@ -4,7 +4,7 @@ from django.contrib.databrowse.datastructures import EasyModel
from django.contrib.databrowse.sites import DatabrowsePlugin from django.contrib.databrowse.sites import DatabrowsePlugin
from django.shortcuts import render_to_response from django.shortcuts import render_to_response
from django.utils.text import capfirst from django.utils.text import capfirst
from django.utils.encoding import smart_str from django.utils.encoding import smart_str, force_unicode
from django.views.generic import date_based from django.views.generic import date_based
import datetime import datetime
import time import time
@ -33,7 +33,7 @@ class FieldChoicePlugin(DatabrowsePlugin):
if not fields: if not fields:
return u'' return u''
return u'<p class="filter"><strong>View by:</strong> %s</p>' % \ return u'<p class="filter"><strong>View by:</strong> %s</p>' % \
u', '.join(['<a href="fields/%s/">%s</a>' % (f.name, capfirst(f.verbose_name)) for f in fields.values()]) u', '.join(['<a href="fields/%s/">%s</a>' % (f.name, force_unicode(capfirst(f.verbose_name))) for f in fields.values()])
def urls(self, plugin_name, easy_instance_field): def urls(self, plugin_name, easy_instance_field):
if easy_instance_field.field in self.field_dict(easy_instance_field.model.model).values(): if easy_instance_field.field in self.field_dict(easy_instance_field.model.model).values():