Merge branch 'dev' into gae_pytz

Author: TkTech

.gitignore

@@ -5,3 +5,5 @@
 dist/
 docs/_build
 .tox/
+.vscode
+*.code-workspace

docs/index.rst

@@ -28,7 +28,7 @@ older version you will have to upgrade or disable the Jinja support
 Configuration
 -------------
 
-To get started all you need to do is to instanciate a :class:`Babel`
+To get started all you need to do is to instantiate a :class:`Babel`
 object after configuring the application::
 
     from flask import Flask

flask_babel/__init__.py

@@ -16,8 +16,8 @@
 from flask import current_app, request
 from flask.ctx import has_request_context
 from babel import dates, numbers, support, Locale
-from werkzeug import ImmutableDict
 from pytz import timezone, UTC
+from werkzeug.datastructures import ImmutableDict
 
 from flask_babel._compat import string_types
 from flask_babel.speaklater import LazyString
@@ -299,6 +299,9 @@ def refresh():
         if hasattr(ctx, key):
             delattr(ctx, key)
 
+    if hasattr(ctx, 'forced_babel_locale'):
+        ctx.babel_locale = ctx.forced_babel_locale
+
 
 @contextmanager
 def force_locale(locale):
@@ -319,20 +322,19 @@ def force_locale(locale):
         yield
         return
 
-    babel = current_app.extensions['babel']
-
-    orig_locale_selector_func = babel.locale_selector_func
     orig_attrs = {}
     for key in ('babel_translations', 'babel_locale'):
         orig_attrs[key] = getattr(ctx, key, None)
 
     try:
-        babel.locale_selector_func = lambda: locale
-        for key in orig_attrs:
-            setattr(ctx, key, None)
+        ctx.babel_locale = Locale.parse(locale)
+        ctx.forced_babel_locale = ctx.babel_locale
+        ctx.babel_translations = None
         yield
     finally:
-        babel.locale_selector_func = orig_locale_selector_func
+        if hasattr(ctx, 'forced_babel_locale'):
+            del ctx.forced_babel_locale
+
         for key, value in orig_attrs.items():
             setattr(ctx, key, value)
 
@@ -614,6 +616,21 @@ def index():
     return LazyString(gettext, string, **variables)
 
 
+def lazy_ngettext(singular, plural, num, **variables):
+    """Like :func:`ngettext` but the string returned is lazy which means
+    it will be translated when it is used as an actual string.
+
+    Example::
+
+        apples = lazy_ngettext(u'%(num)d Apple', u'%(num)d Apples', num=len(apples))
+
+        @app.route('/')
+        def index():
+            return unicode(apples)
+    """
+    return LazyString(ngettext, singular, plural, num, **variables)
+
+
 def lazy_pgettext(context, string, **variables):
     """Like :func:`pgettext` but the string returned is lazy which means
     it will be translated when it is used as an actual string.

tests/tests.py

@@ -6,13 +6,14 @@
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..'))
 
 import pickle
+from threading import Thread, Semaphore
 
 import unittest
 from decimal import Decimal
 import flask
 from datetime import datetime, timedelta
 import flask_babel as babel
-from flask_babel import gettext, ngettext, lazy_gettext, get_translations
+from flask_babel import gettext, ngettext, lazy_gettext, lazy_ngettext, get_translations
 from babel.support import NullTranslations
 from flask_babel._compat import text_type
 
@@ -204,6 +205,46 @@ def select_locale():
                 assert str(babel.get_locale()) == 'en_US'
             assert str(babel.get_locale()) == 'de_DE'
 
+    def test_force_locale_with_threading(self):
+        app = flask.Flask(__name__)
+        b = babel.Babel(app)
+
+        @b.localeselector
+        def select_locale():
+            return 'de_DE'
+
+        semaphore = Semaphore(value=0)
+
+        def first_request():
+            with app.test_request_context():
+                with babel.force_locale('en_US'):
+                    assert str(babel.get_locale()) == 'en_US'
+                    semaphore.acquire()
+
+        thread = Thread(target=first_request)
+        thread.start()
+
+        try:
+            with app.test_request_context():
+                assert str(babel.get_locale()) == 'de_DE'
+        finally:
+            semaphore.release()
+            thread.join()
+
+    def test_refresh_during_force_locale(self):
+        app = flask.Flask(__name__)
+        b = babel.Babel(app)
+
+        @b.localeselector
+        def select_locale():
+            return 'de_DE'
+
+        with app.test_request_context():
+            with babel.force_locale('en_US'):
+                assert str(babel.get_locale()) == 'en_US'
+                babel.refresh()
+                assert str(babel.get_locale()) == 'en_US'
+
 
 class NumberFormattingTestCase(unittest.TestCase):
 
@@ -266,6 +307,18 @@ def test_lazy_gettext(self):
             assert text_type(yes) == 'Yes'
             assert yes.__html__() == 'Yes'
 
+    def test_lazy_ngettext(self):
+        app = flask.Flask(__name__)
+        babel.Babel(app, default_locale='de_DE')
+        one_apple = lazy_ngettext(u'%(num)s Apple', u'%(num)s Apples', 1)
+        with app.test_request_context():
+            assert text_type(one_apple) == '1 Apfel'
+            assert one_apple.__html__() == '1 Apfel'
+        two_apples = lazy_ngettext(u'%(num)s Apple', u'%(num)s Apples', 2)
+        with app.test_request_context():
+            assert text_type(two_apples) == u'2 Äpfel'
+            assert two_apples.__html__() == u'2 Äpfel'
+
     def test_list_translations(self):
         app = flask.Flask(__name__)
         b = babel.Babel(app, default_locale='de_DE')