move templates to app dirs, rename .htm to .html, clean up i18n

pyweb/locale/de/LC_MESSAGES/django.po

@@ -0,0 +1,51 @@
+# German translation file for Mumble-Django.
+#
+# Copyright (C) 2009, Michael "Svedrin" Ziegler <diese-addy@funzt-halt.net>
+#
+# Mumble-Django is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This package is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-01-11 14:54+0100\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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+
+#: templates/index.html:33
+msgid "Edit translations"
+msgstr "Übersetzung bearbeiten"
+
+#: templates/index.html:35
+msgid "Imprint"
+msgstr "Impressum"
+
+#: templates/index.html:51
+msgid "Profile"
+msgstr "Profil"
+
+#: templates/registration/profile.html:7
+#, python-format
+msgid "Profile of %(username)s"
+msgstr "Profil von %(username)s"
+
+#: templates/registration/profile.html:12
+msgid "Mumble Accounts"
+msgstr "Mumble-Konten"
+
+#: templates/registration/profile.html:25
+msgid "Account"
+msgstr "Benutzerkonto"

pyweb/mumble/locale/de/LC_MESSAGES/django.po

@@ -371,33 +371,28 @@ msgstr "Online seit"
 
 #: templates/mumble.htm:106
 #, python-format
-msgid "Authenticated:    %(authed)s"
-msgstr "Authentifiziert: %(authed)s"
-
-#: templates/mumble.htm:107
-#, python-format
-msgid "Admin:            %(admin)s"
-msgstr "Administrator:   %(admin)s"
+msgid "Authenticated"
+msgstr "Authentifiziert"
 
 #: templates/mumble.htm:108
 #, python-format
-msgid "Muted:            %(muted)s"
-msgstr "Stummgestellt:   %(muted)s"
+msgid "Muted"
+msgstr "Stummgestellt"
 
 #: templates/mumble.htm:109
 #, python-format
-msgid "Deafened:         %(deafened)s"
-msgstr "Taubgestellt:    %(deafened)s"
+msgid "Deafened"
+msgstr "Taubgestellt"
 
 #: templates/mumble.htm:110
 #, python-format
-msgid "Muted by self:    %(selfmuted)s"
-msgstr "Selbst stummgestellt: %(selfmuted)s"
+msgid "Muted by self"
+msgstr "Selbst stummgestellt"
 
 #: templates/mumble.htm:111
 #, python-format
-msgid "Deafened by self: %(selfdeafened)s"
-msgstr "Selbst taubgestellt: %(selfdeafened)s"
+msgid "Deafened by self"
+msgstr "Selbst taubgestellt"
 
 #: templates/mumble.htm:114
 msgid "User"
@@ -411,10 +406,6 @@ msgstr "Vollständiger Name"
 msgid "Admin"
 msgstr "Administrator"
 
-#: templates/mumble.htm:120
-msgid "Sign-up date"
-msgstr "Datum der Registrierung"
-
 #: templates/mumble.htm:130
 msgid "Channel"
 msgstr "Kanal"

pyweb/mumble/locale/hr/LC_MESSAGES/django.po

@@ -17,11 +17,12 @@ msgstr ""
 "Project-Id-Version: Mumble-Django v0.8\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-11-14 13:57+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Vid Marić <vid_maric@yahoo.com>\n"
+"PO-Revision-Date: 2010-01-11 14:11\n"
+"Last-Translator: <de@de.de>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Translated-Using: django-rosetta 0.5.1\n"
 
 #: admin.py:30
 msgid "Registered users"
@@ -56,12 +57,8 @@ msgid "Server Password"
 msgstr "Lozinka servera"
 
 #: forms.py:76
-msgid ""
-"This server is private and protected mode is active. Please enter the server "
-"password."
-msgstr ""
-"Ovo je privatan server i potrebna vam je lozinka za pristup. Molimo vas "
-"unesite lozinku."
+msgid "This server is private and protected mode is active. Please enter the server password."
+msgstr "Ovo je privatan server i potrebna vam je lozinka za pristup. Molimo vas unesite lozinku."
 
 #: forms.py:84 forms.py:130
 msgid "The password you entered is incorrect."
@@ -72,9 +69,7 @@ msgid "Link account"
 msgstr "Povezani račun"
 
 #: forms.py:100
