Added good proposal value in validator response
This commit is contained in:
Stephan Geulette
parent
331ac55afc
commit
8d46bcf30b
|
|
@ -2,5 +2,6 @@ from zope.i18nmessageid import MessageFactory
|
|||
|
||||
_ = MessageFactory("collective.dms.mailcontent")
|
||||
|
||||
|
||||
def initialize(context):
|
||||
"""Initializer called when used as a Zope 2 product."""
|
||||
|
|
|
|||
|
|
@ -50,7 +50,12 @@ class InternalReferenceIncomingMailValidator(validator.SimpleFieldValidator):
|
|||
def validate(self, value):
|
||||
#we call the already defined validators
|
||||
#super(InternalReferenceValidator, self).validate(value)
|
||||
validateIndexValueUniqueness(self.context, 'dmsincomingmail', 'internal_reference_number', value)
|
||||
try:
|
||||
validateIndexValueUniqueness(self.context, 'dmsincomingmail',
|
||||
'internal_reference_number', value)
|
||||
except Invalid:
|
||||
raise Invalid(_(u"This value is already used. A good value would be: ${good_value}",
|
||||
mapping={'good_value': internalReferenceIncomingMailDefaultValue(self)}))
|
||||
|
||||
|
||||
class IDmsIncomingMail(IDmsDocument):
|
||||
|
|
@ -64,13 +69,11 @@ class IDmsIncomingMail(IDmsDocument):
|
|||
|
||||
external_reference_no = schema.TextLine(
|
||||
title=_(u"External Reference Number"),
|
||||
required=False
|
||||
)
|
||||
required=False,)
|
||||
|
||||
internal_reference_no = schema.TextLine(
|
||||
title=_(u"Internal Reference Number"),
|
||||
required=False,
|
||||
)
|
||||
required=False,)
|
||||
|
||||
sender = ContactChoice(
|
||||
title=_(u'Sender'),
|
||||
|
|
@ -164,8 +167,7 @@ class IDmsOutgoingMail(IDmsDocument):
|
|||
|
||||
internal_reference_no = schema.TextLine(
|
||||
title=_(u"Internal Reference Number"),
|
||||
required=False
|
||||
)
|
||||
required=False, )
|
||||
|
||||
recipients = ContactList(
|
||||
title=_(u'Recipients'),
|
||||
|
|
@ -205,7 +207,13 @@ class InternalReferenceOutgoingMailValidator(validator.SimpleFieldValidator):
|
|||
def validate(self, value):
|
||||
#we call the already defined validators
|
||||
#super(InternalReferenceValidator, self).validate(value)
|
||||
validateIndexValueUniqueness(self.context, 'dmsoutgoingmail', 'internal_reference_number', value)
|
||||
try:
|
||||
validateIndexValueUniqueness(self.context, 'dmsoutgoingmail',
|
||||
'internal_reference_number', value)
|
||||
except Invalid:
|
||||
raise Invalid(_(u"This value is already used. A good value would be: ${good_value}",
|
||||
mapping={'good_value': internalReferenceOutgoingMailDefaultValue(self)}))
|
||||
|
||||
|
||||
validator.WidgetValidatorDiscriminators(InternalReferenceOutgoingMailValidator,
|
||||
field=IDmsOutgoingMail['internal_reference_no'])
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"POT-Creation-Date: 2013-04-06 16:59+0000\n"
|
||||
"POT-Creation-Date: 2013-04-12 06:15+0000\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"
|
||||
|
|
@ -21,11 +21,11 @@ msgstr ""
|
|||
msgid "Dms Mail settings"
|
||||
msgstr ""
|
||||
|
||||
#: ../dmsmail.py:63
|
||||
#: ../dmsmail.py:71
|
||||
msgid "External Reference Number"
|
||||
msgstr ""
|
||||
|
||||
#: ../dmsmail.py:77
|
||||
#: ../dmsmail.py:83
|
||||
msgid "In Reply To"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -33,11 +33,11 @@ msgstr ""
|
|||
msgid "Incoming mail internal reference default value expression"
|
||||
msgstr ""
|
||||
|
||||
#: ../dmsmail.py:68
|
||||
#: ../dmsmail.py:75
|
||||
msgid "Internal Reference Number"
|
||||
msgstr ""
|
||||
|
||||
#: ../dmsmail.py:160
|
||||
#: ../dmsmail.py:166
|
||||
msgid "Mail Date"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -49,7 +49,7 @@ msgstr ""
|
|||
msgid "Number of next outgoing mail"
|
||||
msgstr ""
|
||||
|
||||
#: ../dmsmail.py:56
|
||||
#: ../dmsmail.py:64
|
||||
msgid "Original Mail Date"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -57,15 +57,15 @@ msgstr ""
|
|||
msgid "Outgoing mail internal reference default value expression"
|
||||
msgstr ""
|
||||
|
||||
#: ../dmsmail.py:59
|
||||
#: ../dmsmail.py:67
|
||||
msgid "Reception Date"
|
||||
msgstr ""
|
||||
|
||||
#: ../dmsmail.py:168
|
||||
#: ../dmsmail.py:173
|
||||
msgid "Recipients"
|
||||
msgstr ""
|
||||
|
||||
#: ../dmsmail.py:73
|
||||
#: ../dmsmail.py:79
|
||||
msgid "Sender"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -73,10 +73,14 @@ msgstr ""
|
|||
msgid "Tal expression where you can use portal, number as variable"
|
||||
msgstr ""
|
||||
|
||||
#: ../dmsmail.py:38
|
||||
#: ../dmsmail.py:41
|
||||
msgid "This value is already used"
|
||||
msgstr ""
|
||||
|
||||
#: ../dmsmail.py:57
|
||||
msgid "This value is already used. A good value would be: ${good_value}"
|
||||
msgstr ""
|
||||
|
||||
#: ../browser/settings.py:20
|
||||
msgid "This value is used as 'number' variable in linked tal expression"
|
||||
msgstr ""
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"POT-Creation-Date: 2013-04-06 16:59+0000\n"
|
||||
"POT-Creation-Date: 2013-04-12 06:15+0000\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"
|
||||
|
|
@ -19,11 +19,11 @@ msgstr ""
|
|||
msgid "Dms Mail settings"
|
||||
msgstr ""
|
||||
|
||||
#: ../dmsmail.py:63
|
||||
#: ../dmsmail.py:71
|
||||
msgid "External Reference Number"
|
||||
msgstr ""
|
||||
|
||||
#: ../dmsmail.py:77
|
||||
#: ../dmsmail.py:83
|
||||
msgid "In Reply To"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -31,11 +31,11 @@ msgstr ""
|
|||
msgid "Incoming mail internal reference default value expression"
|
||||
msgstr ""
|
||||
|
||||
#: ../dmsmail.py:68
|
||||
#: ../dmsmail.py:75
|
||||
msgid "Internal Reference Number"
|
||||
msgstr ""
|
||||
|
||||
#: ../dmsmail.py:160
|
||||
#: ../dmsmail.py:166
|
||||
msgid "Mail Date"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -47,7 +47,7 @@ msgstr ""
|
|||
msgid "Number of next outgoing mail"
|
||||
msgstr ""
|
||||
|
||||
#: ../dmsmail.py:56
|
||||
#: ../dmsmail.py:64
|
||||
msgid "Original Mail Date"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -55,15 +55,15 @@ msgstr ""
|
|||
msgid "Outgoing mail internal reference default value expression"
|
||||
msgstr ""
|
||||
|
||||
#: ../dmsmail.py:59
|
||||
#: ../dmsmail.py:67
|
||||
msgid "Reception Date"
|
||||
msgstr ""
|
||||
|
||||
#: ../dmsmail.py:168
|
||||
#: ../dmsmail.py:173
|
||||
msgid "Recipients"
|
||||
msgstr ""
|
||||
|
||||
#: ../dmsmail.py:73
|
||||
#: ../dmsmail.py:79
|
||||
msgid "Sender"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -71,10 +71,14 @@ msgstr ""
|
|||
msgid "Tal expression where you can use portal, number as variable"
|
||||
msgstr ""
|
||||
|
||||
#: ../dmsmail.py:38
|
||||
#: ../dmsmail.py:41
|
||||
msgid "This value is already used"
|
||||
msgstr ""
|
||||
|
||||
#: ../dmsmail.py:57
|
||||
msgid "This value is already used. A good value would be: ${good_value}"
|
||||
msgstr ""
|
||||
|
||||
#: ../browser/settings.py:20
|
||||
msgid "This value is used as 'number' variable in linked tal expression"
|
||||
msgstr ""
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"POT-Creation-Date: 2013-04-06 16:59+0000\n"
|
||||
"POT-Creation-Date: 2013-04-12 06:15+0000\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"
|
||||
|
|
@ -19,11 +19,11 @@ msgstr ""
|
|||
msgid "Dms Mail settings"
|
||||
msgstr "Configuration du courrier"
|
||||
|
||||
#: ../dmsmail.py:63
|
||||
#: ../dmsmail.py:71
|
||||
msgid "External Reference Number"
|
||||
msgstr "Référence externe"
|
||||
|
||||
#: ../dmsmail.py:77
|
||||
#: ../dmsmail.py:83
|
||||
msgid "In Reply To"
|
||||
msgstr "Réponse à"
|
||||
|
||||
|
|
@ -31,11 +31,11 @@ msgstr "Réponse à"
|
|||
msgid "Incoming mail internal reference default value expression"
|
||||
msgstr "Courrier entrant: expression Tal définissant la valeur par défaut du champ référence interne"
|
||||
|
||||
#: ../dmsmail.py:68
|
||||
#: ../dmsmail.py:75
|
||||
msgid "Internal Reference Number"
|
||||
msgstr "Référence interne"
|
||||
|
||||
#: ../dmsmail.py:160
|
||||
#: ../dmsmail.py:166
|
||||
msgid "Mail Date"
|
||||
msgstr "Date du courrier"
|
||||
|
||||
|
|
@ -47,7 +47,7 @@ msgstr "Courrier entrant: numéro du prochain courrier"
|
|||
msgid "Number of next outgoing mail"
|
||||
msgstr "Courrier sortant: numéro du prochain courrier"
|
||||
|
||||
#: ../dmsmail.py:56
|
||||
#: ../dmsmail.py:64
|
||||
msgid "Original Mail Date"
|
||||
msgstr "Date du courrier"
|
||||
|
||||
|
|
@ -55,15 +55,15 @@ msgstr "Date du courrier"
|
|||
msgid "Outgoing mail internal reference default value expression"
|
||||
msgstr "Courrier sortant: expression Tal définissant la valeur par défaut du champ référence interne"
|
||||
|
||||
#: ../dmsmail.py:59
|
||||
#: ../dmsmail.py:67
|
||||
msgid "Reception Date"
|
||||
msgstr "Date de réception"
|
||||
|
||||
#: ../dmsmail.py:168
|
||||
#: ../dmsmail.py:173
|
||||
msgid "Recipients"
|
||||
msgstr "Destinataires"
|
||||
|
||||
#: ../dmsmail.py:73
|
||||
#: ../dmsmail.py:79
|
||||
msgid "Sender"
|
||||
msgstr "Expéditeur"
|
||||
|
||||
|
|
@ -71,10 +71,14 @@ msgstr "Expéditeur"
|
|||
msgid "Tal expression where you can use portal, number as variable"
|
||||
msgstr "Expression Tal où les variables portal, number peuvent être utilisées"
|
||||
|
||||
#: ../dmsmail.py:38
|
||||
#: ../dmsmail.py:41
|
||||
msgid "This value is already used"
|
||||
msgstr "Cette valeur est déjà utilisée !"
|
||||
|
||||
#: ../dmsmail.py:57
|
||||
msgid "This value is already used. A good value would be: ${good_value}"
|
||||
msgstr "Cette valeur est déjà utilisée ! Essayez avec: ${good_value}"
|
||||
|
||||
#: ../browser/settings.py:20
|
||||
msgid "This value is used as 'number' variable in linked tal expression"
|
||||
msgstr "Cette valeur est utilisée en tant que variable 'number' dans l'expression Tal liée"
|
||||
|
|
|
|||
Reference in New Issue