diff --git a/ccm-cms/src/com/arsdigita/cms/CMSResources.properties b/ccm-cms/src/com/arsdigita/cms/CMSResources.properties index 39f57dd6e..ab9529b03 100755 --- a/ccm-cms/src/com/arsdigita/cms/CMSResources.properties +++ b/ccm-cms/src/com/arsdigita/cms/CMSResources.properties @@ -1071,3 +1071,6 @@ cms.ui.authoring.error_conflicts_with_this_url=There are conflicts with this URL cms.ui.search.help=To search for content items, please enter at least 3 letters into the search field. You can narrow the result by using additional parameters. cms.ui.search.no_results=Sorry. Not content items found which match your search. cms.ui.change_password=Change password +cms.ui.image_select.page_title=Select or upload image +cms.ui.image_library=Image library +cms.ui.image_upload=Upload image diff --git a/ccm-cms/src/com/arsdigita/cms/CMSResources_de.properties b/ccm-cms/src/com/arsdigita/cms/CMSResources_de.properties index daaf526e7..31faae807 100755 --- a/ccm-cms/src/com/arsdigita/cms/CMSResources_de.properties +++ b/ccm-cms/src/com/arsdigita/cms/CMSResources_de.properties @@ -1065,3 +1065,6 @@ cms.ui.authoring.error_conflicts_with_this_url=Es gibt Konflikte mit dieser URL. cms.ui.search.help=Geben sie mindestens drei Buchstaben ein, um nach Content Items zu suchen. Sie k\u00f6nnen das Ergebnis mit weiteren Parametern einschr\u00e4nken. cms.ui.search.no_results=Es wurden keine Content Items gefunden, die Ihren Suchparametern entsprechen cms.ui.change_password=Passwort \u00e4ndern +cms.ui.image_select.page_title=Bild ausw\u00e4hlen oder hochladen +cms.ui.image_library=Bildersammlung +cms.ui.image_upload=Bild hochladen diff --git a/ccm-cms/src/com/arsdigita/cms/CMSResources_en_GB.properties b/ccm-cms/src/com/arsdigita/cms/CMSResources_en_GB.properties index 43ed9c0c5..d023c668b 100755 --- a/ccm-cms/src/com/arsdigita/cms/CMSResources_en_GB.properties +++ b/ccm-cms/src/com/arsdigita/cms/CMSResources_en_GB.properties @@ -119,3 +119,6 @@ cms.ui.authoring.error_conflicts_with_this_url=There are conflicts with this URL cms.ui.search.help= cms.ui.search.no_results= cms.ui.change_password= +cms.ui.image_select.page_title= +cms.ui.image_library= +cms.ui.image_upload= diff --git a/ccm-cms/src/com/arsdigita/cms/CMSResources_fr.properties b/ccm-cms/src/com/arsdigita/cms/CMSResources_fr.properties index 1bcc9c869..5440f86d5 100755 --- a/ccm-cms/src/com/arsdigita/cms/CMSResources_fr.properties +++ b/ccm-cms/src/com/arsdigita/cms/CMSResources_fr.properties @@ -593,3 +593,6 @@ cms.ui.authoring.error_conflicts_with_this_url=There are conflicts with this URL cms.ui.search.help= cms.ui.search.no_results= cms.ui.change_password= +cms.ui.image_select.page_title= +cms.ui.image_library= +cms.ui.image_upload= diff --git a/ccm-cms/src/com/arsdigita/cms/ui/ImageSelectPage.java b/ccm-cms/src/com/arsdigita/cms/ui/ImageSelectPage.java index ca61fe2e4..a2c3b59f7 100644 --- a/ccm-cms/src/com/arsdigita/cms/ui/ImageSelectPage.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/ImageSelectPage.java @@ -5,6 +5,7 @@ package com.arsdigita.cms.ui; import com.arsdigita.bebop.Component; +import com.arsdigita.bebop.Label; import com.arsdigita.bebop.MapComponentSelectionModel; import com.arsdigita.bebop.PageState; import com.arsdigita.bebop.ParameterSingleSelectionModel; @@ -46,9 +47,7 @@ public class ImageSelectPage extends CMSPage { public static final String RESULT = "result"; public ImageSelectPage() { - super(GlobalizationUtil.globalize( - "cms.ui.image_select.page_title") - .localize().toString(), + super(new Label(GlobalizationUtil.globalize("cms.ui.image_select.page_title")), new SimpleContainer()); setClassAttr("cms-admin"); diff --git a/ccm-sci-assets-publicationspersons/src/com/arsdigita/cms/contentassets/ui/SciPublicationsPersonsPersonForm.java b/ccm-sci-assets-publicationspersons/src/com/arsdigita/cms/contentassets/ui/SciPublicationsPersonsPersonForm.java index f0b76fea2..e089013e5 100644 --- a/ccm-sci-assets-publicationspersons/src/com/arsdigita/cms/contentassets/ui/SciPublicationsPersonsPersonForm.java +++ b/ccm-sci-assets-publicationspersons/src/com/arsdigita/cms/contentassets/ui/SciPublicationsPersonsPersonForm.java @@ -52,8 +52,6 @@ public class SciPublicationsPersonsPersonForm extends BasicItemForm { private final static String ITEM_SEARCH = "publicationRelatedPersons"; private final static String RELATION = "relation"; private final ItemSelectionModel itemModel; - private final GlobalisationUtil globalisationUtil - = new SciPublicationsPersonsGlobalisationUtil(); public SciPublicationsPersonsPersonForm(final ItemSelectionModel itemModel) { @@ -65,6 +63,7 @@ public class SciPublicationsPersonsPersonForm extends BasicItemForm { @Override public void addWidgets() { + final GlobalisationUtil globalisationUtil = new SciPublicationsPersonsGlobalisationUtil(); add(new Label(globalisationUtil.globalise( "com.arsdigita.cms.contentassets.publicationspersons.select_person"))); itemSearch = new ItemSearchWidget( @@ -117,6 +116,7 @@ public class SciPublicationsPersonsPersonForm extends BasicItemForm { final FormData data = event.getFormData(); + final GlobalisationUtil globalisationUtil = new SciPublicationsPersonsGlobalisationUtil(); if (data.get(ITEM_SEARCH) == null) { data.addError(globalisationUtil.globalise( "com.arsdigita.cms.contentasset.publications_persons.none_selected"));