1
0
mirror of https://github.com/dkmstr/openuds.git synced 2024-12-22 13:34:04 +03:00

Merge remote-tracking branch 'origin/v3.6'

This commit is contained in:
Adolfo Gómez García 2023-03-30 15:16:53 +02:00
commit e9e8555f51
No known key found for this signature in database
GPG Key ID: DD1ABF20724CDA23

View File

@ -157,7 +157,7 @@ class EmailMFA(mfas.MFA):
label=_('Mail text'), label=_('Mail text'),
order=33, order=33,
multiline=4, multiline=4,
tooltip=_('Text of the email. If empty, a default text will be used') + '\n' + _('Allowed variables are: {code}, {username}, {ip}'), tooltip=_('Text of the email. If empty, a default text will be used') + '\n' + _('Allowed variables are: ') + '{code}, {username}, {justUsername}. {ip}',
required=True, required=True,
defvalue='', defvalue='',
tab=_('Config'), tab=_('Config'),
@ -168,7 +168,7 @@ class EmailMFA(mfas.MFA):
label=_('Mail HTML'), label=_('Mail HTML'),
order=34, order=34,
multiline=4, multiline=4,
tooltip=_('HTML of the email. If empty, a default HTML will be used')+ '\n' + _('Allowed variables are: {code}, {username}, {ip}'), tooltip=_('HTML of the email. If empty, a default HTML will be used')+ '\n' + _('Allowed variables are: ') + '{code}, {username}, {justUsername}, {ip}',
required=False, required=False,
defvalue='', defvalue='',
tab=_('Config'), tab=_('Config'),