diff --git a/sci-types-project/src/main/java/org/scientificcms/contenttypes/sciproject/ui/SciProjectContactTypes.java b/sci-types-project/src/main/java/org/scientificcms/contenttypes/sciproject/ui/SciProjectContactTypes.java new file mode 100644 index 0000000..fad252e --- /dev/null +++ b/sci-types-project/src/main/java/org/scientificcms/contenttypes/sciproject/ui/SciProjectContactTypes.java @@ -0,0 +1,29 @@ +package org.scientificcms.contenttypes.sciproject.ui; + +import org.libreccm.configuration.ConfigurationManager; +import org.libreccm.ui.AbstractMessagesBean; +import org.scientificcms.contenttypes.sciproject.SciProjectConfig; + +import javax.enterprise.context.RequestScoped; +import javax.inject.Inject; +import javax.inject.Named; + +/** + * + * @author Jens Pelzetter + */ +@RequestScoped +@Named("SciProjectContactTypes") +public class SciProjectContactTypes extends AbstractMessagesBean { + + @Inject + private ConfigurationManager confManager; + + @Override + protected String getMessageBundle() { + return confManager + .findConfiguration(SciProjectConfig.class) + .getContactTypesBundleName(); + } + +} diff --git a/sci-types-project/src/main/java/org/scientificcms/contenttypes/sciproject/ui/SciProjectRoles.java b/sci-types-project/src/main/java/org/scientificcms/contenttypes/sciproject/ui/SciProjectRoles.java new file mode 100644 index 0000000..d99a155 --- /dev/null +++ b/sci-types-project/src/main/java/org/scientificcms/contenttypes/sciproject/ui/SciProjectRoles.java @@ -0,0 +1,29 @@ +package org.scientificcms.contenttypes.sciproject.ui; + +import org.libreccm.configuration.ConfigurationManager; +import org.libreccm.ui.AbstractMessagesBean; +import org.scientificcms.contenttypes.sciproject.SciProjectConfig; + +import javax.enterprise.context.RequestScoped; +import javax.inject.Inject; +import javax.inject.Named; + +/** + * + * @author Jens Pelzetter + */ +@RequestScoped +@Named("SciProjectRoles") +public class SciProjectRoles extends AbstractMessagesBean { + + @Inject + private ConfigurationManager confManager; + + @Override + protected String getMessageBundle() { + return confManager + .findConfiguration(SciProjectConfig.class) + .getMemberRolesBundleName(); + } + +} diff --git a/sci-types-project/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/sciproject/ui/description/view.xhtml b/sci-types-project/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/sciproject/ui/description/view.xhtml index 346d2ca..15e6423 100644 --- a/sci-types-project/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/sciproject/ui/description/view.xhtml +++ b/sci-types-project/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/sciproject/ui/description/view.xhtml @@ -31,6 +31,7 @@ + diff --git a/sci-types-project/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/sciproject/ui/sciproject-description.xhtml b/sci-types-project/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/sciproject/ui/sciproject-description.xhtml index ce62f3e..58b3b71 100644 --- a/sci-types-project/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/sciproject/ui/sciproject-description.xhtml +++ b/sci-types-project/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/sciproject/ui/sciproject-description.xhtml @@ -18,13 +18,13 @@ #{SciProjectMessageBundle.getMessage('description_step.errors.contactable_not_found', [contactableNotFound])} - + #{SciProjectMessageBundle.getMessage('description_step.errors.person_not_found', [personNotFound])} - + #{SciProjectMessageBundle.getMessage('description_step.errors.illegal_member_status_value', [illegalStatusValue])} @@ -43,7 +43,7 @@ - + - #{contact.contactable} - #{contact.contactType} + #{SciProjectContactTables[contact.contactType]} - @@ -226,11 +228,12 @@ dialogTitle="#{SciProjectMessageBundle['memberships.add.title']}" formParamName="personUuid"> - - #{member.role} + #{SciProjectRoles[member.role]} #{member.status} @@ -300,12 +303,13 @@ -