diff --git a/pyweb/locale/de/LC_MESSAGES/django.mo b/pyweb/locale/de/LC_MESSAGES/django.mo new file mode 100644 index 0000000..2370d71 Binary files /dev/null and b/pyweb/locale/de/LC_MESSAGES/django.mo differ diff --git a/pyweb/locale/de/LC_MESSAGES/django.po b/pyweb/locale/de/LC_MESSAGES/django.po new file mode 100644 index 0000000..cb73afb --- /dev/null +++ b/pyweb/locale/de/LC_MESSAGES/django.po @@ -0,0 +1,51 @@ +# German translation file for Mumble-Django. +# +# Copyright (C) 2009, Michael "Svedrin" Ziegler +# +# 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 \n" +"Language-Team: LANGUAGE \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" diff --git a/pyweb/mumble/locale/de/LC_MESSAGES/django.mo b/pyweb/mumble/locale/de/LC_MESSAGES/django.mo index 4207b1d..ed02779 100644 Binary files a/pyweb/mumble/locale/de/LC_MESSAGES/django.mo and b/pyweb/mumble/locale/de/LC_MESSAGES/django.mo differ diff --git a/pyweb/mumble/locale/de/LC_MESSAGES/django.po b/pyweb/mumble/locale/de/LC_MESSAGES/django.po index 0fbf247..ba7262a 100644 --- a/pyweb/mumble/locale/de/LC_MESSAGES/django.po +++ b/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" diff --git a/pyweb/mumble/locale/hr/LC_MESSAGES/django.mo b/pyweb/mumble/locale/hr/LC_MESSAGES/django.mo index b2b02de..43b0d6d 100644 Binary files a/pyweb/mumble/locale/hr/LC_MESSAGES/django.mo and b/pyweb/mumble/locale/hr/LC_MESSAGES/django.mo differ diff --git a/pyweb/mumble/locale/hr/LC_MESSAGES/django.po b/pyweb/mumble/locale/hr/LC_MESSAGES/django.po index b939323..dd708a7 100644 --- a/pyweb/mumble/locale/hr/LC_MESSAGES/django.po +++ b/pyweb/mumble/locale/hr/LC_MESSAGES/django.po @@ -1,27 +1,28 @@ # Croatian translation file for Mumble-Django. -# +# # Copyright (C) 2009, Vid "Night" Marić -# +# # 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: 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ć \n" +"PO-Revision-Date: 2010-01-11 14:11\n" +"Last-Translator: \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" " Hint:
\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" " Savjet:
\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" -"

You need to be logged in to be able " -"to register an account on this Mumble server.

\n" +"

You need to be logged in to be able to register an account on this Mumble server.

\n" " " msgstr "" "\n" -"

Morate biti prijavljeni (ulogirani) " -"kako bi ste napravili račun na ovom Mumble serveru.

\n" +"

Morate biti prijavljeni (ulogirani) kako bi ste napravili račun na ovom Mumble serveru.

