Skip to content

Commit 4b3d70d

Browse files
committed
Add missing unicode markers for python2. See KristianOellegaard#291.
1 parent 5ff754f commit 4b3d70d

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

hvad/admin.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,13 @@ def all_translations(self, obj):
7070
languages = []
7171
current_language = get_language()
7272
for language in obj.get_available_languages():
73-
entry = '<a href="%s">%s</a>' % (self.get_url(obj, lang=language), language)
73+
entry = u'<a href="%s">%s</a>' % (self.get_url(obj, lang=language), language)
7474
if language == current_language:
7575
entry = u'<strong>%s</strong>' % entry
7676
languages.append(entry)
7777
return u', '.join(languages)
7878
all_translations.allow_tags = True
79-
all_translations.short_description = _('all translations')
79+
all_translations.short_description = _(u'all translations')
8080

8181
def get_available_languages(self, obj):
8282
if obj is None:
@@ -240,12 +240,12 @@ def delete_translation(self, request, object_id, language_code):
240240
if request.POST: # The user has already confirmed the deletion.
241241
if perms_needed:
242242
raise PermissionDenied
243-
obj_display = '%s translation of %s' % (lang, force_text(obj.master))
243+
obj_display = u'%s translation of %s' % (force_text(lang), force_text(obj.master))
244244
self.log_deletion(request, obj, obj_display)
245245
self.delete_model_translation(request, obj)
246246

247247
self.message_user(request,
248-
_('The %(name)s "%(obj)s" was deleted successfully.') % {
248+
_(u'The %(name)s "%(obj)s" was deleted successfully.') % {
249249
'name': force_text(opts.verbose_name),
250250
'obj': force_text(obj_display)
251251
}
@@ -255,12 +255,12 @@ def delete_translation(self, request, object_id, language_code):
255255
return HttpResponseRedirect(self.reverse('admin:index'))
256256
return HttpResponseRedirect(self.reverse('admin:%s_%s_changelist' % (opts.app_label, opts.model_name)))
257257

258-
object_name = '%s Translation' % force_text(opts.verbose_name)
258+
object_name = _(u'%s Translation') % force_text(opts.verbose_name)
259259

260260
if perms_needed or protected:
261-
title = _("Cannot delete %(name)s") % {"name": object_name}
261+
title = _(u"Cannot delete %(name)s") % {"name": object_name}
262262
else:
263-
title = _("Are you sure?")
263+
title = _(u"Are you sure?")
264264

265265
context = {
266266
"title": title,

0 commit comments

Comments
 (0)