diff --git a/ccm-cms/src/com/arsdigita/cms/CMSGlobalized.java b/ccm-cms/src/com/arsdigita/cms/CMSGlobalized.java
index 5144579dc..ea322c3f3 100755
--- a/ccm-cms/src/com/arsdigita/cms/CMSGlobalized.java
+++ b/ccm-cms/src/com/arsdigita/cms/CMSGlobalized.java
@@ -34,6 +34,6 @@ public interface CMSGlobalized extends Globalized {
/*
* We use one central resource file per language for all of CMS:
*/
- public static final String BUNDLE_NAME = "com.arsdigita.cms.ui.CMSResources";
+ public static final String BUNDLE_NAME = "com.arsdigita.cms.CMSResources";
}
diff --git a/ccm-cms/src/com/arsdigita/cms/ui/CMSResources.properties b/ccm-cms/src/com/arsdigita/cms/CMSResources.properties
similarity index 97%
rename from ccm-cms/src/com/arsdigita/cms/ui/CMSResources.properties
rename to ccm-cms/src/com/arsdigita/cms/CMSResources.properties
index 56ad542fa..514fd7da6 100755
--- a/ccm-cms/src/com/arsdigita/cms/ui/CMSResources.properties
+++ b/ccm-cms/src/com/arsdigita/cms/CMSResources.properties
@@ -3,6 +3,12 @@ cms.attributeset_is_locked=AttributeSet is locked
cms.cannot_create_xml_document=Cannot create XML document
cms.cant_promote_folders=Can't promote folders
cms.classnotfoundexception=ClassNotFoundException:
+cms.illegalaccessexception=IllegalAccessException:
+cms.instantiationexception=InstantiationException:
+cms.nosuchmethodexception=NoSuchMethodException:
+cms.templates=Templates
+cms.title=Title
+
cms.contenttypes.contact=Contact:
cms.contenttypes.contact_details=Contact Details:
cms.contenttypes.contact_information=Contact Information:
@@ -14,10 +20,7 @@ cms.contenttypes.department=Department:
cms.contenttypes.end_date=End Date:
cms.contenttypes.end_time=End Time:
cms.contenttypes.event_type_not_registered=Event type not registered
-cms.ui.item.days=days
-cms.ui.item.notification_period=Notify in advance:
-cms.ui.item.notification_period_before_start=The period for advance notification must not be longer than the publishing period.
-cms.ui.item.hours=hours
+
#used in ccm-cms-types-job
cms.contenttypes.grade=Grade:
#used in ccm-cms-types-organization
@@ -48,8 +51,10 @@ cms.contenttypes.start_date=Start Date:
cms.contenttypes.start_time=Start Time:
cms.contenttypes.subjectitems=SubjectItems:
cms.contenttypes.summary=Description:
-cms.contenttypes.title=Title:
+cms.contenttypes.title=Title:
+
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:
@@ -70,6 +75,8 @@ 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?
@@ -96,24 +103,25 @@ 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
-cms.contenttypes.ui.event_start_time=Event Start Time:
-cms.contenttypes.ui.event_end_time=Event End Time:
+cms.contenttypes.ui.view_image=view image
+
cms.dispatcher.cannot_find_domain_object=cannot find domain object
cms.dispatcher.could_not_find_imageasset=Could not find ImageAsset:
cms.dispatcher.failed_to_retrieve_imageasset=Failed to retrieve ImageAsset:
cms.dispatcher.no_permission_to_access_resource=no permission to access resource
cms.dispatcher.not_implemented=not implemented
-cms.dispatcher.unknown_context=Unknown context:
+cms.dispatcher.unknown_context=Unknown context:
+
cms.formbuilder.cannot_create_acsobject=cannot create ACSObject
cms.formbuilder.cannot_instantiate_object=cannot instantiate object
cms.formbuilder.no_such_form=no such form
cms.formbuilder.roll_me_back=Roll me back
cms.formbuilder.css=Cascading Style Sheet (CSS) Class Attribute
-cms.illegalaccessexception=IllegalAccessException:
+
cms.image.erroneous_jpeg_marker_length=Erroneous JPEG marker length
cms.image.expected_soi_marker_first=Expected SOI marker first
-cms.image.not_a_jpeg_file=Not a JPEG file
+cms.image.not_a_jpeg_file=Not a JPEG file
+
cms.installer.approval=Approval
cms.installer.article=Article
cms.installer.authoring=Authoring
@@ -125,20 +133,19 @@ cms.installer.cannot_read_line_of_data=Cannot read line of data
cms.installer.cannot_set_template_text=Cannot set template text
cms.installer.could_not_load_section=Could not load ContentSection named '{0}'
cms.installer.deploy=Deploy
-cms.installer.failed_to_update_the_default_content_section=Failed to update the default content section.
-cms.installer.formbuilder.form=Form
-cms.installer.formbuilder.form_section=Form Section
+cms.installer.failed_to_update_the_default_content_section=Failed to update the default content section.
cms.installer.production_workflow=Production Workflow
cms.installer.root_folder=Root Folder
cms.installer.root_site_node_missing=Root site node missing
cms.installer.simple_publication=Simple Publication
cms.installer.template=Template
-cms.instantiationexception=InstantiationException:
+
+cms.installer.formbuilder.form=Form
+cms.installer.formbuilder.form_section=Form Section
+
cms.lifecycle.could_not_fetch_lifecycle=Could not fetch lifecycle:
cms.lifecycle.could_not_fetch_phase=Could not fetch phase:
-cms.ui.item.lifecycle.start_date_in_past=The start date must not be in the past
-cms.ui.item.lifecycle.end_date_before_start_date=The end date must not be before the start date
-cms.nosuchmethodexception=NoSuchMethodException:
+
cms.publishToFile.cannot_find_file=cannot find file
cms.publishToFile.cannot_find_item_class=cannot find item class
cms.publishToFile.cannot_find_server=cannot find server
@@ -157,8 +164,8 @@ cms.publishToFile.publish_to_file_setlocalrequestpassword_could_not_be_created=P
cms.publishToFile.publishsource_sourcebase_must_end_in_=PublishSource sourceBase must end in '/'
cms.publishToFile.server=server
cms.publishToFile.unable_to_find_closing_for_tag=Unable to find closing '>' for tag.
-cms.publishToFile.unable_to_get_contentitem=Unable to get contentItem:
-cms.contenttypes.ui.address=Address:
+cms.publishToFile.unable_to_get_contentitem=Unable to get contentItem:
+
cms.tasks.ui.anyone=Anyone
cms.tasks.ui.assigned_to=Assigned To:
cms.tasks.ui.assignment_info=Assignment Info
@@ -181,8 +188,8 @@ cms.tasks.ui.status_no_colon=Status
cms.tasks.ui.task_type=Task Type
cms.tasks.ui.title=Title
cms.tasks.ui.workflow=Workflow
-cms.templates=Templates
-cms.title=Title
+
+
cms.ui.Authoring=Authoring
cms.ui.History=History
cms.ui.Lifecycle=Lifecycle
@@ -195,6 +202,8 @@ cms.ui.actions=Actions
cms.ui.all_items=All Items
cms.ui.assigned_categories=Assigned Categories:
cms.ui.attention=Attention
+cms.ui.file=File:
+
cms.ui.authoring.an_item_with_this_name_already_exists=An item with this name already exists
cms.ui.authoring.bad_getblob_datatype=Bad getBlob datatype
cms.ui.authoring.bad_getclob_datatype=Bad getClob datatype
@@ -232,7 +241,6 @@ cms.ui.authoring.upload_image=Upload Image:
cms.ui.authoring.upload_image=Upload Image:
cms.ui.authoring.file_upload.auto_detect=(Auto-detect)
cms.ui.authoring.file_upload.file_type=File Type:
-cms.ui.file=File:
cms.ui.authoring.none=none
cms.ui.authoring.workflow=Select a Workflow
cms.ui.authoring_kit_has_more_than_one_step=This authoring kit has more than one step:
@@ -260,9 +268,9 @@ cms.ui.cancel_hit=Cancel hit
cms.ui.cancelled=cancelled
cms.ui.cannot_assign_groups_to_owner=cannot assign groups to owner
cms.ui.categories=Categories
+
cms.ui.category._back= (back)
cms.ui.category.add=Add category
-cms.ui.categoryLocalization.add=Add category localization
cms.ui.category.add_index_item=Set index item
cms.ui.category.add_use_context=Add Use Context
cms.ui.category.assigned_purposes=Assigned Purposes:
@@ -271,9 +279,9 @@ cms.ui.category.batch_categorized_objects=Batch Order Items in This Category
cms.ui.category.batch_order_objects_order=Priority
cms.ui.category.batch_order_objects_title=Title
cms.ui.category.categorized_objects=Order Live Objects in This Category
-cms.ui.category.category.current=Current category
+# ## cms.ui.category.category.current=Current category
+cms.ui.category.category_current=Current category
cms.ui.category.change_index_item=Change index item
-cms.ui.category.view_index_item=View index item
cms.ui.category.edit_index_item=Edit index item
cms.ui.category.content_item=Content Item
cms.ui.category.delete=Delete category
@@ -294,28 +302,36 @@ cms.ui.category.item.none=There are no items in this category
cms.ui.category.item=Categorized item
cms.ui.category.labeln=Label:\n
cms.ui.category.localizations=Category Localizations
-cms.ui.category.localization.add=Add localization
-cms.ui.category.localization.name=Name
-cms.ui.category.localization.description=Description
-cms.ui.category.localization.url=URL
-cms.ui.category.localization.locale=Language
-cms.ui.category.localization.action=Action
-cms.ui.category.localization.confirm_delete=Delete this localization?
-cms.ui.category.localization.none=This category has no localizations
-cms.ui.category.localization.error_locale=Please select a locale
+
+cms.ui.category.localization_action=Action
+cms.ui.category.localization_add=Add localization
+cms.ui.category.localization_confirm_delete=Delete this localization?
+cms.ui.category.localization_description=Description
+cms.ui.category.localization_edit=Edit
+cms.ui.category.localization_error_locale=Please select a locale
+cms.ui.category.localization_locale=Language
+cms.ui.category.localization_name=Name
+cms.ui.category.localization_none=This category has no localizations
+cms.ui.category.localization_url=URL
+
+cms.ui.category.linked=Linked categories
+cms.ui.category.linked_add=Add or remove linked categories
cms.ui.category.linked.add=Add or remove linked categories
cms.ui.category.linked.none=This category has no linked categories
-cms.ui.category.linked=Linked categories
+cms.ui.category.linked_none=This category has no linked categories
+
cms.ui.category.name_not_unique=There is already a category with this name
cms.ui.category.no_categorized_objects=There are no categorized objects
cms.ui.category.no_category_purposes=No Category Purposes
cms.ui.category.no_linked_categories=No linked categories
cms.ui.category.no_subcategories=No subcategories
+
cms.ui.category.purpose.add=Add or remove category purposes
cms.ui.category.purpose.assigned=Assigned purposes
cms.ui.category.purpose.available=Available purposes
cms.ui.category.purpose.none=This category has no assigned purposes
cms.ui.category.purposes=Category purposes
+
cms.ui.category.return=Return
cms.ui.category.select_index_item=Select index item for category
cms.ui.category.subcategories=Subcategories
@@ -327,6 +343,8 @@ cms.ui.category.url=URL
cms.ui.category.use_context=Use Context
cms.ui.category.use_contexts=Use Contexts
cms.ui.category.use_context_must_be_unique=Use context must be unique within a Content Section.
+cms.ui.category.view_index_item=View index item
+
cms.ui.choose_target_folder=Choose target folder
cms.ui.content_center=Content center
cms.ui.content_item=Content item
@@ -388,6 +406,7 @@ cms.ui.item.authoring=Authoring
cms.ui.item.categories.assigned=Assigned categories
cms.ui.item.categories.available=Available categories
cms.ui.item.current_row_does_not_exist=Current row does not exist
+cms.ui.item.days=days
cms.ui.item.edit_lifecycle=Edit Lifecycle
cms.ui.item.end_date=End date:
cms.ui.item.end_time=End time:
@@ -410,6 +429,8 @@ cms.ui.item.lifecycle.start_time=Start time
cms.ui.item.lifecycle.unpublish=Unpublish content item
cms.ui.item.lifecycle=Lifecycle
cms.ui.item.lifecycles=Publishing
+cms.ui.item.notification_period=Notify in advance:
+cms.ui.item.notification_period_before_start=The period for advance notification must not be longer than the publishing period.
cms.ui.item.preview=Preview
cms.ui.item.reapply_a_lifecycle=Re-apply a Lifecycle
cms.ui.item.revision.added=Added To
@@ -448,6 +469,10 @@ cms.ui.item.the_current_row_does_not_exists=The current row does not exists
cms.ui.item.workflow=Workflow
cms.ui.item.workflow.start=Start workflow
cms.ui.item.workflow.stop=Stop workflow
+cms.ui.item.hours=hours
+cms.ui.item.lifecycle.start_date_in_past=The start date must not be in the past
+cms.ui.item.lifecycle.end_date_before_start_date=The end date must not be before the start date
+
cms.ui.item_name_already_in_folder=That title is already in use by another item in this folder:
cms.ui.label=Label
cms.ui.label_prompt=Label:
diff --git a/ccm-cms/src/com/arsdigita/cms/ui/CMSResources_de.properties b/ccm-cms/src/com/arsdigita/cms/CMSResources_de.properties
similarity index 92%
rename from ccm-cms/src/com/arsdigita/cms/ui/CMSResources_de.properties
rename to ccm-cms/src/com/arsdigita/cms/CMSResources_de.properties
index 9020ebea8..0864d35e8 100755
--- a/ccm-cms/src/com/arsdigita/cms/ui/CMSResources_de.properties
+++ b/ccm-cms/src/com/arsdigita/cms/CMSResources_de.properties
@@ -23,7 +23,7 @@ cms.ui.item.hours=Stunden
cms.contenttypes.grade=Grade:
cms.contenttypes.image=Bilder:
cms.contenttypes.installer.article_section=Artikel Abschnitt
-cms.contenttypes.installer.article_section_for_a_multipart_article=Artikel Abschnitt f\u00fcr einen mehrteiligen Artikel
+cms.contenttypes.installer.article_section_for_a_multipart_article=Artikel Abschnitt f\u00FCr einen mehrteiligen Artikel
cms.contenttypes.job_description=Beschreibung:
cms.contenttypes.job_type_not_registered=Inhaltstyp Job nicht registriert
cms.contenttypes.lead=Beschreibung (Lead Text):
@@ -43,7 +43,7 @@ cms.contenttypes.pressrelease_type_not_registered=Inhaltstyp PressRelease nicht
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.services_provided=Verf\u00FCgbare Services:
cms.contenttypes.start_date=Start Datum:
cms.contenttypes.start_time=Beginn um\:
cms.contenttypes.subjectitems=Themen\:
@@ -62,7 +62,7 @@ cms.contenttypes.ui.contact_info=Kontakt Info:
cms.contenttypes.ui.contacts=Kontakte:
cms.contenttypes.ui.content_group_current_items=Aktuelle Items:
cms.contenttypes.ui.content_group_name=Inhalt Gruppen Name:
-cms.contenttypes.ui.content_group_new_item=Neuen Item hinzuf\u00fcgen:
+cms.contenttypes.ui.content_group_new_item=Neuen Item hinzuf\u00FCgen:
cms.contenttypes.ui.cost=Kosten:
cms.contenttypes.ui.creation_date=Erstellungsdatum:
cms.contenttypes.ui.date=Datum:
@@ -75,7 +75,7 @@ cms.contenttypes.ui.government_uid=Government UID:
cms.contenttypes.ui.grade=Grad:
cms.contenttypes.ui.homepage=Homepage?
cms.contenttypes.ui.job_description=Job Beschreibung:
-cms.contenttypes.ui.launch_date=Ver\u00f6ffentlichungsdatum:
+cms.contenttypes.ui.launch_date=Ver\u00F6ffentlichungsdatum:
cms.contenttypes.ui.lead=Beschreibung (Lead Text):
cms.contenttypes.ui.lead_line=Beschreibung (Lead Zeile):
cms.contenttypes.ui.link_to_map=Link to Map:
@@ -91,7 +91,7 @@ cms.contenttypes.ui.ref_number=Ref. Nr.:
cms.contenttypes.ui.reference=Referenz:
cms.contenttypes.ui.reference_code=Referenz Code:
cms.contenttypes.ui.salary=Gehalt:
-cms.contenttypes.ui.services_provided=Verf\u00fcgbarer Service:
+cms.contenttypes.ui.services_provided=Verf\u00FCgbarer Service:
cms.contenttypes.ui.start_date=Anfangsdatum:
cms.contenttypes.ui.start_time=Anfangszeit:
cms.contenttypes.ui.subject_items=Subject Items:
@@ -104,7 +104,7 @@ cms.contenttypes.ui.event_end_time=Event Ende um\:
cms.dispatcher.cannot_find_domain_object=Domain Object nicht auffindbar
cms.dispatcher.could_not_find_imageasset=ImageAsset nicht auffindbar:
cms.dispatcher.failed_to_retrieve_imageasset=ImageAsset nicht auffindbar:
-cms.dispatcher.no_permission_to_access_resource=Keine Rechte f\u00fcr diese Ressource
+cms.dispatcher.no_permission_to_access_resource=Keine Rechte f\u00FCr diese Ressource
cms.dispatcher.not_implemented=nicht implementiert
cms.dispatcher.unknown_context=Unbekannter Kontext:
cms.formbuilder.cannot_create_acsobject=ACSObject kann nicht erstellt werden
@@ -133,7 +133,7 @@ cms.installer.formbuilder.form_section=Form Abschnitt
cms.installer.production_workflow=Production Workflow
cms.installer.root_folder=Basisverzeichnis
cms.installer.root_site_node_missing=Root site node missing
-cms.installer.simple_publication=Einfache Ver\u00f6ffentlichung
+cms.installer.simple_publication=Einfache Ver\u00F6ffentlichung
cms.installer.template=Vorlage
cms.instantiationexception=InstantiationException:
cms.lifecycle.could_not_fetch_lifecycle=Could not fetch lifecycle:
@@ -188,7 +188,7 @@ cms.templates=Vorlagen
cms.title=Titel
cms.ui.Authoring=Verfassen
cms.ui.History=Historie
-cms.ui.Lifecycle=Ver\u00f6ffentlichungszyklus
+cms.ui.Lifecycle=Ver\u00F6ffentlichungszyklus
cms.ui.Publishing=Herausgabe
cms.ui.Summary=Zusammenfassung
cms.ui.template=Vorlage
@@ -206,7 +206,7 @@ cms.ui.authoring.body=Textbereich:
cms.ui.authoring.caption=Untertitel:
cms.ui.authoring.content_type=Inhaltstyp:
cms.ui.authoring.couldnt_create_contentpage=Konnte ContentPage nicht erstellen
-cms.ui.authoring.edit_body_text=Textk\u00f6rper editieren:
+cms.ui.authoring.edit_body_text=Textk\u00F6rper editieren:
cms.ui.authoring.edit_caption=Untertitel editieren
cms.ui.authoring.file_action=File Action
cms.ui.authoring.image_action=Image Action
@@ -219,10 +219,10 @@ cms.ui.authoring.no_asset=Kein Asset
cms.ui.authoring.no_content_types_were_found=Keine Inhaltstypen gefunden
cms.ui.authoring.no_current_wizard=No current wizard
cms.ui.authoring.not_implemented=Nicht implementiert
-cms.ui.authoring.page_launch_date=Ver\u00f6ffentlichungsdatum:
+cms.ui.authoring.page_launch_date=Ver\u00F6ffentlichungsdatum:
cms.ui.authoring.page_title=Titel der Seite:
cms.ui.authoring.remove_image=Bild entfernen
-cms.ui.authoring.select_an_existing_image=Vorhandenes Bild ausw\u00c4hlen
+cms.ui.authoring.select_an_existing_image=Vorhandenes Bild ausw\u00C4hlen
cms.ui.authoring.sql_error_in_getting_byte_content=SQL Error in getting byte content!
cms.ui.authoring.sqle=SQLE
cms.ui.authoring.steps=Authoring steps
@@ -240,7 +240,7 @@ cms.ui.authoring.none=niemand
cms.ui.authoring.workflow=Arbeitsablauf w\u00E4hlen
cms.ui.authoring_kit_has_more_than_one_step=Dieses Authorenkit hat mehr als einen Schritt:
cms.ui.authoring_kit_has_no_steps=Dieses Authorenkit hat keine Schritte:
-cms.ui.authoringkit.authoring_kit_for=Authorenkit f\u00fcr
+cms.ui.authoringkit.authoring_kit_for=Authorenkit f\u00FCr
cms.ui.authoringkit.component=Komponente:
cms.ui.authoringkit.content_type_id=Inhaltstyp ID#
cms.ui.authoringkit.create_component=Komponente erstellen:
@@ -249,22 +249,22 @@ cms.ui.authoringkit.current_row_does_not_exists=Aktuelle Zeile existiert nicht
cms.ui.authoringkit.description=Beschreibung:
cms.ui.authoringkit.description_bundle=Description Bundle
cms.ui.authoringkit.description_key=Description Key
-cms.ui.authoringkit.do_you_really_want_to_delete_this_authoring_step=Soll dieser Schritt wirklich gel\u00f6scht werden?
+cms.ui.authoringkit.do_you_really_want_to_delete_this_authoring_step=Soll dieser Schritt wirklich gel\u00F6scht werden?
cms.ui.authoringkit.label=Label:
cms.ui.authoringkit.label_bundle=Label Bundle
cms.ui.authoringkit.label_key=Label Key
cms.ui.authoringkit.ordering=Ordering:
cms.ui.authoringkit.submission_cancelled=Submission Cancelled
-cms.ui.available_categories=Verf\u00fcgbare Kategorien:
+cms.ui.available_categories=Verf\u00FCgbare Kategorien:
cms.ui.browse=Navigation
cms.ui.browse_items_by_category=Durchsicht der Elemente nach Kategorien
cms.ui.cancel=Abbruch
-cms.ui.cancel_hit=Abbruch dr\u00fccken
+cms.ui.cancel_hit=Abbruch dr\u00FCcken
cms.ui.cancelled=abgebrochen
cms.ui.cannot_assign_groups_to_owner=cannot assign groups to owner
cms.ui.categories=Kategorien
-cms.ui.category._back= (zur\u00fcck)
-cms.ui.category.add=Kategorie hinzuf\u00fcgen
+cms.ui.category._back= (zur\u00FCck)
+cms.ui.category.add=Kategorie hinzuf\u00FCgen
cms.ui.category.add_index_item=Set index item
cms.ui.category.add_use_context=Add Use Context
cms.ui.category.assigned_purposes=Assigned Purposes:
@@ -276,7 +276,7 @@ cms.ui.category.categorized_objects=Objekte in dieser Kategorie anordnen
cms.ui.category.category.current=Aktuelle Kategorie
cms.ui.category.change_index_item=Change index item
cms.ui.category.content_item=Content Item
-cms.ui.category.delete=Kategorie l\u00f6schen
+cms.ui.category.delete=Kategorie l\u00F6schen
cms.ui.category.delete_prompt=Wollen Sie wirklich diese Kategorie l\u00F6schen?
cms.ui.category.descriptionn=Beschreibung:\n
cms.ui.category.details=Kategorie Einzelheiten
@@ -302,9 +302,9 @@ cms.ui.category.localization.description=Beschreibung
cms.ui.category.localization.url=URL
cms.ui.category.localization.locale=Sprache
cms.ui.category.localization.action=Aktion
-cms.ui.category.localization.confirm_delete=Soll diese Sprachversion gelöscht werden?
+cms.ui.category.localization.confirm_delete=Soll diese Sprachversion gel\u00F6scht werden?
cms.ui.category.localization.none=Diese Kategorie hat keine Sprachversionen
-cms.ui.category.localization.error_locale=Bitte wählen Sie eine Sprache aus
+cms.ui.category.localization.error_locale=Bitte w\u00E4hlen Sie eine Sprache aus
cms.ui.category.name_not_unique=Es gibt bereits eine Kategorie mit diesem Namen.
cms.ui.category.no_categorized_objects=Es gibt keine kategorisierten Objekte
cms.ui.category.no_category_purposes=No Category Purposes
@@ -344,12 +344,12 @@ cms.ui.user_admin=Benutzerverwaltung
cms.ui.contents_of=Inhalt von
cms.ui.create=Erstellen
cms.ui.default_locale=Voreingestellte Sprache\:
-cms.ui.delete=L\u00f6schen
+cms.ui.delete=L\u00F6schen
cms.ui.description=Beschreibung
cms.ui.edit=Bearbeiten
cms.ui.edit_folder=Aktuellen Ordner umbenennen
cms.ui.email=Email
-cms.ui.enter_a_keyword=Schl\u00fcsselwort eingeben:
+cms.ui.enter_a_keyword=Schl\u00FCsselwort eingeben:
cms.ui.enter_first_name_last_name_andor_email_address=Enter first name, last name, and/or email address:
cms.ui.enter_first_name_last_name_email_address_andor_group_name=Enter first name, last name, email address and/or Group Name:
cms.ui.failed_to_create_new_dp_item=Failed to create a new DP Item.
@@ -385,16 +385,16 @@ cms.ui.item.access_denied=Zugriff verweigert.
cms.ui.item.apply_a_lifecycle=Lebenszyklus zuordnen
cms.ui.item.authoring=Verfassen
cms.ui.item.categories.assigned=Zugewiesene Kategorien
-cms.ui.item.categories.available=Verf\u00fcgbare Kategorien
+cms.ui.item.categories.available=Verf\u00FCgbare Kategorien
cms.ui.item.current_row_does_not_exist=Aktuelle Zeile existiert nicht
cms.ui.item.edit_lifecycle=Lebenszyklus bearbeiten
cms.ui.item.end_date=Ende am\:
cms.ui.item.end_time=Ende um\:
cms.ui.item.end_time_incomplete=Zeitangabe unvollst\u00E4ndig
cms.ui.item.history=Historie
-cms.ui.item.invalid_end_date_please_try_again=Ung\u00fcltiges Enddatum, bitte erneut versuchen
-cms.ui.item.invalid_start_date_please_try_again=Un\u00fcltiges Anfangsdatum, bitte erneut versuchen
-cms.ui.item.language.add=Sprache hinzuf\u00fcgen
+cms.ui.item.invalid_end_date_please_try_again=Ung\u00FCltiges Enddatum, bitte erneut versuchen
+cms.ui.item.invalid_start_date_please_try_again=Un\u00FCltiges Anfangsdatum, bitte erneut versuchen
+cms.ui.item.language.add=Sprache hinzuf\u00FCgen
cms.ui.item.language.change=Sprache \u00E4ndern
cms.ui.item.languages=Sprachen
cms.ui.item.lifecycle.apply=Anzuwendenden Lebenszyklus ausw\u00E4hlen
@@ -407,7 +407,7 @@ cms.ui.item.lifecycle.start_date=Anfangsdatum
cms.ui.item.lifecycle.start_time=Beginn um
cms.ui.item.lifecycle.unpublish=Dokument zur\u00FCckziehen
cms.ui.item.lifecycle=Lebenszyklus
-cms.ui.item.lifecycles=Ver\u00f6ffentlichen
+cms.ui.item.lifecycles=Ver\u00F6ffentlichen
cms.ui.item.preview=Vorschau
cms.ui.item.reapply_a_lifecycle=Lebenszyklus erneut anwenden
cms.ui.item.revision.added=Hinzugef\u00FCgt zu
@@ -418,7 +418,7 @@ cms.ui.item.revision.from=Von
cms.ui.item.revision.from_is_null='Von' Ausgabe ist notwendig
cms.ui.item.revision.none=Dieses Dokument hat keine Ausgaben
cms.ui.item.revision.nothing=nichts
-cms.ui.item.revision.operation.change=\u00c4ndern
+cms.ui.item.revision.operation.change=\u00C4ndern
cms.ui.item.revision.operation.new_value=Neuer Wert
cms.ui.item.revision.operation.none=Keine Operationen vorhanden
cms.ui.item.revision.operation.object=Objekt
@@ -479,7 +479,7 @@ cms.ui.lifecycle.no_phases=Dieser Lebenszyklus hat keine Phasen
cms.ui.lifecycle.phase.add=Eine Phase hinzuf\u00FCgen
cms.ui.lifecycle.phase.days=Tage
cms.ui.lifecycle.phase.delay=Verzug
-cms.ui.lifecycle.phase.delete=Phase l\u00f6schen
+cms.ui.lifecycle.phase.delete=Phase l\u00F6schen
cms.ui.lifecycle.phase.duration=Dauer
cms.ui.lifecycle.phase.duration_negative=Die Dauer muss gr\u00F6\u00DFer als Null sein.
cms.ui.lifecycle.phase.edit=Phase bearbeiten
@@ -488,9 +488,9 @@ cms.ui.lifecycle.phase.mins=Min.
cms.ui.lifecycle.phase.name_not_unique=Es gibt bereits eine Phase mit diesemNamen
cms.ui.lifecycle.phase.none=Dieser Lebenszyklus hat keine Phasen
cms.ui.lifecycle.phase.start_delay=Start delay
-cms.ui.lifecycle.phase_add=Phase hinzuf\u00fcgen
+cms.ui.lifecycle.phase_add=Phase hinzuf\u00FCgen
cms.ui.lifecycle.phase_delay=Delay
-cms.ui.lifecycle.phase_delete=Phase l\u00f6schen
+cms.ui.lifecycle.phase_delete=Phase l\u00F6schen
cms.ui.lifecycle.phase_description=Beschreibung
cms.ui.lifecycle.phase_duration=Dauer
cms.ui.lifecycle.phase_edit=Phase editieren
@@ -533,20 +533,20 @@ cms.ui.preview=Vorschau
cms.ui.primary_instance=Primary Instance
cms.ui.remove=Entfernen
cms.ui.restore_default_permissions=Default Rechte wiederherstellen
-cms.ui.role.add=Rolle hinzuf\u00fcgen
-cms.ui.role.admin.add=Administrator hinzuf\u00fcgen
+cms.ui.role.add=Rolle hinzuf\u00FCgen
+cms.ui.role.admin.add=Administrator hinzuf\u00FCgen
cms.ui.role.admin.email=Email
cms.ui.role.admin.name=Name
cms.ui.role.admin.none=Diese Rolle hat keine Administratoren
-cms.ui.role.admin.remove=Administrator l\u00f6schen
+cms.ui.role.admin.remove=Administrator l\u00F6schen
cms.ui.role.admins=Administratoren
-cms.ui.role.delete=Rolle l\u00f6schen
-cms.ui.role.delete_prompt=Diese Rolle wirklich l\u00f6schen?
+cms.ui.role.delete=Rolle l\u00F6schen
+cms.ui.role.delete_prompt=Diese Rolle wirklich l\u00F6schen?
cms.ui.role.description=Beschreibung
cms.ui.role.details=Details der Rolle
cms.ui.role.edit=Rolle bearbeiten
cms.ui.role.intro=Eine Rolle als Bearbeiter oder Betrachter ausw\u00E4hlen oder eine neue erstellen
-cms.ui.role.member.add=Mitglied hinzuf\u00fcgen
+cms.ui.role.member.add=Mitglied hinzuf\u00FCgen
cms.ui.role.member.email=Email
cms.ui.role.member.name=Name
cms.ui.role.member.none=Diese Rolle hat keine Mitglieder
@@ -626,7 +626,7 @@ cms.ui.type.element.value_required=Wert erforderlich?
cms.ui.type.elements=Elemente
cms.ui.type.from=Von
cms.ui.type.intro=Inhaltstyp ausw\u00E4hlen oder neu erstellen
-cms.ui.type.invalid=Ung\u00fcltiger Inhaltstyp
+cms.ui.type.invalid=Ung\u00FCltiger Inhaltstyp
cms.ui.type.label=Label
cms.ui.type.lifecycle.none=This content type has no default lifecycle
cms.ui.type.lifecycle=Voreingestellter Zyklus
@@ -638,7 +638,7 @@ cms.ui.type.duplicate_type=Es gibt bereits einen Typ mit Namen "{0}"
cms.ui.type.object_type=Objekttyp
cms.ui.type.parent.none=Dieser Inhaltstyp hat keine Eltern
cms.ui.type.parent=Eltern des Inhaltstyp
-cms.ui.type.template.add=Muster hinzuf\u00fcgen
+cms.ui.type.template.add=Muster hinzuf\u00FCgen
cms.ui.type.templates=Muster
cms.ui.type.title=Titel
cms.ui.type.to=An
@@ -664,8 +664,8 @@ cms.ui.viewers=Betrachter
cms.ui.welcome=Willkommen
cms.ui.worfklow.task_roles=Zugewiesene Rollen
cms.ui.workflow.add=Arbeitsablauf hinzuf\u00FCgen
-cms.ui.workflow.add_a_new_task_to=Neue Aufgabe hinzuf\u00fcgen f\u00fcr
-cms.ui.workflow.add_task=Aufgabe hinzuf\u00fcgen
+cms.ui.workflow.add_a_new_task_to=Neue Aufgabe hinzuf\u00FCgen f\u00FCr
+cms.ui.workflow.add_task=Aufgabe hinzuf\u00FCgen
cms.ui.workflow.assign_roles_for=Rollen zuweisen an
cms.ui.workflow.cancel_hit=Abbruch anklicken
cms.ui.workflow.comment=Kommentar
@@ -682,19 +682,19 @@ cms.ui.workflow.insufficient_privileges=Insufficient privileges
cms.ui.workflow.insufficient_privileges=Sie haben unzureichende Rechte
cms.ui.workflow.intro=Arbeitsablauf w\u00E4hlen oder einen neuen hinzuf\u00FCgen
cms.ui.workflow.lock_tasks=Meine Aufgaben f\u00FCr diesen Inhaltstyp reservieren
-cms.ui.workflow.no_users_were_selected=Keine Benutzer ausgew\u00c4hlt
+cms.ui.workflow.no_users_were_selected=Keine Benutzer ausgew\u00C4hlt
cms.ui.workflow.no_users_were_selected=Keine Benutzer ausgew\u00E4hlt.
cms.ui.workflow.num_tasks=Anzahl der Aufgaben
cms.ui.workflow.restart_stopped_workflow=Gestoppter Arbeitsablauf erneut starten
cms.ui.workflow.stop_workflow=Arbeitsablauf stoppen
-cms.ui.workflow.task.add=Aufgabe hinzuf\u00fcgen
+cms.ui.workflow.task.add=Aufgabe hinzuf\u00FCgen
cms.ui.workflow.task.approve=Akzeptieren
cms.ui.workflow.task.approve_prompt=Diesen Text akzeptieren?
cms.ui.workflow.task.assigned.lock_all=Alle meine Aufgaben zu diesem Punkt reservieren
cms.ui.workflow.task.assigned.none=Sie haben keine zugeordneten Aufgaben
cms.ui.workflow.task.assigned.unlock_all=Alle meine Aufgaben zu diesem Punkt freigeben
cms.ui.workflow.task.assigned=Ihre zugeordneten Aufgaben
-cms.ui.workflow.task.comment.add=Kommentar hinzuf\u00fcgen
+cms.ui.workflow.task.comment.add=Kommentar hinzuf\u00FCgen
cms.ui.workflow.task.delete=Aufgabe l\u00F6schen
cms.ui.workflow.task.delete_prompt=Sind Sie sicher diese Aufgabe zu l\u00F6schen?
cms.ui.workflow.task.dependencies=Abh\u00E4ngigkeiten
@@ -735,7 +735,7 @@ 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\u00c4ngen
+cms.contenttypes.shared.attach_files.description=Dateien anh\u00C4ngen
cms.contenttypes.shared.basic_properties.description=Basiseigenschaften editieren
cms.contenttypes.shared.basic_properties.title=Basiseigenschaften
cms.contenttypes.shared.body_text.title=Haupttext
@@ -754,10 +754,10 @@ mime_type_xsl=XSL
# {6}: The text of the last comment added to the Task
# {7}: The name of the person who added the last comment
# {8}: The start date of the Task
-cms.ui.workflow.email.subject.enable="{0}" ist {1,choice,1#kann erstellt werden|2#wartet auf Annahme|3#wartet auf Ver\u00f6ffentlichung}
-cms.ui.workflow.email.subject.finish={1,choice,1#Verfassen|2#Annahme|3#Ver\u00f6ffentlichen} von "{0}" ist erfolgt
-cms.ui.workflow.email.subject.rollback={1,choice,1#Verfassen|2#Annahme|3#Ver\u00f6ffentlichen} von "{0}" wurde widerrufen
-cms.ui.workflow.email.subject.disable={1,choice,1#Verfassen|2#Annahme|3#Ver\u00f6ffentlichen} von "{0}" wurde deaktiviert
+cms.ui.workflow.email.subject.enable="{0}" ist {1,choice,1#kann erstellt werden|2#wartet auf Annahme|3#wartet auf Ver\u00F6ffentlichung}
+cms.ui.workflow.email.subject.finish={1,choice,1#Verfassen|2#Annahme|3#Ver\u00F6ffentlichen} von "{0}" ist erfolgt
+cms.ui.workflow.email.subject.rollback={1,choice,1#Verfassen|2#Annahme|3#Ver\u00F6ffentlichen} von "{0}" wurde widerrufen
+cms.ui.workflow.email.subject.disable={1,choice,1#Verfassen|2#Annahme|3#Ver\u00F6ffentlichen} von "{0}" wurde deaktiviert
cms.ui.workflow.email.body.enable=\
"{0}" is {1,choice,1#ready for authoring|2#waiting for approval|3#waiting for deployment} on {3}. \n\
@@ -830,3 +830,16 @@ cms.contenttypes.ui.description_missing=Bitte eine Beschreibung eingeben
cms.ui.category.view_index_item=Index Element anzeigen
cms.ui.category.edit_index_item=Index Element bearbeiten
+cms.ui.category.category_current=Aktuelle Kategorie
+cms.ui.category.localization_action=Aktion
+cms.ui.category.localization_add=Sprache hinzuf\u00FCgen
+cms.ui.category.localization_confirm_delete=Sprache l\u00F6schen
+cms.ui.category.localization_description=Beschreibung
+cms.ui.category.localization_edit=Bearbeiten
+cms.ui.category.localization_error_locale=Eine Sprache w\u00E4hlen
+cms.ui.category.localization_locale=Sparache
+cms.ui.category.localization_name=Name
+cms.ui.category.localization_none=Diese Kaegorie hat keine Sprachversionen
+cms.ui.category.localization_url=URL
+cms.ui.category.linked_add=Verk\u00FCpfte Kategorie l\u00F6schen oder hinzuf\u00FCgen
+cms.ui.category.linked_none=cms.ui.category.linked.add=Add or remove linked categories\n
diff --git a/ccm-cms/src/com/arsdigita/cms/ui/CMSResources_en_GB.properties b/ccm-cms/src/com/arsdigita/cms/CMSResources_en_GB.properties
similarity index 100%
rename from ccm-cms/src/com/arsdigita/cms/ui/CMSResources_en_GB.properties
rename to ccm-cms/src/com/arsdigita/cms/CMSResources_en_GB.properties
diff --git a/ccm-cms/src/com/arsdigita/cms/ui/CMSResources_fr.properties b/ccm-cms/src/com/arsdigita/cms/CMSResources_fr.properties
similarity index 100%
rename from ccm-cms/src/com/arsdigita/cms/ui/CMSResources_fr.properties
rename to ccm-cms/src/com/arsdigita/cms/CMSResources_fr.properties
diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/ContentAssetInitializer.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/ContentAssetInitializer.java
index abe0b95d4..bb1096cb2 100755
--- a/ccm-cms/src/com/arsdigita/cms/contenttypes/ContentAssetInitializer.java
+++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/ContentAssetInitializer.java
@@ -22,7 +22,7 @@ import com.arsdigita.runtime.CompoundInitializer;
import com.arsdigita.runtime.RuntimeConfig;
import com.arsdigita.runtime.PDLInitializer;
import com.arsdigita.runtime.DomainInitEvent;
-import com.arsdigita.runtime.LegacyInitEvent;
+// import com.arsdigita.runtime.LegacyInitEvent;
import com.arsdigita.globalization.GlobalizedMessage;
import com.arsdigita.db.DbHelper;
import com.arsdigita.persistence.pdl.ManifestSource;
@@ -69,6 +69,7 @@ public abstract class ContentAssetInitializer extends CompoundInitializer {
*
* @param evt Type of initialization
*/
+ @Override
public void init(DomainInitEvent evt) {
super.init(evt);
@@ -119,7 +120,8 @@ public abstract class ContentAssetInitializer extends CompoundInitializer {
/**
* Returns the path to the XML file defintions for the
- * asset, eg /WEB-INF/traversal-adapters/com/arsdigita/cms/contentassets/FileAttachments.xml
+ * asset,
+ * eg /WEB-INF/traversal-adapters/com/arsdigita/cms/contentassets/FileAttachments.xml
*/
public abstract String getTraversalXML();
@@ -134,13 +136,28 @@ public abstract class ContentAssetInitializer extends CompoundInitializer {
*/
public abstract Class getAuthoringStep();
+// DEPRECATED - API Change (pb - 2010-05-23) - will be removed asap
+// Initializer is meant to execute once at startup to set basic features for
+// operation. AuthoringStepLabel and AuthoringStepDescription are part of the UI
+// and have to be localized, i.e. determined each time a user invokes the UI.
+// This is contrary to the concept of an initializer.
+//
+// Accordingly in AuthoringStep setLabel is set deprecated and replaced by
+// setLabelKey to identify an Authoring Step.
+//
+// As an temporary measure Label / Description from FSIglobalize will be used
+// by registerAssetStep method (see above).
+// XXX todo: Replace label by labelKey overall in the appropriate code!
+//
/**
* The label for the authoring step
+ * @deprecated (see above)
*/
public abstract GlobalizedMessage getAuthoringStepLabel();
-
+
/**
* The description for the authoring step
+ * @deprecated (see above)
*/
public abstract GlobalizedMessage getAuthoringStepDescription();
diff --git a/ccm-cms/src/com/arsdigita/cms/ui/authoring/AuthoringKitWizard.java b/ccm-cms/src/com/arsdigita/cms/ui/authoring/AuthoringKitWizard.java
index fb4277587..546a65ebb 100755
--- a/ccm-cms/src/com/arsdigita/cms/ui/authoring/AuthoringKitWizard.java
+++ b/ccm-cms/src/com/arsdigita/cms/ui/authoring/AuthoringKitWizard.java
@@ -90,6 +90,7 @@ import java.util.ArrayList;
*/
public class AuthoringKitWizard extends LayoutPanel implements Resettable {
+ /** Private Logger instance for this class */
private static final Logger s_log = Logger.getLogger
(AuthoringKitWizard.class);
@@ -106,36 +107,6 @@ public class AuthoringKitWizard extends LayoutPanel implements Resettable {
private static final ArrayList s_assets = new ArrayList();
- public static void registerAssetStep(String baseObjectType,
- Class step,
- GlobalizedMessage label,
- GlobalizedMessage description,
- int sortKey) {
- // cg - allow registered steps to be overridden by registering a step with the same label
- // this is a bit of a hack used specifically for creating a specialised version of image
- // step. There is no straightforward way of preventing the original image step from being
- // registered, but I needed the image step to use a different step class if the specialised
- // image step application was loaded. Solution is to ensure initialiser in new project
- // runs after original ccm-ldn-image-step initializer and override the registered step here
- s_log.debug(
- "registering asset step - label: "
- + label.localize()
- + " step class: "
- + step.getName());
-
- Iterator assets = s_assets.iterator();
- while (assets.hasNext()) {
- Object[] data = (Object[]) assets.next();
- GlobalizedMessage thisLabel = (GlobalizedMessage) data[2];
- if (thisLabel.localize().equals(label.localize())) {
- s_log.debug("registering authoring step with same label as previously registered step");
- s_assets.remove(data);
- break;
- }
- }
- s_assets.add(new Object[] {baseObjectType, step, label, description});
- }
-
private final Object[] m_vals;
private final ContentType m_type;
@@ -352,6 +323,9 @@ public class AuthoringKitWizard extends LayoutPanel implements Resettable {
});
}
+ /**
+ *
+ */
private final class StepListener implements ChangeListener {
public final void stateChanged(final ChangeEvent e) {
final PageState state = e.getPageState();
@@ -371,6 +345,9 @@ public class AuthoringKitWizard extends LayoutPanel implements Resettable {
}
}
+ /**
+ *
+ */
private final class StepCompletionListener implements ActionListener {
public final void actionPerformed(final ActionEvent e) {
final PageState state = e.getPageState();
@@ -393,6 +370,11 @@ public class AuthoringKitWizard extends LayoutPanel implements Resettable {
}
}
+ /**
+ *
+ * @param page
+ */
+ @Override
public final void register(final Page page) {
super.register(page);
@@ -420,6 +402,44 @@ public class AuthoringKitWizard extends LayoutPanel implements Resettable {
});
}
+ /**
+ *
+ * @param baseObjectType
+ * @param step
+ * @param label
+ * @param description
+ * @param sortKey
+ */
+ public static void registerAssetStep(String baseObjectType,
+ Class step,
+ GlobalizedMessage label,
+ GlobalizedMessage description,
+ int sortKey) {
+ // cg - allow registered steps to be overridden by registering a step with the same label
+ // this is a bit of a hack used specifically for creating a specialised version of image
+ // step. There is no straightforward way of preventing the original image step from being
+ // registered, but I needed the image step to use a different step class if the specialised
+ // image step application was loaded. Solution is to ensure initialiser in new project
+ // runs after original ccm-ldn-image-step initializer and override the registered step here
+ s_log.debug(
+ "registering asset step - label: "
+ + label.localize()
+ + " step class: "
+ + step.getName());
+
+ Iterator assets = s_assets.iterator();
+ while (assets.hasNext()) {
+ Object[] data = (Object[]) assets.next();
+ GlobalizedMessage thisLabel = (GlobalizedMessage) data[2];
+ if (thisLabel.localize().equals(label.localize())) {
+ s_log.debug("registering authoring step with same label as previously registered step");
+ s_assets.remove(data);
+ break;
+ }
+ }
+ s_assets.add(new Object[] {baseObjectType, step, label, description});
+ }
+
/**
* @return The content type handled by this wizard
*/
@@ -427,6 +447,10 @@ public class AuthoringKitWizard extends LayoutPanel implements Resettable {
return m_type;
}
+ /**
+ *
+ * @return
+ */
public List getList() {
return m_list;
}
diff --git a/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryLinks.java b/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryLinks.java
index 22f699370..e523ef8d9 100755
--- a/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryLinks.java
+++ b/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryLinks.java
@@ -70,7 +70,7 @@ public class CategoryLinks extends List {
});
final Label label = new Label
- (GlobalizationUtil.globalize("cms.ui.category.linked.none"));
+ (GlobalizationUtil.globalize("cms.ui.category.linked_none"));
label.setFontWeight(Label.ITALIC);
setEmptyView(label);
}
diff --git a/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryLocalizationAddForm.java b/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryLocalizationAddForm.java
index 5b99d1a7d..3c4414e23 100644
--- a/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryLocalizationAddForm.java
+++ b/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryLocalizationAddForm.java
@@ -54,7 +54,7 @@ public class CategoryLocalizationAddForm extends CategoryLocalizationForm {
public CategoryLocalizationAddForm(final CategoryRequestLocal category) {
super("AddCategoryLocalization",
- gz("cms.ui.category.localization.add"), category);
+ gz("cms.ui.category.localization_add"), category);
addInitListener(new InitListener());
addProcessListener(new ProcessListener());
diff --git a/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryLocalizationEditForm.java b/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryLocalizationEditForm.java
index cbbc273f0..eb0c12306 100644
--- a/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryLocalizationEditForm.java
+++ b/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryLocalizationEditForm.java
@@ -53,7 +53,7 @@ public class CategoryLocalizationEditForm extends CategoryLocalizationForm {
final String locale) {
super("EditCategoryLocalization", gz(
- "cms.ui.category.localization.edit"), category);
+ "cms.ui.category.localization_edit"), category);
// Speichere Locale ab
m_categoryLocalizationLocale = locale;
diff --git a/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryLocalizationForm.java b/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryLocalizationForm.java
index e0ee54ef8..94b6292ca 100644
--- a/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryLocalizationForm.java
+++ b/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryLocalizationForm.java
@@ -96,12 +96,12 @@ public class CategoryLocalizationForm extends BaseForm {
if (code == null || code.length() == 0) {
data.addError(
(String)GlobalizationUtil.globalize(
- "cms.ui.category.localization.error_locale").localize());
+ "cms.ui.category.localization_error_locale").localize());
}
}
});
- addField(gz("cms.ui.category.localization.locale"), m_locale);
+ addField(gz("cms.ui.category.localization_locale"), m_locale);
m_name = new TextField(new TrimmedStringParameter(NAME));
addField(gz("cms.ui.name"), m_name);
diff --git a/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryLocalizationTable.java b/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryLocalizationTable.java
index 25e6c9057..c02be4ce8 100644
--- a/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryLocalizationTable.java
+++ b/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryLocalizationTable.java
@@ -70,7 +70,7 @@ public class CategoryLocalizationTable extends Table implements TableActionListe
// if table is empty:
setEmptyView(new Label(GlobalizationUtil.globalize(
- "cms.ui.category.localization.none")));
+ "cms.ui.category.localization_none")));
TableColumnModel tab_model = getColumnModel();
// define columns
@@ -78,13 +78,13 @@ public class CategoryLocalizationTable extends Table implements TableActionListe
tab_model.add(new TableColumn(0, GlobalizationUtil.globalize(
"cms.ui.category.localization.locale").localize(), TABLE_COL_LANG));
tab_model.add(new TableColumn(1, GlobalizationUtil.globalize(
- "cms.ui.category.localization.name").localize()));
+ "cms.ui.category.localization_name").localize()));
tab_model.add(new TableColumn(2, GlobalizationUtil.globalize(
- "cms.ui.category.localization.description").localize()));
+ "cms.ui.category.localization_description").localize()));
tab_model.add(new TableColumn(3, GlobalizationUtil.globalize(
- "cms.ui.category.localization.url").localize()));
+ "cms.ui.category.localization_url").localize()));
tab_model.add(new TableColumn(4, GlobalizationUtil.globalize(
- "cms.ui.category.localization.action").localize(), TABLE_COL_DEL));
+ "cms.ui.category.localization_action").localize(), TABLE_COL_DEL));
setModelBuilder(new CategoryLocalizationTableModelBuilder());
@@ -237,7 +237,7 @@ public class CategoryLocalizationTable extends Table implements TableActionListe
if (true) {
ControlLink link = new ControlLink(value.toString());
link.setConfirmation((String) GlobalizationUtil.globalize(
- "cms.ui.category.localization.confirm_delete").localize());
+ "cms.ui.category.localization_confirm_delete").localize());
// link.setConfirmation("Delete this localization?");
return link;
} else {