[Cdd-commits] r848 - in cdd/trunk/webtools: . po templates

CDD Subversion Commit noreply at alioth.debian.org
Fri Jun 20 14:49:50 UTC 2008


Author: tille
Date: Fri Jun 20 14:49:50 2008
New Revision: 848

Modified:
   cdd/trunk/webtools/cddtasktools.py
   cdd/trunk/webtools/mkpot.sh
   cdd/trunk/webtools/po/cdd-webtools.pot
   cdd/trunk/webtools/po/da.po
   cdd/trunk/webtools/po/de.po
   cdd/trunk/webtools/po/fr.po
   cdd/trunk/webtools/po/it.po
   cdd/trunk/webtools/po/pt.po
   cdd/trunk/webtools/tasks.py
   cdd/trunk/webtools/templates/tasks.xhtml
   cdd/trunk/webtools/templates/tasks_idx.xhtml
Log:
More tranlsted strings, more languages, renamed output files to work with Apache MultiViews Option


Modified: cdd/trunk/webtools/cddtasktools.py
==============================================================================
--- cdd/trunk/webtools/cddtasktools.py	(original)
+++ cdd/trunk/webtools/cddtasktools.py	Fri Jun 20 14:49:50 2008
@@ -324,7 +324,8 @@
                 continue
             # f = urllib.urlopen(DDTPURL+dist+'/'+component+DDTPDIR+'/'+lang)
             cachefile = cachedir+'/'+dist+'_'+component+'_'+lang+'.'+COMPRESSIONEXTENSION
-            (file,info) = urllib.urlretrieve(DDTPURL+dist+'/'+component+DDTPDIR+lang+'.'+COMPRESSIONEXTENSION,cachefile)
+            ddtpfile = DDTPURL+dist+'/'+component+DDTPDIR+lang+'.'+COMPRESSIONEXTENSION
+            (file,info) = urllib.urlretrieve(ddtpfile,cachefile)
             if COMPRESSIONEXTENSION == 'gz':
                 g = gzip.GzipFile(file)
             elif COMPRESSIONEXTENSION == 'bz2':
@@ -333,17 +334,22 @@
                 print >>stderr, "Unknown compression extension " + COMPRESSIONEXTENSION
                 return exit(-1)
 
-            for stanza in deb822.Sources.iter_paragraphs(g, shared_storage=False):
-                pkg = stanza['package']
-                if pkg not in pks2translate:
-                    continue
+            try:
+                for stanza in deb822.Sources.iter_paragraphs(g, shared_storage=False):
+                    pkg = stanza['package']
+                    if pkg not in pks2translate:
+                        continue
 
-                self.alldeps_in_main_info[pkg].desc[lang] = {}
-                (short, long) = SplitDescription(stanza['description-'+lang])
+                    self.alldeps_in_main_info[pkg].desc[lang] = {}
+                    (short, long) = SplitDescription(stanza['description-'+lang])
 
-                # Markup strings to enable verbatim output of preformatted text
-                self.alldeps_in_main_info[pkg].desc[lang]['short'] = MarkupString(short, pkg, 'pkgShortDesc', lang)
-                self.alldeps_in_main_info[pkg].desc[lang]['long']  = MarkupString(long,  pkg, 'pkgLongDesc', lang)
+                    # Markup strings to enable verbatim output of preformatted text
+                    self.alldeps_in_main_info[pkg].desc[lang]['short'] = MarkupString(short, pkg, 'pkgShortDesc', lang)
+                    self.alldeps_in_main_info[pkg].desc[lang]['long']  = MarkupString(long,  pkg, 'pkgLongDesc', lang)
+            except IOError, errtxt:
+                print >>stderr, "'%s' error when trying to retrieve file %s for language %s" %\
+                       (errtxt, ddtpfile, lang)
+                os.unlink(file)
 
     def MarkupPreformatedStringsCDD(self):
         # Genshi does not touch strings that are marked with "Markup()" - so just

Modified: cdd/trunk/webtools/mkpot.sh
==============================================================================
--- cdd/trunk/webtools/mkpot.sh	(original)
+++ cdd/trunk/webtools/mkpot.sh	Fri Jun 20 14:49:50 2008
@@ -11,6 +11,6 @@
 	--output-dir="po" \
 	--escape \
 	--output="${NAME}.pot" \
-	tasks.py tasks_idx.py templates/tasks_idx.xhtml #  templates/tasks.xhtml
+	tasks.py templates/tasks_idx.xhtml templates/tasks.xhtml
 
 #	--language="Python" \

