diff -Nru flask-babelex-0.9.3/debian/changelog flask-babelex-0.9.4/debian/changelog --- flask-babelex-0.9.3/debian/changelog 2019-02-18 12:36:35.000000000 +0000 +++ flask-babelex-0.9.4/debian/changelog 2020-04-30 09:27:44.000000000 +0000 @@ -1,3 +1,19 @@ +flask-babelex (0.9.4-1) unstable; urgency=medium + + [ Ondřej Nový ] + * Use debhelper-compat instead of debian/compat. + + [ Debian Janitor ] + * Bump debhelper from old 10 to 12. + * Set upstream metadata fields: Bug-Database, Bug-Submit. + + [ Sophie Brun ] + * New upstream version 0.9.4: fix "import ImmutableDict from werkzeug" + with new python3-werkzeug version >= 1.0.0 + * Bump Standards-Version to 4.5.0 (no changes) + + -- Sophie Brun Thu, 30 Apr 2020 11:27:44 +0200 + flask-babelex (0.9.3-2) unstable; urgency=medium * Tack MIT license on debian/*. diff -Nru flask-babelex-0.9.3/debian/compat flask-babelex-0.9.4/debian/compat --- flask-babelex-0.9.3/debian/compat 2017-12-01 08:40:44.000000000 +0000 +++ flask-babelex-0.9.4/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -10 diff -Nru flask-babelex-0.9.3/debian/control flask-babelex-0.9.4/debian/control --- flask-babelex-0.9.3/debian/control 2019-02-18 12:36:19.000000000 +0000 +++ flask-babelex-0.9.4/debian/control 2020-04-30 09:27:44.000000000 +0000 @@ -4,13 +4,13 @@ Section: python Priority: optional Build-Depends: - debhelper (>= 10), + debhelper-compat (= 12), dh-python, python3-all, python3-babel, python3-flask, python3-setuptools, -Standards-Version: 4.1.4 +Standards-Version: 4.5.0 Homepage: https://github.com/mrjoes/flask-babelex Vcs-Git: https://salsa.debian.org/python-team/modules/flask-babelex.git Vcs-Browser: https://salsa.debian.org/python-team/modules/flask-babelex diff -Nru flask-babelex-0.9.3/debian/upstream/metadata flask-babelex-0.9.4/debian/upstream/metadata --- flask-babelex-0.9.3/debian/upstream/metadata 1970-01-01 00:00:00.000000000 +0000 +++ flask-babelex-0.9.4/debian/upstream/metadata 2020-04-30 09:27:44.000000000 +0000 @@ -0,0 +1,2 @@ +Bug-Database: https://github.com/mrjoes/flask-babelex/issues +Bug-Submit: https://github.com/mrjoes/flask-babelex/issues/new diff -Nru flask-babelex-0.9.3/docs/index.rst flask-babelex-0.9.4/docs/index.rst --- flask-babelex-0.9.3/docs/index.rst 2016-01-19 14:20:29.000000000 +0000 +++ flask-babelex-0.9.4/docs/index.rst 2020-02-07 15:14:11.000000000 +0000 @@ -1,7 +1,7 @@ Flask-BabelEx ============= -.. module:: flask.ext.babelex +.. module:: flask_babelex Flask-BabelEx is an extension to `Flask`_ that adds i18n and l10n support to any Flask application with the help of `babel`_, `pytz`_ and @@ -31,7 +31,7 @@ object after configuring the application:: from flask import Flask - from flask.ext.babelex import Babel + from flask_babelex import Babel app = Flask(__name__) app.config.from_pyfile('mysettings.cfg') @@ -106,7 +106,7 @@ Here some examples: ->>> from flask.ext.babelex import format_datetime +>>> from flask_babelex import format_datetime >>> from datetime import datetime >>> format_datetime(datetime(1987, 3, 5, 17, 12)) u'Mar 5, 1987 5:12:00 PM' @@ -122,7 +122,7 @@ And again with a different language: >>> app.config['BABEL_DEFAULT_LOCALE'] = 'de' ->>> from flask.ext.babelex import refresh; refresh() +>>> from flask_babelex import refresh; refresh() >>> format_datetime(datetime(1987, 3, 5, 17, 12), 'EEEE, d. MMMM yyyy H:mm') u'Donnerstag, 5. M\xe4rz 1987 17:12' @@ -142,7 +142,7 @@ :func:`ngettext`. The first to translate singular strings and the second to translate strings that might become plural. Here some examples:: - from flask.ext.babelex import gettext, ngettext + from flask_babelex import gettext, ngettext gettext(u'A simple string') gettext(u'Value: %(value)s', value=42) @@ -153,7 +153,7 @@ strings. Lazy strings will not be evaluated until they are actually used. To use such a lazy string, use the :func:`lazy_gettext` function:: - from flask.ext.babelex import lazy_gettext + from flask_babelex import lazy_gettext class MyForm(formlibrary.FormBase): success_message = lazy_gettext(u'The form was successfully saved.') @@ -240,7 +240,7 @@ Flask-BabelEx allows extension developers to specify which translation domain to use:: - from flask.ext.babelex import Domain + from flask_babelex import Domain mydomain = Domain(domain='myext') @@ -254,7 +254,7 @@ If extension is distributed with the localizations, it is possible to specify their location:: - from flask.ext.babelex import Domain + from flask_babelex import Domain from flask.ext.myext import translations mydomain = Domain(translations.__path__[0]) @@ -269,7 +269,7 @@ :class:`Babel` on initialization:: from flask import Flask - from flask.ext.babelex import Babel, Domain + from flask_babelex import Babel, Domain app = Flask(__name__) domain = Domain(domain='myext') @@ -281,7 +281,7 @@ :meth:`~Domain.as_default` method from within the request context:: from flask import Flask - from flask.ext.babelex import Babel, Domain, gettext + from flask_babelex import Babel, Domain, gettext app = Flask(__name__) domain = Domain(domain='myext') diff -Nru flask-babelex-0.9.3/flask_babelex/_compat.py flask-babelex-0.9.4/flask_babelex/_compat.py --- flask-babelex-0.9.3/flask_babelex/_compat.py 2016-01-19 14:20:29.000000000 +0000 +++ flask-babelex-0.9.4/flask_babelex/_compat.py 2020-02-07 15:14:11.000000000 +0000 @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """ - flask.ext.babelex._compat - ~~~~~~~~~~~~~~~~~~~~~~~~~ + flask_babelex._compat + ~~~~~~~~~~~~~~~~~~~~~ :copyright: (c) 2013 by Armin Ronacher, Daniel Neuhäuser. :license: BSD, see LICENSE for more details. diff -Nru flask-babelex-0.9.3/flask_babelex/__init__.py flask-babelex-0.9.4/flask_babelex/__init__.py --- flask-babelex-0.9.3/flask_babelex/__init__.py 2016-01-19 14:20:29.000000000 +0000 +++ flask-babelex-0.9.4/flask_babelex/__init__.py 2020-02-07 15:14:11.000000000 +0000 @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """ - flask.ext.babelex - ~~~~~~~~~~~~~~~~~ + flask_babelex + ~~~~~~~~~~~~~ Implements i18n/l10n support for Flask applications based on Babel. @@ -20,7 +20,7 @@ from flask import _request_ctx_stack from babel import dates, numbers, support, Locale from babel.support import NullTranslations -from werkzeug import ImmutableDict +from werkzeug.datastructures import ImmutableDict try: from pytz.gae import pytz except ImportError: @@ -531,7 +531,10 @@ gettext(u'Hello %(name)s!', name='World') """ t = self.get_translations() - return t.ugettext(string) % variables + if variables: + return t.ugettext(string) % variables + else: + return t.ugettext(string) def ngettext(self, singular, plural, num, **variables): """Translates a string with the current locale and passes in the diff -Nru flask-babelex-0.9.3/Flask_BabelEx.egg-info/PKG-INFO flask-babelex-0.9.4/Flask_BabelEx.egg-info/PKG-INFO --- flask-babelex-0.9.3/Flask_BabelEx.egg-info/PKG-INFO 2016-01-19 14:20:41.000000000 +0000 +++ flask-babelex-0.9.4/Flask_BabelEx.egg-info/PKG-INFO 2020-02-07 15:17:02.000000000 +0000 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: Flask-BabelEx -Version: 0.9.3 +Version: 0.9.4 Summary: Adds i18n/l10n support to Flask applications Home-page: http://github.com/mrjoes/flask-babelex Author: Serge S. Koval diff -Nru flask-babelex-0.9.3/Flask_BabelEx.egg-info/requires.txt flask-babelex-0.9.4/Flask_BabelEx.egg-info/requires.txt --- flask-babelex-0.9.3/Flask_BabelEx.egg-info/requires.txt 2016-01-19 14:20:41.000000000 +0000 +++ flask-babelex-0.9.4/Flask_BabelEx.egg-info/requires.txt 2020-02-07 15:17:02.000000000 +0000 @@ -1,4 +1,4 @@ Flask Babel>=1.0 speaklater>=1.2 -Jinja2>=2.5 \ No newline at end of file +Jinja2>=2.5 diff -Nru flask-babelex-0.9.3/PKG-INFO flask-babelex-0.9.4/PKG-INFO --- flask-babelex-0.9.3/PKG-INFO 2016-01-19 14:20:41.000000000 +0000 +++ flask-babelex-0.9.4/PKG-INFO 2020-02-07 15:17:02.490354500 +0000 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: Flask-BabelEx -Version: 0.9.3 +Version: 0.9.4 Summary: Adds i18n/l10n support to Flask applications Home-page: http://github.com/mrjoes/flask-babelex Author: Serge S. Koval diff -Nru flask-babelex-0.9.3/setup.cfg flask-babelex-0.9.4/setup.cfg --- flask-babelex-0.9.3/setup.cfg 2016-01-19 14:20:41.000000000 +0000 +++ flask-babelex-0.9.4/setup.cfg 2020-02-07 15:17:02.490354500 +0000 @@ -4,5 +4,4 @@ [egg_info] tag_build = tag_date = 0 -tag_svn_revision = 0 diff -Nru flask-babelex-0.9.3/setup.py flask-babelex-0.9.4/setup.py --- flask-babelex-0.9.3/setup.py 2016-01-19 14:20:29.000000000 +0000 +++ flask-babelex-0.9.4/setup.py 2020-02-07 15:16:01.000000000 +0000 @@ -28,7 +28,7 @@ setup( name='Flask-BabelEx', - version='0.9.3', + version='0.9.4', url='http://github.com/mrjoes/flask-babelex', license='BSD', author='Serge S. Koval',