From ac1a823fe86d0001076565c0af08ae16303d1e70 Mon Sep 17 00:00:00 2001
From: Kiran Jonnalagadda <kiran@hasgeek.com>
Date: Thu, 14 Dec 2023 16:40:36 +0530
Subject: [PATCH] Fix gettext return type, re-extract Babel strings

`lazy_gettext` (aliased as `__`) returns `LazyString`, which is not compatible with `str` and causes downstream type errors. Since it's meant to ducktype a string and works in _almost_ all situations (notable exception: `json.dumps`), we re-cast `__` to claim it returns a `str`.
---
 babel.cfg                                     |   4 +-
 src/baseframe/__init__.py                     |   8 +-
 src/baseframe/extensions.py                   |   8 +-
 src/baseframe/forms/validators.py             |  19 +-
 src/baseframe/translations/baseframe.pot      | 228 ++++++++--------
 .../hi_IN/LC_MESSAGES/baseframe.mo            | Bin 7154 -> 6724 bytes
 .../hi_IN/LC_MESSAGES/baseframe.po            | 243 +++++++++---------
 7 files changed, 264 insertions(+), 246 deletions(-)

diff --git a/babel.cfg b/babel.cfg
index 74b4120e..de2583db 100644
--- a/babel.cfg
+++ b/babel.cfg
@@ -1,6 +1,6 @@
 [python: **.py]