Modified: cdd/trunk/webtools/po/cdd-webtools.pot
==============================================================================
--- cdd/trunk/webtools/po/cdd-webtools.pot	(original)
+++ cdd/trunk/webtools/po/cdd-webtools.pot	Fri Jun 20 14:49:50 2008
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: cdd-webtools 0.1.1\n"
 "Report-Msgid-Bugs-To: debian-custom at lists.debian.org\n"
-"POT-Creation-Date: 2008-06-17 10:16+0200\n"
+"POT-Creation-Date: 2008-06-20 13:55+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -32,7 +32,7 @@
 msgid "Version"
 msgstr ""
 
-#: tasks.py:79 tasks_idx.py:54
+#: tasks.py:79
 msgid "Summary"
 msgstr ""
 
@@ -68,70 +68,75 @@
 "href=\"mailto:%s\">%s mailing list</a>"
 msgstr ""
 
+#: tasks.py:89
+#, python-format
+msgid ""
+"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."
+msgstr ""
+
 #: tasks.py:90
+msgid "Tasks page"
+msgstr ""
+
+#: tasks.py:91
+msgid "Project"
+msgstr ""
+
+#: tasks.py:92
+#, python-format
+msgid ""
+"Help us to see Debian used by medical practicioners and researchers!\n"
+"Join us on the\n"
+"<a href=\"%s\">Alioth page</a>."
+msgstr ""
+
+#: tasks.py:97
 msgid ""
 "Green: The project is <a href=\"#official-debs\">available as an official "
 "Debian package</a>"
 msgstr ""
 
-#: tasks.py:91
+#: tasks.py:98
 msgid ""
 "Yellow: The project is <a href=\"#unofficial-debs\">available as an "
 "unofficial Debian package</a>"
 msgstr ""
 
-#: tasks.py:92
+#: tasks.py:99
 msgid ""
-"Red: The project is <a href=\"#debs-not-available\">not (yet) available as a "
+"Red: The project is <a href=\"#prospective-debs\">not (yet) available as a "
 "Debian package</a>"
 msgstr ""
 
-#: tasks.py:93
-msgid "White: The project has an unknown status."
-msgstr ""
-
-#: tasks.py:97
+#: tasks.py:104
 msgid "Official"
 msgstr ""
 
-#: tasks.py:98
+#: tasks.py:105
 msgid "Unofficial"
 msgstr ""
 
-#: tasks.py:99
+#: tasks.py:106
 msgid "Prospective"
 msgstr ""
 
-#: tasks.py:102
+#: tasks.py:109
 msgid "Official Debian packages"
 msgstr ""
 
-#: tasks.py:103
+#: tasks.py:110
 msgid ""
 "Experimental or unofficial Debian packages, projects with packaging stuff in "
 "SVN"
 msgstr ""
 
-#: tasks.py:104
+#: tasks.py:111
 msgid "Debian packages not available"
 msgstr ""
 
-#: tasks.py:106
+#: tasks.py:113
 msgid "Packages"
 msgstr ""
-
-#: tasks_idx.py:53
-msgid "Tasks page"
-msgstr ""
-
-#: tasks_idx.py:55
-msgid "Project"
-msgstr ""
-
-#: tasks_idx.py:56
-#, python-format
-msgid ""
-"Help us to see Debian used by medical practicioners and researchers!\n"
-"Join us on the\n"
-"<a href=\"%s\">Alioth page</a>."
-msgstr ""

Modified: cdd/trunk/webtools/po/da.po
==============================================================================
--- cdd/trunk/webtools/po/da.po	(original)
+++ cdd/trunk/webtools/po/da.po	Fri Jun 20 14:49:50 2008
@@ -7,7 +7,7 @@
 msgid   ""
 msgstr  "Project-Id-Version: cdd-webtools 0.1.1\n"
         "Report-Msgid-Bugs-To: debian-custom at lists.debian.org\n"
-        "POT-Creation-Date: 2008-06-17 10:16+0200\n"
+        "POT-Creation-Date: 2008-06-20 13:55+0200\n"
         "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
         "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
         "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -31,7 +31,7 @@
 msgid   "Version"
 msgstr  ""
 
-#: tasks.py:79 tasks_idx.py:54
+#: tasks.py:79
 msgid   "Summary"
 msgstr  ""
 
@@ -65,68 +65,72 @@
         "s\">%s mailing list</a>"
 msgstr  ""
 
+#: tasks.py:89
+#, python-format
+msgid   "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."
+msgstr  ""
+
 #: tasks.py:90
-msgid   "Green: The project is <a href=\"#official-debs\">available as an official Debian package</"
-        "a>"
+msgid   "Tasks page"
 msgstr  ""
 
 #: tasks.py:91
-msgid   "Yellow: The project is <a href=\"#unofficial-debs\">available as an unofficial Debian "
-        "package</a>"
+msgid   "Project"
 msgstr  ""
 
 #: tasks.py:92
