[portal-commits] JBoss Portal SVN: r10991 - branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui.
Author: thomas.heute(a)jboss.com
Date: 2008-06-11 12:39:05 -0400 (Wed, 11 Jun 2008)
New Revision: 10991
Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertiesBean.java
Log:
Use Request locale
Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertiesBean.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertiesBean.java 2008-06-11
16:38:51 UTC (rev 10990)
+++
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertiesBean.java 2008-06-11
16:39:05 UTC (rev 10991)
@@ -25,12 +25,14 @@
import org.jboss.portal.core.admin.ui.actions.PropertyAction;
import org.jboss.portal.core.model.portal.PortalObject;
+import javax.faces.context.FacesContext;
import javax.faces.model.DataModel;
import javax.faces.model.ListDataModel;
import javax.faces.model.SelectItem;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import java.util.Locale;
import java.util.SortedMap;
import java.util.TreeMap;
@@ -145,7 +147,8 @@
// Add only property user can change state
if (propertyInfo.getScope() == PropertyInfo.PUBLIC_SCOPE &&
propertyInfo.getAccessMode() == PropertyInfo.READ_WRITE_ACCESS_MODE &&
!PropertiesInfo.isControlProperty(propertyName))
{
- items.add(new SelectItem(propertyInfo.getName(),
propertyInfo.getDisplayName().getDefaultString(),
propertyInfo.getDescription().getDefaultString()));
+ Locale locale = FacesContext.getCurrentInstance().getExternalContext().
getRequestLocale();
+ items.add(new SelectItem(propertyInfo.getName(),
propertyInfo.getDisplayName().getString(locale, true),
propertyInfo.getDescription().getDefaultString()));
}
}
}