svn commit: r596757 - in /lenya/trunk/src: modules-core/workflow/resources/i18n/ modules-core/workflow/usecases/ webapp/lenya/resources/i18n/

[email protected]
Newsgroups gmane.comp.cms.lenya.cvs
Message-ID <[email protected]> 
Author: andreas
Date: Tue Nov 20 09:58:07 2007
New Revision: 596757

URL: http://svn.apache.org/viewvc?rev=596757&view=rev
Log:
Consolidate German workflow usecase i18n messages

Modified:
    lenya/trunk/src/modules-core/workflow/resources/i18n/cmsui_de.xml
    lenya/trunk/src/modules-core/workflow/usecases/deactivate.jx
    lenya/trunk/src/modules-core/workflow/usecases/publish.jx
    lenya/trunk/src/modules-core/workflow/usecases/reject.jx
    lenya/trunk/src/modules-core/workflow/usecases/submit.jx
    lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_de.xml

Modified: lenya/trunk/src/modules-core/workflow/resources/i18n/cmsui_de.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/workflow/resources/i18n/cmsui_de.xml?rev=596757&r1=596756&r2=596757&view=diff
==============================================================================
--- lenya/trunk/src/modules-core/workflow/resources/i18n/cmsui_de.xml (original)
+++ lenya/trunk/src/modules-core/workflow/resources/i18n/cmsui_de.xml Tue Nov 20 09:58:07 2007
@@ -22,10 +22,7 @@
 
   <message key="workflow.multiWorkflow">Workflow-Übersicht</message>
   <message key="back-to-document">Zurück zum Dokument</message>
-  <message key="workflow.submit">Einreichen</message>
-  <message key="workflow.reject">Zurückweisen</message>
   <message key="workflow.publish">Publizieren</message>
-  <message key="workflow.deactivate">Deaktivieren</message>
   <message key="Path">Pfad</message>
   <message key="Actions">Aktionen</message>
   <message key="state-as-text">Zustand als Text</message>
@@ -49,6 +46,24 @@
   <message key="This usecase can only be invoked when the live version exists.">
     Dieser Usecase kann nur ausgeführt werden, wenn die Live-Version existiert.
   </message>
+  
+  <!-- submit usecase -->
+  <message key="workflow.submit">Einreichen</message>
+  <message key="submit-for-approval?">
+    Möchten Sie das Dokument <xhtml:q>{0}</xhtml:q> zur Durchsicht einreichen?
+  </message>  
+  
+  <!-- reject usecase -->
+  <message key="workflow.reject">Zurückweisen</message>
+  <message key="Reject">Ablehnen</message>
+  <message key="reject-doc?">
+    Möchten Sie das Dokument <xhtml:q>{0}</xhtml:q> zurückweisen?
+  </message>
+  
+  <!-- deactivate usecase -->
+  <message key="workflow.deactivate">Deaktivieren</message>
+  <message key="deactivate-doc?">Möchten Sie das Dokument <xhtml:q>{0}</xhtml:q> deaktivieren?</message>
+  
   
 </catalogue>
 

Modified: lenya/trunk/src/modules-core/workflow/usecases/deactivate.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/workflow/usecases/deactivate.jx?rev=596757&r1=596756&r2=596757&view=diff
==============================================================================
--- lenya/trunk/src/modules-core/workflow/usecases/deactivate.jx (original)
+++ lenya/trunk/src/modules-core/workflow/usecases/deactivate.jx Tue Nov 20 09:58:07 2007
@@ -43,9 +43,12 @@
           <input type="hidden" name="lenya.usecase" value="${request.getParameter('lenya.usecase')}"/>
           <table class="lenya-table-noborder">
             <tr>
-              <td class="lenya-entry-caption" valign="top"><i18n:text>Document</i18n:text>:</td>
-              <td valign="top">
-                "<jx:out value="${title}"/>"
+              <td colspan="2" class="lenya-entry-caption">
+                <i18n:translate>
+                  <i18n:text i18n:key="deactivate-doc?"/>
+                  <i18n:param><jx:out value="${title}"/></i18n:param>
+                </i18n:translate>
+                <br/><br/>
               </td>
             </tr>
             <jx:set var="linksToDocument" value="${usecase.getParameter('linksToDocument').getDocuments()}"/>

Modified: lenya/trunk/src/modules-core/workflow/usecases/publish.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/workflow/usecases/publish.jx?rev=596757&r1=596756&r2=596757&view=diff
==============================================================================
--- lenya/trunk/src/modules-core/workflow/usecases/publish.jx (original)
+++ lenya/trunk/src/modules-core/workflow/usecases/publish.jx Tue Nov 20 09:58:07 2007
@@ -23,11 +23,11 @@
   xmlns="http://www.w3.org/1999/xhtml" 
   xmlns:i18n="http://apache.org/cocoon/i18n/2.1" >
   
-  <page:title><i18n:text>Publish</i18n:text></page:title>
+  <page:title><i18n:text>workflow.publish</i18n:text></page:title>
   <page:body>
     <div class="lenya-box">
       <div class="lenya-box-title">