-msgid   "Red: The project is <a href=\"#debs-not-available\">not (yet) available as a Debian "
+#, python-format
+msgid   "Help us to see Debian used by medical practicioners and researchers!\n"
+        "Join us on the\n"
+        "<a href=\"%s\">Alioth page</a>."
+msgstr  ""
+
+#: tasks.py:97
+msgid   "Green: The project is <a href=\"#official-debs\">available as an official Debian package</"
+        "a>"
+msgstr  ""
+
+#: tasks.py:98
+msgid   "Yellow: The project is <a href=\"#unofficial-debs\">available as an unofficial Debian "
         "package</a>"
 msgstr  ""
 
-#: tasks.py:93
-msgid   "White: The project has an unknown status."
+#: tasks.py:99
+msgid   "Red: The project is <a href=\"#prospective-debs\">not (yet) available as a Debian "
+        "package</a>"
 msgstr  ""
 
-#: tasks.py:97
+#: tasks.py:104
 msgid   "Official"
 msgstr  ""
 
-#: tasks.py:98
+#: tasks.py:105
 msgid   "Unofficial"
 msgstr  ""
 
-#: tasks.py:99
+#: tasks.py:106
 msgid   "Prospective"
 msgstr  ""
 
-#: tasks.py:102
+#: tasks.py:109
 msgid   "Official Debian packages"
 msgstr  ""
 
-#: tasks.py:103
+#: tasks.py:110
 msgid   "Experimental or unofficial Debian packages, projects with packaging stuff in SVN"
 msgstr  ""
 
-#: tasks.py:104
+#: tasks.py:111
 msgid   "Debian packages not available"
 msgstr  ""
 
-#: tasks.py:106
+#: tasks.py:113
 msgid   "Packages"
 msgstr  ""
 
-#: tasks_idx.py:53
-msgid   "Tasks page"
-msgstr  ""
-
-#: tasks_idx.py:55
-msgid   "Project"
-msgstr  ""
-
-#: tasks_idx.py:56
-#, python-format
-msgid   "Help us to see Debian used by medical practicioners and researchers!\n"
-        "Join us on the\n"
-        "<a href=\"%s\">Alioth page</a>."
-msgstr  ""
-
 #
 # These strings occured in the old *.php files and the translations should be
 # preserved for later use.

Modified: cdd/trunk/webtools/po/de.po
==============================================================================
--- cdd/trunk/webtools/po/de.po	(original)
+++ cdd/trunk/webtools/po/de.po	Fri Jun 20 14:49:50 2008
@@ -7,7 +7,7 @@
 msgid   ""
 msgstr  "Project-Id-Version: 0.1\n"
         "Report-Msgid-Bugs-To: debian-custom at lists.debian.org\n"
-        "POT-Creation-Date: 2008-06-17 10:16+0200\n"
+        "POT-Creation-Date: 2008-06-20 13:55+0200\n"
         "PO-Revision-Date: 2008-02-17 17:13:51+0200\n"
         "Last-Translator: Steffen Möller, Andreas Tille <{moeller,tille}@debian.org>\n"
         "Language-Team: German <de at li.org>\n"
@@ -31,7 +31,7 @@
 msgid   "Version"
 msgstr  "Version"
 
-#: tasks.py:79 tasks_idx.py:54
+#: tasks.py:79
 msgid   "Summary"
 msgstr  "Zusammenfassung"
 
@@ -58,81 +58,89 @@
         "geben, hat jede Kopfzeile einen Farbcode entsprechend diesem Schema:"
 
 #: tasks.py:85
+#, python-format
 msgid   "If you discover a project which looks like a good candidate for %s\n"
         "                              to you, or if you have prepared an inofficial Debian "
         "package, please do not hesitate to\n"
         "                              send a description of that project to the <a href=\"mailto:%"
         "s\">%s mailing list</a>"
-msgstr  "Wenn Sie ein Projekt entdecken, das ein guter Kandidat für %s zu sein scheint, "
-        "oder wenn Sie ein inoffizielles Debianpaket erstellt haben, zögern Sie bitte nicht eine "
+msgstr  "Wenn Sie ein Projekt entdecken, das ein guter Kandidat für %s zu sein scheint, oder wenn "
+        "Sie ein inoffizielles Debianpaket erstellt haben, zögern Sie bitte nicht eine "
         "Beschreibung des Projekts an die <a href=\"mailto:%s\">%s Mailingliste</a> zu schicken."
 
