Use i18n for the cache and SQL panels.

4 files changed, 117 insertions, 71 deletions

diff --git a/debug_toolbar/locale/en/LC_MESSAGES/django.mo b/debug_toolbar/locale/en/LC_MESSAGES/django.mo
index 5ffd385..ccc04a2 100644
--- a/debug_toolbar/locale/en/LC_MESSAGES/django.mo
+++ b/debug_toolbar/locale/en/LC_MESSAGES/django.mo
diff --git a/debug_toolbar/locale/en/LC_MESSAGES/django.po b/debug_toolbar/locale/en/LC_MESSAGES/django.po
index eaefdc6..a1c0b2e 100644
--- a/debug_toolbar/locale/en/LC_MESSAGES/django.po
+++ b/debug_toolbar/locale/en/LC_MESSAGES/django.po
@@ -7,36 +7,54 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-18 08:06-0800\n"
+"POT-Creation-Date: 2012-03-05 17:21+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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: panels/cache.py:92
-#, python-format
-msgid "Cache: %.2fms"
+msgid "Cache"
 msgstr ""
 
-#: panels/cache.py:95
+#: panels/cache.py:96
+#, python-format
+msgid "%(cache_calls)d call in %(time).2fms"
+msgid_plural "%(cache_calls)d calls in %(time).2fms"
+msgstr[0] ""
+msgstr[1] ""
+
+#: panels/cache.py:102
 msgid "Cache Usage"
 msgstr ""
 
-#: panels/headers.py:36 panels/headers.py:39
+#: panels/headers.py:37 panels/headers.py:40
 msgid "HTTP Headers"
 msgstr ""
 
-#: panels/logger.py:56
+#: panels/logger.py:117
 msgid "Logging"
 msgstr ""
 
-#: panels/logger.py:63
+#: panels/logger.py:122
+#, python-format
+msgid "%(count)s message"
+msgid_plural "%(count)s messages"
+msgstr[0] ""
+msgstr[1] ""
+
+#: panels/logger.py:126
 msgid "Log Messages"
 msgstr ""
 
-#: panels/request_vars.py:13 panels/request_vars.py:16
+#: panels/profiling.py:149 panels/profiling.py:155
+msgid "Profiling"
+msgstr ""
+
+#: panels/request_vars.py:22 panels/request_vars.py:25
 msgid "Request Vars"
 msgstr ""
 
@@ -49,82 +67,77 @@ msgstr ""
 msgid "Settings from <code>%s</code>"
 msgstr ""
 
-#: panels/signals.py:39 panels/signals.py:42
+#: panels/signals.py:40 panels/signals.py:54
 msgid "Signals"
 msgstr ""
 
-#: panels/sql.py:146
+#: panels/sql.py:121
 msgid "SQL"
 msgstr ""
 
-#: panels/sql.py:160
-msgid "SQL Queries"
-msgstr ""
-
-#: panels/template.py:47
+#: panels/template.py:102
 msgid "Templates"
 msgstr ""
 
-#: panels/template.py:52
+#: panels/template.py:106
 #, python-format
 msgid "Templates (%(num_templates)s rendered)"
 msgstr ""
 
-#: panels/timer.py:35 templates/debug_toolbar/panels/cache.html:39
+#: panels/timer.py:56 templates/debug_toolbar/panels/cache.html:39
 #: templates/debug_toolbar/panels/logger.html:7
-#: templates/debug_toolbar/panels/sql.html:5
 #: templates/debug_toolbar/panels/sql_explain.html:11
 #: templates/debug_toolbar/panels/sql_profile.html:12
 #: templates/debug_toolbar/panels/sql_select.html:11
 msgid "Time"
 msgstr ""
 
-#: panels/timer.py:47
+#: panels/timer.py:70
 msgid "Resource Usage"
 msgstr ""
 
-#: panels/timer.py:78
+#: panels/timer.py:83
 msgid "User CPU time"
 msgstr ""
 
-#: panels/timer.py:79
+#: panels/timer.py:84
 msgid "System CPU time"
 msgstr ""
 
-#: panels/timer.py:80
+#: panels/timer.py:85
 msgid "Total CPU time"
 msgstr ""
 
-#: panels/timer.py:81
+#: panels/timer.py:86
 msgid "Elapsed time"
 msgstr ""
 
-#: panels/timer.py:82
+#: panels/timer.py:87
 msgid "Context switches"
 msgstr ""
 
-#: panels/version.py:20 panels/version.py:29
+#: panels/version.py:19 panels/version.py:28
 msgid "Versions"
 msgstr ""
 
