From 06d7ef9cba084280d1531f5cb6f1f9b72a97bf75 Mon Sep 17 00:00:00 2001 From: pb Date: Wed, 2 Feb 2011 22:23:51 +0000 Subject: [PATCH] Fix fehlende Globalisierung bei File Attachment (ticket #169) git-svn-id: https://svn.libreccm.org/ccm/trunk@730 8810af33-2d31-482b-a856-94f89814c4df --- .../contentassets/FileAttachmentGlobalize.java | 10 +++++----- .../FileAttachmentResources.properties | 16 ++++++++-------- .../FileAttachmentResources_de.properties | 16 ++++++++-------- .../contentassets/ui/FileAttachmentsStep.java | 11 +++++++---- 4 files changed, 28 insertions(+), 25 deletions(-) diff --git a/ccm-cms-assets-fileattachment/src/com/arsdigita/cms/contentassets/FileAttachmentGlobalize.java b/ccm-cms-assets-fileattachment/src/com/arsdigita/cms/contentassets/FileAttachmentGlobalize.java index e50047ccd..e7f3b681a 100644 --- a/ccm-cms-assets-fileattachment/src/com/arsdigita/cms/contentassets/FileAttachmentGlobalize.java +++ b/ccm-cms-assets-fileattachment/src/com/arsdigita/cms/contentassets/FileAttachmentGlobalize.java @@ -32,7 +32,7 @@ public class FileAttachmentGlobalize { */ public static GlobalizedMessage AuthoringStepLabel() { return new GlobalizedMessage( - "com.arsdigita.cms.contentassets.file_attachment_label", + "cms.contentassets.file_attachment.label", "com.arsdigita.cms.contentassets.FileAttachmentResources"); } @@ -41,7 +41,7 @@ public class FileAttachmentGlobalize { */ public static GlobalizedMessage AuthoringStepDescription() { return new GlobalizedMessage( - "com.arsdigita.cms.contentassets.file_attachment_description", + "cms.contentassets.file_attachment.description", "com.arsdigita.cms.contentassets.FileAttachmentResources"); } @@ -50,7 +50,7 @@ public class FileAttachmentGlobalize { */ public static GlobalizedMessage FileTypeLabel() { return new GlobalizedMessage( - "com.arsdigita.cms.contentassets.file_type_label", + "cms.contentassets.file_attachment.type_label", "com.arsdigita.cms.contentassets.FileAttachmentResources"); } @@ -59,7 +59,7 @@ public class FileAttachmentGlobalize { */ public static GlobalizedMessage NoFilesAssociatedMsg() { return new GlobalizedMessage( - "com.arsdigita.cms.contentassets.no_files_associated_msg", + "cms.contentassets.file_attachment.no_files_associated_msg", "com.arsdigita.cms.contentassets.FileAttachmentResources"); } @@ -68,7 +68,7 @@ public class FileAttachmentGlobalize { */ public static GlobalizedMessage UploadNewFileLabel() { return new GlobalizedMessage( - "com.arsdigita.cms.contentassets.upload_new_file_label", + "cms.contentassets.file_attachment.upload_new_file_label", "com.arsdigita.cms.contentassets.FileAttachmentResources"); } diff --git a/ccm-cms-assets-fileattachment/src/com/arsdigita/cms/contentassets/FileAttachmentResources.properties b/ccm-cms-assets-fileattachment/src/com/arsdigita/cms/contentassets/FileAttachmentResources.properties index b1f0ca284..a35c016b8 100755 --- a/ccm-cms-assets-fileattachment/src/com/arsdigita/cms/contentassets/FileAttachmentResources.properties +++ b/ccm-cms-assets-fileattachment/src/com/arsdigita/cms/contentassets/FileAttachmentResources.properties @@ -1,8 +1,8 @@ -cms.contentassets.file_attachment_label=Attach files -cms.contentassets.file_attachment_description=Attach files -cms.contentassets.file_type_label=File Type: -cms.contentassets.no_files_associated_msg=This item does not have any associated files. -cms.contentassets.upload_new_file_label=Upload a new file -cms.contentassets.tableheader_file=File -cms.contentassets.tableheader_description=Description -com.arsdigita.cms.contentassets.file_attachment_label=File attachments +cms.contentassets.file_attachment.label=Attach files +cms.contentassets.file_attachment.description=Attach files +cms.contentassets.file_attachment.type_label=File Type: +cms.contentassets.file_attachment.no_files_associated_msg=This item does not have any associated files. +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 diff --git a/ccm-cms-assets-fileattachment/src/com/arsdigita/cms/contentassets/FileAttachmentResources_de.properties b/ccm-cms-assets-fileattachment/src/com/arsdigita/cms/contentassets/FileAttachmentResources_de.properties index c5c079f70..a2973fc13 100644 --- a/ccm-cms-assets-fileattachment/src/com/arsdigita/cms/contentassets/FileAttachmentResources_de.properties +++ b/ccm-cms-assets-fileattachment/src/com/arsdigita/cms/contentassets/FileAttachmentResources_de.properties @@ -1,8 +1,8 @@ -cms.contentassets.file_attachment_label=Dateien anf\u00fcgen -cms.contentassets.file_attachment_description=Dateien anf\u00fcgen -cms.contentassets.file_type_label=Datei Typ: -cms.contentassets.no_files_associated_msg=Diesem Dokument sind keine Dateien zum Download zugeordnet. -cms.contentassets.upload_new_file_label=Neue Datei hochladen -cms.contentassets.tableheader_file=Datei -cms.contentassets.tableheader_description=Beschreibung -com.arsdigita.cms.contentassets.file_attachment_label=Dateianh\u00e4nge +cms.contentassets.file_attachment.label=Dateien anf\u00fcgen +cms.contentassets.file_attachment.description=Dateien anf\u00fcgen +cms.contentassets.file_attachment.type_label=Datei Typ: +cms.contentassets.file_attachment.no_files_associated_msg=Diesem Dokument sind keine Dateien zum Download zugeordnet. +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 diff --git a/ccm-cms-assets-fileattachment/src/com/arsdigita/cms/contentassets/ui/FileAttachmentsStep.java b/ccm-cms-assets-fileattachment/src/com/arsdigita/cms/contentassets/ui/FileAttachmentsStep.java index 42f9d134f..8a641d22f 100755 --- a/ccm-cms-assets-fileattachment/src/com/arsdigita/cms/contentassets/ui/FileAttachmentsStep.java +++ b/ccm-cms-assets-fileattachment/src/com/arsdigita/cms/contentassets/ui/FileAttachmentsStep.java @@ -96,10 +96,13 @@ public class FileAttachmentsStep extends SecurityPropertyEditor { // The upload form. m_uploadForm = new FileAttachmentUpload(m_item); add("upload", - // XXX todo: use of tostring() is ugly and not supported API. add method - // has to be refactored to accept a GlobalizedMessage as Parameter instead - // of a plain string for the Label (2. parameter) ! - FileAttachmentGlobalize.UploadNewFileLabel().toString(), + // XXX todo: method add expects a plain string as label parameter. Use + // of tostring() is ugly and not supported API (for debugging only). + // add method has to be refactored to accept a GlobalizedMessage + // 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), m_uploadForm.getSaveCancelSection().getCancelButton());