+#: tasks.py:89
+msgid   "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."
+msgstr  "Die Liste auf der rechten Seite enthält verschiedene Softwareprojekte, die für das %s "
+        "Projekt von Interesse sind. Derzeit sind nur einige von diesen als Debianpakete "
+        "verfügbar. Zielsetzung ist es jedoch, all die Software für %s zu paketieren, um einen qualitativ "
+        "hochwertigeCustom Debian Distribution (interne Anpassung von Debian an spezielle "
+        "Bedürfnisse) zu erstellen."
+
 #: tasks.py:90
+msgid   "Tasks page"
+msgstr  "Aufgaben"
+
+#: tasks.py:91
+msgid   "Project"
+msgstr  "Projekt"
+
+#: tasks.py:92
+#, python-format
+msgid   "Help us to see Debian used by medical practicioners and researchers!\n"
+        "Join us on the\n"
+        "<a href=\"%s\">Alioth page</a>."
+msgstr  "Hilf uns dabei, Debian für Ärzte und Forscher attraktiv zu machen!\n"
+        "Du kannst dem Projekt auf der <a href=\"%s\">Alioth Seite</a> beitreten."
+
+#: tasks.py:97
 msgid   "Green: The project is <a href=\"#official-debs\">available as an official Debian package</"
         "a>"
 msgstr  "Grün: Das Projekt <a href=\"#official-debs\">ist als ein offizielles Debianpaket "
         "verfügbar</a>"
 
-#: tasks.py:91
+#: tasks.py:98
 msgid   "Yellow: The project is <a href=\"#unofficial-debs\">available as an unofficial Debian "
         "package</a>"
 msgstr  "Gelb: Das Projekt <a href=\"#unofficial-debs\">ist als ein inoffizielles Debianpaket "
         "verfügbar</a>"
 
-#: tasks.py:92
-msgid   "Red: The project is <a href=\"#debs-not-available\">not (yet) available as a Debian "
+#: tasks.py:99
+msgid   "Red: The project is <a href=\"#prospective-debs\">not (yet) available as a Debian "
         "package</a>"
-msgstr  "Rot: Das Projekt <a href=\"#debs-not-available\">ist (noch) nicht als Debianpaket "
+msgstr  "Rot: Das Projekt <a href=\"#prospective-debs\">ist (noch) nicht als Debianpaket "
         "verfügbar</a>"
 
-#: tasks.py:93
-msgid   "White: The project has an unknown status."
-msgstr  "Weiß: Das Projekt hat einen unbekannten Status."
-
-#: tasks.py:97
+#: tasks.py:104
 msgid   "Official"
 msgstr  "Offiziell"
 
-#: tasks.py:98
+#: tasks.py:105
 msgid   "Unofficial"
 msgstr  "Inoffiziell"
 
-#: tasks.py:99
+#: tasks.py:106
 msgid   "Prospective"
 msgstr  "Voraussichtlich"
 
-#: tasks.py:102
+#: tasks.py:109
 msgid   "Official Debian packages"
 msgstr  "Offizielle Debianpakete"
 
-#: tasks.py:103
+#: tasks.py:110
 msgid   "Experimental or unofficial Debian packages, projects with packaging stuff in SVN"
 msgstr  ""
 
-#: tasks.py:104
+#: tasks.py:111
 msgid   "Debian packages not available"
 msgstr  "Debianpakete nicht verfügbar"
 
-#: tasks.py:106
+#: tasks.py:113
 msgid   "Packages"
 msgstr  "Pakete"
 
-#: tasks_idx.py:53
-msgid   "Tasks page"
-msgstr  "Aufgaben"
-
-#: tasks_idx.py:55
-msgid   "Project"
-msgstr  "Projekt"
-
-#: tasks_idx.py:56
-#, python-format
-msgid   "Help us to see Debian used by medical practicioners and researchers!\n"
-        "Join us on the\n"
-        "<a href=\"%s\">Alioth page</a>."
-msgstr  "Hilf uns dabei, Debian für Ärzte und Forscher attraktiv zu machen!\n"
-        "Du kannst dem Projekt auf der <a href=\"%s\">Alioth Seite</a> beitreten."
-
 #: ../bug_details.tmpl:8 ../bugs.tmpl:7 ../ddtp.tmpl:7 ../ddtp_details.tmpl:8 ../locales.php:7
 #: ../tasks.tmpl:8 ../tasks_idx.tmpl:8
 msgid   "summary"
@@ -232,7 +240,6 @@
 msgstr  "Gruppenrichtlinien"
 
 #: ../index.php:43
-#, fuzzy
 msgid   "Bugs"
 msgstr  "Gemeldete Probleme"
 
@@ -253,7 +260,6 @@
 msgstr  "SVN Repository"
 
 #: ../index.php:49
