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

Fix fehlende Globalisierung bei File Attachment (ticket #169) 

git-svn-id: https://svn.libreccm.org/ccm/trunk@730 8810af33-2d31-482b-a856-94f89814c4df
master
pb 2011-02-02 22:23:51 +00:00
parent 2c89d68f98
commit 06d7ef9cba
4 changed files with 28 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,7 +32,7 @@ public class FileAttachmentGlobalize {
*/ */
public static GlobalizedMessage AuthoringStepLabel() { public static GlobalizedMessage AuthoringStepLabel() {
return new GlobalizedMessage( return new GlobalizedMessage(
"com.arsdigita.cms.contentassets.file_attachment_label", "cms.contentassets.file_attachment.label",
"com.arsdigita.cms.contentassets.FileAttachmentResources"); "com.arsdigita.cms.contentassets.FileAttachmentResources");
} }
@ -41,7 +41,7 @@ public class FileAttachmentGlobalize {
*/ */
public static GlobalizedMessage AuthoringStepDescription() { public static GlobalizedMessage AuthoringStepDescription() {
return new GlobalizedMessage( return new GlobalizedMessage(
"com.arsdigita.cms.contentassets.file_attachment_description", "cms.contentassets.file_attachment.description",
"com.arsdigita.cms.contentassets.FileAttachmentResources"); "com.arsdigita.cms.contentassets.FileAttachmentResources");
} }
@ -50,7 +50,7 @@ public class FileAttachmentGlobalize {
*/ */
public static GlobalizedMessage FileTypeLabel() { public static GlobalizedMessage FileTypeLabel() {
return new GlobalizedMessage( return new GlobalizedMessage(
"com.arsdigita.cms.contentassets.file_type_label", "cms.contentassets.file_attachment.type_label",
"com.arsdigita.cms.contentassets.FileAttachmentResources"); "com.arsdigita.cms.contentassets.FileAttachmentResources");
} }
@ -59,7 +59,7 @@ public class FileAttachmentGlobalize {
*/ */
public static GlobalizedMessage NoFilesAssociatedMsg() { public static GlobalizedMessage NoFilesAssociatedMsg() {
return new GlobalizedMessage( return new GlobalizedMessage(
"com.arsdigita.cms.contentassets.no_files_associated_msg", "cms.contentassets.file_attachment.no_files_associated_msg",
"com.arsdigita.cms.contentassets.FileAttachmentResources"); "com.arsdigita.cms.contentassets.FileAttachmentResources");
} }
@ -68,7 +68,7 @@ public class FileAttachmentGlobalize {
*/ */
public static GlobalizedMessage UploadNewFileLabel() { public static GlobalizedMessage UploadNewFileLabel() {
return new GlobalizedMessage( return new GlobalizedMessage(
"com.arsdigita.cms.contentassets.upload_new_file_label", "cms.contentassets.file_attachment.upload_new_file_label",
"com.arsdigita.cms.contentassets.FileAttachmentResources"); "com.arsdigita.cms.contentassets.FileAttachmentResources");
} }

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

@ -1,8 +1,8 @@
cms.contentassets.file_attachment_label=Attach files cms.contentassets.file_attachment.label=Attach files
cms.contentassets.file_attachment_description=Attach files cms.contentassets.file_attachment.description=Attach files
cms.contentassets.file_type_label=File Type: cms.contentassets.file_attachment.type_label=File Type:
cms.contentassets.no_files_associated_msg=This item does not have any associated files. cms.contentassets.file_attachment.no_files_associated_msg=This item does not have any associated files.
cms.contentassets.upload_new_file_label=Upload a new file cms.contentassets.file_attachment.upload_new_file_label=Upload a new file
cms.contentassets.tableheader_file=File cms.contentassets.file_attachment.tableheader_file=File
cms.contentassets.tableheader_description=Description cms.contentassets.file_attachment.tableheader_description=Description
com.arsdigita.cms.contentassets.file_attachment_label=File attachments cms.contentassets.file_attachment.list_label=File attachments

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

@ -1,8 +1,8 @@
cms.contentassets.file_attachment_label=Dateien anf\u00fcgen cms.contentassets.file_attachment.label=Dateien anf\u00fcgen
cms.contentassets.file_attachment_description=Dateien anf\u00fcgen cms.contentassets.file_attachment.description=Dateien anf\u00fcgen
cms.contentassets.file_type_label=Datei Typ: cms.contentassets.file_attachment.type_label=Datei Typ:
cms.contentassets.no_files_associated_msg=Diesem Dokument sind keine Dateien zum Download zugeordnet. cms.contentassets.file_attachment.no_files_associated_msg=Diesem Dokument sind keine Dateien zum Download zugeordnet.
cms.contentassets.upload_new_file_label=Neue Datei hochladen cms.contentassets.file_attachment.upload_new_file_label=Neue Datei hochladen
cms.contentassets.tableheader_file=Datei cms.contentassets.file_attachment.tableheader_file=Datei
cms.contentassets.tableheader_description=Beschreibung cms.contentassets.file_attachment.tableheader_description=Beschreibung
com.arsdigita.cms.contentassets.file_attachment_label=Dateianh\u00e4nge cms.contentassets.file_attachment.list_label=Dateianh\u00e4nge

11
ccm-cms-assets-fileattachment/src/com/arsdigita/cms/contentassets/ui/FileAttachmentsStep.java
View File

@ -96,10 +96,13 @@ public class FileAttachmentsStep extends SecurityPropertyEditor {
// The upload form. // The upload form.
m_uploadForm = new FileAttachmentUpload(m_item); m_uploadForm = new FileAttachmentUpload(m_item);
add("upload", add("upload",
// XXX todo: use of tostring() is ugly and not supported API. add method // XXX todo: method add expects a plain string as label parameter. Use
// has to be refactored to accept a GlobalizedMessage as Parameter instead // of tostring() is ugly and not supported API (for debugging only).
// of a plain string for the Label (2. parameter) ! // add method has to be refactored to accept a GlobalizedMessage
FileAttachmentGlobalize.UploadNewFileLabel().toString(), // Parameter instead of a plain string for the Label (2. parameter) !
// It is uggly to make an additional localize() to get an object which
// can be casted to String!
(String)FileAttachmentGlobalize.UploadNewFileLabel().localize(),
new WorkflowLockedComponentAccess(m_uploadForm, m_item), new WorkflowLockedComponentAccess(m_uploadForm, m_item),
m_uploadForm.getSaveCancelSection().getCancelButton()); m_uploadForm.getSaveCancelSection().getCancelButton());