From f43e33d5b61c83e2e71afa3dd6d68a0775fd04fb Mon Sep 17 00:00:00 2001
From: pb <pb@8810af33-2d31-482b-a856-94f89814c4df>
Date: Sun, 9 Jun 2013 17:43:35 +0000
Subject: [PATCH] =?UTF-8?q?Anpassung=20und=20Vervollst=C3=A4ndigung=20Reso?=
 =?UTF-8?q?urceBundles=20sowie=20Sprachumschaltung=20abgeschlossen.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://svn.libreccm.org/ccm/trunk@2193 8810af33-2d31-482b-a856-94f89814c4df
---
 .../cms/contenttypes/LegalNotice.xml          | 13 +++++++---
 .../LegalNoticeResources.properties           |  2 ++
 ...ies => LegalNoticeResources_de.properties} |  1 +
 .../LegalNoticeResources_en_GB.properties     |  2 ++
 .../LegalNoticeResources_fr.properties        |  2 ++
 .../LegalNoticeResrouce.properties            |  1 -
 .../ui/LegalNoticePropertiesStep.java         | 24 ++++++++++++++-----
 .../ui/LegalNoticePropertyForm.java           | 13 ++++++----
 8 files changed, 44 insertions(+), 14 deletions(-)
 create mode 100755 ccm-cms-types-legalnotice/src/com/arsdigita/cms/contenttypes/LegalNoticeResources.properties
 rename ccm-cms-types-legalnotice/src/com/arsdigita/cms/contenttypes/{LegalNoticeResrouce_de.properties => LegalNoticeResources_de.properties} (59%)
 create mode 100755 ccm-cms-types-legalnotice/src/com/arsdigita/cms/contenttypes/LegalNoticeResources_en_GB.properties
 create mode 100755 ccm-cms-types-legalnotice/src/com/arsdigita/cms/contenttypes/LegalNoticeResources_fr.properties
 delete mode 100755 ccm-cms-types-legalnotice/src/com/arsdigita/cms/contenttypes/LegalNoticeResrouce.properties

diff --git a/ccm-cms-types-legalnotice/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/LegalNotice.xml b/ccm-cms-types-legalnotice/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/LegalNotice.xml
index ebda29295..4de7d666f 100755
--- a/ccm-cms-types-legalnotice/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/LegalNotice.xml
+++ b/ccm-cms-types-legalnotice/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/LegalNotice.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ctd:content-types xmlns:ctd="http://xmlns.redhat.com/cms/content-types" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.redhat.com/cms/content-types content-types.xsd">
-  <ctd:content-type label="LegalNotice" description="An legal notice type" objectType="com.arsdigita.cms.contenttypes.LegalNotice" classname="com.arsdigita.cms.contenttypes.LegalNotice">
-    <ctd:authoring-kit createComponent="com.arsdigita.cms.ui.authoring.PageCreate">
+<ctd:content-types xmlns:ctd="http://xmlns.redhat.com/cms/content-types" 
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+          xsi:schemaLocation="http://xmlns.redhat.com/cms/content-types content-types.xsd">
+
+  <ctd:content-type label="LegalNotice" 
+              description="An legal notice type" 
+               objectType="com.arsdigita.cms.contenttypes.LegalNotice"
+                classname="com.arsdigita.cms.contenttypes.LegalNotice">
+
+      <ctd:authoring-kit createComponent="com.arsdigita.cms.ui.authoring.PageCreate">
 
       <ctd:authoring-step
          labelKey="cms.contenttypes.shared.basic_properties.title" 
diff --git a/ccm-cms-types-legalnotice/src/com/arsdigita/cms/contenttypes/LegalNoticeResources.properties b/ccm-cms-types-legalnotice/src/com/arsdigita/cms/contenttypes/LegalNoticeResources.properties
new file mode 100755
index 000000000..f730223a6
--- /dev/null
+++ b/ccm-cms-types-legalnotice/src/com/arsdigita/cms/contenttypes/LegalNoticeResources.properties
@@ -0,0 +1,2 @@
+legal_notice.authoring.basic_properties.description=Edit the title, name, and government UID
+cms.contenttypes.ui.legal_notice.government_uid=Government UID:
diff --git a/ccm-cms-types-legalnotice/src/com/arsdigita/cms/contenttypes/LegalNoticeResrouce_de.properties b/ccm-cms-types-legalnotice/src/com/arsdigita/cms/contenttypes/LegalNoticeResources_de.properties
similarity index 59%
rename from ccm-cms-types-legalnotice/src/com/arsdigita/cms/contenttypes/LegalNoticeResrouce_de.properties
rename to ccm-cms-types-legalnotice/src/com/arsdigita/cms/contenttypes/LegalNoticeResources_de.properties
index 7fc3d1f2a..952c51a28 100644
--- a/ccm-cms-types-legalnotice/src/com/arsdigita/cms/contenttypes/LegalNoticeResrouce_de.properties
+++ b/ccm-cms-types-legalnotice/src/com/arsdigita/cms/contenttypes/LegalNoticeResources_de.properties
@@ -1 +1,2 @@
 legal_notice.authoring.basic_properties.description=Editieren vonTitel, Name und ID