-#, fuzzy
 msgid   "Localizations"
 msgstr  "Übersetzung"
 
@@ -439,6 +445,9 @@
 msgid   "Please follow the link below to start translating"
 msgstr  "Bitte folge dem unten angegebenen Link, um eine erste Übersetzung einzugeben."
 
+#~ msgid        "White: The project has an unknown status."
+#~ msgstr       "Weiß: Das Projekt hat einen unbekannten Status."
+
 #~ msgid        "Debian Med"
 #~ msgstr       "Debian Med"
 

Modified: cdd/trunk/webtools/po/fr.po
==============================================================================
--- cdd/trunk/webtools/po/fr.po	(original)
+++ cdd/trunk/webtools/po/fr.po	Fri Jun 20 14:49:50 2008
@@ -10,7 +10,7 @@
 msgid   ""
 msgstr  "Project-Id-Version: messages\n"
         "Report-Msgid-Bugs-To: debian-custom at lists.debian.org\n"
-        "POT-Creation-Date: 2008-06-17 10:16+0200\n"
+        "POT-Creation-Date: 2008-06-20 13:55+0200\n"
         "PO-Revision-Date: 2007-10-07 10:38+0900\n"
         "Last-Translator: Charles Plessy <charles-debian-nospam at plessy.org>\n"
         "Language-Team: français <fr at li.org.example>\n"
@@ -35,7 +35,7 @@
 msgid   "Version"
 msgstr  ""
 
-#: tasks.py:79 tasks_idx.py:54
+#: tasks.py:79
 #, fuzzy
 msgid   "Summary"
 msgstr  "r&eacute;sum&eacute;"
@@ -70,70 +70,74 @@
         "s\">%s mailing list</a>"
 msgstr  ""
 
+#: tasks.py:89
+#, python-format
+msgid   "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."
+msgstr  ""
+
 #: tasks.py:90
+#, fuzzy
+msgid   "Tasks page"
+msgstr  "Localisation"
+
+#: tasks.py:91
+msgid   "Project"
+msgstr  ""
+
+#: tasks.py:92
+#, python-format
+msgid   "Help us to see Debian used by medical practicioners and researchers!\n"
+        "Join us on the\n"
+        "<a href=\"%s\">Alioth page</a>."
+msgstr  ""
+
+#: tasks.py:97
 msgid   "Green: The project is <a href=\"#official-debs\">available as an official Debian package</"
         "a>"
 msgstr  ""
 
-#: tasks.py:91
+#: tasks.py:98
 msgid   "Yellow: The project is <a href=\"#unofficial-debs\">available as an unofficial Debian "
         "package</a>"
 msgstr  ""
 
-#: tasks.py:92
-msgid   "Red: The project is <a href=\"#debs-not-available\">not (yet) available as a Debian "
+#: tasks.py:99
+msgid   "Red: The project is <a href=\"#prospective-debs\">not (yet) available as a Debian "
         "package</a>"
 msgstr  ""
 
-#: tasks.py:93
-msgid   "White: The project has an unknown status."
-msgstr  ""
-
-#: tasks.py:97
+#: tasks.py:104
 msgid   "Official"
 msgstr  ""
 
-#: tasks.py:98
+#: tasks.py:105
 msgid   "Unofficial"
 msgstr  ""
 
-#: tasks.py:99
+#: tasks.py:106
 msgid   "Prospective"
 msgstr  ""
 
-#: tasks.py:102
+#: tasks.py:109
 msgid   "Official Debian packages"
 msgstr  ""
 
-#: tasks.py:103
+#: tasks.py:110
 msgid   "Experimental or unofficial Debian packages, projects with packaging stuff in SVN"
 msgstr  ""
 
-#: tasks.py:104
+#: tasks.py:111
 msgid   "Debian packages not available"
 msgstr  ""
 
-#: tasks.py:106
+#: tasks.py:113
 #, fuzzy
 msgid   "Packages"
 msgstr  "Liens"
 
-#: tasks_idx.py:53
-#, fuzzy
-msgid   "Tasks page"
-msgstr  "Localisation"
-
-#: tasks_idx.py:55
-msgid   "Project"
-msgstr  ""
-
-#: tasks_idx.py:56
-#, python-format
-msgid   "Help us to see Debian used by medical practicioners and researchers!\n"
-        "Join us on the\n"
-        "<a href=\"%s\">Alioth page</a>."
-msgstr  ""
-
 #: ../bug_details.tmpl:8 ../bugs.tmpl:7 ../ddtp.tmpl:7 ../ddtp_details.tmpl:8 ../locales.php:7
 #: ../tasks.tmpl:8 ../tasks_idx.tmpl:8
 msgid   "summary"

