You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2007/07/18 15:47:03 UTC
svn commit: r557259 - in /lenya/trunk/src/modules-core/usecase:
java/src/org/apache/lenya/cms/usecase/AbstractUsecase.java
resources/i18n/cmsui.xml resources/i18n/cmsui_de.xml
Author: andreas
Date: Wed Jul 18 06:47:02 2007
New Revision: 557259
URL: http://svn.apache.org/viewvc?view=rev&rev=557259
Log:
Added i18n for 'objects are checked out' message. This fixes bug 42931.
Modified:
lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/AbstractUsecase.java
lenya/trunk/src/modules-core/usecase/resources/i18n/cmsui.xml
lenya/trunk/src/modules-core/usecase/resources/i18n/cmsui_de.xml
Modified: lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/AbstractUsecase.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/AbstractUsecase.java?view=diff&rev=557259&r1=557258&r2=557259
==============================================================================
--- lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/AbstractUsecase.java (original)
+++ lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/AbstractUsecase.java Wed Jul 18 06:47:02 2007
@@ -55,6 +55,8 @@
public class AbstractUsecase extends AbstractLogEnabled implements Usecase, Configurable,
Contextualizable, Serviceable, Initializable {
+ protected static final String ERROR_OBJECTS_CHECKED_OUT = "objects-checked-out";
+
protected static final StateMachine.Transition[] TRANSITIONS = {
new StateMachine.Transition("start", "preChecked", "checkPreconditions"),
new StateMachine.Transition("preChecked", "nodesLocked", "lockInvolvedObjects"),
@@ -769,8 +771,7 @@
}
}
} else {
- addErrorMessage("The operation cannot be executed because one ore more of the "
- + "involved objects are checked out.");
+ addErrorMessage(ERROR_OBJECTS_CHECKED_OUT);
}
} catch (RepositoryException e) {
Modified: lenya/trunk/src/modules-core/usecase/resources/i18n/cmsui.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/usecase/resources/i18n/cmsui.xml?view=diff&rev=557259&r1=557258&r2=557259
==============================================================================
--- lenya/trunk/src/modules-core/usecase/resources/i18n/cmsui.xml (original)
+++ lenya/trunk/src/modules-core/usecase/resources/i18n/cmsui.xml Wed Jul 18 06:47:02 2007
@@ -21,5 +21,8 @@
<catalogue xml:lang="en" xmlns:xhtml="http://www.w3.org/1999/xhtml">
<message key="could-not-execute-usecase">Could not execute usecase</message>
+ <message key="objects-checked-out">
+ The operation cannot be executed because one ore more of the involved objects are checked out.
+ </message>
</catalogue>
Modified: lenya/trunk/src/modules-core/usecase/resources/i18n/cmsui_de.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/usecase/resources/i18n/cmsui_de.xml?view=diff&rev=557259&r1=557258&r2=557259
==============================================================================
--- lenya/trunk/src/modules-core/usecase/resources/i18n/cmsui_de.xml (original)
+++ lenya/trunk/src/modules-core/usecase/resources/i18n/cmsui_de.xml Wed Jul 18 06:47:02 2007
@@ -21,5 +21,9 @@
<catalogue xml:lang="de" xmlns:xhtml="http://www.w3.org/1999/xhtml">
<message key="could-not-execute-usecase">Der Usecase konnte nicht ausgeführt werden</message>
+ <message key="objects-checked-out">
+ Die Operation konnte nicht ausgeführt werden, da eines oder mehrere der beteiligten
+ Objekte ausgecheckt sind.
+ </message>
</catalogue>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org