-msgid ""
-"The account already exists and belongs to me, just link it instead of "
-"creating."
+msgid "The account already exists and belongs to me, just link it instead of creating."
 msgstr "Ovaj račun već postoji. Povežite ga umjesto da radite novi račun."
 
 #: forms.py:112
@@ -98,12 +93,8 @@ msgid "DBus or ICE base"
 msgstr "DBus ili ICE"
 
 #: models.py:45
-msgid ""
-"Examples: 'net.sourceforge.mumble.murmur' for DBus or 'Meta:tcp -h 127.0.0.1 "
-"-p 6502' for Ice."
-msgstr ""
-"Primjeri: 'net.sourceforge.mumble.murmur' za DBus ili 'Meta:tcp -h 127.0.0.1 "
-"-p 6502' za Ice."
+msgid "Examples: 'net.sourceforge.mumble.murmur' for DBus or 'Meta:tcp -h 127.0.0.1 -p 6502' for Ice."
+msgstr "Primjeri: 'net.sourceforge.mumble.murmur' za DBus ili 'Meta:tcp -h 127.0.0.1 -p 6502' za Ice."
 
 #: models.py:46
 msgid "Server ID"
@@ -114,12 +105,8 @@ msgid "Server Address"
 msgstr "Adresa servera"
 
 #: models.py:47
-msgid ""
-"Hostname or IP address to bind to. You should use a hostname here, because "
-"it will appear on the global server list."
-msgstr ""
-"Ime poslužitelja (hostname) ili IP adresa adresa za spajanje. Koristite ime "
-"poslužitelja ovdje zato što će se pojaviti na globalnoj listi servera."
+msgid "Hostname or IP address to bind to. You should use a hostname here, because it will appear on the global server list."
+msgstr "Ime poslužitelja (hostname) ili IP adresa adresa za spajanje. Koristite ime poslužitelja ovdje zato što će se pojaviti na globalnoj listi servera."
 
 #: models.py:48
 msgid "Server Port"
@@ -139,8 +126,7 @@ msgstr "Poruka dobrodošlice"
 
 #: models.py:51
 msgid "Password required to join. Leave empty for public servers."
-msgstr ""
-"Lozinka za pristup serveru. Ostaviti prazno ako se spajate na javni server."
+msgstr "Lozinka za pristup serveru. Ostaviti prazno ako se spajate na javni server."
 
 #: models.py:52
 msgid "Superuser Password"
@@ -183,12 +169,8 @@ msgid "Default channel"
 msgstr "Početni kanal"
 
 #: models.py:60
-msgid ""
-"Enter the ID of the default channel here. The Channel viewer displays the ID "
-"to server admins on the channel detail page."
-msgstr ""
-"Unesite ID početnog kanala. Prikaz kanala pokazuje ID administratorima "
-"servera na stranici s detaljima kanala."
+msgid "Enter the ID of the default channel here. The Channel viewer displays the ID to server admins on the channel detail page."
+msgstr "Unesite ID početnog kanala. Prikaz kanala pokazuje ID administratorima servera na stranici s detaljima kanala."
 
 #: models.py:61
 msgid "Boot Server"
@@ -204,9 +186,7 @@ msgstr "Instance servera"
 
 #: models.py:121
 #, python-format
-msgid ""
-"Port number %(portno)d is not within the allowed range %(minrange)d - %"
-"(maxrange)d"
+msgid "Port number %(portno)d is not within the allowed range %(minrange)d - %(maxrange)d"
 msgstr "Port %(portno)d nije u dozvoljenom opsegu %(minrange)d - %(maxrange)d"
 
 #: models.py:378
@@ -254,19 +234,15 @@ msgstr "Ovo polje ne smije biti ažurirano nakon što je zapis spremljen."
 msgid ""
 "\n"
 "      <b>Hint:</b><br />\n"
-"      This area is used to display additional information for each channel "
-"and player, but requires JavaScript to be\n"
-"      displayed correctly. You will not see the detail pages, but you can "
-"use all links and forms\n"
+"      This area is used to display additional information for each channel and player, but requires JavaScript to be\n"
+"      displayed correctly. You will not see the detail pages, but you can use all links and forms\n"
 "      that are displayed.\n"
 "      "
 msgstr ""
 "\n"
 "      <b>Savjet:</b><br />\n"
