downloads: Correctly label xen image generator.

diff --git a/translations/de/LC_MESSAGES/webapp.po b/translations/de/LC_MESSAGES/webapp.po
index eeac64045101ba9948da06bd9bbb72f455626239..4cdb5a54fcf8c0a48dafdf00f55315069ec73890 100644 (file)
--- a/translations/de/LC_MESSAGES/webapp.po
+++ b/translations/de/LC_MESSAGES/webapp.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-05 16:03+0200\n"
+"POT-Creation-Date: 2014-05-09 16:22+0200\n"
 "PO-Revision-Date: 2014-05-05 16:06+0100\n"
 "Last-Translator: Michael Tremer <michael.tremer@ipfire.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -1032,84 +1033,92 @@ msgstr ""
 msgid "Checkout this crowdfunding wish from #ipfire:"
 msgstr ""
 
-#: webapp/backend/releases.py:91
+#: webapp/backend/releases.py:94
 msgid "Image for the armv5tel architecture"
 msgstr "Image für die armv5tel-Architektur"
 
-#: webapp/backend/releases.py:92
+#: webapp/backend/releases.py:95
 msgid "armv5tel image for boards with serial console"
 msgstr "armv5tel-Image für Boards mit serieller Konsole"
 
-#: webapp/backend/releases.py:93
+#: webapp/backend/releases.py:96
 msgid "Installable CD image"
 msgstr "Bootbares CD-Image"
 
-#: webapp/backend/releases.py:94
+#: webapp/backend/releases.py:97
 msgid "Torrent file"
 msgstr "Torrentdatei"
 
-#: webapp/backend/releases.py:95
+#: webapp/backend/releases.py:98
 msgid "Flash image"
 msgstr "Flash-Image"
 
-#: webapp/backend/releases.py:96
+#: webapp/backend/releases.py:99
 msgid "Flash image for devices with serial console"
 msgstr "Flash-Image für Geräte mit serieller Konsole"
 
-#: webapp/backend/releases.py:97
+#: webapp/backend/releases.py:100
 msgid "USB FDD Image"
 msgstr "USB-FDD-Image"
 
-#: webapp/backend/releases.py:98
+#: webapp/backend/releases.py:101
 msgid "USB HDD Image"
 msgstr "USB-HDD-Image"
 
-#: webapp/backend/releases.py:99
+#: webapp/backend/releases.py:102
 msgid "Pregenerated Xen image"
 msgstr "Vorgefertigtes Xen-Image"
 
-#: webapp/backend/releases.py:105 webapp/backend/releases.py:145
+#: webapp/backend/releases.py:103
+msgid "Xen-Image Generator"
+msgstr "Xen-Image-Generator"
+
+#: webapp/backend/releases.py:109 webapp/backend/releases.py:151
 msgid "Unknown image type"
 msgstr "Unbekanntes Imageformat"
 
-#: webapp/backend/releases.py:131
+#: webapp/backend/releases.py:136
 msgid "This image runs on many ARM-based boards"
 msgstr "Dieses Image läuft auf vielen ARM-basierten Boards"
 
-#: webapp/backend/releases.py:132
+#: webapp/backend/releases.py:137
 msgid "This image runs on ARM boards with a serial console"
 msgstr "Dieses Image läuft auf ARM-Boards mit serieller Konsole"
 
-#: webapp/backend/releases.py:133
+#: webapp/backend/releases.py:138
 msgid "Use this image to burn a CD and install IPFire from it."
 msgstr ""
 "Nutze dieses Image um eine CD zu erstellen und IPFire von dieser zu "
 "installieren."
 
-#: webapp/backend/releases.py:134
+#: webapp/backend/releases.py:139
 msgid "Download the CD image from the torrent network."
 msgstr "CD-Image mit aus dem Torrentnetzwerk laden"
 
-#: webapp/backend/releases.py:135
+#: webapp/backend/releases.py:140
 msgid "An image that is meant to run on embedded devices."
 msgstr "Ein Image, das für eingebettete Systeme optimiert ist."
 
-#: webapp/backend/releases.py:136
+#: webapp/backend/releases.py:141
 msgid "Flash image where a serial console is enabled by default."
 msgstr "Image, bei welchem die serielle Konsole eingeschaltet ist."
 
-#: webapp/backend/releases.py:137
+#: webapp/backend/releases.py:142
 msgid "Install IPFire from a floppy-formated USB key."
 msgstr "IPFire von einem Floppy-formatiertem USB-Stick installieren."
 
-#: webapp/backend/releases.py:138
+#: webapp/backend/releases.py:143
 msgid "If the floppy image doesn't work, use this image instead."
 msgstr "Wenn das Floppy-Image nicht funktioniert, dieses verwenden."
 
-#: webapp/backend/releases.py:139
+#: webapp/backend/releases.py:144
 msgid "A ready-to-run image for Xen."
 msgstr "Ein fertiges Image für Xen."
 
+#: webapp/backend/releases.py:145
+msgid "Generator for creating a Xen image."
+msgstr "Generator zum Erstellen einex Xen-Images."
+
 #: webapp/__init__.py:308
 #: /usr/lib/python2.7/site-packages/tornado/locale.py:235
 #: /usr/lib/python3.3/site-packages/tornado/locale.py:235

diff --git a/translations/webapp.pot b/translations/webapp.pot
index 75d6c00be22811a3081b365c9f1b42678cefa15e..fcb41bdc1546f6296aaa65fa54fdffef14a07993 100644 (file)
--- a/translations/webapp.pot
+++ b/translations/webapp.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-05 16:03+0200\n"
+"POT-Creation-Date: 2014-05-09 16:22+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1033,82 +1033,90 @@ msgstr ""
 msgid "Checkout this crowdfunding wish from #ipfire:"
 msgstr ""
 
