Author: billyxie
Date: 2009-07-23 05:18:51 +0200 (Thu, 23 Jul 2009)
New Revision: 37193
Modified:
CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/resources/cmsc-repository.properties
CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_nl.properties
CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_zh.properties
CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/attachmentupload.jsp
CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/imageupload.jsp
Log:
CMSC-1467 - Improve bulk image and attachment upload to show failed files
Modified:
CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/resources/cmsc-repository.properties
===================================================================
---
CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/resources/cmsc-repository.properties
2009-07-22 20:33:50 UTC (rev 37192)
+++
CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/resources/cmsc-repository.properties
2009-07-23 03:18:51 UTC (rev 37193)
@@ -341,7 +341,11 @@
images.upload.results=Uploaded images
images.upload.explanation=Select a local image file or a ZIP-file containing
multiple images
images.upload.result=Uploaded {0} image(s)
-images.upload.error=No images uploaded. The image(s) might be to large. Check
ZIP-file, it might be corrupt or password protected or it might not contain any
supported images.
+images.upload.filetypeinvalid=Please upload a local image or a ZIP-file
containing multiple images.
+images.upload.emptyfile=Please upload a local image or a ZIP-file containing
multiple images.
+images.upload.bigfile=The file is too big(max 8MB).
+images.upload.failedtip=Failed image(s):
+images.upload.uploadedtip=Uploaded image(s):
images.upload.info=Info
images.upload.edit=Edit image
@@ -350,7 +354,10 @@
attachments.upload.results=Uploaded attachments
attachments.upload.explanation=Select a local attachment file or a ZIP-file
containing multiple attachments
attachments.upload.result=Uploaded {0} attachment(s)
-attachments.upload.error=No attachments uploaded. Possible reasons:<ol><li>the
attachment(s) are too big (max 16MB), even though it is zipped in a ZIP-file
that is smaller then the limit.</li><li>the ZIP-file does not contain
files</li><li>the ZIP-file is secured with a password</li><li>the ZIP-file is
damaged.</li></ol>
+attachments.upload.emptyfile=Please select a attachment file or Zip file to
upload.
+attachments.upload.bigfile=The attachment(s) is too big(max 8MB).
+attachments.upload.failedtip=Failed attachment(s):
+attachments.upload.uploadedtip=Uploaded attachment(s):
attachments.upload.info=Info
attachments.upload.edit=Edit attachment
Modified:
CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_nl.properties
===================================================================
---
CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_nl.properties
2009-07-22 20:33:50 UTC (rev 37192)
+++
CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_nl.properties
2009-07-23 03:18:51 UTC (rev 37193)
@@ -342,7 +342,11 @@
images.upload.results=Geuploaden afbeeldingen
images.upload.explanation=Kies een lokale afbeelding of een ZIP-bestand met
meerdere afbeeldingen
images.upload.result=Aantal afbeeldingen geupload: {0}
-images.upload.error=Geen afbeeldingen geupload. De afbeelding(en) kunnen te
groot zijn. Controleer bij gebruik van een ZIP-bestand of het afbeeldingen
bevat, niet beveiligd is met een wachtwoord en niet corrupt is.
+images.upload.filetypeinvalid=Please upload a local image or a ZIP-file
containing multiple images.
+images.upload.emptyfile=Please upload a local image or a ZIP-file containing
multiple images.
+images.upload.bigfile=The file is too big(max 8MB).
+images.upload.failedtip=Failed image(s):
+images.upload.uploadedtip=Uploaded image(s):
images.upload.info=Info
images.upload.edit=Bewerk afbeelding
@@ -351,7 +355,10 @@
attachments.upload.results=Bijlagen geupload:
attachments.upload.explanation=Kies een lokale bijlage of een ZIP-bestand met
meerdere bijlagen
attachments.upload.result=Aantal bijlagen geupload: {0}
-attachments.upload.error=Geen bijlagen geupload. Mogelijke oorzaken:<ol><li>de
bijlage(s) kunnen te groot zijn (max 16MB), ook al is deze ingepakt in een
ZIP-bestand dat kleiner is.</li><li>het ZIP-bestand bevat geen
bijlagen</li><li>het ZIP-bestand is beveiligd met een wachtwoord</li><li>het
ZIP-bestand is beschadigd.</li></ol>
+attachments.upload.emptyfile=Please select a attachment file or Zip file to
upload.
+attachments.upload.bigfile=The attachment(s) is too big(max 8MB).
+attachments.upload.failedtip=Failed attachment(s):
+attachments.upload.uploadedtip=Uploaded attachment(s):
attachments.upload.info=Info
attachments.upload.edit=Bewerk bijlage
Modified:
CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_zh.properties
===================================================================
---
CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_zh.properties
2009-07-22 20:33:50 UTC (rev 37192)
+++
CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_zh.properties
2009-07-23 03:18:51 UTC (rev 37193)
@@ -340,7 +340,11 @@
images.upload.results=上传图片
images.upload.explanation=选择一个本地的图片文件或者包含若干图片文件的zip文件
images.upload.result=更新 {0} 个图片(s)
-images.upload.error=没有上传图片. 检查zip文件，它可能损坏或者被密码保护或者没有包含图片文件.
+images.upload.filetypeinvalid=请上传图片或zip文件格式的图片压缩包.
+images.upload.emptyfile=请上传图片或zip文件格式的图片压缩包.
+images.upload.bigfile=文件太大(最大 8MB).
+images.upload.failedtip=上传失败的图片:
+images.upload.uploadedtip=上传成功的图片:
images.upload.info=信息
images.upload.edit=编辑图片
@@ -349,7 +353,10 @@
attachments.upload.results=上传附件
attachments.upload.explanation=选择一个本地的附件或者包含若干附件的zip文件
attachments.upload.result=更新 {0} 个附件(s)
-attachments.upload.error=No attachments uploaded. Possible reasons:<ol><li>the
attachment(s) are too big (max 16MB), even though it is zipped in a ZIP-file
that is smaller then the limit.</li><li>the ZIP-file does not contain
files</li><li>the ZIP-file is secured with a password</li><li>the ZIP-file is
damaged.</li></ol>
+attachments.upload.emptyfile=选择一个本地的附件或者包含若干附件的zip文件
+attachments.upload.bigfile=附件太大(最大 8MB).
+attachments.upload.failedtip=上传失败的附件:
+attachments.upload.uploadedtip=上传成功的附件:
attachments.upload.info=信息
attachments.upload.edit=编辑附件
Modified:
CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/attachmentupload.jsp
===================================================================
---
CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/attachmentupload.jsp
2009-07-22 20:33:50 UTC (rev 37192)
+++
CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/attachmentupload.jsp
2009-07-23 03:18:51 UTC (rev 37193)
@@ -66,13 +66,13 @@
</div>
<div id="notbusy">
<c:if test="${param.fileIsEmpty}">
- <p> Please select a attachment file or Zip file.</p>
+ <p> <fmt:message
key="attachments.upload.emptyfile"/></p>
</c:if>
<c:if test="${param.fileTooBig}">
- <p> The file is too big.</p>
+ <p> <fmt:message key="attachments.upload.bigfile"/></p>
</c:if>
<c:if test="${param.numberOfFailedFiles >= 0}">
- <p> Failed Attachment(s):
${param.numberOfFailedFiles}<br />
+ <p> <fmt:message key="attachments.upload.failedtip"/>
${param.numberOfFailedFiles}<br />
<c:forEach var="failedFile"
items="${sessionScope.failedFiles}">
<c:out value="${failedFile}" />
</c:forEach>
@@ -80,7 +80,7 @@
</p>
</c:if>
<c:if test="${param.numberOfUploadedNodes >= 0}">
- <p> Uploaded Attachment(s):
${param.numberOfUploadedNodes}<br />
+ <p> <fmt:message
key="attachments.upload.uploadedtip"/> ${param.numberOfUploadedNodes}<br />
<c:forEach var="uploadedFile"
items="${sessionScope.uploadedFiles}">
<c:out value="${uploadedFile}" />
</c:forEach>
Modified:
CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/imageupload.jsp
===================================================================
---
CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/imageupload.jsp
2009-07-22 20:33:50 UTC (rev 37192)
+++
CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/imageupload.jsp
2009-07-23 03:18:51 UTC (rev 37193)
@@ -69,16 +69,16 @@
</div>
<div id="notbusy">
<c:if test="${param.fileTypeInvalid}">
- <p> Please upload a image or Zip file.</p>
+ <p> <fmt:message
key="images.upload.filetypeinvalid"/></p>
</c:if>
<c:if test="${param.fileIsEmpty}">
- <p> Please select a image file or Zip file.</p>
+ <p> <fmt:message key="images.upload.emptyfile"/></p>
</c:if>
<c:if test="${param.fileTooBig}">
- <p> The file is too big.</p>
+ <p> <fmt:message key="images.upload.bigfile"/></p>
</c:if>
<c:if test="${param.numberOfFailedFiles >= 0}">
- <p> Failed Image(s):
${param.numberOfFailedFiles}<br />
+ <p> <fmt:message key="images.upload.failedtip"/>
${param.numberOfFailedFiles}<br />
<c:forEach var="failedFile"
items="${sessionScope.failedFiles}">
<c:out value="${failedFile}" />
</c:forEach>
@@ -86,7 +86,7 @@
</p>
</c:if>
<c:if test="${param.numberOfUploadedNodes >= 0}">
- <p> Uploaded Image(s):
${param.numberOfUploadedNodes}<br />
+ <p> <fmt:message key="images.upload.uploadedtip"/>
${param.numberOfUploadedNodes}<br />
<c:forEach var="uploadedFile"
items="${sessionScope.uploadedFiles}">
<c:out value="${uploadedFile}" />
</c:forEach>
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
