cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cross...@apache.org
Subject cvs commit: cocoon-2.1/src/java/org/apache/cocoon/i18n XMLResourceBundleFactory.java
Date Thu, 29 Apr 2004 01:00:43 GMT
crossley    2004/04/28 18:00:43

  Modified:    .        status.xml
               src/java/org/apache/cocoon/i18n
                        XMLResourceBundleFactory.java
  Log:
  XMLResourceBundleFactory was stopping when it encountered the first
  bundle name that does not have a locale, missing those that might be
  in one of the other locations.
  PR: 27878
  Submitted by: Ralph Goers
  
  Revision  Changes    Path
  1.309     +6 -1      cocoon-2.1/status.xml
  
  Index: status.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/status.xml,v
  retrieving revision 1.308
  retrieving revision 1.309
  diff -u -r1.308 -r1.309
  --- status.xml	25 Apr 2004 12:12:08 -0000	1.308
  +++ status.xml	29 Apr 2004 01:00:43 -0000	1.309
  @@ -212,6 +212,11 @@
     <changes>
   
    <release version="@version@" date="@date@">
  +   <action dev="DC" type="fix" due-to="Ralph Goers" fixes-bug="27878">
  +     XMLResourceBundleFactory was stopping when it encountered the first
  +     bundle name that does not have a locale, missing those that might be
  +     in one of the other locations.
  +   </action>
      <action dev="SW" type="fix">
        Moved storage of all flow-related data (viewData, continuation, request, etc) from
request
        attributes to object model entries. This allows a view called by sendPage() to also
use
  
  
  
  1.14      +3 -1      cocoon-2.1/src/java/org/apache/cocoon/i18n/XMLResourceBundleFactory.java
  
  Index: XMLResourceBundleFactory.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/i18n/XMLResourceBundleFactory.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- XMLResourceBundleFactory.java	5 Mar 2004 13:02:56 -0000	1.13
  +++ XMLResourceBundleFactory.java	29 Apr 2004 01:00:43 -0000	1.14
  @@ -264,6 +264,8 @@
                           {
                               parentBundle = _select(directories, index, name, locale);
                           }
  +                    } else if (++index < directories.length) {
  +                        parentBundle = _select(directories, index, name, locale);
                       }
   
                       if (!isNotFoundBundle(fileName)) {
  
  
  

Mime
View raw message