Modified: cdd/trunk/webtools/po/it.po
==============================================================================
--- cdd/trunk/webtools/po/it.po	(original)
+++ cdd/trunk/webtools/po/it.po	Fri Jun 20 14:49:50 2008
@@ -7,7 +7,7 @@
 msgid   ""
 msgstr  "Project-Id-Version: 0.1\n"
         "Report-Msgid-Bugs-To: debian-custom at lists.debian.org\n"
-        "POT-Creation-Date: 2008-06-17 10:16+0200\n"
+        "POT-Creation-Date: 2008-06-20 13:55+0200\n"
         "PO-Revision-Date: 2008-02-17 13:30+0100\n"
         "Last-Translator: David Paleino <d.paleino at gmail.com>\n"
         "Language-Team: Italian <it at li.org>\n"
@@ -32,7 +32,7 @@
 msgid   "Version"
 msgstr  "Revisione"
 
-#: tasks.py:79 tasks_idx.py:54
+#: tasks.py:79
 #, fuzzy
 msgid   "Summary"
 msgstr  "riassunto"
@@ -71,74 +71,78 @@
         "preparato un pacchetto Debian non ufficiale, non esitare a mandare una descrizione di "
         "quel progetto alla %smailing list Debian-Med%s"
 
+#: tasks.py:89
+#, python-format
+msgid   "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."
+msgstr  ""
+
 #: tasks.py:90
+msgid   "Tasks page"
+msgstr  "Tasks della CDD"
+
+#: tasks.py:91
+msgid   "Project"
+msgstr  ""
+
+#: tasks.py:92
+#, fuzzy, python-format
+msgid   "Help us to see Debian used by medical practicioners and researchers!\n"
+        "Join us on the\n"
+        "<a href=\"%s\">Alioth page</a>."
+msgstr  "Aiutaci a vedere Debian usata dai medici e dai ricercatori! Unisciti a noi sulla %spagina "
+        "Alioth%s."
+
+#: tasks.py:97
 #, fuzzy
 msgid   "Green: The project is <a href=\"#official-debs\">available as an official Debian package</"
         "a>"
 msgstr  "Verde: Il progetto è %sdisponibile come pacchetto Debian ufficiale%s"
 
-#: tasks.py:91
+#: tasks.py:98
 #, fuzzy
 msgid   "Yellow: The project is <a href=\"#unofficial-debs\">available as an unofficial Debian "
         "package</a>"
 msgstr  "Giallo: Il progetto è %sdisponibile come pacchetto Debian non ufficiale%s"
 
-#: tasks.py:92
+#: tasks.py:99
 #, fuzzy
-msgid   "Red: The project is <a href=\"#debs-not-available\">not (yet) available as a Debian "
+msgid   "Red: The project is <a href=\"#prospective-debs\">not (yet) available as a Debian "
         "package</a>"
 msgstr  "Rosso: Il progetto %snon è (ancora) disponibile come pacchetto Debian%s"
 
-#: tasks.py:93
-msgid   "White: The project has an unknown status."
-msgstr  ""
-
-#: tasks.py:97
+#: tasks.py:104
 msgid   "Official"
 msgstr  ""
 
-#: tasks.py:98
+#: tasks.py:105
 msgid   "Unofficial"
 msgstr  ""
 
-#: tasks.py:99
+#: tasks.py:106
 msgid   "Prospective"
 msgstr  ""
 
-#: tasks.py:102
+#: tasks.py:109
 msgid   "Official Debian packages"
 msgstr  ""
 
-#: tasks.py:103
+#: tasks.py:110
 msgid   "Experimental or unofficial Debian packages, projects with packaging stuff in SVN"
 msgstr  ""
 
-#: tasks.py:104
+#: tasks.py:111
 #, fuzzy
 msgid   "Debian packages not available"
 msgstr  "pacchetto Debian non disponibile"
 
-#: tasks.py:106
+#: tasks.py:113
 #, fuzzy
 msgid   "Packages"
 msgstr  "pagine"
 
-#: tasks_idx.py:53
-msgid   "Tasks page"
-msgstr  "Tasks della CDD"
-
-#: tasks_idx.py:55
-msgid   "Project"
-msgstr  ""
-
-#: tasks_idx.py:56
-#, fuzzy, python-format
-msgid   "Help us to see Debian used by medical practicioners and researchers!\n"
-        "Join us on the\n"
-        "<a href=\"%s\">Alioth page</a>."
-msgstr  "Aiutaci a vedere Debian usata dai medici e dai ricercatori! Unisciti a noi sulla %spagina "
-        "Alioth%s."
-
 #: ../bug_details.tmpl:8 ../bugs.tmpl:7 ../ddtp.tmpl:7 ../ddtp_details.tmpl:8 ../locales.php:7
 #: ../tasks.tmpl:8 ../tasks_idx.tmpl:8
 msgid   "summary"

