Author: thomas.heute(a)jboss.com
Date: 2007-11-21 06:11:21 -0500 (Wed, 21 Nov 2007)
New Revision: 9059
Added:
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-news-samples-war/WEB-INF/classes/
Removed:
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-basic-samples-war/WEB-INF/classes/
Modified:
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPreferences.xhtml
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-news-samples-war/WEB-INF/classes/NewsResource.properties
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-news-samples-war/WEB-INF/classes/NewsResource_fr.properties
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-news-samples-war/WEB-INF/classes/NewsResource_it.properties
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-news-samples-war/WEB-INF/portlet.xml
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-weather-samples-war/WEB-INF/portlet.xml
Log:
JBPORTAL-1809: Preferences names are not displayed correctly
Modified:
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPreferences.xhtml
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPreferences.xhtml 2007-11-21
10:18:37 UTC (rev 9058)
+++
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPreferences.xhtml 2007-11-21
11:11:21 UTC (rev 9059)
@@ -33,7 +33,7 @@
</c:choose>
</td>
<td>
- <h:outputText value="#{pref.displayName}"/>
+ <h:outputText
value="#{pref.displayName.value}"/>
</td>
<td>
<h:selectBooleanCheckbox disabled="true"
value="#{pref.readOnly}"/>
Copied:
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-news-samples-war/WEB-INF/classes
(from rev 9058,
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-basic-samples-war/WEB-INF/classes)
Modified:
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-news-samples-war/WEB-INF/classes/NewsResource.properties
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-basic-samples-war/WEB-INF/classes/NewsResource.properties 2007-11-21
10:18:37 UTC (rev 9058)
+++
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-news-samples-war/WEB-INF/classes/NewsResource.properties 2007-11-21
11:11:21 UTC (rev 9059)
@@ -21,5 +21,5 @@
# 02110-1301 USA, or see the FSF site:
http://www.fsf.org. #
################################################################################
-javax.portlet.preference.description.RssXml=RSS feed URL
-javax.portlet.preference.description.expires=Expiration time
+javax.portlet.preference.name.RssXml=RSS feed URL
+javax.portlet.preference.name.expires=Expiration time
Modified:
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-news-samples-war/WEB-INF/classes/NewsResource_fr.properties
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-basic-samples-war/WEB-INF/classes/NewsResource_fr.properties 2007-11-21
10:18:37 UTC (rev 9058)
+++
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-news-samples-war/WEB-INF/classes/NewsResource_fr.properties 2007-11-21
11:11:21 UTC (rev 9059)
@@ -21,5 +21,5 @@
# 02110-1301 USA, or see the FSF site:
http://www.fsf.org. #
################################################################################
-javax.portlet.preference.description.RssXml=URL du flux RSS
-javax.portlet.preference.description.expires=Temps d'expiration
+javax.portlet.preference.name.RssXml=URL du flux RSS
+javax.portlet.preference.name.expires=Temps d'expiration
Modified:
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-news-samples-war/WEB-INF/classes/NewsResource_it.properties
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-basic-samples-war/WEB-INF/classes/NewsResource_it.properties 2007-11-21
10:18:37 UTC (rev 9058)
+++
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-news-samples-war/WEB-INF/classes/NewsResource_it.properties 2007-11-21
11:11:21 UTC (rev 9059)
@@ -21,5 +21,5 @@
# 02110-1301 USA, or see the FSF site:
http://www.fsf.org. #
################################################################################
-javax.portlet.preference.description.RssXml=URL per RSS
-javax.portlet.preference.description.expires=Scadenza
+javax.portlet.preference.name.RssXml=URL per RSS
+javax.portlet.preference.name.expires=Scadenza
Modified:
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-news-samples-war/WEB-INF/portlet.xml
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-news-samples-war/WEB-INF/portlet.xml 2007-11-21
10:18:37 UTC (rev 9058)
+++
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-news-samples-war/WEB-INF/portlet.xml 2007-11-21
11:11:21 UTC (rev 9059)
@@ -53,6 +53,7 @@
</supports>
<supported-locale>en</supported-locale>
<supported-locale>fr</supported-locale>
+ <supported-locale>it</supported-locale>
<resource-bundle>NewsResource</resource-bundle>
<portlet-info>
<title>News Feeds</title>
Modified:
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-weather-samples-war/WEB-INF/portlet.xml
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-weather-samples-war/WEB-INF/portlet.xml 2007-11-21
10:18:37 UTC (rev 9058)
+++
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-weather-samples-war/WEB-INF/portlet.xml 2007-11-21
11:11:21 UTC (rev 9059)
@@ -51,6 +51,10 @@
<portlet-mode>EDIT</portlet-mode>
<portlet-mode>HELP</portlet-mode>
</supports>
+ <supported-locale>fr</supported-locale>
+ <supported-locale>en</supported-locale>
+ <supported-locale>it</supported-locale>
+ <resource-bundle>WeatherResource</resource-bundle>
<portlet-info>
<title>Weather Portlet</title>
<keywords>sample,news</keywords>