From 8e72411c1fc979062ab1f2e2bbcea3deddac7ee7 Mon Sep 17 00:00:00 2001 From: jensp Date: Fri, 3 Sep 2010 13:04:04 +0000 Subject: [PATCH] =?UTF-8?q?ResourceBundles=20mit=20den=20Texten=20f=C3=BCr?= =?UTF-8?q?=20ccm-sci-publications.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://svn.libreccm.org/ccm/trunk@525 8810af33-2d31-482b-a856-94f89814c4df --- .../ContenttypesResources_de.properties | 2 +- ...nericOrganizationalUnitPropertiesStep.java | 4 +- .../contenttypes/ArticleInCollectedVolume.xml | 8 +- .../cms/contenttypes/ArticleInJournal.xml | 8 +- .../cms/contenttypes/CollectedVolume.xml | 8 +- .../arsdigita/cms/contenttypes/Expertise.xml | 8 +- .../cms/contenttypes/GreyLiterature.xml | 8 +- .../cms/contenttypes/InProceedings.xml | 8 +- .../cms/contenttypes/InternetArticle.xml | 8 +- .../arsdigita/cms/contenttypes/Monograph.xml | 8 +- .../cms/contenttypes/Publication.xml | 8 +- .../contenttypes/PublicationWithPublisher.xml | 8 +- .../arsdigita/cms/contenttypes/Publisher.xml | 8 +- .../com/arsdigita/cms/contenttypes/Review.xml | 8 +- .../com/arsdigita/cms/contenttypes/Series.xml | 8 +- .../cms/contenttypes/UnPublished.xml | 8 +- .../cms/contenttypes/WorkingPaper.xml | 8 +- .../ArticleInCollectedVolumePropertyForm.java | 4 - .../ui/ArticleInJournalPropertyForm.java | 4 - .../ui/CollectedVolumePropertyForm.java | 6 +- .../ui/GreyLiteraturePropertyForm.java | 6 +- .../ui/InProceedingsPropertyForm.java | 30 ++- .../ui/InternetArticlePropertyForm.java | 6 +- .../ui/MonographPropertiesStep.java | 5 +- .../ui/MonographPropertyForm.java | 6 +- .../ui/PublicationAuthorAddForm.java | 8 +- .../ui/PublicationAuthorsPropertyStep.java | 2 +- .../ui/PublicationAuthorsTable.java | 4 +- .../ui/PublicationGlobalizationUtil.java | 2 +- .../ui/PublicationPropertyForm.java | 8 +- .../ui/PublicationResources.properties | 208 ++++++++++++++++++ .../ui/PublicationResources_de.properties | 207 +++++++++++++++++ .../ui/PublisherPropertyForm.java | 6 +- .../contenttypes/ui/ReviewPropertyForm.java | 5 - .../ui/SeriesEditshipAddForm.java | 6 +- .../contenttypes/ui/SeriesEditshipTable.java | 102 ++++----- .../contenttypes/ui/SeriesPropertyForm.java | 6 +- .../contenttypes/ui/SeriesVolumesTable.java | 5 +- .../ui/UnPublishedPropertyForm.java | 6 +- 39 files changed, 568 insertions(+), 200 deletions(-) create mode 100644 ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationResources.properties create mode 100644 ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationResources_de.properties diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/ContenttypesResources_de.properties b/ccm-cms/src/com/arsdigita/cms/contenttypes/ContenttypesResources_de.properties index 13f9a91bd..2da7b1d57 100644 --- a/ccm-cms/src/com/arsdigita/cms/contenttypes/ContenttypesResources_de.properties +++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/ContenttypesResources_de.properties @@ -98,7 +98,7 @@ cms.contenttypes.ui.genericorganunit.name=Name cms.contenttypes.ui.genericorgaunit.persons.confirm_delete=Person wirklich entfernen? cms.contenttypes.ui.genericorgaunit.persons.delete=Person entfernen cms.contenttypes.ui.genericorgaunit.persons.name=Name -cms.contenttypes.ui.genericorgaunit.persons.none=Keine verkn\u00fcpften personen +cms.contenttypes.ui.genericorgaunit.persons.none=Keine verkn\u00fcpften Personen cms.contenttypes.ui.genericorgaunit.persons.role=Rolle cms.contenttypes.ui.genericorgaunit.select_child=Untergeordnete Organizationseinheit ausw\u00e4hlen cms.contenttypes.ui.genericorgaunit.select_contact=Kontakt ausw\u00e4hlen diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitPropertiesStep.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitPropertiesStep.java index f9962b5f4..c7b0ade84 100644 --- a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitPropertiesStep.java +++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitPropertiesStep.java @@ -121,10 +121,10 @@ public class GenericOrganizationalUnitPropertiesStep extends SimpleEditStep { AuthoringKitWizard parent) { addStep(new GenericOrganizationalUnitContactPropertiesStep(itemModel, parent), - "cms.contenttypes.ui.orgaunit.childs"); + "cms.contenttypes.ui.orgaunit.contact"); addStep(new GenericOrganizationalUnitChildrenPropertiesStep(itemModel, parent), - "cms.contenttypes.ui.orgaunit.contact"); + "cms.contenttypes.ui.orgaunit.child"); addStep(new GenericOrganizationalUnitPersonPropertiesStep(itemModel, parent), "cms.contenttypes.ui.orgaunit.persons"); diff --git a/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/ArticleInCollectedVolume.xml b/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/ArticleInCollectedVolume.xml index cb71e8594..66772b2c4 100644 --- a/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/ArticleInCollectedVolume.xml +++ b/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/ArticleInCollectedVolume.xml @@ -13,10 +13,10 @@ diff --git a/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/ArticleInJournal.xml b/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/ArticleInJournal.xml index f28a91ae6..5466317ed 100644 --- a/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/ArticleInJournal.xml +++ b/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/ArticleInJournal.xml @@ -13,10 +13,10 @@ diff --git a/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/CollectedVolume.xml b/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/CollectedVolume.xml index 0221c6ec2..a195ba094 100644 --- a/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/CollectedVolume.xml +++ b/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/CollectedVolume.xml @@ -13,10 +13,10 @@ diff --git a/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Expertise.xml b/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Expertise.xml index 3faf4a6ee..868130de3 100644 --- a/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Expertise.xml +++ b/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Expertise.xml @@ -13,10 +13,10 @@ diff --git a/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/GreyLiterature.xml b/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/GreyLiterature.xml index 34ea964f3..6d569187c 100644 --- a/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/GreyLiterature.xml +++ b/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/GreyLiterature.xml @@ -13,10 +13,10 @@ diff --git a/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/InProceedings.xml b/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/InProceedings.xml index 2cea20a14..594dfb92f 100644 --- a/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/InProceedings.xml +++ b/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/InProceedings.xml @@ -13,10 +13,10 @@ diff --git a/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/InternetArticle.xml b/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/InternetArticle.xml index d894e21ad..3ff1cb34c 100644 --- a/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/InternetArticle.xml +++ b/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/InternetArticle.xml @@ -13,10 +13,10 @@ diff --git a/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Monograph.xml b/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Monograph.xml index 69bb45d89..b1958a108 100644 --- a/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Monograph.xml +++ b/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Monograph.xml @@ -13,10 +13,10 @@ diff --git a/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Publication.xml b/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Publication.xml index bf52853c6..d046d8909 100644 --- a/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Publication.xml +++ b/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Publication.xml @@ -14,10 +14,10 @@ diff --git a/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/PublicationWithPublisher.xml b/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/PublicationWithPublisher.xml index 32b98a634..3b6d86001 100644 --- a/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/PublicationWithPublisher.xml +++ b/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/PublicationWithPublisher.xml @@ -14,10 +14,10 @@ diff --git a/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Publisher.xml b/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Publisher.xml index aad1052a0..cd107136a 100644 --- a/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Publisher.xml +++ b/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Publisher.xml @@ -13,10 +13,10 @@ diff --git a/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Review.xml b/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Review.xml index 105313aa9..1b02fe67c 100644 --- a/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Review.xml +++ b/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Review.xml @@ -13,10 +13,10 @@ diff --git a/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Series.xml b/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Series.xml index 312586025..9e80b0af8 100644 --- a/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Series.xml +++ b/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Series.xml @@ -13,10 +13,10 @@ diff --git a/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/UnPublished.xml b/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/UnPublished.xml index 31aafb144..e278621cc 100644 --- a/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/UnPublished.xml +++ b/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/UnPublished.xml @@ -14,10 +14,10 @@ diff --git a/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/WorkingPaper.xml b/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/WorkingPaper.xml index 4f3a857c0..aa93de61d 100644 --- a/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/WorkingPaper.xml +++ b/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/WorkingPaper.xml @@ -13,10 +13,10 @@ diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInCollectedVolumePropertyForm.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInCollectedVolumePropertyForm.java index 56c73a452..81631652d 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInCollectedVolumePropertyForm.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInCollectedVolumePropertyForm.java @@ -102,9 +102,5 @@ public class ArticleInCollectedVolumePropertyForm article.save(); } - - if (m_step != null) { - m_step.maybeForwardToNextStep(fse.getPageState()); - } } } diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInJournalPropertyForm.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInJournalPropertyForm.java index f50040d4a..a321b9aff 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInJournalPropertyForm.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInJournalPropertyForm.java @@ -147,10 +147,6 @@ public class ArticleInJournalPropertyForm (Date) data.get(ArticleInJournal.PUBLICATION_DATE)); article.save(); - - if (m_step != null) { - m_step.maybeForwardToNextStep(fse.getPageState()); - } } } } diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/CollectedVolumePropertyForm.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/CollectedVolumePropertyForm.java index 7cf69b251..caac83bf1 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/CollectedVolumePropertyForm.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/CollectedVolumePropertyForm.java @@ -114,10 +114,6 @@ public class CollectedVolumePropertyForm CollectedVolume.EDITION)); collectedVolume.save(); - } - - if (m_step != null) { - m_step.maybeForwardToNextStep(fse.getPageState()); - } + } } } diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/GreyLiteraturePropertyForm.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/GreyLiteraturePropertyForm.java index d3e07f96e..5ab636eb3 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/GreyLiteraturePropertyForm.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/GreyLiteraturePropertyForm.java @@ -92,10 +92,6 @@ public class GreyLiteraturePropertyForm grey.setUrl((String) data.get(GreyLiterature.URL)); grey.save(); - } - - if (m_step != null) { - m_step.maybeForwardToNextStep(fse.getPageState()); - } + } } } diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/InProceedingsPropertyForm.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/InProceedingsPropertyForm.java index 7a0812a66..a759997f8 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/InProceedingsPropertyForm.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/InProceedingsPropertyForm.java @@ -64,18 +64,7 @@ public class InProceedingsPropertyForm Calendar today = new GregorianCalendar(); add(new Label((String) PublicationGlobalizationUtil.globalize( - "publications.ui.inproccedings.date_to_of_conference"). - localize())); - ParameterModel dateToParam = - new DateParameter(InProceedings.DATE_TO_OF_CONFERENCE); - com.arsdigita.bebop.form.Date dateTo = - new com.arsdigita.bebop.form.Date( - dateToParam); - dateTo.setYearRange(1900, today.get(Calendar.YEAR) + 3); - add(dateTo); - - add(new Label((String) PublicationGlobalizationUtil.globalize( - "publications.ui.inproceedings.data_form_of_conference"). + "publications.ui.inproceedings.date_from_of_conference"). localize())); ParameterModel dateFromParam = new DateParameter(InProceedings.DATE_FROM_OF_CONFERENCE); @@ -84,6 +73,17 @@ public class InProceedingsPropertyForm dateFromParam); dateFrom.setYearRange(1900, today.get(Calendar.YEAR) + 3); add(dateFrom); + + add(new Label((String) PublicationGlobalizationUtil.globalize( + "publications.ui.inproceedings.date_to_of_conference"). + localize())); + ParameterModel dateToParam = + new DateParameter(InProceedings.DATE_TO_OF_CONFERENCE); + com.arsdigita.bebop.form.Date dateTo = + new com.arsdigita.bebop.form.Date( + dateToParam); + dateTo.setYearRange(1900, today.get(Calendar.YEAR) + 3); + add(dateTo); add(new Label((String) PublicationGlobalizationUtil.globalize( "publications.ui.inproceedings.place_of_conference"). @@ -190,10 +190,6 @@ public class InProceedingsPropertyForm (Integer) data.get(InProceedings.PAGES_TO)); inProceedings.save(); - } - - if (m_step != null) { - m_step.maybeForwardToNextStep(fse.getPageState()); - } + } } } diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/InternetArticlePropertyForm.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/InternetArticlePropertyForm.java index 2cd6f4023..49f1453d4 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/InternetArticlePropertyForm.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/InternetArticlePropertyForm.java @@ -144,11 +144,7 @@ public class InternetArticlePropertyForm article.setPublicationDate( (Date) data.get(InternetArticle.PUBLICATION_DATE)); - article.save(); - - if (m_step != null) { - m_step.maybeForwardToNextStep(fse.getPageState()); - } + article.save(); } } } diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/MonographPropertiesStep.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/MonographPropertiesStep.java index cb7f8bc3d..16a041a7b 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/MonographPropertiesStep.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/MonographPropertiesStep.java @@ -24,7 +24,8 @@ public class MonographPropertiesStep public static Component getMonographPropertiesStep( ItemSelectionModel itemModel) { - DomainObjectPropertySheet sheet = (DomainObjectPropertySheet) PublicationWithPublisherPropertiesStep. + DomainObjectPropertySheet sheet = (DomainObjectPropertySheet) + PublicationWithPublisherPropertiesStep. getPublicationWithPublisherPropertySheet(itemModel); sheet.add(PublicationGlobalizationUtil.globalize( @@ -55,7 +56,7 @@ public class MonographPropertiesStep basicProperties.add(EDIT_SHEET_NAME, (String) PublicationGlobalizationUtil.globalize( - "publications.ui.monography.edit_basic_sheet").localize(), + "publications.ui.monograph.edit_basic_sheet").localize(), new WorkflowLockedComponentAccess(editBasicSheet, itemModel), editBasicSheet.getSaveCancelSection(). diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/MonographPropertyForm.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/MonographPropertyForm.java index 6acefac00..e92706d36 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/MonographPropertyForm.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/MonographPropertyForm.java @@ -100,10 +100,6 @@ public class MonographPropertyForm monograph.setEdition((String) data.get(Monograph.EDITION)); monograph.save(); - } - - if (m_step != null) { - m_step.maybeForwardToNextStep(fse.getPageState()); - } + } } } diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationAuthorAddForm.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationAuthorAddForm.java index ee4f5ef39..25be5414a 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationAuthorAddForm.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationAuthorAddForm.java @@ -54,7 +54,7 @@ public class PublicationAuthorAddForm add(m_itemSearch); add(new Label((String) PublicationGlobalizationUtil.globalize( - "publications.ui.authors.is_editor").localize())); + "publications.ui.authors.author.is_editor").localize())); ParameterModel isEditorModel = new BooleanParameter( AuthorshipCollection.EDITOR); RadioGroup isEditorGroup = new RadioGroup(isEditorModel); @@ -62,16 +62,16 @@ public class PublicationAuthorAddForm isEditorGroup.setMetaDataAttribute( "label", (String) PublicationGlobalizationUtil.globalize( - "publications.ui.authors.is_editor_label"). + "publications.ui.authors.author.is_editor_label"). localize()); isEditorGroup.addOption( new Option(Boolean.FALSE.toString(), (String) PublicationGlobalizationUtil.globalize( - "publications.ui.authors.is_editor_false").localize())); + "publications.ui.authors.author.is_editor_false").localize())); isEditorGroup.addOption( new Option(Boolean.TRUE.toString(), (String) PublicationGlobalizationUtil.globalize( - "publications.ui.authors.is_editor_true").localize())); + "publications.ui.authors.author.is_editor_true").localize())); add(isEditorGroup); } diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationAuthorsPropertyStep.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationAuthorsPropertyStep.java index 92767acd4..24bab5b42 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationAuthorsPropertyStep.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationAuthorsPropertyStep.java @@ -30,7 +30,7 @@ public class PublicationAuthorsPropertyStep extends SimpleEditStep { new PublicationAuthorAddForm(itemModel); add(ADD_AUTHOR_SHEET_NAME, (String) PublicationGlobalizationUtil.globalize( - "publications.ui.add_author").localize(), + "publications.ui.authors.add_author").localize(), new WorkflowLockedComponentAccess(addAuthorSheet, itemModel), addAuthorSheet.getSaveCancelSection().getCancelButton()); diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationAuthorsTable.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationAuthorsTable.java index b4c3cb778..d2beec5dd 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationAuthorsTable.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationAuthorsTable.java @@ -146,11 +146,11 @@ public class PublicationAuthorsTable case 1: if (m_authorshipCollection.isEditor()) { return (String) PublicationGlobalizationUtil.globalize( - "publications.ui.authors.author.isEditor"). + "publications.ui.authors.author.is_editor"). localize(); } else { return PublicationGlobalizationUtil.globalize( - "publications.ui.authors.author.isNotEditor"). + "publications.ui.authors.author.is_not_editor"). localize(); } case 2: diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationGlobalizationUtil.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationGlobalizationUtil.java index 7681c2270..91c8de7cc 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationGlobalizationUtil.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationGlobalizationUtil.java @@ -9,7 +9,7 @@ import com.arsdigita.globalization.GlobalizedMessage; public class PublicationGlobalizationUtil { public static final String BUNDLE_NAME = - "com.arsdigita.cms.contenttypes.PublicationBundle"; + "com.arsdigita.cms.contenttypes.ui.PublicationResources"; public static GlobalizedMessage globalize(String key) { return new GlobalizedMessage(key, BUNDLE_NAME); diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationPropertyForm.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationPropertyForm.java index ad7fbd4e6..d273b038d 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationPropertyForm.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationPropertyForm.java @@ -54,7 +54,7 @@ public class PublicationPropertyForm add(title); add(new Label((String) PublicationGlobalizationUtil.globalize( - "publications.ui.publication.yearOfPublication").localize())); + "publications.ui.publication.year_of_publication").localize())); ParameterModel yearOfPublicationParam = new IntegerParameter( Publication.YEAR_OF_PUBLICATION); TextField yearOfPublication = new TextField(yearOfPublicationParam); @@ -104,11 +104,7 @@ public class PublicationPropertyForm publication.setMisc((String) data.get(Publication.MISC)); publication.save(); - } - - if (m_step != null) { - m_step.maybeForwardToNextStep(fse.getPageState()); - } + } } @Override diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationResources.properties b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationResources.properties new file mode 100644 index 000000000..9d66a1d1d --- /dev/null +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationResources.properties @@ -0,0 +1,208 @@ +# Resource file containing all english (default) texts for the forms of the +# ccm-sci-publications module +#***************************************************************************** + +#General +#======= +publications.ui.articleInCollectedVolume_properties.title=Basic properties +publications.ui.articleInCollectedVolume.basic_properties.description=Basic properties +publications.ui.articleInJournal_properties.title=Basic properties +publications.ui.articleInJournal.basic_properties.description=Basic properties +publications.ui.collectedVolume_properties.title=Basic properties +publications.ui.collectedVolume.basic_properties.description=Basic properties +publications.ui.expertise_properties.title=Basic properties +publications.ui.expertise.basic_properties.description=Basic properties +publications.ui.greyLiterature_properties.title=Basic properties +publications.ui.greyLiterature.basic_properties.description=Basic properties +publications.ui.inProceedings_properties.title=Basic properties +publications.ui.inProceedings.basic_properties.description=Basic properties +publications.ui.InternetArticle_properties.title=Basic properties +publications.ui.internetArticle.basic_properties.description=Basic properties +publications.ui.monograph_properties.title=Basic properties +publications.ui.monograph.basic_properties.description=Basic properties +publications.ui.publication_with_publishers_properties.title=Basic properties +publications.ui.publication_with_publisher.basic_properties.description=Basic properties +publications.ui.publication_properties.title=Basic properties +publications.ui.publication_properties.title.description=Basic properties +publications.ui.publisher_properties.title=Basic properties +publications.ui.publisher.basic_properties.description=Basic properties +publications.ui.review_properties.title=Basic properties +publications.ui.review.basic_properties.description=Basic properties +publications.ui.series_properties.title=Basic properties +publications.ui.series.basic_properties.description=Basic properties +publications.ui.unPublished_properties.title=Basic properties +publications.ui.unPublished.basic_properties.description=Basic properties +publications.ui.workingPaper_properties.title=Basic properties +publications.ui.workingPaper.basic_properties.description=Basic properties + + +#Publication +#=========== +publications.ui.publication.abstract=Abstract +publications.ui.publication.authors=Authors +publications.ui.publication.basic_properties=Basic properties +publications.ui.publication.edit_basic_sheet=Edit basic properties +publications.ui.publication.misc=Miscellaneous data +publications.ui.publication.title=Title +publications.ui.publication.year_of_publication=Year of publication + +#PublicationWithPublisher +#======================== +publications.ui.with_publisher.isbn=ISBN +publications.ui.with_publisher.publisher=Publisher + +#CollectedVolume +#=============== +publications.ui.collected_volume.add_article=Add article +publications.ui.collected_volume.article=Article +publications.ui.collected_volume.article.down=Down +publications.ui.collected_volume.article.remove=Remove article +publications.ui.collected_volume.article.up=Up +publications.ui.collected_volume_articles=Articles +publications.ui.collected_volume.articles.select_article=Select article to add +publications.ui.collected_volume.edition=Edition +publications.ui.collected_volume.edit_basic_sheet=Edit basic properties +publications.ui.collected_volume.no_articles=This collected volumes has no articles +publications.ui.collected_volume.number_of_pages=NUmber of pages +publications.ui.collected_volume.number_of_volumes=Number of volumes +publications.ui.collected_volume.volume=Volume + +#ArticleInCollectedVolume +#======================== +publications.ui.article_in_collected_volume.chapter=Chapter +publications.ui.article_in_collected_volume.edit_basic_sheet=Edit basic properties +publications.ui.article_in_collected_volume.pages_from=First page +publications.ui.article_in_collected_volume.pages_to=Last page + +#Monograph +#========= +publications.ui.monograph.edition=Edition +publications.ui.monograph.edit_basic_sheet=Edit basic properties +publications.ui.monograph.numberOfPages=Number of pages +publications.ui.monograph.numberOfVolumes=Number of volumes +publications.ui.monograph.volume=Volume + +#InProceedings +#============= +publications.ui.inproceedings.date_form_of_conference=Date of Conference (first day) +publications.ui.inproceedings.date_to_of_conference=Date of Conference (last day) +publications.ui.inproceedings.edit_basic_sheet=Edit basic properties +publications.ui.inproceedings.name_of_conference=Name of conference +publications.ui.inproceedings.number_of_pages=Number of pages +publications.ui.inproceedings.number_of_volumes=Number of volumes +publications.ui.inproceedings.organizer_of_conference=Organizer of conference +publications.ui.inproceedings.pages_from=First page +publications.ui.inproceedings.pages_from=Last page +publications.ui.inproceedings.place_of_conference=Place of conference +publications.ui.inproceedings.volume=Volume + +#InternetArticle +#=============== +publications.ui.internetarticle.edition=Edition +publications.ui.internetarticle.edit_basic_sheet=Edit basic properties +publications.ui.internetarticle.number=Number +publications.ui.internetarticle.number_of_pages=Number of pages +publications.ui.internetarticle.organization=Organization +publications.ui.internetarticle.place=Place +publications.ui.internetarticle.publicationdate=Publication date. + +#ArticleInJournal +#================ +publications.ui.articleinjournal.edit_basic_sheet=Edit basic properties +publications.ui.articleinjournal.issn=ISSN +publications.ui.articleinjournal.issue=Issue +publications.ui.articleinjournal.journal=Journal +publications.ui.articleinjournal.url=URL +publications.ui.articleinjournal.pages_from=First page +publications.ui.articleinjournal.pages_to=Last page +publications.ui.articleinjournal.publicationDate=Publication date +publications.ui.articleinjournal.volume=Volume + +#UnPublished +#=========== +publications.ui.unpublished.edit_basic_sheet=Edit basic properties +publications.ui.unpublished.number=Number +publications.ui.unpublished.number_of_pages=Number of pages +publications.ui.unpublished.organization=Organization +publications.ui.unpublished.place=Place + +#GreyLiterature +#============== +publications.ui.greyliterature.edit_basic_sheet=Edit basic properties +publications.ui.greyliterature.pages_from=First page +publications.ui.greyliterature.pages_to=Last page +publications.ui.greyliterature.url=URL + +#WorkingPaper +#============ +publications.ui.workingpaper.edit_basic_sheet=Edit basic properties + +#Expertise +#========= +publications.ui.expertise.edit_basic_sheet=Edit basic properties +publications.ui.expertise.number_of_pages=Number of pages +publications.ui.expertise.place=Place +publications.ui.expertise.organization=Organization +publications.ui.expertise.orderer=Orderer +publications.ui.expertise.url=URL + +#Review +#====== +publications.ui.review.edit_basic_sheet=Edit basic properties +publications.ui.review.issn=ISSN +publications.ui.review.issue=Issue +publications.ui.review.journal=Journal +publications.ui.review.pagesFrom=First page +publications.ui.review.pagesTo=Last page +publications.ui.review.publicationdate=Publication data +publications.ui.review.url=URL +publications.ui.review.volume=Volume + +#Authors +#======= +publications.ui.authors.add_author=Add author +publications.ui.authors.author.confirm_remove=Really remove this author? +publications.ui.authors.author.delete=Remove author +publications.ui.authors.author.down=Move down +publications.ui.authors.author.is_editor=Is editor? +publications.ui.authors.author.is_editor_label=Yes +publications.ui.authors.author.is_editor_false=No +publications.ui.authors.author.is_editor_true=Yes +publications.ui.authors.author.is_not_editor=No +publications.ui.authors.author.name=Name +publications.ui.authors.author.remove=Remove author +publications.ui.authors.author.up=Move up +publications.ui.authors.none=No authors +publications.ui.authors.selectAuthor=Select author + +#Publisher +#========= +publications.ui.publisher.basic_properties=Basic properties +publications.ui.publisher.edit_basic_properties=Edit basic properties +publications.ui.publisher.place=Place + +#Series +#====== +publications.ui.series.add_editship=Add editor +publications.ui.series.add_volume=Add volume +publications.ui.series.basic_properties=Basic properties +publications.ui.series.editors=Editors +publications.ui.series.edit_basic_sheet=Edit basic properties +publications.ui.series.editship.down=Move down +publications.ui.series.editship.from=Editor from +publications.ui.series.editship.name=Name +publications.ui.series.editship.none=No editors +publications.ui.series.editship.remove=Remove editor +publications.ui.series.editship.remove.confirm=Really remove this editor? +publications.ui.series.editship.selectEditors=Select editor +publications.ui.series.editship.to=Editor to +publications.ui.series.editship.up=Move up +publications.ui.series.title=Title +publications.ui.series.volume_of_series=Volume of series +publications.ui.series.volumes=Volumes +publications.ui.series.volumes.select_publication=Select publication to add +publications.ui.series.volumes.name=Name +publications.ui.series.volumes.none=No volumes +publications.ui.series.volumes.remove=Remove volume +publications.ui.series.volumes.remove.confirm=Really remove this volume? +publications.ui.series.volumes.volume_of_series=Volume of series diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationResources_de.properties b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationResources_de.properties new file mode 100644 index 000000000..f6de5bce1 --- /dev/null +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationResources_de.properties @@ -0,0 +1,207 @@ +# Resource file containing all german texts for the forms of the +# ccm-sci-publications module +#***************************************************************************** + +#General +#======= +publications.ui.articleInCollectedVolume_properties.title=Basiseigenschaften +publications.ui.articleInCollectedVolume.basic_properties.description=Basiseigenschaften +publications.ui.articleInJournal_properties.title=Basiseigenschaften +publications.ui.articleInJournal.basic_properties.description=Basiseigenschaften +publications.ui.collectedVolume_properties.title=Basiseigenschaften +publications.ui.collectedVolume.basic_properties.description=Basiseigenschaften +publications.ui.expertise_properties.title=Basiseigenschaften +publications.ui.expertise.basic_properties.description=Basiseigenschaften +publications.ui.greyLiterature_properties.title=Basiseigenschaften +publications.ui.greyLiterature.basic_properties.description=Basiseigenschaften +publications.ui.inProceedings_properties.title=Basiseigenschaften +publications.ui.inProceedings.basic_properties.description=Basiseigenschaften +publications.ui.InternetArticle_properties.title=Basiseigenschaften +publications.ui.internetArticle.basic_properties.description=Basiseigenschaften +publications.ui.monograph_properties.title=Basiseigenschaften +publications.ui.monograph.basic_properties.description=Basiseigenschaften +publications.ui.publication_with_publishers_properties.title=Basiseigenschaften +publications.ui.publication_with_publisher.basic_properties.description=Basiseigenschaften +publications.ui.publication_properties.title=Basiseigenschaften +publications.ui.publication_properties.title.description=Basiseigenschaften +publications.ui.publisher_properties.title=Basiseigenschaften +publications.ui.publisher.basic_properties.description=Basiseigenschaften +publications.ui.review_properties.title=Basiseigenschaften +publications.ui.review.basic_properties.description=Basiseigenschaften +publications.ui.series_properties.title=Basiseigenschaften +publications.ui.series.basic_properties.description=Basiseigenschaften +publications.ui.unPublished_properties.title=Basiseigenschaften +publications.ui.unPublished.basic_properties.description=Basiseigenschaften +publications.ui.workingPaper_properties.title=Basiseigenschaften +publications.ui.workingPaper.basic_properties.description=Basiseigenschaften + +#Publication +#=========== +publications.ui.publication.abstract=Zusammenfassung +publications.ui.publication.authors=Autoren +publications.ui.publication.basic_properties=Basiseigenschaften +publications.ui.publication.edit_basic_sheet=Basiseigenschaften bearbeiten +publications.ui.publication.misc=Weitere Angaben +publications.ui.publication.title=Titel +publications.ui.publication.year_of_publication=Jahr + +#PublicationWithPublisher +#======================== +publications.ui.with_publisher.isbn=ISBN +publications.ui.with_publisher.publisher=Verlag + +#CollectedVolume +#=============== +publications.ui.collected_volume.add_article=Artikel hinzuf\u00fcgen +publications.ui.collected_volume.article=Artikel +publications.ui.collected_volume.article.down=Runter +publications.ui.collected_volume.article.remove=Artikel entfernen +publications.ui.collected_volume.article.up=Hoch +publications.ui.collected_volume_articles=Artikel +publications.ui.collected_volume.articles.select_article=Artikel w\u00e4hlen +publications.ui.collected_volume.edition=Auflage +publications.ui.collected_volume.edit_basic_sheet=Basiseigenschaften bearbeiten +publications.ui.collected_volume.no_articles=Keine Artikel vorhanden +publications.ui.collected_volume.number_of_pages=Anzahl der Seiten +publications.ui.collected_volume.number_of_volumes=Anzahl der B\u00e4nde +publications.ui.collected_volume.volume=Band + +#ArticleInCollectedVolume +#======================== +publications.ui.article_in_collected_volume.chapter=Kapitel +publications.ui.article_in_collected_volume.edit_basic_sheet=Basiseigenschaften bearbeiten +publications.ui.article_in_collected_volume.pages_from=Erste Seite +publications.ui.article_in_collected_volume.pages_to=Letzte Seite + +#Monograph +#========= +publications.ui.monograph.edition=Auflage +publications.ui.monograph.edit_basic_sheet=Basiseigenschaften bearbeiten +publications.ui.monograph.numberOfPages=Anzahl der Seiten +publications.ui.monograph.numberOfVolumes=Anzahl der B\u00e4nde +publications.ui.monograph.volume=Band + +#InProceedings +#============= +publications.ui.inproceedings.date_form_of_conference=Datum der Konferenz (erster Tag) +publications.ui.inproceedings.date_to_of_conference=Datum der Konferenz (letzter Tag) +publications.ui.inproceedings.edit_basic_sheet=Basiseigenschaften bearbeiten +publications.ui.inproceedings.name_of_conference=Name der Konferenz +publications.ui.inproceedings.number_of_pages=Anzahl der Seiten +publications.ui.inproceedings.number_of_volumes=Anzahl der B\u00e4nde +publications.ui.inproceedings.organizer_of_conference=Veranstalter der Konferenz +publications.ui.inproceedings.pages_from=Erste Seite +publications.ui.inproceedings.pages_from=Letzte Seite +publications.ui.inproceedings.place_of_conference=Veranstaltungsort +publications.ui.inproceedings.volume=Band + +#InternetArticle +#=============== +publications.ui.internetarticle.edition=Auflage +publications.ui.internetarticle.edit_basic_sheet=Basiseigenschaften bearbeiten +publications.ui.internetarticle.number=Nummer +publications.ui.internetarticle.number_of_pages=Anzahl der Seiten +publications.ui.internetarticle.organization=Organisation +publications.ui.internetarticle.place=Erscheinungsort +publications.ui.internetarticle.publicationdate=Ver\u00f6ffentlichungsdatum + +#ArticleInJournal +#================ +publications.ui.articleinjournal.edit_basic_sheet=Basiseigenschaften bearbeiten +publications.ui.articleinjournal.issn=ISSN +publications.ui.articleinjournal.issue=Jahrgang +publications.ui.articleinjournal.journal=Zeitschrift +publications.ui.articleinjournal.url=URL +publications.ui.articleinjournal.pages_from=Erste Seite +publications.ui.articleinjournal.pages_to=Letzte Seite +publications.ui.articleinjournal.publicationDate=Erscheinungsdatum +publications.ui.articleinjournal.volume=Band + +#UnPublished +#=========== +publications.ui.unpublished.edit_basic_sheet=Basiseigenschaften bearbeiten +publications.ui.unpublished.number=Nummer +publications.ui.unpublished.number_of_pages=Anzahl der Seiten +publications.ui.unpublished.organization=Organisation +publications.ui.unpublished.place=Erscheinungsort + +#GreyLiterature +#============== +publications.ui.greyliterature.edit_basic_sheet=Basiseigenschaften bearbeiten +publications.ui.greyliterature.pages_from=Erste Seite +publications.ui.greyliterature.pages_to=Letzte Seite +publications.ui.greyliterature.url=URL + +#WorkingPaper +#============ +publications.ui.workingpaper.edit_basic_sheet=Basiseigenschaften bearbeiten + +#Expertise +#========= +publications.ui.expertise.edit_basic_sheet=Basiseigenschaften bearbeiten +publications.ui.expertise.number_of_pages=Anzahl der Seiten +publications.ui.expertise.place=Erscheinungsort +publications.ui.expertise.organization=Organisation +publications.ui.expertise.orderer=Auftraggeber +publications.ui.expertise.url=URL + +#Review +#====== +publications.ui.review.edit_basic_sheet=Basiseigenschaften bearbeiten +publications.ui.review.issn=ISSN +publications.ui.review.issue=Jahrgang +publications.ui.review.journal=Zeitschrift +publications.ui.review.pagesFrom=Erste Seite +publications.ui.review.pagesTo=Letzte Seite +publications.ui.review.publicationdate=Erscheinungsdatum +publications.ui.review.url=URL +publications.ui.review.volume=Band + +#Authors +#======= +publications.ui.authors.add_author=Autor hinzuf\u00fcgen +publications.ui.authors.author.confirm_remove=Diesen Autor wirklich entfernen? +publications.ui.authors.author.delete=Autor entfernen +publications.ui.authors.author.down=Runter +publications.ui.authors.author.is_editor=Herausgeber? +publications.ui.authors.author.is_editor_label=Herausgeber? +publications.ui.authors.author.is_editor_false=Nein +publications.ui.authors.author.is_editor_true=Ja +publications.ui.authors.author.is_not_editor=Nein +publications.ui.authors.author.name=Name +publications.ui.authors.author.remove=Autor entfernen +publications.ui.authors.author.up=Hoch +publications.ui.authors.none=Keine Autoren gefunden +publications.ui.authors.selectAuthor=Autor ausw\u00e4hlen + +#Publisher +#========= +publications.ui.publisher.basic_properties=Basiseigenschaften +publications.ui.publisher.edit_basic_properties=Basiseigenschaften bearbeiten +publications.ui.publisher.place=Erscheinungsort + +#Series +#====== +publications.ui.series.add_editship=Herausgeber hinzuf\u00fcgen +publications.ui.series.add_volume=Band hinzuf\u00fcgen +publications.ui.series.basic_properties=Basiseigenscahaften +publications.ui.series.editors=Herausgeber +publications.ui.series.edit_basic_sheet=Basiseigenschaften bearbeiten +publications.ui.series.editship.down=Runter +publications.ui.series.editship.from=Herausgeber seit +publications.ui.series.editship.name=Name +publications.ui.series.editship.none=Keine Herausgeber gefunden +publications.ui.series.editship.remove=Herausgeber entfernen +publications.ui.series.editship.remove.confirm=Diesen Herausgeber wirklich entfernen? +publications.ui.series.editship.selectEditors=Herausgeber ausw\u00e4hlen +publications.ui.series.editship.to=Herausgeber bis +publications.ui.series.editship.up=Hoch +publications.ui.series.title=Titel +publications.ui.series.volume_of_series=Band der Reihe +publications.ui.series.volumes=Anzahl der B\u00e4nde +publications.ui.series.volumes.select_publication=Publikation zum Hinzuf\u00fcgen ausw\u00e4hlen +publications.ui.series.volumes.name=Name +publications.ui.series.volumes.none=Keine B\u00e4nde gefunden. +publications.ui.series.volumes.remove=Band entfernen. +publications.ui.series.volumes.remove.confirm=Diesen Band wirklich entfernen +publications.ui.series.volumes.volume_of_series=Band der Serie diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublisherPropertyForm.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublisherPropertyForm.java index e2a5fc1eb..ef5881235 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublisherPropertyForm.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublisherPropertyForm.java @@ -71,10 +71,6 @@ public class PublisherPropertyForm publisher.setPlace((String) data.get(PLACE)); } - publisher.save(); - - if (m_step != null) { - m_step.maybeForwardToNextStep(fse.getPageState()); - } + publisher.save(); } } diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ReviewPropertyForm.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ReviewPropertyForm.java index b82556e82..c121846b2 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ReviewPropertyForm.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ReviewPropertyForm.java @@ -138,10 +138,5 @@ public class ReviewPropertyForm review.save(); } - - if (m_step != null) { - m_step.maybeForwardToNextStep(fse.getPageState()); - } - } } diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/SeriesEditshipAddForm.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/SeriesEditshipAddForm.java index 893172917..459c13432 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/SeriesEditshipAddForm.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/SeriesEditshipAddForm.java @@ -42,7 +42,7 @@ public class SeriesEditshipAddForm extends BasicItemForm { @Override protected void addWidgets() { add(new Label((String) PublicationGlobalizationUtil.globalize( - "publications.ui.series.editorship.selectEditors").localize())); + "publications.ui.series.editship.selectEditors").localize())); m_itemSearch = new ItemSearchWidget( ITEM_SEARCH, ContentType.findByAssociatedObjectType(GenericPerson.class. @@ -50,7 +50,7 @@ public class SeriesEditshipAddForm extends BasicItemForm { add(m_itemSearch); add(new Label((String) PublicationGlobalizationUtil.globalize( - "publications.ui.series.editorship.from").localize())); + "publications.ui.series.editship.from").localize())); ParameterModel fromParam = new DateParameter(EditshipCollection.FROM); com.arsdigita.bebop.form.Date from = new com.arsdigita.bebop.form.Date( fromParam); @@ -59,7 +59,7 @@ public class SeriesEditshipAddForm extends BasicItemForm { add(from); add(new Label((String) PublicationGlobalizationUtil.globalize( - "publications.ui.series.editorship.to").localize())); + "publications.ui.series.editship.to").localize())); ParameterModel toParam = new DateParameter(EditshipCollection.TO); com.arsdigita.bebop.form.Date to = new com.arsdigita.bebop.form.Date( toParam); diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/SeriesEditshipTable.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/SeriesEditshipTable.java index 9aaa57f0c..2cf681bdc 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/SeriesEditshipTable.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/SeriesEditshipTable.java @@ -67,7 +67,7 @@ public class SeriesEditshipTable extends Table implements TableActionListener { /* colModel.add(new TableColumn( 4, PublicationGlobalizationUtil.globalize( - "publications.ui.series.edithship.up").localize(), + "publications.ui.series.editship.up").localize(), TABLE_COL_UP)); colModel.add(new TableColumn( 5, @@ -216,7 +216,8 @@ public class SeriesEditshipTable extends Table implements TableActionListener { if (canDelete) { ControlLink link = new ControlLink(value.toString()); link.setConfirmation((String) PublicationGlobalizationUtil. - globalize("publications.ui.editship.remove.confirm"). + globalize( + "publications.ui.series.editship.remove.confirm"). localize()); return link; } else { @@ -228,67 +229,67 @@ public class SeriesEditshipTable extends Table implements TableActionListener { /* private class UpCellRenderer - extends LockableImpl - implements TableCellRenderer { + extends LockableImpl + implements TableCellRenderer { - @Override - public Component getComponent( - Table table, - PageState state, - Object value, - boolean isSelected, - Object key, - int row, - int col) { + @Override + public Component getComponent( + Table table, + PageState state, + Object value, + boolean isSelected, + Object key, + int row, + int col) { - if (0 == row) { - s_log.debug("Row is first row in table, don't show up link"); - Label label = new Label(""); - return label; - } else { - ControlLink link = new ControlLink("up"); - return link; - } - } + if (0 == row) { + s_log.debug("Row is first row in table, don't show up link"); + Label label = new Label(""); + return label; + } else { + ControlLink link = new ControlLink("up"); + return link; + } + } }*/ /* private class DownCellRenderer - extends LockableImpl - implements TableCellRenderer { + extends LockableImpl + implements TableCellRenderer { - @Override - public Component getComponent( - Table table, - PageState state, - Object value, - boolean isSelected, - Object key, - int row, - int col) { + @Override + public Component getComponent( + Table table, + PageState state, + Object value, + boolean isSelected, + Object key, + int row, + int col) { - Series = (Series) m_itemModel. - getSelectedObject(state); - EditshipCollection editors = series.getEditors(); + Series = (Series) m_itemModel. + getSelectedObject(state); + EditshipCollection editors = series.getEditors(); - if ((editors.size() - 1) - == row) { - s_log.debug("Row is last row in table, don't show down link"); - Label label = new Label(""); - return label; - } else { - ControlLink link = new ControlLink("down"); - return link; - } - } + if ((editors.size() - 1) + == row) { + s_log.debug("Row is last row in table, don't show down link"); + Label label = new Label(""); + return label; + } else { + ControlLink link = new ControlLink("down"); + return link; + } + } }*/ - @Override public void cellSelected(TableActionEvent event) { PageState state = event.getPageState(); GenericPerson editor = - new GenericPerson(new BigDecimal(event.getRowKey().toString())); + new GenericPerson(new BigDecimal(event.getRowKey(). + toString())); Series series = (Series) m_itemModel.getSelectedObject(state); @@ -297,15 +298,14 @@ public class SeriesEditshipTable extends Table implements TableActionListener { TableColumn column = getColumnModel().get(event.getColumn().intValue()); if (TABLE_COL_EDIT.equals(column.getHeaderKey().toString())) { - - } else if(TABLE_COL_DEL.equals(column.getHeaderKey().toString())) { + } else if (TABLE_COL_DEL.equals(column.getHeaderKey().toString())) { series.removeEditor(editor); } /* else if(TABLE_COL_UP.equals(column.getHeaderKey().toString())) { editors.swapWithPrevious(editor); } else if(TABLE_COL_DOWN.equals(column.getHeaderKey().toString())) { - authors.swapWithNext(editor); + authors.swapWithNext(editor); } */ } diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/SeriesPropertyForm.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/SeriesPropertyForm.java index 9957d0652..d9b3b42e9 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/SeriesPropertyForm.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/SeriesPropertyForm.java @@ -70,11 +70,7 @@ public class SeriesPropertyForm series.setTitle((String) data.get(Series.NAME)); series.save(); - } - - if (m_step != null) { - m_step.maybeForwardToNextStep(fse.getPageState()); - } + } } @Override diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/SeriesVolumesTable.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/SeriesVolumesTable.java index 37e59ce4d..83d523760 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/SeriesVolumesTable.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/SeriesVolumesTable.java @@ -51,7 +51,7 @@ public class SeriesVolumesTable extends Table implements TableActionListener { colModel.add(new TableColumn( 1, PublicationGlobalizationUtil.globalize( - "publications.ui.series.volumes.volumeOfSeries").localize())); + "publications.ui.series.volumes.volume_of_series").localize())); colModel.add(new TableColumn( 2, PublicationGlobalizationUtil.globalize( @@ -194,7 +194,8 @@ public class SeriesVolumesTable extends Table implements TableActionListener { if (canDelete) { ControlLink link = new ControlLink(value.toString()); link.setConfirmation((String) PublicationGlobalizationUtil. - globalize("publications.ui.volumes.remove.confirm"). + globalize( + "publications.ui.series.volumes.remove.confirm"). localize()); return link; } else { diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/UnPublishedPropertyForm.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/UnPublishedPropertyForm.java index f64c596b0..fe1b70c27 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/UnPublishedPropertyForm.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/UnPublishedPropertyForm.java @@ -107,11 +107,7 @@ public class UnPublishedPropertyForm unpublished.setNumberOfPages( (Integer) data.get(UnPublished.NUMBER_OF_PAGES)); - unpublished.save(); - - if (m_step != null) { - m_step.maybeForwardToNextStep(fse.getPageState()); - } + unpublished.save(); } } }