-"      Ovdje se prikazuju dodatne informacije za svaki kanali svakog igrača "
-"te zahtjeva JavaScript kako bi\n"
-"      se informacije pravilno prikazale. Nećete vidjeti stranicu s "
-"detaljima, ali možete koristiti sve linkove i forme.\n"
+"      Ovdje se prikazuju dodatne informacije za svaki kanali svakog igrača te zahtjeva JavaScript kako bi\n"
+"      se informacije pravilno prikazale. Nećete vidjeti stranicu s detaljima, ali možete koristiti sve linkove i forme.\n"
 "      "
 
 #: templates/mumble.htm:26
@@ -297,13 +273,11 @@ msgstr "Nemate račun na ovom serveru"
 #, python-format
 msgid ""
 "\n"
-"      <p>You need to be <a href=\"%(login_url)s\">logged in</a> to be able "
-"to register an account on this Mumble server.</p>\n"
+"      <p>You need to be <a href=\"%(login_url)s\">logged in</a> to be able to register an account on this Mumble server.</p>\n"
 "    "
 msgstr ""
 "\n"
-"      <p>Morate biti <a href=\"%(login_url)s\">prijavljeni (ulogirani)</a> "
-"kako bi ste napravili račun na ovom Mumble serveru.</p>\n"
+"      <p>Morate biti <a href=\"%(login_url)s\">prijavljeni (ulogirani)</a> kako bi ste napravili račun na ovom Mumble serveru.</p>\n"
 "    "
 
 #: templates/mumble.htm:59 templates/mumble.htm.py:124
@@ -312,16 +286,13 @@ msgid "User Texture"
 msgstr "Korisnička slika"
 
 #: templates/mumble.htm:61
-#, fuzzy
 msgid ""
 "\n"
-"          You can upload an image that you would like to use as your user "
-"texture here.\n"
+"          You can upload an image that you would like to use as your user texture here.\n"
 "        "
 msgstr ""
 "\n"
-"          Možete postaviti sliku za koju bi htjeli da zamjeni vašekorisničko "
-"ime u Mumble transparentu (overlay).\n"
+"          Možete postaviti sliku za koju bi htjeli da zamjeni vašekorisničko ime u Mumble transparentu (overlay).\n"
 "        "
 
 #: templates/mumble.htm:66
@@ -335,14 +306,12 @@ msgstr ""
 #: templates/mumble.htm:72
 msgid ""
 "\n"
-"          Hint: The texture image <b>needs</b> to be 600x60 in size. If you "
-"upload an image with\n"
+"          Hint: The texture image <b>needs</b> to be 600x60 in size. If you upload an image with\n"
 "          a different size, it will be resized accordingly.<br />\n"
 "        "
 msgstr ""
 "\n"
-"          Savjet: Slika <b>mora</b> biti veličine 600x60. Ako odaberete "
-"sliku drugačije veličine, veličina će biti promjenjena u 600x60.<br />\n"
+"          Savjet: Slika <b>mora</b> biti veličine 600x60. Ako odaberete sliku drugačije veličine, veličina će biti promjenjena u 600x60.<br />\n"
 "        "
 
 #: templates/mumble.htm:89
@@ -359,33 +328,28 @@ msgstr "Na serveru od"
 
 #: templates/mumble.htm:106
 #, python-format
-msgid "Authenticated:    %(authed)s"
-msgstr "Registriran korisnik: %(authed)s"
-
-#: templates/mumble.htm:107
-#, python-format
-msgid "Admin:            %(admin)s"
-msgstr "Administrator:   %(admin)s"
+msgid "Authenticated"
+msgstr "Registriran korisnik"
 
 #: templates/mumble.htm:108
 #, python-format
-msgid "Muted:            %(muted)s"
-msgstr "Utišan mikrofon:   %(muted)s"
+msgid "Muted"
+msgstr "Utišan mikrofon"
 
 #: templates/mumble.htm:109
 #, python-format
-msgid "Deafened:         %(deafened)s"
-msgstr "Utišani zvučnici / slušalice:    %(deafened)s"
+msgid "Deafened"
+msgstr "Utišani zvučnici / slušalice"
 
 #: templates/mumble.htm:110
 #, python-format
-msgid "Muted by self:    %(selfmuted)s"
-msgstr "Samo-utišan mikrofon: %(selfmuted)s"
+msgid "Muted by self"
+msgstr "Samo-utišan mikrofon"
 
 #: templates/mumble.htm:111
 #, python-format
