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/04/17 14:20:15 UTC

svn commit: r529575 - in /lenya/trunk/src: modules-core/sitemanagement/usecases/site/ modules/cforms/config/ modules/links/config/ modules/news/config/ modules/opendocument/config/menus/ modules/resource/config/menus/ webapp/lenya/resources/i18n/

Author: andreas
Date: Tue Apr 17 05:20:13 2007
New Revision: 529575

URL: http://svn.apache.org/viewvc?view=rev&rev=529575
Log:
Consider the case that no doctype parameter has been passed to the create usecase.

Modified:
    lenya/trunk/src/modules-core/sitemanagement/usecases/site/create.jx
    lenya/trunk/src/modules/cforms/config/menu.xsp
    lenya/trunk/src/modules/links/config/menu.xsp
    lenya/trunk/src/modules/news/config/menu.xsp
    lenya/trunk/src/modules/opendocument/config/menus/opendocument.xsp
    lenya/trunk/src/modules/resource/config/menus/resource.xsp
    lenya/trunk/src/webapp/lenya/resources/i18n/cmsui.xml
    lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_de.xml
    lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_es.xml
    lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_fr.xml
    lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_it.xml
    lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_ja.xml
    lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_nl.xml
    lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_pt.xml
    lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_ru.xml

Modified: lenya/trunk/src/modules-core/sitemanagement/usecases/site/create.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/sitemanagement/usecases/site/create.jx?view=diff&rev=529575&r1=529574&r2=529575
==============================================================================
--- lenya/trunk/src/modules-core/sitemanagement/usecases/site/create.jx (original)
+++ lenya/trunk/src/modules-core/sitemanagement/usecases/site/create.jx Tue Apr 17 05:20:13 2007
@@ -24,17 +24,25 @@
   xmlns:i18n="http://apache.org/cocoon/i18n/2.1" >
   
   <page:title>
-    <i18n:translate>
-      <i18n:text>New Document</i18n:text>
-      <i18n:param><jx:out value="${usecase.getParameter('doctype')}"/></i18n:param>
-    </i18n:translate>
+    <jx:choose>
+      <jx:when test="${usecase.getParameter('doctype') == null}">
+        <i18n:translate>
+          <i18n:text>New Document</i18n:text>
+        </i18n:translate>
+      </jx:when>
+      <jx:otherwise>
+        <i18n:translate>
+          <i18n:text>New ... Document</i18n:text>
+          <i18n:param><jx:out value="${usecase.getParameter('doctype')}"/></i18n:param>
+        </i18n:translate>
+      </jx:otherwise>
+    </jx:choose>
   </page:title>
   <page:body>
     <div class="lenya-box">
       <div class="lenya-box-title">
         <i18n:translate>
           <i18n:text>New Document</i18n:text>
-          <i18n:param><jx:out value="${usecase.getParameter('doctype')}"/></i18n:param>
         </i18n:translate>
       </div>
       

Modified: lenya/trunk/src/modules/cforms/config/menu.xsp
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/cforms/config/menu.xsp?view=diff&rev=529575&r1=529574&r2=529575
==============================================================================
--- lenya/trunk/src/modules/cforms/config/menu.xsp (original)
+++ lenya/trunk/src/modules/cforms/config/menu.xsp Tue Apr 17 05:20:13 2007
@@ -41,7 +41,7 @@
         <block areas="site authoring">
           <item uc:usecase="sitemanagement.create" href="?doctype=cforms">
             <i18n:translate>
-              <i18n:text>New Document</i18n:text>
+              <i18n:text>New ... Document</i18n:text>
               <i18n:param>CForms</i18n:param>
             </i18n:translate>
           </item>

Modified: lenya/trunk/src/modules/links/config/menu.xsp
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/links/config/menu.xsp?view=diff&rev=529575&r1=529574&r2=529575
==============================================================================
--- lenya/trunk/src/modules/links/config/menu.xsp (original)
+++ lenya/trunk/src/modules/links/config/menu.xsp Tue Apr 17 05:20:13 2007
@@ -41,7 +41,7 @@
         <block areas="site authoring">
           <item uc:usecase="sitemanagement.create" href="?doctype=links">
             <i18n:translate>
-              <i18n:text>New Document</i18n:text>
+              <i18n:text>New ... Document</i18n:text>
               <i18n:param>Links</i18n:param>
             </i18n:translate>
           </item>

