--- a/_exceptions.py Wed Sep 09 16:48:39 2009 +0200
+++ b/_exceptions.py Wed Sep 09 17:16:13 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):
--- a/doc/book/en/B0015-define-permissions.en.txt Wed Sep 09 16:48:39 2009 +0200
+++ b/doc/book/en/B0015-define-permissions.en.txt Wed Sep 09 17:16:13 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 "
--- a/doc/book/en/development/datamodel/definition.rst Wed Sep 09 16:48:39 2009 +0200
+++ b/doc/book/en/development/datamodel/definition.rst Wed Sep 09 17:16:13 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 "
--- a/i18n/en.po Wed Sep 09 16:48:39 2009 +0200
+++ b/i18n/en.po Wed Sep 09 17:16:13 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 ""
--- a/i18n/es.po Wed Sep 09 16:48:39 2009 +0200
+++ b/i18n/es.po Wed Sep 09 17:16:13 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"
--- a/i18n/fr.po Wed Sep 09 16:48:39 2009 +0200
+++ b/i18n/fr.po Wed Sep 09 17:16:13 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"
--- a/web/views/basecontrollers.py Wed Sep 09 16:48:39 2009 +0200
+++ b/web/views/basecontrollers.py Wed Sep 09 17:16:13 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)