Author: jerome
Date: 2008-12-02 09:33:45 +0100 (Tue, 02 Dec 2008)
New Revision: 2972
Modified:
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/settings/Languages.java
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/swing/TuxHelpPanel.java
Log:
* Fixed a bug using not installed languages.
Modified:
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/settings/Languages.java
===================================================================
---
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/settings/Languages.java
2008-12-02 07:32:28 UTC (rev 2971)
+++
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/settings/Languages.java
2008-12-02 08:33:45 UTC (rev 2972)
@@ -36,9 +36,16 @@
public Languages(Locale locale){
this.locale = locale;
- String bundle =
"com/tuxdroid/cc/settings/LanguagesSet/languages";
- captions = ResourceBundle.getBundle(bundle, locale);
- this.messages = new Messages(locale);
+ String bundle =
"com/tuxdroid/cc/settings/LanguagesSet/languages";
+ try{
+ captions = ResourceBundle.getBundle(bundle, locale);
+ }
+ catch(Exception e)
+ {
+ this.locale = new Locale("en", "US");
+ captions = ResourceBundle.getBundle(bundle,
this.locale);
+ }
+ this.messages = new Messages(this.locale);
}
Modified:
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/swing/TuxHelpPanel.java
===================================================================
---
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/swing/TuxHelpPanel.java
2008-12-02 07:32:28 UTC (rev 2971)
+++
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/swing/TuxHelpPanel.java
2008-12-02 08:33:45 UTC (rev 2972)
@@ -66,7 +66,10 @@
}
private File getFileByLanguage(String language){
- return this.files.get(language);
+ if(this.files.containsKey(language))
+ return this.files.get(language);
+ else
+ return this.files.get("en");
}
private JEditorPane getEditor(String subcategory){
@@ -75,6 +78,7 @@
String f =
(this.getFileByLanguage(this.language)).getAbsolutePath();
File fichier = new File(f + File.separator + subcategory);
+
try{
editorPane = new JEditorPane();
editorPane.setContentType("text/html;charset=utf-8");
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Tux-droid-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tux-droid-svn