\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 needs to be 600x60 in size. If you " -"upload an image with\n" +" Hint: The texture image needs to be 600x60 in size. If you upload an image with\n" " a different size, it will be resized accordingly.
\n" " " msgstr "" "\n" -" Savjet: Slika mora biti veličine 600x60. Ako odaberete " -"sliku drugačije veličine, veličina će biti promjenjena u 600x60.
\n" +" Savjet: Slika mora biti veličine 600x60. Ako odaberete sliku drugačije veličine, veličina će biti promjenjena u 600x60.
\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" diff --git a/pyweb/mumble/locale/it/LC_MESSAGES/django.mo b/pyweb/mumble/locale/it/LC_MESSAGES/django.mo index 21caf78..51ad7ad 100644 Binary files a/pyweb/mumble/locale/it/LC_MESSAGES/django.mo and b/pyweb/mumble/locale/it/LC_MESSAGES/django.mo differ diff --git a/pyweb/mumble/locale/it/LC_MESSAGES/django.po b/pyweb/mumble/locale/it/LC_MESSAGES/django.po index 0e5a029..be978c4 100644 --- a/pyweb/mumble/locale/it/LC_MESSAGES/django.po +++ b/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" diff --git a/pyweb/mumble/locale/ja/LC_MESSAGES/django.mo b/pyweb/mumble/locale/ja/LC_MESSAGES/django.mo index 556f84d..facc1bc 100644 Binary files a/pyweb/mumble/locale/ja/LC_MESSAGES/django.mo and b/pyweb/mumble/locale/ja/LC_MESSAGES/django.mo differ diff --git a/pyweb/mumble/locale/ja/LC_MESSAGES/django.po b/pyweb/mumble/locale/ja/LC_MESSAGES/django.po index afe7da3..75caada 100644 --- a/pyweb/mumble/locale/ja/LC_MESSAGES/django.po +++ b/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" diff --git a/pyweb/mumble/locale/pl/LC_MESSAGES/django.mo b/pyweb/mumble/locale/pl/LC_MESSAGES/django.mo index b0b010e..948c26d 100644 Binary files a/pyweb/mumble/locale/pl/LC_MESSAGES/django.mo and b/pyweb/mumble/locale/pl/LC_MESSAGES/django.mo differ diff --git a/pyweb/mumble/locale/pl/LC_MESSAGES/django.po b/pyweb/mumble/locale/pl/LC_MESSAGES/django.po index 7ac05ef..1659944 100644 --- a/pyweb/mumble/locale/pl/LC_MESSAGES/django.po +++ b/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" diff --git a/template/mumble/channel.htm b/pyweb/mumble/templates/mumble/channel.html similarity index 100% rename from template/mumble/channel.htm rename to pyweb/mumble/templates/mumble/channel.html diff --git a/template/mumble/list.htm b/pyweb/mumble/templates/mumble/list.html similarity index 87% rename from template/mumble/list.htm rename to pyweb/mumble/templates/mumble/list.html index eb548fa..66257c4 100644 --- a/template/mumble/list.htm +++ b/pyweb/mumble/templates/mumble/list.html @@ -1,4 +1,4 @@ -{% extends "index.htm" %} +{% extends "index.html" %} {% load mumble_extras %} {% block Headline %} Configured Mumble Servers @@ -11,4 +11,4 @@ Configured Mumble Servers {% endfor %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/template/mumble/mobile_list.htm b/pyweb/mumble/templates/mumble/mobile_list.html similarity index 90% rename from template/mumble/mobile_list.htm rename to pyweb/mumble/templates/mumble/mobile_list.html index ef795e1..fee1094 100644 --- a/template/mumble/mobile_list.htm +++ b/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 diff --git a/template/mumble/mobile_mumble.htm b/pyweb/mumble/templates/mumble/mobile_mumble.html similarity index 84% rename from template/mumble/mobile_mumble.htm rename to pyweb/mumble/templates/mumble/mobile_mumble.html index 3bcdaf1..cc3981d 100644 --- a/template/mumble/mobile_mumble.htm +++ b/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 %} diff --git a/template/mumble/mumble.htm b/pyweb/mumble/templates/mumble/mumble.html similarity index 92% rename from template/mumble/mumble.htm rename to pyweb/mumble/templates/mumble/mumble.html index fd71067..504ebe0 100644 --- a/template/mumble/mumble.htm +++ b/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 @@

{% trans "Player" %} {{ item.name }}

    -
  • {% trans "Online since" %} {{ item.onlinesince|time }}
    • -
  • {% blocktrans with item.isAuthed|yesno as authed %}Authenticated: {{ authed }}{% endblocktrans %}
    • -
  • {% blocktrans with item.isAdmin|yesno as admin %}Admin: {{ admin }}{% endblocktrans %}
    • -
  • {% blocktrans with item.mute|yesno as muted %}Muted: {{ muted }}{% endblocktrans %}
    • -
  • {% blocktrans with item.deaf|yesno as deafened %}Deafened: {{ deafened }}{% endblocktrans %}
    • -
  • {% blocktrans with item.selfMute|yesno as selfmuted %}Muted by self: {{ selfmuted }}{% endblocktrans %}
    • -
  • {% blocktrans with item.selfDeaf|yesno as selfdeafened %}Deafened by self: {{ selfdeafened }}{% endblocktrans %}
    • +
  • {% trans "Online since" %}: {{ item.onlinesince|time }}
    • +
  • {% trans "Authenticated" %}: {{ item.isAuthed|yesno }}
    • +
  • {% trans "Admin" %}: {{ item.isAdmin|yesno }}
    • +
  • {% trans "Muted" %}: {{ item.mute|yesno }}
    • +
  • {% trans "Deafened" %}: {{ item.deaf|yesno }}
    • +
  • {% trans "Muted by self" %}: {{ item.selfMute|yesno }}
    • +
  • {% trans "Deafened by self" %}: {{ item.selfDeaf|yesno }}
{% if item.mumbleuser and item.mumbleuser.owner %}