Modified: lenya/trunk/src/modules/news/config/menu.xsp
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/news/config/menu.xsp?view=diff&rev=529575&r1=529574&r2=529575
==============================================================================
--- lenya/trunk/src/modules/news/config/menu.xsp (original)
+++ lenya/trunk/src/modules/news/config/menu.xsp Tue Apr 17 05:20:13 2007
@@ -39,7 +39,7 @@
         <block areas="site authoring">
           <item uc:usecase="sitemanagement.create" href="?doctype=news&amp;sample=Children">
             <i18n:translate>
-              <i18n:text>New Document</i18n:text>
+              <i18n:text>New ... Document</i18n:text>
               <i18n:param>News</i18n:param>
             </i18n:translate>
           </item>

Modified: lenya/trunk/src/modules/opendocument/config/menus/opendocument.xsp
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/opendocument/config/menus/opendocument.xsp?view=diff&rev=529575&r1=529574&r2=529575
==============================================================================
--- lenya/trunk/src/modules/opendocument/config/menus/opendocument.xsp (original)
+++ lenya/trunk/src/modules/opendocument/config/menus/opendocument.xsp Tue Apr 17 05:20:13 2007
@@ -41,7 +41,7 @@
         <block areas="site authoring">
           <item uc:usecase="opendocument.create" href="?doctype=opendocument">
             <i18n:translate>
-              <i18n:text>New Document</i18n:text>
+              <i18n:text>New ... Document</i18n:text>
               <i18n:param>ODT</i18n:param>
             </i18n:translate>
           </item>

Modified: lenya/trunk/src/modules/resource/config/menus/resource.xsp
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/resource/config/menus/resource.xsp?view=diff&rev=529575&r1=529574&r2=529575
==============================================================================
--- lenya/trunk/src/modules/resource/config/menus/resource.xsp (original)
+++ lenya/trunk/src/modules/resource/config/menus/resource.xsp Tue Apr 17 05:20:13 2007
@@ -39,7 +39,7 @@
         <block areas="site authoring">
           <item uc:usecase="resource.create" href="?doctype=resource">
             <i18n:translate>
-              <i18n:text>New Document</i18n:text>
+              <i18n:text>New ... Document</i18n:text>
               <i18n:param>Media</i18n:param>
             </i18n:translate>
           </item>

Modified: lenya/trunk/src/webapp/lenya/resources/i18n/cmsui.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/webapp/lenya/resources/i18n/cmsui.xml?view=diff&rev=529575&r1=529574&r2=529575
==============================================================================
--- lenya/trunk/src/webapp/lenya/resources/i18n/cmsui.xml (original)
+++ lenya/trunk/src/webapp/lenya/resources/i18n/cmsui.xml Tue Apr 17 05:20:13 2007
@@ -123,7 +123,8 @@
   <message key="reject-doc?">Do you want to reject the document <xhtml:em>"{0}"</xhtml:em>?</message>
   
   <!-- cms menu -->
-  <message key="New Document">New {0} Document</message>
+  <message key="New Document">New Document</message>
+  <message key="New ... Document">New {0} Document</message>
   <message key="New Language Version">New Language Version</message>
   <message key="Remove Language Version">Remove Language Version</message>
   <message key="File">File</message>  

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?view=diff&rev=529575&r1=529574&r2=529575
==============================================================================
--- lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_de.xml (original)
+++ lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_de.xml Tue Apr 17 05:20:13 2007
@@ -134,7 +134,8 @@
   <message key="reject-doc?">Wollen Sie das Dokument <xhtml:em>"{0}"</xhtml:em> ablehnen?</message>
 
   <!-- cms menu -->
-  <message key="New Document">Neues {0}-Dokument</message>
+  <message key="New Document">Neues Dokument</message>
+  <message key="New ... Document">Neues {0}-Dokument</message>
   <message key="New Language Version">Neue Sprachversion</message>
   <message key="Remove Language Version">Sprachversion löschen</message>
   <message key="File">Datei</message>  

Modified: lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_es.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_es.xml?view=diff&rev=529575&r1=529574&r2=529575
==============================================================================
--- lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_es.xml (original)
+++ lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_es.xml Tue Apr 17 05:20:13 2007
@@ -127,7 +127,8 @@
   <message key="reject-doc?">¿Desea rechazar&#160;el&#160;documento&#160;{0}?</message>
 
   <!-- cms menu -->
-  <message key="New Document">Nuevo&#160;documento {0}</message>
+  <message key="New Document">Nuevo&#160;documento</message>
+  <message key="New ... Document">Nuevo&#160;documento {0}</message>
   <message key="New Language Version">Nueva&#160;versión&#160;de&#160;idioma</message>
   <message key="Remove Language Version">Eliminar&#160;versión&#160;de&#160;idioma</message>
   <message key="File">Archivo</message>

