[Osmose-dev-devel] osmose/src/osmose/application OSMApplication.java, 1.3, 1.4

[Olivier G. <og...@us...>]

Update of /cvsroot/osmose-dev/osmose/src/osmose/application
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv31107/src/osmose/application

Modified Files:
	OSMApplication.java 
Log Message:
Language switching (feature request #1359770)

Index: OSMApplication.java
===================================================================
RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/OSMApplication.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** OSMApplication.java	6 Jul 2006 15:03:44 -0000	1.3
--- OSMApplication.java	3 Apr 2008 20:38:41 -0000	1.4
***************
*** 28,31 ****
--- 28,32 ----
  import osmose.application.slideeditor.*;
  import osmose.application.undoredo.*;
+ import osmose.application.user.OSMUser;
  
  
***************
*** 34,38 ****
   * <p>Description : main class of OSMOSE application</p>
   * <p>Copyright : Copyright (c) 2003</p>
!  * <p>Société : </p>
   * @author non attribuable
   * @version 1.0
--- 35,39 ----
   * <p>Description : main class of OSMOSE application</p>
   * <p>Copyright : Copyright (c) 2003</p>
!  * <p>Soci�t� : </p>
   * @author non attribuable
   * @version 1.0
***************
*** 76,80 ****
        boolean bLoadLocalOk = false;
        try {
!         Locale currentLocale = new Locale(language, country);
          Localisation = (ResourceBundle)ResourceBundle.getBundle("osmose_local", currentLocale);
          bLoadLocalOk = true;
--- 77,83 ----
        boolean bLoadLocalOk = false;
        try {
!     	String userLanguage = (String)OSMUser.USER.getProperty("language.default", OSMApplication.Properties.getStringProp("OSM_Language")+"_"+OSMApplication.Properties.getStringProp("OSM_Country"));
!     	String[] lang = userLanguage.split("_");
!     	Locale currentLocale = new Locale(lang[0], lang[1]);
          Localisation = (ResourceBundle)ResourceBundle.getBundle("osmose_local", currentLocale);
          bLoadLocalOk = true;
***************
*** 198,202 ****
      }
      else {
!       OSMFatalError fe = new OSMFatalError("Erreur de lecture des fichiers de propriétés.", "Error reading properties files.");
        fe.showDialogAndExit();
      }
--- 201,205 ----
      }
      else {
!       OSMFatalError fe = new OSMFatalError("Erreur de lecture des fichiers de propri�t�s.", "Error reading properties files.");
        fe.showDialogAndExit();
      }
***************
*** 426,430 ****
     * <p>Description : This class is use to display a fatal error and exit.</p>
     * <p>Copyright : Copyright (c) 2003</p>
!    * <p>Société : </p>
     * @author TD
     * @version 1.0
--- 429,433 ----
     * <p>Description : This class is use to display a fatal error and exit.</p>
     * <p>Copyright : Copyright (c) 2003</p>
!    * <p>Soci�t� : </p>
     * @author TD
     * @version 1.0