LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Improvment of the error message for an already attached file 

git-svn-id: https://svn.libreccm.org/ccm/trunk@3116 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2015-02-04 08:40:06 +00:00
parent 055e31c990
commit fa275828cd
5 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ccm-cms-assets-fileattachment/src/com/arsdigita/cms/contentassets/FileAttachmentGlobalize.java
View File

@ -71,7 +71,7 @@ public class FileAttachmentGlobalize {
"cms.contentassets.file_attachment.upload_new_file_label",
"com.arsdigita.cms.contentassets.FileAttachmentResources");
}
}

2
ccm-cms-assets-fileattachment/src/com/arsdigita/cms/contentassets/FileAttachmentResources.properties
View File

@ -6,4 +6,4 @@ cms.contentassets.file_attachment.upload_new_file_label=Upload a new file
cms.contentassets.file_attachment.tableheader_file=File
cms.contentassets.file_attachment.tableheader_description=Description
cms.contentassets.file_attachment.list_label=File attachments
cms.contentassets.file_attachment.already_attached=A file with the same name as the selected file has already been attached.
cms.contentassets.file_attachment.already_attached=A file with the name {0} as already been attached.

2
ccm-cms-assets-fileattachment/src/com/arsdigita/cms/contentassets/FileAttachmentResources_de.properties
View File

@ -6,4 +6,4 @@ cms.contentassets.file_attachment.upload_new_file_label=Neue Datei hochladen
cms.contentassets.file_attachment.tableheader_file=Datei
cms.contentassets.file_attachment.tableheader_description=Beschreibung
cms.contentassets.file_attachment.list_label=Dateianh\u00e4nge
cms.contentassets.file_attachment.already_attached=Eine Datei mit dem Namen der ausgew\u00e4hlten Datei wurde bereits hinzugef\u00fcgt.
cms.contentassets.file_attachment.already_attached=Eine Datei mit dem Namen {0} wurde bereits hinzugef\u00fcgt.

3
ccm-cms-assets-fileattachment/src/com/arsdigita/cms/contentassets/ui/FileAttachmentUpload.java
View File

@ -30,6 +30,7 @@ import com.arsdigita.cms.ContentItem;
import com.arsdigita.cms.ItemSelectionModel;
import com.arsdigita.cms.contentassets.FileAttachment;
import com.arsdigita.cms.contentassets.FileAttachmentGlobalize;
import com.arsdigita.cms.contentassets.util.FileAttachmentGlobalizationUtil;
import com.arsdigita.cms.ui.FileUploadSection;
import com.arsdigita.cms.util.GlobalizationUtil;
import com.arsdigita.dispatcher.DispatcherHelper;
@ -159,7 +160,7 @@ public class FileAttachmentUpload extends Form
final DataObject attachment = attachments.getDataObject();
if (attachment.get(FileAttachment.NAME).equals(fileName)) {
attachments.close();
throw new FormProcessException(GlobalizationUtil.globalize(
throw new FormProcessException(FileAttachmentGlobalizationUtil.globalize(
"cms.contentassets.file_attachment.already_attached", new String[]{fileName}));
}
}

21
ccm-cms-assets-fileattachment/src/com/arsdigita/cms/contentassets/util/FileAttachmentGlobalizationUtil.java 100644
View File

@ -0,0 +1,21 @@
package com.arsdigita.cms.contentassets.util;
import com.arsdigita.globalization.GlobalizedMessage;
/**
*
* @author Jens Pelzetter <jens@jp-digital.de>
*/
public class FileAttachmentGlobalizationUtil {
public static final String BUNDLE_NAME = "com.arsdigita.cms.contentassets.FileAttachmentResources";
public static GlobalizedMessage globalize(final String key) {
return new GlobalizedMessage(key, BUNDLE_NAME);
}
public static GlobalizedMessage globalize(final String key, final Object[] args) {
return new GlobalizedMessage(key, BUNDLE_NAME, args);
}
}