xlawrence 2005/07/04 14:55:24 CEST
Modified files:
core/src/conf/java JahiaMessageResources.properties
JahiaMessageResources_en.properties
JahiaMessageResources_fr.properties
Log:
Added warning messages for manage_rights. Updated message for staging pages
in bigTexts
Revision Changes Path
1.12 +4 -2 jahia/core/src/conf/java/JahiaMessageResources.properties
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/conf/java/JahiaMessageResources.properties.diff?r1=1.11&r2=1.12&f=h
1.12 +4 -2
jahia/core/src/conf/java/JahiaMessageResources_en.properties
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/conf/java/JahiaMessageResources_en.properties.diff?r1=1.11&r2=1.12&f=h
1.13 +4 -2
jahia/core/src/conf/java/JahiaMessageResources_fr.properties
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/conf/java/JahiaMessageResources_fr.properties.diff?r1=1.12&r2=1.13&f=h
Index: JahiaMessageResources.properties
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/conf/java/JahiaMessageResources.properties,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- JahiaMessageResources.properties 24 Jun 2005 15:30:12 -0000 1.11
+++ JahiaMessageResources.properties 4 Jul 2005 12:55:24 -0000 1.12
@@ -254,9 +254,11 @@
org.jahia.engines.workflow.activationResultMessage
= {0} ({1} {2} : language {3})
-org.jahia.engines.shared.BigText_Field.stagingWarning
= Page [<strong>{0}</strong>] in language
[<strong>{1}</strong>] is in state "<strong>staging</strong>" which might cause
a "<strong>404 Error</strong>", if the link is followed.
+org.jahia.engines.shared.BigText_Field.stagingWarning
= Page [<strong>{0}</strong>] is in state
"<strong>staging</strong>" and has never been validated, which will cause a
"<strong>403 Error</strong>" in "Live" mode, if the link is followed.
org.jahia.engines.shared.BigText_Field.markForDeleteWarning
= Page [<strong>{0}</strong>] is in state
"<strong>markForDelete</strong>" which will cause a "<strong>404
Error</strong>" after validation, if the link is followed.
org.jahia.engines.shared.BigText_Field.approvalWarning
= Page [<strong>{0}</strong>] in language
[<strong>{1}</strong>] is in state "<strong>waiting For Approval</strong>"
which might cause a "<strong>404 Error</strong>", if the link is followed.
org.jahia.engines.shared.BigText_Field.notExistingWarning
= Page [<strong>{0}</strong>] is not reachable
which will cause a "<strong>404 Error</strong>", if the link is followed.
org.jahia.engines.shared.BigText_Field.lessAccessWarning
= Page [<strong>{0}</strong>] cannot be
accessed by group(s) [<strong>{1}</strong>] which can however access the link
value. A click on the link will cause a "<strong>403 Error</strong>" for
this(those) group(s).
-org.jahia.engines.shared.BigText_Field.wrongKeys
= URL key [<strong>{0}</strong>] is invalid.
It is not linked to any page.
\ No newline at end of file
+org.jahia.engines.shared.BigText_Field.wrongKeys
= URL key [<strong>{0}</strong>] is invalid.
It is not linked to any page.
+
+org.jahia.engines.rights.ManageRights.future403warning
= By removing the READ rights on this page for
users of group(s) [<strong>{0}</strong>], they will get a "<strong>403
Error</strong>" if they follow the link on page [<strong>{1}</strong>]. It
contains a BigText field containing a link to the current page.
\ No newline at end of file
Index: JahiaMessageResources_en.properties
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/conf/java/JahiaMessageResources_en.properties,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- JahiaMessageResources_en.properties 24 Jun 2005 15:30:12 -0000
1.11
+++ JahiaMessageResources_en.properties 4 Jul 2005 12:55:24 -0000
1.12
@@ -254,9 +254,11 @@
org.jahia.engines.workflow.activationResultMessage
= {0} ({1} {2} : language {3})
-org.jahia.engines.shared.BigText_Field.stagingWarning
= Page [<strong>{0}</strong>] in language
[<strong>{1}</strong>] is in state "<strong>staging</strong>" which might cause
a "<strong>404 Error</strong>", if the link is followed.
+org.jahia.engines.shared.BigText_Field.stagingWarning
= Page [<strong>{0}</strong>] is in state
"<strong>staging</strong>" and has never been validated, which will cause a
"<strong>403 Error</strong>" in "Live" mode, if the link is followed.
org.jahia.engines.shared.BigText_Field.markForDeleteWarning
= Page [<strong>{0}</strong>] is in state
"<strong>markForDelete</strong>" which will cause a "<strong>404
Error</strong>" after validation, if the link is followed.
org.jahia.engines.shared.BigText_Field.approvalWarning
= Page [<strong>{0}</strong>] in language
[<strong>{1}</strong>] is in state "<strong>waiting For Approval</strong>"
which might cause a "<strong>404 Error</strong>", if the link is followed.
org.jahia.engines.shared.BigText_Field.notExistingWarning
= Page [<strong>{0}</strong>] is not reachable
which will cause a "<strong>404 Error</strong>", if the link is followed.
org.jahia.engines.shared.BigText_Field.lessAccessWarning
= Page [<strong>{0}</strong>] cannot be
accessed by group(s) [<strong>{1}</strong>] which can however access the link
value. A click on the link will cause a "<strong>403 Error</strong>" for
this(those) group(s).
-org.jahia.engines.shared.BigText_Field.wrongKeys
= URL key [<strong>{0}</strong>] is invalid.
It is not linked to any page.
\ No newline at end of file
+org.jahia.engines.shared.BigText_Field.wrongKeys
= URL key [<strong>{0}</strong>] is invalid.
It is not linked to any page.
+
+org.jahia.engines.rights.ManageRights.future403warning
= By removing the READ rights on this page for
users of group(s) [<strong>{0}</strong>], they will get a "<strong>403
Error</strong>" if they follow the link on page [<strong>{1}</strong>]. It
contains a BigText field containing a link to the current page.
\ No newline at end of file
Index: JahiaMessageResources_fr.properties
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/conf/java/JahiaMessageResources_fr.properties,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- JahiaMessageResources_fr.properties 24 Jun 2005 15:30:12 -0000
1.12
+++ JahiaMessageResources_fr.properties 4 Jul 2005 12:55:24 -0000
1.13
@@ -232,9 +232,11 @@
org.jahia.engines.workflow.activationResultMessage
= {0} ({1} {2} : langue {3})
-org.jahia.engines.shared.BigText_Field.stagingWarning
= La page [<strong>{0}</strong>] dans la
langue [<strong>{1}</strong>] est dans l état
"<strong>édité</strong>", ce qui pourrait générer
une "<strong>Erreur 404</strong>", si le lien est suivi.
+org.jahia.engines.shared.BigText_Field.stagingWarning
= La page [<strong>{0}</strong>] est dans l
état "<strong>édité</strong>" et n a jamais
été validée, ce qui générera une
"<strong>Erreur 403</strong>" en mode "En Ligne", si le lien est suivi.
org.jahia.engines.shared.BigText_Field.markForDeleteWarning
= La page [<strong>{0}</strong>] est dans l
état "<strong>à supprimer</strong>", ce qui
générera une "<strong>Erreur 404</strong>" après
validation, si le lien est suivi .
org.jahia.engines.shared.BigText_Field.approvalWarning
= La page [<strong>{0}</strong>] dans la
langue [<strong>{1}</strong>] est dans l état
"<strong>approuvé</strong>", ce qui pourrait générer une
"<strong>Erreur 404</strong>", si le lien est suivi.
org.jahia.engines.shared.BigText_Field.notExistingWarning
= La page [<strong>{0}</strong>] n est pas
atteignable, ce qui générera une "<strong>Erreur 404</strong>",
si le lien est suivi.
org.jahia.engines.shared.BigText_Field.lessAccessWarning
= La page [<strong>{0}</strong>] n est pas
atteignable pour le(s) groupe(s) [<strong>{1}</strong>] qui peut(peuvent)
cependant voir le lien. Un click sur le lien provoquera une "<strong>Erreur
403</strong>" pour ce(s) groupe(s).
-org.jahia.engines.shared.BigText_Field.wrongKeys
= La clé URL [<strong>{0}</strong>] est
invalide. Aucune page ne lui est associée.
\ No newline at end of file
+org.jahia.engines.shared.BigText_Field.wrongKeys
= La clé URL [<strong>{0}</strong>] est
invalide. Aucune page ne lui est associée.
+
+org.jahia.engines.rights.ManageRights.future403warning
= En supprimant les droits de LECTURE de cette
page pour les utilisateurs du(des) groupe(s) [<strong>{0}</strong>], une
"<strong>Erreur 403</strong>" surviendra si le lien depuis la page
[<strong>{1}</strong>] est suivi. Un champ "BigText" contient un lien vers la
page courante.
\ No newline at end of file