-#: webapp/backend/releases.py:91
+#: webapp/backend/releases.py:94
 msgid "Image for the armv5tel architecture"
 msgstr ""
 
-#: webapp/backend/releases.py:92
+#: webapp/backend/releases.py:95
 msgid "armv5tel image for boards with serial console"
 msgstr ""
 
-#: webapp/backend/releases.py:93
+#: webapp/backend/releases.py:96
 msgid "Installable CD image"
 msgstr ""
 
-#: webapp/backend/releases.py:94
+#: webapp/backend/releases.py:97
 msgid "Torrent file"
 msgstr ""
 
-#: webapp/backend/releases.py:95
+#: webapp/backend/releases.py:98
 msgid "Flash image"
 msgstr ""
 
-#: webapp/backend/releases.py:96
+#: webapp/backend/releases.py:99
 msgid "Flash image for devices with serial console"
 msgstr ""
 
-#: webapp/backend/releases.py:97
+#: webapp/backend/releases.py:100
 msgid "USB FDD Image"
 msgstr ""
 
-#: webapp/backend/releases.py:98
+#: webapp/backend/releases.py:101
 msgid "USB HDD Image"
 msgstr ""
 
-#: webapp/backend/releases.py:99
+#: webapp/backend/releases.py:102
 msgid "Pregenerated Xen image"
 msgstr ""
 
-#: webapp/backend/releases.py:105 webapp/backend/releases.py:145
+#: webapp/backend/releases.py:103
+msgid "Xen-Image Generator"
+msgstr ""
+
+#: webapp/backend/releases.py:109 webapp/backend/releases.py:151
 msgid "Unknown image type"
 msgstr ""
 
-#: webapp/backend/releases.py:131
+#: webapp/backend/releases.py:136
 msgid "This image runs on many ARM-based boards"
 msgstr ""
 
-#: webapp/backend/releases.py:132
+#: webapp/backend/releases.py:137
 msgid "This image runs on ARM boards with a serial console"
 msgstr ""
 
-#: webapp/backend/releases.py:133
+#: webapp/backend/releases.py:138
 msgid "Use this image to burn a CD and install IPFire from it."
 msgstr ""
 
-#: webapp/backend/releases.py:134
+#: webapp/backend/releases.py:139
 msgid "Download the CD image from the torrent network."
 msgstr ""
 
-#: webapp/backend/releases.py:135
+#: webapp/backend/releases.py:140
 msgid "An image that is meant to run on embedded devices."
 msgstr ""
 
-#: webapp/backend/releases.py:136
+#: webapp/backend/releases.py:141
 msgid "Flash image where a serial console is enabled by default."
 msgstr ""
 
-#: webapp/backend/releases.py:137
+#: webapp/backend/releases.py:142
 msgid "Install IPFire from a floppy-formated USB key."
 msgstr ""
 
-#: webapp/backend/releases.py:138
+#: webapp/backend/releases.py:143
 msgid "If the floppy image doesn't work, use this image instead."
 msgstr ""
 
-#: webapp/backend/releases.py:139
+#: webapp/backend/releases.py:144
 msgid "A ready-to-run image for Xen."
 msgstr ""
 
+#: webapp/backend/releases.py:145
+msgid "Generator for creating a Xen image."
+msgstr ""
+
 #: webapp/__init__.py:308
 #: /usr/lib/python2.7/site-packages/tornado/locale.py:235
 #: /usr/lib/python3.3/site-packages/tornado/locale.py:235

diff --git a/webapp/__init__.py b/webapp/__init__.py
index 3dfdbecf35a13a3f6479755ecf8531ec1f06474b..0c6bd6e6ba8c6284c7e99df91060a45abef19c04 100644 (file)
--- a/webapp/__init__.py
+++ b/webapp/__init__.py
@@ -109,7 +109,7 @@ class Application(tornado.web.Application):
                ])
 
                # downloads.ipfire.org
-               self.add_handlers(r"downloads?\.ipfire\.org", [
+               self.add_handlers(r"downloads?(\.dev)?\.ipfire\.org", [
                        (r"/", DownloadsIndexHandler),
                        (r"/latest", DownloadsLatestHandler),
                        (r"/release/(\d)", DownloadsReleaseHandler),

diff --git a/webapp/backend/releases.py b/webapp/backend/releases.py
index e9b984da925d1ca407641cd3a0df34edc453283c..5da6c62b652eaf474b62cc2488a6ef2c9f089d47 100644 (file)
--- a/webapp/backend/releases.py
+++ b/webapp/backend/releases.py
@@ -51,6 +51,9 @@ class File(Object):
                        return "torrent"
 
                elif "xen" in filename:
+                       if "downloader" in filename:
+                               return "xen-downloader"
+
                        return "xen"
 
                elif "sources" in filename:
@@ -97,6 +100,7 @@ class File(Object):
                        "usbfdd"        : _("USB FDD Image"),
                        "usbhdd"        : _("USB HDD Image"),
                        "xen"           : _("Pregenerated Xen image"),
+                       "xen-downloader": _("Xen-Image Generator"),
                }
 
                try:
@@ -116,6 +120,7 @@ class File(Object):
                        "armv5tel"      : 40,
                        "armv5tel-scon" : 41,
                        "xen"           : 50,
+                       "xen-downloader": 51,
                }
                
                try:
@@ -137,6 +142,7 @@ class File(Object):
                        "usbfdd"        : _("Install IPFire from a floppy-formated USB key."),
                        "usbhdd"        : _("If the floppy image doesn't work, use this image instead."),
                        "xen"           : _("A ready-to-run image for Xen."),
+                       "xen-downloader": _("Generator for creating a Xen image."),
                }
 
                try: