Author: ulhume
Date: 2008-07-30 02:19:27 +0200 (Wed, 30 Jul 2008)
New Revision: 1418
Added:
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/build.xml
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/container/build.xml
Removed:
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/build.xml
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/container/build.xml
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/GadgetDescription.java
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/container/GadgetInstance.java
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/container/GadgetParameter.java
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/container/GadgetToken.java
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/gadget/SimpleGadget.java
Log:
i18n support
Deleted:
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/build.xml
===================================================================
---
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/build.xml
2008-07-29 20:04:08 UTC (rev 1417)
+++
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/build.xml
2008-07-30 00:19:27 UTC (rev 1418)
@@ -1,3 +0,0 @@
-<project default="Update dependencies" name="Tuxdroid Gadget Framework
Builder">
- <import file="./builder/build.xml"/>
-</project>
\ No newline at end of file
Added:
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/build.xml
===================================================================
---
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/build.xml
(rev 0)
+++
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/build.xml
2008-07-30 00:19:27 UTC (rev 1418)
@@ -0,0 +1,3 @@
+<project default="Update dependencies" name="Tuxdroid Gadget Framework
Builder">
+ <import file="./builder/build.xml" />
+</project>
\ No newline at end of file
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-07-29 20:04:08 UTC (rev 1417)
+++
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/container/Gadget.java
2008-07-30 00:19:27 UTC (rev 1418)
@@ -24,14 +24,17 @@
import java.io.File;
import java.util.Iterator;
+import java.util.Locale;
import java.util.Vector;
import java.util.logging.Logger;
-import
com.kysoh.tuxdroid.gadget.framework.container.interpreters.GadgetInterpreter;
-
+import net.karmaLab.po.I18n;
+import net.karmaLab.po.I18nFactory;
import net.karmaLab.tools.Listeners;
import net.karmaLab.traces.Traces;
+import
com.kysoh.tuxdroid.gadget.framework.container.interpreters.GadgetInterpreter;
+
/**
* @author [EMAIL PROTECTED] (remove _bad_ before sending an
* email)
@@ -51,6 +54,7 @@
}
private final Vector<GadgetParameter> parameters = new
Vector<GadgetParameter>();
+ private I18n i18n;
/**
* @return the configuration
@@ -94,6 +98,10 @@
*/
public void setInterpreter(GadgetInterpreter interpreter) {
this.interpreter = interpreter;
+ i18n = I18nFactory.getI18n(new
File(interpreter.getWorkingPath(), "resources"));
+ GadgetDescription.i18n = i18n;
+ GadgetToken.i18n = i18n;
+ GadgetParameter.i18n = i18n;
}
static final Logger logger = Traces.LOGGER(Gadget.class);
@@ -146,7 +154,22 @@
return new File(interpreter.getWorkingPath(),
description.getIconFile());
}
- public File getHeloFile() {
- return new File(interpreter.getWorkingPath(),
description.getIconFile());
+ public File getHelpFile() {
+ File helpFile = new File(interpreter.getWorkingPath(),
"resources/help_" + Locale.getDefault().getLanguage() + ".html");
+ if (!helpFile.exists()) {
+ helpFile = new File(interpreter.getWorkingPath(),
"resources/help.html");
+ if (!helpFile.exists()) {
+ return null;
+ }
+ }
+ return helpFile;
}
+
+ public static void main(String[] args) {
+
+ }
+
+ public String tr(String message, Object... tmp) {
+ return i18n.tr(message, tmp);
+ }
}
Modified:
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/container/GadgetDescription.java
===================================================================
---
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/container/GadgetDescription.java
2008-07-29 20:04:08 UTC (rev 1417)
+++
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/container/GadgetDescription.java
2008-07-30 00:19:27 UTC (rev 1418)
@@ -24,6 +24,8 @@
import java.util.UUID;
+import net.karmaLab.po.I18n;
+
public class GadgetDescription {
private String name;
private String description;
@@ -80,11 +82,13 @@
this.name = name;
}
+ static I18n i18n;
+
/**
* @return the description
*/
public String getDescription() {
- return description;
+ return i18n.tr(description);
}
/**
@@ -126,21 +130,6 @@
}
/**
- * @return the helpFile
- */
- public String getHelpFile() {
- return helpFile;
- }
-
- /**
- * @param helpFile
- * the helpFile to set
- */
- public void setHelpFile(String helpFile) {
- this.helpFile = helpFile;
- }
-
- /**
* @return the iconFile
*/
public String getIconFile() {
Modified:
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/container/GadgetInstance.java
===================================================================
---
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/container/GadgetInstance.java
2008-07-29 20:04:08 UTC (rev 1417)
+++
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/container/GadgetInstance.java
2008-07-30 00:19:27 UTC (rev 1418)
@@ -106,7 +106,14 @@
String name = parameters[0];
String[] tmp = new String[parameters.length - 1];
System.arraycopy(parameters, 1, tmp, 0, tmp.length);
- if (name.equals("error")) {
+ if (name.equals("message")) {
+ String message = tmp[0];
+ String[] tmp1 = new String[tmp.length - 1];
+ if (tmp1.length > 0) {
+ System.arraycopy(tmp, 1, tmp1, 0,
tmp1.length);
+ }
+
GadgetInstance.this.gadget.listeners.fire().notification(GadgetInstance.this,
"message", gadget.tr(message, (Object[]) tmp1));
+ } else if (name.equals("error")) {
GadgetInstance.this.gadget.listeners.fire().errors(GadgetInstance.this, tmp[0]);
} else if (name.equals("trace")) {
GadgetInstance.this.gadget.listeners.fire().trace(GadgetInstance.this, tmp[0]);
Modified:
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/container/GadgetParameter.java
===================================================================
---
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/container/GadgetParameter.java
2008-07-29 20:04:08 UTC (rev 1417)
+++
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/container/GadgetParameter.java
2008-07-30 00:19:27 UTC (rev 1418)
@@ -22,6 +22,7 @@
package com.kysoh.tuxdroid.gadget.framework.container;
+import net.karmaLab.po.I18n;
import net.karmaLab.traces.ApplicationError;
public class GadgetParameter {
@@ -110,11 +111,13 @@
this.name = name;
}
+ static I18n i18n;
+
/**
* @return the description
*/
public String getDescription() {
- return description;
+ return i18n.tr(description);
}
/**
@@ -152,6 +155,9 @@
* @return the defaultValue
*/
public String getDefaultValue() {
+ if (kind == GadgetParameterType.stringParameter) {
+ defaultValue = i18n.tr(defaultValue);
+ }
return defaultValue;
}
Modified:
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/container/GadgetToken.java
===================================================================
---
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/container/GadgetToken.java
2008-07-29 20:04:08 UTC (rev 1417)
+++
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/container/GadgetToken.java
2008-07-30 00:19:27 UTC (rev 1418)
@@ -22,35 +22,40 @@
package com.kysoh.tuxdroid.gadget.framework.container;
+import net.karmaLab.po.I18n;
+
public class GadgetToken {
- private String name;
- private String description;
+ private String name;
+ private String description;
+ static I18n i18n;
- /**
- * @return the name
- */
- public String getName() {
- return name;
- }
+ /**
+ * @return the name
+ */
+ public String getName() {
+ return name;
+ }
- /**
- * @param name the name to set
- */
- public void setName(String name) {
- this.name = name;
- }
+ /**
+ * @param name
+ * the name to set
+ */
+ public void setName(String name) {
+ this.name = name;
+ }
- /**
- * @return the description
- */
- public String getDescription() {
- return description;
- }
+ /**
+ * @return the description
+ */
+ public String getDescription() {
+ return i18n.tr(description);
+ }
- /**
- * @param description the description to set
- */
- public void setDescription(String description) {
- this.description = description;
- }
+ /**
+ * @param description
+ * the description to set
+ */
+ public void setDescription(String description) {
+ this.description = description;
+ }
}
Deleted:
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/container/build.xml
===================================================================
---
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/container/build.xml
2008-07-29 20:04:08 UTC (rev 1417)
+++
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/container/build.xml
2008-07-30 00:19:27 UTC (rev 1418)
@@ -1,3 +0,0 @@
-<project default="Update dependencies" name="tuxdroid gadget framework
builder">
- <import file="./builder/build.xml"/>
-</project>
\ No newline at end of file
Copied:
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/container/build.xml
(from rev 1397,
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/build.xml)
===================================================================
---
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/container/build.xml
(rev 0)
+++
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/container/build.xml
2008-07-30 00:19:27 UTC (rev 1418)
@@ -0,0 +1,3 @@
+<project default="Update dependencies" name="Tuxdroid Gadget Framework
Builder">
+ <import file="./builder/build.xml"/>
+</project>
\ No newline at end of file
Property changes on:
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/container/build.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:mergeinfo
+
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-07-29 20:04:08 UTC (rev 1417)
+++
software_suite_v2/software/tuxdroid-gadget-framework/trunk/tuxdroid-gadget-framework/sources/com/kysoh/tuxdroid/gadget/framework/gadget/SimpleGadget.java
2008-07-30 00:19:27 UTC (rev 1418)
@@ -118,8 +118,11 @@
* @param content
* message content
*/
- protected void throwMessageNotification(String content) {
- throwNotification("message", content);
+ protected void throwMessageNotification(String content, Object...
arguments) {
+ Object[] tmp = new String[arguments.length + 1];
+ tmp[0] = content;
+ System.arraycopy(arguments, 0, tmp, 1, arguments.length);
+ throwNotification("message", tmp);
}
/**
-------------------------------------------------------------------------
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
