2025-summer/team-3
12
Fork 0
Code Issues Pull requests Projects Releases Activity

don't cast ugettext_lazy calls to str, as our json encoder is now clever

Browse source
This commit is contained in:
Laura Klünder 2017-11-30 01:10:49 +01:00
parent 2d292844d6
commit a7c140a2ac
7 changed files with 26 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/c3nav/mapdata/utils/locations.py
View file

@ -237,10 +237,8 @@ class CustomLocation:
self.level = level
self.x = x
self.y = y
self.title = str(_('Coordinates'))
self.subtitle = str(_('%(level)s, x=%(x)s, y=%(y)s') % {'level': self.level.title,
'x': self.x,
'y': self.y})
self.title = _('Coordinates')
self.subtitle = _('%(level)s, x=%(x)s, y=%(y)s') % {'level': self.level.title, 'x': self.x, 'y': self.y}
@property
def serialized_geometry(self):
@ -268,19 +266,19 @@ class CustomLocation:
return {
'id': self.pk,
'display': [
(str(_('Type')), str(_('Coordinates'))),
(str(_('ID')), str(self.pk)),
(str(_('Slug')), str(self.pk)),
(str(_('Level')), {
(_('Type'), _('Coordinates')),
(_('ID'), self.pk),
(_('Slug'), self.pk),
(_('Level'), {
'id': self.level.pk,
'slug': self.level.get_slug(),
'title': self.level.title,
'can_search': self.level.can_search,
}),
(str(_('X Coordinate')), str(self.x)),
(str(_('Y Coordinate')), str(self.y)),
(str(_('Title')), str(self.title)),
(str(_('Subtitle')), str(self.subtitle)),
(_('X Coordinate'), str(self.x)),
(_('Y Coordinate'), str(self.y)),
(_('Title'), self.title),
(_('Subtitle'), self.subtitle),
],
'geometry': self.serialized_geometry,
}