starred/WYGIWYH
1
0
Fork 0
mirror of https://github.com/eitchtee/WYGIWYH.git synced 2026-07-10 06:42:49 +02:00
Code Issues 14 Packages Projects Releases 10 Wiki Activity

fix(locale): get_format doesn't override number formatting if use_l10n is None

Browse Source
This commit is contained in:
Herculino Trotta
2025-08-10 12:23:41 -03:00
parent 20c6989ffb
commit 66a5e6d613
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/apps/common/functions/format.py
+6 -1
View File
@@ -5,7 +5,12 @@ from django.utils.formats import get_format as original_get_format
def get_format(format_type=None, lang=None, use_l10n=None): def get_format(format_type=None, lang=None, use_l10n=None):
user = get_current_user() user = get_current_user()
if user and user.is_authenticated and hasattr(user, "settings") and use_l10n: if (
user
and user.is_authenticated
and hasattr(user, "settings")
and use_l10n is not False
):
user_settings = user.settings user_settings = user.settings
if format_type == "THOUSAND_SEPARATOR": if format_type == "THOUSAND_SEPARATOR":
number_format = getattr(user_settings, "number_format", None) number_format = getattr(user_settings, "number_format", None)
app/apps/common/widgets/decimal.py
+1 -2
View File
@@ -35,8 +35,7 @@ class ArbitraryDecimalDisplayNumberInput(forms.TextInput):
self.attrs.update( self.attrs.update(
{ {
"x-data": "", "x-data": "",
"x-mask:dynamic": f"$money($input, '{get_format('DECIMAL_SEPARATOR')}', " "x-mask:dynamic": f"$money($input, '{get_format('DECIMAL_SEPARATOR')}', '{get_format('THOUSAND_SEPARATOR')}', '30')",
f"'{get_format('THOUSAND_SEPARATOR')}', '30')",
"x-on:keyup": "$el.dispatchEvent(new Event('input'))", "x-on:keyup": "$el.dispatchEvent(new Event('input'))",
} }
) )