Enhanced globlization: Selection of content types, part 1. It works, but not all content types adopted yet (showing the globaization key at the moment).

git-svn-id: https://svn.libreccm.org/ccm/trunk@2733 8810af33-2d31-482b-a856-94f89814c4df

ccm-atoz/src/com/arsdigita/atoz/ui/admin/CategoryProviderContentTypeBlockForm.java

@@ -87,7 +87,7 @@ public class CategoryProviderContentTypeBlockForm extends Form {
                     while (ctc.next()) {
                         ContentType contentType = ctc.getContentType();
                         optionGroup.addOption(new Option(contentType.getID()
-                                .toString(), contentType.getLabel()));
+                                .toString(), contentType.getName()));
                     }
                 }
             });

ccm-cms-assets-dublincore/src/com/arsdigita/cms/contentassets/ui/DublinCoreSummary.java

@@ -229,14 +229,14 @@ public class DublinCoreSummary extends ColumnPanel {
             m_rights.setLabel(dces.getRights(), state);
         }
             
-        m_documentType.setLabel(item.getContentType().getLabel(), state);
+        m_documentType.setLabel(item.getContentType().getName(), state);
 
         m_language.setLabel(item.getLanguage(), state);
             
         if (dces != null) {
             m_dateValid.setLabel(dces.getDate(), state);
             
-         // m_keywords.setLabel(dces.getKeywords(), state); will be Subject!
+         // m_keywords.setName(dces.getKeywords(), state); will be Subject!
         }
 
         super.generateXML(state, parent);

ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/PublicPersonalProfileResources.properties

@@ -42,3 +42,5 @@ publicpersonalprofile.ui.misc=Miscellaneous
 publicpersonalprofile.ui.misc.edit=Edit miscellaneous
 publicpersonalprofile.ui.misc.title=Miscellaneous
 publicpersonalprofile.ui.no_nav_items=No navigation entries defined
+#Fixed Key! Defined in class ContentTypes#getLabel()
+cms.contenttypes.publicpersonalprofile.type_label=Public Personal Profile

ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/PublicPersonalProfileResources_de.properties

@@ -42,3 +42,5 @@ publicpersonalprofile.ui.misc=Sonstiges
 publicpersonalprofile.ui.misc.edit=Sonstiges bearbeiten
 publicpersonalprofile.ui.misc.title=Sonstiges
 publicpersonalprofile.ui.no_nav_items=Keine Navigationspunkte definiert
+#Fixed Key! Defined in class ContentTypes#getLabel()
+cms.contenttypes.publicpersonalprofile.type_label=\u00d6ffentliches Pers\u00f6nliches Profil

ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileCreate.java

