Anpassung und Vervollständigung ResourceBundles sowie Sprachumschaltung abgeschlossen.

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

ccm-cms-types-job/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/Job.xml

@@ -7,7 +7,9 @@
 
   <!-- First off the adapters for ContentItemPanel -->
   <xrd:context name="com.arsdigita.cms.dispatcher.SimpleXMLGenerator">
-    <xrd:adapter objectType="com.arsdigita.cms.contenttypes.Job" extends="com.arsdigita.cms.ContentPage" traversalClass="com.arsdigita.cms.contenttypes.ContentItemTraversalAdapter">
+    <xrd:adapter objectType="com.arsdigita.cms.contenttypes.Job" 
+                    extends="com.arsdigita.cms.ContentPage" 
+             traversalClass="com.arsdigita.cms.contenttypes.ContentItemTraversalAdapter">
       <xrd:formatter property="/object/closingDate" 
                         class="com.arsdigita.xml.formatters.DateFormatter"/>
     </xrd:adapter>

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

@@ -1 +1,10 @@
 job.authoring.basic_properties.description=Edit the title, name, grade, closing date, salary, overview, ref. no., department, job description, person specification, and release date
+cms.contenttypes.ui.job.grade=Grade:
+cms.contenttypes.ui.job.closing_date=Closing Date:
+cms.contenttypes.ui.job.salary=Salary:
+cms.contenttypes.ui.job.overview=Overview:
+cms.contenttypes.ui.job.ref_number=Ref Number:
+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:

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

@@ -1 +1,10 @@
 job.authoring.basic_properties.description=Editieren der Beschreibungsdaten
+cms.contenttypes.ui.job.grade=Stufe:
+cms.contenttypes.ui.job.closing_date=Bewerbungsschluss:
+cms.contenttypes.ui.job.salary=Gehalt:
+cms.contenttypes.ui.job.overview=\u00dcbersicht:
+cms.contenttypes.ui.job.ref_number=Ref. Nr.:
+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:

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

@@ -0,0 +1,10 @@
+job.authoring.basic_properties.description=Edit the title, name, grade, closing date, salary, overview, ref. no., department, job description, person specification, and release date
+cms.contenttypes.ui.job.grade=Grade:
+cms.contenttypes.ui.job.closing_date=Closing Date:
+cms.contenttypes.ui.job.salary=Salary:
+cms.contenttypes.ui.job.overview=Overview:
+cms.contenttypes.ui.job.ref_number=Ref Number:
+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:

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

@@ -0,0 +1,10 @@
+job.authoring.basic_properties.description=Edit the title, name, grade, closing date, salary, overview, ref. no., department, job description, person specification, and release date
+cms.contenttypes.ui.job.grade=Niveau::
+cms.contenttypes.ui.job.closing_date=Date de cl\u00f4ture:
+cms.contenttypes.ui.job.salary=Salaire:
+cms.contenttypes.ui.job.overview=Vue d'ensemble:
+cms.contenttypes.ui.job.ref_number=Num\u00e9ro de r\u00e9f\u00e9rence:
+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:

ccm-cms-types-job/src/com/arsdigita/cms/contenttypes/ui/JobPropertiesStep.java

@@ -25,6 +25,7 @@ import com.arsdigita.cms.ContentPage;
 import com.arsdigita.cms.ContentSection;
 import com.arsdigita.cms.ItemSelectionModel;
 import com.arsdigita.cms.contenttypes.Job;
+import com.arsdigita.cms.contenttypes.util.JobGlobalizationUtil;
 import com.arsdigita.domain.DomainObject;
 import com.arsdigita.toolbox.ui.DomainObjectPropertySheet;
 import com.arsdigita.cms.ui.authoring.AuthoringKitWizard;
