Changeset 702:c6edb6fcd1f8

Show
Ignore:
Timestamp:
10/07/09 14:52:08 (4 years ago)
Author:
tgambet
Branch:
default
convert_revision:
svn:cdcfb263-7567-472c-a848-e2c2df3466e7/trunk@703
Message:

the language name is automatically added to language properties at runtime

Files:
3 modified

Legend:

Unmodified
Added
Removed

  • WebContent/WEB-INF/languages/en.properties

    r700 r702  
    1 language=English 
    21 
    32universal_checker=The Web's Universal Conformance Checker 

  • WebContent/WEB-INF/languages/fr.properties

    r693 r702  
    1  
    2 language=Français 
    31 
    42universal_checker=The Web's Universal Conformance Checker 

  • src/org/w3c/unicorn/util/Language.java

    r698 r702  
    6767                        throw new IllegalArgumentException("Invalid language file: " + langFile + ". " + localeString + " is not a valid ISO language code. This file will not be loaded."); 
    6868 
     69                Locale locale = Language.getLocale(localeString); 
     70                 
    6971                FileInputStream fis = new FileInputStream(langFile); 
    7072                InputStreamReader isr; 
    … …  
    7476                        props.load(isr); 
    7577                        props.put("lang", localeString); 
     78                        char[] languageArray = locale.getDisplayLanguage(locale).toCharArray(); 
     79                        languageArray[0] = Character.toUpperCase(languageArray[0]); 
     80                        String language = new String(languageArray); 
     81                        props.put("language", language); 
    7682                        return props; 
    7783                } catch (UnsupportedEncodingException e) {