Author: jerome
Date: 2008-12-08 11:52:06 +0100 (Mon, 08 Dec 2008)
New Revision: 3037
Added:
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/settings/LanguagesSet/languages_es_ES.properties
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/settings/LanguagesSet/messages_es_ES.properties
Removed:
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/settings/LanguagesSet/languages_sp_SP.properties
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/settings/LanguagesSet/messages_sp_SP.properties
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/TuxLanguagesMenu.java
Log:
* Renamed property file.
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-08 10:07:08 UTC (rev 3036)
+++
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/settings/Languages.java
2008-12-08 10:52:06 UTC (rev 3037)
@@ -38,10 +38,11 @@
this.locale = locale;
String bundle =
"com/tuxdroid/cc/settings/LanguagesSet/languages";
try{
- captions = ResourceBundle.getBundle(bundle, new
Locale(locale.getLanguage()));
+ captions = ResourceBundle.getBundle(bundle,locale);
}
catch(Exception e)
{
+ e.printStackTrace();
this.locale = new Locale("en", "US");
captions = ResourceBundle.getBundle(bundle,
this.locale);
}
Copied:
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/settings/LanguagesSet/languages_es_ES.properties
(from rev 3036,
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/settings/LanguagesSet/languages_sp_SP.properties)
===================================================================
(Binary files differ)
Deleted:
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/settings/LanguagesSet/languages_sp_SP.properties
===================================================================
(Binary files differ)
Copied:
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/settings/LanguagesSet/messages_es_ES.properties
(from rev 3035,
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/settings/LanguagesSet/messages_sp_SP.properties)
===================================================================
---
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/settings/LanguagesSet/messages_es_ES.properties
(rev 0)
+++
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/settings/LanguagesSet/messages_es_ES.properties
2008-12-08 10:52:06 UTC (rev 3037)
@@ -0,0 +1,13 @@
+changedLanguageMessage=Renicie el Control Center para que los cambios tengan
efecto.
+messagesPanesTitle=Notificaciones del Control Center.
+getFileErrorMessage=Error intentando obtener el fichero.
+attitunesReadError=Ha ocurrido un error. Este attitune no puede ser
reproducido.
+radioNotConnected=No se ha detectado la conexion de radio.\nPor favor encienda
su TUX.
+dongleNotConnected=El pez dongle no se ha detectado.\nAsegurese que el dongle
este conectado.
+serverConnectionError=No es posible la conexion al software servidor del TUX
Droid.\nSegurese de que este ejecutandose e intentenlo de nuevo.
+attituneIndexError=Este attitune no se encuentra en el indice
+urlFileError=URL no puede ser abierta. Asegurese que la direccion es correcta\
o que no tiene a instalado este attitune.
+urlFromWarning=Advertencia: este fichero no proviene del sitio web 'live with
a penguin'.
+unexcpectedFileFormat=Error: este fichero no es un gadget o un attitune.
+frmeworkNotifictionError= a notificado un error.
+softwareUpdate=Some gadget, attitunes or tools have been updated.\nPlease wait
until Control center get new softwares.
Property changes on:
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/settings/LanguagesSet/messages_es_ES.properties
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mergeinfo
+
Deleted:
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/settings/LanguagesSet/messages_sp_SP.properties
===================================================================
---
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/settings/LanguagesSet/messages_sp_SP.properties
2008-12-08 10:07:08 UTC (rev 3036)
+++
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/settings/LanguagesSet/messages_sp_SP.properties
2008-12-08 10:52:06 UTC (rev 3037)
@@ -1,13 +0,0 @@
-changedLanguageMessage=Renicie el Control Center para que los cambios tengan
efecto.
-messagesPanesTitle=Notificaciones del Control Center.
-getFileErrorMessage=Error intentando obtener el fichero.
-attitunesReadError=Ha ocurrido un error. Este attitune no puede ser
reproducido.
-radioNotConnected=No se ha detectado la conexion de radio.\nPor favor encienda
su TUX.
-dongleNotConnected=El pez dongle no se ha detectado.\nAsegurese que el dongle
este conectado.
-serverConnectionError=No es posible la conexion al software servidor del TUX
Droid.\nSegurese de que este ejecutandose e intentenlo de nuevo.
-attituneIndexError=Este attitune no se encuentra en el indice
-urlFileError=URL no puede ser abierta. Asegurese que la direccion es correcta\
o que no tiene a instalado este attitune.
-urlFromWarning=Advertencia: este fichero no proviene del sitio web 'live with
a penguin'.
-unexcpectedFileFormat=Error: este fichero no es un gadget o un attitune.
-frmeworkNotifictionError= a notificado un error.
-softwareUpdate=Some gadget, attitunes or tools have been updated.\nPlease wait
until Control center get new softwares.
Modified:
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/swing/TuxLanguagesMenu.java
===================================================================
---
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/swing/TuxLanguagesMenu.java
2008-12-08 10:07:08 UTC (rev 3036)
+++
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/swing/TuxLanguagesMenu.java
2008-12-08 10:52:06 UTC (rev 3037)
@@ -65,16 +65,21 @@
Hashtable<String, String> en = new Hashtable<String, String>();
Hashtable<String, String> fr = new Hashtable<String, String>();
Hashtable<String, String> nl = new Hashtable<String, String>();
+ Hashtable<String, String> sp = new Hashtable<String, String>();
+
en.put("male", "Ryan");
en.put("female", "Heather");
fr.put("male", "Bruno");
fr.put("female", "Julie");
nl.put("male", "Sofie");
nl.put("female", "Sofie");
+ sp.put("male", "Maria");
+ sp.put("female", "Maria");
locutors.put("en", en);
locutors.put("fr", fr);
locutors.put("nl", nl);
+ locutors.put("es", sp);
}
/** Gets languages **/
@@ -83,14 +88,17 @@
this.languages = new File[]{
new
File(CcCommons.targetClass.getResource("settings/LanguagesSet/languages_en_US.properties").getFile()),
new
File(CcCommons.targetClass.getResource("settings/LanguagesSet/languages_fr_FR.properties").getFile()),
- new
File(CcCommons.targetClass.getResource("settings/LanguagesSet/languages_nl_NL.properties").getFile())
+ new
File(CcCommons.targetClass.getResource("settings/LanguagesSet/languages_nl_NL.properties").getFile()),
+ new
File(CcCommons.targetClass.getResource("settings/LanguagesSet/languages_es_ES.properties").getFile())
};
for(File f : this.languages){
interfaceLanguages.add(f.getName());
}
- }catch(Exception except){}
+ }catch(Exception except){
+ except.printStackTrace();
+ }
}
@@ -191,12 +199,15 @@
else
CcCommons.settings.saveSpeaker(currentLocutor);
}
+
else if(lang.equalsIgnoreCase("nl")){
if(!isValidLocutor(currentLocutor, lang))
CcCommons.settings.saveSpeaker(locutors.get("nl").get("male"));
else
CcCommons.settings.saveSpeaker(currentLocutor);
}
+
+
CcCommons.settings.saveLocale(lang,
country);
String msg =
CcCommons.language.messages.getChangedLangageMessage();
------------------------------------------------------------------------------
SF.Net email is Sponsored by MIX09, March 18-20, 2009 in Las Vegas, Nevada.
The future of the web can't happen without you. Join us at MIX09 to help
pave the way to the Next Web now. Learn more and register at
http://ad.doubleclick.net/clk;208669438;13503038;i?http://2009.visitmix.com/
_______________________________________________
Tux-droid-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tux-droid-svn