+cms.contenttypes.ui.legal_notice.government_uid=Referenz:
diff --git a/ccm-cms-types-legalnotice/src/com/arsdigita/cms/contenttypes/LegalNoticeResources_en_GB.properties b/ccm-cms-types-legalnotice/src/com/arsdigita/cms/contenttypes/LegalNoticeResources_en_GB.properties
new file mode 100755
index 000000000..f730223a6
--- /dev/null
+++ b/ccm-cms-types-legalnotice/src/com/arsdigita/cms/contenttypes/LegalNoticeResources_en_GB.properties
@@ -0,0 +1,2 @@
+legal_notice.authoring.basic_properties.description=Edit the title, name, and government UID
+cms.contenttypes.ui.legal_notice.government_uid=Government UID:
diff --git a/ccm-cms-types-legalnotice/src/com/arsdigita/cms/contenttypes/LegalNoticeResources_fr.properties b/ccm-cms-types-legalnotice/src/com/arsdigita/cms/contenttypes/LegalNoticeResources_fr.properties
new file mode 100755
index 000000000..771e992eb
--- /dev/null
+++ b/ccm-cms-types-legalnotice/src/com/arsdigita/cms/contenttypes/LegalNoticeResources_fr.properties
@@ -0,0 +1,2 @@
+legal_notice.authoring.basic_properties.description=Edit the title, name, and government UID
+cms.contenttypes.ui.legal_notice.government_uid=Identifiant d\u00e9partement:
diff --git a/ccm-cms-types-legalnotice/src/com/arsdigita/cms/contenttypes/LegalNoticeResrouce.properties b/ccm-cms-types-legalnotice/src/com/arsdigita/cms/contenttypes/LegalNoticeResrouce.properties
deleted file mode 100755
index 04f5da77b..000000000
--- a/ccm-cms-types-legalnotice/src/com/arsdigita/cms/contenttypes/LegalNoticeResrouce.properties
+++ /dev/null
@@ -1 +0,0 @@
-legal_notice.authoring.basic_properties.description=Edit the title, name, and government UID
\ No newline at end of file
diff --git a/ccm-cms-types-legalnotice/src/com/arsdigita/cms/contenttypes/ui/LegalNoticePropertiesStep.java b/ccm-cms-types-legalnotice/src/com/arsdigita/cms/contenttypes/ui/LegalNoticePropertiesStep.java
index 39bd4d4bf..47e6271dd 100755
--- a/ccm-cms-types-legalnotice/src/com/arsdigita/cms/contenttypes/ui/LegalNoticePropertiesStep.java
+++ b/ccm-cms-types-legalnotice/src/com/arsdigita/cms/contenttypes/ui/LegalNoticePropertiesStep.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.LegalNotice;
+import com.arsdigita.cms.contenttypes.util.LegalNoticeGlobalizationUtil;
 import com.arsdigita.domain.DomainObject;
 import com.arsdigita.toolbox.ui.DomainObjectPropertySheet;
 import com.arsdigita.cms.ui.authoring.AuthoringKitWizard;
