svnno****@sourc*****
svnno****@sourc*****
2007年 12月 21日 (金) 17:57:52 JST
Revision: 761
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=761
Author: shinsuke
Date: 2007-12-21 17:57:52 +0900 (Fri, 21 Dec 2007)
Log Message:
-----------
displayed l10ned name for layout and portlet.
Modified Paths:
--------------
pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/SiteEditorLogic.java
-------------- next part --------------
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/SiteEditorLogic.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/SiteEditorLogic.java 2007-12-14 01:20:48 UTC (rev 760)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/SiteEditorLogic.java 2007-12-21 08:57:52 UTC (rev 761)
@@ -519,11 +519,18 @@
if (name == null) {
return null;
}
- int index = name.indexOf(PALAdminConstants.SEPARATOR);
- if (index < 0) {
- return name;
+ PortletDefinitionComposite portlet = getPortletRegistry()
+ .getPortletDefinitionByUniqueName(name);
+ if (portlet == null) {
+ int index = name.indexOf(PALAdminConstants.SEPARATOR);
+ if (index < 0) {
+ return name;
+ }
+ return name.substring(index + 2);
+ } else {
+ // localized name
+ return portlet.getDisplayNameText(getRequestContext().getLocale());
}
- return name.substring(index + 2);
}
public List<Map<String, String>> createLayoutNamesList() {