You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by jo...@apache.org on 2005/09/19 23:23:11 UTC

svn commit: r290274 - in /cocoon: blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/ blocks/forms/trunk/samples/messages/ trunk/

Author: joerg
Date: Mon Sep 19 14:23:00 2005
New Revision: 290274

URL: http://svn.apache.org/viewcvs?rev=290274&view=rev
Log:
fixing bug 35475:
CForms: Improved error message for wrong content type on upload.

I hope all these strange characters in the message files get through correctly.

Modified:
    cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/Upload.java
    cocoon/blocks/forms/trunk/samples/messages/FormsMessages.xml
    cocoon/blocks/forms/trunk/samples/messages/FormsMessages_de.xml
    cocoon/blocks/forms/trunk/samples/messages/FormsMessages_el.xml
    cocoon/blocks/forms/trunk/samples/messages/FormsMessages_fr.xml
    cocoon/blocks/forms/trunk/samples/messages/FormsMessages_it_IT.xml
    cocoon/blocks/forms/trunk/samples/messages/FormsMessages_nl.xml
    cocoon/blocks/forms/trunk/samples/messages/FormsMessages_pl.xml
    cocoon/blocks/forms/trunk/samples/messages/FormsMessages_zh_CN.xml
    cocoon/trunk/status.xml

Modified: cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/Upload.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/Upload.java?rev=290274&r1=290273&r2=290274&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/Upload.java (original)
+++ cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/Upload.java Mon Sep 19 14:23:00 2005
@@ -130,7 +130,10 @@
                     return true;
                 }
             }
-            setValidationError(new ValidationError(new I18nMessage("upload.invalid-type", Constants.I18N_CATALOGUE)));
+            I18nMessage message = new I18nMessage("upload.invalid-type",
+                                                  new String[] {contentType},
+                                                  Constants.I18N_CATALOGUE);
+            setValidationError(new ValidationError(message));
             return false;
         }
 

Modified: cocoon/blocks/forms/trunk/samples/messages/FormsMessages.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/samples/messages/FormsMessages.xml?rev=290274&r1=290273&r2=290274&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/samples/messages/FormsMessages.xml (original)
+++ cocoon/blocks/forms/trunk/samples/messages/FormsMessages.xml Mon Sep 19 14:23:00 2005
@@ -52,7 +52,7 @@
    <message key="validation.mod10">Mod 10 check failed.</message>
    <message key="aggregatedfield.split-failed">Content of this field does not
       match the following regular expression: {0}</message>
-   <message key="upload.invalid-type">Invalid content type.</message>
+   <message key="upload.invalid-type">Invalid content type: {0}.</message>
    <message key="upload.rejected">Upload size too large ({0} kbytes). Only {1} kbytes are allowed.</message>
    <message key="calendar.alt">Calendar</message>
 </catalogue>

Modified: cocoon/blocks/forms/trunk/samples/messages/FormsMessages_de.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/samples/messages/FormsMessages_de.xml?rev=290274&r1=290273&r2=290274&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/samples/messages/FormsMessages_de.xml (original)
+++ cocoon/blocks/forms/trunk/samples/messages/FormsMessages_de.xml Mon Sep 19 14:23:00 2005
@@ -52,6 +52,6 @@
 
 
   <message key="aggregatedfield.split-failed">Der Inhalt des Feldes entspricht nicht dem regul. Ausdruck: {0}</message>
-  <message key="upload.invalid-type">Falscher Inhaltstyp.</message>
+  <message key="upload.invalid-type">Falscher Inhaltstyp: {0}.</message>
   <message key="calendar.alt">Kalender</message>
 </catalogue>

Modified: cocoon/blocks/forms/trunk/samples/messages/FormsMessages_el.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/samples/messages/FormsMessages_el.xml?rev=290274&r1=290273&r2=290274&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/samples/messages/FormsMessages_el.xml (original)
+++ cocoon/blocks/forms/trunk/samples/messages/FormsMessages_el.xml Mon Sep 19 14:23:00 2005
@@ -44,6 +44,6 @@
 	<message key="validation.numeric.max">Ο αριθμός πρέπει να είναι μικρότερος ή ίσος του {0}.</message>
 	<message key="validation.mod10">Ο έλεγχος "Mod 10" απέτυχε.</message>
 	<message key="aggregatedfield.split-failed">Το περιεχόμενο του πεδίου δεν ικανοποιεί το regular expression: {0}</message>
-	<message key="upload.invalid-type">Μή έγκυρος τύπος δεδομένων.</message>
+	<message key="upload.invalid-type">Μή έγκυρος τύπος δεδομένων: {0}.</message>
 	<message key="calendar.alt">ημερολόγιο</message>
 </catalogue>

Modified: cocoon/blocks/forms/trunk/samples/messages/FormsMessages_fr.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/samples/messages/FormsMessages_fr.xml?rev=290274&r1=290273&r2=290274&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/samples/messages/FormsMessages_fr.xml (original)
+++ cocoon/blocks/forms/trunk/samples/messages/FormsMessages_fr.xml Mon Sep 19 14:23:00 2005
@@ -53,7 +53,7 @@
 
 
   <message key="aggregatedfield.split-failed">Ne correspond pas à l'expression régulière: {0}</message>
-  <message key="upload.invalid-type">Type de fichier incorrect.</message>
+  <message key="upload.invalid-type">Type de fichier incorrect: {0}.</message>
   <message key="upload.rejected">Téléchargement trop gros ({0} ko). Un maximum de {1} ko est autorisé.</message>
   <message key="calendar.alt">Calendrier</message>
 </catalogue>

