diff --git a/pyweb/mumble/locale/de/LC_MESSAGES/django.mo b/pyweb/mumble/locale/de/LC_MESSAGES/django.mo index c74df78..ad229e9 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 b808bfc..86e7156 100644 --- a/pyweb/mumble/locale/de/LC_MESSAGES/django.po +++ b/pyweb/mumble/locale/de/LC_MESSAGES/django.po @@ -267,16 +267,20 @@ msgstr "Benutzertextur" msgid "" "\n" -" You can upload an image that you would like to use as your user texture here.
\n" -" Your current texture is:
\n" +" You can upload an image that you would like to use as your user texture here.\n" " " msgstr "" "\n" " Du kannst hier ein Bild hochladen, das als deine Benutzertextur " -"angezeigt werden soll.
\n" -" Deine momentane Textur ist diese:
\n" +"angezeigt werden soll.\n" " " +msgid "Your current texture is" +msgstr "Deine momentane Textur ist diese" + +msgid "You don't currently have a texture set" +msgstr "Du hast momentan keine Textur gesetzt" + msgid "\n" " Hint: The texture image needs to be 600x60 in size. If " "you upload an image with\n" diff --git a/pyweb/mumble/models.py b/pyweb/mumble/models.py index a8e64e6..b55c71f 100644 --- a/pyweb/mumble/models.py +++ b/pyweb/mumble/models.py @@ -427,6 +427,14 @@ class MumbleUser( models.Model ): """Read an image from the infile and install it as the user's texture.""" self.server.ctl.setTexture(self.server.srvid, self.mumbleid, infile) + def hasTexture( self ): + try: + self.getTexture(); + except ValueError: + return False; + else: + return True; + # Deletion handler @staticmethod diff --git a/template/mumble/mumble.htm b/template/mumble/mumble.htm index d33a83d..6913f25 100644 --- a/template/mumble/mumble.htm +++ b/template/mumble/mumble.htm @@ -59,10 +59,16 @@

{% trans "User Texture" %}

{% blocktrans with DBaseObject.id as serverid %} - You can upload an image that you would like to use as your user texture here.
- Your current texture is:
- {% endblocktrans %} + You can upload an image that you would like to use as your user texture here. + {% endblocktrans %}
+
+ {% if MumbleAccount.hasTexture %} + {% trans "Your current texture is" %}:
user texture
+ {% else %} + {% trans "You don't currently have a texture set" %}.
+ {% endif %} +
{% blocktrans with DBaseObject.id as serverid %} Hint: The texture image needs to be 600x60 in size. If you upload an image with a different size, it will be resized accordingly.