@@ -86,7 +86,7 @@ public class PublicPersonalProfileCreate extends PageCreate {
         add(m_workflowSection, ColumnPanel.INSERT);
         add(new Label(GlobalizationUtil.globalize(
                 "cms.ui.authoring.content_type")));
-        add(new Label(type.getLabel()));   // the title or name of the type
+        add(new Label(type.getName()));   // the title or name of the type
         add(new Label(GlobalizationUtil.globalize("cms.ui.language.field")));
         add(new LanguageWidget(LANGUAGE));
 

ccm-cms-types-address/src/com/arsdigita/cms/contenttypes/AddressResources.properties

@@ -0,0 +1,5 @@
+# To change this license header, choose License Headers in Project Properties.
+# To change this template file, choose Tools | Templates
+# and open the template in the editor.
+
+cms.contenttypes.address.type_label=Address

ccm-cms-types-address/src/com/arsdigita/cms/contenttypes/AddressResources_de.properties

@@ -0,0 +1,5 @@
+# To change this license header, choose License Headers in Project Properties.
+# To change this template file, choose Tools | Templates
+# and open the template in the editor.
+
+cms.contenttypes.address.type_label=Adresse

ccm-cms-types-address/src/com/arsdigita/cms/contenttypes/AddressResources_en.properties

@@ -0,0 +1,5 @@
+# To change this license header, choose License Headers in Project Properties.
+# To change this template file, choose Tools | Templates
+# and open the template in the editor.
+
+cms.contenttypes.address.type_label=Address

ccm-cms-types-address/src/com/arsdigita/cms/contenttypes/AddressResources_fr.properties

@@ -0,0 +1,5 @@
+# To change this license header, choose License Headers in Project Properties.
+# To change this template file, choose Tools | Templates
+# and open the template in the editor.
+
+cms.contenttypes.address.type_label=Address

ccm-cms-types-agenda/src/com/arsdigita/cms/contenttypes/AgendaResources.properties

@@ -8,3 +8,5 @@ cms.contenttypes.ui.agenda.attendees=Attendees:
 cms.contenttypes.ui.agenda.subject_items=Subject Items:
 cms.contenttypes.ui.agenda.contact_info=Contact Information:
 cms.contenttypes.ui.agenda.creation_date=Creation Date:
+#Fixed, defined by class ContentType
+cms.contenttypes.agenda.type_label=Agenda

ccm-cms-types-agenda/src/com/arsdigita/cms/contenttypes/AgendaResources_de.properties

@@ -8,3 +8,5 @@ cms.contenttypes.ui.agenda.attendees=Teilnehmer:
 cms.contenttypes.ui.agenda.subject_items=Themen:
 cms.contenttypes.ui.agenda.contact_info=Kontakt Information:
 cms.contenttypes.ui.agenda.creation_date=Erstellungsdatum:
+#Fixed, defined by class ContentType
+cms.contenttypes.agenda.type_label=Ablaufplan

ccm-cms-types-article/src/com/arsdigita/cms/contenttypes/ArticleResources.properties

@@ -0,0 +1,5 @@
+# To change this license header, choose License Headers in Project Properties.
+# To change this template file, choose Tools | Templates
+# and open the template in the editor.
+
+cms.contenttypes.article.type_label=Article

ccm-cms-types-article/src/com/arsdigita/cms/contenttypes/ArticleResources_de.properties

@@ -0,0 +1,5 @@
+# To change this license header, choose License Headers in Project Properties.
+# To change this template file, choose Tools | Templates
+# and open the template in the editor.
+
+cms.contenttypes.article.type_label=Artikel

ccm-cms-types-article/src/com/arsdigita/cms/contenttypes/ArticleResources_en.properties

@@ -0,0 +1,5 @@
+# To change this license header, choose License Headers in Project Properties.
+# To change this template file, choose Tools | Templates
+# and open the template in the editor.
+
+cms.contenttypes.article.type_label=Article

ccm-cms-types-article/src/com/arsdigita/cms/contenttypes/ArticleResources_fr.properties

@@ -0,0 +1,5 @@
+# To change this license header, choose License Headers in Project Properties.
+# To change this template file, choose Tools | Templates
+# and open the template in the editor.
+
+cms.contenttypes.article.type_label=Translate: Article

ccm-cms-types-bookmark/src/com/arsdigita/cms/contenttypes/BookmarkResources.properties

@@ -1 +1,2 @@
 cms.contenttypes.ui.bookmark.url=URL:
+cms.contenttypes.bookmark.type_label=Bookmark

ccm-cms-types-bookmark/src/com/arsdigita/cms/contenttypes/BookmarkResources_de.properties

@@ -1 +1,2 @@
 cms.contenttypes.ui.bookmark.url=URL:
+cms.contenttypes.bookmark.type_label=Lesezeichen

ccm-cms-types-bookmark/src/com/arsdigita/cms/contenttypes/BookmarkResources_en.properties

@@ -1 +1,2 @@
 cms.contenttypes.ui.bookmark.url=URL:
+cms.contenttypes.bookmark.type_label=Bookmark

ccm-cms-types-bookmark/src/com/arsdigita/cms/contenttypes/BookmarkResources_fr.properties

@@ -1 +1,2 @@
 cms.contenttypes.ui.bookmark.url=URL:
+cms.contenttypes.bookmark.type_label=Bookmark

ccm-cms-types-contact/src/com/arsdigita/cms/contenttypes/ContactResources.properties

@@ -0,0 +1,2 @@
+#Fixed key, defined in class ContentTypes 
+cms.contenttypes.contact.type_label=Contact

ccm-cms-types-contact/src/com/arsdigita/cms/contenttypes/ContactResources_de.properties

@@ -0,0 +1,5 @@
+# To change this license header, choose License Headers in Project Properties.
+# To change this template file, choose Tools | Templates
+# and open the template in the editor.
+
+cms.contenttypes.contact.type_label=Kontakt

ccm-cms-types-contact/src/com/arsdigita/cms/contenttypes/ContactResources_fr.properties

@@ -0,0 +1,5 @@
+# To change this license header, choose License Headers in Project Properties.
+# To change this template file, choose Tools | Templates
+# and open the template in the editor.
+
+cms.contenttypes.contact.type_label=Contact

ccm-cms-types-decisiontree/src/com/arsdigita/cms/contenttypes/DecisionTreeResources.properties

@@ -75,3 +75,4 @@ cms.contenttypes.ui.decisiontree.sections.delete_section_msg=Section to be delet
 cms.contenttypes.ui.decisiontree.options.delete_option_msg=Option to be deleted: "{0}"
 cms.contenttypes.ui.decisiontree.options.delete_button=Delete
 cms.contenttypes.ui.decisiontree.options.delete.submission_cancelled=Option Delete submission cancelled
+cms.contenttypes.decisiontree.type_label=Decision Tree

ccm-cms-types-decisiontree/src/com/arsdigita/cms/contenttypes/DecisionTreeResources_de.properties

@@ -75,3 +75,4 @@ cms.contenttypes.ui.decisiontree.sections.delete_section_msg=Zu l\u00f6schende S
 cms.contenttypes.ui.decisiontree.options.delete_option_msg=Zu l\u00f6schende Option: "{0}"
 cms.contenttypes.ui.decisiontree.options.delete_button=Entfernen
 cms.contenttypes.ui.decisiontree.options.delete.submission_cancelled=Option Delete submission cancelled
+cms.contenttypes.decisiontree.type_label=Entscheidungsbaum

ccm-cms-types-decisiontree/src/com/arsdigita/cms/contenttypes/DecisionTreeResources_en.properties

@@ -75,3 +75,4 @@ cms.contenttypes.ui.decisiontree.sections.delete_section_msg=Section to be delet
 cms.contenttypes.ui.decisiontree.options.delete_option_msg=Option to be deleted: "{0}"
 cms.contenttypes.ui.decisiontree.options.delete_button=Delete
 cms.contenttypes.ui.decisiontree.options.delete.submission_cancelled=Option Delete submission cancelled
+cms.contenttypes.decisiontree.type_label=Decision Tree

ccm-cms-types-decisiontree/src/com/arsdigita/cms/contenttypes/DecisionTreeResources_fr.properties

@@ -75,3 +75,4 @@ cms.contenttypes.ui.decisiontree.sections.delete_section_msg=Section to be delet
 cms.contenttypes.ui.decisiontree.options.delete_option_msg=Option to be deleted: "{0}"
 cms.contenttypes.ui.decisiontree.options.delete_button=Delete
 cms.contenttypes.ui.decisiontree.options.delete.submission_cancelled=Option Delete submission cancelled
+cms.contenttypes.decisiontree.type_label=Decision Tree

ccm-cms-types-event/src/com/arsdigita/cms/contenttypes/EventResources.properties

@@ -20,3 +20,5 @@ cms.contenttypes.ui.event.link_to_map=Link to Map
 cms.contenttypes.ui.event.cost=Cost:
 #Probably not used!
 cms.contenttypes.ui.event.there_are_no_events=There are no events.
+cms.contenttypes.event.type_label=Event
+cms.contenttypes.event_type_not_registered=Type not registered

ccm-cms-types-event/src/com/arsdigita/cms/contenttypes/EventResources_de.properties

@@ -21,3 +21,5 @@ cms.contenttypes.ui.event.event_type=Veranstaltungs-Typ:
 cms.contenttypes.ui.event.link_to_map=Link zur Karte
 cms.contenttypes.ui.event.cost=Kosten:
 cms.contenttypes.ui.event.there_are_no_events=Es sind keine Veranstaltungen vorhanden.
+cms.contenttypes.event.type_label=Veranstaltung
+cms.contenttypes.event_type_not_registered=Typ nicht registriert

ccm-cms-types-event/src/com/arsdigita/cms/contenttypes/EventResources_fr.properties

@@ -22,3 +22,4 @@ cms.contenttypes.ui.event.event_type=Event Type:
 cms.contenttypes.ui.event.link_to_map=Link to Map
 cms.contenttypes.ui.event.cost=Cost:
 cms.contenttypes.ui.event.there_are_no_events=Il n'y a aucun \u00e9venement
+cms.contenttypes.event.type_label=Event

ccm-cms-types-faqitem/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/FAQItem.xml

@@ -11,12 +11,12 @@
                objectType="com.arsdigita.cms.contenttypes.FAQItem"
                 classname="com.arsdigita.cms.contenttypes.FAQItem">
 
-    <ctd:authoring-kit
+    <ctd:authoring-kit>
-<!--
-    <ctd:authoring-kit createComponent="com.arsdigita.cms.ui.authoring.PageCreate">
- -->   
       <!--  Overwrite the standard pageCreate class to customize and include 
             additional content type specific widgets.                       -->
+      <!--
+      <ctd:authoring-kit createComponent="com.arsdigita.cms.ui.authoring.PageCreate">
+      -->   
       createComponent="com.arsdigita.cms.contenttypes.ui.authoring.FAQItemCreate">
 
       <ctd:authoring-step

ccm-cms-types-faqitem/src/com/arsdigita/cms/contenttypes/FAQItemResources.properties

@@ -3,3 +3,4 @@ faq_item.authoring.basic_properties.description=Edit question and answer
 cms.contenttypes.ui.faq.question=Question:
 cms.contenttypes.ui.faq.answer=Answer:
 cms.contenttypes.ui.faq.sectionName=Section Name
+cms.contenttypes.faqitem.type_label=FAQ  Item

ccm-cms-types-faqitem/src/com/arsdigita/cms/contenttypes/FAQItemResources_de.properties

@@ -2,3 +2,4 @@ faq_item.authoring.basic_properties.description=Frage und Antwort bearbeiten
 cms.contenttypes.ui.faq.question=Frage:
 cms.contenttypes.ui.faq.answer=Antwort:
 cms.contenttypes.ui.faq.sectionName=Abschnitt
+cms.contenttypes.faqitem.type_label=H\u00e4ufig gestellte Frage

ccm-cms-types-filestorageitem/src/com/arsdigita/cms/contenttypes/FileStorageItemResources.properties

@@ -1,2 +1,3 @@
 file_storage_item.authoring.file_attachment.title=File
 file_storage_item.authoring.file_attachment.description=File associated with this item
+cms.contenttypes.filestorageitem.type_label=File Storage Item

ccm-cms-types-filestorageitem/src/com/arsdigita/cms/contenttypes/FileStorageItemResources_de.properties

@@ -1,2 +1,3 @@
 file_storage_item.authoring.file_attachment.title=Datei
 file_storage_item.authoring.file_attachment.description=Zugeh\u00f6rige Datei f\u00fcr dieses Dokument ("Haupt-Datei)"
+cms.contenttypes.filestorageitem.type_label=Datei zum Herunterladen

ccm-cms-types-formitem/src/com/arsdigita/cms/formbuilder/FormItemResources.properties

@@ -9,3 +9,5 @@ cms.contenttypes.ui.form_item.remote_url_label=Remote URL:
 cms.contenttypes.ui.form_item.empty=(empty)
 cms.contenttypes.ui.form_item.submit_label=Submit
 cms.contenttypes.ui.form_item.oh_no_you_dont=Oh no you don't
+#Fixed Key! Defined in class ContentTypes
+cms.formbuilder.formitem.type_label=Form Item

ccm-cms-types-formitem/src/com/arsdigita/cms/formbuilder/FormItemResources_de.properties

@@ -9,3 +9,4 @@ cms.contenttypes.ui.form_item.remote_url_label=Entfernte URL:
 cms.contenttypes.ui.form_item.empty=(leer)
 cms.contenttypes.ui.form_item.submit_label=Ausf\u00fchren
 cms.contenttypes.ui.form_item.oh_no_you_dont=Nein, das wollen sie nicht
+cms.formbuilder.formitem.type_label=Formular

ccm-cms-types-formitem/src/com/arsdigita/cms/formbuilder/FormItemResources_fr.properties

@@ -9,3 +9,4 @@ cms.contenttypes.ui.form_item.remote_url_label=Remote URL:
 cms.contenttypes.ui.form_item.empty=(empty)
 cms.contenttypes.ui.form_item.submit_label=Submit
 cms.contenttypes.ui.form_item.oh_no_you_dont=non, vous ne pouvez pas
+cms.formbuilder.formitem.type_label=Form Item

ccm-cms-types-formsectionitem/src/com/arsdigita/cms/formbuilder/FormSectionItemResources.properties

@@ -3,3 +3,5 @@ form_section_item.authoring.controls.title=Edit Form Controls
 form_section_item.authoring.actions.description=Edit the form actions present on the form
 form_section_item.authoring.actions.title=Edit Form Actions
 cms.contenttypes.ui.form_section.oh_no_you_dont=Oh no you don't
+#Fixed Key! Defined in class ContentTypes#getLabel()
+cms.formbuilder.formsectionitem.type_label=Form Section Item

ccm-cms-types-formsectionitem/src/com/arsdigita/cms/formbuilder/FormSectionItemResources_de.properties

@@ -3,3 +3,4 @@ form_section_item.authoring.controls.title=Formularelemente bearbeiten
 form_section_item.authoring.actions.description=Editieren der Aktionen des Formulars
 form_section_item.authoring.actions.title=Formularaktionen bearbeiten
 cms.contenttypes.ui.form_section.oh_no_you_dont=Nein, das wollen sie nicht
+cms.formbuilder.formsectionitem.type_label=Formularabschnitt

ccm-cms-types-formsectionitem/src/com/arsdigita/cms/formbuilder/FormSectionItemResources_fr.properties

@@ -3,3 +3,4 @@ form_section_item.authoring.controls.title=Edit Form Controls
 form_section_item.authoring.actions.description=Edit the form actions present on the form
 form_section_item.authoring.actions.title=Edit Form Actions
 cms.contenttypes.ui.form_section.oh_no_you_dont=non, vous ne pouvez pas
+cms.formbuilder.formsectionitem.type_label=Form Section Item

ccm-cms-types-glossaryitem/src/com/arsdigita/cms/contenttypes/GlossaryItemResources.properties

@@ -0,0 +1,4 @@
+cms.contenttypes.ui.glossary.term=Term:
+cms.contenttypes.ui.glossary.definition=Definition:
+#Fixed Key! Defined in class ContentType#getLabel()
+cms.contenttypes.glossaryitem.type_label=Glossary Item

ccm-cms-types-glossaryitem/src/com/arsdigita/cms/contenttypes/GlossaryItemResources_de.properties

@@ -0,0 +1,4 @@
+cms.contenttypes.ui.glossary.term=Begriff:
+cms.contenttypes.ui.glossary.definition=Definition:
+#Fixed Key! Defined in class ContentType#getLabel()
+cms.contenttypes.glossaryitem.type_label=Begriffserkl\u00e4rung

ccm-cms-types-glossaryitem/src/com/arsdigita/cms/contenttypes/GlossaryResources.properties

@@ -1,2 +0,0 @@
-cms.contenttypes.ui.glossary.term=Term:
-cms.contenttypes.ui.glossary.definition=Definition:

ccm-cms-types-glossaryitem/src/com/arsdigita/cms/contenttypes/GlossaryResources_de.properties

@@ -1,2 +0,0 @@
-cms.contenttypes.ui.glossary.term=Begriff:
-cms.contenttypes.ui.glossary.definition=Definition:

ccm-cms-types-glossaryitem/src/com/arsdigita/cms/contenttypes/util/GlossaryGlobalizationUtil.java

@@ -34,11 +34,14 @@ public class GlossaryGlobalizationUtil implements Globalized {
     
     /**  Name of Java resource files to handle Glossary's globalisation.  */
     final public static String BUNDLE_NAME = 
-                        "com.arsdigita.cms.contenttypes.GlossaryResources";
+                        "com.arsdigita.cms.contenttypes.GlossaryItemResources";
 
     /**
      *  This returns a globalized message using the package specific bundle,
      *  provided by BUNDLE_NAME. 
+     * 
+     * @param key
+     * @return 
      */
     public static GlobalizedMessage globalize(String key) {
         return new GlobalizedMessage(key, BUNDLE_NAME);
@@ -48,6 +51,10 @@ public class GlossaryGlobalizationUtil implements Globalized {
      * Returns a globalized message object, using the package specific bundle,
      * as specified by BUNDLE_NAME. Also takes in an Object[] of arguments to
      * interpolate into the retrieved message using the  MessageFormat class.
+     * 
+     * @param key
+     * @param args
+     * @return 
      */
     public static GlobalizedMessage globalize(String key, Object[] args) {
         return new GlobalizedMessage(key, BUNDLE_NAME, args);

ccm-cms-types-historicdate/src/com/arsdigita/cms/contenttypes/HistoricDateResources.properties

@@ -7,3 +7,4 @@ historicdate.ui.month=Month
 historicdate.ui.day_of_month=Day of Month
 historicdate.ui.date_is_approx=Date is approximately
 historicdate.ui.lead=Lead text
+cms.contenttypes.historicdate.type_label=Historic Date

ccm-cms-types-historicdate/src/com/arsdigita/cms/contenttypes/HistoricDateResources_de.properties

@@ -7,3 +7,4 @@ historicdate.ui.month=Monat
 historicdate.ui.day_of_month=Tag
 historicdate.ui.date_is_approx=Ungef\u00e4hres Datum
 historicdate.ui.lead=Zusammenfassung
+cms.contenttypes.historicdate.type_label=Historisches Ereignis

ccm-cms-types-image/src/com/arsdigita/cms/contenttypes/ImageResources.properties

@@ -14,3 +14,5 @@ cms.contenttypes.ui.image.material=Material:
 cms.contenttypes.ui.image.technique=Technique:
 cms.contenttypes.ui.image.origin=Point of Origin:
 cms.contenttypes.ui.image.origSize=Size of Original:
+#Fixed Key! Defined in class ContentType#getLabel()
+cms.contenttypes.image.type_label=Image

ccm-cms-types-image/src/com/arsdigita/cms/contenttypes/ImageResources_de.properties

@@ -12,3 +12,5 @@ cms.contenttypes.ui.image.material=Material:
 cms.contenttypes.ui.image.technique=Technik:
 cms.contenttypes.ui.image.origin=Ort der Entstehung:
 cms.contenttypes.ui.image.origSize=Gr\u00f6\u00dfe des Originals:
+#Fixed Key! Defined in class ContentType#getLabel()
+cms.contenttypes.image.type_label=Bild / Grafik

ccm-cms-types-inlinesite/src/com/arsdigita/cms/contenttypes/InlineSiteResources.properties

@@ -1 +1,3 @@
 cms.contenttypes.ui.inlinesite.url=Site Url:
+#Fixed Key! Defined in class ContentType#getLabel()
+cms.contenttypes.inlinesite.type_label=Inline Site

ccm-cms-types-inlinesite/src/com/arsdigita/cms/contenttypes/InlineSiteResources_de.properties

@@ -1 +1,3 @@
 cms.contenttypes.ui.inlinesite.url=Url der Seite:
+#Fixed Key! Defined in class ContentType#getLabel()
+cms.contenttypes.inlinesite.type_label=Inline Site

ccm-cms-types-inlinesite/src/com/arsdigita/cms/contenttypes/InlineSiteResources_fr.properties

@@ -1 +1,3 @@
 cms.contenttypes.ui.inlinesite.url=Site URL:
+#Fixed Key! Defined in class ContentType#getLabel()
+cms.contenttypes.inlinesite.type_label=Inline Site

ccm-cms-types-job/src/com/arsdigita/cms/contenttypes/JobResources.properties

@@ -8,3 +8,4 @@ cms.contenttypes.ui.job.department=Department:
 cms.contenttypes.ui.job.job_description=Detailed Job Description:
 cms.contenttypes.ui.job.person_specification=Personal Requirements:
 cms.contenttypes.ui.job.contact_details=Contact Details:
+cms.contenttypes.job.type_label=Job Item

ccm-cms-types-job/src/com/arsdigita/cms/contenttypes/JobResources_de.properties

@@ -8,3 +8,4 @@ cms.contenttypes.ui.job.department=Abteilung:
 cms.contenttypes.ui.job.job_description=Stellenbeschreibung:
 cms.contenttypes.ui.job.person_specification=Pers\u00f6nliche Anforderungen:
 cms.contenttypes.ui.job.contact_details=Kontaktdetails:
+cms.contenttypes.job.type_label=Stellenangebot

ccm-cms-types-job/src/com/arsdigita/cms/contenttypes/JobResources_en_GB.properties

@@ -8,3 +8,4 @@ cms.contenttypes.ui.job.department=Department:
 cms.contenttypes.ui.job.job_description=Job Description:
 cms.contenttypes.ui.job.person_specification=Personal Requirements:
 cms.contenttypes.ui.job.contact_details=Contact Details:
+cms.contenttypes.job.type_label=Job Item

ccm-cms-types-job/src/com/arsdigita/cms/contenttypes/JobResources_fr.properties

@@ -8,3 +8,4 @@ cms.contenttypes.ui.job.department=Departement:
 cms.contenttypes.ui.job.job_description=Description du poste:
 cms.contenttypes.ui.job.person_specification=D\u00e9tails concernant la personne:
 cms.contenttypes.ui.job.contact_details=Contact:
+cms.contenttypes.job.type_label=Job Item

ccm-cms-types-legalnotice/src/com/arsdigita/cms/contenttypes/LegalNoticeResources.properties

@@ -1,2 +1,4 @@
 legal_notice.authoring.basic_properties.description=Edit the title, name, and government UID
 cms.contenttypes.ui.legal_notice.government_uid=Government UID:
+#Fixed Type! Defined in class ContentType#getLabel()
+cms.contenttypes.legalnotice.type_label=Legal Notice

ccm-cms-types-legalnotice/src/com/arsdigita/cms/contenttypes/LegalNoticeResources_de.properties

@@ -1,2 +1,4 @@
 legal_notice.authoring.basic_properties.description=Editieren vonTitel, Name und ID
 cms.contenttypes.ui.legal_notice.government_uid=Referenz:
+#Fixed Type! Defined in class ContentType#getLabel()
+cms.contenttypes.legalnotice.type_label=Rechtliche Information

ccm-cms-types-legalnotice/src/com/arsdigita/cms/contenttypes/LegalNoticeResources_en_GB.properties

@@ -1,2 +1,4 @@
 legal_notice.authoring.basic_properties.description=Edit the title, name, and government UID
 cms.contenttypes.ui.legal_notice.government_uid=Government UID:
+#Fixed Type! Defined in class ContentType#getLabel()
+cms.contenttypes.legalnotice.type_label=Legal Notice

ccm-cms-types-legalnotice/src/com/arsdigita/cms/contenttypes/LegalNoticeResources_fr.properties

@@ -1,2 +1,4 @@
 legal_notice.authoring.basic_properties.description=Edit the title, name, and government UID
 cms.contenttypes.ui.legal_notice.government_uid=Identifiant d\u00e9partement:
+#Fixed Type! Defined in class ContentType#getLabel()
+cms.contenttypes.legalnotice.type_label=Legal Notice

ccm-cms-types-member/src/com/arsdigita/cms/contenttypes/MemberResources.properties

@@ -0,0 +1,2 @@
+#Fixed Type! Defined in class ContentType#getLabel()
+cms.contenttypes.member.type_label=Member

ccm-cms-types-member/src/com/arsdigita/cms/contenttypes/MemberResources_de.properties

@@ -0,0 +1,2 @@
+#Fixed Type! Defined in class ContentType#getLabel()
+cms.contenttypes.member.type_label=Mitglied

ccm-cms-types-member/src/com/arsdigita/cms/contenttypes/MemberResources_en_GB.properties

@@ -0,0 +1,2 @@
+#Fixed Type! Defined in class ContentType#getLabel()
+cms.contenttypes.member.type_label=Member

ccm-cms-types-member/src/com/arsdigita/cms/contenttypes/MemberResources_fr.properties

@@ -0,0 +1,2 @@
+#Fixed Type! Defined in class ContentType#getLabel()
+cms.contenttypes.member.type_label=Member

ccm-cms-types-minutes/src/com/arsdigita/cms/contenttypes/MinutesResources.properties

@@ -3,3 +3,5 @@ cms.contenttypes.ui.minutes.reference=Reference:
 cms.contenttypes.ui.minutes.action_item=Action Item:
 cms.contenttypes.ui.minutes.attendees=Attendees:
 cms.contenttypes.ui.minutes.description_of=Description of Minutes:
+#Fixed Key! Defined in class ContentType#getLabel()
+cms.contenttypes.minutes.type_label=Minutes

ccm-cms-types-minutes/src/com/arsdigita/cms/contenttypes/MinutesResources_de.properties

@@ -3,3 +3,5 @@ cms.contenttypes.ui.minutes.reference=Referenz:
 cms.contenttypes.ui.minutes.action_item=Aktionselement:
 cms.contenttypes.ui.minutes.attendees=Teilnehmer:
 cms.contenttypes.ui.minutes.description_of=Beschreibung der Tagesordnungspunkte:
+#Fixed Key! Defined in class ContentType#getLabel()
+cms.contenttypes.minutes.type_label=Protokoll

ccm-cms-types-minutes/src/com/arsdigita/cms/contenttypes/MinutesResources_en_GB.properties

@@ -3,3 +3,5 @@ cms.contenttypes.ui.minutes.reference=Reference:
 cms.contenttypes.ui.minutes.action_item=Action Item:
 cms.contenttypes.ui.minutes.attendees=Attendees:
 cms.contenttypes.ui.minutes.description_of=Description of Minutes:
+#Fixed Key! Defined in class ContentType#getLabel()
+cms.contenttypes.minutes.type_label=Minutes

ccm-cms-types-minutes/src/com/arsdigita/cms/contenttypes/MinutesResources_fr.properties

@@ -3,3 +3,5 @@ cms.contenttypes.ui.minutes.reference=R\u00e9ference
 cms.contenttypes.ui.minutes.action_item=Action de l'\u00e9l\u00e9ment
 cms.contenttypes.ui.minutes.attendees=Participants:
 cms.contenttypes.ui.minutes.description_of=Description de la r\u00e9union
+#Fixed Key! Defined in class ContentType#getLabel()
+cms.contenttypes.minutes.type_label=Minutes

ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/MultiPartArticleResources.properties

@@ -32,3 +32,4 @@ cms.contenttypes.ui.mparticle.section.create_break=Create page break
 cms.contenttypes.ui.mparticle.image.delete_button=Delete Image
 cms.contenttypes.ui.mparticle.section_table.link_move_below=move belowe here
 cms.contenttypes.ui.mparticle.section_table.link_not_defined=(No action possible)
+cms.contenttypes.multipartarticle.type_label=Multipart Article

ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/MultiPartArticleResources_de.properties

@@ -32,3 +32,4 @@ cms.contenttypes.ui.mparticle.section.create_break=Seitenumbruch einf\u00fcgen
 cms.contenttypes.ui.mparticle.image.delete_button=Bild Entfernen
 cms.contenttypes.ui.mparticle.section_table.link_move_below=unterhalb verschieben
 cms.contenttypes.ui.mparticle.section_table.link_not_defined=(Keine Aktion m\u00f6glich)
+cms.contenttypes.multipartarticle.type_label=Mehrteiliger Artikel

ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/MultiPartArticleResources_fr.properties

@@ -32,3 +32,4 @@ cms.contenttypes.ui.mparticle.section.create_break=Create section break
 cms.contenttypes.ui.mparticle.image.delete_button=Delete Image
 cms.contenttypes.ui.mparticle.section_table.link_move_below=move belowe here
 cms.contenttypes.ui.mparticle.section_table.link_not_defined=(No action possible)
+cms.contenttypes.multipartarticle.type_label=Multipart Article

ccm-cms-types-newsitem/src/com/arsdigita/cms/contenttypes/NewsItemResources.properties

@@ -8,3 +8,4 @@ cms.contenttypes.ui.newsitem.news_date=Date
 cms.contenttypes.ui.newsitem.unknown=unknown
 cms.contenttypes.ui.newsitem.yes=Yes
 cms.contenttypes.ui.newsitem.no=No
+cms.contenttypes.newsitem.type_label=News Item

ccm-cms-types-newsitem/src/com/arsdigita/cms/contenttypes/NewsItemResources_de.properties

@@ -16,3 +16,4 @@ cms.contenttypes.ui.newsitem.news_date=Erscheinungsdatum:
 cms.contenttypes.ui.newsitem.unknown=unbekannt
 cms.contenttypes.ui.newsitem.yes=Ja
 cms.contenttypes.ui.newsitem.no=Nein
+cms.contenttypes.newsitem.type_label=Neuigkeiten

ccm-cms-types-newsitem/src/com/arsdigita/cms/contenttypes/NewsItemResources_fr.properties

@@ -14,3 +14,4 @@ cms.contenttypes.ui.newsitem.news_date=Erscheinungsdatum:
 cms.contenttypes.ui.newsitem.unknown=unknown
 cms.contenttypes.ui.newsitem.yes=Yes
 cms.contenttypes.ui.newsitem.no=No
+cms.contenttypes.newsitem.type_label=News Item

ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/OrganizationResources.properties

@@ -11,3 +11,5 @@ cms.contenttypes.ui.organization.image=Image:
 cms.contenttypes.ui.organization.file_upload=Upload
 cms.contenttypes.ui.organization.file_delete=Delete
 cms.contenttypes.ui.organization.file_ignore=Ignore
+#Fixed Key! Defined in class ContentType#getLabel()
+cms.contenttypes.organization.type_label=Organization

ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/OrganizationResources_de.properties

@@ -11,3 +11,5 @@ cms.contenttypes.ui.organization.image=Bild:
 cms.contenttypes.ui.organization.file_upload=Hochladen
 cms.contenttypes.ui.organization.file_delete=L\u00f6schen
 cms.contenttypes.ui.organization.file_ignore=\u00dcberspringen
+#Fixed Key! Defined in class ContentType#getLabel()
+cms.contenttypes.organization.type_label=Organisation

ccm-cms-types-person/src/com/arsdigita/cms/contenttypes/PersonResources.properties

@@ -0,0 +1,4 @@
+person.authoring.logo_image.title=Assign Logo Image
+person.authoring.logo_image.description=Assign Logo Image
+#Fixed Key! Defined in class ContentType#getLabel()
+cms.contenttypes.person.type_label=Person

ccm-cms-types-person/src/com/arsdigita/cms/contenttypes/PersonResources_de.properties

@@ -0,0 +1,4 @@
+person.authoring.logo_image.title=Assign Logo Image
+person.authoring.logo_image.description=Assign Logo Image
+#Fixed Key! Defined in class ContentType#getLabel()
+cms.contenttypes.person.type_label=Person

ccm-cms-types-person/src/com/arsdigita/cms/contenttypes/PersonResources_en_GB.properties

@@ -0,0 +1,4 @@
+person.authoring.logo_image.title=Assign Logo Image
+person.authoring.logo_image.description=Assign Logo Image
+#Fixed Key! Defined in class ContentType#getLabel()
+cms.contenttypes.person.type_label=Person

ccm-cms-types-person/src/com/arsdigita/cms/contenttypes/PersonResources_fr.properties

@@ -0,0 +1,4 @@
+person.authoring.logo_image.title=Assign Logo Image
+person.authoring.logo_image.description=Assign Logo Image
+#Fixed Key! Defined in class ContentType#getLabel()
+cms.contenttypes.person.type_label=Person

ccm-cms-types-pressrelease/src/com/arsdigita/cms/contenttypes/PressReleaseResources.properties

@@ -1,3 +1,4 @@
 press_release.authoring.basic_properties.description=Edit the title, name, contact info, summary, ref. code and release date
 cms.contenttypes.ui.pressrelease.contact_info=Contact Info:
 cms.contenttypes.ui.pressrelease.ref_code=Ref. Code:
+cms.contenttypes.pressrelease.type_label=Press Release

ccm-cms-types-pressrelease/src/com/arsdigita/cms/contenttypes/PressReleaseResources_de.properties

@@ -1,3 +1,4 @@
 press_release.authoring.basic_properties.description=Editieren von Titel, Name, Kontakt Information, Zusammenfassung, Ref. Id und Erscheinungsdatum
 cms.contenttypes.ui.pressrelease.contact_info=Kontaktinformation:
 cms.contenttypes.ui.pressrelease.ref_code=Referenz:
+cms.contenttypes.pressrelease.type_label=Pressemitteilung

ccm-cms-types-pressrelease/src/com/arsdigita/cms/contenttypes/PressReleaseResources_fr.properties

@@ -1,3 +1,4 @@
 press_release.authoring.basic_properties.description=Edit the title, name, contact info, summary, ref. code and release date
 cms.contenttypes.ui.pressrelease.contact_info=Contact:
 cms.contenttypes.ui.pressrelease.ref_code=Code de r\u00e9f\u00e9rence:
+cms.contenttypes.pressrelease.type_label=Press Release

ccm-cms-types-service/src/com/arsdigita/cms/contenttypes/ServiceResources.properties

@@ -3,3 +3,5 @@ cms.contenttypes.ui.service.services_provided=Services Provided:
 cms.contenttypes.ui.service.opening_times=Opening Times:
 cms.contenttypes.ui.service.contacts=Contacts:
 cms.contenttypes.ui.service.address=Address:
+#Fixed Key! Defined in class ContentTypes#getLabel()
+cms.contenttypes.service.type_label=Service

ccm-cms-types-service/src/com/arsdigita/cms/contenttypes/ServiceResources_de.properties

@@ -3,3 +3,5 @@ cms.contenttypes.ui.service.services_provided=Verf\u00fcgbarer Service:
 cms.contenttypes.ui.service.opening_times=\u00d6ffnungszeiten:
 cms.contenttypes.ui.service.contacts=Kontakte:
 cms.contenttypes.ui.service.address=Adresse:
+#Fixed Key! Defined in class ContentTypes#getLabel()
+cms.contenttypes.service.type_label=Service

ccm-cms-types-service/src/com/arsdigita/cms/contenttypes/ServiceResources_fr.properties

@@ -3,3 +3,5 @@ cms.contenttypes.ui.service.services_provided=Services propos\u00e9s:
 cms.contenttypes.ui.service.opening_times=Heures d'ouverture:
 cms.contenttypes.ui.service.contacts=Contacts:
 cms.contenttypes.ui.service.address=Addresse:
+#Fixed Key! Defined in class ContentTypes#getLabel()
+cms.contenttypes.service.type_label=Service

ccm-cms-types-simpleaddress/src/com/arsdigita/cms/contenttypes/SimpleAddressResources.properties

@@ -14,3 +14,5 @@ cms.contenttypes.ui.simpleaddress.uri=URL
 cms.contenttypes.ui.simpleaddress.uri_desc=A URL to find more information about this Address
 cms.contenttypes.ui.simpleaddress.uri_hint=A URL to find more information about this Address
 cms.contenttypes.ui.simpleaddress.error_iso_country=You must select a country
+#Fixed Key! Defined in class ContentType#getLabel()
+cms.contenttypes.simpleaddress.type_label=Simple Address

ccm-cms-types-simpleaddress/src/com/arsdigita/cms/contenttypes/SimpleAddressResources_de.properties

@@ -18,3 +18,5 @@ cms.contenttypes.ui.simpleaddress.uri=URL
 cms.contenttypes.ui.simpleaddress.uri_desc=URL, um weitere Informationen zu erhalten
 cms.contenttypes.ui.simpleaddress.uri_hint=URL, um weitere Informationen zu erhalten
 cms.contenttypes.ui.simpleaddress.error_iso_country=Es muss ein Land ausgew\u00e4hlt werden
+#Fixed Key! Defined in class ContentType#getLabel()
+cms.contenttypes.simpleaddress.type_label=(Einfache) Adresse

ccm-cms/src/com/arsdigita/cms/ContentType.java

@@ -42,6 +42,7 @@ import java.util.ArrayList;
 import java.net.URL;
 import java.net.MalformedURLException;
 import java.util.StringTokenizer;
+import org.apache.log4j.Logger;
 
 /**
  * <p>A Content Type defines the characteristics of a content
@@ -60,6 +61,12 @@ import java.util.StringTokenizer;
  */
 public class ContentType extends ACSObject {
 
+    /** Internal logger instance to faciliate debugging. Enable logging output
+     *  by editing /WEB-INF/conf/log4j.properties int hte runtime environment
+     *  and set com.arsdigita.cms.ui.authoring.NewItemForm=DEBUG by uncommenting 
+     *  or adding the line.                                                   */
+    private static final Logger s_log = Logger.getLogger(ContentType.class);
+
     public static final String BASE_DATA_OBJECT_TYPE =
                                "com.arsdigita.cms.ContentType";
     public static final String OBJECT_TYPE = "associatedObjectType";
@@ -155,27 +162,69 @@ public class ContentType extends ACSObject {
     }
     
     /**
-     * Fetches the label for the content type.
+     * Fetches the label for the content type. The label is a globalized 
+     * notation displayed to the user to identify the content type. As an
+     * example a content type named "Article" (as in getName()) will be 
+     * displayed in an english environment as the label "Article", in 
+     * German as "Artikel", etc.
      * 
-     * @return The label
+     * The label is retrieved from content type's resources. The message uses
+     * some convention to retrieve the message key and resource bundle.
+     * 
+     * Client classes may overwrite the method to provide a label from a 
+     * diffrent source.
+     * 
+     * @return The (globalized) label.
      */
-    public String getLabel() {
+    public GlobalizedMessage getLabel() {
-        return (String) get(LABEL);
-    }
         
-    public GlobalizedMessage getTypeLabel() {
+        // We assume the name of the resource bundle is the same as the 
-        GlobalizedMessage label = null;
+        // ObjectType "Resources" appended.
+        String objectTypeName = getAssociatedObjectType();        
+            if (s_log.isDebugEnabled()) {
+                s_log.debug(
+                        "Object Type is " + objectTypeName );
+            }
+        String bundleName = objectTypeName.concat("Resources");
+        // We assume the name of the key is the same as the ObjectType 
+        // minus the domain part ("com.arsdigita.") and staring with "cms"
+        // and ".type_label" appended
+        int keyBegin = objectTypeName.indexOf("cms");
+        String labelKey = objectTypeName.substring(keyBegin)
+                                        .concat(".type_label")
+                                        .toLowerCase();
+        
+        // Create the globalized label
+        GlobalizedMessage label = new GlobalizedMessage(labelKey, bundleName);
 
         return label;
     }
 
     /**
-     * Sets the label for this content type.
+     * Fetches the name for the content type. The name is a fixed String, which
+     * 'names' a content type and is not localizible. It is stored in the
+     * database and a symbolic name for the formal ID. It may contain any
+     * characters but is preferable an english term. Examples are "FAQ item" or
+     * "Article" or "Multipart Aricle". It has to be unique system-wide.
      *
-     * @param label The label
+     * @return The label
      */
-    public void setLabel(String label) {
+    public String getName() {
-        set(LABEL, label);
+        return (String) get(LABEL);
+    }
+
+    /**
+     * Sets the name for this content type. The name is a fixed String.
+     * @see getName() for additional details.
+     * 
+     * The name is stored in the database. In the database this property is
+     * stored under 'label', when globliation was not an issue.
+     * The Method is primarly used in the initial loading step.
+     *
+     * @param name The label
+     */
+    public void setName(String name) {
+        set(LABEL, name);
     }
 
     /**

ccm-cms/src/com/arsdigita/cms/ContentTypeCollection.java

@@ -38,6 +38,7 @@ public class ContentTypeCollection extends DomainCollection {
     /**
      * Constructor.
      *
+     * @param dataCollection
      */
     public ContentTypeCollection(DataCollection dataCollection) {
         super(dataCollection);
@@ -67,7 +68,9 @@ public class ContentTypeCollection extends DomainCollection {
      * Returns a <code>DomainObject</code> for the current position in
      * the collection.
      *
+     * @return 
      */
+    @Override
     public DomainObject getDomainObject() {
         return new ContentType(m_dataCollection.getDataObject());
     }
@@ -76,6 +79,7 @@ public class ContentTypeCollection extends DomainCollection {
      * Returns a <code>LifecycleDefinition</code> for the current position in
      * the collection.
      *
+     * @return 
      */
     public ContentType getContentType() {
         return (ContentType) getDomainObject();
@@ -84,6 +88,7 @@ public class ContentTypeCollection extends DomainCollection {
     /**
      * Reset this collection
      */
+    @Override
     public void reset() {
         m_dataCollection.reset();
     }

ccm-cms/src/com/arsdigita/cms/ContentTypeWorkflowTemplate.java

@@ -118,7 +118,7 @@ public class ContentTypeWorkflowTemplate extends DomainObject {
                 (new OID(WorkflowTemplate.BASE_DATA_OBJECT_TYPE, id));
         } catch (DataObjectNotFoundException e) {
             s_log.debug("There is no default workflow template for CT " +
-                    type.getLabel() +
+                    type.getName() +
                     " in section " +
                     section.getName());
             return null;

ccm-cms/src/com/arsdigita/cms/contenttypes/ContentTypeHelperImpl.java

@@ -199,7 +199,7 @@ public class ContentTypeHelperImpl implements ContentTypeHelper {
             s_log.debug("making new content type");
             m_type =
             ContentType.findByAssociatedObjectType(m_objectType);
-            m_type.setLabel(m_label);
+            m_type.setName(m_label);
             m_type.setDescription(m_description);
             m_type.save();
         } catch (DataObjectNotFoundException e) {
@@ -214,7 +214,7 @@ public class ContentTypeHelperImpl implements ContentTypeHelper {
             // you need to use labelKey, labelBundle, descriptionKey
             // and descriptionBundle
             m_type = new ContentType();
-            m_type.setLabel(m_label);
+            m_type.setName(m_label);
             m_type.setDescription(m_description);
             m_type.setClassName(m_className);
             m_type.setAssociatedObjectType(m_objectType);

ccm-cms/src/com/arsdigita/cms/contenttypes/GenericAddress.java

@@ -21,7 +21,9 @@ package com.arsdigita.cms.contenttypes;
 import com.arsdigita.globalization.LocaleNegotiator;
 import com.arsdigita.cms.ContentType;
 import com.arsdigita.cms.ContentPage;
+import com.arsdigita.cms.contenttypes.util.ContenttypesGlobalizationUtil;
 import com.arsdigita.domain.DataObjectNotFoundException;
+import com.arsdigita.globalization.GlobalizedMessage;
 import com.arsdigita.persistence.DataObject;
 import com.arsdigita.persistence.OID;
 import com.arsdigita.util.Assert;
@@ -209,4 +211,5 @@ public class GenericAddress extends ContentPage {
 
         return countryNames;
     }
+    
 }

ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericAddressCreate.java

@@ -15,8 +15,8 @@ import com.arsdigita.cms.ui.authoring.PageCreate;
 import java.util.Date;
 
 /**
- * Special create step for GenericAddress, creating a {@link GenericAddressBundle} instead of a 
+ * Special create step for GenericAddress, creating a {@link GenericAddressBundle} 
- * Content Bundle
+ * instead of a Content Bundle
  * 
  * @author Jens Pelzetter <jens@jp-digital.de>
  * @version $Id$

ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericPersonCreate.java

@@ -63,7 +63,7 @@ public class GenericPersonCreate extends PageCreate {
         m_workflowSection = new ApplyWorkflowFormSection(type);
         add(m_workflowSection, ColumnPanel.INSERT);
         add(new Label(GlobalizationUtil.globalize("cms.ui.authoring.content_type")));
-        add(new Label(type.getLabel()));
+        add(new Label(type.getName()));
         //add(new Label(GlobalizationUtil.globalize("cms.ui.language.field")));
         //add(new LanguageWidget(LANGUAGE));
         final LanguageWidget languageWidget = new LanguageWidget(LANGUAGE);

ccm-cms/src/com/arsdigita/cms/dispatcher/ContentItemDispatcher.java

@@ -179,7 +179,7 @@ public class ContentItemDispatcher implements Dispatcher {
             s_log.debug("updating mapping for item " + item.getName() +
                         " with ID " + item.getID() +
                         " in section " + section.getName() +
-                        " of type " + item.getContentType().getLabel() +
+                        " of type " + item.getContentType().getName() +
                         " to template " + sPath);
         }
 
@@ -199,7 +199,7 @@ public class ContentItemDispatcher implements Dispatcher {
                                 ContentType type,
                                 Template t) {
         s_log.debug("updating cache for section " + section.getName() +
-                    " and type " + type.getLabel());
+                    " and type " + type.getName());
 
         //get all the items in the section
         ItemCollection items = section.getItems();
@@ -258,7 +258,7 @@ public class ContentItemDispatcher implements Dispatcher {
         s_log.debug("updating mapping for item " + item.getName() +
                     " with ID " + item.getID() +
                     " in section " + item.getContentSection().getName() +
-                    " of type " + item.getContentType().getLabel() +
+                    " of type " + item.getContentType().getName() +
                     " to template " + sTemplatePath);
         cachePut(item.getID(), sTemplatePath);
     }

ccm-cms/src/com/arsdigita/cms/dispatcher/SimpleXMLGenerator.java

@@ -286,7 +286,7 @@ public class SimpleXMLGenerator implements XMLGenerator {
         final Element element = startElement(useContext, parent);
         final Element additionalAttrs = UDItemElement(useContext);
 
-        element.addAttribute("type", UDItem.getContentType().getLabel());
+        element.addAttribute("type", UDItem.getContentType().getName());
         element.addAttribute("id", UDItem.getID().toString());
         element.addAttribute("name", UDItem.getName());
         element.addAttribute("title", UDItem.getTitle());

ccm-cms/src/com/arsdigita/cms/ui/ContentItemNavbar.java

@@ -82,7 +82,7 @@ public class ContentItemNavbar extends CMSContainer {
         element.addAttribute("sectionURL", section.getURL() +
                              PageLocations.SECTION_PAGE +
                              returnFolder);
-        element.addAttribute("type", type.getLabel());
+        element.addAttribute("type", type.getName());
         element.addAttribute("name", item.getDisplayName());
         exportAttributes(element);
         parent.addContent(element);

ccm-cms/src/com/arsdigita/cms/ui/ContentItemPage.java

@@ -537,7 +537,7 @@ public class ContentItemPage extends CMSPage implements ActionListener {
     protected Element generateXMLHelper(PageState state, Document parent) {
         Element page = super.generateXMLHelper(state, parent);
         Element contenttype = page.newChildElement("bebop:contentType", BEBOP_XML_NS);
-        contenttype.setText(m_item.getContentItem(state).getContentType().getLabel());
+        contenttype.setText(m_item.getContentItem(state).getContentType().getName());
 
         return page;
     }

ccm-cms/src/com/arsdigita/cms/ui/FlatItemList.java

@@ -273,9 +273,11 @@ public class FlatItemList extends SegmentedPanel
                 // ACSObject parent = currentFolder.getParent();
                 DataObject context = PermissionService.getContext(currentFolder);
                 if (context == null) {
-                    target.setLabel(GlobalizationUtil.globalize("cms.ui.restore_default_permissions"));
+                    target.setLabel(GlobalizationUtil
+                                    .globalize("cms.ui.restore_default_permissions"));
                 } else {
-                    target.setLabel((String) GlobalizationUtil.globalize("cms.ui.use_custom_permissions").localize());
+                    target.setLabel(GlobalizationUtil
+                                    .globalize("cms.ui.use_custom_permissions"));
                 }
             }