{% trans "User" %} {{ item.mumbleuser.owner.username|capfirst }}

diff --git a/template/mumble/player.htm b/pyweb/mumble/templates/mumble/player.html similarity index 78% rename from template/mumble/player.htm rename to pyweb/mumble/templates/mumble/player.html index e44428c..e19f77a 100644 --- a/template/mumble/player.htm +++ b/pyweb/mumble/templates/mumble/player.html @@ -1,23 +1,24 @@ {% load mumble_extras %} +{% load i18n %}
{% if Player.isAuthed %} - authed + authed {% endif %} {% if Player.mute or Player.suppress %} - muted + muted {% endif %} {% if Player.deaf %} - deafened + deafened {% endif %} {% if Player.selfMute %} - self-muted + self-muted {% endif %} {% if Player.selfDeaf %} - self-deafened + self-deafened {% endif %} {% if Player.hasComment %} - has comment + has comment {% endif %} diff --git a/template/mumble/server.htm b/pyweb/mumble/templates/mumble/server.html similarity index 100% rename from template/mumble/server.htm rename to pyweb/mumble/templates/mumble/server.html diff --git a/pyweb/mumble/templatetags/mumble_extras.py b/pyweb/mumble/templatetags/mumble_extras.py index 9a58d23..04196f8 100644 --- a/pyweb/mumble/templatetags/mumble_extras.py +++ b/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 ); diff --git a/pyweb/mumble/views.py b/pyweb/mumble/views.py index 43780ba..3b02b91 100644 --- a/pyweb/mumble/views.py +++ b/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, diff --git a/pyweb/settings.py b/pyweb/settings.py index f2b13a2..cc0e80e 100644 --- a/pyweb/settings.py +++ b/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' diff --git a/template/404.html b/pyweb/templates/404.html similarity index 100% rename from template/404.html rename to pyweb/templates/404.html diff --git a/template/500.html b/pyweb/templates/500.html similarity index 100% rename from template/500.html rename to pyweb/templates/500.html diff --git a/template/index.htm b/pyweb/templates/index.html similarity index 81% rename from template/index.htm rename to pyweb/templates/index.html index 1be7955..49f6ade 100644 --- a/template/index.htm +++ b/pyweb/templates/index.html @@ -1,3 +1,4 @@ +{% load i18n %} @@ -23,19 +24,22 @@

{% block Headline %}{% endblock %}

diff --git a/template/mobile_index.htm b/pyweb/templates/mobile_index.html similarity index 100% rename from template/mobile_index.htm rename to pyweb/templates/mobile_index.html diff --git a/template/registration/activate.html b/pyweb/templates/registration/activate.html similarity index 94% rename from template/registration/activate.html rename to pyweb/templates/registration/activate.html index 8ff59df..41cfbbb 100644 --- a/template/registration/activate.html +++ b/pyweb/templates/registration/activate.html @@ -1,4 +1,4 @@ -{% extends "index.htm" %} +{% extends "index.html" %} {% load i18n %} {% block Headline %}Account activation{% endblock %} diff --git a/template/registration/activation_email.txt b/pyweb/templates/registration/activation_email.txt similarity index 100% rename from template/registration/activation_email.txt rename to pyweb/templates/registration/activation_email.txt diff --git a/template/registration/activation_email_subject.txt b/pyweb/templates/registration/activation_email_subject.txt similarity index 100% rename from template/registration/activation_email_subject.txt rename to pyweb/templates/registration/activation_email_subject.txt diff --git a/template/registration/imprint.html b/pyweb/templates/registration/imprint.html similarity index 89% rename from template/registration/imprint.html rename to pyweb/templates/registration/imprint.html index 63a31f6..9276b45 100644 --- a/template/registration/imprint.html +++ b/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 %}

