[tuxdroid-svn] r5020 - in software_suite_v3/smart-core/smart-server/trunk: data/web_interface/devel/xsl data/web_interface/user_01/xsl util/applicationserver/plugin util/applicationserver/plugin/translation util/i18n

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

Author: remi
Date: 2009-07-03 11:28:32 +0200 (Fri, 03 Jul 2009)
New Revision: 5020

Added:
   software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/translation/
   software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/translation/default.pot
   software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/translation/en.po
   software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/translation/fr.po
Modified:
   software_suite_v3/smart-core/smart-server/trunk/data/web_interface/devel/xsl/plugin_gadget_common.xsl
   software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/gadget_configuration.xsl
   software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/Plugin.py
   software_suite_v3/smart-core/smart-server/trunk/util/i18n/I18n.py
Log:
* Added common translations of the plugins int pot and po files
* Fixed the way to show the locutor selection in the web interfaces.

Modified: software_suite_v3/smart-core/smart-server/trunk/data/web_interface/devel/xsl/plugin_gadget_common.xsl
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/data/web_interface/devel/xsl/plugin_gadget_common.xsl	2009-07-03 09:06:00 UTC (rev 5019)
+++ software_suite_v3/smart-core/smart-server/trunk/data/web_interface/devel/xsl/plugin_gadget_common.xsl	2009-07-03 09:28:32 UTC (rev 5020)
@@ -325,7 +325,7 @@
         <!-- PARMETERS CONTENT -->
         <div class="sectionContentTop2"></div>
         <xsl:for-each select="parameters/*">
-            <xsl:if test="visible = 'True' or name = 'locutor'">
+            <xsl:if test="visible = 'True'">
                 <div class="sectionContentRowBox">
                     <xsl:element name="input">
                         <xsl:attribute name="class">text</xsl:attribute>

Modified: software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/gadget_configuration.xsl
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/gadget_configuration.xsl	2009-07-03 09:06:00 UTC (rev 5019)
+++ software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/gadget_configuration.xsl	2009-07-03 09:28:32 UTC (rev 5020)
@@ -91,7 +91,7 @@
             </div>
             <!-- GADGET PARAMETERS -->
             <xsl:for-each select="root/data/parameters/*">
-                <xsl:if test="visible = 'True' or name = 'locutor'">
+                <xsl:if test="visible = 'True'">
                     <div class="gadgetConfContentFrameMiddle">
                         <div class="gadgetConfContentFrameSep"></div>
                         <xsl:element name="input">

Modified: software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/Plugin.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/Plugin.py	2009-07-03 09:06:00 UTC (rev 5019)
+++ software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/Plugin.py	2009-07-03 09:28:32 UTC (rev 5020)
@@ -108,7 +108,7 @@
             'defaultValue' : defaultLocutor,
             'description' : 'Locutor',
             'category' : 'internals',
-            'visible' : 'false',
+            'visible' : 'true',
         })
         self.__parameters.append(pluginParameter)
         pluginParameter = PluginParameter(self, {
@@ -490,9 +490,12 @@
             SUPPORTED_LANGUAGES_LIST.append(language)
         for language in SUPPORTED_LANGUAGES_LIST:
             i18n = I18n()
-            i18n.setPoDirectory(os.path.join(self.__workingPath, "resources"))
+            i18n.setPoDirectory(os.path.join(os.path.split(__file__)[0],
+                "translation"))
             i18n.setLocale(language)
             i18n.update()
+            i18n.setPoDirectory(os.path.join(self.__workingPath, "resources"))
+            i18n.update()
             self.__i18nList[language] = i18n
 
     # --------------------------------------------------------------------------

Added: software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/translation/default.pot
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/translation/default.pot	                        (rev 0)
+++ software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/translation/default.pot	2009-07-03 09:28:32 UTC (rev 5020)
@@ -0,0 +1,20 @@
+msgid "Locutor"
+msgstr ""
+
+msgid "Pitch"
+msgstr ""
+
+msgid "Country"
+msgstr ""
+
+msgid "Language"
+msgstr ""
+
+msgid "Uuid"
+msgstr ""
+
+msgid "Started by"
+msgstr ""
+
+msgid "Verbose mode"
+msgstr ""

Added: software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/translation/en.po
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/translation/en.po	                        (rev 0)
+++ software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/translation/en.po	2009-07-03 09:28:32 UTC (rev 5020)
@@ -0,0 +1,20 @@
+msgid "Locutor"
+msgstr "Voice"
+
+msgid "Pitch"
+msgstr "Pitch"
+
+msgid "Country"
+msgstr "Country"
+
+msgid "Language"
+msgstr "Language"
+
+msgid "Uuid"
+msgstr "Internal identifier"
+
+msgid "Started by"
+msgstr "Started by"
+
+msgid "Verbose mode"
+msgstr "Verbose mode"

Added: software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/translation/fr.po
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/translation/fr.po	                        (rev 0)
+++ software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/translation/fr.po	2009-07-03 09:28:32 UTC (rev 5020)
@@ -0,0 +1,20 @@
+msgid "Locutor"
+msgstr "Voix"
+
+msgid "Pitch"
+msgstr "Pitch"
+
+msgid "Country"
+msgstr "Pays"
+
+msgid "Language"
+msgstr "Langue"
+
+msgid "Uuid"
+msgstr "Identificateur internet"
+
+msgid "Started by"
+msgstr "Drrar"
+
+msgid "Verbose mode"
+msgstr "Mode traces"

Modified: software_suite_v3/smart-core/smart-server/trunk/util/i18n/I18n.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/util/i18n/I18n.py	2009-07-03 09:06:00 UTC (rev 5019)
+++ software_suite_v3/smart-core/smart-server/trunk/util/i18n/I18n.py	2009-07-03 09:28:32 UTC (rev 5020)
@@ -123,7 +123,7 @@
         fileName = "%s.po" % self.__language
         poFile = os.path.join(self.__poDirectory, fileName)
         if os.path.isfile(poFile):
-            self.__data = {}
+            #self.__data = {}
             try:
                 f = open(poFile, "rb")
                 try: