Index: lutinutil/src/java/org/codelutin/i18n/Language.java diff -u lutinutil/src/java/org/codelutin/i18n/Language.java:1.2 lutinutil/src/java/org/codelutin/i18n/Language.java:1.3 --- lutinutil/src/java/org/codelutin/i18n/Language.java:1.2 Sat Nov 17 10:46:06 2007 +++ lutinutil/src/java/org/codelutin/i18n/Language.java Fri Dec 21 10:34:32 2007 @@ -27,6 +27,7 @@ import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; +import java.io.InputStream; import java.net.URL; import java.util.ArrayList; import java.util.Enumeration; @@ -45,20 +46,37 @@ protected Properties resource; - public Language(Locale l) { + public Language(Locale l,String toEncoding) { String[] filenames = getFilenames(l); for (String filename : filenames) { try { URL url = Resource.getURL(filename); - Logger.getLogger("org.codelutin.i18n.Language.Language").info( - "Langue file URL:" + url); + Logger.getLogger("org.codelutin.i18n.Language.Language").info("Langue file URL:" + url); resource = new I18nFileReader(); - ((I18nFileReader)resource).load(url.openStream(), "UTF-8"); + ((I18nFileReader)resource).load2(url.openStream(), toEncoding); } catch (Exception eee) { - Logger - .getLogger("org.codelutin.i18n.Language.Language") - .warning( - "Unable to load language file: " + filename); + Logger.getLogger("org.codelutin.i18n.Language.Language").warning("Unable to load language file: " + filename); + resource = null; + continue; + } + break; + } + } + + /** + * @param l la locale a utiliser + * @deprecated L'appel à {@link I18nFileReader#load(InputStream, String)} ne fonctionne pas bien. + */ + public Language(Locale l) { + String[] filenames = getFilenames(l); + for (String filename : filenames) { + try { + URL url = Resource.getURL(filename); + Logger.getLogger("org.codelutin.i18n.Language.Language").info("Langue file URL:" + url); + resource = new I18nFileReader(); + ((I18nFileReader)resource).load(url.openStream(), "UTF-8"); + } catch (Exception eee) { + Logger.getLogger("org.codelutin.i18n.Language.Language").warning("Unable to load language file: " + filename); resource = null; continue; }