Index: builtin/src/main/java/org/hippoecm/repository/standardworkflow/FolderWorkflowImpl_nl.properties IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>NATIVE_TO_ASCII_ISO-8859-1 =================================================================== --- builtin/src/main/java/org/hippoecm/repository/standardworkflow/FolderWorkflowImpl_nl.properties (revision 35234) +++ builtin/src/main/java/org/hippoecm/repository/standardworkflow/FolderWorkflowImpl_nl.properties (revision ) @@ -8,3 +8,4 @@ move=heeft {0} "{1}" verplaatst exception,type\=org.hippoecm.repository.api.WorkflowException,message\=Cannot\ rename\ document\ to\ same\ name=De naam mag niet gelijk zijn aan de oorspronkelijke naam. +delete-unknown=heeft {0} een document verwijderd Index: builtin/src/main/java/org/hippoecm/repository/standardworkflow/FolderWorkflowImpl_it.properties IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>NATIVE_TO_ASCII_ISO-8859-1 =================================================================== --- builtin/src/main/java/org/hippoecm/repository/standardworkflow/FolderWorkflowImpl_it.properties (revision 35234) +++ builtin/src/main/java/org/hippoecm/repository/standardworkflow/FolderWorkflowImpl_it.properties (revision ) @@ -8,3 +8,4 @@ move={0} ha spostato "{1}" exception,type\=org.hippoecm.repository.api.WorkflowException,message\=Cannot\ rename\ document\ to\ same\ name=Fornire un nome differente. +delete-unknown={0} ha cancellato un documento Index: builtin/src/main/java/org/hippoecm/repository/standardworkflow/DefaultWorkflowImpl_nl.properties IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>NATIVE_TO_ASCII_ISO-8859-1 =================================================================== --- builtin/src/main/java/org/hippoecm/repository/standardworkflow/DefaultWorkflowImpl_nl.properties (revision 35234) +++ builtin/src/main/java/org/hippoecm/repository/standardworkflow/DefaultWorkflowImpl_nl.properties (revision ) @@ -10,3 +10,4 @@ exception,type\=org.hippoecm.repository.api.WorkflowException,message\=Document\ type\ does\ not\ allow\ for\ reverting\ changes=Document staat het terugdraaien van veranderingen niet toe. exception,type\=org.hippoecm.repository.api.WorkflowException,message\=cannot\ delete\ document\ which\ is\ not\ contained\ in\ a\ folder=Kan document niet verwijderen als deze zich niet in een map bevindt. +delete-unknown=heeft {0} een document verwijderd \ No newline at end of file Index: perspectives/src/main/java/org/hippoecm/frontend/plugins/cms/dashboard/EventModel.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- perspectives/src/main/java/org/hippoecm/frontend/plugins/cms/dashboard/EventModel.java (revision 35234) +++ perspectives/src/main/java/org/hippoecm/frontend/plugins/cms/dashboard/EventModel.java (revision ) @@ -24,6 +24,7 @@ import javax.jcr.RepositoryException; import org.apache.commons.lang.StringEscapeUtils; +import org.apache.commons.lang.StringUtils; import org.apache.wicket.Component; import org.apache.wicket.model.IComponentAssignedModel; import org.apache.wicket.model.IModel; @@ -36,7 +37,7 @@ public class EventModel implements IComponentAssignedModel { @SuppressWarnings("unused") - private static final String SVN_ID = "$Id: EventModel.java 34197 2012-05-03 12:29:40Z uhommes $"; + private static final String SVN_ID = "$Id: EventModel.java 34197 2012-04-23 13:00:12Z uhommes $"; private static final long ONE_MINUTE = 60 * 1000; private static final long FIVE_MINUTES = 5 * 60 * 1000; @@ -182,9 +183,15 @@ try { if (nameModel != null) { String name = nameModel.getObject(); + StringResourceModel operationModel; + if(name != null && name.startsWith("org.hippoecm.repository.api.Document[uuid=")) { + final String method2 = StringUtils.replaceOnce(method, "delete", "delete-unknown"); + operationModel = new StringResourceModel(method2, component, null, new Object[]{user}); + } else { - name = StringEscapeUtils.escapeHtml(name); + name = StringEscapeUtils.escapeHtml(name); - StringResourceModel operationModel = new StringResourceModel(method, component, null, + operationModel = new StringResourceModel(method, component, null, - new Object[]{user, name}); + new Object[]{user, name}); + } return new StringResourceModel(time, component, null, "").getString() + operationModel.getString(); } else { StringResourceModel operationModel = new StringResourceModel(method, component, null, Index: builtin/src/main/java/org/hippoecm/repository/standardworkflow/DefaultWorkflowImpl_it.properties IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>NATIVE_TO_ASCII_ISO-8859-1 =================================================================== --- builtin/src/main/java/org/hippoecm/repository/standardworkflow/DefaultWorkflowImpl_it.properties (revision 35234) +++ builtin/src/main/java/org/hippoecm/repository/standardworkflow/DefaultWorkflowImpl_it.properties (revision ) @@ -10,3 +10,4 @@ exception,type\=org.hippoecm.repository.api.WorkflowException,message\=Document\ type\ does\ not\ allow\ for\ reverting\ changes=Non è possibile annullare le modifiche per questo tipo di documento. exception,type\=org.hippoecm.repository.api.WorkflowException,message\=cannot\ delete\ document\ which\ is\ not\ contained\ in\ a\ folder=Non è possibile cancellare un documento che non è in una cartella. +delete-unknown={0} ha cancellato un documento Index: builtin/src/main/java/org/hippoecm/repository/standardworkflow/DefaultWorkflowImpl.properties IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>NATIVE_TO_ASCII_ISO-8859-1 =================================================================== --- builtin/src/main/java/org/hippoecm/repository/standardworkflow/DefaultWorkflowImpl.properties (revision 35234) +++ builtin/src/main/java/org/hippoecm/repository/standardworkflow/DefaultWorkflowImpl.properties (revision ) @@ -3,6 +3,7 @@ commitEditableInstance={0} finished drafting out "{1}" delete={0} deleted "{1}" +delete-unknown={0} deleted a document rename={0} renamed "{1}" move={0} moved "{1}" copy={0} copied a document "{1}" Index: builtin/src/main/java/org/hippoecm/repository/standardworkflow/FolderWorkflowImpl_fr.properties IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>NATIVE_TO_ASCII_ISO-8859-1 =================================================================== --- builtin/src/main/java/org/hippoecm/repository/standardworkflow/FolderWorkflowImpl_fr.properties (revision 35234) +++ builtin/src/main/java/org/hippoecm/repository/standardworkflow/FolderWorkflowImpl_fr.properties (revision ) @@ -8,3 +8,4 @@ move={0} a déplacé "{1}" exception,type\=org.hippoecm.repository.api.WorkflowException,message\=Cannot\ rename\ document\ to\ same\ name=Impossible de renommer un document avec le même nom. +delete-unknown={0} a supprimé un document Index: builtin/src/main/java/org/hippoecm/repository/standardworkflow/DefaultWorkflowImpl_de.properties IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>NATIVE_TO_ASCII_ISO-8859-1 =================================================================== --- builtin/src/main/java/org/hippoecm/repository/standardworkflow/DefaultWorkflowImpl_de.properties (revision 35234) +++ builtin/src/main/java/org/hippoecm/repository/standardworkflow/DefaultWorkflowImpl_de.properties (revision ) @@ -10,3 +10,4 @@ exception,type\=org.hippoecm.repository.api.WorkflowException,message\=Document\ type\ does\ not\ allow\ for\ reverting\ changes=Der Dokumententyp erlaubt nicht das Rückgängigmachen von Veränderungen. exception,type\=org.hippoecm.repository.api.WorkflowException,message\=cannot\ delete\ document\ which\ is\ not\ contained\ in\ a\ folder=Das Löschen eines Dokumentes, welches sich nicht in einem Container befindet, ist nicht möglich. +delete-unknown={0} gelöscht ein Document Index: builtin/src/main/java/org/hippoecm/repository/standardworkflow/DefaultWorkflowImpl_fr.properties IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>NATIVE_TO_ASCII_ISO-8859-1 =================================================================== --- builtin/src/main/java/org/hippoecm/repository/standardworkflow/DefaultWorkflowImpl_fr.properties (revision 35234) +++ builtin/src/main/java/org/hippoecm/repository/standardworkflow/DefaultWorkflowImpl_fr.properties (revision ) @@ -10,3 +10,4 @@ exception,type\=org.hippoecm.repository.api.WorkflowException,message\=Document\ type\ does\ not\ allow\ for\ reverting\ changes=Impossible d'annuler les changements sur ce type de document exception,type\=org.hippoecm.repository.api.WorkflowException,message\=cannot\ delete\ document\ which\ is\ not\ contained\ in\ a\ folder=Impossible de supprimer un document qui n'est pas dans un dossier +delete-unknown={0} a supprimé un document Index: builtin/src/main/java/org/hippoecm/repository/standardworkflow/FolderWorkflowImpl_de.properties IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>NATIVE_TO_ASCII_ISO-8859-1 =================================================================== --- builtin/src/main/java/org/hippoecm/repository/standardworkflow/FolderWorkflowImpl_de.properties (revision 35234) +++ builtin/src/main/java/org/hippoecm/repository/standardworkflow/FolderWorkflowImpl_de.properties (revision ) @@ -8,3 +8,4 @@ move={0} verschoben "{1}" exception,type\=org.hippoecm.repository.api.WorkflowException,message\=Cannot\ rename\ document\ to\ same\ name=Der Dokumentenname kann nicht in den gleichen Namen umbeannt werden +delete-unknown={0} gelöscht ein Document Index: builtin/src/main/java/org/hippoecm/repository/standardworkflow/FolderWorkflowImpl.properties IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>NATIVE_TO_ASCII_ISO-8859-1 =================================================================== --- builtin/src/main/java/org/hippoecm/repository/standardworkflow/FolderWorkflowImpl.properties (revision 35234) +++ builtin/src/main/java/org/hippoecm/repository/standardworkflow/FolderWorkflowImpl.properties (revision ) @@ -1,6 +1,7 @@ add={0} added "{1}" reorder={0} reordered a folder delete={0} deleted "{1}" +delete-unknown={0} deleted a document rename={0} renamed "{1}" copy={0} copied "{1}" copyTo={0} copied "{1}"