-#: templates/debug_toolbar/base.html:23
+#: templates/debug_toolbar/base.html:11
 msgid "Hide Toolbar"
 msgstr ""
 
-#: templates/debug_toolbar/base.html:23
+#: templates/debug_toolbar/base.html:11
 msgid "Hide"
 msgstr ""
 
-#: templates/debug_toolbar/base.html:48
+#: templates/debug_toolbar/base.html:36
 msgid "Show Toolbar"
 msgstr ""
 
-#: templates/debug_toolbar/base.html:54
+#: templates/debug_toolbar/base.html:42
 msgid "Close"
 msgstr ""
 
 #: templates/debug_toolbar/redirect.html:7
-#: templates/debug_toolbar/panels/logger.html:9
+#: templates/debug_toolbar/panels/logger.html:10
 msgid "Location"
 msgstr ""
 
@@ -174,10 +187,10 @@ msgid "Key"
 msgstr ""
 
 #: templates/debug_toolbar/panels/headers.html:6
-#: templates/debug_toolbar/panels/request_vars.html:37
-#: templates/debug_toolbar/panels/request_vars.html:63
-#: templates/debug_toolbar/panels/request_vars.html:85
-#: templates/debug_toolbar/panels/request_vars.html:107
+#: templates/debug_toolbar/panels/request_vars.html:39
+#: templates/debug_toolbar/panels/request_vars.html:65
+#: templates/debug_toolbar/panels/request_vars.html:87
+#: templates/debug_toolbar/panels/request_vars.html:109
 #: templates/debug_toolbar/panels/settings_vars.html:6
 #: templates/debug_toolbar/panels/timer.html:10
 msgid "Value"
@@ -188,13 +201,38 @@ msgid "Level"
 msgstr ""
 
 #: templates/debug_toolbar/panels/logger.html:8
+msgid "Channel"
+msgstr ""
+
+#: templates/debug_toolbar/panels/logger.html:9
 msgid "Message"
 msgstr ""
 
-#: templates/debug_toolbar/panels/logger.html:24
+#: templates/debug_toolbar/panels/logger.html:26
 msgid "No messages logged"
 msgstr ""
 
+#: templates/debug_toolbar/panels/profiling.html:6
+msgid "Call"
+msgstr ""
+
+#: templates/debug_toolbar/panels/profiling.html:7
+msgid "CumTime"
+msgstr ""
+
+#: templates/debug_toolbar/panels/profiling.html:8
+#: templates/debug_toolbar/panels/profiling.html:10
+msgid "Per"
+msgstr ""
+
+#: templates/debug_toolbar/panels/profiling.html:9
+msgid "TotTime"
+msgstr ""
+
+#: templates/debug_toolbar/panels/profiling.html:11
+msgid "Count"
+msgstr ""
+
 #: templates/debug_toolbar/panels/request_vars.html:3
 msgid "View information"
 msgstr ""
@@ -211,42 +249,42 @@ msgstr ""
 msgid "kwargs"
 msgstr ""
 
-#: templates/debug_toolbar/panels/request_vars.html:27
+#: templates/debug_toolbar/panels/request_vars.html:29
 msgid "COOKIES Variables"
 msgstr ""
 
-#: templates/debug_toolbar/panels/request_vars.html:36
-#: templates/debug_toolbar/panels/request_vars.html:62
-#: templates/debug_toolbar/panels/request_vars.html:84
-#: templates/debug_toolbar/panels/request_vars.html:106
+#: templates/debug_toolbar/panels/request_vars.html:38
+#: templates/debug_toolbar/panels/request_vars.html:64
+#: templates/debug_toolbar/panels/request_vars.html:86
+#: templates/debug_toolbar/panels/request_vars.html:108
 msgid "Variable"
 msgstr ""
 
-#: templates/debug_toolbar/panels/request_vars.html:50
+#: templates/debug_toolbar/panels/request_vars.html:52
 msgid "No COOKIE data"
 msgstr ""
 
-#: templates/debug_toolbar/panels/request_vars.html:53
+#: templates/debug_toolbar/panels/request_vars.html:55
 msgid "SESSION Variables"
 msgstr ""
 
-#: templates/debug_toolbar/panels/request_vars.html:76
+#: templates/debug_toolbar/panels/request_vars.html:78
 msgid "No SESSION data"
 msgstr ""
 
-#: templates/debug_toolbar/panels/request_vars.html:79
+#: templates/debug_toolbar/panels/request_vars.html:81
 msgid "GET Variables"
 msgstr ""
 
