# HG changeset patch # User Sylvain Thénault # Date 1252562444 -7200 # Node ID 9f75f5de2134650e9cc1b553ed6eb91ffca37496 # Parent 7d4bc4c5432675cd687266668bc0847eb2877c39# Parent f4b94d03f86f966ccdce914007dbb79acf725241 merge diff -r 7d4bc4c54326 -r 9f75f5de2134 _exceptions.py --- a/_exceptions.py Thu Sep 10 08:00:03 2009 +0200 +++ b/_exceptions.py Thu Sep 10 08:00:44 2009 +0200 @@ -118,7 +118,7 @@ class NoSelectableObject(RegistryException): """some views with the given vid have been found but no - one is applyable to the result set + one is applicable to the result set """ class UnknownProperty(RegistryException): diff -r 7d4bc4c54326 -r 9f75f5de2134 doc/book/en/B0015-define-permissions.en.txt --- a/doc/book/en/B0015-define-permissions.en.txt Thu Sep 10 08:00:03 2009 +0200 +++ b/doc/book/en/B0015-define-permissions.en.txt Thu Sep 10 08:00:44 2009 +0200 @@ -114,7 +114,7 @@ require_group = SubjectRelation('EGroup', cardinality='+*', description=_('groups to which the permission is granted')) require_state = SubjectRelation('State', - description=_("entity'state in which the permission is applyable")) + description=_("entity'state in which the permission is applicable")) # can be used on any entity require_permission = ObjectRelation('**', cardinality='*1', composite='subject', description=_("link a permission to the entity. This " diff -r 7d4bc4c54326 -r 9f75f5de2134 doc/book/en/development/datamodel/definition.rst --- a/doc/book/en/development/datamodel/definition.rst Thu Sep 10 08:00:03 2009 +0200 +++ b/doc/book/en/development/datamodel/definition.rst Thu Sep 10 08:00:44 2009 +0200 @@ -390,7 +390,7 @@ require_group = SubjectRelation('CWGroup', cardinality='+*', description=_('groups to which the permission is granted')) require_state = SubjectRelation('State', - description=_("entity'state in which the permission is applyable")) + description=_("entity's state in which the permission is applicable")) # can be used on any entity require_permission = ObjectRelation('**', cardinality='*1', composite='subject', description=_("link a permission to the entity. This " diff -r 7d4bc4c54326 -r 9f75f5de2134 i18n/en.po --- a/i18n/en.po Thu Sep 10 08:00:03 2009 +0200 +++ b/i18n/en.po Thu Sep 10 08:00:44 2009 +0200 @@ -608,7 +608,9 @@ msgid "You can use any of the following substitutions in your text" msgstr "" -msgid "You have no access to this view or it's not applyable to current data" +msgid "" +"You have no access to this view or it can not be used to display the current " +"data." msgstr "" msgid "" diff -r 7d4bc4c54326 -r 9f75f5de2134 i18n/es.po --- a/i18n/es.po Thu Sep 10 08:00:03 2009 +0200 +++ b/i18n/es.po Thu Sep 10 08:00:44 2009 +0200 @@ -625,8 +625,10 @@ "Puede realizar cualquiera de las siguientes sustituciones en el contenido de " "su email." -msgid "You have no access to this view or it's not applyable to current data" -msgstr "No tiene acceso a esta vista o No es aplicable a los datos actuales" +msgid "" +"You have no access to this view or it can not be used to display the current " +"data." +msgstr "No tiene acceso a esta vista o No se puede utilizare para los datos actuales." msgid "" "You're not authorized to access this page. If you think you should, please " @@ -3190,3 +3192,7 @@ msgid "you should probably delete that property" msgstr "deberia probablamente suprimir esta propriedad" + +#~ msgid "" +#~ "You have no access to this view or it's not applyable to current data" +#~ msgstr "No tiene acceso a esta vista o No es aplicable a los datos actuales" diff -r 7d4bc4c54326 -r 9f75f5de2134 i18n/fr.po --- a/i18n/fr.po Thu Sep 10 08:00:03 2009 +0200 +++ b/i18n/fr.po Thu Sep 10 08:00:44 2009 +0200 @@ -624,9 +624,10 @@ "Vous pouvez utiliser n'importe quelle substitution parmi la liste suivante " "dans le contenu de votre courriel." -msgid "You have no access to this view or it's not applyable to current data" -msgstr "" -"Vous n'avez pas accès à cette vue ou elle ne s'applique pas aux données" +msgid "" +"You have no access to this view or it can not be used to display the current " +"data." +msgstr "Vous n'avez pas accès à cette vue ou elle ne peut pas afficher ces données." msgid "" "You're not authorized to access this page. If you think you should, please " @@ -3207,5 +3208,10 @@ msgid "you should probably delete that property" msgstr "vous devriez probablement supprimer cette propriété" +#~ msgid "" +#~ "You have no access to this view or it's not applyable to current data" +#~ msgstr "" +#~ "Vous n'avez pas accès à cette vue ou elle ne s'applique pas aux données" + #~ msgid "download image" #~ msgstr "image de téléchargement" diff -r 7d4bc4c54326 -r 9f75f5de2134 web/views/basecontrollers.py --- a/web/views/basecontrollers.py Thu Sep 10 08:00:03 2009 +0200 +++ b/web/views/basecontrollers.py Thu Sep 10 08:00:44 2009 +0200 @@ -129,7 +129,8 @@ if rset: req.set_message(req._("The view %s can not be applied to this query") % vid) else: - req.set_message(req._("You have no access to this view or it's not applyable to current data")) + req.set_message(req._("You have no access to this view or it can not " + "be used to display the current data.")) self.warning("the view %s can not be applied to this query", vid) vid = vid_from_rset(req, rset, self.schema) view = self.vreg['views'].select(vid, req, rset=rset) diff -r 7d4bc4c54326 -r 9f75f5de2134 web/views/editcontroller.py --- a/web/views/editcontroller.py Thu Sep 10 08:00:03 2009 +0200 +++ b/web/views/editcontroller.py Thu Sep 10 08:00:44 2009 +0200 @@ -194,13 +194,13 @@ # NOTE: raising ValidationError here is not a good solution because # we can't gather all errors at once. Hopefully, the new 3.6.x # form handling will fix that - if attrtype == 'Int': + if value and attrtype == 'Int': try: value = int(value) except ValueError: raise ValidationError(entity.eid, {attr: self.req._("invalid integer value")}) - elif attrtype == 'Float': + elif value and attrtype == 'Float': try: value = float(value) except ValueError: