Browse Source

fix date/time formats and remove translations for yes and no (django has these itself)

Natenom/support-murmur-13-1446181288462
Michael Ziegler 15 years ago
parent
commit
bbde3f950b
  1. 11
      pyweb/mumble/locale/de/LC_MESSAGES/django.po
  2. 11
      pyweb/mumble/locale/hr/LC_MESSAGES/django.po
  3. 13
      pyweb/mumble/locale/it/LC_MESSAGES/django.po
  4. 11
      pyweb/mumble/locale/ja/LC_MESSAGES/django.po
  5. 11
      pyweb/mumble/locale/la/LC_MESSAGES/django.po
  6. 36
      template/mumble/mumble.htm
  7. 4
      template/registration/profile.html

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

@ -35,14 +35,6 @@ msgstr "Benutzer online"
msgid "Channel count"
msgstr "Channels"
#: admin.py:42
msgid "Yes"
msgstr "Ja"
#: admin.py:43
msgid "No"
msgstr "Nein"
#: admin.py:44
msgid "Public"
msgstr "Öffentlich"
@ -305,9 +297,6 @@ msgstr "Spieler"
msgid "Online since"
msgstr "Online seit"
msgid "yes,no"
msgstr "ja,nein"
msgid "Authenticated: %(authed)s"
msgstr "Authentifiziert: %(authed)s"

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

@ -35,14 +35,6 @@ msgstr "Korisnici na serveru"
msgid "Channel count"
msgstr "Kanali"
#: admin.py:42
msgid "Yes"
msgstr "Da"
#: admin.py:43
msgid "No"
msgstr "Ne"
#: admin.py:44
msgid "Public"
msgstr "Javni server"
@ -297,9 +289,6 @@ msgstr "Korisnik"
msgid "Online since"
msgstr "Na serveru od"
msgid "yes,no"
msgstr "da,ne"
msgid "Authenticated: %(authed)s"
msgstr "Registriran korisnik: %(authed)s"

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

@ -35,14 +35,6 @@ msgstr "Utenti online"
msgid "Channel count"
msgstr "Quantità canali"
#: admin.py:42
msgid "Yes"
msgstr "Si"
#: admin.py:43
msgid "No"
msgstr "No"
#: admin.py:44
msgid "Public"
msgstr "Publico"
@ -267,11 +259,6 @@ msgstr "Giocatore"
msgid "Online since"
msgstr "Online da"
#: mumble.htm:98 mumble.htm.py:99 mumble.htm.py:100 mumble.htm.py:101
#: mumble.htm:102 mumble.htm.py:103
msgid "yes,no"
msgstr "Si,No"
#: mumble.htm:98
#, python-format
msgid "Authenticated: %(authed)s"

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

@ -36,14 +36,6 @@ msgstr "オンラインのユーザ"
msgid "Channel count"
msgstr "チャンネル数"
#: admin.py:42
msgid "Yes"
msgstr "はい"
#: admin.py:43
msgid "No"
msgstr "いいえ"
#: admin.py:44
msgid "Public"
msgstr "公開"
@ -297,9 +289,6 @@ msgstr "プレーヤ"
msgid "Online since"
msgstr "接続開始時間"
msgid "yes,no"
msgstr "yes,no"
msgid "Authenticated: %(authed)s"
msgstr "登録済み: %(authed)s"

11
pyweb/mumble/locale/la/LC_MESSAGES/django.po

@ -35,14 +35,6 @@ msgstr "Ineonlay ersusay"
msgid "Channel count"
msgstr "Annelchay ountcay"
#: admin.py:42
msgid "Yes"
msgstr "Esyay"
#: admin.py:43
msgid "No"
msgstr "Onay"
#: admin.py:44
msgid "Public"
msgstr "Ublicpay"
@ -306,9 +298,6 @@ msgstr "Ayerplay"
msgid "Online since"
msgstr "Ineonlay incesay"
msgid "yes,no"
msgstr "esyay,onay"
msgid "Authenticated: %(authed)s"
msgstr "Enticatedauthay: %(authed)s"

36
template/mumble/mumble.htm

@ -96,13 +96,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:"H:i"}}</li>
<li>{% blocktrans with item.isAuthed|yesno:_("yes,no") as authed %}Authenticated: {{ authed }}{% endblocktrans %}</li>
<li>{% blocktrans with item.isAdmin|yesno:_("yes,no") as admin %}Admin: {{ admin }}{% endblocktrans %}</li>
<li>{% blocktrans with item.muted|yesno:_("yes,no") as muted %}Muted: {{ muted }}{% endblocktrans %}</li>
<li>{% blocktrans with item.deafened|yesno:_("yes,no") as deafened %}Deafened: {{ deafened }}{% endblocktrans %}</li>
<li>{% blocktrans with item.selfmuted|yesno:_("yes,no") as selfmuted %}Muted by self: {{ selfmuted }}{% endblocktrans %}</li>
<li>{% blocktrans with item.selfdeafened|yesno:_("yes,no") as selfdeafened %}Deafened by self: {{ selfdeafened }}{% endblocktrans %}</li>
<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.muted|yesno as muted %}Muted: {{ muted }}{% endblocktrans %}</li>
<li>{% blocktrans with item.deafened|yesno as deafened %}Deafened: {{ deafened }}{% endblocktrans %}</li>
<li>{% blocktrans with item.selfmuted|yesno as selfmuted %}Muted by self: {{ selfmuted }}{% endblocktrans %}</li>
<li>{% blocktrans with item.selfdeafened|yesno as selfdeafened %}Deafened by self: {{ selfdeafened }}{% endblocktrans %}</li>
</ul>
{% if item.mumbleuser and item.mumbleuser.owner %}
<h2>{% trans "User" %} {{ item.mumbleuser.owner.username|capfirst }}</h2>
@ -110,8 +110,8 @@
{% if item.mumbleuser.owner.first_name and item.mumbleuser.owner.last_name %}
<li>{% trans "Full Name" %}: {{ item.mumbleuser.owner.first_name }} {{ item.mumbleuser.owner.last_name }}</li>
{% endif %}
<li>{% trans "Admin" %}: {% if item.mumbleuser.owner.is_staff %}{% trans "Yes" %}{% else %}{% trans "No" %}{% endif %}</li>
<li>{% trans "Sign-up date" %}: {{ item.mumbleuser.owner.date_joined }}</li>
<li>{% trans "Admin" %}: {{ if item.mumbleuser.owner.is_staff|yesno }}</li>
<li>{% trans "Sign-up date" %}: {{ item.mumbleuser.owner.date_joined|date }}</li>
</ul>
{% endif %}
{% if item.mumbleuser %}
@ -122,16 +122,16 @@
{% else %}
<div id="mumble_{{ item.id }}" class="mumble-ext x-hide-display">
<h2>{% trans "Channel" %} {{ item.name }}</h2>
{% if CurrentUserIsAdmin or user.is_staff %}
{% trans "Channel ID" %}: {{ item.chanid }}<br />
{% endif %}
{% if CurrentUserIsAdmin or user.is_staff %}
{% trans "Channel ID" %}: {{ item.chanid }}<br />
{% endif %}
<a href="{{ item|chanurl:MumbleAccount }}" class="mumble">{% trans "Connect" %}</a>
{% if item.description %}
<fieldset>
<legend>{% trans "Channel description" %}</legend>
{{ item.description|safe }}
</fieldset>
{% endif %}
{% if item.description %}
<fieldset>
<legend>{% trans "Channel description" %}</legend>
{{ item.description|safe }}
</fieldset>
{% endif %}
</div>
{% endif %}
{% endfor %}

4
template/registration/profile.html

@ -27,8 +27,8 @@
<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 }}</li>
<li>Last login: {{ user.last_login }}</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>

Loading…
Cancel
Save