Anpassung und Vervollständigung ResourceBundles sowie Sprachumschaltung abgeschlossen.

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

ccm-cms-types-motditem/src/com/arsdigita/cms/contenttypes/MOTDResources.properties

@@ -0,0 +1,2 @@
+motd.authoring.basic_properties.description=Edit the title, name, and details of motd
+cms.contenttypes.ui.motd.message=Message:

ccm-cms-types-motditem/src/com/arsdigita/cms/contenttypes/MOTDResources_de.properties

@@ -0,0 +1,2 @@
+motd.authoring.basic_properties.description=Edit the title, name, and details of motd
+cms.contenttypes.ui.motd.message=Beitrag:

ccm-cms-types-motditem/src/com/arsdigita/cms/contenttypes/MOTDResources_en_GB.properties

@@ -0,0 +1,2 @@
+motd.authoring.basic_properties.description=Edit the title, name, and details of motd
+cms.contenttypes.ui.motd.message=Message:

ccm-cms-types-motditem/src/com/arsdigita/cms/contenttypes/MOTDResources_fr.properties

@@ -0,0 +1,2 @@
+motd.authoring.basic_properties.description=Edit the title, name, and details of motd
+cms.contenttypes.ui.motd.message=Message:

ccm-cms-types-motditem/src/com/arsdigita/cms/contenttypes/ui/MOTDComponent.java

