From 93fc75c28da9f033f0226c713472de3a1c333803 Mon Sep 17 00:00:00 2001 From: pb Date: Sat, 8 Jun 2013 11:56:02 +0000 Subject: [PATCH] Verbesserung der Lokalisierung. git-svn-id: https://svn.libreccm.org/ccm/trunk@2189 8810af33-2d31-482b-a856-94f89814c4df --- .../com/arsdigita/cms/CMSResources.properties | 21 ++---- .../arsdigita/cms/CMSResources_de.properties | 23 ++----- .../cms/CMSResources_en_GB.properties | 5 ++ .../arsdigita/cms/CMSResources_fr.properties | 9 ++- .../ui/GenericAddressPropertiesStep.java | 15 ++++- .../ui/GenericAddressPropertyForm.java | 47 ++++++++----- .../ui/GenericArticlePropertiesStep.java | 20 ++++-- .../authoring/AuthoringResources.properties | 65 ------------------ .../AuthoringResources_de.properties | 66 ------------------- .../AuthoringResources_fr.properties | 63 ------------------ .../cms/ui/authoring/NewItemForm.java | 32 ++++----- .../cms/ui/authoring/PageCreate.java | 3 +- .../arsdigita/bebop/SaveCancelSection.java | 3 - .../src/com/arsdigita/bebop/form/Submit.java | 1 + .../bebop/ui/BebopResources_de.properties | 12 ++-- 15 files changed, 104 insertions(+), 281 deletions(-) delete mode 100755 ccm-cms/src/com/arsdigita/cms/ui/authoring/AuthoringResources.properties delete mode 100755 ccm-cms/src/com/arsdigita/cms/ui/authoring/AuthoringResources_de.properties delete mode 100755 ccm-cms/src/com/arsdigita/cms/ui/authoring/AuthoringResources_fr.properties diff --git a/ccm-cms/src/com/arsdigita/cms/CMSResources.properties b/ccm-cms/src/com/arsdigita/cms/CMSResources.properties index e0b06cb39..ea927e283 100755 --- a/ccm-cms/src/com/arsdigita/cms/CMSResources.properties +++ b/ccm-cms/src/com/arsdigita/cms/CMSResources.properties @@ -53,21 +53,14 @@ cms.contenttypes.no_section=No section cms.contenttypes.opening_time=Opening Time: cms.contenttypes.person_specification=Person Specification: cms.contenttypes.pressrelease_type_not_registered=PressRelease type not registered -cms.contenttypes.ref_number=Ref. Number: -cms.contenttypes.salary=Salary: cms.contenttypes.service_type_not_registered=Service type not registered cms.contenttypes.services_provided=Services Provided: -cms.contenttypes.start_date=Start Date: -cms.contenttypes.start_time=Start Time: -cms.contenttypes.subjectitems=SubjectItems: cms.contenttypes.summary=Description: cms.contenttypes.title=Page Title: cms.contenttypes.template.body_text.title=Body text cms.contenttypes.template.body_text.description=Edit the body text cms.contenttypes.shared.assign_categories.title=Assign Categories cms.contenttypes.shared.assign_categories.description=Assign Categories -cms.contenttypes.shared.attach_files.title=Attach Files -cms.contenttypes.shared.attach_files.description=Attach Files cms.contenttypes.shared.basic_properties.description=Edit Basic Properties cms.contenttypes.shared.basic_properties.title=Basic Properties cms.contenttypes.shared.body_text.title=Body Text @@ -78,8 +71,6 @@ cms.contenttypes.shared.body_text.description=Edit the Body Text # ========================================= cms.contenttypes.ui.action_item=Action Item: cms.contenttypes.ui.address=Address: -cms.contenttypes.ui.agenda_date=Agenda Date: -cms.contenttypes.ui.agenda_date_and_time=Agenda Date and Time: cms.contenttypes.ui.attendees=Attendees: cms.contenttypes.ui.bodyoverview=Body/Overview: cms.contenttypes.ui.closing_date=Closing Date: @@ -98,8 +89,6 @@ cms.contenttypes.ui.description_missing=Please enter a description cms.contenttypes.ui.description_of_minutes=Description of Minutes: cms.contenttypes.ui.end_date=End Date: cms.contenttypes.ui.end_time=End Time: -cms.contenttypes.ui.event_start_time=Event Start Time: -cms.contenttypes.ui.event_end_time=Event End Time: cms.contenttypes.ui.government_uid=Government UID: cms.contenttypes.ui.grade=Grade: cms.contenttypes.ui.homepage=Homepage: @@ -123,7 +112,6 @@ cms.contenttypes.ui.start_date=Start Date: cms.contenttypes.ui.start_time=Start Time: cms.contenttypes.ui.subject_items=Subject Items: cms.contenttypes.ui.summary=Description: -cms.contenttypes.ui.there_are_no_events=There are no events cms.contenttypes.ui.title=Title: cms.contenttypes.ui.view_image=view image @@ -260,7 +248,6 @@ cms.ui.failed_to_generate_new_id=Failed to generate a new sequence ID. cms.ui.failed_to_instantiate_authoring_component=Failed to instantiate this authoring step component: cms.ui.failed_to_retrieve=Failed to retrieve: cms.ui.failed_to_validate_title_uniqueness=Failed to validate title uniqueness -cms.ui.file=File: cms.ui.finish=Finish cms.ui.folder_browser=Folder Browser cms.ui.for=for @@ -313,7 +300,7 @@ cms.ui.search_to_add_new_members=Search to Add New Members cms.ui.search_errors.empty_terms=Please enter some search terms cms.ui.search_errors.bad_terms=Your search terms contain illegal words or characters cms.ui.search_no_results=Sorry. Your search returned 0 results. -cms.ui.select_one=--select one-- +cms.ui.select_one=-- select one -- cms.ui.sign_out=Sign out cms.ui.submission_cancelled=Submission Cancelled cms.ui.Summary=Summary @@ -371,7 +358,6 @@ cms.ui.authoring.name=Name: cms.ui.authoring.no_asset=No asset cms.ui.authoring.no_content_types_were_found=No content types were found cms.ui.authoring.no_current_wizard=No current wizard -cms.ui.authoring.none=none cms.ui.authoring.not_implemented=Not Implemented cms.ui.authoring.page_launch_date=Launch Date: cms.ui.authoring.remove_image=Remove image @@ -1116,3 +1102,8 @@ cms.ui.go_to_home_folder=Go to home folder cms.ui.no_home_folder_selected=No home folder selected cms.ui.cateogry.is_visible=Visible? cms.ui.category.is_visible=Visible? +cms.ui.authoring.file_upload.file=File: +cms.ui.authoring.file_upload.no_file=none +cms.ui.authoring.no_types_registered=No types registered +cms.ui.authoring.create_new=Create new: +cms.ui.authoring.go=Go diff --git a/ccm-cms/src/com/arsdigita/cms/CMSResources_de.properties b/ccm-cms/src/com/arsdigita/cms/CMSResources_de.properties index 370cdae86..4c8fed69d 100755 --- a/ccm-cms/src/com/arsdigita/cms/CMSResources_de.properties +++ b/ccm-cms/src/com/arsdigita/cms/CMSResources_de.properties @@ -53,21 +53,14 @@ cms.contenttypes.no_section=Kein Abschnitt cms.contenttypes.opening_time=\u00d6ffnungszeit\: cms.contenttypes.person_specification=Person Spezifikation: cms.contenttypes.pressrelease_type_not_registered=Inhaltstyp PressRelease nicht registriert -cms.contenttypes.ref_number=Ref. Nummer\: -cms.contenttypes.salary=Gehalt: cms.contenttypes.service_type_not_registered=Inhaltstyp Service nicht registriert cms.contenttypes.services_provided=Verf\u00fcgbare Services: -cms.contenttypes.start_date=Startdatum: -cms.contenttypes.start_time=Beginn um\: -cms.contenttypes.subjectitems=Themen: cms.contenttypes.summary=Beschreibung: cms.contenttypes.title=Titel: cms.contenttypes.template.body_text.title=Haupttext\: cms.contenttypes.template.body_text.description=Haupttext bearbeiten cms.contenttypes.shared.assign_categories.title=Kategorien zuweisen cms.contenttypes.shared.assign_categories.description=Kategorien zuweisen -cms.contenttypes.shared.attach_files.title=Dateien zuordnen -cms.contenttypes.shared.attach_files.description=Dateien anh\u00e4ngen cms.contenttypes.shared.basic_properties.description=Basiseigenschaften bearbeiten cms.contenttypes.shared.basic_properties.title=Basiseigenschaften cms.contenttypes.shared.body_text.title=Haupttext @@ -78,8 +71,6 @@ cms.contenttypes.shared.body_text.description=Haupttext bearbeiten # ========================================= cms.contenttypes.ui.action_item=Aktionselement: cms.contenttypes.ui.address=Adresse: -cms.contenttypes.ui.agenda_date=Zeit: -cms.contenttypes.ui.agenda_date_and_time=Datum und Zeit: cms.contenttypes.ui.attendees=Teilnehmer: cms.contenttypes.ui.bodyoverview=\u00dcbersicht\: cms.contenttypes.ui.closing_date=Abschluss am\: @@ -98,8 +89,6 @@ cms.contenttypes.ui.description_missing=Bitte eine Beschreibung eingeben cms.contenttypes.ui.description_of_minutes=Beschreibung der Tagesordnungspunkte: cms.contenttypes.ui.end_date=Enddatum: cms.contenttypes.ui.end_time=Ende um\: -cms.contenttypes.ui.event_start_time=Veranstaltungsbeginn um: -cms.contenttypes.ui.event_end_time=Veranstaltungsende um: cms.contenttypes.ui.government_uid=Government UID: cms.contenttypes.ui.grade=Stufe: cms.contenttypes.ui.homepage=Homepage: @@ -123,7 +112,6 @@ cms.contenttypes.ui.start_date=Anfangsdatum: cms.contenttypes.ui.start_time=Anfangszeit: cms.contenttypes.ui.subject_items=Thema Items: cms.contenttypes.ui.summary=Beschreibung: -cms.contenttypes.ui.there_are_no_events=Keine Ereignisse vorhanden cms.contenttypes.ui.title=Titel: cms.contenttypes.ui.view_image=Bild anzeigen @@ -259,7 +247,6 @@ cms.ui.failed_to_generate_new_id=Fehler beim Erzeugen einer neuen Sequenz-ID. cms.ui.failed_to_instantiate_authoring_component=Fehler beim Instanzieren des Bearbeitsschritts: cms.ui.failed_to_retrieve=Fehler beim Laden: cms.ui.failed_to_validate_title_uniqueness=Konnte Eindeutigkeit des Titels nicht verifizieren -cms.ui.file=Datei: cms.ui.finish=Beenden cms.ui.folder_browser=Ordner durchsehen cms.ui.for=f\u00fcr @@ -305,14 +292,14 @@ cms.ui.remove=Entfernen cms.ui.reports=Berichte cms.ui.restore_default_permissions=Standardrechte wiederherstellen cms.ui.roles=Rollen -cms.ui.save=Sichern +cms.ui.save=Speichern cms.ui.search=Suche cms.ui.search_prompt=Suche um neue Mitglieder zu erg\u00e4nzen cms.ui.search_to_add_new_members=Suche um neue Mitglieder zu erg\u00e4nzen cms.ui.search_errors.empty_terms=Bitte Suchbegriffe eingeben cms.ui.search_errors.bad_terms=Your search terms contain illegal words or characters cms.ui.search_no_results=Ihre Suche ergab leider keine Treffer. -cms.ui.select_one=--ausw\u00e4hlen-- +cms.ui.select_one=-- Bitte ausw\u00e4hlen -- cms.ui.sign_out=Abmelden cms.ui.submission_cancelled=Prozess abgebrochen cms.ui.Summary=Zusammenfassung @@ -383,7 +370,6 @@ cms.ui.authoring.upload_a_new_image=Neues Bild hochladen cms.ui.authoring.upload_image=Bild hochladen: cms.ui.authoring.file_upload.auto_detect=(automatisch) cms.ui.authoring.file_upload.file_type=Dateityp: -cms.ui.authoring.none=niemand cms.ui.authoring.workflow=Arbeitsablauf w\u00e4hlen @@ -1108,3 +1094,8 @@ cms.ui.go_to_home_folder=Zum Start-Ordner cms.ui.no_home_folder_selected=Kein Start-Ordner festgelegt cms.ui.cateogry.is_visible=Sichtbar? cms.ui.category.is_visible=Sichtbar? +cms.ui.authoring.file_upload.file=Datei: +cms.ui.authoring.file_upload.no_file=keine +cms.ui.authoring.no_types_registered=Keine Typen registriert +cms.ui.authoring.create_new=Neuer Inhalt: +cms.ui.authoring.go=Anlegen diff --git a/ccm-cms/src/com/arsdigita/cms/CMSResources_en_GB.properties b/ccm-cms/src/com/arsdigita/cms/CMSResources_en_GB.properties index 38de21210..8083ba39a 100755 --- a/ccm-cms/src/com/arsdigita/cms/CMSResources_en_GB.properties +++ b/ccm-cms/src/com/arsdigita/cms/CMSResources_en_GB.properties @@ -61,3 +61,8 @@ cms.ui.no_home_folder_selected=No home folder selected cms.ui.contentcenter.action=Action cms.ui.cateogry.is_visible= cms.ui.category.is_visible= +cms.ui.authoring.file_upload.file=File: +cms.ui.authoring.file_upload.no_file=none +cms.ui.authoring.no_types_registered=No types registered +cms.ui.authoring.create_new=Create new: +cms.ui.authoring.go=Go diff --git a/ccm-cms/src/com/arsdigita/cms/CMSResources_fr.properties b/ccm-cms/src/com/arsdigita/cms/CMSResources_fr.properties index a3a94b57b..88bc8bfbf 100755 --- a/ccm-cms/src/com/arsdigita/cms/CMSResources_fr.properties +++ b/ccm-cms/src/com/arsdigita/cms/CMSResources_fr.properties @@ -34,7 +34,6 @@ cms.contenttypes.service_type_not_registered=Type de service non enregistr\u00e9 # ========================================= cms.contenttypes.ui.action_item=Action de l'\u00e9l\u00e9ment cms.contenttypes.ui.address=Addresse -cms.contenttypes.ui.agenda_date_and_time=Date et heure de l'agenda cms.contenttypes.ui.attendees=Participants cms.contenttypes.ui.bodyoverview=Corps / Vue d'ensemble cms.contenttypes.ui.closing_date=Date de cl\u00f4ture @@ -64,7 +63,6 @@ cms.contenttypes.ui.salary=Salaire cms.contenttypes.ui.services_provided=Services propos\u00e9s cms.contenttypes.ui.summary=R\u00e9sum\u00e9 cms.contenttypes.ui.summary=R\u00e9sum\u00e9 -cms.contenttypes.ui.there_are_no_events=Il n'y a aucun \u00e9venement cms.contenttypes.ui.title=Titre de la page cms.contenttypes.ui.view_image=voir l'image @@ -567,7 +565,7 @@ cms.ui.item_search.flatBrowse=Select item cms.ui.category.undeletable=This category can't be deleted. cms.ui.item_search.flat.filter.submit=Filter cms.ui.item_search.selected=Selected content item (id) -cms.ui.item_search.create=Create new +cms.ui.item_search.create=Cr\u00e9er cms.ui.item_search.create.folder_select=Select folder cms.ui.image_library=Image Library cms.ui.image_upload=Upload Image @@ -588,3 +586,8 @@ cms.ui.go_to_home_folder= cms.ui.no_home_folder_selected=No home folder selected cms.ui.cateogry.is_visible= cms.ui.category.is_visible= +cms.ui.authoring.file_upload.file=File: +cms.ui.authoring.file_upload.no_file=aucun +cms.ui.authoring.no_types_registered=Pas de types enregistr\u00e9 +cms.ui.authoring.create_new=Cr\u00e9er un nouveau: +cms.ui.authoring.go=Go diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericAddressPropertiesStep.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericAddressPropertiesStep.java index d82fc5687..f97078bff 100644 --- a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericAddressPropertiesStep.java +++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericAddressPropertiesStep.java @@ -35,12 +35,21 @@ import com.arsdigita.cms.util.GlobalizationUtil; import java.text.DateFormat; +/** + * + * + */ public class GenericAddressPropertiesStep extends SimpleEditStep { public static final String EDIT_SHEET_NAME = "edit"; + /** + * + * @param itemModel + * @param parent + */ public GenericAddressPropertiesStep(ItemSelectionModel itemModel, - AuthoringKitWizard parent) { + AuthoringKitWizard parent) { super(itemModel, parent); setDefaultEditKey(EDIT_SHEET_NAME); @@ -61,10 +70,10 @@ public class GenericAddressPropertiesStep extends SimpleEditStep { public static Component getAddressPropertySheet(ItemSelectionModel itemModel) { DomainObjectPropertySheet sheet = new DomainObjectPropertySheet(itemModel); - sheet.add(GlobalizationUtil - .globalize("cms.contenttypes.ui.name"), GenericAddress.NAME); sheet.add(GlobalizationUtil .globalize("cms.contenttypes.ui.title"), GenericAddress.TITLE); + sheet.add(GlobalizationUtil + .globalize("cms.contenttypes.ui.name"), GenericAddress.NAME); sheet.add(ContenttypesGlobalizationUtil .globalize("cms.contenttypes.ui.address.address"), GenericAddress.ADDRESS); diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericAddressPropertyForm.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericAddressPropertyForm.java index 630dfea26..ed18ceaef 100644 --- a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericAddressPropertyForm.java +++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericAddressPropertyForm.java @@ -40,6 +40,7 @@ import com.arsdigita.cms.ItemSelectionModel; import com.arsdigita.cms.contenttypes.GenericAddress; import com.arsdigita.cms.contenttypes.util.ContenttypesGlobalizationUtil; import com.arsdigita.cms.ui.authoring.BasicPageForm; +import com.arsdigita.cms.util.GlobalizationUtil; import java.util.Iterator; import java.util.Map; import org.apache.log4j.Logger; @@ -50,7 +51,10 @@ import org.apache.log4j.Logger; * @author: Jens Pelzetter * @author: Sören Bernstein */ -public class GenericAddressPropertyForm extends BasicPageForm implements FormProcessListener, FormInitListener, FormSubmissionListener { +public class GenericAddressPropertyForm extends BasicPageForm + implements FormProcessListener, + FormInitListener, + FormSubmissionListener { private static final Logger s_log = Logger.getLogger(GenericAddressPropertyForm.class); private GenericAddressPropertiesStep m_step; @@ -113,7 +117,7 @@ public class GenericAddressPropertyForm extends BasicPageForm implements FormPro SingleSelect country = new SingleSelect(countryParam); country.addOption(new Option("", - new Label(ContenttypesGlobalizationUtil + new Label(GlobalizationUtil .globalize("cms.ui.select_one")))); Iterator countries = GenericAddress.getSortedListOfCountries(null) @@ -125,27 +129,30 @@ public class GenericAddressPropertyForm extends BasicPageForm implements FormPro elem.getKey().toString())); } - country.addValidationListener( - new ParameterListener() { + country.addValidationListener(new ParameterListener() { - public void validate(ParameterEvent e) - throws FormProcessException { - ParameterData data = e.getParameterData(); - String isoCode = (String) data.getValue(); - s_log.debug("ISO code is : " + isoCode); - if (isoCode == null || isoCode.length() == 0) { - data.addError((String) ContenttypesGlobalizationUtil - .globalize("cms.contenttypes.ui.address.error_iso_country") - .localize()); - } - } - }); + public void validate(ParameterEvent e) + throws FormProcessException { + ParameterData data = e.getParameterData(); + String isoCode = (String) data.getValue(); + s_log.debug("ISO code is : " + isoCode); + if (isoCode == null || isoCode.length() == 0) { + data.addError((String) ContenttypesGlobalizationUtil + .globalize("cms.contenttypes.ui.address.error_iso_country") + .localize()); + } + } + }); add(country); } } + /** + * + * @param fse + */ public void init(FormSectionEvent fse) { FormData data = fse.getFormData(); GenericAddress address = (GenericAddress) super.initBasicWidgets(fse); @@ -159,6 +166,10 @@ public class GenericAddressPropertyForm extends BasicPageForm implements FormPro } } + /** + * + * @param fse + */ public void submitted(FormSectionEvent fse) { if (m_step != null && getSaveCancelSection().getCancelButton().isSelected(fse.getPageState())) { @@ -166,6 +177,10 @@ public class GenericAddressPropertyForm extends BasicPageForm implements FormPro } } + /** + * + * @param fse + */ public void process(FormSectionEvent fse) { FormData data = fse.getFormData(); diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericArticlePropertiesStep.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericArticlePropertiesStep.java index c33f5f410..7adb64522 100755 --- a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericArticlePropertiesStep.java +++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericArticlePropertiesStep.java @@ -46,7 +46,8 @@ public class GenericArticlePropertiesStep extends SimpleEditStep { public static String EDIT_SHEET_NAME = "edit"; DomainObjectPropertySheet get; - public GenericArticlePropertiesStep(ItemSelectionModel itemModel, AuthoringKitWizard parent) { + public GenericArticlePropertiesStep(ItemSelectionModel itemModel, + AuthoringKitWizard parent) { super(itemModel, parent); setDefaultEditKey(EDIT_SHEET_NAME); @@ -58,7 +59,10 @@ public class GenericArticlePropertiesStep extends SimpleEditStep { protected void createEditSheet(ItemSelectionModel itemModel) { BasicPageForm editSheet; editSheet = new GenericArticlePropertyForm(itemModel, this); - add(EDIT_SHEET_NAME, "Edit", new WorkflowLockedComponentAccess(editSheet, itemModel), editSheet.getSaveCancelSection().getCancelButton()); + add(EDIT_SHEET_NAME, + "Edit", + new WorkflowLockedComponentAccess(editSheet, itemModel), + editSheet.getSaveCancelSection().getCancelButton()); } protected void setDisplayComponent(ItemSelectionModel itemModel) { @@ -76,8 +80,10 @@ public class GenericArticlePropertiesStep extends SimpleEditStep { public static Component getGenericArticlePropertySheet(ItemSelectionModel itemModel) { DomainObjectPropertySheet sheet = new DomainObjectPropertySheet(itemModel); - sheet.add(GlobalizationUtil.globalize("cms.contenttypes.ui.name"), GenericArticle.NAME); - sheet.add(GlobalizationUtil.globalize("cms.contenttypes.ui.title"), GenericArticle.TITLE); + sheet.add(GlobalizationUtil.globalize("cms.contenttypes.ui.title"), + GenericArticle.TITLE); + sheet.add(GlobalizationUtil.globalize("cms.contenttypes.ui.name"), + GenericArticle.NAME); if (!ContentSection.getConfig().getHideLaunchDate()) { sheet.add(GlobalizationUtil.globalize("cms.contenttypes.ui.launch_date"), ContentPage.LAUNCH_DATE, @@ -88,9 +94,11 @@ public class GenericArticlePropertiesStep extends SimpleEditStep { PageState state) { ContentPage page = (ContentPage) item; if (page.getLaunchDate() != null) { - return DateFormat.getDateInstance(DateFormat.LONG).format(page.getLaunchDate()); + return DateFormat.getDateInstance(DateFormat.LONG) + .format(page.getLaunchDate()); } else { - return (String) GlobalizationUtil.globalize("cms.ui.unknown").localize(); + return (String) GlobalizationUtil.globalize( + "cms.ui.unknown").localize(); } } }); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/authoring/AuthoringResources.properties b/ccm-cms/src/com/arsdigita/cms/ui/authoring/AuthoringResources.properties deleted file mode 100755 index 7092e300b..000000000 --- a/ccm-cms/src/com/arsdigita/cms/ui/authoring/AuthoringResources.properties +++ /dev/null @@ -1,65 +0,0 @@ -COMMENT.00=BUTTON/LINK LABELS -cms.ui.authoring.save=Save -cms.ui.authoring.create=Create -cms.ui.authoring.cancel=Cancel -cms.ui.authoring.edit=Edit -cms.ui.authoring.remove=Remove - -COMMENT.01=CONTENT TYPES -Article_with_Image=Article with Image -Page_with_Editor=Page with Editor -Department_Page=Department Page -Folder=Folder -Link_List=Link List -Link=Link - -cms.ui.authoring.no_types_registered=No types registered -cms.ui.authoring.create_new=Create new: -cms.ui.authoring.go=Go - -COMMENT.05=ERROR MESSAGES -cms.ui.authoring.lifecycle_date_error_msg=The lifecycle start date must come before the lifecycle end date. -cms.ui.authoring.failed_to_fetch_content_type=Failed to fetch content type for -cms.ui.authoring.authoring_kit_has_no_steps=This authoring kit has no steps: -cms.ui.authoring.authoring_kit_has_more_than_one_step=This authoring kit has more than one step: -cms.ui.authoring.failed_to_find_java_class_for_authoring_component=Failed to find the Java class for this authoring step component: -cms.ui.authoring.failed_to_instantiate_authoring_component=Failed to instantiate this authoring step component: -cms.ui.authoring.item_name_already_in_folder=That title is already in use by another item in this folder: -cms.ui.authoring.failed_to_validate_title_uniqueness=Failed to validate title uniqueness -cms.ui.authoring.failed_to_generate_new_id=Failed to generate a new sequence ID. -cms.ui.authoring.failed_to_create_new_dp_item=Failed to create a new DP Item. -cms.ui.authoring.workflow_profile_exists_on_selected_folder=Workflow Profile exists on selected folder -cms.ui.authoring.user_not_found=User not found -cms.ui.authoring.cannot_assign_groups_to_owner=cannot assign groups to owner -cms.ui.authoring.failed_to_retrieve=Failed to retrieve: - - -COMMENT.10=BASIC METADATA -cms.ui.authoring.name=Name -cms.ui.authoring.owner=Owner -cms.ui.authoring.none=none -cms.ui.authoring.location=Location -cms.ui.authoring.title=Title -cms.ui.authoring.description=Description -cms.ui.authoring.subject_classes=Subject classes -cms.ui.authoring.caption=Caption -cms.ui.authoring.alt=Alt - -COMMENT.20=ADVANCED METADATA -cms.ui.authoring.title_en=Title (english) -cms.ui.authoring.description_en=Description (english) -cms.ui.authoring.authors=Author(s) -cms.ui.authoring.owner=Owner -cms.ui.authoring.created_by=Created by -cms.ui.authoring.contact=Contact -cms.ui.authoring.lifecycle_start=Lifecycle start date -cms.ui.authoring.lifecycle_end=Lifecycle end date -cms.ui.authoring.created_on=Created on -cms.ui.authoring.last_modified_on=Last Modified On -cms.ui.authoring.published_on=Published on -cms.ui.authoring.version_number=Version # -cms.ui.authoring.document_type=Document type -cms.ui.authoring.format=Format -cms.ui.authoring.security_class=Security class -cms.ui.authoring.failed_to_upload_image=Failed to upload image -cms.ui.authoring.choose_contact=Kontakt ausw\u00e4hlen diff --git a/ccm-cms/src/com/arsdigita/cms/ui/authoring/AuthoringResources_de.properties b/ccm-cms/src/com/arsdigita/cms/ui/authoring/AuthoringResources_de.properties deleted file mode 100755 index 1792ea092..000000000 --- a/ccm-cms/src/com/arsdigita/cms/ui/authoring/AuthoringResources_de.properties +++ /dev/null @@ -1,66 +0,0 @@ -COMMENT.00=BUTTON/LINK LABELS -cms.ui.authoring.save=Speichern -cms.ui.authoring.create=Anlegen -cms.ui.authoring.cancel=Abbruch -cms.ui.authoring.edit=Ändern -cms.ui.authoring.remove=Löschen - -COMMENT.01=CONTENT TYPES -Article_with_Image=Artikel mit Bild -Page_with_Editor=Seite mit Editor -Department_Page=Abteilungsseite -Folder=Verzeichnis -Link_List=Linkliste -Link=Link - -cms.ui.authoring.no_types_registered=Keine Typen registriert -cms.ui.authoring.create_new=Neuer Inhalt: -cms.ui.authoring.go=Anlegen - -COMMENT.05=ERROR MESSAGES -cms.ui.authoring.lifecycle_date_error_msg=Das Anfangsdatum muss vor dem Enddatum liegen -cms.ui.authoring.item_name_already_in_folder=Dieses Verzeichnis enthät bereits einen Inhalt mit diesem Titel -cms.ui.authoring.failed_to_validate_title_uniqueness=Titel bereits vorhanden -cms.ui.authoring.failed_to_upload_image=Konnte Bild nicht hochladen -cms.ui.authoring.failed_to_fetch_content_type=Inhaltstyp konnte nicht ermittelt werden f\u00FCr -cms.ui.authoring.authoring_kit_has_no_steps=Dieser Authorenkit hat keine Unterteilung -cms.ui.authoring.authoring_kit_has_more_than_one_step=Dieser Authorenkit hat mehr als eine Unterteilung -cms.ui.authoring.none=Nichts -cms.ui.authoring.failed_to_find_java_class_for_authoring_component=Die Java-Klasse f\u00FCr diesen Authorenschritt konnte nicht ermittelt werden -cms.ui.authoring.failed_to_instantiate_authoring_component=Die Komponente f\u00FCr diesen Authorenschritt konnte nicht erzeugt werden -cms.ui.authoring.failed_to_generate_new_id=Konnte keine neue ID generieren. -cms.ui.authoring.failed_to_create_new_dp_item=Konnte neuen Inhalt nicht anlegen. -cms.ui.authoring.workflow_profile_exists_on_selected_folder=Dieses Verzeichnis besitzt bereits ein Workflowprofil -cms.ui.authoring.user_not_found=Benutzer nicht gefunden -cms.ui.authoring.cannot_assign_groups_to_owner=Gruppen können nicht als Verantwortlicher verwendet werden -cms.ui.authoring.failed_to_retrieve=Fehler beim Laden: - - -COMMENT.10=BASIC METADATA -cms.ui.authoring.name=Name -cms.ui.authoring.owner=Verantwortlicher -cms.ui.authoring.none=niemand -cms.ui.authoring.location=Pfad -cms.ui.authoring.title=Titel -cms.ui.authoring.description=Beschreibung -cms.ui.authoring.subject_classes=Themenklasse -cms.ui.authoring.caption=Unterschrift -cms.ui.authoring.alt=Alternativtext - -COMMENT.20=ADVANCED METADATA -cms.ui.authoring.title_en=Englischer Titel -cms.ui.authoring.description_en=Englische Beschreibung -cms.ui.authoring.authors=Autor(en) -cms.ui.authoring.owner=Inhaltsverantwortlicher -cms.ui.authoring.created_by=Angelegt von -cms.ui.authoring.contact=Kontakt -cms.ui.authoring.choose_contact=Wählen Sie einen Kontakt aus -cms.ui.authoring.lifecycle_start=Veröffentlichungsbeginn -cms.ui.authoring.lifecycle_end=Veröffentlichungsende -cms.ui.authoring.created_on=Angelegt am -cms.ui.authoring.last_modified_on=Zuletzt geändert am -cms.ui.authoring.published_on=Veröffentlicht am -cms.ui.authoring.version_number=Versionsnr. -cms.ui.authoring.document_type=Dokumenttyp -cms.ui.authoring.format=Format -cms.ui.authoring.security_class=Sicherheitsklasse diff --git a/ccm-cms/src/com/arsdigita/cms/ui/authoring/AuthoringResources_fr.properties b/ccm-cms/src/com/arsdigita/cms/ui/authoring/AuthoringResources_fr.properties deleted file mode 100755 index 938218bb2..000000000 --- a/ccm-cms/src/com/arsdigita/cms/ui/authoring/AuthoringResources_fr.properties +++ /dev/null @@ -1,63 +0,0 @@ -COMMENT.00=LIBELLE DES BOUTONS ET DES LIENS -cms.ui.authoring.save=Enregistrer -cms.ui.authoring.create=Créer -cms.ui.authoring.cancel=Effacer -cms.ui.authoring.edit=Modifier -cms.ui.authoring.remove=Retirer - -COMMENT.01=TYPES DE CONTENU -Article_with_Image=Article avec image -Page_with_Editor=Page avec éditeur -Department_Page=Page de département -Folder=Dossier -Link_List=Liste de liens -Link=Liens - -cms.ui.authoring.no_types_registered=Pas de types enregistré -cms.ui.authoring.create_new=Créer un nouveau: -cms.ui.authoring.go=Go - -COMMENT.05=ERROR MESSAGES -cms.ui.authoring.lifecycle_date_error_msg=La date de début du cycle de vie doit précéder la date de fin. -cms.ui.authoring.failed_to_fetch_content_type=Echec dans la recherche de type de contenu pour -cms.ui.authoring.authoring_kit_has_no_steps=Il n'y a pas d'étape dans ce kit auteur: -cms.ui.authoring.authoring_kit_has_more_than_one_step=Ce kit auteur contient plus d'une étape: -cms.ui.authoring.failed_to_find_java_class_for_authoring_component=Echec dans la recherche de la classe Java de cette étape du kit auteur: -cms.ui.authoring.failed_to_instantiate_authoring_component=Echec du lancement de cette étape du kit auteur: -cms.ui.authoring.item_name_already_in_folder=Ce titre est déjà utilisé par un autre élément de ce dossier: -cms.ui.authoring.failed_to_validate_title_uniqueness=Echec de la validation de l'unicité de ce titre -cms.ui.authoring.failed_to_generate_new_id=Echec à la génération d'un nouvel identifiant de séquence. -cms.ui.authoring.failed_to_create_new_dp_item=Echec à la création d'un nouvel élément DP. -cms.ui.authoring.workflow_profile_exists_on_selected_folder=Profil de Workflow existant dans le dossier sélectionné -cms.ui.authoring.user_not_found=Utilisateur non trouvé -cms.ui.authoring.cannot_assign_groups_to_owner=impossible d'affecter un groupe à son propriétaire -cms.ui.authoring.failed_to_retrieve=Echec de récupération: - - -COMMENT.10=META DONNEES DE BASE -cms.ui.authoring.name=Nom -cms.ui.authoring.owner=Propriétaire -cms.ui.authoring.none=aucun -cms.ui.authoring.location=Lieu -cms.ui.authoring.title=Titre -cms.ui.authoring.description=Description -cms.ui.authoring.subject_classes=Classes objet -cms.ui.authoring.caption=Légende -cms.ui.authoring.alt=Alt - -COMMENT.20=META DONNEES AVANCEES -cms.ui.authoring.title_en=Titre (en anglais) -cms.ui.authoring.description_en=Description (en anglais) -cms.ui.authoring.authors=Auteur(s) -cms.ui.authoring.owner=Propriétaire -cms.ui.authoring.created_by=Créé par -cms.ui.authoring.contact=Contact -cms.ui.authoring.lifecycle_start=Date de début du cycle de vie -cms.ui.authoring.lifecycle_end=Date de fin du cycle de vie -cms.ui.authoring.created_on=Créé le -cms.ui.authoring.last_modified_on=Modifié le -cms.ui.authoring.published_on=Publié le -cms.ui.authoring.version_number=Numéro de version -cms.ui.authoring.document_type=Type de document -cms.ui.authoring.format=Format -cms.ui.authoring.security_class=Classe de sécurité diff --git a/ccm-cms/src/com/arsdigita/cms/ui/authoring/NewItemForm.java b/ccm-cms/src/com/arsdigita/cms/ui/authoring/NewItemForm.java index b59009fa1..21a80525f 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/authoring/NewItemForm.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/authoring/NewItemForm.java @@ -34,8 +34,8 @@ import com.arsdigita.cms.ContentType; import com.arsdigita.cms.ContentTypeCollection; import com.arsdigita.cms.SecurityManager; import com.arsdigita.cms.ui.ItemSearch; +import com.arsdigita.cms.util.GlobalizationUtil; import com.arsdigita.domain.DataObjectNotFoundException; -import com.arsdigita.globalization.GlobalizedMessage; import com.arsdigita.kernel.Kernel; import com.arsdigita.kernel.Party; import com.arsdigita.kernel.permissions.PermissionDescriptor; @@ -57,8 +57,6 @@ import java.math.BigDecimal; */ public abstract class NewItemForm extends Form { - public static final String RESOURCE_BUNDLE = - "com.arsdigita.cms.ui.authoring.AuthoringResources"; public static String DP_TYPE_PREFIX = "com.arsdigita.dp."; private SingleSelect m_typeWidget; private Submit m_submit; @@ -79,11 +77,15 @@ public abstract class NewItemForm extends Form { panel.setWidth("2%"); panel.setBorder(0); - m_emptyLabel = new Label(globalize("cms.ui.authoring.no_types_registered"), false); + m_emptyLabel = new Label(GlobalizationUtil + .globalize("cms.ui.authoring.no_types_registered"), + false); m_emptyLabel.setIdAttr("empty_label"); panel.add(m_emptyLabel); - m_createLabel = new Label(globalize("cms.ui.authoring.create_new"), false); + m_createLabel = new Label(GlobalizationUtil + .globalize("cms.ui.authoring.create_new"), + false); m_createLabel.setIdAttr("create_label"); panel.add(m_createLabel); @@ -99,7 +101,10 @@ public abstract class NewItemForm extends Form { ContentSection section = getContentSection(state); ContentType parentType = null; ContentTypeCollection typesCollection = null; - BigDecimal singleTypeID = (BigDecimal) state.getValue(new BigDecimalParameter(ItemSearch.SINGLE_TYPE_PARAM)); + BigDecimal singleTypeID = (BigDecimal) + state.getValue(new + BigDecimalParameter( + ItemSearch.SINGLE_TYPE_PARAM)); if (singleTypeID != null) { try { @@ -147,7 +152,7 @@ public abstract class NewItemForm extends Form { String l = type.getLabel(); if (cn.startsWith(DP_TYPE_PREFIX, 0)) { o.addOption(new Option(type.getID().toString(), - new Label(globalize(l.replace(' ', '_'))))); + new Label(GlobalizationUtil.globalize(l.replace(' ', '_'))))); } else { o.addOption(new Option(type.getID().toString(), type.getLabel())); } @@ -164,7 +169,8 @@ public abstract class NewItemForm extends Form { panel.add(m_typeWidget); - m_submit = new Submit("new", globalize("cms.ui.authoring.go")); + m_submit = new Submit("new", GlobalizationUtil.globalize( + "cms.ui.authoring.go")); panel.add(m_submit); add(panel); @@ -199,14 +205,4 @@ public abstract class NewItemForm extends Form { super.generateXML(state, parent); } } - - /** - * Getting the GlobalizedMessage using a CMS Class targetBundle. - * - * @param key The resource key - * @pre ( key != null ) - */ - public static GlobalizedMessage globalize(String key) { - return new GlobalizedMessage(key, RESOURCE_BUNDLE); - } } diff --git a/ccm-cms/src/com/arsdigita/cms/ui/authoring/PageCreate.java b/ccm-cms/src/com/arsdigita/cms/ui/authoring/PageCreate.java index a86b21831..46322ef19 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/authoring/PageCreate.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/authoring/PageCreate.java @@ -93,8 +93,9 @@ public class PageCreate extends BasicPageForm @Override protected void addWidgets() { - /* Add workflow selection */ + /* Retrieve Content Type */ ContentType type = getItemSelectionModel().getContentType(); + /* Add workflow selection based on configured Content Type */ m_workflowSection = new ApplyWorkflowFormSection(type); add(m_workflowSection, ColumnPanel.INSERT); /* content type */ diff --git a/ccm-core/src/com/arsdigita/bebop/SaveCancelSection.java b/ccm-core/src/com/arsdigita/bebop/SaveCancelSection.java index c98fc5c5e..e9de84a03 100755 --- a/ccm-core/src/com/arsdigita/bebop/SaveCancelSection.java +++ b/ccm-core/src/com/arsdigita/bebop/SaveCancelSection.java @@ -18,9 +18,6 @@ */ package com.arsdigita.bebop; -import com.arsdigita.bebop.FormSection; -import com.arsdigita.bebop.BoxPanel; -import com.arsdigita.bebop.Container; import com.arsdigita.bebop.form.Submit; import com.arsdigita.bebop.util.GlobalizationUtil; diff --git a/ccm-core/src/com/arsdigita/bebop/form/Submit.java b/ccm-core/src/com/arsdigita/bebop/form/Submit.java index 72d5bb2fd..7aad13e46 100755 --- a/ccm-core/src/com/arsdigita/bebop/form/Submit.java +++ b/ccm-core/src/com/arsdigita/bebop/form/Submit.java @@ -136,6 +136,7 @@ public class Submit extends Widget { *

