From 4cf7ec25d752cac2bb21cc87fc5cf206a63face7 Mon Sep 17 00:00:00 2001
From: Michael Barton <michael.barton@rackspace.com>
Date: Fri, 14 Jan 2011 11:30:17 +0000
Subject: [PATCH] missed things

---
 swift/account/reaper.py    | 18 +++++++++---------
 swift/auth/server.py       | 10 +++++-----
 swift/container/updater.py |  2 +-
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/swift/account/reaper.py b/swift/account/reaper.py
index 02e32506f0..d31558b9c6 100644
--- a/swift/account/reaper.py
+++ b/swift/account/reaper.py
@@ -241,28 +241,28 @@ class AccountReaper(Daemon):
         except Exception:
             self.logger.exception(
                 _('Exception with account %s'), account)
-            log = 'Incomplete pass on account %s' % account
+            log = _('Incomplete pass on account %s') % account
         if self.stats_containers_deleted:
-            log += ', %s containers deleted' % self.stats_containers_deleted
+            log += _(', %s containers deleted') % self.stats_containers_deleted
         if self.stats_objects_deleted:
-            log += ', %s objects deleted' % self.stats_objects_deleted
+            log += _(', %s objects deleted') % self.stats_objects_deleted
         if self.stats_containers_remaining:
-            log += ', %s containers remaining' % \
+            log += _(', %s containers remaining') % \
                    self.stats_containers_remaining
         if self.stats_objects_remaining:
-            log += ', %s objects remaining' % self.stats_objects_remaining
+            log += _(', %s objects remaining') % self.stats_objects_remaining
         if self.stats_containers_possibly_remaining:
-            log += ', %s containers possibly remaining' % \
+            log += _(', %s containers possibly remaining') % \
                    self.stats_containers_possibly_remaining
         if self.stats_objects_possibly_remaining:
-            log += ', %s objects possibly remaining' % \
+            log += _(', %s objects possibly remaining') % \
                    self.stats_objects_possibly_remaining
         if self.stats_return_codes:
-            log += ', return codes: '
+            log += _(', return codes: ')
             for code in sorted(self.stats_return_codes.keys()):
                 log += '%s %sxxs, ' % (self.stats_return_codes[code], code)
             log = log[:-2]
-        log += ', elapsed: %.02fs' % (time() - begin)
+        log += _(', elapsed: %.02fs') % (time() - begin)
         self.logger.info(log)
 
     def reap_container(self, account, account_partition, account_nodes,
diff --git a/swift/auth/server.py b/swift/auth/server.py
index afd2164207..0582d9cfda 100644
--- a/swift/auth/server.py
+++ b/swift/auth/server.py
@@ -146,7 +146,7 @@ class AuthController(object):
                 previous_prefix = ''
                 if '_' in row[0]:
                     previous_prefix = row[0].split('_', 1)[0]
-                msg = ('''
+                msg = _(('''
 THERE ARE ACCOUNTS IN YOUR auth.db THAT DO NOT BEGIN WITH YOUR NEW RESELLER
 PREFIX OF "%s".
 YOU HAVE A FEW OPTIONS:
@@ -164,14 +164,14 @@ YOU HAVE A FEW OPTIONS:
        TO REVERT BACK TO YOUR PREVIOUS RESELLER PREFIX.
 
     %s
-                    ''' % (self.reseller_prefix.rstrip('_'), self.db_file,
+                    ''') % (self.reseller_prefix.rstrip('_'), self.db_file,
                     self.reseller_prefix.rstrip('_'), self.db_file,
-                    previous_prefix, previous_prefix and ' ' or '''
+                    previous_prefix, previous_prefix and ' ' or _('''
     SINCE YOUR PREVIOUS RESELLER PREFIX WAS AN EMPTY STRING, IT IS NOT
     RECOMMENDED TO PERFORM OPTION 3 AS THAT WOULD MAKE SUPPORTING MULTIPLE
     RESELLERS MORE DIFFICULT.
-                    '''.strip())).strip()
-                self.logger.critical('CRITICAL: ' + ' '.join(msg.split()))
+                    ''').strip())).strip()
+                self.logger.critical(_('CRITICAL: ') + ' '.join(msg.split()))
                 raise Exception('\n' + msg)
 
     def add_storage_account(self, account_name=''):
diff --git a/swift/container/updater.py b/swift/container/updater.py
index 9dacea32d1..d6b1beb2b1 100644
--- a/swift/container/updater.py
+++ b/swift/container/updater.py
@@ -127,7 +127,7 @@ class ContainerUpdater(Daemon):
         Run the updater once.
         """
         patcher.monkey_patch(all=False, socket=True)
-        self.logger.info('Begin container update single threaded sweep')
+        self.logger.info(_('Begin container update single threaded sweep'))
         begin = time.time()
         self.no_changes = 0
         self.successes = 0