Modified: lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_fr.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_fr.xml?view=diff&rev=529575&r1=529574&r2=529575
==============================================================================
--- lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_fr.xml (original)
+++ lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_fr.xml Tue Apr 17 05:20:13 2007
@@ -118,7 +118,8 @@
   <message key="reject-doc?">Voulez-vous rejeter le document {0}?</message>
 
   <!-- cms menu -->
-  <message key="New document">Nouveau document {0}</message>
+  <message key="New Document">Nouveau document</message>
+  <message key="New ... Document">Nouveau document {0}</message>
   <message key="New Language Version">Nouvelle traduction</message>
   <message key="Remove Language Version">Supprimer la traduction</message>
   <message key="File">Fichier</message>

Modified: lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_it.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_it.xml?view=diff&rev=529575&r1=529574&r2=529575
==============================================================================
--- lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_it.xml (original)
+++ lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_it.xml Tue Apr 17 05:20:13 2007
@@ -103,8 +103,9 @@
 	<message key="Reject">Respingi</message>
 	<message key="reject-doc?">Vuoi respingere il documento {0}?</message>
 	<!-- cms menu -->
-	<message key="New document">Nuovo Documento {0}</message>
-	<message key="New Language Version">Nuova Lingua</message>
+	<message key="New Document">Nuovo Documento</message>
+  <message key="New ... Document">Nuovo Documento {0}</message>
+  <message key="New Language Version">Nuova Lingua</message>
 	<message key="Remove Language Version">Rimuovi Lingua</message>
 	<message key="File">File</message>
 	<message key="Edit">Modifica</message>

Modified: lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_ja.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_ja.xml?view=diff&rev=529575&r1=529574&r2=529575
==============================================================================
--- lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_ja.xml (original)
+++ lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_ja.xml Tue Apr 17 05:20:13 2007
@@ -112,7 +112,8 @@
   <message key="reject-doc?">ドキュメント {0} を拒否しますか?</message>
 
   <!-- cms menu -->
-  <message key="New Document">新規ドキュメント {0}</message>
+  <message key="New Document">新規ドキュメント</message>
+  <message key="New ... Document">新規ドキュメント {0}</message>
   <message key="New Language Version">新規言語バージョン</message>
   <message key="Remove Language Version">言語バージョンの削除</message>
   <message key="File">ファイル</message>

Modified: lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_nl.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_nl.xml?view=diff&rev=529575&r1=529574&r2=529575
==============================================================================
--- lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_nl.xml (original)
+++ lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_nl.xml Tue Apr 17 05:20:13 2007
@@ -126,7 +126,8 @@
   <message key="reject-doc?">Wilt u het document {0} afwijzen?</message>
 
   <!-- cms menu -->
-  <message key="New Document">Nieuw {0} Document</message>
+  <message key="New Document">Nieuw Document</message>
+  <message key="New ... Document">Nieuw {0} Document</message>
   <message key="New Language Version">Nieuwe taal versie</message>
 
   <message key="Remove Language Version">Verwijder taal versie</message>

Modified: lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_pt.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_pt.xml?view=diff&rev=529575&r1=529574&r2=529575
==============================================================================
--- lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_pt.xml (original)
+++ lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_pt.xml Tue Apr 17 05:20:13 2007
@@ -116,7 +116,8 @@
   <message key="reject-doc?">Deseja rejeitar o documento {0}?</message>
 
   <!-- cms menu -->
-  <message key="New Document">Novo documento {0}</message>
+  <message key="New Document">Novo documento</message>
+  <message key="New ... Document">Novo documento {0}</message>
   <message key="New Language Version">Nova versão de idioma</message>
   <message key="Remove Language Version">Eliminar versão de idioma</message>
   <message key="File">Ficheiro</message>

Modified: lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_ru.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_ru.xml?view=diff&rev=529575&r1=529574&r2=529575
==============================================================================
--- lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_ru.xml (original)
+++ lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_ru.xml Tue Apr 17 05:20:13 2007
@@ -120,7 +120,8 @@
 
 <message key="reject-doc?">Хотите отклонить документ {0}?</message>
 <!-- cms menu -->
-<message key="New Document">Новый {0} документ</message>
+<message key="New Document">Новый документ</message>
+<message key="New ... Document">Новый {0} документ</message>
 <message key="New Language Version">Версия на другом языке</message>
 <message key="Remove Language Version">Удалить версию на другом языке</message>
 <message key="File">Файл</message>



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