Merge branch 'lazyjson'

Conflicts:
	flask_babel/__init__.py

Author: TkTech

flask_babel/__init__.py

@@ -30,7 +30,7 @@
     timezone = pytz.timezone
     UTC = pytz.UTC
 
-from flask_babel._compat import string_types
+from flask_babel._compat import string_types, text_type
 
 
 class Babel(object):
@@ -591,6 +591,21 @@ def npgettext(context, singular, plural, num, **variables):
     return s if not variables else s % variables
 
 
+def make_json_lazy_string(func, *args, **kwargs):
+    """Like :method:`speaklater.make_lazy_string` but returns a subclass
+    that provides an :method:`__html__` method.  That method is used by
+    :class:`flask.json.JSONEncoder` to serialize objects of unrecognized
+    types.
+    """
+    from speaklater import _LazyString
+
+    class JsonLazyString(_LazyString):
+        def __html__(self):
+            return text_type(self)
+
+    return JsonLazyString(func, args, kwargs)
+
+
 def lazy_gettext(string, **variables):
     """Like :func:`gettext` but the string returned is lazy which means
     it will be translated when it is used as an actual string.
@@ -603,8 +618,7 @@ def lazy_gettext(string, **variables):
         def index():
             return unicode(hello)
     """
-    from speaklater import make_lazy_string
-    return make_lazy_string(gettext, string, **variables)
+    return make_json_lazy_string(gettext, string, **variables)
 
 
 def lazy_pgettext(context, string, **variables):
@@ -613,8 +627,7 @@ def lazy_pgettext(context, string, **variables):
 
     .. versionadded:: 0.7
     """
-    from speaklater import make_lazy_string
-    return make_lazy_string(pgettext, context, string, **variables)
+    return make_json_lazy_string(pgettext, context, string, **variables)
 
 
 def _get_current_context():

tests/tests.py

@@ -218,9 +218,11 @@ def test_lazy_gettext(self):
         yes = lazy_gettext(u'Yes')
         with app.test_request_context():
             assert text_type(yes) == 'Ja'
+            assert yes.__html__() == 'Ja'
         app.config['BABEL_DEFAULT_LOCALE'] = 'en_US'
         with app.test_request_context():
             assert text_type(yes) == 'Yes'
+            assert yes.__html__() == 'Yes'
 
     def test_list_translations(self):
         app = flask.Flask(__name__)