@@ -47,6 +48,11 @@ public class JobPropertiesStep extends SimpleEditStep {
     /** The name of the editing sheet added to this step */
     public static String EDIT_SHEET_NAME = "edit";
 
+    /**
+     * 
+     * @param itemModel
+     * @param parent 
+     */
     public JobPropertiesStep(ItemSelectionModel itemModel,
                              AuthoringKitWizard parent) {
         super(itemModel, parent);
@@ -55,7 +61,9 @@ public class JobPropertiesStep extends SimpleEditStep {
         BasicPageForm editSheet;
 
         editSheet = new JobPropertyForm(itemModel, this);
-        add(EDIT_SHEET_NAME, "Edit", new WorkflowLockedComponentAccess(editSheet, itemModel),
+        add(EDIT_SHEET_NAME, 
+            "Edit", 
+            new WorkflowLockedComponentAccess(editSheet, itemModel),
             editSheet.getSaveCancelSection().getCancelButton());
 
         setDisplayComponent(getJobPropertySheet(itemModel));
@@ -75,8 +83,11 @@ public class JobPropertiesStep extends SimpleEditStep {
 
         DomainObjectPropertySheet sheet = new DomainObjectPropertySheet(itemModel);
 
-        sheet.add( GlobalizationUtil.globalize("cms.contenttypes.ui.name"),  Job.NAME);
+        sheet.add( GlobalizationUtil.globalize("cms.contenttypes.ui.title"),  
-        sheet.add( GlobalizationUtil.globalize("cms.contenttypes.ui.title"),  Job.TITLE);
+                Job.TITLE);
+        sheet.add( GlobalizationUtil.globalize("cms.contenttypes.ui.name"),  
+                   Job.NAME);
+
         if (!ContentSection.getConfig().getHideLaunchDate()) {
             sheet.add(GlobalizationUtil.globalize("cms.contenttypes.ui.launch_date"),
                       ContentPage.LAUNCH_DATE,
@@ -89,13 +100,27 @@ public class JobPropertiesStep extends SimpleEditStep {
                                   return DateFormat.getDateInstance(DateFormat.LONG)
                                       .format(page.getLaunchDate());
                               } else {
-                                  return (String)GlobalizationUtil.globalize("cms.ui.unknown").localize();
+                                  return (String)GlobalizationUtil
+                                          .globalize("cms.ui.unknown")
+                                          .localize();
                               }
                           }
                       });
         }
-        sheet.add( GlobalizationUtil.globalize("cms.contenttypes.ui.grade"),  Job.GRADE);
+
-        sheet.add( GlobalizationUtil.globalize("cms.contenttypes.ui.closing_date"),  
+        // Job content type currently does not use the default 
+        // basic descriuption properties (as persisted in cms-pages and by
+        // default part of the object list). Would be convenient to move the
+        // ct specific overview property to basic description.
+        sheet.add( JobGlobalizationUtil
+                   .globalize("cms.contenttypes.ui.job.overview"),
+                   Job.BODY);
+
+        sheet.add( JobGlobalizationUtil
+                   .globalize("cms.contenttypes.ui.job.grade"),  
+                   Job.GRADE);
+        sheet.add( JobGlobalizationUtil
+                   .globalize("cms.contenttypes.ui.job.closing_date"),  
                   Job.CLOSING_DATE,
                   new DomainObjectPropertySheet.AttributeFormatter() {
 
@@ -107,17 +132,30 @@ public class JobPropertiesStep extends SimpleEditStep {
                               return DateFormat.getDateInstance(DateFormat.LONG)
                                   .format(job.getClosingDate());
                           } else {
-                              return (String)GlobalizationUtil.globalize("cms.ui.unknown").localize();
+                              return (String)GlobalizationUtil
+                                      .globalize("cms.ui.unknown")
+                                      .localize();
                           }
                       }
                   });
-        sheet.add( GlobalizationUtil.globalize("cms.contenttypes.ui.salary"),  Job.SALARY);
+        sheet.add( JobGlobalizationUtil
-        sheet.add( GlobalizationUtil.globalize("cms.contenttypes.ui.bodyoverview"),  Job.BODY);
+                   .globalize("cms.contenttypes.ui.job.salary"),
-        sheet.add( GlobalizationUtil.globalize("cms.contenttypes.ui.ref_number"),  Job.REF_NUMBER);
+                   Job.SALARY);
-        sheet.add( GlobalizationUtil.globalize("cms.contenttypes.ui.department"),  Job.DEPARTMENT);
+        sheet.add( JobGlobalizationUtil
-        sheet.add( GlobalizationUtil.globalize("cms.contenttypes.ui.job_description"),  Job.JOB_DESCRIPTION);
+                   .globalize("cms.contenttypes.ui.job.ref_number"),
-        sheet.add( GlobalizationUtil.globalize("cms.contenttypes.ui.person_specification"),  Job.PERSON_SPECIFICATION);
+                   Job.REF_NUMBER);
-        sheet.add( GlobalizationUtil.globalize("cms.contenttypes.ui.contact_details"),  Job.CONTACT_DETAILS);
+        sheet.add( JobGlobalizationUtil
+                   .globalize("cms.contenttypes.ui.job.department"),
+                   Job.DEPARTMENT);
+        sheet.add( JobGlobalizationUtil
+                   .globalize("cms.contenttypes.ui.job.job_description"),
+                   Job.JOB_DESCRIPTION);
+        sheet.add( JobGlobalizationUtil
+                   .globalize("cms.contenttypes.ui.job.person_specification"),
+                   Job.PERSON_SPECIFICATION);
+        sheet.add( JobGlobalizationUtil
+                   .globalize("cms.contenttypes.ui.job.contact_details"),
+                   Job.CONTACT_DETAILS);
 
         return sheet;
     }

ccm-cms-types-job/src/com/arsdigita/cms/contenttypes/ui/JobPropertyForm.java

@@ -26,13 +26,14 @@ import com.arsdigita.bebop.event.FormProcessListener;
 import com.arsdigita.bebop.event.FormSectionEvent;
 import com.arsdigita.bebop.event.FormSubmissionListener;
 import com.arsdigita.bebop.form.TextField;
-import com.arsdigita.cms.ui.CMSDHTMLEditor;
 import com.arsdigita.bebop.parameters.DateParameter;
 import com.arsdigita.bebop.parameters.ParameterModel;
 import com.arsdigita.bebop.parameters.StringParameter;
 import com.arsdigita.cms.ItemSelectionModel;
 import com.arsdigita.cms.contenttypes.Job;
+import com.arsdigita.cms.contenttypes.util.JobGlobalizationUtil;
 import com.arsdigita.cms.ui.authoring.BasicPageForm;
+import com.arsdigita.cms.ui.CMSDHTMLEditor;
 import com.arsdigita.cms.util.GlobalizationUtil;
 
 
@@ -45,14 +46,14 @@ public class JobPropertyForm extends BasicPageForm
 
     private JobPropertiesStep m_step;
 
+    /**  body parameter name */
+    public static final String BODY = "body";
     /** Grade parameter name */
     public static final String GRADE = "grade";
     /** closing date parameter name */
     public static final String CLOSING_DATE = "closingDate";
     /** salary parameter name */
     public static final String SALARY = "salary";
-    /**  body parameter name */
-    public static final String BODY = "body";
     /** Ref number parameter name */
     public static final String REF_NUMBER = "ref_number";
     /** department parameter name */
@@ -96,7 +97,20 @@ public class JobPropertyForm extends BasicPageForm
     protected void addWidgets() {
         super.addWidgets();
 
-        add(new Label(GlobalizationUtil.globalize("cms.contenttypes.ui.grade")));
+        // Job content type currently does not use the default 
+        // basic descriuption properties (as persisted in cms-pages and by
+        // default part of the object list). Would be convenient to move the
+        // ct specific overview property to basic description.
+        add(new Label(JobGlobalizationUtil
+                      .globalize("cms.contenttypes.ui.job.overview")));
+        ParameterModel bodyParam = new StringParameter(BODY);
+        CMSDHTMLEditor body = new CMSDHTMLEditor(bodyParam);
+        body.setCols(40);
+        body.setRows(10);
+        add(body);
+
+        add(new Label(JobGlobalizationUtil
+                      .globalize("cms.contenttypes.ui.job.grade")));
         ParameterModel gradeParam
             = new StringParameter(GRADE);
         TextField grade = new TextField(gradeParam);
@@ -104,42 +118,41 @@ public class JobPropertyForm extends BasicPageForm
         grade.setMaxLength(30);
         add(grade);
 
-        add(new Label(GlobalizationUtil.globalize("cms.contenttypes.ui.closing_date")));
+        add(new Label(JobGlobalizationUtil
+                      .globalize("cms.contenttypes.ui.job.closing_date")));
         ParameterModel closingDateParam
             = new DateParameter(CLOSING_DATE);
         com.arsdigita.bebop.form.Date closingDate
             = new com.arsdigita.bebop.form.Date(closingDateParam );
         add(closingDate);
 
-        add(new Label(GlobalizationUtil.globalize("cms.contenttypes.ui.salary")));
+        add(new Label(JobGlobalizationUtil
+                      .globalize("cms.contenttypes.ui.job.salary")));
         ParameterModel salaryParam = new StringParameter(SALARY);
         CMSDHTMLEditor salary = new CMSDHTMLEditor(salaryParam);
         salary.setCols(40);
         salary.setRows(10);
         add(salary);
 
-        add(new Label(GlobalizationUtil.globalize("cms.contenttypes.ui.bodyoverview")));
-        ParameterModel bodyParam = new StringParameter(BODY);
-        CMSDHTMLEditor body = new CMSDHTMLEditor(bodyParam);
-        body.setCols(40);
-        body.setRows(10);
-        add(body);
 
-        add(new Label(GlobalizationUtil.globalize("cms.contenttypes.ui.ref_number")));
+        add(new Label(JobGlobalizationUtil
+                      .globalize("cms.contenttypes.ui.job.ref_number")));
         ParameterModel refNumberParam = new StringParameter(REF_NUMBER);
         TextField refNumber = new TextField(refNumberParam);
         refNumber.setSize(30);
         refNumber.setMaxLength(30);
         add(refNumber);
 
-        add(new Label(GlobalizationUtil.globalize("cms.contenttypes.ui.department")));
+        add(new Label(JobGlobalizationUtil
+                      .globalize("cms.contenttypes.ui.job.department")));
         ParameterModel departmentParam = new StringParameter(DEPARTMENT);
         TextField department = new TextField(departmentParam);
         department.setSize(30);
         department.setMaxLength(30);
         add(department);
 
-        add(new Label(GlobalizationUtil.globalize("cms.contenttypes.ui.job_description")));
+        add(new Label(JobGlobalizationUtil
+                      .globalize("cms.contenttypes.ui.job.job_description")));
         ParameterModel jobDescriptionParam =
             new StringParameter(JOB_DESCRIPTION);
         CMSDHTMLEditor jobDescription = new CMSDHTMLEditor(jobDescriptionParam);
@@ -147,7 +160,8 @@ public class JobPropertyForm extends BasicPageForm
         jobDescription.setRows(10);
         add(jobDescription);
 
-        add(new Label(GlobalizationUtil.globalize("cms.contenttypes.ui.person_specification")));
+        add(new Label(JobGlobalizationUtil
+                      .globalize("cms.contenttypes.ui.job.person_specification")));
         ParameterModel personSpecificationParam =
             new StringParameter(PERSON_SPECIFICATION);
         CMSDHTMLEditor personSpecification = new CMSDHTMLEditor(personSpecificationParam);
@@ -155,7 +169,8 @@ public class JobPropertyForm extends BasicPageForm
         personSpecification.setRows(10);
         add(personSpecification);
 
-        add(new Label(GlobalizationUtil.globalize("cms.contenttypes.ui.contact_details")));
+        add(new Label(JobGlobalizationUtil
+                      .globalize("cms.contenttypes.ui.job.contact_details")));
         ParameterModel contactDetailsParam
             = new StringParameter(CONTACT_DETAILS);
         CMSDHTMLEditor contactDetails = new CMSDHTMLEditor(contactDetailsParam);