Modified: cdd/trunk/webtools/po/pt.po
==============================================================================
--- cdd/trunk/webtools/po/pt.po	(original)
+++ cdd/trunk/webtools/po/pt.po	Fri Jun 20 14:49:50 2008
@@ -7,7 +7,7 @@
 msgid   ""
 msgstr  "Project-Id-Version: \n"
         "Report-Msgid-Bugs-To: debian-custom at lists.debian.org\n"
-        "POT-Creation-Date: 2008-06-17 10:16+0200\n"
+        "POT-Creation-Date: 2008-06-20 13:55+0200\n"
         "PO-Revision-Date: 2008-02-10 21:36-0300\n"
         "Last-Translator: Nelson A. de Oliveira <naoliv at debian.org>\n"
         "Language-Team: Debian i10n Portugu&ecirc;s <debian-l10n-portuguese at lists.debian.org>\n"
@@ -32,7 +32,7 @@
 msgid   "Version"
 msgstr  "Revis&atilde;o"
 
-#: tasks.py:79 tasks_idx.py:54
+#: tasks.py:79
 #, fuzzy
 msgid   "Summary"
 msgstr  "sum&aacute;rio"
@@ -68,71 +68,75 @@
         "s\">%s mailing list</a>"
 msgstr  ""
 
+#: tasks.py:89
+#, python-format
+msgid   "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."
+msgstr  ""
+
 #: tasks.py:90
+#, fuzzy
+msgid   "Tasks page"
+msgstr  "P&aacute;gina de tradu&ccedil;&otilde;es"
+
+#: tasks.py:91
+msgid   "Project"
+msgstr  ""
+
+#: tasks.py:92
+#, python-format
+msgid   "Help us to see Debian used by medical practicioners and researchers!\n"
+        "Join us on the\n"
+        "<a href=\"%s\">Alioth page</a>."
+msgstr  ""
+
+#: tasks.py:97
 msgid   "Green: The project is <a href=\"#official-debs\">available as an official Debian package</"
         "a>"
 msgstr  ""
 
-#: tasks.py:91
+#: tasks.py:98
 msgid   "Yellow: The project is <a href=\"#unofficial-debs\">available as an unofficial Debian "
         "package</a>"
 msgstr  ""
 
-#: tasks.py:92
-msgid   "Red: The project is <a href=\"#debs-not-available\">not (yet) available as a Debian "
+#: tasks.py:99
+msgid   "Red: The project is <a href=\"#prospective-debs\">not (yet) available as a Debian "
         "package</a>"
 msgstr  ""
 
-#: tasks.py:93
-msgid   "White: The project has an unknown status."
-msgstr  ""
-
-#: tasks.py:97
+#: tasks.py:104
 msgid   "Official"
 msgstr  ""
 
-#: tasks.py:98
+#: tasks.py:105
 msgid   "Unofficial"
 msgstr  ""
 
-#: tasks.py:99
+#: tasks.py:106
 msgid   "Prospective"
 msgstr  ""
 
-#: tasks.py:102
+#: tasks.py:109
 msgid   "Official Debian packages"
 msgstr  ""
 
-#: tasks.py:103
+#: tasks.py:110
 msgid   "Experimental or unofficial Debian packages, projects with packaging stuff in SVN"
 msgstr  ""
 
-#: tasks.py:104
+#: tasks.py:111
 #, fuzzy
 msgid   "Debian packages not available"
 msgstr  "status das tradu&ccedil;&otilde;es"
 
-#: tasks.py:106
+#: tasks.py:113
 #, fuzzy
 msgid   "Packages"
 msgstr  "links"
 
-#: tasks_idx.py:53
-#, fuzzy
-msgid   "Tasks page"
-msgstr  "P&aacute;gina de tradu&ccedil;&otilde;es"
-
-#: tasks_idx.py:55
-msgid   "Project"
-msgstr  ""
-
-#: tasks_idx.py:56
-#, python-format
-msgid   "Help us to see Debian used by medical practicioners and researchers!\n"
-        "Join us on the\n"
-        "<a href=\"%s\">Alioth page</a>."
-msgstr  ""
-
 #: ../bug_details.tmpl:8 ../bugs.tmpl:7 ../ddtp.tmpl:7 ../ddtp_details.tmpl:8 ../locales.php:7
 #: ../tasks.tmpl:8 ../tasks_idx.tmpl:8
 msgid   "summary"