-msgid "Deafened by self: %(selfdeafened)s"
-msgstr "Samo-utišani zvučnici / slušalice: %(selfdeafened)s"
+msgid "Deafened by self"
+msgstr "Samo-utišani zvučnici / slušalice"
 
 #: templates/mumble.htm:114
 msgid "User"

pyweb/mumble/locale/it/LC_MESSAGES/django.po

@@ -354,33 +354,28 @@ msgstr "Online da"
 
 #: templates/mumble.htm:106
 #, python-format
-msgid "Authenticated:    %(authed)s"
-msgstr "Authenticated:    %(authed)s"
-
-#: templates/mumble.htm:107
-#, python-format
-msgid "Admin:            %(admin)s"
-msgstr "Amministratore:   %(admin)s"
+msgid "Authenticated"
+msgstr "Authenticated"
 
 #: templates/mumble.htm:108
 #, python-format
-msgid "Muted:            %(muted)s"
-msgstr "Muto:   %(muted)s"
+msgid "Muted"
+msgstr "Muto"
 
 #: templates/mumble.htm:109
 #, python-format
-msgid "Deafened:         %(deafened)s"
-msgstr "Sordo:    %(deafened)s"
+msgid "Deafened"
+msgstr "Sordo"
 
 #: templates/mumble.htm:110
 #, python-format
-msgid "Muted by self:    %(selfmuted)s"
-msgstr "Mutato solo: %(selfmuted)s"
+msgid "Muted by self"
+msgstr "Mutato solo"
 
 #: templates/mumble.htm:111
 #, python-format
-msgid "Deafened by self: %(selfdeafened)s"
-msgstr "Rintronarsi: %(selfdeafened)s"
+msgid "Deafened by self"
+msgstr "Rintronarsi"
 
 #: templates/mumble.htm:114
 msgid "User"

pyweb/mumble/locale/ja/LC_MESSAGES/django.po

@@ -363,33 +363,28 @@ msgstr "接続開始時間"
 
 #: templates/mumble.htm:106
 #, python-format
-msgid "Authenticated:    %(authed)s"
-msgstr "登録済み: %(authed)s"
-
-#: templates/mumble.htm:107
-#, python-format
-msgid "Admin:            %(admin)s"
-msgstr "管理者:   %(admin)s"
+msgid "Authenticated"
+msgstr "登録済み"
 
 #: templates/mumble.htm:108
 #, python-format
-msgid "Muted:            %(muted)s"
-msgstr "発言禁止:   %(muted)s"
+msgid "Muted"
+msgstr "発言禁止"
 
 #: templates/mumble.htm:109
 #, python-format
-msgid "Deafened:         %(deafened)s"
-msgstr "聴取禁止:    %(deafened)s"
+msgid "Deafened"
+msgstr "聴取禁止"
 
 #: templates/mumble.htm:110
 #, python-format
-msgid "Muted by self:    %(selfmuted)s"
-msgstr "自分で発言禁止: %(selfmuted)s"
+msgid "Muted by self"
+msgstr "自分で発言禁止"
 
 #: templates/mumble.htm:111
 #, python-format
-msgid "Deafened by self: %(selfdeafened)s"
-msgstr "自分で聴取禁止: %(selfdeafened)s"
+msgid "Deafened by self"
+msgstr "自分で聴取禁止"
 
 #: templates/mumble.htm:114
 msgid "User"

pyweb/mumble/locale/pl/LC_MESSAGES/django.po

@@ -354,33 +354,28 @@ msgstr "Czas online"
 
 #: templates/mumble.htm:106
 #, python-format
-msgid "Authenticated:    %(authed)s"
-msgstr "Zarejestrowany: %(authed)s"
-
-#: templates/mumble.htm:107
-#, python-format
-msgid "Admin:            %(admin)s"
-msgstr "Administrator:   %(admin)s"
+msgid "Authenticated"
+msgstr "Zarejestrowany"
 
 #: templates/mumble.htm:108
 #, python-format
-msgid "Muted:            %(muted)s"
-msgstr "Wyciszony mikrofon:   %(muted)s"
+msgid "Muted"
+msgstr "Wyciszony mikrofon"
 
 #: templates/mumble.htm:109
 #, python-format
