cvs commit: jakarta-jmeter/src/core/org/apache/jmeter/resources PackageTest.java

[sebb]

sebb        2005/05/02 04:56:42

  Modified:    src/core/org/apache/jmeter/resources PackageTest.java
  Log:
  Fix to work with zh_CN and zh_TW properties
  
  Revision  Changes    Path
  1.15      +15 -11    
jakarta-jmeter/src/core/org/apache/jmeter/resources/PackageTest.java
  
  Index: PackageTest.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/resources/PackageTest.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- PackageTest.java  18 Mar 2005 15:26:54 -0000      1.14
  +++ PackageTest.java  2 May 2005 11:56:42 -0000       1.15
  @@ -25,7 +25,6 @@
   import java.util.Collections;
   import java.util.Enumeration;
   import java.util.List;
  -import java.util.Locale;
   import java.util.MissingResourceException;
   import java.util.PropertyResourceBundle;
   
  @@ -109,7 +108,7 @@
        if (lang.length()==0){
                        return "messages.properties";
        } else {
  -                     return 
"messages_"+lang.toLowerCase(Locale.ENGLISH)+".properties";
  +                     return "messages_"+lang+".properties";
        }
       }
        
  @@ -177,7 +176,8 @@
                ts.addTest(new PackageTest("atestDE"));
                ts.addTest(new PackageTest("atestNO"));
                ts.addTest(new PackageTest("atestJA"));
  -             ts.addTest(new PackageTest("atestCN"));
  +             ts.addTest(new PackageTest("atestzh_CN"));
  +             ts.addTest(new PackageTest("atestzh_TW"));
                ts.addTest(new PackageTest("atestFR"));
                return ts;
        }
  @@ -192,24 +192,28 @@
   
       public void atestDE() throws Exception
        {
  -             check("DE");
  +             check("de");
        }
   
       public void atestJA() throws Exception
        {
  -             check("JA");
  +             check("ja");
        }
  -    public void atestCN() throws Exception
  +    public void atestzh_CN() throws Exception
        {
  -             check("CN");
  +             check("zh_CN");
  +     }
  +    public void atestzh_TW() throws Exception
  +     {
  +             check("zh_TW");
        }
        public void atestNO() throws Exception
        {
  -             check("NO");
  +             check("no");
        }
        public void atestFR() throws Exception
        {
  -             check("FR");
  +             check("fr");
        }
        public void atestDefault() throws Exception
        {
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]