-[html-jinja2: **/templates/**.html.jinja2]
-extensions=jinja2.ext.autoescape,jinja2.ext.do
+[jinja2: **/templates/**.html.jinja2]
+extensions=jinja2.ext.do
 [javascript-jinja2: **/templates/js/**.js.jinja2]
 encoding = utf-8
 extract_messages=_,gettext,ngettext
diff --git a/src/baseframe/__init__.py b/src/baseframe/__init__.py
index 43cfb281..cd9fc3ef 100644
--- a/src/baseframe/__init__.py
+++ b/src/baseframe/__init__.py
@@ -1,6 +1,8 @@
 """Baseframe init."""
 
-from flask_babel import gettext as _, lazy_gettext as __
+from typing import Callable, cast
+
+from flask_babel import gettext, lazy_gettext
 
 from ._version import __version__, __version_info__
 from .assets import Version, assets
@@ -13,6 +15,10 @@
 
 from . import forms  # isort:skip
 
+# Pretend these return str, not Any or LazyString
+_ = cast(Callable[..., str], gettext)
+__ = cast(Callable[..., str], lazy_gettext)
+
 # TODO: baseframe_js and baseframe_css are defined in deprecated.py
 # and pending removal after an audit of all apps
 __all__ = [  # noqa: F405
diff --git a/src/baseframe/extensions.py b/src/baseframe/extensions.py
index 0ef40f79..fe2ecab1 100644
--- a/src/baseframe/extensions.py
+++ b/src/baseframe/extensions.py
@@ -1,8 +1,10 @@
 """Standard extensions to add to the Flask app."""
+# pyright: reportMissingImports = false
 
 import os.path
 import typing as t
 from datetime import tzinfo
+from typing import cast
 
 from flask import current_app, request
 from flask_babel import Babel, Domain
@@ -24,8 +26,6 @@
     line_profile = None
 
 __all__ = [
-    '_',
-    '__',
     'asset_cache',
     'babel',
     'baseframe_translations',
@@ -52,8 +52,8 @@
 baseframe_translations = Domain(
     os.path.join(os.path.dirname(__file__), 'translations'), domain='baseframe'
 )
-_ = baseframe_translations.gettext
-__ = baseframe_translations.lazy_gettext
+_ = cast(t.Callable[..., str], baseframe_translations.gettext)
+__ = cast(t.Callable[..., str], baseframe_translations.lazy_gettext)
 
 
 def get_user_locale() -> str:
diff --git a/src/baseframe/forms/validators.py b/src/baseframe/forms/validators.py
index d3ecc30f..8c2329ba 100644
--- a/src/baseframe/forms/validators.py
+++ b/src/baseframe/forms/validators.py
@@ -8,6 +8,7 @@
 from collections import namedtuple
 from decimal import Decimal
 from fractions import Fraction
+from typing import Any, cast
 from urllib.parse import urljoin, urlparse
 
 import dns.resolver
@@ -219,12 +220,12 @@ def __call__(self, form: WTForm, field: WTField) -> None:
             raise ValidationError(self.message.format(**d))
 
     def compare(self, value: t.Any, other: t.Any) -> bool:
-        raise NotImplementedError(_("Subclasses must define ``compare``"))
+        raise NotImplementedError("Subclasses must define ``compare``")
 
 
 class GreaterThan(_Comparison):
     """
-    Validate field.data > otherfield.data.
+    Validate ``field.data > otherfield.data``.
 
     :param fieldname:
         The name of the other field to compare to.
@@ -242,7 +243,7 @@ def compare(self, value: t.Any, other: t.Any) -> bool:
 
 class GreaterThanEqualTo(_Comparison):
     """
-    Validate field.data >= otherfield.data.
+    Validate ``field.data >= otherfield.data``.
 
     :param fieldname:
         The name of the other field to compare to.
@@ -260,7 +261,7 @@ def compare(self, value: t.Any, other: t.Any) -> bool:
 
 class LesserThan(_Comparison):
     """
-    Validate field.data < otherfield.data.
+    Validate ``field.data < otherfield.data``.
 
     :param fieldname:
         The name of the other field to compare to.
@@ -278,7 +279,7 @@ def compare(self, value: t.Any, other: t.Any) -> bool:
 
 class LesserThanEqualTo(_Comparison):
     """
-    Validate field.data <= otherfield.data.
+    Validate ``field.data <= otherfield.data``.
 
     :param fieldname:
         The name of the other field to compare to.
@@ -296,7 +297,7 @@ def compare(self, value: t.Any, other: t.Any) -> bool:
 
 class NotEqualTo(_Comparison):
     """
-    Validate field.data != otherfield.data.
+    Validate ``field.data != otherfield.data``.
 
     :param fieldname:
         The name of the other field to compare to.
@@ -428,7 +429,7 @@ class ValidUrl:
     """
 
     user_agent = (
-        "Mozilla/5.0 (X11; Linux x86_64; rv:66.0) Gecko/20100101 Hasgeek/linkchecker"
+        'Mozilla/5.0 (X11; Linux x86_64; rv:66.0) Gecko/20100101 Hasgeek/linkchecker'
     )
 
     default_message = __("The URL “{url}” is not valid or is currently inaccessible")
@@ -500,7 +501,7 @@ def check_url(
 
         cache_key = 'linkchecker/' + md5sum(url)
         try:
-            cache_check = asset_cache.get(cache_key)
+            cache_check = cast(Any, asset_cache.get(cache_key))
         except ValueError:  # Possible error from a broken pickle
             cache_check = None
         # Read from cache, but assume cache may be broken since Flask-Cache stores data
@@ -509,7 +510,7 @@ def check_url(
             rurl = cache_check.get('url')
             code = cache_check.get('code')
         else:
-            rurl = None  # rurl is the response URL after following redirects
+            rurl = None  # `rurl` is the response URL after following redirects
             code = None
 
         # TODO: Also honour the robots.txt protocol and stay off URLs that aren't meant
diff --git a/src/baseframe/translations/baseframe.pot b/src/baseframe/translations/baseframe.pot
index cd070479..2c6d0d70 100644
--- a/src/baseframe/translations/baseframe.pot
+++ b/src/baseframe/translations/baseframe.pot
@@ -1,332 +1,330 @@
 # Translations template for PROJECT.
-# Copyright (C) 2021 ORGANIZATION
+# Copyright (C) 2023 ORGANIZATION
 # This file is distributed under the same license as the PROJECT project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2021.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2023.
 #
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-05-06 02:01+0530\n"
+"POT-Creation-Date: 2023-12-14 16:36+0530\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.9.1\n"
+"Generated-By: Babel 2.12.1\n"
 
-#: baseframe/filters.py:32
+#: src/baseframe/filters.py:37
 msgid "now"
 msgstr ""
 
-#: baseframe/filters.py:34
+#: src/baseframe/filters.py:39
 msgid "seconds ago"
 msgstr ""
 
-#: baseframe/filters.py:36
+#: src/baseframe/filters.py:41
 #, python-format
 msgid "%(num)s seconds ago"
 msgstr ""
 
-#: baseframe/filters.py:38
+#: src/baseframe/filters.py:43
 msgid "a minute ago"
 msgstr ""
 
-#: baseframe/filters.py:40
+#: src/baseframe/filters.py:45
 #, python-format
 msgid "%(num)s minutes ago"
 msgstr ""
 
-#: baseframe/filters.py:42
+#: src/baseframe/filters.py:47
 msgid "an hour ago"
 msgstr ""
 
-#: baseframe/filters.py:43
+#: src/baseframe/filters.py:48
 #, python-format
 msgid "%(num)s hours ago"
 msgstr ""
 
-#: baseframe/filters.py:45
+#: src/baseframe/filters.py:50
 msgid "a day ago"
 msgstr ""
 
-#: baseframe/filters.py:47
+#: src/baseframe/filters.py:52
 #, python-format
 msgid "%(num)s days ago"
 msgstr ""
 
-#: baseframe/filters.py:49
+#: src/baseframe/filters.py:54
 msgid "a month ago"
 msgstr ""
 
-#: baseframe/filters.py:51
+#: src/baseframe/filters.py:56
 #, python-format
 msgid "%(num)s months ago"
 msgstr ""
 
-#: baseframe/filters.py:53
+#: src/baseframe/filters.py:58
 msgid "a year ago"
 msgstr ""
 
-#: baseframe/filters.py:54
+#: src/baseframe/filters.py:59
 #, python-format
 msgid "%(num)s years ago"
 msgstr ""
 
-#: baseframe/forms/auto.py:31
-#: baseframe/templates/baseframe/bootstrap3/delete.html.jinja2:11
-#: baseframe/templates/baseframe/mui/delete.html.jinja2:13
+#: src/baseframe/forms/auto.py:32
+#: src/baseframe/templates/baseframe/bootstrap3/forms.html.jinja2:154
+#: src/baseframe/templates/baseframe/mui/forms.html.jinja2:208
+msgid "Submit"
+msgstr ""
+
+#: src/baseframe/forms/auto.py:39
+#: src/baseframe/templates/baseframe/bootstrap3/delete.html.jinja2:11
+#: src/baseframe/templates/baseframe/mui/delete.html.jinja2:13
 msgid "Delete"
 msgstr ""
 
-#: baseframe/forms/auto.py:32
-#: baseframe/templates/baseframe/bootstrap3/delete.html.jinja2:12
-#: baseframe/templates/baseframe/bootstrap3/forms.html.jinja2:53
-#: baseframe/templates/baseframe/mui/delete.html.jinja2:14
-#: baseframe/templates/baseframe/mui/forms.html.jinja2:96
+#: src/baseframe/forms/auto.py:40
+#: src/baseframe/templates/baseframe/bootstrap3/delete.html.jinja2:12
+#: src/baseframe/templates/baseframe/bootstrap3/forms.html.jinja2:94
+#: src/baseframe/templates/baseframe/mui/delete.html.jinja2:14
+#: src/baseframe/templates/baseframe/mui/forms.html.jinja2:146
 msgid "Cancel"
 msgstr ""
 
-#: baseframe/forms/auto.py:40
-#: baseframe/templates/baseframe/bootstrap3/forms.html.jinja2:76
-#: baseframe/templates/baseframe/mui/forms.html.jinja2:119
-msgid "Submit"
+#: src/baseframe/forms/fields.py:181 src/baseframe/forms/fields.py:912
+msgid "Not a valid choice"
 msgstr ""
 
-#: baseframe/forms/fields.py:169
-msgid "Not a valid choice!"
+#: src/baseframe/forms/fields.py:292
+msgid "This date/time could not be recognized"
 msgstr ""
 
-#: baseframe/forms/fields.py:936
+#: src/baseframe/forms/fields.py:895
 msgid "Value not in LabeledEnum"
 msgstr ""
 
-#: baseframe/forms/fields.py:946
+#: src/baseframe/forms/fields.py:907
 msgid "Invalid Choice: could not coerce"
 msgstr ""
 
-#: baseframe/forms/fields.py:950
-msgid "Not a valid choice"
-msgstr ""
-
-#: baseframe/forms/fields.py:1006
+#: src/baseframe/forms/fields.py:976
 msgid "Field value must be a dictionary"
 msgstr ""
 
-#: baseframe/forms/fields.py:1024
-msgid "Invalid JSON: {0!r}"
+#: src/baseframe/forms/fields.py:998
+msgid "Invalid JSON: {message}"
 msgstr ""
 
-#: baseframe/forms/fields.py:1027
-msgid "The JSON root must be a hash object"
+#: src/baseframe/forms/fields.py:1002
+msgid "The JSON data must be a hash object enclosed in {}"
 msgstr ""
 
-#: baseframe/forms/form.py:124
+#: src/baseframe/forms/form.py:136
 msgid "This form has already been submitted"
 msgstr ""
 
-#: baseframe/forms/sqlalchemy.py:20
-msgid "This {attr} is already in use"
-msgstr ""
-
-#: baseframe/forms/sqlalchemy.py:48
+#: src/baseframe/forms/sqlalchemy.py:53
 msgid "This URL name is already in use"
 msgstr ""
 
-#: baseframe/forms/validators.py:72
+#: src/baseframe/forms/validators.py:76
 msgid "The secret parameter is missing"
 msgstr ""
 
-#: baseframe/forms/validators.py:73
+#: src/baseframe/forms/validators.py:77
 msgid "The secret parameter is invalid or malformed"
 msgstr ""
 
-#: baseframe/forms/validators.py:74
+#: src/baseframe/forms/validators.py:78
 msgid "The response parameter is missing"
 msgstr ""
 
-#: baseframe/forms/validators.py:75
+#: src/baseframe/forms/validators.py:79
 msgid "The response parameter is invalid or malformed"
 msgstr ""
 
-#: baseframe/forms/validators.py:127
+#: src/baseframe/forms/validators.py:129
 msgid "This requires ‘{field}’ to be specified"
 msgstr ""
 
-#: baseframe/forms/validators.py:158 baseframe/forms/validators.py:187
+#: src/baseframe/forms/validators.py:160 src/baseframe/forms/validators.py:189
 msgid "This is required"
 msgstr ""
 
-#: baseframe/forms/validators.py:204
+#: src/baseframe/forms/validators.py:205
 msgid "Comparison failed"
 msgstr ""
 
-#: baseframe/forms/validators.py:222
-msgid "Subclasses must define ``compare``"
-msgstr ""
-
-#: baseframe/forms/validators.py:237
+#: src/baseframe/forms/validators.py:238
 msgid "This must be greater than {other_label}"
 msgstr ""
 
-#: baseframe/forms/validators.py:255
+#: src/baseframe/forms/validators.py:256
 msgid "This must be greater than or equal to {other_label}"
 msgstr ""
 
-#: baseframe/forms/validators.py:273
+#: src/baseframe/forms/validators.py:274
 msgid "This must be lesser than {other_label}"
 msgstr ""
 
-#: baseframe/forms/validators.py:291
+#: src/baseframe/forms/validators.py:292
 msgid "This must be lesser than or equal to {other_label}"
 msgstr ""
 
-#: baseframe/forms/validators.py:309
+#: src/baseframe/forms/validators.py:310
 msgid "This must not be the same as {other_label}"
 msgstr ""
 
-#: baseframe/forms/validators.py:323
+#: src/baseframe/forms/validators.py:324
 msgid "This is not a valid emoji"
 msgstr ""
 
-#: baseframe/forms/validators.py:344
+#: src/baseframe/forms/validators.py:345
 msgid "This domain is not a public email domain"
 msgstr ""
 
-#: baseframe/forms/validators.py:367
+#: src/baseframe/forms/validators.py:368
 msgid "This domain is a public email domain"
 msgstr ""
 
-#: baseframe/forms/validators.py:388
+#: src/baseframe/forms/validators.py:389
 msgid "This email address does not appear to be valid"
 msgstr ""
 
-#: baseframe/forms/validators.py:434
+#: src/baseframe/forms/validators.py:435
 msgid "The URL “{url}” is not valid or is currently inaccessible"
 msgstr ""
 
-#: baseframe/forms/validators.py:436
+#: src/baseframe/forms/validators.py:437
 msgid ""
 "The URL “{url}” linked from “{text}” is not valid or is currently "
 "inaccessible"
 msgstr ""
 
-#: baseframe/forms/validators.py:440
+#: src/baseframe/forms/validators.py:441
 msgid "This URL’s protocol is not allowed"
 msgstr ""
 
-#: baseframe/forms/validators.py:442
+#: src/baseframe/forms/validators.py:443
 msgid "This URL’s domain is not allowed"
 msgstr ""
 
-#: baseframe/forms/validators.py:489 baseframe/forms/validators.py:494
+#: src/baseframe/forms/validators.py:490 src/baseframe/forms/validators.py:495
 msgid ", "
 msgstr ""
 
-#: baseframe/forms/validators.py:659
+#: src/baseframe/forms/validators.py:665
 msgid "Email address identified"
 msgstr ""
 
-#: baseframe/forms/validators.py:677
+#: src/baseframe/forms/validators.py:682
 msgid ""
 "This name contains unsupported characters. It should have letters, "
 "numbers and non-terminal hyphens only"
 msgstr ""
 
-#: baseframe/forms/validators.py:692
+#: src/baseframe/forms/validators.py:696
 msgid "Valid latitude and longitude expected"
 msgstr ""
 
-#: baseframe/forms/validators.py:693
+#: src/baseframe/forms/validators.py:697
 msgid "Latitude must be within ± 90 degrees"
 msgstr ""
 
-#: baseframe/forms/validators.py:694
+#: src/baseframe/forms/validators.py:698
 msgid "Longitude must be within ± 180 degrees"
 msgstr ""
 
-#: baseframe/forms/validators.py:718
+#: src/baseframe/forms/validators.py:722
 msgid "The server was temporarily unreachable. Try again"
 msgstr ""
 
-#: baseframe/forms/widgets.py:185
+#: src/baseframe/forms/widgets.py:158
 msgid "Latitude"
 msgstr ""
 
-#: baseframe/forms/widgets.py:192
+#: src/baseframe/forms/widgets.py:165
 msgid "Longitude"
 msgstr ""
 
-#: baseframe/forms/widgets.py:311
+#: src/baseframe/forms/widgets.py:284
 msgid "Image URL"
 msgstr ""
 
-#: baseframe/templates/400.html.jinja2:2
+#: src/baseframe/templates/baseframe/bootstrap3/forms.html.jinja2:100
+#: src/baseframe/templates/baseframe/mui/forms.html.jinja2:152
+msgid "This form has timed out. Please submit again to confirm"
+msgstr ""
+
+#: src/baseframe/templates/baseframe/bootstrap3/forms.html.jinja2:122
+#: src/baseframe/templates/baseframe/mui/forms.html.jinja2:172
+msgid "Please review the indicated issues"
+msgstr ""
+
+#: src/baseframe/templates/baseframe/bootstrap3/redirect.html.jinja2:1
+#: src/baseframe/templates/baseframe/mui/redirect.html.jinja2:1
+msgid "Loading…"
+msgstr ""
+
+#: src/baseframe/templates/baseframe/mui/forms.html.jinja2:230
+msgid "An error occured when submitting the form"
+msgstr ""
+
+#: src/baseframe/templates/baseframe/mui/imgeefield.html.jinja2:5
+msgid "Select or upload image"
+msgstr ""
+
+#: src/baseframe/templates/baseframe/mui/imgeefield.html.jinja2:8
+msgid "Close"
+msgstr ""
+
+#: src/baseframe/templates/errors/400.html.jinja2:2
 msgid "Bad Request"
 msgstr ""
 
-#: baseframe/templates/400.html.jinja2:5 baseframe/templates/422.html.jinja2:5
+#: src/baseframe/templates/errors/400.html.jinja2:5
+#: src/baseframe/templates/errors/422.html.jinja2:5
 msgid "This request was malformed and could not be processed"
 msgstr ""
 
-#: baseframe/templates/403.html.jinja2:2
+#: src/baseframe/templates/errors/403.html.jinja2:2
 msgid "Access denied"
 msgstr ""
 
-#: baseframe/templates/403.html.jinja2:5
+#: src/baseframe/templates/errors/403.html.jinja2:5
 msgid "You do not have access to that page"
 msgstr ""
 
-#: baseframe/templates/404.html.jinja2:2
+#: src/baseframe/templates/errors/404.html.jinja2:2
 msgid "Not Found"
 msgstr ""
 
-#: baseframe/templates/404.html.jinja2:5
+#: src/baseframe/templates/errors/404.html.jinja2:5
 msgid "The page you were looking for does not exist"
 msgstr ""
 
-#: baseframe/templates/422.html.jinja2:2
+#: src/baseframe/templates/errors/422.html.jinja2:2
 msgid "Unprocessable Entity"
 msgstr ""
 
-#: baseframe/templates/429.html.jinja2:2
+#: src/baseframe/templates/errors/429.html.jinja2:2
 msgid "Too Many Requests"
 msgstr ""
 
-#: baseframe/templates/429.html.jinja2:5
+#: src/baseframe/templates/errors/429.html.jinja2:5
 msgid "You have exceeded the rate limit and must try after some time"
 msgstr ""
 
-#: baseframe/templates/500.html.jinja2:2
+#: src/baseframe/templates/errors/500.html.jinja2:2
 msgid "Internal Server Error"
 msgstr ""
 
-#: baseframe/templates/500.html.jinja2:5
+#: src/baseframe/templates/errors/500.html.jinja2:5
 msgid ""
 "Something broke inside. A report has been sent to the server’s "
 "administrator. Our apologies for the inconvenience"
 msgstr ""
-
-#: baseframe/templates/baseframe/bootstrap3/forms.html.jinja2:56
-#: baseframe/templates/baseframe/mui/forms.html.jinja2:99
-msgid "This form has timed out. Please submit again to confirm"
-msgstr ""
-
-#: baseframe/templates/baseframe/bootstrap3/forms.html.jinja2:63
-msgid "Please review the indicated issues"
-msgstr ""
-
-#: baseframe/templates/baseframe/bootstrap3/redirect.html.jinja2:1
-#: baseframe/templates/baseframe/mui/redirect.html.jinja2:1
-msgid "Loading…"
-msgstr ""
-
-#: baseframe/templates/baseframe/mui/imgeefield.html.jinja2:5
-msgid "Select or upload image"
-msgstr ""
-
-#: baseframe/templates/baseframe/mui/imgeefield.html.jinja2:8
-msgid "Close"
-msgstr ""
diff --git a/src/baseframe/translations/hi_IN/LC_MESSAGES/baseframe.mo b/src/baseframe/translations/hi_IN/LC_MESSAGES/baseframe.mo
index 49fd2bd588d3baf531315a4e341b7295bf1848db..9f5cf41fe4e539c6f2f62af0c1c67c0fb91c7da3 100644
GIT binary patch
delta 1012
zcmYMyPe>F|9Ki86`!99d@z3_psbyy~+lZ8AcXh*vGAg3fh$w;rmqKxis5wML!FbZ@
zP}F2e<e?6E2ud6%5Q(5VbTUi|DuhlQf)4iQB1GRG`=Ei@&-=YMJMZ`V&08qGE_m||
zkrBnUg?kP67ek`|*Zr_kb%bMBk54d(FR=mVbo@=PFJglEL`11LuErQ<F^a7y?<rK~
zJ++6yDki$o#(u2EVO)+ku?okr87Hs?KcGDK6|?wV$4PdP#8S8xH{%LCgp$Z9+=eb5
zQJzvy8Ej%A#;TadG?vi8K^;$`yl@uR;cu<AM5ztL+p!e~P}c8a5vQ>cf1z~Jq?!Rt
zV;lRcD-5J1FR&TkVH5sA$<(4usq`p6OYsCsYtN!|;*ySsknXEnI=+LK`J4|?5=!%@
z4DP}#_M<0*>kQ<9XWGvw9gy9mA{(WG11PO5<9ZxKY4tefaSD6!2TG+q9E3LPMfsE?
zDC>`P95?B|EM!dDjYX7=MsWvD;zj(4J$R<JlE5@RAbyXtc%I!{+)Eo}gDE_W7TMj#
zb0~3?liP{Mup7sco*V)W4-+SG=Q5>^<0EaD?A{WWumd+zzKwnO28Zw(cCD<OosU=|
zj&P#O*oTtn45rYfIva0b6Ha6p$ikdnSU^6PN?Mf`r>x*pIAQpUk*oe_ba!CH_JxCT
zb*GWYw>Y^Lr(iqn9r<?udCfgztA8-=hMZjRD(;2+3uay5n)?m^Z|!`LtB+L$!;Pmy
F{{Sn1a76$B

delta 1287
zcmYk)Ur19?9Ki8AooVV!on_0?Yi3GVO-n8Rlu<-UY7q63s8dH<nZr2+3t8EJp@+H^
zA%Y5<2}(wbprRyDDtw5f7op<z5cOa^NYq0XeShvkjg8OwopW~1@BGf0+&W+E|B!6H
zsqiV|x0>IANuqzBcae&cNcbL;@EclX*sLhYkb)BDpp2KI1*<R)kKz(MhEdpxGS3(8
z_bV4^tfb>AsyK{G@dYl&Hz*r?#u)sC*=T09SloazzYue9rx71RNw5v&|L1Wn-o_R9
z1eYj&MVX<IMaL|b<8M5IrKFvQ*9|8ygLn?}F+MsR??73&4%gvX!(q%Np2ki1-RRHa
z6vf2*(8m7C85&aJK6K$I7Ges=T7#7+C39gmo<d1@5GCPB<f}wbj(ChmDZLG)LfJ-a
zM{Z9kGvW&LpW?m`(2&eu@UKjq!yHUtHL(a~yw30(N+m{6PWBRQ_!FhHNj!k{n2T}+
zHMj*Eu^w-s9QcQY`pZe96BH#K%TeyU7G<K>h-VDHU<3VsP&TYzrYIHIg}d-EcHsh6
zV<)>vLQ{Ac-{BAzP|g{An?(KFXxt%9+0e#Ik%?V+1790)bBeJ6R?)wJ@<uAjwh4!@
z7NgirY{XYMfhBk)HT<|Iaf<j8_Ts36r!ScnahyE7fDL#b-Dq7E&bS-pEo7vH7b?dr
z;yRT69;1H{<t;o%xq|7mP+z3QWZmD|>1c5`tCfdps!P<<_DpZLHf-*-R(pJ^Lk*8L
zxjgPBXQs9}YHzyCQ@tKWPj<BX)J7+>T#j~^>S;XgYzldz4o0qax!cv#4xi84t<rL|
zc%6>sF4f(tcC<S~Ph)nQEcqMlg&XZfs=c7Zp08PA`?QhRHq-V{TAV+^c2^HP(*q-V
z@Twjd|39(N4U5C1JxJJL%GBl)K5kpgMGxF$zN!cA>A@a7FhJ{(9=xmv9@4s|2gVlH
p>DPmoWTvb+pnbKd=5gj}V~PEtj>P8ZIEjp$HJf!$Xg2jk#9wq4*;xPp

diff --git a/src/baseframe/translations/hi_IN/LC_MESSAGES/baseframe.po b/src/baseframe/translations/hi_IN/LC_MESSAGES/baseframe.po
index 442a8026..529aaad0 100644
--- a/src/baseframe/translations/hi_IN/LC_MESSAGES/baseframe.po
+++ b/src/baseframe/translations/hi_IN/LC_MESSAGES/baseframe.po
@@ -7,208 +7,200 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-05-06 02:01+0530\n"
+"POT-Creation-Date: 2023-12-14 16:36+0530\n"
 "PO-Revision-Date: 2020-12-18 17:52+0530\n"
 "Last-Translator: \n"
 "Language: hi_IN\n"
 "Language-Team: hi_IN <LL@li.org>\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.9.1\n"
+"Generated-By: Babel 2.12.1\n"
 
-#: baseframe/filters.py:32
+#: src/baseframe/filters.py:37
 msgid "now"
 msgstr "अभी"
 
-#: baseframe/filters.py:34
+#: src/baseframe/filters.py:39
 msgid "seconds ago"
 msgstr "कुछ सेकंड पहले"
 
-#: baseframe/filters.py:36
+#: src/baseframe/filters.py:41
 #, python-format
 msgid "%(num)s seconds ago"
 msgstr "%(num)s सेकंड पहले"
 
-#: baseframe/filters.py:38
+#: src/baseframe/filters.py:43
 msgid "a minute ago"
 msgstr "एक मिनट पहले"
 
-#: baseframe/filters.py:40
+#: src/baseframe/filters.py:45
 #, python-format
 msgid "%(num)s minutes ago"
 msgstr "%(num)s मिनटों पहले"
 
-#: baseframe/filters.py:42
+#: src/baseframe/filters.py:47
 msgid "an hour ago"
 msgstr "एक घंटा पहले"
 
-#: baseframe/filters.py:43
+#: src/baseframe/filters.py:48
 #, python-format
 msgid "%(num)s hours ago"
 msgstr "%(num)s घंटो पहले"
 
-#: baseframe/filters.py:45
+#: src/baseframe/filters.py:50
 msgid "a day ago"
 msgstr "एक दिन पहले"
 
-#: baseframe/filters.py:47
+#: src/baseframe/filters.py:52
 #, python-format
 msgid "%(num)s days ago"
 msgstr "%(num)s दिनों पहले"
 
-#: baseframe/filters.py:49
+#: src/baseframe/filters.py:54
 msgid "a month ago"
 msgstr "एक महीने पहले"
 
-#: baseframe/filters.py:51
+#: src/baseframe/filters.py:56
 #, python-format
 msgid "%(num)s months ago"
 msgstr "%(num)s महीनों पहले"
 
-#: baseframe/filters.py:53
+#: src/baseframe/filters.py:58
 msgid "a year ago"
 msgstr "एक साल पहले"
 
-#: baseframe/filters.py:54
+#: src/baseframe/filters.py:59
 #, python-format
 msgid "%(num)s years ago"
 msgstr "%(num)s सालों पहले"
 
-#: baseframe/forms/auto.py:31
-#: baseframe/templates/baseframe/bootstrap3/delete.html.jinja2:11
-#: baseframe/templates/baseframe/mui/delete.html.jinja2:13
+#: src/baseframe/forms/auto.py:32
+#: src/baseframe/templates/baseframe/bootstrap3/forms.html.jinja2:154
+#: src/baseframe/templates/baseframe/mui/forms.html.jinja2:208
+msgid "Submit"
+msgstr "जमा करें"
+
+#: src/baseframe/forms/auto.py:39
+#: src/baseframe/templates/baseframe/bootstrap3/delete.html.jinja2:11
+#: src/baseframe/templates/baseframe/mui/delete.html.jinja2:13
 msgid "Delete"
 msgstr "मिटाएं"
 
-#: baseframe/forms/auto.py:32
-#: baseframe/templates/baseframe/bootstrap3/delete.html.jinja2:12
-#: baseframe/templates/baseframe/bootstrap3/forms.html.jinja2:53
-#: baseframe/templates/baseframe/mui/delete.html.jinja2:14
-#: baseframe/templates/baseframe/mui/forms.html.jinja2:96
+#: src/baseframe/forms/auto.py:40
+#: src/baseframe/templates/baseframe/bootstrap3/delete.html.jinja2:12
+#: src/baseframe/templates/baseframe/bootstrap3/forms.html.jinja2:94
+#: src/baseframe/templates/baseframe/mui/delete.html.jinja2:14
+#: src/baseframe/templates/baseframe/mui/forms.html.jinja2:146
 msgid "Cancel"
 msgstr "रद्द करें"
 
-#: baseframe/forms/auto.py:40
-#: baseframe/templates/baseframe/bootstrap3/forms.html.jinja2:76
-#: baseframe/templates/baseframe/mui/forms.html.jinja2:119
-msgid "Submit"
-msgstr "जमा करें"
+#: src/baseframe/forms/fields.py:181 src/baseframe/forms/fields.py:912
+msgid "Not a valid choice"
+msgstr "यह मान्य विकल्प नहीं हैं"
 
-#: baseframe/forms/fields.py:169
-msgid "Not a valid choice!"
-msgstr "यह मान्य विकल्प नहीं हैं!"
+#: src/baseframe/forms/fields.py:292
+msgid "This date/time could not be recognized"
+msgstr ""
 
-#: baseframe/forms/fields.py:936
+#: src/baseframe/forms/fields.py:895
 msgid "Value not in LabeledEnum"
 msgstr ""
 
-#: baseframe/forms/fields.py:946
+#: src/baseframe/forms/fields.py:907
 msgid "Invalid Choice: could not coerce"
 msgstr ""
 
-#: baseframe/forms/fields.py:950
-msgid "Not a valid choice"
-msgstr "यह मान्य विकल्प नहीं हैं"
-
-#: baseframe/forms/fields.py:1006
+#: src/baseframe/forms/fields.py:976
 msgid "Field value must be a dictionary"
 msgstr "फील्ड वैल्यू एक डिक्शनरी होनी चाहिए"
 
-#: baseframe/forms/fields.py:1024
-msgid "Invalid JSON: {0!r}"
-msgstr "अमान्य JSON: {0!r}"
+#: src/baseframe/forms/fields.py:998
+msgid "Invalid JSON: {message}"
+msgstr ""
 
-#: baseframe/forms/fields.py:1027
-msgid "The JSON root must be a hash object"
-msgstr "JSON का रूट हैश ऑब्जेक्ट होना चाहिए"
+#: src/baseframe/forms/fields.py:1002
+msgid "The JSON data must be a hash object enclosed in {}"
+msgstr ""
 
-#: baseframe/forms/form.py:124
+#: src/baseframe/forms/form.py:136
 msgid "This form has already been submitted"
 msgstr "ये फॉर्म पहले ही जमा किया जा चुका है"
 
-#: baseframe/forms/sqlalchemy.py:20
-msgid "This {attr} is already in use"
-msgstr "यह {attr} पहले से इस्तेमाल में हैं"
-
-#: baseframe/forms/sqlalchemy.py:48
+#: src/baseframe/forms/sqlalchemy.py:53
 msgid "This URL name is already in use"
 msgstr "यह URL नाम पहले से इस्तेमाल में हैं"
 
-#: baseframe/forms/validators.py:72
+#: src/baseframe/forms/validators.py:76
 msgid "The secret parameter is missing"
 msgstr "सीक्रेट पैरामीटर मौजूद नहीं हैं"
 
-#: baseframe/forms/validators.py:73
+#: src/baseframe/forms/validators.py:77
 msgid "The secret parameter is invalid or malformed"
 msgstr "सीक्रेट पैरामीटर गलत या असामान्य है"
 
-#: baseframe/forms/validators.py:74
+#: src/baseframe/forms/validators.py:78
 msgid "The response parameter is missing"
 msgstr ""
 
-#: baseframe/forms/validators.py:75
+#: src/baseframe/forms/validators.py:79
 msgid "The response parameter is invalid or malformed"
 msgstr ""
 
-#: baseframe/forms/validators.py:127
+#: src/baseframe/forms/validators.py:129
 msgid "This requires ‘{field}’ to be specified"
 msgstr ""
 
-#: baseframe/forms/validators.py:158 baseframe/forms/validators.py:187
+#: src/baseframe/forms/validators.py:160 src/baseframe/forms/validators.py:189
 msgid "This is required"
 msgstr "यह आवश्यक है"
 
-#: baseframe/forms/validators.py:204
+#: src/baseframe/forms/validators.py:205
 msgid "Comparison failed"
 msgstr "तुलना असफल रही"
 
-#: baseframe/forms/validators.py:222
-msgid "Subclasses must define ``compare``"
-msgstr ""
-
-#: baseframe/forms/validators.py:237
+#: src/baseframe/forms/validators.py:238
 msgid "This must be greater than {other_label}"
 msgstr ""
 
-#: baseframe/forms/validators.py:255
+#: src/baseframe/forms/validators.py:256
 msgid "This must be greater than or equal to {other_label}"
 msgstr ""
 
-#: baseframe/forms/validators.py:273
+#: src/baseframe/forms/validators.py:274
 msgid "This must be lesser than {other_label}"
 msgstr ""
 
-#: baseframe/forms/validators.py:291
+#: src/baseframe/forms/validators.py:292
 msgid "This must be lesser than or equal to {other_label}"
 msgstr ""
 
-#: baseframe/forms/validators.py:309
+#: src/baseframe/forms/validators.py:310
 msgid "This must not be the same as {other_label}"
 msgstr ""
 
-#: baseframe/forms/validators.py:323
+#: src/baseframe/forms/validators.py:324
 msgid "This is not a valid emoji"
 msgstr "यह मान्य इमोजी नहीं है"
 
-#: baseframe/forms/validators.py:344
+#: src/baseframe/forms/validators.py:345
 msgid "This domain is not a public email domain"
 msgstr "यह डोमेन सार्वजनिक ईमेल डोमेन नहीं है"
 
-#: baseframe/forms/validators.py:367
+#: src/baseframe/forms/validators.py:368
 msgid "This domain is a public email domain"
 msgstr "यह डोमेन सार्वजनिक ईमेल डोमेन है"
 
-#: baseframe/forms/validators.py:388
+#: src/baseframe/forms/validators.py:389
 msgid "This email address does not appear to be valid"
 msgstr "लगता है की यह ईमेल पता मान्य नहीं है"
 
-#: baseframe/forms/validators.py:434
+#: src/baseframe/forms/validators.py:435
 msgid "The URL “{url}” is not valid or is currently inaccessible"
 msgstr "यह URL “{url}” या तो मान्य नहीं है या फिर इस वक्त पहुँचा नहीं जा सकता"
 
-#: baseframe/forms/validators.py:436
+#: src/baseframe/forms/validators.py:437
 msgid ""
 "The URL “{url}” linked from “{text}” is not valid or is currently "
 "inaccessible"
@@ -216,23 +208,23 @@ msgstr ""
 "“{text}” से लिंक किया गया URL “{url}” या तो मान्य नहीं है या फिर इस वक्त "
 "पहुँचा नहीं जा सकता"
 
-#: baseframe/forms/validators.py:440
+#: src/baseframe/forms/validators.py:441
 msgid "This URL’s protocol is not allowed"
 msgstr "इस URL के प्रोटोकॉल अस्वीकृत है"
 
-#: baseframe/forms/validators.py:442
+#: src/baseframe/forms/validators.py:443
 msgid "This URL’s domain is not allowed"
 msgstr "इस URL के डोमेन अस्वीकृत है"
 
-#: baseframe/forms/validators.py:489 baseframe/forms/validators.py:494
+#: src/baseframe/forms/validators.py:490 src/baseframe/forms/validators.py:495
 msgid ", "
 msgstr ""
 
-#: baseframe/forms/validators.py:659
+#: src/baseframe/forms/validators.py:665
 msgid "Email address identified"
 msgstr "ईमेल पता पहचाना गया"
 
-#: baseframe/forms/validators.py:677
+#: src/baseframe/forms/validators.py:682
 msgid ""
 "This name contains unsupported characters. It should have letters, "
 "numbers and non-terminal hyphens only"
@@ -240,100 +232,121 @@ msgstr ""
 "इस नाम में असमर्थित पात्र हैं। इसमें केवल पत्र, संख्या और हाइफेन होने "
 "चाहिए"
 
-#: baseframe/forms/validators.py:692
+#: src/baseframe/forms/validators.py:696
 msgid "Valid latitude and longitude expected"
 msgstr "मान्य अक्षांश और देशांतर की जरूरत है"
 
-#: baseframe/forms/validators.py:693
+#: src/baseframe/forms/validators.py:697
 msgid "Latitude must be within ± 90 degrees"
 msgstr "अक्षांश ± 90 डिग्री के अंदर होना चाहिए"
 
-#: baseframe/forms/validators.py:694
+#: src/baseframe/forms/validators.py:698
 msgid "Longitude must be within ± 180 degrees"
 msgstr "देशांतर ± 180 डिग्री के अंदर होना चाहिए"
 
-#: baseframe/forms/validators.py:718
+#: src/baseframe/forms/validators.py:722
 msgid "The server was temporarily unreachable. Try again"
 msgstr "सर्वर थोड़ी देर के लिए पहुँच से बाहर था. फिर से कोशिश करें"
 
-#: baseframe/forms/widgets.py:185
+#: src/baseframe/forms/widgets.py:158
 msgid "Latitude"
 msgstr "अक्षांश"
 
-#: baseframe/forms/widgets.py:192
+#: src/baseframe/forms/widgets.py:165
 msgid "Longitude"
 msgstr "देशांतर"
 
-#: baseframe/forms/widgets.py:311
+#: src/baseframe/forms/widgets.py:284
 msgid "Image URL"
 msgstr "इमेज URL"
 
-#: baseframe/templates/400.html.jinja2:2
+#: src/baseframe/templates/baseframe/bootstrap3/forms.html.jinja2:100
+#: src/baseframe/templates/baseframe/mui/forms.html.jinja2:152
+msgid "This form has timed out. Please submit again to confirm"
+msgstr ""
+"इस फॉर्म को जमा करने का समय खत्म हो चुका है. पुष्टि के लिए कृपयाफिर से "
+"जमा करें"
+
+#: src/baseframe/templates/baseframe/bootstrap3/forms.html.jinja2:122
+#: src/baseframe/templates/baseframe/mui/forms.html.jinja2:172
+msgid "Please review the indicated issues"
+msgstr "कृपया चिन्हांकित किये गए गलतियों का आलोच करें"
+
+#: src/baseframe/templates/baseframe/bootstrap3/redirect.html.jinja2:1
+#: src/baseframe/templates/baseframe/mui/redirect.html.jinja2:1
+msgid "Loading…"
+msgstr "लोडिंग…"
+
+#: src/baseframe/templates/baseframe/mui/forms.html.jinja2:230
+msgid "An error occured when submitting the form"
+msgstr ""
+
+#: src/baseframe/templates/baseframe/mui/imgeefield.html.jinja2:5
+msgid "Select or upload image"
+msgstr "इमेज को चुने या फिर अपलोड करें"
+
+#: src/baseframe/templates/baseframe/mui/imgeefield.html.jinja2:8
+msgid "Close"
+msgstr "बंद करें"
+
+#: src/baseframe/templates/errors/400.html.jinja2:2
 msgid "Bad Request"
 msgstr "अमान्य रिक्वेस्ट"
 
-#: baseframe/templates/400.html.jinja2:5 baseframe/templates/422.html.jinja2:5
+#: src/baseframe/templates/errors/400.html.jinja2:5
+#: src/baseframe/templates/errors/422.html.jinja2:5
 msgid "This request was malformed and could not be processed"
 msgstr "यह रिक्वेस्ट विकृत होने के कारण प्रोसेस नहीं हो पायी"
 
-#: baseframe/templates/403.html.jinja2:2
+#: src/baseframe/templates/errors/403.html.jinja2:2
 msgid "Access denied"
 msgstr "पहुँच निषेध"
 
-#: baseframe/templates/403.html.jinja2:5
+#: src/baseframe/templates/errors/403.html.jinja2:5
 msgid "You do not have access to that page"
 msgstr "आपके पास उस पेज को खोलने की पहुंच नहीं है"
 
-#: baseframe/templates/404.html.jinja2:2
+#: src/baseframe/templates/errors/404.html.jinja2:2
 msgid "Not Found"
 msgstr "नहीं मिला"
 
-#: baseframe/templates/404.html.jinja2:5
+#: src/baseframe/templates/errors/404.html.jinja2:5
 msgid "The page you were looking for does not exist"
 msgstr "जिस पेज की आप तलाश कर रहे थे वह मौजूद नहीं है"
 
-#: baseframe/templates/422.html.jinja2:2
+#: src/baseframe/templates/errors/422.html.jinja2:2
 msgid "Unprocessable Entity"
 msgstr ""
 
-#: baseframe/templates/429.html.jinja2:2
+#: src/baseframe/templates/errors/429.html.jinja2:2
 msgid "Too Many Requests"
 msgstr "बहुत अधिक अनुरोध"
 
-#: baseframe/templates/429.html.jinja2:5
+#: src/baseframe/templates/errors/429.html.jinja2:5
 msgid "You have exceeded the rate limit and must try after some time"
 msgstr "आपने दर सीमा पार कर दी है और आपको थोड़ी देर बाद कोशिश करनी होगी"
 
-#: baseframe/templates/500.html.jinja2:2
+#: src/baseframe/templates/errors/500.html.jinja2:2
 msgid "Internal Server Error"
 msgstr "आंतरिक सर्वर त्रुटि"
 
-#: baseframe/templates/500.html.jinja2:5
+#: src/baseframe/templates/errors/500.html.jinja2:5
 msgid ""
 "Something broke inside. A report has been sent to the server’s "
 "administrator. Our apologies for the inconvenience"
 msgstr ""
 
-#: baseframe/templates/baseframe/bootstrap3/forms.html.jinja2:56
-#: baseframe/templates/baseframe/mui/forms.html.jinja2:99
-msgid "This form has timed out. Please submit again to confirm"
-msgstr ""
-"इस फॉर्म को जमा करने का समय खत्म हो चुका है. पुष्टि के लिए कृपयाफिर से "
-"जमा करें"
+#~ msgid "Not a valid choice!"
+#~ msgstr "यह मान्य विकल्प नहीं हैं!"
 
-#: baseframe/templates/baseframe/bootstrap3/forms.html.jinja2:63
-msgid "Please review the indicated issues"
-msgstr "कृपया चिन्हांकित किये गए गलतियों का आलोच करें"
+#~ msgid "Invalid JSON: {0!r}"
+#~ msgstr "अमान्य JSON: {0!r}"
 
-#: baseframe/templates/baseframe/bootstrap3/redirect.html.jinja2:1
-#: baseframe/templates/baseframe/mui/redirect.html.jinja2:1
-msgid "Loading…"
-msgstr "लोडिंग…"
+#~ msgid "The JSON root must be a hash object"
+#~ msgstr "JSON का रूट हैश ऑब्जेक्ट होना चाहिए"
 
-#: baseframe/templates/baseframe/mui/imgeefield.html.jinja2:5
-msgid "Select or upload image"
-msgstr "इमेज को चुने या फिर अपलोड करें"
+#~ msgid "This {attr} is already in use"
+#~ msgstr "यह {attr} पहले से इस्तेमाल में हैं"
 
-#: baseframe/templates/baseframe/mui/imgeefield.html.jinja2:8
-msgid "Close"
-msgstr "बंद करें"
+#~ msgid "Subclasses must define ``compare``"
+#~ msgstr ""