-msgid "Deafened:         %(deafened)s"
-msgstr "Wyciszone słuchawki:    %(deafened)s"
+msgid "Deafened"
+msgstr "Wyciszone słuchawki"
 
 #: templates/mumble.htm:110
 #, python-format
-msgid "Muted by self:    %(selfmuted)s"
-msgstr "Wyciszył mikrofon: %(selfmuted)s"
+msgid "Muted by self"
+msgstr "Wyciszył mikrofon"
 
 #: templates/mumble.htm:111
 #, python-format
-msgid "Deafened by self: %(selfdeafened)s"
-msgstr "Wyciszył słuchawki: %(selfdeafened)s"
+msgid "Deafened by self"
+msgstr "Wyciszył słuchawki"
 
 #: templates/mumble.htm:114
 msgid "User"

template/mumble/list.htm → pyweb/mumble/templates/mumble/list.html

@@ -1,4 +1,4 @@
-{% extends "index.htm" %}
+{% extends "index.html" %}
 {% load mumble_extras %}
 {% block Headline %}
 Configured Mumble Servers

template/mumble/mobile_list.htm → pyweb/mumble/templates/mumble/mobile_list.html

@@ -1,4 +1,4 @@
-{% extends "mobile_index.htm" %}
+{% extends "mobile_index.html" %}
 {% load mumble_extras %}
 {% block Headline %}
 Configured Mumble Servers

template/mumble/mobile_mumble.htm → pyweb/mumble/templates/mumble/mobile_mumble.html

@@ -1,4 +1,4 @@
-{% extends "mobile_index.htm" %}
+{% extends "mobile_index.html" %}
 {% load mumble_extras %}
 {% load i18n %}
 {% block Headline %}

template/mumble/mumble.htm → pyweb/mumble/templates/mumble/mumble.html

@@ -1,4 +1,4 @@
-{% extends "index.htm" %}
+{% extends "index.html" %}
 {% load mumble_extras %}
 {% load i18n %}
 {% block Headline %}
@@ -102,13 +102,13 @@
     <div id="mumble_{{ item.id }}" class="mumble-ext x-hide-display">
       <h2>{% trans "Player" %} {{ item.name }}</h2>
       <ul>
-        <li>{% trans "Online since" %}   {{ item.onlinesince|time }}</li>
-        <li>{% blocktrans with     item.isAuthed|yesno as authed       %}Authenticated:    {{ authed       }}{% endblocktrans %}</li>
-        <li>{% blocktrans with      item.isAdmin|yesno as admin        %}Admin:            {{ admin        }}{% endblocktrans %}</li>
-        <li>{% blocktrans with         item.mute|yesno as muted        %}Muted:            {{ muted        }}{% endblocktrans %}</li>
-        <li>{% blocktrans with         item.deaf|yesno as deafened     %}Deafened:         {{ deafened     }}{% endblocktrans %}</li>
-        <li>{% blocktrans with     item.selfMute|yesno as selfmuted    %}Muted by self:    {{ selfmuted    }}{% endblocktrans %}</li>
-        <li>{% blocktrans with     item.selfDeaf|yesno as selfdeafened %}Deafened by self: {{ selfdeafened }}{% endblocktrans %}</li>
+        <li>{% trans "Online since"     %}: {{ item.onlinesince|time }}</li>
+        <li>{% trans "Authenticated"    %}: {{ item.isAuthed|yesno   }}</li>
+        <li>{% trans "Admin"            %}: {{  item.isAdmin|yesno   }}</li>
+        <li>{% trans "Muted"            %}: {{     item.mute|yesno   }}</li>
+        <li>{% trans "Deafened"         %}: {{     item.deaf|yesno   }}</li>
+        <li>{% trans "Muted by self"    %}: {{ item.selfMute|yesno   }}</li>
+        <li>{% trans "Deafened by self" %}: {{ item.selfDeaf|yesno   }}</li>
       </ul>
       {% if item.mumbleuser and item.mumbleuser.owner %}
         <h2>{% trans "User" %} {{ item.mumbleuser.owner.username|capfirst }}</h2>

template/mumble/player.htm → pyweb/mumble/templates/mumble/player.html

@@ -1,23 +1,24 @@
 {% load mumble_extras %}
+{% load i18n %}
 <div class="mumble" style="background-image: url( {{ MEDIA_URL }}/mumble/linie_v.png )">
   <span class="mumble">
     {% if Player.isAuthed %}