diff --git a/template/registration/login.html b/pyweb/templates/registration/login.html similarity index 97% rename from template/registration/login.html rename to pyweb/templates/registration/login.html index f99069c..250f25b 100644 --- a/template/registration/login.html +++ b/pyweb/templates/registration/login.html @@ -1,4 +1,4 @@ -{% extends "index.htm" %} +{% extends "index.html" %} {% load i18n %} {% block Headline %}Login{% endblock %} diff --git a/template/registration/logout.html b/pyweb/templates/registration/logout.html similarity index 85% rename from template/registration/logout.html rename to pyweb/templates/registration/logout.html index a06f60e..29ff3e2 100644 --- a/template/registration/logout.html +++ b/pyweb/templates/registration/logout.html @@ -1,4 +1,4 @@ -{% extends "index.htm" %} +{% extends "index.html" %} {% load i18n %} {% block Headline %}Logged out{% endblock %} diff --git a/pyweb/templates/registration/profile.html b/pyweb/templates/registration/profile.html new file mode 100644 index 0000000..c9906c4 --- /dev/null +++ b/pyweb/templates/registration/profile.html @@ -0,0 +1,37 @@ +{% extends "index.html" %} +{% load i18n %} + +{% block Headline %}{% trans "Profile" %}{% endblock %} + +{% block Content %} +

{% blocktrans with user|capfirst as username %}Profile of {{username}}{% endblocktrans %}

+
+

Statistics

+
    + {% if mumbleaccs %} +
  • {% trans "Mumble Accounts" %}: + +
    • + {% endif %} +
+
+
+

{% trans "Account" %}

+
    +
  • {% trans "Full Name" %}: {{ user.first_name }} {{ user.last_name }}
    • +
  • {% trans "e-mail address" %}: {{ user.email }}
    • +
  • {% trans "staff status" %}: {{ user.is_staff|yesno }}
    • +
  • {% trans "date joined" %}: {{ user.date_joined|date }} {{ user.date_joined|time }}
    • +
  • {% trans "last login" %}: {{ user.last_login|date }} {{ user.last_login|time }}
    • +
  • {% trans "Change password" %}
    • +
  • {% trans "Log out" %}
    • +
+
+{% endblock %} + diff --git a/template/registration/registration_complete.html b/pyweb/templates/registration/registration_complete.html similarity index 93% rename from template/registration/registration_complete.html rename to pyweb/templates/registration/registration_complete.html index 1e113f2..dfcb843 100644 --- a/template/registration/registration_complete.html +++ b/pyweb/templates/registration/registration_complete.html @@ -1,4 +1,4 @@ -{% extends "index.htm" %} +{% extends "index.html" %} {% load i18n %} {% block Headline %}Registration complete{% endblock %} diff --git a/template/registration/registration_form.html b/pyweb/templates/registration/registration_form.html similarity index 92% rename from template/registration/registration_form.html rename to pyweb/templates/registration/registration_form.html index 06c1e56..fdd8bb1 100644 --- a/template/registration/registration_form.html +++ b/pyweb/templates/registration/registration_form.html @@ -1,4 +1,4 @@ -{% extends "index.htm" %} +{% extends "index.html" %} {% load i18n %} {% block Headline %}Create Account{% endblock %} diff --git a/pyweb/urls.py b/pyweb/urls.py index 3bb4062..ea6cc42 100644 --- a/pyweb/urls.py +++ b/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('', diff --git a/template/registration/profile.html b/template/registration/profile.html deleted file mode 100644 index bdfdf81..0000000 --- a/template/registration/profile.html +++ /dev/null @@ -1,37 +0,0 @@ -{% extends "index.htm" %} -{% load i18n %} - -{% block Headline %}Profile{% endblock %} - -{% block Content %} -

Profile of {{user|capfirst}}

-
-

Statistics

-
    - {% if mumbleaccs %} -
  • Mumble Accounts: - -
    • - {% endif %} -
-
-
-

Account

-
    -
  • Full Name: {{ user.first_name }} {{ user.last_name }}
    • -
  • E-Mail Adress: {{ user.email }}
    • -
  • Staff: {% if user.is_staff %} yes (admin area) {% else %} no {% endif %}
    • -
  • Sign-up date: {{ user.date_joined|date }} {{ user.date_joined|time }}
    • -
  • Last login: {{ user.last_login|date }} {{ user.last_login|time }}
    • -
  • Change Password
    • -
  • Logout
    • -
-
-{% endblock %} -