diff -r da4aedfabea5 -r f63d2f9aca35 site-manage/site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteAction.java --- a/site-manage/site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteAction.java Tue Apr 01 16:34:41 2014 +0800 +++ b/site-manage/site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteAction.java Tue Apr 01 16:37:46 2014 +0800 @@ -1330,14 +1330,16 @@ views.put(SiteConstants.SITE_TYPE_MYWORKSPACE, rb.getFormattedMessage("java.sites", new Object[]{rb.getString("java.my")})); for (int sTypeIndex = 0; sTypeIndex < sTypes.size(); sTypeIndex++) { String type = (String) sTypes.get(sTypeIndex); - views.put(type, rb.getFormattedMessage("java.sites", new Object[]{type})); + String typeName = SiteService.getLocalizedSiteType(type); + views.put(type, rb.getFormattedMessage("java.sites", new Object[]{typeName})); } List moreTypes = siteTypeProvider.getTypesForSiteList(); if (!moreTypes.isEmpty()) { for(String mType : moreTypes) { - views.put(mType, rb.getFormattedMessage("java.sites", new Object[]{mType})); + String typeName = SiteService.getLocalizedSiteType(mType); + views.put(mType, rb.getFormattedMessage("java.sites", new Object[]{typeName})); } } // default view diff -r da4aedfabea5 -r f63d2f9aca35 site-manage/site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteBrowserAction.java --- a/site-manage/site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteBrowserAction.java Tue Apr 01 16:34:41 2014 +0800 +++ b/site-manage/site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteBrowserAction.java Tue Apr 01 16:37:46 2014 +0800 @@ -267,7 +267,11 @@ context.put("termProp", (String) state.getAttribute(SEARCH_TERM_PROP)); context.put("searchText", (String) state.getAttribute(STATE_SEARCH)); - context.put("siteType", (String) state.getAttribute(STATE_SEARCH_SITE_TYPE)); + String siteType = (String) state.getAttribute(STATE_SEARCH_SITE_TYPE); + if (!StringUtils.isBlank(siteType)) { + siteType = SiteService.getLocalizedSiteType(siteType); + } + context.put("siteType", siteType); context.put("termSelection", (String) state.getAttribute(STATE_TERM_SELECTION)); context.put("siteBrowserTextEdit", new SiteTextEditUtil()); @@ -342,7 +346,7 @@ private String buildSimpleSearchContext(SessionState state, Context context) { - List newTypes = new Vector(); + List newTypes = new Vector(); if (state.getAttribute(NO_SHOW_SEARCH_TYPE) != null) { String noType = state.getAttribute(NO_SHOW_SEARCH_TYPE).toString(); @@ -372,6 +376,12 @@ } context.put("siteTypes", newTypes); + Map localizedSiteTypes = new HashMap(); + for (String type: newTypes) + { + localizedSiteTypes.put(type, SiteService.getLocalizedSiteType(type)); + } + context.put("localizedSiteTypes", localizedSiteTypes); String termSearchSiteType = (String) state.getAttribute(SEARCH_TERM_SITE_TYPE); if (termSearchSiteType != null) diff -r da4aedfabea5 -r f63d2f9aca35 site-manage/site-manage-tool/tool/src/webapp/vm/sitebrowser/chef_sitebrowser_simpleSearch.vm --- a/site-manage/site-manage-tool/tool/src/webapp/vm/sitebrowser/chef_sitebrowser_simpleSearch.vm Tue Apr 01 16:34:41 2014 +0800 +++ b/site-manage/site-manage-tool/tool/src/webapp/vm/sitebrowser/chef_sitebrowser_simpleSearch.vm Tue Apr 01 16:37:46 2014 +0800 @@ -35,7 +35,7 @@
- +
@@ -49,7 +49,7 @@ #else
- +
#end #end diff -r da4aedfabea5 -r f63d2f9aca35 site-manage/site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-list.vm --- a/site-manage/site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-list.vm Tue Apr 01 16:34:41 2014 +0800 +++ b/site-manage/site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-list.vm Tue Apr 01 16:37:46 2014 +0800 @@ -242,9 +242,7 @@ - #set($type="") - #set($type = $site.getType()) - $!type + $validator.escapeHtml($site.getLocalizedType()) #if ($site.CreatedBy) diff -r 363a05d451fc -r 95bacb1b41ff site-manage/site-manage-tool/tool/src/webapp/vm/sitebrowser/chef_sitebrowser_list.vm --- a/site-manage/site-manage-tool/tool/src/webapp/vm/sitebrowser/chef_sitebrowser_list.vm Tue Apr 01 16:39:22 2014 +0800 +++ b/site-manage/site-manage-tool/tool/src/webapp/vm/sitebrowser/chef_sitebrowser_list.vm Tue Apr 01 17:58:58 2014 +0800 @@ -125,8 +125,7 @@ - #set($type = $site.Type) - $validator.escapeHtml($!type) + $validator.escapeHtml($!site.localizedType)