@@ -54,7 +55,9 @@ public class LegalNoticePropertiesStep extends SimpleEditStep {
         BasicPageForm editSheet;
 
         editSheet = new LegalNoticePropertyForm(itemModel,this);
-        add(EDIT_SHEET_NAME, "Edit", new WorkflowLockedComponentAccess(editSheet, itemModel),
+        add(EDIT_SHEET_NAME, 
+            "Edit", 
+            new WorkflowLockedComponentAccess(editSheet, itemModel),
             editSheet.getSaveCancelSection().getCancelButton());
 
         setDisplayComponent(getLegalNoticePropertySheet(itemModel));
@@ -73,10 +76,15 @@ public class LegalNoticePropertiesStep extends SimpleEditStep {
                                                         itemModel) {
         DomainObjectPropertySheet sheet = new DomainObjectPropertySheet(itemModel);
 
-        sheet.add( GlobalizationUtil.globalize("cms.contenttypes.ui.name"),  LegalNotice.NAME);
-        sheet.add( GlobalizationUtil.globalize("cms.contenttypes.ui.title"),  LegalNotice.TITLE);
+        sheet.add( GlobalizationUtil
+                   .globalize("cms.contenttypes.ui.title"),
+                   LegalNotice.TITLE);
+        sheet.add( GlobalizationUtil
+                   .globalize("cms.contenttypes.ui.name"),
+                   LegalNotice.NAME);
         if (!ContentSection.getConfig().getHideLaunchDate()) {
-            sheet.add(GlobalizationUtil.globalize("cms.contenttypes.ui.launch_date"),
+            sheet.add(GlobalizationUtil
+                      .globalize("cms.contenttypes.ui.launch_date"),
                       ContentPage.LAUNCH_DATE,
                       new DomainObjectPropertySheet.AttributeFormatter() {
                           public String format(DomainObject item,
@@ -87,12 +95,16 @@ public class LegalNoticePropertiesStep 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.government_uid"),  LegalNotice.GOVERNMENT_UID);
+        sheet.add( LegalNoticeGlobalizationUtil
+                   .globalize("cms.contenttypes.ui.legal_notice.government_uid"),
+                   LegalNotice.GOVERNMENT_UID);
 
         return sheet;
     }
diff --git a/ccm-cms-types-legalnotice/src/com/arsdigita/cms/contenttypes/ui/LegalNoticePropertyForm.java b/ccm-cms-types-legalnotice/src/com/arsdigita/cms/contenttypes/ui/LegalNoticePropertyForm.java
index 992f4aed4..4d4efc62f 100755
--- a/ccm-cms-types-legalnotice/src/com/arsdigita/cms/contenttypes/ui/LegalNoticePropertyForm.java
+++ b/ccm-cms-types-legalnotice/src/com/arsdigita/cms/contenttypes/ui/LegalNoticePropertyForm.java
@@ -28,8 +28,9 @@ import com.arsdigita.bebop.event.FormSubmissionListener;
 import com.arsdigita.bebop.form.TextField;
 import com.arsdigita.bebop.parameters.ParameterModel;
 import com.arsdigita.bebop.parameters.StringParameter;
-import com.arsdigita.cms.ItemSelectionModel;
 import com.arsdigita.cms.contenttypes.LegalNotice;
+import com.arsdigita.cms.contenttypes.util.LegalNoticeGlobalizationUtil;
+import com.arsdigita.cms.ItemSelectionModel;
 import com.arsdigita.cms.ui.authoring.BasicPageForm;
 import com.arsdigita.cms.util.GlobalizationUtil;
 
@@ -39,7 +40,9 @@ import com.arsdigita.cms.util.GlobalizationUtil;
  * LegalNotice subclasses.
  **/
 public class LegalNoticePropertyForm extends BasicPageForm
-    implements FormProcessListener, FormInitListener, FormSubmissionListener {
+                                     implements FormProcessListener, 
+                                                FormInitListener, 
+                                                FormSubmissionListener {
 
     private LegalNoticePropertiesStep m_step;
 
@@ -65,7 +68,8 @@ public class LegalNoticePropertyForm extends BasicPageForm
      *    LegalNotice to work on
      * @param step The LegalNoticePropertiesStep which controls this form.
      */
-    public LegalNoticePropertyForm( ItemSelectionModel itemModel, LegalNoticePropertiesStep step ) {
+    public LegalNoticePropertyForm( ItemSelectionModel itemModel, 
+                                    LegalNoticePropertiesStep step ) {
         super( ID, itemModel );
         m_step = step;
         addSubmissionListener(this);
@@ -77,7 +81,8 @@ public class LegalNoticePropertyForm extends BasicPageForm
     protected void addWidgets() {
         super.addWidgets();
 
-        add(new Label(GlobalizationUtil.globalize("cms.contenttypes.ui.government_uid")));
+        add(new Label(LegalNoticeGlobalizationUtil
+                      .globalize("cms.contenttypes.ui.legal_notice.government_uid")));
         ParameterModel governmentUIDParam = new StringParameter(GOVERNMENT_UID);
         TextField governmentUID = new TextField(governmentUIDParam);
         governmentUID.setSize(30);