You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by jw...@apache.org on 2005/04/29 15:05:03 UTC
svn commit: r165303 - in /lenya/trunk/src:
java/org/apache/lenya/cms/ac/usecases/
java/org/apache/lenya/cms/editors/forms/
java/org/apache/lenya/cms/site/usecases/
java/org/apache/lenya/cms/workflow/usecases/ webapp/lenya/resources/i18n/
Author: jwkaltz
Date: Fri Apr 29 06:05:02 2005
New Revision: 165303
URL: http://svn.apache.org/viewcvs?rev=165303&view=rev
Log:
added messages with parameters where appropriate
Modified:
lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/AccessControl.java
lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/Group.java
lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/User.java
lenya/trunk/src/java/org/apache/lenya/cms/editors/forms/OneFormEditor.java (contents, props changed)
lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/Delete.java
lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/Nudge.java
lenya/trunk/src/java/org/apache/lenya/cms/workflow/usecases/InvokeWorkflow.java
lenya/trunk/src/webapp/lenya/resources/i18n/cmsui.xml
Modified: lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/AccessControl.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/AccessControl.java?rev=165303&r1=165302&r2=165303&view=diff
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/AccessControl.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/AccessControl.java Fri Apr 29 06:05:02 2005
@@ -95,7 +95,7 @@
Role role = getRoleManager().getRole(roleId);
if (role == null) {
- addErrorMessage("Role [" + roleId + "] does not exist!");
+ addErrorMessage("role_no_such_role", new String[]{roleId});
}
this.helper.manipulateCredential(item, role, operations[j]);
@@ -160,4 +160,4 @@
public Item[] getItems() {
return this.items;
}
-}
\ No newline at end of file
+}
Modified: lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/Group.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/Group.java?rev=165303&r1=165302&r2=165303&view=diff
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/Group.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/Group.java Fri Apr 29 06:05:02 2005
@@ -36,7 +36,7 @@
String groupId = (String) value;
org.apache.lenya.ac.Group group = getGroupManager().getGroup(groupId);
if (group == null) {
- addErrorMessage("The group [" + groupId + "] does not exist.");
+ addErrorMessage("group_no_such_entry", new String[]{groupId});
} else {
setParameter(GROUP, group);
}
Modified: lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/User.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/User.java?rev=165303&r1=165302&r2=165303&view=diff
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/User.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/User.java Fri Apr 29 06:05:02 2005
@@ -36,10 +36,10 @@
String userId = (String) value;
org.apache.lenya.ac.User user = getUserManager().getUser(userId);
if (user == null) {
- addErrorMessage("The user [" + userId + "] does not exist.");
+ addErrorMessage("user_no_such_user", new String[]{userId});
} else {
setParameter(USER, user);
}
}
}
-}
\ No newline at end of file
+}
Modified: lenya/trunk/src/java/org/apache/lenya/cms/editors/forms/OneFormEditor.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/editors/forms/OneFormEditor.java?rev=165303&r1=165302&r2=165303&view=diff
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/editors/forms/OneFormEditor.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/editors/forms/OneFormEditor.java Fri Apr 29 06:05:02 2005
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2004 The Apache Software Foundation
+ * Copyright 1999-2005 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -101,7 +101,7 @@
DocumentHelper.readDocument(xmlSource.getInputStream());
wellFormed = true;
} catch (SAXException e) {
- addErrorMessage("Document is not well-formed: " + e.getMessage());
+ addErrorMessage("error-document-form", new String[]{e.getMessage()});
}
if (wellFormed) {
@@ -116,7 +116,7 @@
String message = RelaxNG.validate(schemaInputSource, xmlInputSource);
if (message != null) {
- addErrorMessage("RELAX NG Validation failed: " + message);
+ addErrorMessage("error-validation", new String[]{message});
}
}
@@ -196,4 +196,4 @@
int i = content.indexOf(">");
return content.substring(0, i) + " " + namespaces + content.substring(i);
}
-}
\ No newline at end of file
+}
Propchange: lenya/trunk/src/java/org/apache/lenya/cms/editors/forms/OneFormEditor.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified: lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/Delete.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/Delete.java?rev=165303&r1=165302&r2=165303&view=diff
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/Delete.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/Delete.java Fri Apr 29 06:05:02 2005
@@ -34,7 +34,7 @@
* Delete a document and all its descendants, including all language versions. The documents are
* moved to the trash.
*
- * @version $Id:$
+ * @version $Id$
*/
public class Delete extends DocumentUsecase {
@@ -59,7 +59,7 @@
for (int i = 0; i < documents.length; i++) {
Document liveVersion = identityMap.getAreaVersion(documents[i], Publication.LIVE_AREA);
if (liveVersion.exists()) {
- addErrorMessage("Cannot delete because document [" + liveVersion + "] is live!");
+ addErrorMessage("delete-doc-live", new String[]{liveVersion.getId()});
}
}
}
Modified: lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/Nudge.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/Nudge.java?rev=165303&r1=165302&r2=165303&view=diff
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/Nudge.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/Nudge.java Fri Apr 29 06:05:02 2005
@@ -27,7 +27,7 @@
/**
* Nudge a document one position up or down.
*
- * @version $Id:$
+ * @version $Id$
*/
public class Nudge extends DocumentUsecase {
@@ -67,14 +67,14 @@
} else if (direction.equals(DOWN)) {
siblings = node.getNextSiblings();
} else {
- addErrorMessage("The direction [" + direction + "] is not supported!");
+ addErrorMessage("nudge-error-direction-unknown", new String[]{direction});
}
if (siblings != null && siblings.length == 0) {
- addErrorMessage("Cannot move the node in this direction.");
+ addErrorMessage("nudge-error-direction");
}
} else {
- addErrorMessage("This operation can only be invoked on site trees.");
+ addErrorMessage("nudge-error-area");
}
} catch (Exception e) {
throw new RuntimeException(e);
Modified: lenya/trunk/src/java/org/apache/lenya/cms/workflow/usecases/InvokeWorkflow.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/workflow/usecases/InvokeWorkflow.java?rev=165303&r1=165302&r2=165303&view=diff
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/workflow/usecases/InvokeWorkflow.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/workflow/usecases/InvokeWorkflow.java Fri Apr 29 06:05:02 2005
@@ -38,7 +38,7 @@
* </pre>
* </code>
*
- * @version $Id:$
+ * @version $Id$
*/
public class InvokeWorkflow extends DocumentUsecase implements Configurable {
@@ -65,8 +65,7 @@
try {
workflowManager = (WorkflowManager) this.manager.lookup(WorkflowManager.ROLE);
if (!workflowManager.canInvoke(getSourceDocument(), getEvent())) {
- addErrorMessage("The event [" + getEvent() + "] is not executable on document ["
- + getSourceDocument() + "].");
+ addErrorMessage("error-workflow-document", new String[]{getEvent(), getSourceDocument().getId()});
}
} finally {
if (workflowManager != null) {
Modified: lenya/trunk/src/webapp/lenya/resources/i18n/cmsui.xml
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/resources/i18n/cmsui.xml?rev=165303&r1=165302&r2=165303&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/resources/i18n/cmsui.xml (original)
+++ lenya/trunk/src/webapp/lenya/resources/i18n/cmsui.xml Fri Apr 29 06:05:02 2005
@@ -173,6 +173,7 @@
<message key="Group Administration">Group Administration</message>
<message key="Add Group">Add Group</message>
<message key="Group Data">Group Data</message>
+ <message key="group_no_such_entry">The group {0} does not exist.</message>
<!-- User Administration -->
<message key="User Data">User Data</message>
@@ -188,13 +189,16 @@
<message key="Group Affiliation">Group Affiliation</message>
<message key="Change Password">Change Password</message>
<message key="Edit Group Affiliation">Edit Group Affiliation</message>
- <!-- Errors in user administration -->
+ <message key="user_no_such_user">The user {0} does not exist.</message>
<message key="ldap_no_such_user">The user {0} does not exist in the LDAP directory.</message>
<!-- User Types -->
<message key="LDAP User">LDAP User</message>
<message key="Local User">CMS User</message>
+ <!-- Role Administration -->
+ <message key="role_no_such_role">The role {0} does not exist.</message>
+
<!-- IP Range Administration -->
<message key="IP Range">IP Range</message>
<message key="IP Range ID">IP Range ID</message>
@@ -203,7 +207,7 @@
<message key="IP Range Administration">IP Range Administration</message>
<message key="Add IP Range">Add IP Range</message>
<message key="IP Range Profile">IP Range Profile</message>
-
+
<!-- Site tab (info screens) -->
<message key="Available Languages">Available Languages</message>
<message key="This document is not available in this language.">This document is not available in this language.</message>
@@ -229,6 +233,7 @@
<message key="Task">Task</message>
<message key="Day">Day</message>
<message key="Time">Time</message>
+
<!-- Deactivate and delete -->
<message key="docs-have-links-to-doc">The following documents have links to this document</message>
<message key="Deactivate Document">Deactivate Document</message>
@@ -238,6 +243,8 @@
<message key="delete-doc">Delete document {0}</message>
<message key="cannot-deactivate-unless-children-deactivated">This document cannot be deactivated unless the following child documents are deactivated</message>
<message key="delete-language-versions?">Do you really want to delete all language versions of the document {0}?</message>
+ <message key="delete-doc-live">Cannot delete because document {0} is live!</message>
+
<!-- Archive document -->
<message key="Archive Document">Archive Document</message>
<message key="archive-doc">Archive document {0}</message>
@@ -254,11 +261,17 @@
<message key="Paste Document">Paste Document</message>
<message key="paste-doc">Paste document {0}</message>
<message key="paste-doc-from-clip?">Do you want to paste the document {0} from the clipboard?</message>
+
<!-- Cut document -->
<message key="Cut Document">Cut Document</message>
<message key="cut-doc">Cut document {0}</message>
<message key="cut-doc-to-clip?">Do you want to cut the document {0} and move it to the clipboard? You can paste the document later at the location of your choosing.</message>
+ <!-- Nudge document -->
+ <message key="nudge-error-direction-unknown">The direction {0} is not supported!</message>
+ <message key="nudge-error-direction">Cannot move the node in this direction.</message>
+ <message key="nudge-error-area">This operation can only be invoked on site trees.</message>
+
<!-- Info Asset -->
<message key="Insert Image">Insert Image</message>
<message key="Insert Asset">Insert Asset</message>
@@ -266,7 +279,7 @@
<message key="Insert a new Image">Insert a new Image</message>
<message key="Upload an Asset">Upload an Asset</message>
- <!-- Info workflow -->
+ <!-- Workflow -->
<message key="Value">Value</message>
<message key="Event">Event</message>
<message key="Variables">Variables</message>
@@ -277,6 +290,8 @@
<message key="submit">submit</message>
<message key="reject">reject</message>
<message key="publish">publish</message>
+ <message key="error-workflow-document">The event {0} is not executable on
+ document {1}</message>
<!-- Info asset -->
<message key="New Asset">New Asset</message>
@@ -328,5 +343,10 @@
<message key="lenya.rc.nocheckin">Resource could not be checked in</message>
<message key="Generic Exception">Generic Exception</message>
<message key="Check the log files.">Check the log files.</message>
+
+ <!-- Error messages of a general nature -->
+ <message key="error-document-form">Document is not well-formed: {0}</message>
+ <message key="error-validation">Schema validation failed: {0}</message>
+
</catalogue>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org