-#: templates/debug_toolbar/panels/request_vars.html:98
+#: templates/debug_toolbar/panels/request_vars.html:100
 msgid "No GET data"
 msgstr ""
 
-#: templates/debug_toolbar/panels/request_vars.html:101
+#: templates/debug_toolbar/panels/request_vars.html:103
 msgid "POST Variables"
 msgstr ""
 
-#: templates/debug_toolbar/panels/request_vars.html:120
+#: templates/debug_toolbar/panels/request_vars.html:122
 msgid "No POST data"
 msgstr ""
 
@@ -266,28 +304,27 @@ msgstr ""
 msgid "Receivers"
 msgstr ""
 
-#: templates/debug_toolbar/panels/sql.html:6
-msgid "Action"
-msgstr ""
-
-#: templates/debug_toolbar/panels/sql.html:7
-msgid "Stacktrace"
-msgstr ""
-
 #: templates/debug_toolbar/panels/sql.html:8
+#, python-format
+msgid "%(num)s query"
+msgid_plural "%(num)s queries"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templates/debug_toolbar/panels/sql.html:19
 msgid "Query"
 msgstr ""
 
-#: templates/debug_toolbar/panels/sql.html:38
-msgid "Line"
+#: templates/debug_toolbar/panels/sql.html:20
+msgid "Timeline"
 msgstr ""
 
-#: templates/debug_toolbar/panels/sql.html:39
-msgid "Method"
+#: templates/debug_toolbar/panels/sql.html:21
+msgid "Time (ms)"
 msgstr ""
 
-#: templates/debug_toolbar/panels/sql.html:40
-msgid "File"
+#: templates/debug_toolbar/panels/sql.html:22
+msgid "Action"
 msgstr ""
 
 #: templates/debug_toolbar/panels/sql_explain.html:3
@@ -307,11 +344,17 @@ msgstr ""
 msgid "Executed SQL"
 msgstr ""
 
+#: templates/debug_toolbar/panels/sql_explain.html:13
+#: templates/debug_toolbar/panels/sql_profile.html:14
+#: templates/debug_toolbar/panels/sql_select.html:13
+msgid "Database"
+msgstr ""
+
 #: templates/debug_toolbar/panels/sql_profile.html:4
 msgid "SQL Profiled"
 msgstr ""
 
-#: templates/debug_toolbar/panels/sql_profile.html:35
+#: templates/debug_toolbar/panels/sql_profile.html:37
 msgid "Error"
 msgstr ""
 
@@ -319,7 +362,7 @@ msgstr ""
 msgid "SQL Selected"
 msgstr ""
 
-#: templates/debug_toolbar/panels/sql_select.html:34
+#: templates/debug_toolbar/panels/sql_select.html:36
 msgid "Empty set"
 msgstr ""
 
diff --git a/debug_toolbar/panels/cache.py b/debug_toolbar/panels/cache.py
index ace343b..1656932 100644
--- a/debug_toolbar/panels/cache.py
+++ b/debug_toolbar/panels/cache.py
@@ -3,7 +3,7 @@ import inspect
 
 from django.core import cache
 from django.core.cache.backends.base import BaseCache
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import ugettext_lazy as _, ungettext
 from debug_toolbar.panels import DebugPanel
 
 
@@ -89,7 +89,14 @@ class CacheDebugPanel(DebugPanel):
             cache.cache = self.cache
 
     def nav_title(self):
-        return _('Cache: %.2fms') % self.cache.total_time
+        return _('Cache')
+
+    def nav_subtitle(self):
+        cache_calls = len(self.cache.calls)
+        return ungettext('%(cache_calls)d call in %(time).2fms',
+                         '%(cache_calls)d calls in %(time).2fms',
+                         cache_calls) % {'cache_calls': cache_calls,
+                                         'time': self.cache.total_time}
 
     def title(self):
         return _('Cache Usage')
diff --git a/debug_toolbar/panels/sql.py b/debug_toolbar/panels/sql.py
index b05eefe..f4edcb3 100644
--- a/debug_toolbar/panels/sql.py
+++ b/debug_toolbar/panels/sql.py
@@ -121,12 +121,8 @@ class SQLDebugPanel(DebugPanel):
         return _('SQL')
 
     def nav_subtitle(self):
-        # TODO l10n: use ngettext
-        return "%d %s in %.2fms" % (
-            self._num_queries,
-            (self._num_queries == 1) and 'query' or 'queries',
-            self._sql_time
-        )
+        return __("%d query in %.2fms", "%d queries in %.2fms",
+                  self._num_queries) % (self._num_queries, self._sql_time)
 
     def title(self):
         count = len(self._databases)