Modified: cdd/trunk/webtools/tasks.py
==============================================================================
--- cdd/trunk/webtools/tasks.py	(original)
+++ cdd/trunk/webtools/tasks.py	Fri Jun 20 14:49:50 2008
@@ -19,7 +19,7 @@
 
 CDD='debian-med'
 
-languages = ('en', 'da', 'de', 'fr', 'it', 'pt')
+languages = ('en', 'da', 'de', 'es', 'fr', 'it', 'jp', 'pt')
 
 cdeps=CddDependencies(CDD)
 cdeps.GetAllDependencies()
@@ -68,7 +68,16 @@
 	        exit(-1)
 
 t = datetime.now()
+htaccess = OUTPUTDIR[CDD] + '/.htaccess'
+try:
+	os.unlink(htaccess)
+except: # simply continue if file does not exist
+	pass
+htafp = open(htaccess, 'w')
+print >> htafp, "Options +MultiViews"
+
 for lang in languages:
+	print >> htafp, "AddLanguage %s .%s" % (lang, lang)
 	l10nstring[lang].install()
 	_ = l10nstring[lang].ugettext
 	data['lang']              = lang
@@ -86,7 +95,7 @@
                               to you, or if you have prepared an inofficial Debian package, please do not hesitate to
                               send a description of that project to the <a href="mailto:%s">%s mailing list</a>""") % \
                                   (data['projectname'], data['projectlist'], data['projectname']))
-
+        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'] = _("""Help us to see Debian used by medical practicioners and researchers!
@@ -121,7 +130,9 @@
 
 	template = loader.load('tasks_idx.xhtml')
 
-	outputfile = OUTPUTDIR[CDD] + '/index_' + lang + '.html'
+	outputfile = OUTPUTDIR[CDD] + '/index.html'
+	if lang != 'en':
+		outputfile += '.' + lang
 	try:
 		os.unlink(outputfile)
 	except: # simply continue if file does not exist
@@ -148,7 +159,9 @@
 			    data['colorcodes'].append(Markup(COLORCODES[type]))
 		data['projects']     = cdeps.tasks[task].dependencies
 
-		outputfile = OUTPUTDIR[CDD] + '/' + task + '_' + lang + '.html'
+		outputfile = OUTPUTDIR[CDD] + '/' + task + '.html'
+	        if lang != 'en':
+			outputfile += '.' + lang
 		try:
 			os.unlink(outputfile)
 		except: # simply continue if file does not exist
@@ -160,3 +173,4 @@
 
 		f.close()
 
+htafp.close()

Modified: cdd/trunk/webtools/templates/tasks.xhtml
==============================================================================
--- cdd/trunk/webtools/templates/tasks.xhtml	(original)
+++ cdd/trunk/webtools/templates/tasks.xhtml	Fri Jun 20 14:49:50 2008
@@ -35,10 +35,7 @@
                  </span></p>
 			</div>
 			<div class="row">
-				<p>
-					The list to the right includes various software projects which are of some interest to the Debian-Med Project.
-					Currently, only a few of them are available as Debian packages.
-					It is our goal, however, to include all software in Debian-Med which can sensibly add to a high quality Custom Debian Distribution.
+				<p>${description}
 				</p>
 				<p>${legend}</p>
 				<ul>
@@ -68,7 +65,7 @@
 	           <span py:otherwise="">${project.desc['en']['short']}</span>
 	         </span>
 	     </em><br/>
-	     <a href="$project.homepage}">${project.homepage}</a>
+	     <a href="$project.homepage">${project.homepage}</a>
 	     <div py:if="project.responsible != None"><span py:choose="type"><span py:when="'official'">${maintainer}</span><span py:otherwise="">${responsible}</span></span>: ${project.responsible}</div>
 	   </td>
            <td class="project-license">

Modified: cdd/trunk/webtools/templates/tasks_idx.xhtml
==============================================================================
--- cdd/trunk/webtools/templates/tasks_idx.xhtml	(original)
+++ cdd/trunk/webtools/templates/tasks_idx.xhtml	Fri Jun 20 14:49:50 2008
@@ -36,7 +36,7 @@
 			</p>
 			<dl>
                              <py:for each="task in taskskeys">
-                                <dt><a href="${task}_${lang}.html" name="${task}" id="${task}">${tasks[task].metapkg.PrintedName} - <span py:choose="">
+                                <dt><a href="${task}.html.${lang}" name="${task}" id="${task}">${tasks[task].metapkg.PrintedName} - <span py:choose="">
 	           <span py:when="tasks[task].metapkg.desc.has_key(lang)">${tasks[task].metapkg.desc[lang]['short']}</span>
 	           <span py:otherwise="">${tasks[task].metapkg.desc['en']['short']}</span>
                  </span></a></dt>



More information about the Cdd-commits mailing list