-    <img src="{{ MEDIA_URL }}/mumble/authenticated.png" alt="authed" title="Authenticated" />
+    <img src="{{ MEDIA_URL }}/mumble/authenticated.png" alt="authed" title="{% trans "Authenticated" %}" />
     {% endif %}
     {% if Player.mute or Player.suppress %}
-      <img src="{{ MEDIA_URL }}/mumble/muted_server.png" alt="muted" title="Muted by server" />
+      <img src="{{ MEDIA_URL }}/mumble/muted_server.png" alt="muted" title="{% trans "Muted" %}" />
     {% endif %}
     {% if Player.deaf %}
-      <img src="{{ MEDIA_URL }}/mumble/deafened_server.png" alt="deafened" title="Deafened by server" />
+      <img src="{{ MEDIA_URL }}/mumble/deafened_server.png" alt="deafened" title="{% trans "Deafened" %}" />
     {% endif %}
     {% if Player.selfMute %}
-      <img src="{{ MEDIA_URL }}/mumble/muted_self.png" alt="self-muted" title="Muted by themselves" />
+      <img src="{{ MEDIA_URL }}/mumble/muted_self.png" alt="self-muted" title="{% trans "Muted by self" %}" />
     {% endif %}
     {% if Player.selfDeaf %}
-      <img src="{{ MEDIA_URL }}/mumble/deafened_self.png" alt="self-deafened" title="Deafened by themselves" />
+      <img src="{{ MEDIA_URL }}/mumble/deafened_self.png" alt="self-deafened" title="{% trans "Deafened by self" %}" />
     {% endif %}
     {% if Player.hasComment %}
-      <img src="{{ MEDIA_URL }}/mumble/comment.png" alt="has comment" title="has a User Comment set" />
+      <img src="{{ MEDIA_URL }}/mumble/comment.png" alt="has comment" title="{% trans "has a User Comment set" %}" />
     {% endif %}
   </span>
   <span>

pyweb/mumble/templatetags/mumble_extras.py

@@ -34,11 +34,11 @@ register.filter( 'trunc', trunc );
 ### FILTER: chanview -- renders an mmChannel / mmPlayer object with the correct template.
 def chanview( obj, user = None ):
 	if obj.is_server:
-		return render_to_string( 'mumble/server.htm',  { 'Server':  obj, 'MumbleAccount': user, 'MEDIA_URL': settings.MEDIA_URL } );
+		return render_to_string( 'mumble/server.html',  { 'Server':  obj, 'MumbleAccount': user, 'MEDIA_URL': settings.MEDIA_URL } );
 	elif obj.is_channel:
-		return render_to_string( 'mumble/channel.htm', { 'Channel': obj, 'MumbleAccount': user, 'MEDIA_URL': settings.MEDIA_URL } );
+		return render_to_string( 'mumble/channel.html', { 'Channel': obj, 'MumbleAccount': user, 'MEDIA_URL': settings.MEDIA_URL } );
 	elif obj.is_player:
-		return render_to_string( 'mumble/player.htm',  { 'Player':  obj, 'MumbleAccount': user, 'MEDIA_URL': settings.MEDIA_URL } );
+		return render_to_string( 'mumble/player.html',  { 'Player':  obj, 'MumbleAccount': user, 'MEDIA_URL': settings.MEDIA_URL } );
 
 register.filter( 'chanview', chanview );
 

pyweb/mumble/views.py

