Reorganized categories list alphabetically and used bundle messages in dataverse.java #2829

Author: rbhatta99

src/main/java/edu/harvard/iq/dataverse/Dataverse.java

@@ -105,25 +105,22 @@ public void setDataverseType(DataverseType dataverseType) {
     @Transient
     private final String uncategorizedString = "Uncategorized";
 
-    /**
-     * @todo Don't hard code these as English. Use bundleUtils
-     */
-    public String getFriendlyCategoryName(){
+        public String getFriendlyCategoryName(){
        switch (this.dataverseType) {
             case RESEARCHERS:
-                return "Researcher";
+                return BundleUtil.getStringFromBundle("dataverse.type.selectTab.researchers");
             case RESEARCH_PROJECTS:
-                return "Research Project";
+                return BundleUtil.getStringFromBundle("dataverse.type.selectTab.researchProjects");
             case JOURNALS:
-                return "Journal";            
+                return BundleUtil.getStringFromBundle("dataverse.type.selectTab.journals");           
             case ORGANIZATIONS_INSTITUTIONS:
-                return "Organization or Institution";            
+                return BundleUtil.getStringFromBundle("dataverse.type.selectTab.organizationsAndInsitutions");           
             case TEACHING_COURSES:
-                return "Teaching Course";
+                return BundleUtil.getStringFromBundle("dataverse.type.selectTab.teachingCourses");
             case LABORATORY:
-               return "Laboratory";
+               return BundleUtil.getStringFromBundle("dataverse.type.selectTab.laboratory");
             case RESEARCH_GROUP:
-               return "Research Group";
+               return BundleUtil.getStringFromBundle("dataverse.type.selectTab.researchGroup");
             case DEPARTMENT:
                 return BundleUtil.getStringFromBundle("dataverse.type.selectTab.department");
             case UNCATEGORIZED:

src/main/webapp/dataverse.xhtml

@@ -116,14 +116,14 @@
                                     <div class="col-sm-9 form-col-container">
                                         <h:selectOneMenu id="dataverseCategory" tabindex="5" styleClass="form-control" value="#{DataversePage.dataverse.dataverseType}">
                                             <f:selectItem id="dvSelect" itemLabel="#{bundle['dataverse.type.selectTab.top']}" itemValue="" />
-                                            <f:selectItem id="dvResearch" itemLabel="#{bundle['dataverse.type.selectTab.researchers']}" itemValue="RESEARCHERS" />
-                                            <f:selectItem id="dvResearchProj" itemLabel="#{bundle['dataverse.type.selectTab.researchProjects']}" itemValue="RESEARCH_PROJECTS" />
-                                            <f:selectItem id="dvResearchGrp" itemLabel="#{bundle['dataverse.type.selectTab.researchGroup']}" itemValue="RESEARCH_GROUP" />
-                                            <f:selectItem id="dvLab" itemLabel="#{bundle['dataverse.type.selectTab.laboratory']}" itemValue="LABORATORY" />
+                                            <f:selectItem id="dvDepartment" itemLabel="#{bundle['dataverse.type.selectTab.department']}" itemValue="DEPARTMENT" />
                                             <f:selectItem id="dvJournals" itemLabel="#{bundle['dataverse.type.selectTab.journals']}" itemValue="JOURNALS" />
+                                            <f:selectItem id="dvLab" itemLabel="#{bundle['dataverse.type.selectTab.laboratory']}" itemValue="LABORATORY" />
                                             <f:selectItem id="dvOrgInst" itemLabel="#{bundle['dataverse.type.selectTab.organizationsAndInsitutions']}" itemValue="ORGANIZATIONS_INSTITUTIONS" />
+                                            <f:selectItem id="dvResearch" itemLabel="#{bundle['dataverse.type.selectTab.researchers']}" itemValue="RESEARCHERS" />
+                                            <f:selectItem id="dvResearchGrp" itemLabel="#{bundle['dataverse.type.selectTab.researchGroup']}" itemValue="RESEARCH_GROUP" />
+                                            <f:selectItem id="dvResearchProj" itemLabel="#{bundle['dataverse.type.selectTab.researchProjects']}" itemValue="RESEARCH_PROJECTS" />                                           
                                             <f:selectItem id="dvTeaching" itemLabel="#{bundle['dataverse.type.selectTab.teachingCourses']}" itemValue="TEACHING_COURSES" />
-                                            <f:selectItem id="dvDepartment" itemLabel="#{bundle['dataverse.type.selectTab.department']}" itemValue="DEPARTMENT" />
                                             <f:selectItem id="dvUncategorized" itemLabel="#{bundle['dataverse.type.selectTab.uncategorized']}" itemValue="UNCATEGORIZED" />
                                         </h:selectOneMenu>
                                         <p:message for="dataverseCategory" display="text"/>