From 44e27bf65fd997e851779586aeec99c13bb477e1 Mon Sep 17 00:00:00 2001
From: ilvalle <paolo.valleri@gmail.com>
Date: Thu, 8 Feb 2018 20:58:37 +0100
Subject: [PATCH] fix py3 languages decode added tests. close #1848, thanks
 @bjquinn

---
 gluon/languages.py            |  5 ++++-
 gluon/tests/test_languages.py | 24 +++++++++++++++++++++++-
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/gluon/languages.py b/gluon/languages.py
index 0d8bd4a2..6a0f22b1 100644
--- a/gluon/languages.py
+++ b/gluon/languages.py
@@ -434,7 +434,10 @@ class lazyT(object):
         return str(self).encode(*a, **b)
 
     def decode(self, *a, **b):
-        return str(self).decode(*a, **b)
+        if PY2:
+            return str(self).decode(*a, **b)
+        else:
+            return str(self)
 
     def read(self):
         return str(self)
diff --git a/gluon/tests/test_languages.py b/gluon/tests/test_languages.py
index cb2fb6bc..7cc33723 100644
--- a/gluon/tests/test_languages.py
+++ b/gluon/tests/test_languages.py
@@ -12,7 +12,8 @@ import tempfile
 import unittest
 
 from gluon import languages
-from gluon._compat import PY2
+from gluon._compat import PY2, to_unicode
+from gluon.storage import Messages
 
 MP_WORKING = 0
 try:
@@ -108,6 +109,8 @@ class TestTranslations(unittest.TestCase):
         T.force('it')
         self.assertEqual(str(T('Hello World')),
                          'Salve Mondo')
+        self.assertEqual(to_unicode(T('Hello World')),
+                         'Salve Mondo')
 
 class TestDummyApp(unittest.TestCase):
 
@@ -179,3 +182,22 @@ def index():
         for key in ['hello', 'world', '%s %%{shop}', 'ahoy']:
             self.assertTrue(key in en_dict)
             self.assertTrue(key in pt_dict)
+
+class TestMessages(unittest.TestCase):
+
+    def setUp(self):
+        if os.path.isdir('gluon'):
+            self.langpath = 'applications/welcome/languages'
+        else:
+            self.langpath = os.path.realpath(
+                '../../applications/welcome/languages')
+        self.http_accept_language = 'en'
+
+    def tearDown(self):
+        pass
+
+    def test_decode(self):
+        T = languages.translator(self.langpath, self.http_accept_language)
+        messages = Messages(T)
+        messages.update({'email_sent':'Email sent', 'test': "ä"})
+        self.assertEqual(to_unicode(messages.email_sent, 'utf-8'), 'Email sent')