Index: lutinutil/src/java/org/codelutin/i18n/I18n.java
diff -u lutinutil/src/java/org/codelutin/i18n/I18n.java:1.3 lutinutil/src/java/org/codelutin/i18n/I18n.java:1.4
--- lutinutil/src/java/org/codelutin/i18n/I18n.java:1.3	Tue Jan  1 17:18:01 2008
+++ lutinutil/src/java/org/codelutin/i18n/I18n.java	Tue Jan  1 18:43:26 2008
@@ -23,9 +23,9 @@
  *
  * @author Benjamin Poussin <poussin@codelutin.com>
  * Copyright Code Lutin
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
  *
- * Mise a jour: $Date: 2008-01-01 17:18:01 $
+ * Mise a jour: $Date: 2008-01-01 18:43:26 $
  * par : $Author: tchemit $
  */
 
@@ -42,8 +42,8 @@
  * <ul>
  *   <li> import the org.codelutin.i18n.I18n class,
  *   <li> init the translation support with the init(String language) or
- *   init(String language, String country) static methods in your main, ( eg:
- *   I18n.init("fr","FR") )
+ *   initXXX(String language, String country) static methods in your main, ( eg:
+ *   I18n.initXXX("fr","FR") ) (XXX=Iso88591 | UTF8)
  *   <li> call the translate static method for each sentence, ( eg:
  *   I18n._("hello you !") )
  *   <li> create a resource file for each language following the naming
@@ -63,7 +63,8 @@
     private static final String UTF_8_ENCONDING = "UTF-8";
 
     /**
-     * Initialize the library for given <code>language</code> with <code>ISO-8859-1</code> enconding
+     * Initialize the library for given <code>language</code> with
+     * <code>ISO-8859-1</code> enconding
      *
      * @param language language to use
      */
@@ -71,7 +72,8 @@
         init0(language, ISO_8859_1_ENCONDING);
     }
     /**
-     * Initialize the library for given <code>language</code> and given <code>country</code> with <code>ISO-8859-1</code> enconding
+     * Initialize the library for given <code>language</code> and given
+     * <code>country</code> with <code>ISO-8859-1</code> enconding
      *
      * @param language language to use
      * @param country country to use
@@ -81,7 +83,8 @@
     }
 
     /**
-     * Initialize the library for given <code>language</code> with <code>UTF-8</code> enconding
+     * Initialize the library for given <code>language</code> with
+     * <code>UTF-8</code> enconding
      *
      * @param language language to use
      */
@@ -90,7 +93,8 @@
     }
 
     /**
-     * Initialize the library for given <code>language</code> and given <code>country</code> with <code>UTF-81</code> enconding
+     * Initialize the library for given <code>language</code> and
+     * given <code>country</code> with <code>UTF-81</code> enconding
      *
      * @param language language to use
      * @param country country to use
@@ -102,7 +106,7 @@
     /** Filtre a appliquer avant de retourner les chaines */
     protected static I18nFilter filter = null;
 
-    /** l'objet langue ? utiliser */
+    /** l'objet langue à utiliser */
     protected static Language language = null;
 
     /** Indique le chamin du fichier dans lequel ecrire les entrees non trouvees */
@@ -198,24 +202,29 @@
      *
      * @param language   une chaine representant la langue a utiliser fr, en, ...
      * @param toEncoding l'encoding de destination
+     * @see LanguageEnum
      */
     protected  static void init0(String language, String toEncoding) {
-        I18n.language = new Language(new Locale(language), toEncoding);
+        LanguageEnum languageVal = getLanguage(language);
+        setLanguage(languageVal, toEncoding);
     }
 
     /**
      * Initialise la librairie.
      *
-     * @param language   une chaine representant la langue à utiliser fr, en, ...
-     * @param country    le pays (en majuscule FR)
+     * @param language   une chaine representant la langue à utiliser fr, en (en minuscule), ...
+     * @param country    le pays (la norme
      * @param toEncoding l'encoding de destination
+     * @see LanguageEnum
+     * @see CountryEnum
      */
     protected static void init0(String language, String country, String toEncoding) {
-        I18n.language = new Language(new Locale(language, country), toEncoding);
+        LanguageEnum languageValue = getLanguage(language);
+        CountryEnum countryValue = getCountry(country);
+        setLanguage(languageValue, countryValue, toEncoding);
     }
 
 
-
     /**
      * Initialise la librairie.
      *
@@ -226,6 +235,7 @@
         I18n.language = new Language(new Locale(language));
     }
 
+
     /**
      * Initialise la librairie
      *
@@ -250,4 +260,31 @@
         I18n.recordFilePath = recordFilePath;
     }
 
+    protected static void setLanguage(LanguageEnum language, String toEncoding) {
+        I18n.language = new Language(new Locale(language.name()), toEncoding);
+    }
+
+    protected static void setLanguage(LanguageEnum language, CountryEnum country, String toEncoding) {
+        I18n.language = new Language(new Locale(language.name(),country.name()), toEncoding);
+    }
+
+    public static LanguageEnum getLanguage(String language) {
+        try {
+            LanguageEnum languageValue;
+            languageValue = LanguageEnum.valueOf(language.toLowerCase());
+            return languageValue;
+        }catch (NullPointerException e) {
+            throw new IllegalArgumentException(e);
+        }
+    }
+
+    public static CountryEnum getCountry(String country) {
+        try {
+            CountryEnum countryValue;
+            countryValue = CountryEnum.valueOf(country.toUpperCase());
+            return countryValue;
+        }catch (NullPointerException e) {
+            throw new IllegalArgumentException(e);
+        }
+    }
 } //I18n