Author: Paul_R
Date: 2008-08-29 10:31:38 +0200 (Fri, 29 Aug 2008)
New Revision: 1632
Modified:
software_suite_v2/software/gadgets/tuxdroid-gadget-weather/trunk/tuxdroid-gadget-weather/resources/en.po
software_suite_v2/software/gadgets/tuxdroid-gadget-weather/trunk/tuxdroid-gadget-weather/resources/fr.po
software_suite_v2/software/gadgets/tuxdroid-gadget-weather/trunk/tuxdroid-gadget-weather/resources/nl.po
software_suite_v2/software/gadgets/tuxdroid-gadget-weather/trunk/tuxdroid-gadget-weather/sources/net/karmaLab/tuxDroid/gadgets/WeatherGadget.java
software_suite_v2/software/gadgets/tuxdroid-gadget-weather/trunk/tuxdroid-gadget-weather/sources/net/karmaLab/tuxDroid/gadgets/messages_en.properties
software_suite_v2/software/gadgets/tuxdroid-gadget-weather/trunk/tuxdroid-gadget-weather/sources/net/karmaLab/tuxDroid/gadgets/messages_fr.properties
software_suite_v2/software/gadgets/tuxdroid-gadget-weather/trunk/tuxdroid-gadget-weather/sources/net/karmaLab/tuxDroid/gadgets/messages_nl.properties
Log:
* Moved TTS sentences from .po to .properties.
because the internalization engine with .po doesn't works.
Modified:
software_suite_v2/software/gadgets/tuxdroid-gadget-weather/trunk/tuxdroid-gadget-weather/resources/en.po
===================================================================
---
software_suite_v2/software/gadgets/tuxdroid-gadget-weather/trunk/tuxdroid-gadget-weather/resources/en.po
2008-08-29 07:17:01 UTC (rev 1631)
+++
software_suite_v2/software/gadgets/tuxdroid-gadget-weather/trunk/tuxdroid-gadget-weather/resources/en.po
2008-08-29 08:31:38 UTC (rev 1632)
@@ -1,15 +1,3 @@
-msgid "http://www.google.com/ig/api?hl=en&weather=%s";
-msgstr "http://www.google.com/ig/api?hl=en&weather=%s";
-
-msgid "unknown"
-msgstr "unknown"
-
-msgid "Current weather at %s is \"%s\" with a temperature of %s degrees %s.
Humidity level is %s percent."
-msgstr "Current weather at %s is \"%s\" with a temperature of %s degrees %s.
Humidity level is %s percent."
-
-msgid "Tomorrow's forecast : \"%s\" temperatures from %s to %s degrees."
-msgstr "Tomorrow's forecast : \"%s\" temperatures from %s to %s degrees."
-
msgid "Weather Gadget"
msgstr "Weather Gadget"
Modified:
software_suite_v2/software/gadgets/tuxdroid-gadget-weather/trunk/tuxdroid-gadget-weather/resources/fr.po
===================================================================
---
software_suite_v2/software/gadgets/tuxdroid-gadget-weather/trunk/tuxdroid-gadget-weather/resources/fr.po
2008-08-29 07:17:01 UTC (rev 1631)
+++
software_suite_v2/software/gadgets/tuxdroid-gadget-weather/trunk/tuxdroid-gadget-weather/resources/fr.po
2008-08-29 08:31:38 UTC (rev 1632)
@@ -1,16 +1,4 @@
-msgid "http://www.google.com/ig/api?hl=en&weather=%s";
-msgstr "http://www.google.com/ig/api?hl=fr&weather=%s";
-
-msgid "unknown"
-msgstr "inconnue"
-
-msgid "Current weather at %s is \"%s\" with a temperature of %s degrees %s.
Humidity level is %s percent."
-msgstr "La météo actuelle à %s est \"%s\" avec une température de %s degrés
%s. Le taux d'humidité est de %s pour cent."
-
-msgid "Tomorrow's forecast : \"%s\" temperatures from %s to %s degrees."
-msgstr "Les prévisions pour demain : \"%s\" avec des température de %s à %s
degrés."
-
-msgid "Weather Gadget"
+msgid "Weather Gadget"
msgstr "Gadget Météo"
msgid "Google Weather Gadget"
Modified:
software_suite_v2/software/gadgets/tuxdroid-gadget-weather/trunk/tuxdroid-gadget-weather/resources/nl.po
===================================================================
---
software_suite_v2/software/gadgets/tuxdroid-gadget-weather/trunk/tuxdroid-gadget-weather/resources/nl.po
2008-08-29 07:17:01 UTC (rev 1631)
+++
software_suite_v2/software/gadgets/tuxdroid-gadget-weather/trunk/tuxdroid-gadget-weather/resources/nl.po
2008-08-29 08:31:38 UTC (rev 1632)
@@ -1,15 +1,3 @@
-msgid "http://www.google.com/ig/api?hl=en&weather=%s";
-msgstr "http://www.google.com/ig/api?hl=fr&weather=%s";
-
-msgid "unknown"
-msgstr "onbekend"
-
-msgid "Current weather at %s is \"%s\" with a temperature of %s degrees %s.
Humidity level is %s percent."
-msgstr "Het weer vandaag in %s is \"%s\" met een temperatuur van %s graden %s.
De vochtigheidsgraad is %s procents."
-
-msgid "Tomorrow's forecast : \"%s\" temperatures from %s to %s degrees."
-msgstr "De weersverwachtingen voor morgen : \"%s\" met temperaturen van %s tot
%s graden."
-
msgid "Weather Gadget"
msgstr "Weer Gadget"
Modified:
software_suite_v2/software/gadgets/tuxdroid-gadget-weather/trunk/tuxdroid-gadget-weather/sources/net/karmaLab/tuxDroid/gadgets/WeatherGadget.java
===================================================================
---
software_suite_v2/software/gadgets/tuxdroid-gadget-weather/trunk/tuxdroid-gadget-weather/sources/net/karmaLab/tuxDroid/gadgets/WeatherGadget.java
2008-08-29 07:17:01 UTC (rev 1631)
+++
software_suite_v2/software/gadgets/tuxdroid-gadget-weather/trunk/tuxdroid-gadget-weather/sources/net/karmaLab/tuxDroid/gadgets/WeatherGadget.java
2008-08-29 08:31:38 UTC (rev 1632)
@@ -139,14 +139,14 @@
Element current = xmlReply.getElementAt(1);
String weather = getData(current, "condition"); //$NON-NLS-1$
if (weather.length() == 0) {
- weather = "unknown"; //$NON-NLS-1$
+ weather = Messages.getString("unknown"); //$NON-NLS-1$
}
String temperature = getData(current, configuration().getUnit()
== Unit.celsius ? "temp_c" : "temp_f"); //$NON-NLS-1$ //$NON-NLS-2$
String humidity = getData(current, "humidity"); //$NON-NLS-1$
humidity = humidity.split(":")[1]; //$NON-NLS-1$
humidity = (String) humidity.subSequence(0,
humidity.length()-1);
- String message = String.format("Current weather at %s is \"%s\"
with a temperature of %s degrees %s. Humidity level is %s percent.",
configuration().getLocation(), weather, temperature, //$NON-NLS-1$
+ String message =
String.format(Messages.getString("current_weather"),
configuration().getLocation(), weather, temperature, //$NON-NLS-1$
configuration().getUnit() == Unit.celsius ?
"celsius" : "fahrenheit", humidity); //$NON-NLS-1$ //$NON-NLS-2$
throwMessage(message);
@@ -175,7 +175,7 @@
temperatureHigh = getData(current, "high");
//$NON-NLS-1$
}
- message = String.format("Tomorrow's forecast : \"%s\"
temperatures from %s to %s degrees.", weather, temperature, temperatureHigh);
//$NON-NLS-1$
+ message = String.format(Messages.getString("forecast"),
weather, temperature, temperatureHigh); //$NON-NLS-1$
throwMessage(message);
}
outputFile.deleteOnExit();
Modified:
software_suite_v2/software/gadgets/tuxdroid-gadget-weather/trunk/tuxdroid-gadget-weather/sources/net/karmaLab/tuxDroid/gadgets/messages_en.properties
===================================================================
---
software_suite_v2/software/gadgets/tuxdroid-gadget-weather/trunk/tuxdroid-gadget-weather/sources/net/karmaLab/tuxDroid/gadgets/messages_en.properties
2008-08-29 07:17:01 UTC (rev 1631)
+++
software_suite_v2/software/gadgets/tuxdroid-gadget-weather/trunk/tuxdroid-gadget-weather/sources/net/karmaLab/tuxDroid/gadgets/messages_en.properties
2008-08-29 08:31:38 UTC (rev 1632)
@@ -1 +1,4 @@
url=http://www.google.com/ig/api?hl=en&weather=%s
+current_weather=Current weather at %s is \"%s\" with a temperature of %s
degrees %s. Humidity level is %s percent.
+forecast=Tomorrow's forecast : \"%s\" temperatures from %s to %s degrees.
+unknown=unknown
\ No newline at end of file
Modified:
software_suite_v2/software/gadgets/tuxdroid-gadget-weather/trunk/tuxdroid-gadget-weather/sources/net/karmaLab/tuxDroid/gadgets/messages_fr.properties
===================================================================
---
software_suite_v2/software/gadgets/tuxdroid-gadget-weather/trunk/tuxdroid-gadget-weather/sources/net/karmaLab/tuxDroid/gadgets/messages_fr.properties
2008-08-29 07:17:01 UTC (rev 1631)
+++
software_suite_v2/software/gadgets/tuxdroid-gadget-weather/trunk/tuxdroid-gadget-weather/sources/net/karmaLab/tuxDroid/gadgets/messages_fr.properties
2008-08-29 08:31:38 UTC (rev 1632)
@@ -1 +1,4 @@
-url=http://www.google.com/ig/api?hl=en&weather=%s
+url=http://www.google.com/ig/api?hl=fr&weather=%s
+current_weather=La m�t�o actuelle �� %s est \"%s\" avec une temp�rature de %s
degr�s %s. Le taux d'humidit� est de %s pour cent.
+forecast=Les pr�visions pour demain : \"%s\" avec des temp�rature de %s � %s
degr�s.
+unknown=inconnu
Modified:
software_suite_v2/software/gadgets/tuxdroid-gadget-weather/trunk/tuxdroid-gadget-weather/sources/net/karmaLab/tuxDroid/gadgets/messages_nl.properties
===================================================================
---
software_suite_v2/software/gadgets/tuxdroid-gadget-weather/trunk/tuxdroid-gadget-weather/sources/net/karmaLab/tuxDroid/gadgets/messages_nl.properties
2008-08-29 07:17:01 UTC (rev 1631)
+++
software_suite_v2/software/gadgets/tuxdroid-gadget-weather/trunk/tuxdroid-gadget-weather/sources/net/karmaLab/tuxDroid/gadgets/messages_nl.properties
2008-08-29 08:31:38 UTC (rev 1632)
@@ -1 +1,4 @@
url=http://www.google.com/ig/api?hl=nl&weather=%s
+current_weather=Het weer vandaag in %s is \"%s\" met een temperatuur van %s
graden %s. De vochtigheidsgraad is %s procents.
+forecast=De weersverwachtingen voor morgen : \"%s\" met temperaturen van %s
tot %s graden.
+unknown=onbekend
\ No newline at end of file
-------------------------------------------------------------------------
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