-        <i18n:text>Publish</i18n:text>
+        <i18n:text>workflow.publish</i18n:text>
       </div>
       <div class="lenya-box-body">
         

Modified: lenya/trunk/src/modules-core/workflow/usecases/reject.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/workflow/usecases/reject.jx?rev=596757&r1=596756&r2=596757&view=diff
==============================================================================
--- lenya/trunk/src/modules-core/workflow/usecases/reject.jx (original)
+++ lenya/trunk/src/modules-core/workflow/usecases/reject.jx Tue Nov 20 09:58:07 2007
@@ -23,7 +23,7 @@
   xmlns="http://www.w3.org/1999/xhtml" 
   xmlns:i18n="http://apache.org/cocoon/i18n/2.1" >
   
-  <page:title><i18n:text>Reject Document</i18n:text></page:title>
+  <page:title><i18n:text>workflow.reject</i18n:text></page:title>
   <page:body>
     <div class="lenya-box">
       
@@ -33,10 +33,7 @@
       
       
       <div class="lenya-box-title">
-        <i18n:translate>
-          <i18n:text i18n:key="reject-doc"/>
-          <i18n:param><jx:out value="${title}"/></i18n:param>
-        </i18n:translate>      
+        <i18n:text>workflow.reject</i18n:text>
       </div>
       
       <jx:import uri="fallback://lenya/modules/usecase/templates/messages.jx"/>

Modified: lenya/trunk/src/modules-core/workflow/usecases/submit.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/workflow/usecases/submit.jx?rev=596757&r1=596756&r2=596757&view=diff
==============================================================================
--- lenya/trunk/src/modules-core/workflow/usecases/submit.jx (original)
+++ lenya/trunk/src/modules-core/workflow/usecases/submit.jx Tue Nov 20 09:58:07 2007
@@ -23,7 +23,7 @@
   xmlns="http://www.w3.org/1999/xhtml" 
   xmlns:i18n="http://apache.org/cocoon/i18n/2.1" >
   
-  <page:title><i18n:text>Submit Document</i18n:text></page:title>
+  <page:title><i18n:text>workflow.submit</i18n:text></page:title>
   <page:body>
     <div class="lenya-box">
       
@@ -32,10 +32,7 @@
         .getFirstValue('title')}"/>
       
       <div class="lenya-box-title">
-        <i18n:translate>
-          <i18n:text i18n:key="submit-for-approval"/>
-          <i18n:param><jx:out value="${title}"/></i18n:param>
-        </i18n:translate>      
+        <i18n:text>workflow.submit</i18n:text>
       </div>
       
       <jx:import uri="fallback://lenya/modules/usecase/templates/messages.jx"/>

Modified: lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_de.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_de.xml?rev=596757&r1=596756&r2=596757&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_de.xml (original)
+++ lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_de.xml Tue Nov 20 09:58:07 2007
@@ -108,10 +108,6 @@
   <message key="Other Publications">Andere&#160;Publikationen</message>
   
 
-  <!-- submit screen -->
-  <message key="submit-for-approval">Dokument "{0}" einreichen</message>
-  <message key="submit-for-approval?">Möchten Sie "{0}" zur Durchsicht einreichen?</message>  
-  
   <!-- publish screen --> 
   <message key="Publish">Veröffentlichen</message>    
   <message key="Source File(s)">Quelldatei(en)</message>
@@ -134,11 +130,6 @@
   <message key="Your History">Ihr Verlauf</message>
   <message key="Login to Authoring Area">An Autorenbereich anmelden</message>
 
-  <!-- reject screen -->
-  <message key="Reject">Ablehnen</message>
-  <message key="reject-doc">Dokument "{0}" ablehnen</message>
-  <message key="reject-doc?">Wollen Sie das Dokument <xhtml:em>"{0}"</xhtml:em> ablehnen?</message>
-
   <!-- cms menu -->
   <message key="New Document">Neues Dokument</message>
   <message key="New ... Document">Neues {0}-Dokument</message>
@@ -279,10 +270,6 @@
   <message key="Time">Zeit</message>
       <!-- Deactivate and delete -->
   <message key="docs-have-links-to-doc">Folgende Dokumente verweisen auf dieses Dokument</message>
-  <message key="Deactivate Document">Dokument deaktivieren</message>
-  <message key="deactivate-doc">Dokument {0} deaktivieren</message>
-  <message key="deactivate-doc?">Wollen Sie das Dokument {0} wirklich deaktivieren?</message>
-  <message key="deactivate complete subtree">den gesamten Teilbaum deaktivieren</message>
   <message key="Delete Document">Dokument löschen</message>
   <message key="cannot-deactivate-unless-children-deactivated">Dieses Dokument kann erst deaktiviert werden, wenn alle untergeordneten Dokumente deaktiviert worden sind.</message>
   <message key="delete-language-versions?">Wollen Sie wirklich alle Sprachversionen des Dokuments {0} löschen?</message>
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.