Merge pull request #2586 from LeXofLeviafan/fix-gettext-error

fixed error caused by the fallback implementation of gettext

README.md

@@ -1,6 +1,6 @@
 # Flask-Admin
 
-Flask-Admin is now part of Pallets-Eco, an open source organization managed by the 
+Flask-Admin is now part of Pallets-Eco, an open source organization managed by the
 Pallets team to facilitate community maintenance of Flask extensions. Please update
 your references to `https://github.com/pallets-eco/flask-admin.git`.
 

doc/changelog.rst

@@ -8,6 +8,7 @@ Fixes:
 
 * Jinja templates can now be loaded in StrictUndefined mode.
 * Remove an implicit dependency on `packaging`
+* Fixed an error caused by the fallback implementation of `gettext()` (when used in templates)
 
 2.0.0a2
 -------

flask_admin/babel.py

@@ -4,11 +4,11 @@
 except ImportError:
 
     def gettext(string, **variables):
-        return string % variables
+        return string if not variables else string % variables
 
     def ngettext(singular, plural, num, **variables):
         variables.setdefault("num", num)
-        return (singular if num == 1 else plural) % variables
+        return gettext((singular if num == 1 else plural), **variables)
 
     def lazy_gettext(string, **variables):
         return gettext(string, **variables)