@@ -58,7 +58,8 @@ public class MOTDComponent extends SimpleComponent {
         if ( categoryID == null ) {
             try {
                 DataCollection motds = 
-                    SessionManager.getSession().retrieve(MOTDItem.BASE_DATA_OBJECT_TYPE);
+                    SessionManager.getSession()
+                                  .retrieve(MOTDItem.BASE_DATA_OBJECT_TYPE);
                 motds.addFilter("version = 'live'");
                 motds.addOrder("id desc");
               

ccm-cms-types-motditem/src/com/arsdigita/cms/contenttypes/ui/authoring/MOTDItemCreate.java

@@ -73,7 +73,8 @@ public class MOTDItemCreate extends PageCreate {
         msg.setCols(40);
         msg.setRows(5);
 
-        add(new Label(MOTDGlobalizationUtil.globalize("cms.contenttypes.ui.motd.message")));
+        add(new Label(MOTDGlobalizationUtil
+                      .globalize("cms.contenttypes.ui.motd.message")));
         add(msg);
     }
 

ccm-cms-types-motditem/src/com/arsdigita/cms/contenttypes/ui/authoring/MOTDItemFileEdit.java

@@ -41,6 +41,7 @@ import com.arsdigita.cms.ui.authoring.BasicPageForm;
 import com.arsdigita.cms.ui.authoring.AuthoringKitWizard;
 import com.arsdigita.cms.ui.authoring.SimpleEditStep;
 import com.arsdigita.cms.ui.workflow.WorkflowLockedComponentAccess;
+import com.arsdigita.cms.util.GlobalizationUtil;
 import com.arsdigita.web.URL;
 
 import java.io.IOException;
@@ -68,7 +69,9 @@ public class MOTDItemFileEdit extends SimpleEditStep {
             form.getSaveCancelSection().getCancelButton());
 
         DomainObjectPropertySheet sheet = new DomainObjectPropertySheet(itemModel);
-        sheet.add(MOTDGlobalizationUtil.globalize("cms.contenttypes.ui.motd.file"), "file.name",
+        sheet.add(GlobalizationUtil
+                  .globalize("cms.contenttypes.ui.file_upload.file"),
+                  "file.name",
                   new DomainObjectPropertySheet.AttributeFormatter() {
                       public String format(DomainObject item,
                                            String attribute,
@@ -82,7 +85,9 @@ public class MOTDItemFileEdit extends SimpleEditStep {
                               "\" target=\"_blank\">" +
                               asset.getDisplayName() + "</a>";
                           } else {
-                              return (String)MOTDGlobalizationUtil.globalize("cms.ui.authoring.none").localize();
+                              return (String)GlobalizationUtil.globalize(
+                                      "cms.ui.authoring.file_upload.no_file")
+                                      .localize();
                           }
                       }
                   });
@@ -109,7 +114,8 @@ public class MOTDItemFileEdit extends SimpleEditStep {
 
         protected void addWidgets() {
             
-            add(new Label(MOTDGlobalizationUtil.globalize("cms.contenttypes.ui.motd.file")));
+            add(new Label(GlobalizationUtil
+                          .globalize("cms.ui.authoring.file_upload.file")));
             add(new Label(new PrintListener() {
                     
                     public void prepare(PrintEvent e) {
@@ -123,12 +129,15 @@ public class MOTDItemFileEdit extends SimpleEditStep {
                         if (file != null) {
                             l.setLabel(file.getName());
                         } else {
-                            l.setLabel(MOTDGlobalizationUtil.globalize("cms.ui.none"));
+                            l.setLabel(GlobalizationUtil
+                                       .globalize("cms.ui.none"));
                         }
                     }
                 }));
 
-            m_fileUploadSection = new FileUploadSection(MOTDGlobalizationUtil.globalize("cms.ui.authoring.file_upload.file_type"),"","");
+            m_fileUploadSection = new 
+                    FileUploadSection(GlobalizationUtil
+                    .globalize("cms.ui.authoring.file_upload.file_type"),"","");
             m_fileUploadSection.getFileUploadWidget()
                 .addValidationListener(new NotNullValidationListener());
 

ccm-cms-types-motditem/src/com/arsdigita/cms/contenttypes/ui/authoring/MOTDItemPropertiesStep.java

@@ -24,6 +24,7 @@ import com.arsdigita.cms.ItemSelectionModel;
 import com.arsdigita.cms.ui.authoring.SimpleEditStep;
 import com.arsdigita.cms.ui.authoring.AuthoringKitWizard;
 import com.arsdigita.cms.ui.authoring.BasicPageForm;
+import com.arsdigita.cms.util.GlobalizationUtil;
 import com.arsdigita.toolbox.ui.DomainObjectPropertySheet;
 import com.arsdigita.bebop.Component;
 import com.arsdigita.bebop.event.FormProcessListener;
@@ -65,9 +66,15 @@ public class MOTDItemPropertiesStep extends SimpleEditStep {
         (ItemSelectionModel itemModel) {
 
         DomainObjectPropertySheet sheet = new DomainObjectPropertySheet(itemModel);
-        sheet.add(MOTDGlobalizationUtil.globalize("cms.ui.authoring.name_url"), MOTDItem.NAME);
+        sheet.add(GlobalizationUtil
-        sheet.add(MOTDGlobalizationUtil.globalize("cms.ui.authoring.page_title"), MOTDItem.TITLE);
+                  .globalize("cms.contenttypes.ui.title"), 
-        sheet.add(MOTDGlobalizationUtil.globalize("cms.contenttypes.ui.motd.message"), MOTDItem.MESSAGE);
+                  MOTDItem.TITLE);
+        sheet.add(GlobalizationUtil
+                  .globalize("cms.contenttypes.ui.name"), 
+                  MOTDItem.NAME);
+        sheet.add(MOTDGlobalizationUtil
+                  .globalize("cms.contenttypes.ui.motd.message"), 
+                  MOTDItem.MESSAGE);
 
         return sheet;
     }
@@ -92,7 +99,8 @@ public class MOTDItemPropertiesStep extends SimpleEditStep {
             msg.setCols(40);
             msg.setRows(5);
             
-            add(new Label(MOTDGlobalizationUtil.globalize("cms.contenttypes.ui.motd.message")));
+            add(new Label(MOTDGlobalizationUtil
+                          .globalize("cms.contenttypes.ui.motd.message")));
             add(msg);
         }
 
@@ -107,7 +115,9 @@ public class MOTDItemPropertiesStep extends SimpleEditStep {
             
             if (getSaveCancelSection().getSaveButton()
                 .isSelected(e.getPageState())) {
-                throw new FormProcessException((String)MOTDGlobalizationUtil.globalize("cms.ui.submission_cancelled").localize());
+                throw new FormProcessException((String)
+                          GlobalizationUtil.globalize("cms.ui.submission_cancelled")
+                          .localize());
             }
         }
 

ccm-cms/src/com/arsdigita/cms/CMSResources.properties

@@ -24,30 +24,11 @@ cms.contenttypes.contact=Contact:
 cms.contenttypes.contact_details=Contact Details:
 cms.contenttypes.contact_information=Contact Information:
 cms.contenttypes.contactinfo=ContactInfo:
-cms.contenttypes.cost=Cost:
 cms.contenttypes.coudlnt_retrieve_text=Coudln't retrieve text
-cms.contenttypes.current_image=Current Image:
-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
-
-#used in ccm-cms-types-job
-cms.contenttypes.grade=Grade:
 #used in ccm-cms-types-organization
 cms.contenttypes.image=Image:
-cms.contenttypes.installer.article_section=Article Section
-cms.contenttypes.installer.article_section_for_a_multipart_article=Article section for a multi-part article
-cms.contenttypes.job_description=Description:
-cms.contenttypes.job_type_not_registered=Job type not registered
-cms.contenttypes.lead=Description:
-cms.contenttypes.legalnotice_type_not_registered=LegalNotice type not registered
 cms.contenttypes.link=Link:
-cms.contenttypes.link_to_map=Link to Map:
-cms.contenttypes.location=Location:
-cms.contenttypes.main_contributor=Main Contributor:
-cms.contenttypes.minutes_type_not_registered=Minutes type not registered
-cms.contenttypes.newsitem_type_not_registered=NewsItem type not registered
 cms.contenttypes.no_content_section=No content section
 cms.contenttypes.no_section=No section
 cms.contenttypes.opening_time=Opening Time:
@@ -65,16 +46,7 @@ cms.contenttypes.shared.basic_properties.description=Edit Basic Properties
 cms.contenttypes.shared.basic_properties.title=Basic Properties
 cms.contenttypes.shared.body_text.title=Body Text
 cms.contenttypes.shared.body_text.description=Edit the Body Text
-
-
-# Package com.arsdigita.cms.contenttypes.ui
-# =========================================
-cms.contenttypes.ui.action_item=Action Item:
 cms.contenttypes.ui.address=Address:
-cms.contenttypes.ui.attendees=Attendees:
-cms.contenttypes.ui.bodyoverview=Body/Overview:
-cms.contenttypes.ui.closing_date=Closing Date:
-cms.contenttypes.ui.contact_details=Contact Details:
 cms.contenttypes.ui.contact_info=Contact Info:
 cms.contenttypes.ui.contacts=Contacts:
 cms.contenttypes.ui.content_group_current_items=Current Items:
@@ -83,16 +55,11 @@ cms.contenttypes.ui.content_group_new_item=Add new item:
 cms.contenttypes.ui.cost=Cost:
 cms.contenttypes.ui.creation_date=Creation Date:
 cms.contenttypes.ui.date=Date:
-cms.contenttypes.ui.department=Department:
 cms.contenttypes.ui.description=Description:
 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.government_uid=Government UID:
-cms.contenttypes.ui.grade=Grade:
 cms.contenttypes.ui.homepage=Homepage:
-cms.contenttypes.ui.job_description=Job Description:
 cms.contenttypes.ui.launch_date=Launch Date:
 cms.contenttypes.ui.lead=Description:
 cms.contenttypes.ui.lead_line=Description:
@@ -103,10 +70,7 @@ cms.contenttypes.ui.name=Name (URL stub):
 cms.contenttypes.ui.opening_times=Opening Times:
 cms.contenttypes.ui.person_specification=Person Specification:
 cms.contenttypes.ui.ref_code=Ref. Code:
-cms.contenttypes.ui.ref_number=Ref Number:
-cms.contenttypes.ui.reference=Reference:
 cms.contenttypes.ui.reference_code=Reference Code:
-cms.contenttypes.ui.salary=Salary:
 cms.contenttypes.ui.services_provided=Services Provided:
 cms.contenttypes.ui.start_date=Start Date:
 cms.contenttypes.ui.start_time=Start Time:
@@ -342,11 +306,9 @@ cms.ui.authoring.an_item_with_this_name_already_exists=An item with this name al
 cms.ui.authoring.bad_getblob_datatype=Bad getBlob datatype
 cms.ui.authoring.bad_getclob_datatype=Bad getClob datatype
 cms.ui.authoring.body=Body:
-cms.ui.authoring.caption=Caption:
 cms.ui.authoring.content_type=Content Type:
 cms.ui.authoring.couldnt_create_contentpage=Couldn't create ContentPage
 cms.ui.authoring.edit_body_text=Edit Body Text:
-cms.ui.authoring.edit_caption=Edit caption
 cms.ui.authoring.file_action=File Action
 cms.ui.authoring.file_upload.auto_detect=(Auto-detect)
 cms.ui.authoring.file_upload.file_type=File Type:

ccm-cms/src/com/arsdigita/cms/CMSResources_de.properties

@@ -24,30 +24,11 @@ cms.contenttypes.contact=Kontakt:
 cms.contenttypes.contact_details=Kontaktdetails:
 cms.contenttypes.contact_information=Kontaktinformation:
 cms.contenttypes.contactinfo=Kontaktinformation:
-cms.contenttypes.cost=Kosten:
 cms.contenttypes.coudlnt_retrieve_text=Text konnte nicht gefunden werden
-cms.contenttypes.current_image=Gegenw\u00e4rtiges Bild\:
-cms.contenttypes.department=Abteilung:
-cms.contenttypes.end_date=Enddatum:
-cms.contenttypes.end_time=Ende um:
 cms.contenttypes.event_type_not_registered=Veranstaltungs-Typ nicht registriert
-
-#used in ccm-cms-types-job
-cms.contenttypes.grade=Grade:
 #used in ccm-cms-types-organization
 cms.contenttypes.image=Bilder:
-cms.contenttypes.installer.article_section=Artikelabschnitt
-cms.contenttypes.installer.article_section_for_a_multipart_article=Artikelabschnitt 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):
-cms.contenttypes.legalnotice_type_not_registered=Inhaltstyp LegalNotice nicht registriert
 cms.contenttypes.link=Link:
-cms.contenttypes.link_to_map=Karte (Link)\:
-cms.contenttypes.location=Ort:
-cms.contenttypes.main_contributor=Hauptredner\:
-cms.contenttypes.minutes_type_not_registered=Inhaltstyp Minutes nicht registriert
-cms.contenttypes.newsitem_type_not_registered=Inhaltstyp NewsItem nicht registriert
 cms.contenttypes.no_content_section=Kein Inhaltsabschnitt
 cms.contenttypes.no_section=Kein Abschnitt
 cms.contenttypes.opening_time=\u00d6ffnungszeit\:
@@ -65,16 +46,7 @@ cms.contenttypes.shared.basic_properties.description=Basiseigenschaften bearbeit
 cms.contenttypes.shared.basic_properties.title=Basiseigenschaften
 cms.contenttypes.shared.body_text.title=Haupttext
 cms.contenttypes.shared.body_text.description=Haupttext bearbeiten
-
-
-# Package com.arsdigita.cms.contenttypes.ui
-# =========================================
-cms.contenttypes.ui.action_item=Aktionselement:
 cms.contenttypes.ui.address=Adresse:
-cms.contenttypes.ui.attendees=Teilnehmer:
-cms.contenttypes.ui.bodyoverview=\u00dcbersicht\:
-cms.contenttypes.ui.closing_date=Abschluss am\:
-cms.contenttypes.ui.contact_details=Kontaktdetails:
 cms.contenttypes.ui.contact_info=Kontaktinformation:
 cms.contenttypes.ui.contacts=Kontakte:
 cms.contenttypes.ui.content_group_current_items=Aktuelle Items:
@@ -83,16 +55,11 @@ cms.contenttypes.ui.content_group_new_item=Neues Dokument hinzuf\u00fcgen:
 cms.contenttypes.ui.cost=Kosten:
 cms.contenttypes.ui.creation_date=Erstellungsdatum:
 cms.contenttypes.ui.date=Datum:
-cms.contenttypes.ui.department=Abteilung:
 cms.contenttypes.ui.description=Beschreibung:
 cms.contenttypes.ui.description_missing=Bitte eine Beschreibung eingeben
-cms.contenttypes.ui.description_of_minutes=Beschreibung der Tagesordnungspunkte:
 cms.contenttypes.ui.end_date=Enddatum:
 cms.contenttypes.ui.end_time=Ende um\:
-cms.contenttypes.ui.government_uid=Government UID:
-cms.contenttypes.ui.grade=Stufe:
 cms.contenttypes.ui.homepage=Homepage:
-cms.contenttypes.ui.job_description=Stellenbeschreibung:
 cms.contenttypes.ui.launch_date=Ver\u00f6ffentlichungsdatum:
 cms.contenttypes.ui.lead=Beschreibung (Lead Text):
 cms.contenttypes.ui.lead_line=Beschreibung (Lead Zeile):
@@ -103,10 +70,7 @@ cms.contenttypes.ui.name=Name (als Teil-URL):
 cms.contenttypes.ui.opening_times=\u00d6ffnungszeiten\:
 cms.contenttypes.ui.person_specification=Person Specification:
 cms.contenttypes.ui.ref_code=Ref. Code:
-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.start_date=Anfangsdatum:
 cms.contenttypes.ui.start_time=Anfangszeit:
@@ -340,11 +304,9 @@ cms.ui.authoring.an_item_with_this_name_already_exists=Ein Item mit diesem Namen
 cms.ui.authoring.bad_getblob_datatype=Ung\u00fcltiger Datentyp getBlob
 cms.ui.authoring.bad_getclob_datatype=Ung\u00fcltiger Datentyp getClob
 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_caption=Untertitel editieren
 cms.ui.authoring.file_action=Dateiaktion
 cms.ui.authoring.image_action=Bildaktion
 cms.ui.authoring.invalid_create_component=Creation component for parent content type is invalid.

ccm-cms/src/com/arsdigita/cms/CMSResources_fr.properties

@@ -17,38 +17,17 @@ cms.templates=Gabarits
 # Package com.arsdigita.cms.contenttypes
 # ======================================
 cms.contenttypes.coudlnt_retrieve_text=Impossible d'afficher le texte
-cms.contenttypes.installer.article_section=Repertoire article
-cms.contenttypes.installer.article_section_for_a_multipart_article=R\u00e9pertoire article pour un article \u00e0 plusieurs parties
-cms.contenttypes.job_type_not_registered=Type de poste non enregistr\u00e9
-cms.contenttypes.legalnotice_type_not_registered=Type de mentions l\u00e9gales non enregistr\u00e9es
-cms.contenttypes.minutes_type_not_registered=Type de r\u00e9union non enregistr\u00e9
-cms.contenttypes.newsitem_type_not_registered=Type d'\u00e9lement d'information non enregistr\u00e9
 cms.contenttypes.no_content_section=Pas de r\u00e9pertoire de contenu
 cms.contenttypes.no_section=Pas de repertoire
 cms.contenttypes.pressrelease_type_not_registered=Type de PresserRel\u00e2cher non enregistr\u00e9
 cms.contenttypes.service_type_not_registered=Type de service non enregistr\u00e9
-
-
-
-# Package com.arsdigita.cms.contenttypes.ui
-# =========================================
-cms.contenttypes.ui.action_item=Action de l'\u00e9l\u00e9ment
 cms.contenttypes.ui.address=Addresse
-cms.contenttypes.ui.attendees=Participants
-cms.contenttypes.ui.bodyoverview=Corps / Vue d'ensemble
-cms.contenttypes.ui.closing_date=Date de cl\u00f4ture
-cms.contenttypes.ui.contact_details=Contact
 cms.contenttypes.ui.contact_info=Contact
 cms.contenttypes.ui.contacts=Contacts
 cms.contenttypes.ui.cost=Co\u00fbt
 cms.contenttypes.ui.date=Date
-cms.contenttypes.ui.department=Departement
 cms.contenttypes.ui.description=Description
-cms.contenttypes.ui.description_of_minutes=Description de la r\u00e9union
-cms.contenttypes.ui.government_uid=Identifiant d\u00e9partement
-cms.contenttypes.ui.grade=Niveau
 cms.contenttypes.ui.homepage=Accueil
-cms.contenttypes.ui.job_description=Description du poste
 cms.contenttypes.ui.lead=Fil conducteur
 cms.contenttypes.ui.lead_line=Ligne de t\u00eate
 cms.contenttypes.ui.link_to_map=Lien vers la carte
@@ -56,10 +35,7 @@ cms.contenttypes.ui.name=Nom (URL)
 cms.contenttypes.ui.opening_times=Heures d'ouverture
 cms.contenttypes.ui.person_specification=D\u00e9tails concernant la personne
 cms.contenttypes.ui.ref_code=Code de r\u00e9f\u00e9rence
-cms.contenttypes.ui.ref_number=Num\u00e9ro de r\u00e9f\u00e9rence
-cms.contenttypes.ui.reference=R\u00e9ference
 cms.contenttypes.ui.reference_code=Code de r\u00e9ference
-cms.contenttypes.ui.salary=Salaire
 cms.contenttypes.ui.services_provided=Services propos\u00e9s
 cms.contenttypes.ui.summary=R\u00e9sum\u00e9
 cms.contenttypes.ui.summary=R\u00e9sum\u00e9
@@ -201,11 +177,9 @@ cms.ui.authoring.an_item_with_this_name_already_exists=Un \u00e9l\u00e9ment de c
 cms.ui.authoring.bad_getblob_datatype=TRANSLATE THIS: Bad getBlob datatype  (cms.ui.authoring.bad_getblob_datatype)
 cms.ui.authoring.bad_getclob_datatype=TRANSLATE THIS: Bad getClob datatype  (cms.ui.authoring.bad_getclob_datatype)
 cms.ui.authoring.body=Corsp de la page
-cms.ui.authoring.caption=L\u00e9gende
 cms.ui.authoring.content_type=Type de contenu
 cms.ui.authoring.couldnt_create_contentpage=Impossible de cr\u00e9er une page de contenu
 cms.ui.authoring.edit_body_text=Modifier le corps de la page
-cms.ui.authoring.edit_caption=Modifier la l\u00e9gende
 cms.ui.authoring.file_action=Action du fichier
 cms.ui.authoring.file_action=Action du fichier
 cms.ui.authoring.image_action=Action de l'image

ccm-cms/src/com/arsdigita/cms/ui/authoring/BasicPageForm.java

@@ -74,7 +74,8 @@ public abstract class BasicPageForm extends BasicItemForm {
      *
      * @param formName the name of this form
      * @param columnPanel the columnpanel of the form
-     * @param itemModel The {@link ItemSelectionModel} which will be responsible for loading the current item
+     * @param itemModel The {@link ItemSelectionModel} which will be responsible 
+     *                  for loading the current item
      */
     public BasicPageForm(String formName,
                          ColumnPanel columnPanel,
@@ -83,8 +84,8 @@ public abstract class BasicPageForm extends BasicItemForm {
     }
 
     /**
-     * Add various widgets to the form. Child classes should override this method to perform all their widget-adding
+     * Add various widgets to the form. Child classes should override this 
-     * needs
+     * method to perform all their widget-adding needs
      */
     @Override
     protected void addWidgets() {