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/05/04 18:21:07 UTC

svn commit: r535316 - in /lenya/trunk/src/modules-core/sitemanagement: java/src/org/apache/lenya/cms/site/usecases/Paste.java resources/i18n/cmsui.xml resources/i18n/cmsui_de.xml

Author: andreas
Date: Fri May  4 09:21:06 2007
New Revision: 535316

URL: http://svn.apache.org/viewvc?view=rev&rev=535316
Log:
Allow paste usecase only in authoring area, added i18n for error messages

Modified:
    lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/Paste.java
    lenya/trunk/src/modules-core/sitemanagement/resources/i18n/cmsui.xml
    lenya/trunk/src/modules-core/sitemanagement/resources/i18n/cmsui_de.xml

Modified: lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/Paste.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/Paste.java?view=diff&rev=535316&r1=535315&r2=535316
==============================================================================
--- lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/Paste.java (original)
+++ lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/Paste.java Fri May  4 09:21:06 2007
@@ -56,10 +56,14 @@
         if (hasErrors()) {
             return;
         }
+        
+        if (!getArea().getName().equals(Publication.AUTHORING_AREA)) {
+            addErrorMessage("only-in-authoring-area");
+        }
 
         Clipboard clipboard = new ClipboardHelper().getClipboard(getContext());
         if (clipboard == null) {
-            addErrorMessage("Cannot paste - the clipboard is empty.");
+            addErrorMessage("clipboard-empty");
         }
     }
 

Modified: lenya/trunk/src/modules-core/sitemanagement/resources/i18n/cmsui.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/sitemanagement/resources/i18n/cmsui.xml?view=diff&rev=535316&r1=535315&r2=535316
==============================================================================
--- lenya/trunk/src/modules-core/sitemanagement/resources/i18n/cmsui.xml (original)
+++ lenya/trunk/src/modules-core/sitemanagement/resources/i18n/cmsui.xml Fri May  4 09:21:06 2007
@@ -54,5 +54,7 @@
   <message key="grant">grant</message>
   <message key="deny">deny</message>
   <message key="world">World</message>
+  <message key="only-in-authoring-area">This usecase can only be invoked in the authoring area.</message>
+  <message key="clipboard-empty">The clipboard is empty.</message>
   
 </catalogue>

Modified: lenya/trunk/src/modules-core/sitemanagement/resources/i18n/cmsui_de.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/sitemanagement/resources/i18n/cmsui_de.xml?view=diff&rev=535316&r1=535315&r2=535316
==============================================================================
--- lenya/trunk/src/modules-core/sitemanagement/resources/i18n/cmsui_de.xml (original)
+++ lenya/trunk/src/modules-core/sitemanagement/resources/i18n/cmsui_de.xml Fri May  4 09:21:06 2007
@@ -54,6 +54,8 @@
   <message key="grant">erlauben</message>
   <message key="deny">verbieten</message>
   <message key="world">Welt</message>
+  <message key="only-in-authoring-area">Dieser Usecase kann nur im Authoring-Bereich ausgeführt werden.</message>
+  <message key="clipboard-empty">Die Zwischenablage ist leer.</message>
   
 </catalogue>
 



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org