aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRob Hudson2009-11-02 13:06:46 -0800
committerRob Hudson2009-11-02 13:06:46 -0800
commit8249c78e5dffd85f0d2216864fa115e9320186d0 (patch)
tree511765647ab2c5607c4c356e2a4851e6693f29be
parent4a1e4ee0891c1c6c3765f479fcef2f23fe28faca (diff)
parent55f21310a27c6c08033501bdcdbcd7d2915942bc (diff)
downloaddjango-debug-toolbar-8249c78e5dffd85f0d2216864fa115e9320186d0.tar.bz2
Merge branch 'master' into tx-master
Conflicts: debug_toolbar/locale/he/LC_MESSAGES/django.po debug_toolbar/templates/debug_toolbar/panels/versions.html
-rw-r--r--debug_toolbar/locale/he/LC_MESSAGES/django.po6
-rw-r--r--debug_toolbar/panels/version.py3
-rw-r--r--debug_toolbar/templates/debug_toolbar/panels/versions.html2
3 files changed, 9 insertions, 2 deletions
diff --git a/debug_toolbar/locale/he/LC_MESSAGES/django.po b/debug_toolbar/locale/he/LC_MESSAGES/django.po
index a3de60a..3632747 100644
--- a/debug_toolbar/locale/he/LC_MESSAGES/django.po
+++ b/debug_toolbar/locale/he/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-11 18:05-0700\n"
+"POT-Creation-Date: 2009-11-02 12:50-0800\n"
"PO-Revision-Date: 2009-08-24 23:08-0600\n"
"Last-Translator: Alex <alex.gaynor@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -231,6 +231,10 @@ msgstr "שגיאה"
msgid "Package"
msgstr ""
+#: templates/debug_toolbar/panels/versions.html:6
+msgid "Package"
+msgstr ""
+
#: templates/debug_toolbar/panels/versions.html:7
#, fuzzy
msgid "Version"
diff --git a/debug_toolbar/panels/version.py b/debug_toolbar/panels/version.py
index 3b69520..bc09e75 100644
--- a/debug_toolbar/panels/version.py
+++ b/debug_toolbar/panels/version.py
@@ -28,6 +28,9 @@ class VersionDebugPanel(DebugPanel):
def title(self):
return 'Versions'
+ def title(self):
+ return 'Versions'
+
def content(self):
versions = {}
for app in settings.INSTALLED_APPS + ['django']:
diff --git a/debug_toolbar/templates/debug_toolbar/panels/versions.html b/debug_toolbar/templates/debug_toolbar/panels/versions.html
index f0ee012..8a09928 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/versions.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/versions.html
@@ -10,7 +10,7 @@
<tbody>
{% for package, version in versions.iteritems %}
<tr class="{% cycle 'djDebugOdd' 'djDebugEven' %}">
- <td>{{ package }}</td>
+ <td>{{ package }}</td>
<td>{{ version }}</td>
</tr>
{% endfor %}