[tuxdroid-svn] r4601 - in software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV: resources src/com/kysoh/tvPrograms/gadget src/com/kysoh/tvPrograms/programs

[jerome <c2m...@c2...>]

Author: jerome
Date: 2009-04-30 09:19:59 +0200 (Thu, 30 Apr 2009)
New Revision: 4601

Modified:
   software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/resources/gadget.pot
   software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/Configuration.java
   software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/programs/SimplePrograms.java
Log:
* Fixed a bug with the DIGITAL_FRENCH one.
* Added error message on gadget template.

Modified: software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/resources/gadget.pot
===================================================================
--- software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/resources/gadget.pot	2009-04-28 10:26:23 UTC (rev 4600)
+++ software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/resources/gadget.pot	2009-04-30 07:19:59 UTC (rev 4601)
@@ -94,3 +94,5 @@
 msgid "Select time frame"
 msgstr ""
 
+msgid "Error while loading the TV program"
+msgstr ""
\ No newline at end of file

Modified: software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/Configuration.java
===================================================================
--- software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/Configuration.java	2009-04-28 10:26:23 UTC (rev 4600)
+++ software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/Configuration.java	2009-04-30 07:19:59 UTC (rev 4601)
@@ -25,7 +25,7 @@
 
 public class Configuration extends SimpleGadgetConfiguration{
 	
-	private String channel = "VTM";
+	private String channel = "Mezzo";
 	private boolean giveProgramDescription = false;
 	private boolean giveMorning = false;
 	private boolean giveAfternoon = false;

Modified: software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/programs/SimplePrograms.java
===================================================================
--- software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/programs/SimplePrograms.java	2009-04-28 10:26:23 UTC (rev 4600)
+++ software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/programs/SimplePrograms.java	2009-04-30 07:19:59 UTC (rev 4601)
@@ -82,6 +82,11 @@
 			
 			channelsMap = this.getChannelsLinkByCountry(country, availables);
 			
+			if((!channelsMap.containsKey(channel)) && (country == SimplePrograms.FR))
+			{
+				channelsMap = this.getChannelsLinkByCountry(SimplePrograms.DIGITAL_FRENCH, availables);
+			}
+			
 			program = this.parseProgramsForChannel(this.channel);
 			
 			if(program.size() > 0)