Modified: cocoon/blocks/forms/trunk/samples/messages/FormsMessages_it_IT.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/samples/messages/FormsMessages_it_IT.xml?rev=290274&r1=290273&r2=290274&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/samples/messages/FormsMessages_it_IT.xml (original)
+++ cocoon/blocks/forms/trunk/samples/messages/FormsMessages_it_IT.xml Mon Sep 19 14:23:00 2005
@@ -54,6 +54,6 @@
   <message key="validation.captcha.mismatch">Verifica CAPTCHA fallita.</message>
 
   <message key="aggregatedfield.split-failed">Il valore non corrisponde alla seguente espressione regolare: {0}</message>
-  <message key="upload.invalid-type">Tipo del contenuto non valido.</message>
+  <message key="upload.invalid-type">Tipo del contenuto non valido: {0}.</message>
   <message key="calendar.alt">Calendario</message>
 </catalogue>

Modified: cocoon/blocks/forms/trunk/samples/messages/FormsMessages_nl.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/samples/messages/FormsMessages_nl.xml?rev=290274&r1=290273&r2=290274&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/samples/messages/FormsMessages_nl.xml (original)
+++ cocoon/blocks/forms/trunk/samples/messages/FormsMessages_nl.xml Mon Sep 19 14:23:00 2005
@@ -50,5 +50,6 @@
    <message key="validation.mod10">De Mod 10 verificatie is mislukt.</message>
    <message key="aggregatedfield.split-failed">De waarde komt niet overeen met
       deze reg. exp.: {0}</message>
+   <message key="upload.invalid-type">(PLEASE TRANSLATE) Invalid content type: {0}.</message>
    <message key="calendar.alt">Kalender</message>
 </catalogue>

Modified: cocoon/blocks/forms/trunk/samples/messages/FormsMessages_pl.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/samples/messages/FormsMessages_pl.xml?rev=290274&r1=290273&r2=290274&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/samples/messages/FormsMessages_pl.xml (original)
+++ cocoon/blocks/forms/trunk/samples/messages/FormsMessages_pl.xml Mon Sep 19 14:23:00 2005
@@ -51,6 +51,6 @@
   <message key="validation.mod10">Wartość nie dzieli się bez reszty przez 10.</message>
 
   <message key="aggregatedfield.split-failed">Zawartość tego pola nie odpowiada wyrażeniu regularnemu: {0}.</message>
-  <message key="upload.invalid-type">Niepoprawny typ.</message>
+  <message key="upload.invalid-type">Niepoprawny typ: {0}.</message>
   <message key="calendar.alt"></message>
 </catalogue>

Modified: cocoon/blocks/forms/trunk/samples/messages/FormsMessages_zh_CN.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/samples/messages/FormsMessages_zh_CN.xml?rev=290274&r1=290273&r2=290274&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/samples/messages/FormsMessages_zh_CN.xml (original)
+++ cocoon/blocks/forms/trunk/samples/messages/FormsMessages_zh_CN.xml Mon Sep 19 14:23:00 2005
@@ -53,6 +53,6 @@
 
 
   <message key="aggregatedfield.split-failed">域的内容不能满足如下表达式: {0}</message>
-  <message key="upload.invalid-type">内容类型不正确.</message>
+  <message key="upload.invalid-type">内容类型不正确: {0}.</message>
   <message key="calendar.alt"></message>
 </catalogue>

Modified: cocoon/trunk/status.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/status.xml?rev=290274&r1=290273&r2=290274&view=diff
==============================================================================
--- cocoon/trunk/status.xml (original)
+++ cocoon/trunk/status.xml Mon Sep 19 14:23:00 2005
@@ -198,6 +198,9 @@
 
   <changes>
   <release version="@version@" date="@date@">
+    <action dev="JH" type="update" fixes-bug="35475" due-to="Mark Lundquist" due-to-email="mlundquist2@comcast.net">
+      CForms: Improved error message for wrong content type on upload.
+    </action>
     <action dev="JH" type="fix" fixes-bug="35162" due-to="Jochen Kuhnle" due-to-email="werbung@kuhnle.net">
       XSP: EclipseJavaCompiler chokes on warnings. Changed to errors.
     </action>

Re: svn commit: r290274 - in /cocoon: blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/ blocks/forms/trunk/samples/messages/ trunk/

Posted by Joerg Heinicke <jo...@gmx.de>.
On 19.09.2005 23:29, hepabolu wrote:

>> +   <message key="upload.invalid-type">(PLEASE TRANSLATE) Invalid 
>> content type: {0}.</message>
> 
> <message key="upload.invalid-type">Ongeldig inhoudstype: {0}.</message>

Thanks. Added. Two more words for Amsterdam :)

Jörg

Re: svn commit: r290274 - in /cocoon: blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/ blocks/forms/trunk/samples/messages/ trunk/

Posted by hepabolu <he...@gmail.com>.
> Modified: cocoon/blocks/forms/trunk/samples/messages/FormsMessages_nl.xml
> URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/samples/messages/FormsMessages_nl.xml?rev=290274&r1=290273&r2=290274&view=diff
> ==============================================================================
> --- cocoon/blocks/forms/trunk/samples/messages/FormsMessages_nl.xml (original)
> +++ cocoon/blocks/forms/trunk/samples/messages/FormsMessages_nl.xml Mon Sep 19 14:23:00 2005
> @@ -50,5 +50,6 @@
>     <message key="validation.mod10">De Mod 10 verificatie is mislukt.</message>
>     <message key="aggregatedfield.split-failed">De waarde komt niet overeen met
>        deze reg. exp.: {0}</message>
> +   <message key="upload.invalid-type">(PLEASE TRANSLATE) Invalid content type: {0}.</message>
>     <message key="calendar.alt">Kalender</message>
>  </catalogue>

<message key="upload.invalid-type">Ongeldig inhoudstype: {0}.</message>

Bye, Helma