portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rwat...@apache.org
Subject svn commit: r225219 - in /portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed: om/folder/impl/StandardMenuDefinitionImpl.java portalsite/menu/resources/MenuTitles_zh.properties
Date Tue, 26 Jul 2005 02:01:53 GMT
Author: rwatler
Date: Mon Jul 25 19:01:50 2005
New Revision: 225219

URL: http://svn.apache.org/viewcvs?rev=225219&view=rev
Log:
patch and locale contributed by James Liao:

- correctly default getShortTitle(Locale) API for standard menus
- complete zh locale specific resources for menu titles


Modified:
    portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/om/folder/impl/StandardMenuDefinitionImpl.java
    portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_zh.properties

Modified: portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/om/folder/impl/StandardMenuDefinitionImpl.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/om/folder/impl/StandardMenuDefinitionImpl.java?rev=225219&r1=225218&r2=225219&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/om/folder/impl/StandardMenuDefinitionImpl.java
(original)
+++ portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/om/folder/impl/StandardMenuDefinitionImpl.java
Mon Jul 25 19:01:50 2005
@@ -258,7 +258,12 @@
      */
     public String getShortTitle(Locale locale)
     {
-        return getShortTitle();
+        String title = getTitle(locale);
+        if (title == null)
+        {
+            title = getShortTitle();
+        }
+        return title;
     }
 
     /**

Modified: portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_zh.properties
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_zh.properties?rev=225219&r1=225218&r2=225219&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_zh.properties
(original)
+++ portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_zh.properties
Mon Jul 25 19:01:50 2005
@@ -17,4 +17,4 @@
 
 ## menu titles
 menu.title.back=\u8fd4\u56de\u5230
-menu.title.breadcrumbs=[zh]You are here:
+menu.title.breadcrumbs=\u5f53\u524d\u4f4d\u7f6e:



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message