@@ -67,7 +67,7 @@ def mumbles( request ):
 		return HttpResponseRedirect( reverse( show, kwargs={ 'server': mumbles[0].id, } ) );
 	
 	return render_to_response(
-		'mumble/list.htm',
+		'mumble/list.html',
 		{ 'MumbleObjects': mumbles,
 		  'MumbleActive':  True,
 		  'MEDIA_URL':     settings.MEDIA_URL,
@@ -83,7 +83,7 @@ def mobile_mumbles( request ):
 		return HttpResponseRedirect( reverse( mobile_show, kwargs={ 'server': mumbles[0].id, } ) );
 	
 	return render_to_response(
-		'mumble/mobile_list.htm',
+		'mumble/mobile_list.html',
 		{ 'MumbleObjects': mumbles,
 		  'MumbleActive':  True,
 		  'MEDIA_URL':     settings.MEDIA_URL,
@@ -189,7 +189,7 @@ def show( request, server ):
 	login_url = reverse( auth_views.login );
 	
 	return render_to_response(
-		'mumble/mumble.htm',
+		'mumble/mumble.html',
 		{
 			'MEDIA_URL':    settings.MEDIA_URL,
 			'login_url':    "%s?next=%s" % ( login_url, show_url ),
@@ -220,7 +220,7 @@ def mobile_show( request, server ):
 			pass;
 	
 	return render_to_response(
-		'mumble/mobile_mumble.htm',
+		'mumble/mobile_mumble.html',
 		{
 			'MEDIA_URL':    settings.MEDIA_URL,
 			'DBaseObject':  srv,

pyweb/settings.py

@@ -175,7 +175,7 @@ TEMPLATE_DIRS = (
 	# Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
 	# Always use forward slashes, even on Windows.
 	# Don't forget to use absolute paths, not relative paths.
-	join( MUMBLE_DJANGO_ROOT, 'template' ),
+	join( MUMBLE_DJANGO_ROOT, 'pyweb', 'templates' ),
 )
 
 TEST_RUNNER = 'mumble.testrunner.run_tests'

template/index.htm → pyweb/templates/index.html

@@ -1,3 +1,4 @@
+{% load i18n %}
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
@@ -23,19 +24,22 @@
       <div id="headpanel">
         <div id="headlinks">
           {% if user.is_authenticated %}
-            <a href="{% url django.contrib.auth.views.logout %}">Logout</a> |
+            <a href="{% url django.contrib.auth.views.logout %}">{% trans "Log out" %}</a> |
           {% else %}
-            <a href="{% url django.contrib.auth.views.login %}">Login</a> |
+            <a href="{% url django.contrib.auth.views.login %}">{% trans "Log in" %}</a> |
           {% endif %}
-          <a href="{% url admin:index %}" target="_blank">Admin</a> |
-          <a href="{% url views.imprint %}">Imprint</a>
+          {% if user.is_staff %}
+            <a href="{% url admin:index %}" target="_blank">{% trans "Administration" %}</a> |
+            <a href="{% url rosetta.views.home %}" target="_blank">{% trans "Edit translations" %}</a> |
+          {% endif %}
+          <a href="{% url views.imprint %}">{% trans "Imprint" %}</a>
         </div>
         <h2>{% block Headline %}{% endblock %}</h2>
       </div>
       <!-- navi -->
       <div id="navipanel">
         <ul id="navilinks">
-          <li><a href="{% url mumble.views.redir %}">Home</a></li>
+          <li><a href="{% url mumble.views.redir %}">{% trans "Home" %}</a></li>
           {% if MumbleActive %}
             <li><b>Mumble</b></li>
           {% else %}
@@ -44,7 +48,7 @@
           {% if ProfileActive %}
             <li><b>Profile</b></li>
           {% else %}
-            <li><a href="{% url views.profile %}">Profile</a></li>
+            <li><a href="{% url views.profile %}">{% trans "Profile" %}</a></li>
           {% endif %}
         </ul>
       </div>

template/registration/activate.html → pyweb/templates/registration/activate.html

@@ -1,4 +1,4 @@
-{% extends "index.htm" %}
+{% extends "index.html" %}
 {% load i18n %}
 
 {% block Headline %}Account activation{% endblock %}

template/registration/imprint.html → pyweb/templates/registration/imprint.html

@@ -1,8 +1,9 @@
-{% extends "index.htm" %}
+{% extends "index.html" %}
 {% load mumble_extras %}
-{% block Headline %}
-  Imprint
-{% endblock %}
+{% load i18n %}
+
+{% block Headline %}{% trans "Imprint" %}{% endblock %}
+
 {% block Content %}
 <div class="rahmen">
   <p>

template/registration/login.html → pyweb/templates/registration/login.html

@@ -1,4 +1,4 @@
-{% extends "index.htm" %}
+{% extends "index.html" %}
 {% load i18n %}
 
 {% block Headline %}Login{% endblock %}

template/registration/logout.html → pyweb/templates/registration/logout.html

@@ -1,4 +1,4 @@
-{% extends "index.htm" %}
+{% extends "index.html" %}
 {% load i18n %}
 
 {% block Headline %}Logged out{% endblock %}

pyweb/templates/registration/profile.html

@@ -0,0 +1,37 @@
+{% extends "index.html" %}
+{% load i18n %}
+
+{% block Headline %}{% trans "Profile" %}{% endblock %}
+
+{% block Content %}
+<h2 class="profile">{% blocktrans with user|capfirst as username %}Profile of {{username}}{% endblocktrans %}</h2>
+<div class="profile">
+  <h4>Statistics</h4>
+  <ul>
+    {% if mumbleaccs %}
+      <li>{% trans "Mumble Accounts" %}:
+        <ul>
+        {% for mm in mumbleaccs %}
+          <li>
+            {{ mm.name }} on Server <a href="{% url mumble.views.show mm.server.id %}">{{ mm.server.name }}</a>
+          </li>
+        {% endfor %}
+        </ul>
+      </li>
+    {% endif %}
+  </ul>
+</div>
+<div class="profile">
+  <h4>{% trans "Account" %}</h4>
+  <ul>
+    <li>{% trans "Full Name" %}: {{ user.first_name }} {{ user.last_name }}</li>
+    <li>{% trans "e-mail address" %}: {{ user.email }}</li>
+    <li>{% trans "staff status" %}: {{ user.is_staff|yesno }}</li>
+    <li>{% trans "date joined" %}: {{ user.date_joined|date }} {{ user.date_joined|time }}</li>
+    <li>{% trans "last login" %}: {{ user.last_login|date }} {{ user.last_login|time }}</li>
+    <li><a href="{% url django.contrib.auth.views.password_change %}">{% trans "Change password" %}</a></li>
+    <li><a href="{% url django.contrib.auth.views.logout %}">{% trans "Log out" %}</a></li>
+  </ul>
+</div>
+{% endblock %}
+

template/registration/registration_complete.html → pyweb/templates/registration/registration_complete.html

@@ -1,4 +1,4 @@
-{% extends "index.htm" %}
+{% extends "index.html" %}
 {% load i18n %}
 
 {% block Headline %}Registration complete{% endblock %}

template/registration/registration_form.html → pyweb/templates/registration/registration_form.html

@@ -1,4 +1,4 @@
-{% extends "index.htm" %}
+{% extends "index.html" %}
 {% load i18n %}
 
 {% block Headline %}Create Account{% endblock %}

pyweb/urls.py

@@ -40,6 +40,11 @@ urlpatterns = patterns('',
 	(r'^admin/',            admin.site.urls),
 )
 
+if "rosetta" in settings.INSTALLED_APPS:
+	urlpatterns += patterns( '',
+		( r'rosetta/', include( 'rosetta.urls' ) )
+	)
+
 # Development stuff
 if settings.DEBUG:
 	urlpatterns += patterns('',

template/registration/profile.html

@@ -1,37 +0,0 @@
-{% extends "index.htm" %}
-{% load i18n %}
-
-{% block Headline %}Profile{% endblock %}
-
-{% block Content %}
-<h2 class="profile">Profile of {{user|capfirst}}</h2>
-<div class="profile">
-  <h4>Statistics</h4>
-  <ul>
-    {% if mumbleaccs %}
-      <li>Mumble Accounts:
-        <ul>
-        {% for mm in mumbleaccs %}
-          <li>
-            {{ mm.name }} on Server <a href="{% url mumble.views.show mm.server.id %}">{{ mm.server.name }}</a>
-          </li>
-        {% endfor %}
-        </ul>
-      </li>
-    {% endif %}
-  </ul>
-</div>
-<div class="profile">
-  <h4>Account</h4>
-  <ul>
-    <li>Full Name: {{ user.first_name }} {{ user.last_name }}</li>
-    <li>E-Mail Adress: {{ user.email }}</li>
-    <li>Staff: {% if user.is_staff %} yes <a href="{% url admin:index %}">(admin area)</a> {% else %} no {% endif %}</li>
-    <li>Sign-up date: {{ user.date_joined|date }} {{ user.date_joined|time }}</li>
-    <li>Last login: {{ user.last_login|date }} {{ user.last_login|time }}</li>
-    <li><a href="{% url django.contrib.auth.views.password_change %}">Change Password</a></li>
-    <li><a href="{% url django.contrib.auth.views.logout %}">Logout</a></li>
-  </ul>
-</div>
-{% endblock %}
-