* * @param buttonLabel The label that shows up on the button. + * @deprecated Refactor to use setButtonLabel(GlobalizedMessage) instead */ public void setButtonLabel(String buttonLabel) { setButtonLabel(new GlobalizedMessage(buttonLabel)); diff --git a/ccm-core/src/com/arsdigita/bebop/ui/BebopResources_de.properties b/ccm-core/src/com/arsdigita/bebop/ui/BebopResources_de.properties index 7288e3ab2..9a999e91c 100644 --- a/ccm-core/src/com/arsdigita/bebop/ui/BebopResources_de.properties +++ b/ccm-core/src/com/arsdigita/bebop/ui/BebopResources_de.properties @@ -70,23 +70,23 @@ bebop.demo.workflow.add_template=add template bebop.page=Seite: bebop.previous=Zur\u00fcck bebop.next=Weiter -bebop.please_select_choice_from_the_list_on_the_left=Please select choice from the list on the left +bebop.please_select_choice_from_the_list_on_the_left=Bitte eine Auswahl aus der Liste links treffen bebop.send_email_to_everybody=Sende E-Mail an alle -bebop.basic_item_metadata=Basic Item Metadata +bebop.basic_item_metadata=Basis Metadaten bebop.title=Titel: -bebop.click_here=click here +bebop.click_here=Hier klicken bebop.demo.foo_is_null=foo is null. bebop.demo.this_link_showshides_the_blurb=This link shows/hides the Blurb bebop.demo.no_action=no action -bebop.event.default_text=Default text +bebop.event.default_text=Default Text bebop.event.call_no=Call no. bebop.first_name=Vorname: bebop.last_name=Nachname: -bebop.hello_world=Hello World +bebop.hello_world=Hallo Welt bebop.edit_the_foo_property=Edit the Foo property bebop.table.=  bebop.the_table_is_empty=The table is empty -bebop.util.some_text=Some Text +bebop.util.some_text=Beliebiger Text bebop.subject=Betreff bebop.body=Body bebop.are_you_sure=Sind Sie sicher?