Marked more strings for translation and updated 'fr' locale.

Signed-off-by: Rob Hudson <rob@cogit8.org>

9 files changed, 28 insertions, 23 deletions

diff --git a/debug_toolbar/panels/cache.py b/debug_toolbar/panels/cache.py
index a05d3cc..8cdd929 100644
--- a/debug_toolbar/panels/cache.py
+++ b/debug_toolbar/panels/cache.py
@@ -7,6 +7,7 @@ except ImportError:
 from django.core import cache
 from django.core.cache.backends.base import BaseCache
 from django.template.loader import render_to_string
+from django.utils.translation import ugettext_lazy as _
 from debug_toolbar.panels import DebugPanel
 
 class CacheStatTracker(BaseCache):
@@ -88,10 +89,10 @@ class CacheDebugPanel(DebugPanel):
             cache.cache = self.cache
 
     def nav_title(self):
-        return 'Cache: %.2fms' % self.cache.total_time
+        return _('Cache: %.2fms') % self.cache.total_time
 
     def title(self):
-        return 'Cache Usage'
+        return _('Cache Usage')
 
     def url(self):
         return ''
@@ -102,4 +103,4 @@ class CacheDebugPanel(DebugPanel):
             cache_time = self.cache.total_time,
             cache = self.cache,
         )
-        return render_to_string('debug_toolbar/panels/cache.html', context)
\ No newline at end of file
+        return render_to_string('debug_toolbar/panels/cache.html', context)
diff --git a/debug_toolbar/panels/headers.py b/debug_toolbar/panels/headers.py
index 06858ef..7a44c2d 100644
--- a/debug_toolbar/panels/headers.py
+++ b/debug_toolbar/panels/headers.py
@@ -1,4 +1,5 @@
 from django.template.loader import render_to_string
+from django.utils.translation import ugettext_lazy as _
 from debug_toolbar.panels import DebugPanel
 
 class HeaderDebugPanel(DebugPanel):
@@ -32,10 +33,10 @@ class HeaderDebugPanel(DebugPanel):
     )
 
     def nav_title(self):
-        return 'HTTP Headers'
+        return _('HTTP Headers')
 
     def title(self):
-        return 'HTTP Headers'
+        return _('HTTP Headers')
 
     def url(self):
         return ''
@@ -49,4 +50,4 @@ class HeaderDebugPanel(DebugPanel):
         context = {
             'headers': self.headers
         }
-        return render_to_string('debug_toolbar/panels/headers.html', context)
\ No newline at end of file
+        return render_to_string('debug_toolbar/panels/headers.html', context)
diff --git a/debug_toolbar/panels/logger.py b/debug_toolbar/panels/logger.py
index a16b933..99f2602 100644
--- a/debug_toolbar/panels/logger.py
+++ b/debug_toolbar/panels/logger.py
@@ -56,10 +56,11 @@ class LoggingPanel(DebugPanel):
         return _("Logging")
 
     def nav_subtitle(self):
+        # FIXME l10n: use ngettext
         return "%s message%s" % (len(handler.get_records()), (len(handler.get_records()) == 1) and '' or 's')
 
     def title(self):
-        return 'Log Messages'
+        return _('Log Messages')
 
     def url(self):
         return ''
diff --git a/debug_toolbar/panels/request_vars.py b/debug_toolbar/panels/request_vars.py
index ab356a0..cea5ec7 100644
--- a/debug_toolbar/panels/request_vars.py
+++ b/debug_toolbar/panels/request_vars.py
@@ -1,4 +1,5 @@
 from django.template.loader import render_to_string
+from django.utils.translation import ugettext_lazy as _
 from debug_toolbar.panels import DebugPanel
 
 class RequestVarsDebugPanel(DebugPanel):
@@ -9,10 +10,10 @@ class RequestVarsDebugPanel(DebugPanel):
     has_content = True
 
     def nav_title(self):
-        return 'Request Vars'
+        return _('Request Vars')
 
     def title(self):
-        return 'Request Vars'
+        return _('Request Vars')
 
     def url(self):
         return ''
diff --git a/debug_toolbar/panels/settings_vars.py b/debug_toolbar/panels/settings_vars.py
index f30f601..8243acf 100644
--- a/debug_toolbar/panels/settings_vars.py
+++ b/debug_toolbar/panels/settings_vars.py
@@ -16,7 +16,7 @@ class SettingsVarsDebugPanel(DebugPanel):
         return _('Settings')
 
     def title(self):
-        return 'Settings from <code>%s</code>' % settings.SETTINGS_MODULE
+        return _('Settings from <code>%s</code>') % settings.SETTINGS_MODULE
 
     def url(self):
         return ''
