Author: jerome
Date: 2008-08-29 15:52:42 +0200 (Fri, 29 Aug 2008)
New Revision: 1636
Removed:
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/container/I18N.java
Modified:
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/container/Gadget.java
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/container/GadgetsContainer.java
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/container/interpreters/GadgetInterpreter.java
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/container/interpreters/GadgetJavaInterpreter.java
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/gadget/SimpleGadget.java
Log:
Added environments language-locutor-pitch-country.
Modified:
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/container/Gadget.java
===================================================================
---
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/container/Gadget.java
2008-08-29 13:38:53 UTC (rev 1635)
+++
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/container/Gadget.java
2008-08-29 13:52:42 UTC (rev 1636)
@@ -104,11 +104,15 @@
static final Logger logger = Traces.LOGGER(Gadget.class);
public GadgetParameter traces;
- public void setLocale(String lang){
+ public void setLocale(String lang, String locutor, String country, int
pitch){
this.i18n = I18nFactory.getI18n(new Locale(lang), new
File(interpreter.getWorkingPath(), "resources"));
GadgetDescription.i18n = i18n;
GadgetToken.i18n = i18n;
GadgetParameter.i18n = i18n;
+ interpreter.setLanguage(lang);
+ interpreter.setLocutor(locutor);
+ interpreter.setContry(country);
+ interpreter.setPitch(String.valueOf(pitch));
}
public Gadget() {
@@ -179,10 +183,10 @@
return i18n.tr(message, tmp);
}
- public void buildI18n() {
- i18n = I18nFactory.getI18n(new
File(interpreter.getWorkingPath(), "resources"));
- GadgetDescription.i18n = i18n;
- GadgetToken.i18n = i18n;
- GadgetParameter.i18n = i18n;
- }
+ //public void buildI18n() {
+ //i18n = I18nFactory.getI18n(new
File(interpreter.getWorkingPath(), "resources"));
+ //GadgetDescription.i18n = i18n;
+ //GadgetToken.i18n = i18n;
+ //GadgetParameter.i18n = i18n;
+ //}
}
Modified:
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/container/GadgetsContainer.java
===================================================================
---
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/container/GadgetsContainer.java
2008-08-29 13:38:53 UTC (rev 1635)
+++
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/container/GadgetsContainer.java
2008-08-29 13:52:42 UTC (rev 1636)
@@ -169,7 +169,6 @@
validate(description.getUuid(), "UUID not defined");
validate(gadget.getInterpreter().getExecutable(),
"Interpreter/Excecutable not defined");
gadget.getInterpreter().setWorkingPath(Files.cannonical(gadgetPath));
- gadget.buildI18n();
gadgets.add(gadget);
listeners.fire().gadgetLoaded(gadget);
}
Deleted:
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/container/I18N.java
===================================================================
---
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/container/I18N.java
2008-08-29 13:38:53 UTC (rev 1635)
+++
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/container/I18N.java
2008-08-29 13:52:42 UTC (rev 1636)
@@ -1,30 +0,0 @@
-/* This file is part of "TuxDroid Gadget Framework".
- * Copyright 2008, kysoh
- * Author : Yoran Brault
- * eMail : [EMAIL PROTECTED] (remove _bad_ before sending an email)
- * Site : http://www.kysoh.com/
- *
- * "TuxDroid Gadget Framework" is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * "TuxDroid Gadget Framework" is distributed in the hope that it will be
useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with "TuxDroid Gadget Framework"; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package com.kysoh.tuxdroid.gadget.framework.container;
-
-import java.util.Locale;
-
-
-public class I18N {
- public static Locale cc_Locale = new Locale("en");
-}
Modified:
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/container/interpreters/GadgetInterpreter.java
===================================================================
---
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/container/interpreters/GadgetInterpreter.java
2008-08-29 13:38:53 UTC (rev 1635)
+++
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/container/interpreters/GadgetInterpreter.java
2008-08-29 13:52:42 UTC (rev 1636)
@@ -35,6 +35,11 @@
abstract public class GadgetInterpreter {
private String executable = "";
private String parameters = "";
+
+ public String cc_language;
+ public String cc_locutor;
+ public String cc_country;
+ public String cc_pitch;
private File workingPath;
@@ -115,4 +120,21 @@
this.workingPath = workingPath;
}
+
+
+ public void setLanguage(String lang){
+ this.cc_language = lang;
+ }
+
+ public void setLocutor(String locutor){
+ this.cc_locutor = locutor;
+ }
+
+ public void setContry(String country){
+ this.cc_country = country;
+ }
+
+ public void setPitch(String pitch){
+ this.cc_pitch = pitch;
+ }
}
Modified:
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/container/interpreters/GadgetJavaInterpreter.java
===================================================================
---
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/container/interpreters/GadgetJavaInterpreter.java
2008-08-29 13:38:53 UTC (rev 1635)
+++
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/container/interpreters/GadgetJavaInterpreter.java
2008-08-29 13:52:42 UTC (rev 1636)
@@ -107,6 +107,10 @@
arguments.add("java");
arguments.add("-cp");
arguments.add(tmp.toString());
+ arguments.add("-DCC_SET_LANGUAGE=" + getLanguage());
+ arguments.add("-DCC_SET_LOCUTOR=" + getLocutor());
+ arguments.add("-DCC_SET_COUNTRY=" + getCountry());
+ arguments.add("-DCC_SET_PITCH=" + getPitch());
// if (getParameters()!=null)
// arguments.add(getParameters());
arguments.add(getExecutable());
@@ -121,5 +125,21 @@
public void setLibrariesPath(String librariesPath) {
this.librariesPath = librariesPath;
}
+
+ public String getLanguage(){
+ return this.cc_language;
+ }
+
+ public String getLocutor(){
+ return this.cc_locutor;
+ }
+
+ public String getCountry(){
+ return this.cc_country;
+ }
+
+ public String getPitch(){
+ return this.cc_pitch;
+ }
}
Modified:
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/gadget/SimpleGadget.java
===================================================================
---
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/gadget/SimpleGadget.java
2008-08-29 13:38:53 UTC (rev 1635)
+++
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/gadget/SimpleGadget.java
2008-08-29 13:52:42 UTC (rev 1636)
@@ -124,7 +124,7 @@
* @param content
* message content
*/
- protected void throwMessage(String content, Object... arguments) {
+ public void throwMessage(String content, Object... arguments) {
Object[] tmp = new Object[arguments.length + 1];
tmp[0] = content;
System.arraycopy(arguments, 0, tmp, 1, arguments.length);
-------------------------------------------------------------------------
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
