[tuxdroid-svn] r4868 - in software_suite_v3/smart-core/smart-server/trunk: resources/04_robot_content_interactions translation/tts_fixes

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

Author: remi
Date: 2009-06-23 13:37:18 +0200 (Tue, 23 Jun 2009)
New Revision: 4868

Modified:
   software_suite_v3/smart-core/smart-server/trunk/resources/04_robot_content_interactions/00_resourceRobotContentInteractions.py
   software_suite_v3/smart-core/smart-server/trunk/translation/tts_fixes/default.pot
   software_suite_v3/smart-core/smart-server/trunk/translation/tts_fixes/en.po
   software_suite_v3/smart-core/smart-server/trunk/translation/tts_fixes/fr.po
Log:
* fixed some translations for tts menu
* added current menu speaking on remote key "K_MENU"

Modified: software_suite_v3/smart-core/smart-server/trunk/resources/04_robot_content_interactions/00_resourceRobotContentInteractions.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/resources/04_robot_content_interactions/00_resourceRobotContentInteractions.py	2009-06-23 11:17:14 UTC (rev 4867)
+++ software_suite_v3/smart-core/smart-server/trunk/resources/04_robot_content_interactions/00_resourceRobotContentInteractions.py	2009-06-23 11:37:18 UTC (rev 4868)
@@ -385,13 +385,13 @@
                 self.computeOnDemandDictForThumbnailBar()
                 return
 
-    def __speakOnDemand(self):
+    def __speakOnDemand(self, intoSentence = ""):
         """
         """
         if len(self.__onDemandList) > 0:
             resourceTuxOSL.ttsStop()
             ugc = self.__onDemandList[self.__onDemandIndex]
-            ugcTtsName = ugc.getDescription().getName()
+            ugcTtsName = intoSentence + " " + ugc.getDescription().getName()
             locutor = resourcePluginsServer.getPluginsContainer().getLocutor()
             pitch = resourcePluginsServer.getPluginsContainer().getPitch()
             language = resourcePluginsServer.getPluginsContainer().getLanguage()
@@ -892,6 +892,15 @@
                 return
         self.__onDemandNext()
 
+    def __contextBtMenu(self, eventName, *args):
+        """
+        """
+        if not self.isStarted():
+            return
+        if self.getForegroundPguContext() != None:
+            return
+        self.__speakOnDemand(intoSentence = "current_menu_is")
+
     def __contextBtMute(self, eventName, *args):
         """
         """
@@ -951,6 +960,8 @@
                     self.__contextRBNext(eventName, *args)
                 elif args[0] == "K_DOWN":
                     self.__contextRBNext(eventName, *args)
+                elif args[0] == "K_MENU":
+                    self.__contextBtMenu(eventName, *args)
                 elif args[0] == "K_MUTE":
                     self.__contextBtMute(eventName, *args)
                 elif args[0] == "K_STANDBY":

Modified: software_suite_v3/smart-core/smart-server/trunk/translation/tts_fixes/default.pot
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/translation/tts_fixes/default.pot	2009-06-23 11:17:14 UTC (rev 4867)
+++ software_suite_v3/smart-core/smart-server/trunk/translation/tts_fixes/default.pot	2009-06-23 11:37:18 UTC (rev 4868)
@@ -1,3 +1,6 @@
+msgid "current_menu_is"
+msgstr ""
+
 msgid "skype"
 msgstr ""
 
@@ -4,9 +7,12 @@
 msgid "tux"
 msgstr ""
 
-msgid "tux_droid"
+msgid "droid"
 msgstr ""
 
+msgid "tuxdroid"
+msgstr ""
+
 msgid "twitter"
 msgstr ""
 

Modified: software_suite_v3/smart-core/smart-server/trunk/translation/tts_fixes/en.po
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/translation/tts_fixes/en.po	2009-06-23 11:17:14 UTC (rev 4867)
+++ software_suite_v3/smart-core/smart-server/trunk/translation/tts_fixes/en.po	2009-06-23 11:37:18 UTC (rev 4868)
@@ -1,3 +1,6 @@
+msgid "current_menu_is"
+msgstr "current menu is"
+
 msgid "skype"
 msgstr "skaipe"
 
@@ -4,7 +7,10 @@
 msgid "tux"
 msgstr "tux"
 
-msgid "tux_droid"
+msgid "droid"
+msgstr "droid"
+
+msgid "tuxdroid"
 msgstr "tux droid"
 
 msgid "twitter"

Modified: software_suite_v3/smart-core/smart-server/trunk/translation/tts_fixes/fr.po
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/translation/tts_fixes/fr.po	2009-06-23 11:17:14 UTC (rev 4867)
+++ software_suite_v3/smart-core/smart-server/trunk/translation/tts_fixes/fr.po	2009-06-23 11:37:18 UTC (rev 4868)
@@ -1,3 +1,6 @@
+msgid "current_menu_is"
+msgstr "le menu actuel est"
+
 msgid "skype"
 msgstr "skaype"
 
@@ -4,7 +7,10 @@
 msgid "tux"
 msgstr "teukss"
 
-msgid "tux_droid"
+msgid "droid"
+msgstr "dro-ide"
+
+msgid "tuxdroid"
 msgstr "teukss dro-ide"
 
 msgid "twitter"