diff --git a/debug_toolbar/panels/signals.py b/debug_toolbar/panels/signals.py
index 56fbfd4..ed5f92f 100644
--- a/debug_toolbar/panels/signals.py
+++ b/debug_toolbar/panels/signals.py
@@ -39,7 +39,7 @@ class SignalDebugPanel(DebugPanel):
         return _("Signals")
 
     def title(self):
-        return "Signals"
+        return _("Signals")
 
     def url(self):
         return ''
diff --git a/debug_toolbar/panels/sql.py b/debug_toolbar/panels/sql.py
index 7a8fa65..9b6db22 100644
--- a/debug_toolbar/panels/sql.py
+++ b/debug_toolbar/panels/sql.py
@@ -14,6 +14,7 @@ from django.template.loader import render_to_string
 from django.utils import simplejson
 from django.utils.encoding import force_unicode
 from django.utils.hashcompat import sha_constructor
+from django.utils.translation import ugettext_lazy as _
 
 from debug_toolbar.panels import DebugPanel
 from debug_toolbar.utils import sqlparse
@@ -142,12 +143,13 @@ class SQLDebugPanel(DebugPanel):
         self._queries = []
 
     def nav_title(self):
-        return 'SQL'
+        return _('SQL')
 
     def nav_subtitle(self):
         self._queries = connection.queries[self._offset:]
         self._sql_time = sum([q['duration'] for q in self._queries])
         num_queries = len(self._queries)
+        # TODO l10n: use ngettext
         return "%d %s in %.2fms" % (
             num_queries,
             (num_queries == 1) and 'query' or 'queries',
@@ -155,7 +157,7 @@ class SQLDebugPanel(DebugPanel):
         )
 
     def title(self):
-        return 'SQL Queries'
+        return _('SQL Queries')
 
     def url(self):
         return ''
diff --git a/debug_toolbar/panels/timer.py b/debug_toolbar/panels/timer.py
index 4e390f6..583c1c0 100644
--- a/debug_toolbar/panels/timer.py
+++ b/debug_toolbar/panels/timer.py
@@ -35,6 +35,7 @@ class TimerDebugPanel(DebugPanel):
         return _('Time')
 
     def nav_subtitle(self):
+        # TODO l10n
         if self.has_resource:
             utime = self._end_rusage.ru_utime - self._start_rusage.ru_utime
             stime = self._end_rusage.ru_stime - self._start_rusage.ru_stime
@@ -43,7 +44,7 @@ class TimerDebugPanel(DebugPanel):
             return 'TOTAL: %0.2fms' % (self.total_time)
 
     def title(self):
-        return 'Resource Usage'
+        return _('Resource Usage')
 
     def url(self):
         return ''
@@ -72,12 +73,13 @@ class TimerDebugPanel(DebugPanel):
 #        urss = self._end_rusage.ru_idrss
 #        usrss = self._end_rusage.ru_isrss
 
+        # TODO l10n on values
         rows = (
-            ('User CPU time', '%0.3f msec' % utime),
-            ('System CPU time', '%0.3f msec' % stime),
-            ('Total CPU time', '%0.3f msec' % (utime + stime)),
-            ('Elapsed time', '%0.3f msec' % self.total_time),
-            ('Context switches', '%d voluntary, %d involuntary' % (vcsw, ivcsw)),
+            (_('User CPU time'), '%0.3f msec' % utime),
+            (_('System CPU time'), '%0.3f msec' % stime),
+            (_('Total CPU time'), '%0.3f msec' % (utime + stime)),
+            (_('Elapsed time'), '%0.3f msec' % self.total_time),
+            (_('Context switches'), '%d voluntary, %d involuntary' % (vcsw, ivcsw)),
 #            ('Memory use', '%d max RSS, %d shared, %d unshared' % (rss, srss, urss + usrss)),
 #            ('Page faults', '%d no i/o, %d requiring i/o' % (minflt, majflt)),
 #            ('Disk operations', '%d in, %d out, %d swapout' % (blkin, blkout, swap)),
diff --git a/debug_toolbar/panels/version.py b/debug_toolbar/panels/version.py
index bc09e75..96a4535 100644
--- a/debug_toolbar/panels/version.py
+++ b/debug_toolbar/panels/version.py
@@ -26,10 +26,7 @@ class VersionDebugPanel(DebugPanel):
         return ''
     
     def title(self):
-        return 'Versions'
-
-    def title(self):
-        return 'Versions'
+        return _('Versions')
 
     def content(self):
         versions = {}