Rezzect/deluge
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[WebUI] Fix error escaping translated text

Browse Source 
In a previous commit d4023e7dde42 removed a decode for Python 3 but
with translated text returned by gettext encoded on Python 2 the
escape function would raise a UnicodeDecodeError trying to use ascii
to decode.

The fix is to decode the message returned by gettext on Python 2.
This commit is contained in:
Calum Lind 2018-10-13 22:49:10 +01:00
parent 0b2cb7539f
commit 10d39c83cb
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
deluge/ui/web/common.py
View File

@ -12,11 +12,14 @@ from __future__ import unicode_literals
import gettext import gettext
import zlib import zlib
from deluge import common from deluge.common import PY2, get_version
def _(text): def _(text):
return gettext.gettext(text) text_local = gettext.gettext(text)
if PY2:
return text_local.decode('utf-8')
return text_local
def escape(text): def escape(text):
@ -51,7 +54,7 @@ try:
A template that adds some built-ins to the rendering A template that adds some built-ins to the rendering
""" """
builtins = {'_': _, 'escape': escape, 'version': common.get_version()} builtins = {'_': _, 'escape': escape, 'version': get_version()}
def render(self, *args, **data): def render(self, *args, **data):
data.update(self.builtins) data.update(self.builtins)