[Cdd-commits] r855 - cdd/trunk/webtools

[CDD Subversion Commit]

Author: tille
Date: Mon Jun 23 21:38:16 2008
New Revision: 855

Modified:
   cdd/trunk/webtools/cddtasktools.py
   cdd/trunk/webtools/tasks.py
Log:
The advertising string is not yet translated in practice - but I have no idea any mory why not because the debugging output of the string looks promising ...


Modified: cdd/trunk/webtools/cddtasktools.py
==============================================================================
--- cdd/trunk/webtools/cddtasktools.py	(original)
+++ cdd/trunk/webtools/cddtasktools.py	Mon Jun 23 21:38:16 2008
@@ -82,7 +82,10 @@
                                                     # for all CDDs that's why the default value makes sense
         ret['vcsdir']      = stanza['vcsdir']       # Path to CDD information files at svn.debian.org
         if stanza.has_key('advertising'):
-            ret['advertising'] = stanza['advertising'] # Some advertising text for the headline
+            # we have to remove the gettext _() call which was inserted into the config
+            # file to enable easy input for config file editors - but the call has to
+            # be made explicitely in the python code
+            ret['advertising'] = re.sub('_\(\W?(.+)\W?\)', '\\1', stanza['advertising'])
 
     return ret
 

Modified: cdd/trunk/webtools/tasks.py
==============================================================================
--- cdd/trunk/webtools/tasks.py	(original)
+++ cdd/trunk/webtools/tasks.py	Mon Jun 23 21:38:16 2008
@@ -87,7 +87,7 @@
         data['description']       = _("The list to the right includes various software projects which are of some interest to the %s Project. Currently, only a few of them are available as Debian packages. It is our goal, however, to include all software in %s which can sensibly add to a high quality Custom Debian Distribution.") % (data['projectname'], data['projectname'])
 	data['gtstrTasksPage']     = _('Tasks page')
 	data['gtstrProject']	   = _('Project')
-	data['projectadvertising'] = data['advertising'] # Hopefully translation will work this way ...
+	data['projectadvertising'] = _(data['advertising']) # Hopefully translation will work this way ...
 	print "DEBUG", data['projectadvertising'], data['advertising']
 
 	COLORCODES = { 'official'      : _('Green: The project is <a href="#official-debs">available as an official Debian package</a>'),