From f278cef4e94c73e26ce2d821b23d5681c6eb66fe Mon Sep 17 00:00:00 2001 From: jensp Date: Wed, 10 Jan 2018 11:05:23 +0000 Subject: [PATCH] CCM NG: Init language widget in PageCreateForm with Kernel#defaultLocale git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@5186 8810af33-2d31-482b-a856-94f89814c4df --- .../arsdigita/cms/ui/authoring/PageCreateForm.java | 12 ++++++++++-- .../org/librecms/CmsResources_de.properties | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/PageCreateForm.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/PageCreateForm.java index afb4d1e66..9e708cebf 100755 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/PageCreateForm.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/PageCreateForm.java @@ -35,6 +35,7 @@ import org.librecms.contentsection.Folder; import com.arsdigita.cms.ItemSelectionModel; import com.arsdigita.globalization.GlobalizedMessage; +import com.arsdigita.kernel.KernelConfig; import com.arsdigita.util.Assert; import org.libreccm.cdi.utils.CdiUtil; @@ -77,6 +78,8 @@ public class PageCreateForm private final CreationSelector creationSelector; private ApplyWorkflowFormSection workflowSection; private final StringParameter selectedLanguageParam; + + private LanguageWidget languageWidget; /** * Construct a new PageCreationForm @@ -133,7 +136,9 @@ public class PageCreateForm /* language selection */ add(new Label(new GlobalizedMessage("cms.ui.language.field", CmsConstants.CMS_BUNDLE))); - add(new LanguageWidget(LANGUAGE)); + languageWidget = new LanguageWidget(LANGUAGE); + add(languageWidget); +// add(new LanguageWidget(LANGUAGE)); /* Additional widgets from super type: title and name (url) */ super.addWidgets(); @@ -160,7 +165,10 @@ public class PageCreateForm */ @Override public void init(final FormSectionEvent event) throws FormProcessException { - // this is currently a no-op + + //Init language widget with default language. + final PageState state = event.getPageState(); + languageWidget.setValue(state, KernelConfig.getConfig().getDefaultLanguage()); } /** diff --git a/ccm-cms/src/main/resources/org/librecms/CmsResources_de.properties b/ccm-cms/src/main/resources/org/librecms/CmsResources_de.properties index 129b0af9f..e58852542 100644 --- a/ccm-cms/src/main/resources/org/librecms/CmsResources_de.properties +++ b/ccm-cms/src/main/resources/org/librecms/CmsResources_de.properties @@ -278,7 +278,7 @@ cms.ui.assets.video_asset.width.label=Breite cms.ui.assets.video_asset.height.label=H\u00f6he cms.ui.assets.video_asset.legal_metadata.label=Rechtliche Informationen cms.ui.categories=Kategorien -cms.ui.new_item=Neues Content Item angelegen +cms.ui.new_item=Neues Content Item anlegen cms.ui.authoring.content_type=Content Typ: #Language cms.ui.language.field=Sprache